driver core: platform: Introduce platform_get_mem_or_io()
Subsystems (6)
PATCH v2 1/5 driver core: platform: Introduce platform_get_mem_or_io()
There are at least few existing users of the proposed API which retrieves either MEM or IO resource from platform device.
Make it common to utilize in the existing and new users.
---
v2: moved to C-file and renamed for the sake of consistency with the rest
platform code
drivers/base/platform.c | 15 +++++++++++++++ include/linux/platform_device.h | 3 +++ 2 files changed, 18 insertions(+)
drivers/base/platform.c +15 -0
@@ -63,6 +63,21 @@ struct resource *platform_get_resource(struct platform_device *dev, }EXPORT_SYMBOL_GPL (platform_get_resource); +struct resource *platform_get_mem_or_io (struct platform_device *dev, +unsigned int num) +{ +u32 i; + +for (i =0 ; i < dev->num_resources; i++) { +struct resource *r = &dev->resource[i]; + +if ((resource_type (r) & (IORESOURCE_MEM |IORESOURCE_IO )) && num-- ==0 ) +return r; + } +return NULL ; +} +EXPORT_SYMBOL_GPL (platform_get_mem_or_io); +#ifdef CONFIG_HAS_IOMEM /** * devm_platform_get_and_ioremap_resource - call devm_ioremap_resource() for a
include/linux/platform_device.h +3 -0
@@ -52,6 +52,9 @@ extern struct device platform_bus;extern struct resource *platform_get_resource (struct platform_device *,unsigned int ,unsigned int ); +extern struct resource *platform_get_mem_or_io (struct platform_device *, +unsigned int ); +extern struct device *platform_find_device_by_driver (struct device *start,const struct device_driver *drv);
Signature · 1 line
2.29.2
PATCH v2 2/5 vfio: platform: Switch to use platform_get_mem_or_io()
Switch to use new platform_get_mem_or_io() instead of home grown analogue.
---
v2: added tag (Eric)
drivers/vfio/platform/vfio_platform.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
drivers/vfio/platform/vfio_platform.c +1 -12
@@ -25,19 +25,8 @@ static struct resource *get_platform_resource(struct vfio_platform_device *vdev, int num) {struct platform_device *dev = (struct platform_device *) vdev->opaque; -int i; -for (i =0 ; i < dev->num_resources; i++) { -struct resource *r = &dev->resource[i]; - -if (resource_type (r) & (IORESOURCE_MEM |IORESOURCE_IO )) { -if (!num) -return r; - - num--; - } - } -return NULL ; +return platform_get_mem_or_io (dev, num); }static int get_platform_irq (struct vfio_platform_device *vdev,int i)
Signature · 1 line
2.29.2
PATCH v2 3/5 usb: host: sl811: Switch to use platform_get_mem_or_io()
In reply to Andy ShevchenkoSwitch to use new platform_get_mem_or_io() instead of home grown analogue. Note, the code has been moved upper in the function to allow farther cleanups, such as resource sanity check.
---
v2: no changes
drivers/usb/host/sl811-hcd.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
drivers/usb/host/sl811-hcd.c +9 -11
@@ -1614,12 +1614,18 @@ sl811h_probe(struct platform_device *dev)void __iomem *addr_reg;void __iomem *data_reg;int retval; -u8 tmp, ioaddr =0 ; +u8 tmp, ioaddr;unsigned long irqflags;if (usb_disabled ())return -ENODEV ; +/* the chip may be wired for either kind of addressing */ + addr =platform_get_mem_or_io (dev,0 ); + data =platform_get_mem_or_io (dev,1 ); +if (!addr || !data ||resource_type (addr) !=resource_type (data)) +return -ENODEV ; +/* basic sanity checks first. board-specific init logic should * have initialized these three resources and probably board * specific platform_data. we don't probe for IRQs, and do only
@@ -1632,16 +1638,8 @@ sl811h_probe(struct platform_device *dev) irq = ires->start; irqflags = ires->flags &IRQF_TRIGGER_MASK ; -/* the chip may be wired for either kind of addressing */ - addr =platform_get_resource (dev,IORESOURCE_MEM ,0 ); - data =platform_get_resource (dev,IORESOURCE_MEM ,1 ); - retval = -EBUSY ; -if (!addr || !data) { - addr =platform_get_resource (dev,IORESOURCE_IO ,0 ); - data =platform_get_resource (dev,IORESOURCE_IO ,1 ); -if (!addr || !data) -return -ENODEV ; - ioaddr =1 ; + ioaddr =resource_type (addr) ==IORESOURCE_IO ; +if (ioaddr) {/* * NOTE: 64-bit resource->start is getting truncated * to avoid compiler warning, assuming that ->start
Signature · 1 line
2.29.2
PATCH v2 4/5 misc: pvpanic: Combine ACPI and platform drivers
In reply to Andy ShevchenkoThere is nothing special in the driver that requires to have a special ACPI driver for it. Combine both into simple platform driver.
---
v2: no changes
drivers/misc/pvpanic.c | 130 ++++++----------------------------------- 1 file changed, 17 insertions(+), 113 deletions(-)
drivers/misc/pvpanic.c +17 -113
@@ -8,7 +8,7 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt -#include <linux/acpi.h> +#include <linux/io.h> #include <linux/kernel.h> #include <linux/kexec.h> #include <linux/module.h>
@@ -49,101 +49,16 @@ static struct notifier_block pvpanic_panic_nb = { .priority = 1, /* let this called before broken drm_fb_helper */ }; -#ifdef CONFIG_ACPI -static int pvpanic_add (struct acpi_device *device); -static int pvpanic_remove (struct acpi_device *device); - -static const struct acpi_device_id pvpanic_device_ids[] = { - {"QEMU0001" ,0 }, - {"" ,0 } -}; -MODULE_DEVICE_TABLE (acpi, pvpanic_device_ids); - -static struct acpi_driver pvpanic_driver = { - .name ="pvpanic" , - .class ="QEMU" , - .ids = pvpanic_device_ids, - .ops = { - .add = pvpanic_add, - .remove = pvpanic_remove, - }, - .owner =THIS_MODULE , -}; - -static acpi_status -pvpanic_walk_resources (struct acpi_resource *res,void *context) -{ -struct resource r; - -if (acpi_dev_resource_io (res, &r)) { -#ifdef CONFIG_HAS_IOPORT_MAP - base =ioport_map (r.start,resource_size (&r)); -return AE_OK ; -#else -return AE_ERROR ; -#endif - }else if (acpi_dev_resource_memory (res, &r)) { - base =ioremap (r.start,resource_size (&r)); -return AE_OK ; - } - -return AE_ERROR ; -} - -static int pvpanic_add (struct acpi_device *device) -{ -int ret; - - ret =acpi_bus_get_status (device); -if (ret <0 ) -return ret; - -if (!device->status.enabled || !device->status.functional) -return -ENODEV ; - -acpi_walk_resources (device->handle,METHOD_NAME__CRS , - pvpanic_walk_resources,NULL ); - -if (!base) -return -ENODEV ; - -atomic_notifier_chain_register (&panic_notifier_list, - &pvpanic_panic_nb); - -return 0 ; -} - -static int pvpanic_remove (struct acpi_device *device) -{ - -atomic_notifier_chain_unregister (&panic_notifier_list, - &pvpanic_panic_nb); -iounmap (base); - -return 0 ; -} - -static int pvpanic_register_acpi_driver (void ) -{ -return acpi_bus_register_driver (&pvpanic_driver); -} - -static void pvpanic_unregister_acpi_driver (void ) -{ -acpi_bus_unregister_driver (&pvpanic_driver); -} -#else -static int pvpanic_register_acpi_driver (void ) -{ -return -ENODEV ; -} - -static void pvpanic_unregister_acpi_driver (void ) {} -#endif -static int pvpanic_mmio_probe (struct platform_device *pdev) { - base =devm_platform_ioremap_resource (pdev,0 ); +struct device *dev = &pdev->dev; +struct resource *res; + + res =platform_get_mem_or_io (pdev,0 ); +if (res &&resource_type (res) ==IORESOURCE_IO ) + base =devm_ioport_map (dev, res->start,resource_size (res)); +else + base =devm_ioremap_resource (dev, res);if (IS_ERR (base))return PTR_ERR (base);
@@ -167,30 +82,19 @@ static const struct of_device_id pvpanic_mmio_match[] = { {} }; +static const struct acpi_device_id pvpanic_device_ids[] = { + {"QEMU0001" ,0 }, + {"" ,0 } +}; +MODULE_DEVICE_TABLE (acpi, pvpanic_device_ids); +static struct platform_driver pvpanic_mmio_driver = { .driver = { .name ="pvpanic-mmio" , .of_match_table = pvpanic_mmio_match, + .acpi_match_table = pvpanic_device_ids, }, .probe = pvpanic_mmio_probe, .remove = pvpanic_mmio_remove, }; - -static int __init pvpanic_mmio_init (void ) -{ -if (acpi_disabled) -return platform_driver_register (&pvpanic_mmio_driver); -else -return pvpanic_register_acpi_driver (); -} - -static void __exit pvpanic_mmio_exit(void) -{ -if (acpi_disabled) -platform_driver_unregister (&pvpanic_mmio_driver); -else -pvpanic_unregister_acpi_driver (); -} - -module_init (pvpanic_mmio_init); -module_exit (pvpanic_mmio_exit); +module_platform_driver (pvpanic_mmio_driver);
Signature · 1 line
2.29.2
PATCH v2 5/5 misc: pvpanic: Replace OF headers by mod_devicetable.h
In reply to Andy ShevchenkoThere is no use for OF headers in the driver, but mod_devicetable.h must be included. Update driver accordingly.
---
v2: no changes
drivers/misc/pvpanic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/pvpanic.c +2 -2
@@ -11,11 +11,11 @@#include <linux/io.h> #include <linux/kernel.h> #include <linux/kexec.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> -#include <linux/of.h> -#include <linux/of_address.h> #include <linux/platform_device.h> #include <linux/types.h> +#include <uapi/misc/pvpanic.h> static void __iomem *base;
Signature · 1 line
2.29.2