adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Driver Core: Early platform driver buffer

Browse source 
Add early_platform_init_buffer() support and update the
early platform driver code to allow passing parameters
to the driver on the kernel command line.

early_platform_init_buffer() simply allows early platform
drivers to provide a pointer and length to a memory area
where the remaining part of the kernel command line option
will be stored.

Needed to pass baud rate and other serial port options
to the reworked early serial console code on SuperH.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Magnus Damm 2009-11-27 17:38:51 +09:00 committed by Greg Kroah-Hartman
parent e16acb503b
commit c60e0504c8
2 changed files with 37 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/base/platform.c
View file

@ -1000,7 +1000,7 @@ static __initdata LIST_HEAD(early_platform_device_list);
int __init early_platform_driver_register(struct early_platform_driver *epdrv, int __init early_platform_driver_register(struct early_platform_driver *epdrv,
char *buf) char *buf)
{ {
unsigned long index; char *tmp;
int n; int n;
/* Simply add the driver to the end of the global list. /* Simply add the driver to the end of the global list.
@ -1019,13 +1019,28 @@ int __init early_platform_driver_register(struct early_platform_driver *epdrv,
if (buf && !strncmp(buf, epdrv->pdrv->driver.name, n)) { if (buf && !strncmp(buf, epdrv->pdrv->driver.name, n)) {
list_move(&epdrv->list, &early_platform_driver_list); list_move(&epdrv->list, &early_platform_driver_list);
if (!strcmp(buf, epdrv->pdrv->driver.name)) /* Allow passing parameters after device name */
if (buf[n] == '\0' || buf[n] == ',')
epdrv->requested_id = -1; epdrv->requested_id = -1;
else if (buf[n] == '.' && strict_strtoul(&buf[n + 1], 10, else {
&index) == 0) epdrv->requested_id = simple_strtoul(&buf[n + 1],
epdrv->requested_id = index; &tmp, 10);
else
if (buf[n] != '.' || (tmp == &buf[n + 1])) {
epdrv->requested_id = EARLY_PLATFORM_ID_ERROR; epdrv->requested_id = EARLY_PLATFORM_ID_ERROR;
n = 0;
} else
n += strcspn(&buf[n + 1], ",") + 1;
}
if (buf[n] == ',')
n++;
if (epdrv->bufsize) {
memcpy(epdrv->buffer, &buf[n],
min_t(int, epdrv->bufsize, strlen(&buf[n]) + 1));
epdrv->buffer[epdrv->bufsize - 1] = '\0';
}
} }
return 0; return 0;

20
include/linux/platform_device.h
View file

@ -83,6 +83,8 @@ struct early_platform_driver {
struct platform_driver *pdrv; struct platform_driver *pdrv;
struct list_head list; struct list_head list;
int requested_id; int requested_id;
char *buffer;
int bufsize;
}; };
#define EARLY_PLATFORM_ID_UNSET -2 #define EARLY_PLATFORM_ID_UNSET -2
@ -102,21 +104,29 @@ extern int early_platform_driver_probe(char *class_str,
int nr_probe, int user_only); int nr_probe, int user_only);
extern void early_platform_cleanup(void); extern void early_platform_cleanup(void);
#define early_platform_init(class_string, platdrv) \
early_platform_init_buffer(class_string, platdrv, NULL, 0)
#ifndef MODULE #ifndef MODULE
#define early_platform_init(class_string, platform_driver) \ #define early_platform_init_buffer(class_string, platdrv, buf, bufsiz) \
static __initdata struct early_platform_driver early_driver = { \ static __initdata struct early_platform_driver early_driver = { \
.class_str = class_string, \ .class_str = class_string, \
.pdrv = platform_driver, \ .buffer = buf, \
.bufsize = bufsiz, \
.pdrv = platdrv, \
.requested_id = EARLY_PLATFORM_ID_UNSET, \ .requested_id = EARLY_PLATFORM_ID_UNSET, \
}; \ }; \
static int __init early_platform_driver_setup_func(char *buf) \ static int __init early_platform_driver_setup_func(char *buffer) \
{ \ { \
return early_platform_driver_register(&early_driver, buf); \ return early_platform_driver_register(&early_driver, buffer); \
} \ } \
early_param(class_string, early_platform_driver_setup_func) early_param(class_string, early_platform_driver_setup_func)
#else /* MODULE */ #else /* MODULE */
#define early_platform_init(class_string, platform_driver) #define early_platform_init_buffer(class_string, platdrv, buf, bufsiz) \
static inline char *early_platform_driver_setup_func(void) \
{ \
return bufsiz ? buf : NULL; \
}
#endif /* MODULE */ #endif /* MODULE */
#endif /* _PLATFORM_DEVICE_H_ */ #endif /* _PLATFORM_DEVICE_H_ */