Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2bd4fd1 authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC64]: Add of_device layer and make ebus/isa use it. 



Sparcspkr and power drivers are converted, to make sure it works.
Eventually the SBUS device layer will use this as a sub-class.

I really cannot cut loose on that bit until sparc32 is given the
same infrastructure.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8cd24ed4

arch/sparc64/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ obj-y := process.o setup.o cpu.o idprom.o \ 
		   irq.o ptrace.o time.o sys_sparc.o signal.o \

		   unaligned.o central.o pci.o starfire.o semaphore.o \

		   power.o sbus.o iommu_common.o sparc64_ksyms.o chmc.o \

		   visemul.o prom.o

		   visemul.o prom.o of_device.o



obj-$(CONFIG_PCI)	 += ebus.o isa.o pci_common.o pci_iommu.o \

			    pci_psycho.o pci_sabre.o pci_schizo.o \

arch/sparc64/kernel/ebus.c

+21 −0
Original line number Diff line number Diff line
@@ -475,6 +475,16 @@ probe_interrupts: 
		}

	}



	dev->ofdev.node = dp;

	dev->ofdev.dev.parent = &dev->bus->ofdev.dev;

	dev->ofdev.dev.bus = &ebus_bus_type;

	strcpy(dev->ofdev.dev.bus_id, dp->path_component_name);



	/* Register with core */

	if (of_device_register(&dev->ofdev) != 0)

		printk(KERN_DEBUG "ebus: device registration error for %s!\n",

		       dev->ofdev.dev.bus_id);



	dp = dp->child;

	if (dp) {

		printk(" ->");
@@ -570,6 +580,17 @@ void __init ebus_init(void) 
		ebus->self = pdev;

		ebus->parent = pbm = cookie->pbm;



		ebus->ofdev.node = dp;

		ebus->ofdev.dev.parent = &pdev->dev;

		ebus->ofdev.dev.bus = &ebus_bus_type;

		strcpy(ebus->ofdev.dev.bus_id, dp->path_component_name);



		/* Register with core */

		if (of_device_register(&ebus->ofdev) != 0)

			printk(KERN_DEBUG "ebus: device registration error for %s!\n",

			       ebus->ofdev.dev.bus_id);





		child = dp->child;

		if (!child)

			goto next_ebus;

arch/sparc64/kernel/isa.c

+33 −4
Original line number Diff line number Diff line
@@ -195,12 +195,25 @@ static void __init isa_fill_devices(struct sparc_isa_bridge *isa_br) 


		isa_dev = kmalloc(sizeof(*isa_dev), GFP_KERNEL);

		if (!isa_dev) {

			fatal_err("cannot allocate isa_dev");

			prom_halt();

			printk(KERN_DEBUG "ISA: cannot allocate isa_dev");

			return;

		}



		memset(isa_dev, 0, sizeof(*isa_dev));



		isa_dev->ofdev.node = dp;

		isa_dev->ofdev.dev.parent = &isa_br->ofdev.dev;

		isa_dev->ofdev.dev.bus = &isa_bus_type;

		strcpy(isa_dev->ofdev.dev.bus_id, dp->path_component_name);



		/* Register with core */

		if (of_device_register(&isa_dev->ofdev) != 0) {

			printk(KERN_DEBUG "isa: device registration error for %s!\n",

			       isa_dev->ofdev.dev.bus_id);

			kfree(isa_dev);

			goto next_sibling;

		}



		/* Link it in. */

		isa_dev->next = NULL;

		if (isa_br->devices == NULL) {
@@ -226,6 +239,7 @@ static void __init isa_fill_devices(struct sparc_isa_bridge *isa_br) 


		printk("]");



	next_sibling:

		dp = dp->sibling;

	}

}
@@ -244,6 +258,7 @@ void __init isa_init(void) 
		struct pcidev_cookie *pdev_cookie;

		struct pci_pbm_info *pbm;

		struct sparc_isa_bridge *isa_br;

		struct device_node *dp;



		pdev_cookie = pdev->sysdata;

		if (!pdev_cookie) {
@@ -252,15 +267,29 @@ void __init isa_init(void) 
			continue;

		}

		pbm = pdev_cookie->pbm;

		dp = pdev_cookie->prom_node;



		isa_br = kmalloc(sizeof(*isa_br), GFP_KERNEL);

		if (!isa_br) {

			fatal_err("cannot allocate sparc_isa_bridge");

			prom_halt();

			printk(KERN_DEBUG "isa: cannot allocate sparc_isa_bridge");

			return;

		}



		memset(isa_br, 0, sizeof(*isa_br));



		isa_br->ofdev.node = dp;

		isa_br->ofdev.dev.parent = &pdev->dev;

		isa_br->ofdev.dev.bus = &isa_bus_type;

		strcpy(isa_br->ofdev.dev.bus_id, dp->path_component_name);



		/* Register with core */

		if (of_device_register(&isa_br->ofdev) != 0) {

			printk(KERN_DEBUG "isa: device registration error for %s!\n",

			       isa_br->ofdev.dev.bus_id);

			kfree(isa_br);

			return;

		}



		/* Link it in. */

		isa_br->next = isa_chain;

		isa_chain = isa_br;

