| Message ID | 20241014-watchdog_sbc_ioport-v1-1-896ccf311839@linux.ibm.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | watchdog: Add HAS_IOPORT dependency for SBC8360 and SBC7240 | expand |
On 10/14/24 04:25, Niklas Schnelle wrote: > Both drivers use I/O port accesses without declaring a dependency on > CONFIG_HAS_IOPORT. For sbc8360_wdt this causes a compile error on UML > once inb()/outb() helpers become conditional. > > For sbc7240_wdt this causes no such errors with UML because this driver > depends on both x86_32 and !UML. Nevertheless add HAS_IOPORT as > a dependency for both drivers to be explicit and drop the !UML > dependency for sbc7240_wdt as it is now redundant since UML implies no > HAS_IOPORT. > > Fixes: 52df67b6b313 ("watchdog: add HAS_IOPORT dependencies") > Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
On Mon, Oct 14, 2024, at 11:25, Niklas Schnelle wrote: > Both drivers use I/O port accesses without declaring a dependency on > CONFIG_HAS_IOPORT. For sbc8360_wdt this causes a compile error on UML > once inb()/outb() helpers become conditional. > > For sbc7240_wdt this causes no such errors with UML because this driver > depends on both x86_32 and !UML. Nevertheless add HAS_IOPORT as > a dependency for both drivers to be explicit and drop the !UML > dependency for sbc7240_wdt as it is now redundant since UML implies no > HAS_IOPORT. > > Fixes: 52df67b6b313 ("watchdog: add HAS_IOPORT dependencies") > Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com> I applied this to the asm-generic tree as well now, seeing that it was not part of the HAS_IOPORT series but is required for UML. Arnd
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 684b9fe84fff5b08a35693aefa57db135196b909..94c96bcfefe34778588febba935664158840aae7 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1509,7 +1509,7 @@ config 60XX_WDT config SBC8360_WDT tristate "SBC8360 Watchdog Timer" - depends on X86_32 + depends on X86_32 && HAS_IOPORT help This is the driver for the hardware watchdog on the SBC8360 Single @@ -1522,7 +1522,7 @@ config SBC8360_WDT config SBC7240_WDT tristate "SBC Nano 7240 Watchdog Timer" - depends on X86_32 && !UML + depends on X86_32 && HAS_IOPORT help This is the driver for the hardware watchdog found on the IEI single board computers EPIC Nano 7240 (and likely others). This
Both drivers use I/O port accesses without declaring a dependency on CONFIG_HAS_IOPORT. For sbc8360_wdt this causes a compile error on UML once inb()/outb() helpers become conditional. For sbc7240_wdt this causes no such errors with UML because this driver depends on both x86_32 and !UML. Nevertheless add HAS_IOPORT as a dependency for both drivers to be explicit and drop the !UML dependency for sbc7240_wdt as it is now redundant since UML implies no HAS_IOPORT. Fixes: 52df67b6b313 ("watchdog: add HAS_IOPORT dependencies") Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com> --- drivers/watchdog/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- base-commit: 8e929cb546ee42c9a61d24fae60605e9e3192354 change-id: 20241014-watchdog_sbc_ioport-db203694de46 Best regards,