Messages in this thread | | | From | Andy Shevchenko <> | Date | Thu, 24 Jan 2019 15:47:08 +0200 | Subject | Re: [PATCH V4 2/6] misc/pvpanic: Add pvpanic driver framework |
| |
On Thu, Jan 24, 2019 at 10:17 AM Peng Hao <peng.hao2@zte.com.cn> wrote: > > Add pvpanic driver framework. Follow-up patches will split the original > pvpanic acpi/of driver as the two separate files and modify code to > adapt the framework. >
This one has run-time bisectability issues.
> Signed-off-by: Peng Hao <peng.hao2@zte.com.cn> > --- > drivers/misc/pvpanic/pvpanic.c | 158 +++++++---------------------------------- > 1 file changed, 27 insertions(+), 131 deletions(-) > > diff --git a/drivers/misc/pvpanic/pvpanic.c b/drivers/misc/pvpanic/pvpanic.c > index 595ac06..f44a884 100644 > --- a/drivers/misc/pvpanic/pvpanic.c > +++ b/drivers/misc/pvpanic/pvpanic.c > @@ -8,11 +8,9 @@ > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > -#include <linux/acpi.h> > +#include <linux/io.h> > #include <linux/kernel.h> > #include <linux/module.h> > -#include <linux/of.h> > -#include <linux/of_address.h> > #include <linux/platform_device.h> > #include <linux/types.h> > > @@ -43,59 +41,25 @@ > .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) > +static int pvpanic_platform_probe(struct platform_device *pdev) > { > - struct resource r; > - > - if (acpi_dev_resource_io(res, &r)) { > - base = ioport_map(r.start, resource_size(&r)); > - return AE_OK; > - } 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; > + struct device *dev = &pdev->dev; > + struct resource *res; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + if (res) { > + base = devm_ioremap_resource(dev, res); > + if (IS_ERR(base)) > + return -ENODEV; > + } else { > + res = platform_get_resource(pdev, IORESOURCE_IO, 0); > + if (!res) > + return -ENODEV; > + > + base = ioport_map(res->start, resource_size(res)); > + if (!base) > + return -ENODEV; > + } > > atomic_notifier_chain_register(&panic_notifier_list, > &pvpanic_panic_nb); > @@ -103,90 +67,22 @@ static int pvpanic_add(struct acpi_device *device) > return 0; > } > > -static int pvpanic_remove(struct acpi_device *device) > +static int pvpanic_platform_remove(struct platform_device *pdev) > { > - > 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) > -{ > - struct resource *mem; > - > - mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - if (!mem) > - return -EINVAL; > - > - base = devm_ioremap_resource(&pdev->dev, mem); > - if (IS_ERR(base)) > - return PTR_ERR(base); > - > - atomic_notifier_chain_register(&panic_notifier_list, > - &pvpanic_panic_nb); > - > - return 0; > -} > - > -static int pvpanic_mmio_remove(struct platform_device *pdev) > -{ > - > - atomic_notifier_chain_unregister(&panic_notifier_list, > - &pvpanic_panic_nb); > + iounmap(base); > > return 0; > } > > -static const struct of_device_id pvpanic_mmio_match[] = { > - { .compatible = "qemu,pvpanic-mmio", }, > - {} > -}; > - > -static struct platform_driver pvpanic_mmio_driver = { > +static struct platform_driver pvpanic_driver = { > + .probe = pvpanic_platform_probe, > + .remove = pvpanic_platform_remove, > .driver = { > - .name = "pvpanic-mmio", > - .of_match_table = pvpanic_mmio_match, > - }, > - .probe = pvpanic_mmio_probe, > - .remove = pvpanic_mmio_remove, > + .name = "pvpanic", > + } > }; > > -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_driver); > -- > 1.8.3.1 >
-- With Best Regards, Andy Shevchenko
| |