arch/sparc64/kernel/of_device.c

0 → 100644
+279 −0
Original line number Diff line number Diff line 
#include <linux/config.h>

#include <linux/string.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/mod_devicetable.h>

#include <linux/slab.h>



#include <asm/errno.h>

#include <asm/of_device.h>



/**

 * 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)

{

	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);

		if (matches->type[0])

			match &= dev->node->type

				&& !strcmp(matches->type, dev->node->type);

		if (matches->compatible[0])

			match &= of_device_is_compatible(dev->node,

							 matches->compatible);

		if (match)

			return matches;

		matches++;

	}

	return NULL;

}



static int of_platform_bus_match(struct device *dev, struct device_driver *drv)

{

	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;

}



struct of_device *of_dev_get(struct of_device *dev)

{

	struct device *tmp;



	if (!dev)

		return NULL;

	tmp = get_device(&dev->dev);

	if (tmp)

		return to_of_device(tmp);

	else

		return NULL;

}



void of_dev_put(struct of_device *dev)

{

	if (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;

}



#ifdef CONFIG_PCI

struct bus_type isa_bus_type = {

       .name	= "isa",

       .match	= of_platform_bus_match,

       .probe	= of_device_probe,

       .remove	= of_device_remove,

       .suspend	= of_device_suspend,

       .resume	= of_device_resume,

};



struct bus_type ebus_bus_type = {

       .name	= "ebus",

       .match	= of_platform_bus_match,

       .probe	= of_device_probe,

       .remove	= of_device_remove,

       .suspend	= of_device_suspend,

       .resume	= of_device_resume,

};

#endif



#ifdef CONFIG_SBUS

struct bus_type sbus_bus_type = {

       .name	= "sbus",

       .match	= of_platform_bus_match,

       .probe	= of_device_probe,

       .remove	= of_device_remove,

       .suspend	= of_device_suspend,

       .resume	= of_device_resume,

};

#endif



static int __init of_bus_driver_init(void)

{

	int err = 0;



#ifdef CONFIG_PCI

	if (!err)

		err = bus_register(&isa_bus_type);

	if (!err)

		err = bus_register(&ebus_bus_type);

#endif

#ifdef CONFIG_SBUS

	if (!err)

		err = bus_register(&sbus_bus_type);

#endif

	return 0;

}



postcore_initcall(of_bus_driver_init);



int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)

{

	/* initialize common driver fields */

	drv->driver.name = drv->name;

	drv->driver.bus = bus;



	/* 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)

{

	struct of_device *ofdev;



	ofdev = to_of_device(dev);

	return sprintf(buf, "%s", ofdev->node->full_name);

}



static DEVICE_ATTR(devspec, S_IRUGO, dev_show_devspec, NULL);



/**

 * of_release_dev - free an of device structure when all users of it are finished.

 * @dev: device that's been disconnected

 *

 * Will be called only by the device core when all users of this of device are

 * done.

 */

void of_release_dev(struct device *dev)

{

	struct of_device *ofdev;



        ofdev = to_of_device(dev);



	kfree(ofdev);

}



int of_device_register(struct of_device *ofdev)

{

	int rc;



	BUG_ON(ofdev->node == NULL);



	rc = device_register(&ofdev->dev);

	if (rc)

		return rc;



	device_create_file(&ofdev->dev, &dev_attr_devspec);



	return 0;

}



