powerpc: of_platform improvements
Subsystems (3)
PATCH 1/3 powerpc: of_platform improvements
This is also something that I'll need in 2.6.20, so please comment asap. It's close to final (that is +- bugs, I don't have any other feature I plan to add there in this cycle).
This patch splits of_platform.c from of_device.c and adds mecanisms for creating of_platform devices in "bulk" by walking the device-tree down and following known bus types.
For example, it could allow platforms using SoC devices to register the whole set of nodes there in one call.
A subsequent patch will add an of_platform_driver for PCI host bridges that can discover PCI busses from the OF tree.
For comments only at this point, so no signed-off.
arch/powerpc/kernel/of_device.c +27 -145
@@ -9,30 +9,26 @@#include <asm/of_device.h> /** -* of_match_device - Tell if an of_device structure has a matching -* of_match structure +* of_match_node - Tell if an device_node has a matching of_match structure * @ids: array of of device match structures to search in -* @dev: the of device structure to match against +* @node: the of device structure to match against * -* Used by a driver to check whether an of_device present in the -* system is in its list of supported devices. +* Low level utility function used by device matching. */ -const struct of_device_id *of_match_device (const struct of_device_id *matches, -const struct of_device *dev) +const struct of_device_id *of_match_node (const struct of_device_id *matches, +const struct device_node *node) { -if (!dev->node) -return NULL ;while (matches->name[0 ] || matches->type[0 ] || matches->compatible[0 ]) {int match =1 ;if (matches->name[0 ]) - match &= dev->node->name - && !strcmp (matches->name, dev->node->name); + match &= node->name + && !strcmp (matches->name, node->name);if (matches->type[0 ]) - match &= dev->node->type - && !strcmp (matches->type, dev->node->type); + match &= node->type + && !strcmp (matches->type, node->type);if (matches->compatible[0 ]) - match &=device_is_compatible (dev->node, - matches->compatible); + match &=device_is_compatible (node, + matches->compatible);if (match)return matches; matches++;
@@ -40,16 +36,21 @@ const struct of_device_id *of_match_devireturn NULL ; } -static int of_platform_bus_match (struct device *dev,struct device_driver *drv) +/** +* of_match_device - Tell if an of_device structure has a matching +* of_match structure +* @ids: array of of device match structures to search in +* @dev: the of device structure to match against +* +* Used by a driver to check whether an of_device present in the +* system is in its list of supported devices. +*/ +const struct of_device_id *of_match_device (const struct of_device_id *matches, +const struct of_device *dev) { -struct of_device * of_dev =to_of_device (dev); -struct of_platform_driver * of_drv =to_of_platform_driver (drv); -const struct of_device_id * matches = of_drv->match_table; - -if (!matches) -return 0 ; - -return of_match_device (matches, of_dev) !=NULL ; +if (!dev->node) +return NULL ; +return of_match_node (matches, dev->node); }struct of_device *of_dev_get (struct of_device *dev)
@@ -71,96 +72,8 @@ void of_dev_put(struct of_device *dev)put_device (&dev->dev); } - -static int of_device_probe (struct device *dev) -{ -int error = -ENODEV ; -struct of_platform_driver *drv; -struct of_device *of_dev; -const struct of_device_id *match; - - drv =to_of_platform_driver (dev->driver); - of_dev =to_of_device (dev); - -if (!drv->probe) -return error; - -of_dev_get (of_dev); - - match =of_match_device (drv->match_table, of_dev); -if (match) - error = drv->probe (of_dev, match); -if (error) -of_dev_put (of_dev); - -return error; -} - -static int of_device_remove (struct device *dev) -{ -struct of_device * of_dev =to_of_device (dev); -struct of_platform_driver * drv =to_of_platform_driver (dev->driver); - -if (dev->driver && drv->remove) - drv->remove (of_dev); -return 0 ; -} - -static int of_device_suspend (struct device *dev,pm_message_t state) -{ -struct of_device * of_dev =to_of_device (dev); -struct of_platform_driver * drv =to_of_platform_driver (dev->driver); -int error =0 ; - -if (dev->driver && drv->suspend) - error = drv->suspend (of_dev, state); -return error; -} - -static int of_device_resume (struct device * dev) -{ -struct of_device * of_dev =to_of_device (dev); -struct of_platform_driver * drv =to_of_platform_driver (dev->driver); -int error =0 ; - -if (dev->driver && drv->resume) - error = drv->resume (of_dev); -return error; -} - -struct bus_type of_platform_bus_type = { - .name ="of_platform" , - .match = of_platform_bus_match, - .probe = of_device_probe, - .remove = of_device_remove, - .suspend = of_device_suspend, - .resume = of_device_resume, -}; - -static int __init of_bus_driver_init (void ) -{ -return bus_register (&of_platform_bus_type); -} - -postcore_initcall (of_bus_driver_init); - -int of_register_driver (struct of_platform_driver *drv) -{ -/* initialize common driver fields */ - drv->driver.name = drv->name; - drv->driver.bus = &of_platform_bus_type; - -/* register with core */ -return driver_register (&drv->driver); -} - -void of_unregister_driver (struct of_platform_driver *drv) -{ -driver_unregister (&drv->driver); -} - - -static ssize_t dev_show_devspec (struct device *dev,struct device_attribute *attr,char *buf) +static ssize_t dev_show_devspec (struct device *dev, +struct device_attribute *attr,char *buf) {struct of_device *ofdev;
@@ -208,41 +121,10 @@ void of_device_unregister(struct of_devidevice_unregister (&ofdev->dev); } -struct of_device *of_platform_device_create (struct device_node *np, -const char *bus_id, -struct device *parent) -{ -struct of_device *dev; - - dev =kmalloc (sizeof (*dev),GFP_KERNEL ); -if (!dev) -return NULL ; -memset (dev,0 ,sizeof (*dev)); - - dev->node =of_node_get (np); - dev->dma_mask =0xffffffffUL ; - dev->dev.dma_mask = &dev->dma_mask; - dev->dev.parent = parent; - dev->dev.bus = &of_platform_bus_type; - dev->dev.release = of_release_dev; - -strlcpy (dev->dev.bus_id, bus_id,BUS_ID_SIZE ); - -if (of_device_register (dev) !=0 ) { -kfree (dev); -return NULL ; - } - -return dev; -}EXPORT_SYMBOL (of_match_device); -EXPORT_SYMBOL (of_platform_bus_type); -EXPORT_SYMBOL (of_register_driver); -EXPORT_SYMBOL (of_unregister_driver);EXPORT_SYMBOL (of_device_register);EXPORT_SYMBOL (of_device_unregister);EXPORT_SYMBOL (of_dev_get);EXPORT_SYMBOL (of_dev_put); -EXPORT_SYMBOL (of_platform_device_create);EXPORT_SYMBOL (of_release_dev);
include/asm-powerpc/of_device.h +2 -32
@@ -6,12 +6,6 @@#include <linux/mod_devicetable.h> #include <asm/prom.h> -/* -* The of_platform_bus_type is a bus type used by drivers that do not -* attach to a macio or similar bus but still use OF probing -* mechanism -*/ -extern struct bus_type of_platform_bus_type;/* * The of_device is a kind of "base class" that is a superset of
@@ -26,40 +20,16 @@ struct of_device };#define to_of_device (d) container_of(d, struct of_device, dev) +extern const struct of_device_id *of_match_node ( +const struct of_device_id *matches,const struct device_node *node);extern const struct of_device_id *of_match_device (const struct of_device_id *matches,const struct of_device *dev);extern struct of_device *of_dev_get (struct of_device *dev);extern void of_dev_put (struct of_device *dev); -/* -* An of_platform_driver driver is attached to a basic of_device on -* the "platform bus" (of_platform_bus_type) -*/ -struct of_platform_driver -{ -char *name; -struct of_device_id *match_table; -struct module *owner; - -int (*probe)(struct of_device * dev,const struct of_device_id *match); -int (*remove)(struct of_device * dev); - -int (*suspend)(struct of_device * dev,pm_message_t state); -int (*resume)(struct of_device * dev); -int (*shutdown)(struct of_device * dev); - -struct device_driver driver; -}; -#define to_of_platform_driver (drv) container_of(drv,struct of_platform_driver, driver) - -extern int of_register_driver (struct of_platform_driver *drv); -extern void of_unregister_driver (struct of_platform_driver *drv);extern int of_device_register (struct of_device *ofdev);extern void of_device_unregister (struct of_device *ofdev); -extern struct of_device *of_platform_device_create (struct device_node *np, -const char *bus_id, -struct device *parent);extern void of_release_dev (struct device *dev);#endif /* __KERNEL__ */
arch/powerpc/kernel/of_platform.c new file +371 -0
371 lines not on this page · raw message
arch/powerpc/kernel/Makefile +1 -1
@@ -21,7 +21,7 @@ obj-$(CONFIG_PPC64) += setup_64.o binfm obj-$(CONFIG_PPC64) += vdso64/ obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o obj-$(CONFIG_PPC_970_NAP) += idle_power4.o -obj-$(CONFIG_PPC_OF) += of_device.o prom_parse.o +obj-$(CONFIG_PPC_OF) += of_device.o of_platform.o prom_parse.o procfs-$(CONFIG_PPC64) := proc_ppc64.o obj-$(CONFIG_PROC_FS) += $(procfs-y) rtaspci-$(CONFIG_PPC64) := rtas_pci.o
drivers/macintosh/therm_pm72.c +3 -2
@@ -129,6 +129,7 @@#include <asm/sections.h> #include <asm/of_device.h> #include <asm/macio.h> +#include <asm/of_platform.h> #include "therm_pm72.h"
@@ -2236,14 +2237,14 @@ static int __init therm_pm72_init(void)return -ENODEV ; } -of_register_driver (&fcu_of_platform_driver); +of_register_platform_driver (&fcu_of_platform_driver);return 0 ; } static void __exit therm_pm72_exit(void) { -of_unregister_driver (&fcu_of_platform_driver); +of_unregister_platform_driver (&fcu_of_platform_driver);if (of_dev)of_device_unregister (of_dev);
include/asm-powerpc/of_platform.h new file +60 -0
60 lines not on this page · raw message
arch/powerpc/platforms/powermac/setup.c +1 -0
@@ -70,6 +70,7 @@#include <asm/pmac_feature.h> #include <asm/time.h> #include <asm/of_device.h> +#include <asm/of_platform.h> #include <asm/mmu_context.h> #include <asm/iommu.h> #include <asm/smu.h>
drivers/macintosh/smu.c +2 -1
@@ -46,6 +46,7 @@#include <asm/abs_addr.h> #include <asm/uaccess.h> #include <asm/of_device.h> +#include <asm/of_platform.h> #define VERSION "0.7"#define AUTHOR "(c) 2005 Benjamin Herrenschmidt, IBM Corp."
@@ -653,7 +654,7 @@ static int __init smu_init_sysfs(void)* I'm a bit too far from figuring out how that works with those * new chipsets, but that will come back and bite us */ -of_register_driver (&smu_of_platform_driver); +of_register_platform_driver (&smu_of_platform_driver);return 0 ; }
drivers/video/platinumfb.c +3 -2
@@ -34,6 +34,7 @@#include <asm/prom.h> #include <asm/pgtable.h> #include <asm/of_device.h> +#include <asm/of_platform.h> #include "macmodes.h" #include "platinumfb.h"
@@ -682,14 +683,14 @@ static int __init platinumfb_init(void)return -ENODEV ;platinumfb_setup (option);#endif -of_register_driver (&platinum_driver); +of_register_platform_driver (&platinum_driver);return 0 ; } static void __exit platinumfb_exit(void) { -of_unregister_driver (&platinum_driver); +of_unregister_platform_driver (&platinum_driver); }MODULE_LICENSE ("GPL" );
Ignore the 1/3 ... I'll post a complete serie with all my patches next week, right now, I'm sending cherry picked ones that are big enough to need early commenting.
Ben.