| Message ID | 1f5bf2e21006f0fd4f10ab3948cf69a737c0b039.1460040201.git.vilhelm.gray@gmail.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Apr 07, 2016 at 10:47:27AM -0400, William Breathitt Gray wrote: > The WinSystems EBC-C384 watchdog timer is controlled via ISA bus > communication. As such, the ISA bus driver is more appropriate than the > platform driver for the WinSystems EBC-C384 watchdog timer driver. > > Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com> > --- > drivers/watchdog/Kconfig | 2 +- > drivers/watchdog/ebc-c384_wdt.c | 43 ++++++++++------------------------------- > 2 files changed, 11 insertions(+), 34 deletions(-) > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index fb94765..b10761d 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -738,7 +738,7 @@ config ALIM7101_WDT > > config EBC_C384_WDT > tristate "WinSystems EBC-C384 Watchdog Timer" > - depends on X86 > + depends on X86 && ISA_BUS I am a bit concerend that the newly introduced ISA_BUS is not automatically enabled. Effectively this means that all drivers depending on it will be disabled until someone enables ISA_BUS in the distribution. Is this a concern for anyone but me ? Anyway, since you are the driver maintainer, I assume that you are ok with it, so Acked-by: Guenter Roeck <linux@roeck-us.net> Side note for Wim: ISA_BUS was introduced with commit b3c1be1b789c ("base: isa: Remove X86_32 dependency") in -next. Guenter > select WATCHDOG_CORE > help > Enables watchdog timer support for the watchdog timer on the > diff --git a/drivers/watchdog/ebc-c384_wdt.c b/drivers/watchdog/ebc-c384_wdt.c > index 77fda0b..4b849b8 100644 > --- a/drivers/watchdog/ebc-c384_wdt.c > +++ b/drivers/watchdog/ebc-c384_wdt.c > @@ -16,10 +16,10 @@ > #include <linux/errno.h> > #include <linux/io.h> > #include <linux/ioport.h> > +#include <linux/isa.h> > #include <linux/kernel.h> > #include <linux/module.h> > #include <linux/moduleparam.h> > -#include <linux/platform_device.h> > #include <linux/types.h> > #include <linux/watchdog.h> > > @@ -95,9 +95,8 @@ static const struct watchdog_info ebc_c384_wdt_info = { > .identity = MODULE_NAME > }; > > -static int __init ebc_c384_wdt_probe(struct platform_device *pdev) > +static int ebc_c384_wdt_probe(struct device *dev, unsigned int id) > { > - struct device *dev = &pdev->dev; > struct watchdog_device *wdd; > > if (!devm_request_region(dev, BASE_ADDR, ADDR_EXTENT, dev_name(dev))) { > @@ -122,61 +121,39 @@ static int __init ebc_c384_wdt_probe(struct platform_device *pdev) > dev_warn(dev, "Invalid timeout (%u seconds), using default (%u seconds)\n", > timeout, WATCHDOG_TIMEOUT); > > - platform_set_drvdata(pdev, wdd); > + dev_set_drvdata(dev, wdd); > > return watchdog_register_device(wdd); > } > > -static int ebc_c384_wdt_remove(struct platform_device *pdev) > +static int ebc_c384_wdt_remove(struct device *dev, unsigned int id) > { > - struct watchdog_device *wdd = platform_get_drvdata(pdev); > + struct watchdog_device *wdd = dev_get_drvdata(dev); > > watchdog_unregister_device(wdd); > > return 0; > } > > -static struct platform_driver ebc_c384_wdt_driver = { > +static struct isa_driver ebc_c384_wdt_driver = { > + .probe = ebc_c384_wdt_probe, > .driver = { > .name = MODULE_NAME > }, > .remove = ebc_c384_wdt_remove > }; > > -static struct platform_device *ebc_c384_wdt_device; > - > static int __init ebc_c384_wdt_init(void) > { > - int err; > - > if (!dmi_match(DMI_BOARD_NAME, "EBC-C384 SBC")) > return -ENODEV; > > - ebc_c384_wdt_device = platform_device_alloc(MODULE_NAME, -1); > - if (!ebc_c384_wdt_device) > - return -ENOMEM; > - > - err = platform_device_add(ebc_c384_wdt_device); > - if (err) > - goto err_platform_device; > - > - err = platform_driver_probe(&ebc_c384_wdt_driver, ebc_c384_wdt_probe); > - if (err) > - goto err_platform_driver; > - > - return 0; > - > -err_platform_driver: > - platform_device_del(ebc_c384_wdt_device); > -err_platform_device: > - platform_device_put(ebc_c384_wdt_device); > - return err; > + return isa_register_driver(&ebc_c384_wdt_driver, 1); > } > > static void __exit ebc_c384_wdt_exit(void) > { > - platform_device_unregister(ebc_c384_wdt_device); > - platform_driver_unregister(&ebc_c384_wdt_driver); > + isa_unregister_driver(&ebc_c384_wdt_driver); > } > > module_init(ebc_c384_wdt_init); > @@ -185,4 +162,4 @@ module_exit(ebc_c384_wdt_exit); > MODULE_AUTHOR("William Breathitt Gray <vilhelm.gray@gmail.com>"); > MODULE_DESCRIPTION("WinSystems EBC-C384 watchdog timer driver"); > MODULE_LICENSE("GPL v2"); > -MODULE_ALIAS("platform:" MODULE_NAME); > +MODULE_ALIAS("isa:" MODULE_NAME); > -- > 2.7.3 > -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Apr 07, 2016 at 05:35:35PM -0700, Guenter Roeck wrote: >I am a bit concerend that the newly introduced ISA_BUS is not automatically >enabled. Effectively this means that all drivers depending on it will >be disabled until someone enables ISA_BUS in the distribution. > >Is this a concern for anyone but me ? > >Anyway, since you are the driver maintainer, I assume that you are ok >with it, so > >Acked-by: Guenter Roeck <linux@roeck-us.net> > >Side note for Wim: ISA_BUS was introduced with commit b3c1be1b789c >("base: isa: Remove X86_32 dependency") in -next. > >Guenter Since the ISA bus lacks standardized probing functionality, and the majority of ISA devices I've encountered expect the user to start writing to the device's I/O port addresses from the get-go, I think ISA_BUS should remain an explicit dependency rather than become selected when a user chooses a driver. That is to say, it is more appropriate for a user to explicitly enable ISA_BUS if their system has an ISA bus; otherwise a user may enable a driver with the expectation of a device probe, whereas the driver will simply start writing to I/O port addresses unexpectedly. William Breathitt Gray -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/07/2016 10:47 AM, William Breathitt Gray wrote: > The WinSystems EBC-C384 watchdog timer is controlled via ISA bus > communication. As such, the ISA bus driver is more appropriate than the > platform driver for the WinSystems EBC-C384 watchdog timer driver. > > Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com> Hey William, I'm seeing this on boot: kernel BUG at drivers/base/driver.c:153! invalid opcode: 0000 [#1] PREEMPT SMP KASAN Modules linked in: CPU: 1 PID: 1 Comm: swapper/0 Not tainted 4.6.0-rc7-next-20160511-sasha-00024-g13dfe33 #3081 task: ffff88005b2f8000 ti: ffff88005b300000 task.ti: ffff88005b300000 RIP: driver_register (drivers/base/driver.c:153 (discriminator 1)) RSP: 0000:ffff88005b307c68 EFLAGS: 00010282 RAX: 0000000000000000 RBX: ffffffffb3987c30 RCX: 1ffffffff68acf26 RDX: 0000000000000000 RSI: dffffc0000000000 RDI: ffffffffb4567930 RBP: ffff88005b307c88 R08: 1ffffffff606e3dc R09: dffffc0000000000 R10: 0000000080000000 R11: 1ffffffff79c42e2 R12: ffffffffb45678a0 R13: ffffffffb3987c38 R14: ffffffffb3987c30 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff880063e40000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 0000000030023000 CR4: 00000000000406a0 Stack: 1ffff1000b660fa4 dffffc0000000000 0000000000000000 ffffffffb3987c00 ffff88005b307cf0 ffffffffa5bf826d ffff88005b307dc0 ffffffffb3987c30 ffffffffb3987ca8 ffffffffb39847e0 ffffffffb39847e0 00000000f673090a Call Trace: isa_register_driver (drivers/base/isa.c:123) dio48e_driver_init (drivers/gpio/gpio-104-dio-48e.c:396) do_one_initcall (init/main.c:770) kernel_init_freeable (init/main.c:834 init/main.c:843 init/main.c:861 init/main.c:1008) kernel_init (init/main.c:936) ret_from_fork (arch/x86/entry/entry_64.S:390) Code: be 00 00 00 00 00 fc ff df 48 89 f9 48 c1 e9 03 80 3c 31 00 74 05 e8 4a 18 be fd 49 83 bc 24 90 00 00 00 00 75 13 e8 2a 89 a0 fd <0f> 0b 48 c7 c7 40 21 51 b4 e8 6f 78 58 ff e8 17 89 a0 fd 49 8d All code ======== 0: be 00 00 00 00 mov $0x0,%esi 5: 00 fc add %bh,%ah 7: ff df lcallq *<internal disassembler error> 9: 48 89 f9 mov %rdi,%rcx c: 48 c1 e9 03 shr $0x3,%rcx 10: 80 3c 31 00 cmpb $0x0,(%rcx,%rsi,1) 14: 74 05 je 0x1b 16: e8 4a 18 be fd callq 0xfffffffffdbe1865 1b: 49 83 bc 24 90 00 00 cmpq $0x0,0x90(%r12) 22: 00 00 24: 75 13 jne 0x39 26: e8 2a 89 a0 fd callq 0xfffffffffda08955 2b:* 0f 0b ud2 <-- trapping instruction 2d: 48 c7 c7 40 21 51 b4 mov $0xffffffffb4512140,%rdi 34: e8 6f 78 58 ff callq 0xffffffffff5878a8 39: e8 17 89 a0 fd callq 0xfffffffffda08955 3e: 49 8d 00 lea (%r8),%rax Code starting with the faulting instruction =========================================== 0: 0f 0b ud2 2: 48 c7 c7 40 21 51 b4 mov $0xffffffffb4512140,%rdi 9: e8 6f 78 58 ff callq 0xffffffffff58787d e: e8 17 89 a0 fd callq 0xfffffffffda0892a 13: 49 8d 00 lea (%r8),%rax RIP driver_register (drivers/base/driver.c:153 (discriminator 1)) RSP <ffff88005b307c68> ---[ end trace 96103422392be10c ]--- -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, May 11, 2016 at 01:04:34PM -0400, Sasha Levin wrote: >On 04/07/2016 10:47 AM, William Breathitt Gray wrote: >> The WinSystems EBC-C384 watchdog timer is controlled via ISA bus >> communication. As such, the ISA bus driver is more appropriate than the >> platform driver for the WinSystems EBC-C384 watchdog timer driver. >> >> Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com> > >Hey William, > >I'm seeing this on boot: > >kernel BUG at drivers/base/driver.c:153! >invalid opcode: 0000 [#1] PREEMPT SMP KASAN >Modules linked in: >CPU: 1 PID: 1 Comm: swapper/0 Not tainted 4.6.0-rc7-next-20160511-sasha-00024-g13dfe33 #3081 >task: ffff88005b2f8000 ti: ffff88005b300000 task.ti: ffff88005b300000 >RIP: driver_register (drivers/base/driver.c:153 (discriminator 1)) >RSP: 0000:ffff88005b307c68 EFLAGS: 00010282 >RAX: 0000000000000000 RBX: ffffffffb3987c30 RCX: 1ffffffff68acf26 >RDX: 0000000000000000 RSI: dffffc0000000000 RDI: ffffffffb4567930 >RBP: ffff88005b307c88 R08: 1ffffffff606e3dc R09: dffffc0000000000 >R10: 0000000080000000 R11: 1ffffffff79c42e2 R12: ffffffffb45678a0 >R13: ffffffffb3987c38 R14: ffffffffb3987c30 R15: 0000000000000000 >FS: 0000000000000000(0000) GS:ffff880063e40000(0000) knlGS:0000000000000000 >CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >CR2: 0000000000000000 CR3: 0000000030023000 CR4: 00000000000406a0 >Stack: >1ffff1000b660fa4 dffffc0000000000 0000000000000000 ffffffffb3987c00 >ffff88005b307cf0 ffffffffa5bf826d ffff88005b307dc0 ffffffffb3987c30 >ffffffffb3987ca8 ffffffffb39847e0 ffffffffb39847e0 00000000f673090a >Call Trace: >isa_register_driver (drivers/base/isa.c:123) >dio48e_driver_init (drivers/gpio/gpio-104-dio-48e.c:396) >do_one_initcall (init/main.c:770) >kernel_init_freeable (init/main.c:834 init/main.c:843 init/main.c:861 init/main.c:1008) >kernel_init (init/main.c:936) >ret_from_fork (arch/x86/entry/entry_64.S:390) >Code: be 00 00 00 00 00 fc ff df 48 89 f9 48 c1 e9 03 80 3c 31 00 74 05 e8 4a 18 be fd 49 83 bc 24 90 00 00 00 00 75 13 e8 2a 89 a0 fd <0f> 0b 48 c7 c7 40 21 51 b4 e8 6f 78 58 ff e8 17 89 a0 fd 49 8d >All code >======== > 0: be 00 00 00 00 mov $0x0,%esi > 5: 00 fc add %bh,%ah > 7: ff df lcallq *<internal disassembler error> > 9: 48 89 f9 mov %rdi,%rcx > c: 48 c1 e9 03 shr $0x3,%rcx > 10: 80 3c 31 00 cmpb $0x0,(%rcx,%rsi,1) > 14: 74 05 je 0x1b > 16: e8 4a 18 be fd callq 0xfffffffffdbe1865 > 1b: 49 83 bc 24 90 00 00 cmpq $0x0,0x90(%r12) > 22: 00 00 > 24: 75 13 jne 0x39 > 26: e8 2a 89 a0 fd callq 0xfffffffffda08955 > 2b:* 0f 0b ud2 <-- trapping instruction > 2d: 48 c7 c7 40 21 51 b4 mov $0xffffffffb4512140,%rdi > 34: e8 6f 78 58 ff callq 0xffffffffff5878a8 > 39: e8 17 89 a0 fd callq 0xfffffffffda08955 > 3e: 49 8d 00 lea (%r8),%rax > >Code starting with the faulting instruction >=========================================== > 0: 0f 0b ud2 > 2: 48 c7 c7 40 21 51 b4 mov $0xffffffffb4512140,%rdi > 9: e8 6f 78 58 ff callq 0xffffffffff58787d > e: e8 17 89 a0 fd callq 0xfffffffffda0892a > 13: 49 8d 00 lea (%r8),%rax >RIP driver_register (drivers/base/driver.c:153 (discriminator 1)) >RSP <ffff88005b307c68> >---[ end trace 96103422392be10c ]--- Hi Sasha, I believe this bug arose from a BUG_ON inside driver_register (specifically line 153 of drivers/base/driver.c): BUG_ON(!drv->bus->p) The 'p' member of the struct bus_type has not been initialized by the time driver_register was called for the gpio-104-dio-48e driver. This member is typically initialized by bus_register, which is called inside isa_bus_init (drivers/base/isa.c). The isa_bus_init function address is set to be called by the device_initcall macro. This causes a race condition between the isa_bus_init function and isa drivers init functions (which use module_init). I believe this can be resolved by changing device_initcall to postcore_initcall, thus ensuring that isa_bus_init is called before any isa drivers are registered. I will implement a fix and test it out, then submit the patch if I don't encounter any errors. Thanks, William Breathitt Gray -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index fb94765..b10761d 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -738,7 +738,7 @@ config ALIM7101_WDT config EBC_C384_WDT tristate "WinSystems EBC-C384 Watchdog Timer" - depends on X86 + depends on X86 && ISA_BUS select WATCHDOG_CORE help Enables watchdog timer support for the watchdog timer on the diff --git a/drivers/watchdog/ebc-c384_wdt.c b/drivers/watchdog/ebc-c384_wdt.c index 77fda0b..4b849b8 100644 --- a/drivers/watchdog/ebc-c384_wdt.c +++ b/drivers/watchdog/ebc-c384_wdt.c @@ -16,10 +16,10 @@ #include <linux/errno.h> #include <linux/io.h> #include <linux/ioport.h> +#include <linux/isa.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/moduleparam.h> -#include <linux/platform_device.h> #include <linux/types.h> #include <linux/watchdog.h> @@ -95,9 +95,8 @@ static const struct watchdog_info ebc_c384_wdt_info = { .identity = MODULE_NAME }; -static int __init ebc_c384_wdt_probe(struct platform_device *pdev) +static int ebc_c384_wdt_probe(struct device *dev, unsigned int id) { - struct device *dev = &pdev->dev; struct watchdog_device *wdd; if (!devm_request_region(dev, BASE_ADDR, ADDR_EXTENT, dev_name(dev))) { @@ -122,61 +121,39 @@ static int __init ebc_c384_wdt_probe(struct platform_device *pdev) dev_warn(dev, "Invalid timeout (%u seconds), using default (%u seconds)\n", timeout, WATCHDOG_TIMEOUT); - platform_set_drvdata(pdev, wdd); + dev_set_drvdata(dev, wdd); return watchdog_register_device(wdd); } -static int ebc_c384_wdt_remove(struct platform_device *pdev) +static int ebc_c384_wdt_remove(struct device *dev, unsigned int id) { - struct watchdog_device *wdd = platform_get_drvdata(pdev); + struct watchdog_device *wdd = dev_get_drvdata(dev); watchdog_unregister_device(wdd); return 0; } -static struct platform_driver ebc_c384_wdt_driver = { +static struct isa_driver ebc_c384_wdt_driver = { + .probe = ebc_c384_wdt_probe, .driver = { .name = MODULE_NAME }, .remove = ebc_c384_wdt_remove }; -static struct platform_device *ebc_c384_wdt_device; - static int __init ebc_c384_wdt_init(void) { - int err; - if (!dmi_match(DMI_BOARD_NAME, "EBC-C384 SBC")) return -ENODEV; - ebc_c384_wdt_device = platform_device_alloc(MODULE_NAME, -1); - if (!ebc_c384_wdt_device) - return -ENOMEM; - - err = platform_device_add(ebc_c384_wdt_device); - if (err) - goto err_platform_device; - - err = platform_driver_probe(&ebc_c384_wdt_driver, ebc_c384_wdt_probe); - if (err) - goto err_platform_driver; - - return 0; - -err_platform_driver: - platform_device_del(ebc_c384_wdt_device); -err_platform_device: - platform_device_put(ebc_c384_wdt_device); - return err; + return isa_register_driver(&ebc_c384_wdt_driver, 1); } static void __exit ebc_c384_wdt_exit(void) { - platform_device_unregister(ebc_c384_wdt_device); - platform_driver_unregister(&ebc_c384_wdt_driver); + isa_unregister_driver(&ebc_c384_wdt_driver); } module_init(ebc_c384_wdt_init); @@ -185,4 +162,4 @@ module_exit(ebc_c384_wdt_exit); MODULE_AUTHOR("William Breathitt Gray <vilhelm.gray@gmail.com>"); MODULE_DESCRIPTION("WinSystems EBC-C384 watchdog timer driver"); MODULE_LICENSE("GPL v2"); -MODULE_ALIAS("platform:" MODULE_NAME); +MODULE_ALIAS("isa:" MODULE_NAME);
The WinSystems EBC-C384 watchdog timer is controlled via ISA bus communication. As such, the ISA bus driver is more appropriate than the platform driver for the WinSystems EBC-C384 watchdog timer driver. Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com> --- drivers/watchdog/Kconfig | 2 +- drivers/watchdog/ebc-c384_wdt.c | 43 ++++++++++------------------------------- 2 files changed, 11 insertions(+), 34 deletions(-)