void of_device_unregister(struct of_device *ofdev)

{

	device_remove_file(&ofdev->dev, &dev_attr_devspec);

	device_unregister(&ofdev->dev);

}



struct of_device* of_platform_device_create(struct device_node *np,

					    const char *bus_id,

					    struct device *parent,

					    struct bus_type *bus)

{

	struct of_device *dev;



	dev = kmalloc(sizeof(*dev), GFP_KERNEL);

	if (!dev)

		return NULL;

	memset(dev, 0, sizeof(*dev));



	dev->dev.parent = parent;

	dev->dev.bus = bus;

	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_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);

arch/sparc64/kernel/power.c

+53 −56
Original line number Diff line number Diff line
@@ -115,66 +115,15 @@ static int __init has_button_interrupt(unsigned int irq, struct device_node *dp) 
	return 1;

}



static int __init power_probe_ebus(struct resource **resp, unsigned int *irq_p, struct device_node **prom_node_p)

static void __devinit power_probe_common(struct of_device *dev, struct resource *res, unsigned int irq)

{

	struct linux_ebus *ebus;

	struct linux_ebus_device *edev;



	for_each_ebus(ebus) {

		for_each_ebusdev(edev, ebus) {

			if (!strcmp(edev->prom_node->name, "power")) {

				*resp = &edev->resource[0];

				*irq_p = edev->irqs[0];

				*prom_node_p = edev->prom_node;

				return 0;

			}

		}

	}

	return -ENODEV;

}



static int __init power_probe_isa(struct resource **resp, unsigned int *irq_p, struct device_node **prom_node_p)

{

	struct sparc_isa_bridge *isa_bus;

	struct sparc_isa_device *isa_dev;



	for_each_isa(isa_bus) {

		for_each_isadev(isa_dev, isa_bus) {

			if (!strcmp(isa_dev->prom_node->name, "power")) {

				*resp = &isa_dev->resource;

				*irq_p = isa_dev->irq;

				*prom_node_p = isa_dev->prom_node;

				return 0;

			}

		}

	}

	return -ENODEV;

}



void __init power_init(void)

{

	struct resource *res = NULL;

	unsigned int irq;

	struct device_node *dp;

	static int invoked;



	if (invoked)

		return;

	invoked = 1;



	if (!power_probe_ebus(&res, &irq, &dp))

		goto found;



	if (!power_probe_isa(&res, &irq, &dp))

		goto found;



	return;



found:

	power_reg = ioremap(res->start, 0x4);



	printk("power: Control reg at %p ... ", power_reg);



	poweroff_method = machine_halt;  /* able to use the standard halt */

	if (has_button_interrupt(irq, dp)) {



	if (has_button_interrupt(irq, dev->node)) {

		if (kernel_thread(powerd, NULL, CLONE_FS) < 0) {

			printk("Failed to start power daemon.\n");

			return;
@@ -188,4 +137,52 @@ found: 
		printk("not using powerd.\n");

	}

}



static struct of_device_id power_match[] = {

	{

		.name = "power",

	},

	{},

};



static int __devinit ebus_power_probe(struct of_device *dev, const struct of_device_id *match)

{

	struct linux_ebus_device *edev = to_ebus_device(&dev->dev);

	struct resource *res = &edev->resource[0];

	unsigned int irq = edev->irqs[0];



	power_probe_common(dev, res,irq);



	return 0;

}



static struct of_platform_driver ebus_power_driver = {

	.name		= "power",

	.match_table	= power_match,

	.probe		= ebus_power_probe,

};



static int __devinit isa_power_probe(struct of_device *dev, const struct of_device_id *match)

{

	struct sparc_isa_device *idev = to_isa_device(&dev->dev);

	struct resource *res = &idev->resource;

	unsigned int irq = idev->irq;



	power_probe_common(dev, res,irq);



	return 0;

}



static struct of_platform_driver isa_power_driver = {

	.name		= "power",

	.match_table	= power_match,

	.probe		= isa_power_probe,

};



void __init power_init(void)

{

	of_register_driver(&ebus_power_driver, &ebus_bus_type);

	of_register_driver(&isa_power_driver, &isa_bus_type);

	return;

}

#endif /* CONFIG_PCI */