Kconfig: Introduce HAS_IOPORT config option
Subsystems (72)
v3 cover Kconfig: Introduce HAS_IOPORT config option
Hello Kernel Hackers,
Some platforms such as s390 do not support PCI I/O spaces. On such platforms I/O space accessors like inb()/outb() are stubs that can never actually work. The way these stubs are implemented in asm-generic/io.h leads to compiler warnings because any use will be a NULL pointer access on these platforms. In a previous patch we tried handling this with a run-time warning on access. This approach however was rejected by Linus[0] with the argument that this really should be a compile-time check and, though a much more invasive change, we believe that is indeed the right approach.
This patch series aims to do exactly that by introducing a HAS_IOPORT config option akin to the existing HAS_IOMEM. When this is unset inb()/outb() and friends may not be defined. This is also the same approach originally planned by Uwe Kleine-König as mentioned in commit ce816fa88cca ("Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP").
This series builds heavily on an original patch for demonstating the concept by Arnd Bergmann[1] and incoporates feedback of previous RFC versions [2] and [3].
This version is based on v6.3-rc1 and is also available on my kernel.org tree in the has_ioport_v3 branch with the PGP signed tag has_ioport_v3_signed:
https://git.kernel.org/pub/scm/linux/kernel/git/niks/linux.git
Thanks,
Niklas Schnelle
Changes from RFC v2:
- Rebased on v6.3-rc1
- Fixed a NULL pointer dereference in set_io_from_upio() due to accidentially expanded #ifdef CONFIG_SERIAL_8250_RT288X (kernel test robot)
- Dropped "ACPI: add dependency on HAS_IOPORT" (Bjorn Helgaas)
- Reworded commit message and moved ifdefs for "PCI/sysfs: Make I/O resource depend on HAS_IOPORT" (Bjorn Helgaas)
- Instead of complete removal inb() etc. are marked with __compiletime_error() when HAS_IOPORT is unset allowing for better error reporting (Ahmad Fatoum)
- Removed HAS_IOPORT dependency from PCMCIA as I/O port use is optional in at least PC Card. Instead added HAS_IOPORT on a per driver basis. (Bjorn Helgaas)
- Made uhci_has_pci_registers() constant 0 if HAS_IOPORT is not defined (Alan Stern)
Changes from RFC v1:
- Completely dropped the LEGACY_PCI option and replaced its dependencies with HAS_IOPORT as appropriate
- In the usb subsystem patch I incorporated the feedback from v1 by Alan Stern:
- Used a local macro to nop in*()/out*() in the helpers
- Removed an unnecessary further restriction on CONFIG_USB_UHCI_HCD
- Added a few more subsystems including wireless, ptp, and, mISDN that I had previously missed due to a blanket !S390.
- Removed blanket !S390 dependencies where they are added due to the I/O port problem
- In the sound system SND_OPL3_LIB needed to use "depends on" instead of "select" because of its added HAS_IOPORT dependency
- In the drm subsystem the bochs driver gets #ifdefs instead of a blanket dependency because its MMIO capable device variant should work without HAS_IOPORT.
[0] https://lore.kernel.org/lkml/CAHk-=wg80je=K7madF4e7WrRNp37e3qh6y10Svhdc7O8SZ_-8g@mail.gmail.com/
[1] https://lore.kernel.org/lkml/CAK8P3a0MNbx-iuzW_-=0ab6-TTZzwV-PT_6gAC1Gp5PgYyHcrA@mail.gmail.com/
[2] https://yhbt.net/lore/all/[email protected]/
[3] https://lore.kernel.org/all/[email protected]/
Niklas Schnelle (38):
Kconfig: introduce HAS_IOPORT option and select it as necessary
ata: add HAS_IOPORT dependencies
char: impi, tpm: depend on HAS_IOPORT
comedi: add HAS_IOPORT dependencies
counter: add HAS_IOPORT dependencies
/dev/port: don't compile file operations without CONFIG_DEVPORT
drm: handle HAS_IOPORT dependencies
firmware: dmi-sysfs: handle HAS_IOPORT=n
gpio: add HAS_IOPORT dependencies
hwmon: add HAS_IOPORT dependencies
i2c: add HAS_IOPORT dependencies
iio: ad7606: Kconfig: add HAS_IOPORT dependencies
Input: add HAS_IOPORT dependencies
Input: gameport: add ISA and HAS_IOPORT dependencies
leds: add HAS_IOPORT dependencies
media: add HAS_IOPORT dependencies
misc: add HAS_IOPORT dependencies
mISDN: add HAS_IOPORT dependencies
mpt fusion: add HAS_IOPORT dependencies
net: handle HAS_IOPORT dependencies
parport: PC style parport depends on HAS_IOPORT
PCI: Make quirk using inw() depend on HAS_IOPORT PCI/sysfs: Make I/O resource depend on HAS_IOPORT
pcmcia: add HAS_IOPORT dependencies
platform: add HAS_IOPORT dependencies
pnp: add HAS_IOPORT dependencies
power: add HAS_IOPORT dependencies
rtc: add HAS_IOPORT dependencies
scsi: add HAS_IOPORT dependencies
sound: add HAS_IOPORT dependencies
speakup: add HAS_IOPORT dependency for SPEAKUP_SERIALIO
staging: add HAS_IOPORT dependencies
tty: serial: handle HAS_IOPORT dependencies
usb: handle HAS_IOPORT dependencies
video: handle HAS_IOPORT dependencies
watchdog: add HAS_IOPORT dependencies
wireless: add HAS_IOPORT dependencies asm-generic/io.h: drop inb() etc for HAS_IOPORT=n
arch/alpha/Kconfig | 1 + arch/arm/Kconfig | 1 + arch/arm64/Kconfig | 1 + arch/ia64/Kconfig | 1 + arch/m68k/Kconfig | 1 + arch/microblaze/Kconfig | 1 + arch/mips/Kconfig | 2 + arch/parisc/Kconfig | 2 + arch/powerpc/Kconfig | 2 +- arch/riscv/Kconfig | 1 + arch/sh/Kconfig | 1 + arch/sparc/Kconfig | 1 + arch/um/Kconfig | 1 + arch/x86/Kconfig | 2 + drivers/accessibility/speakup/Kconfig | 1 + drivers/ata/Kconfig | 1 + drivers/bus/Kconfig | 2 +- drivers/char/Kconfig | 3 +- drivers/char/ipmi/Makefile | 11 +- drivers/char/ipmi/ipmi_si_intf.c | 3 +- drivers/char/ipmi/ipmi_si_pci.c | 3 + drivers/char/mem.c | 6 +- drivers/char/pcmcia/Kconfig | 8 +- drivers/char/tpm/Kconfig | 1 + drivers/char/tpm/tpm_infineon.c | 14 ++- drivers/char/tpm/tpm_tis_core.c | 19 ++- drivers/comedi/Kconfig | 103 +++++++++------ drivers/counter/Kconfig | 1 + drivers/eisa/Kconfig | 1 + drivers/firmware/dmi-sysfs.c | 4 + drivers/gpio/Kconfig | 2 +- drivers/gpu/drm/qxl/Kconfig | 1 + drivers/gpu/drm/tiny/bochs.c | 19 +++ drivers/gpu/drm/tiny/cirrus.c | 2 + drivers/hwmon/Kconfig | 21 +++- drivers/i2c/busses/Kconfig | 31 ++--- drivers/iio/adc/Kconfig | 2 +- drivers/input/gameport/Kconfig | 4 +- drivers/input/serio/Kconfig | 2 + drivers/input/touchscreen/Kconfig | 1 + drivers/isdn/Kconfig | 1 - drivers/isdn/hardware/mISDN/Kconfig | 12 +- drivers/leds/Kconfig | 2 +- drivers/media/pci/dm1105/Kconfig | 2 +- drivers/media/radio/Kconfig | 14 ++- drivers/media/rc/Kconfig | 6 + drivers/message/fusion/Kconfig | 2 +- drivers/misc/altera-stapl/Makefile | 3 +- drivers/misc/altera-stapl/altera.c | 6 +- drivers/net/Kconfig | 2 +- drivers/net/arcnet/Kconfig | 2 +- drivers/net/can/cc770/Kconfig | 1 + drivers/net/can/sja1000/Kconfig | 1 + drivers/net/ethernet/3com/Kconfig | 4 +- drivers/net/ethernet/8390/Kconfig | 6 +- drivers/net/ethernet/amd/Kconfig | 4 +- drivers/net/ethernet/fujitsu/Kconfig | 2 +- drivers/net/ethernet/intel/Kconfig | 2 +- drivers/net/ethernet/sis/Kconfig | 4 +- drivers/net/ethernet/smsc/Kconfig | 2 +- drivers/net/ethernet/ti/Kconfig | 2 +- drivers/net/ethernet/via/Kconfig | 1 + drivers/net/ethernet/xircom/Kconfig | 2 +- drivers/net/fddi/Kconfig | 2 +- drivers/net/fddi/defxx.c | 2 +- drivers/net/hamradio/Kconfig | 6 +- drivers/net/wan/Kconfig | 2 +- drivers/net/wireless/atmel/Kconfig | 2 +- drivers/net/wireless/intersil/hostap/Kconfig | 2 +- drivers/parport/Kconfig | 4 +- drivers/pci/pci-sysfs.c | 4 + drivers/pci/quirks.c | 2 + drivers/pcmcia/Kconfig | 5 +- drivers/platform/chrome/Kconfig | 1 + drivers/platform/chrome/wilco_ec/Kconfig | 1 + drivers/pnp/isapnp/Kconfig | 2 +- drivers/power/reset/Kconfig | 1 + drivers/rtc/Kconfig | 4 +- drivers/scsi/Kconfig | 25 ++-- drivers/scsi/aic7xxx/Kconfig.aic79xx | 2 +- drivers/scsi/aic7xxx/Kconfig.aic7xxx | 2 +- drivers/scsi/aic94xx/Kconfig | 2 +- drivers/scsi/megaraid/Kconfig.megaraid | 6 +- drivers/scsi/mvsas/Kconfig | 2 +- drivers/scsi/pcmcia/Kconfig | 6 +- drivers/scsi/qla2xxx/Kconfig | 2 +- drivers/staging/sm750fb/Kconfig | 2 +- drivers/staging/vt6655/Kconfig | 2 +- drivers/tty/Kconfig | 2 +- drivers/tty/serial/8250/8250_early.c | 4 + drivers/tty/serial/8250/8250_pci.c | 14 +++ drivers/tty/serial/8250/8250_port.c | 44 +++++-- drivers/tty/serial/8250/Kconfig | 5 +- drivers/tty/serial/Kconfig | 2 +- drivers/usb/core/hcd-pci.c | 2 + drivers/usb/host/Kconfig | 4 +- drivers/usb/host/pci-quirks.c | 125 ++++++++++--------- drivers/usb/host/pci-quirks.h | 31 +++-- drivers/usb/host/uhci-hcd.c | 2 +- drivers/usb/host/uhci-hcd.h | 36 ++++-- drivers/video/console/Kconfig | 1 + drivers/video/fbdev/Kconfig | 25 ++-- drivers/watchdog/Kconfig | 6 +- include/asm-generic/io.h | 60 +++++++++ include/linux/gameport.h | 9 +- include/linux/parport.h | 2 +- include/video/vga.h | 8 ++ lib/Kconfig | 4 + lib/Kconfig.kgdb | 3 +- net/ax25/Kconfig | 2 +- sound/drivers/Kconfig | 3 + sound/isa/Kconfig | 31 ++++- sound/pci/Kconfig | 45 +++++-- sound/pcmcia/Kconfig | 2 + 114 files changed, 649 insertions(+), 281 deletions(-)
base-commit: eeac8ede17557680855031c6f305ece2378af326
Signature · 7 lines
2.37.2 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v3 1/38 Kconfig: introduce HAS_IOPORT option and select it as necessary
We introduce a new HAS_IOPORT Kconfig option to indicate support for I/O Port access. In a future patch HAS_IOPORT=n will disable compilation of the I/O accessor functions inb()/outb() and friends on architectures which can not meaningfully support legacy I/O spaces such as s390. Also add dependencies on HAS_IOPORT for the ISA and HAVE_EISA config options as these busses always go along with HAS_IOPORT.
The "depends on" relations on HAS_IOPORT in drivers as well as ifdefs for HAS_IOPORT specific sections will be added in subsequent patches on a per subsystem basis.
--- arch/alpha/Kconfig | 1 + arch/arm/Kconfig | 1 + arch/arm64/Kconfig | 1 + arch/ia64/Kconfig | 1 + arch/m68k/Kconfig | 1 + arch/microblaze/Kconfig | 1 + arch/mips/Kconfig | 2 ++ arch/parisc/Kconfig | 2 ++ arch/powerpc/Kconfig | 2 +- arch/riscv/Kconfig | 1 + arch/sh/Kconfig | 1 + arch/sparc/Kconfig | 1 + arch/um/Kconfig | 1 + arch/x86/Kconfig | 2 ++ drivers/bus/Kconfig | 2 +- drivers/eisa/Kconfig | 1 + lib/Kconfig | 4 ++++ lib/Kconfig.kgdb | 3 ++- 18 files changed, 25 insertions(+), 3 deletions(-)
arch/alpha/Kconfig +1 -0
@@ -27,6 +27,7 @@ config ALPHA select AUDIT_ARCH select GENERIC_CPU_VULNERABILITIES select GENERIC_SMP_IDLE_THREAD + select HAS_IOPORT select HAVE_ARCH_AUDITSYSCALL select HAVE_MOD_ARCH_SPECIFIC select MODULES_USE_ELF_RELA
arch/arm/Kconfig +1 -0
@@ -70,6 +70,7 @@ config ARM select GENERIC_SCHED_CLOCK select GENERIC_SMP_IDLE_THREAD select HARDIRQS_SW_RESEND + select HAS_IOPORT select HAVE_ARCH_AUDITSYSCALL if AEABI && !OABI_COMPAT select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6 select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU
arch/arm64/Kconfig +1 -0
@@ -145,6 +145,7 @@ config ARM64 select GENERIC_GETTIMEOFDAY select GENERIC_VDSO_TIME_NS select HARDIRQS_SW_RESEND + select HAS_IOPORT select HAVE_MOVE_PMD select HAVE_MOVE_PUD select HAVE_PCI
arch/ia64/Kconfig +1 -0
@@ -25,6 +25,7 @@ config IA64 select PCI_DOMAINS if PCI select PCI_MSI select PCI_SYSCALL if PCI + select HAS_IOPORT select HAVE_ASM_MODVERSIONS select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_EXIT_THREAD
arch/m68k/Kconfig +1 -0
@@ -18,6 +18,7 @@ config M68K select GENERIC_CPU_DEVICES select GENERIC_IOMAP select GENERIC_IRQ_SHOW + select HAS_IOPORT if PCI || ISA || ATARI_ROM_ISA select HAVE_ARCH_SECCOMP select HAVE_ARCH_SECCOMP_FILTER select HAVE_ASM_MODVERSIONS
arch/microblaze/Kconfig +1 -0
@@ -21,6 +21,7 @@ config MICROBLAZE select GENERIC_IRQ_SHOW select GENERIC_PCI_IOMAP select GENERIC_SCHED_CLOCK + select HAS_IOPORT if PCI select HAVE_ARCH_HASH select HAVE_ARCH_KGDB select HAVE_ARCH_SECCOMP
arch/mips/Kconfig +2 -0
@@ -47,6 +47,7 @@ config MIPS select GENERIC_SMP_IDLE_THREAD select GENERIC_TIME_VSYSCALL select GUP_GET_PXX_LOW_HIGH if CPU_MIPS32 && PHYS_ADDR_T_64BIT + select HAS_IOPORT if !NO_IOPORT_MAP select HAVE_ARCH_COMPILER_H select HAVE_ARCH_JUMP_LABEL select HAVE_ARCH_KGDB if MIPS_FP_SUPPORT
@@ -3120,6 +3121,7 @@ config PCI_DRIVERS_LEGACY # users to choose the right thing ... # config ISA + depends on HAS_IOPORT bool config TC
arch/parisc/Kconfig +2 -0
@@ -47,6 +47,7 @@ config PARISC select MODULES_USE_ELF_RELA select CLONE_BACKWARDS select TTY # Needed for pdc_cons.c + select HAS_IOPORT if PCI select HAVE_DEBUG_STACKOVERFLOW select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_HASH
@@ -131,6 +132,7 @@ config STACKTRACE_SUPPORT config ISA_DMA_API bool + depends on HAS_IOPORT config ARCH_MAY_HAVE_PC_FDC bool
arch/powerpc/Kconfig +1 -1
@@ -188,6 +188,7 @@ config PPC select GENERIC_SMP_IDLE_THREAD select GENERIC_TIME_VSYSCALL select GENERIC_VDSO_TIME_NS + select HAS_IOPORT if PCI select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_HUGE_VMALLOC if HAVE_ARCH_HUGE_VMAP select HAVE_ARCH_HUGE_VMAP if PPC_RADIX_MMU || PPC_8xx
@@ -1070,7 +1071,6 @@ menu "Bus options" config ISA bool "Support for ISA-bus hardware" - depends on PPC_CHRP select PPC_I8259 help Find out whether you have ISA slots on your motherboard. ISA is the
arch/riscv/Kconfig +1 -0
@@ -74,6 +74,7 @@ config RISCV select GENERIC_TIME_VSYSCALL if MMU && 64BIT select GENERIC_VDSO_TIME_NS if HAVE_GENERIC_VDSO select HARDIRQS_SW_RESEND + select HAS_IOPORT if MMU select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_HUGE_VMALLOC if HAVE_ARCH_HUGE_VMAP select HAVE_ARCH_HUGE_VMAP if MMU && 64BIT && !XIP_KERNEL
arch/sh/Kconfig +1 -0
@@ -25,6 +25,7 @@ config SUPERH select GENERIC_SCHED_CLOCK select GENERIC_SMP_IDLE_THREAD select GUP_GET_PXX_LOW_HIGH if X2TLB + select HAS_IOPORT if HAS_IOPORT_MAP select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_KGDB select HAVE_ARCH_SECCOMP_FILTER
arch/sparc/Kconfig +1 -0
@@ -32,6 +32,7 @@ config SPARC select GENERIC_IRQ_SHOW select ARCH_WANT_IPC_PARSE_VERSION select GENERIC_PCI_IOMAP + select HAS_IOPORT select HAVE_NMI_WATCHDOG if SPARC64 select HAVE_CBPF_JIT if SPARC32 select HAVE_EBPF_JIT if SPARC64
arch/um/Kconfig +1 -0
@@ -56,6 +56,7 @@ config NO_IOPORT_MAP config ISA bool + depends on HAS_IOPORT config SBUS bool
arch/x86/Kconfig +2 -0
@@ -162,6 +162,7 @@ config X86 select GUP_GET_PXX_LOW_HIGH if X86_PAE select HARDIRQS_SW_RESEND select HARDLOCKUP_CHECK_TIMESTAMP if X86_64 + select HAS_IOPORT select HAVE_ACPI_APEI if ACPI select HAVE_ACPI_APEI_NMI if ACPI select HAVE_ALIGNED_STRUCT_PAGE if SLUB
@@ -2893,6 +2894,7 @@ if X86_32 config ISA bool "ISA support" + depends on HAS_IOPORT help Find out whether you have ISA slots on your motherboard. ISA is the name of a bus system, i.e. the way the CPU talks to the other stuff
drivers/bus/Kconfig +1 -1
@@ -81,7 +81,7 @@ config MOXTET config HISILICON_LPC bool "Support for ISA I/O space on HiSilicon Hip06/7" depends on (ARM64 && ARCH_HISI) || (COMPILE_TEST && !ALPHA && !HEXAGON && !PARISC) - depends on HAS_IOMEM + depends on HAS_IOPORT select INDIRECT_PIO if ARM64 help Driver to enable I/O access to devices attached to the Low Pin
drivers/eisa/Kconfig +1 -0
@@ -5,6 +5,7 @@ config HAVE_EISA bool + depends on HAS_IOPORT menuconfig EISA bool "EISA support"
lib/Kconfig +4 -0
@@ -92,6 +92,7 @@ config ARCH_USE_SYM_ANNOTATIONS config INDIRECT_PIO bool "Access I/O in non-MMIO mode" depends on ARM64 + depends on HAS_IOPORT help On some platforms where no separate I/O space exists, there are I/O hosts which can not be accessed in MMIO mode. Using the logical PIO
@@ -509,6 +510,9 @@ config HAS_IOMEM depends on !NO_IOMEM default y +config HAS_IOPORT + bool + config HAS_IOPORT_MAP bool depends on HAS_IOMEM && !NO_IOPORT_MAP
lib/Kconfig.kgdb +2 -1
@@ -121,7 +121,8 @@ config KDB_DEFAULT_ENABLE config KDB_KEYBOARD bool "KGDB_KDB: keyboard as input device" - depends on VT && KGDB_KDB && !PARISC + depends on HAS_IOPORT + depends on VT && KGDB_KDB default n help KDB can use a PS/2 type keyboard for an input device
Signature · 1 line
2.37.2
Re: [PATCH v3 01/38] Kconfig: introduce HAS_IOPORT option and select it as necessary
arch/um/Kconfig config NO_IOPORT_MAP · line 60
Quoted 8 lines · Niklas Schnelle
arch/um/Kconfig +1
-0@@ -56,6 +56,7 @@ config NO_IOPORT_MAP config ISA bool + depends on HAS_IOPORT
config ISA here is already unselectable, and nothing ever does "select ISA" (only in some other architectures), so is there much point in this?
I'm not even sure why this exists at all.
But anyway, adding a dependency to a always-false symbol doesn't make it less always-false :-)
Certainly will be nice to get rid of this cruft for architectures that don't have it.
johannes
Re: [PATCH v3 01/38] Kconfig: introduce HAS_IOPORT option and select it as necessary
Quoted 13 lines · Johannes Berg
arch/um/Kconfig config NO_IOPORT_MAP · line 60
Quoted 8 lines · Niklas Schnelle
arch/um/Kconfig +1
-0@@ -56,6 +56,7 @@ config NO_IOPORT_MAP config ISA bool + depends on HAS_IOPORTconfig ISA here is already unselectable, and nothing ever does "select ISA" (only in some other architectures), so is there much point in this?
Quoted 1 line
I'm not even sure why this exists at all.
You're right there's not much point and I dropped this for v4. I agree that probably the whole "config ISA" could be removed if it's always false anyway but that seems out of scope for this patch.
Quoted 5 lines
But anyway, adding a dependency to a always-false symbol doesn't make it less always-false :-)
Thanks
Quoted 6 lines
Certainly will be nice to get rid of this cruft for architectures that don't have it.
johannes
Yes, also, for s390 the broken NULL + port number access in the generic inb()/outb() currently causes the only remaining clang warning on defconfig builds.
Re: [PATCH v3 01/38] Kconfig: introduce HAS_IOPORT option and select it as necessary
In reply to Niklas SchnelleQuoted 7 lines · On Tue, Mar 14, 2023 at 1:13 PM Niklas Schnelle <[email protected]>…
We introduce a new
HAS_IOPORTKconfigoption to indicate support for I/O Port access. In a future patch HAS_IOPORT=n will disable compilation of the I/O accessor functions inb()/outb() and friends on architectures which can not meaningfully support legacy I/O spaces such as s390. Also add dependencies onHAS_IOPORTfor the ISA andHAVE_EISAconfig options as these busses always go along withHAS_IOPORT.
Quoted 8 lines
The "depends on" relations on
HAS_IOPORTin drivers as well as ifdefs forHAS_IOPORTspecific sections will be added in subsequent patches on a per subsystem basis.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>arch/m68k/Kconfig | 1 +
Gr{oetje,eeting}s,
Geert
Signature · 10 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Arnd Bergmann
maintainerRe: [PATCH v3 01/38] Kconfig: introduce HAS_IOPORT option and select it as necessary
In reply to Niklas SchnelleQuoted 10 lines · Niklas Schnelle
We introduce a new
HAS_IOPORTKconfigoption to indicate support for I/O Port access. In a future patch HAS_IOPORT=n will disable compilation of the I/O accessor functions inb()/outb() and friends on architectures which can not meaningfully support legacy I/O spaces such as s390. Also add dependencies onHAS_IOPORTfor the ISA andHAVE_EISAconfig options as these busses always go along withHAS_IOPORT.The "depends on" relations on
HAS_IOPORTin drivers as well as ifdefs forHAS_IOPORTspecific sections will be added in subsequent patches on a per subsystem basis.
I think it would be helpful to enumerate which architectures do not get HAS_IOPORT added, as they will be affected more.
Quoted 2 lines
Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>
If there are no objections, I could send this first patch for the asm-generic tree as a preparation for 6.3, so we are able to merge the other patches through subsystem maintainer tree for 6.4.
arch/loongarch/ will now also need to select HAS_IOPORT uncontitionally, this architecture was added after you sent v2.
arch/parisc/Kconfig config PARISC · line 50
Quoted 9 lines
arch/parisc/Kconfig +1
-0@@ -47,6 +47,7 @@ config PARISC select MODULES_USE_ELF_RELA select CLONE_BACKWARDS select TTY # Needed for pdc_cons.c + select HAS_IOPORT if PCI
It's also needed for EISA and I think you should select it from CONFIG_GSC in drivers/parisc/Kconfig for this purpose.
This could also be 'select HAS_IOPORT if PCI || EISA', but that would require removing the 'depends on HAS_IOPORT' under drivers/eisa/.
arch/parisc/Kconfig config STACKTRACE_SUPPORT · line 136
Quoted 9 lines
arch/parisc/Kconfig +1
-0select HAVE_DEBUG_STACKOVERFLOW select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_HASH@@ -131,6 +132,7 @@ config STACKTRACE_SUPPORT config ISA_DMA_API bool + depends on HAS_IOPORT
This line is not really needed since there is no way to enable ISA_DMA_API.
Quoted 13 lines
arch/powerpc/Kconfig +1
-0@@ -188,6 +188,7 @@ config PPC select GENERIC_SMP_IDLE_THREAD select GENERIC_TIME_VSYSCALL select GENERIC_VDSO_TIME_NS + select HAS_IOPORT if PCI select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_HUGE_VMALLOC if HAVE_ARCH_HUGE_VMAP select HAVE_ARCH_HUGE_VMAP if PPC_RADIX_MMU || PPC_8xx
arch/powerpc/Kconfig menu "Bus options" · line 1076
Quoted 7 lines
arch/powerpc/Kconfig +0
-1@@ -1070,7 +1071,6 @@ menu "Bus options" config ISA bool "Support for ISA-bus hardware" - depends on PPC_CHRP select PPC_I8259 help Find out whether you have ISA slots on your motherboard. ISA is the
This line looks wrong, I think we should keep that dependency. Did you get a circular dependency if you leave it in?
Quoted 13 lines
arch/x86/Kconfig +1
-0@@ -162,6 +162,7 @@ config X86 select GUP_GET_PXX_LOW_HIGH if X86_PAE select HARDIRQS_SW_RESEND select HARDLOCKUP_CHECK_TIMESTAMP if X86_64 + select HAS_IOPORT select HAVE_ACPI_APEI if ACPI select HAVE_ACPI_APEI_NMI if ACPI select HAVE_ALIGNED_STRUCT_PAGE if SLUB
arch/x86/Kconfig if X86_32 · line 2898
Quoted 5 lines
arch/x86/Kconfig +1
-0@@ -2893,6 +2894,7 @@ if X86_32 config ISA bool "ISA support" + depends on HAS_IOPORT help
HAS_IOPORT is selected unconditionally already, so this doesn't really do anything.
lib/Kconfig.kgdb config KDB_DEFAULT_ENABLE · line 126
Quoted 12 lines
lib/Kconfig.kgdb +2
-1@@ -121,7 +121,8 @@ config KDB_DEFAULT_ENABLE config KDB_KEYBOARD bool "KGDB_KDB: keyboard as input device" - depends on VT && KGDB_KDB && !PARISC + depends on HAS_IOPORT + depends on VT && KGDB_KDB default n
This loses the !PARISC dependency, which I don't think is intentional. The added HAS_IOPORT dependency makes sense here, but I think this should be in a different patch and not in the preparation.
Arnd
Re: [PATCH v3 01/38] Kconfig: introduce HAS_IOPORT option and select it as necessary
Quoted 18 lines · Arnd Bergmann
Quoted 10 lines · Niklas Schnelle
We introduce a new
HAS_IOPORTKconfigoption to indicate support for I/O Port access. In a future patch HAS_IOPORT=n will disable compilation of the I/O accessor functions inb()/outb() and friends on architectures which can not meaningfully support legacy I/O spaces such as s390. Also add dependencies onHAS_IOPORTfor the ISA andHAVE_EISAconfig options as these busses always go along withHAS_IOPORT.The "depends on" relations on
HAS_IOPORTin drivers as well as ifdefs forHAS_IOPORTspecific sections will be added in subsequent patches on a per subsystem basis.I think it would be helpful to enumerate which architectures do not get
HAS_IOPORTadded, as they will be affected more.Quoted 2 lines
Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>
Quoted 7 lines
If there are no objections, I could send this first patch for the asm-generic tree as a preparation for 6.3, so we are able to merge the other patches through subsystem maintainer tree for 6.4.
arch/loongarch/will now also need to selectHAS_IOPORTuncontitionally, this architecture was added after you sent v2.
Ah right. Added "select HAS_IOPORT" for LoongArch.
Quoted 14 lines
arch/parisc/Kconfig config PARISC · line 50
Quoted 10 lines
arch/parisc/Kconfig +1
-0@@ -47,6 +47,7 @@ config PARISC select MODULES_USE_ELF_RELA select CLONE_BACKWARDS select TTY # Needed for pdc_cons.c + select HAS_IOPORT if PCIIt's also needed for EISA and I think you should select it from
CONFIG_GSCindrivers/parisc/Kconfigfor this purpose.
Quoted 3 lines
This could also be 'select
HAS_IOPORTif PCI || EISA', but that would require removing the 'depends onHAS_IOPORT' underdrivers/eisa/.
I did use "select HAS_IOPORT if PCI || ISA || ATARI_ROM_ISA" in m68k so I think ideally we would handle both in the same way. I don't have a strong preference but I think the "select HAS_IOPORT if ..." puts it all in a single place which is nice. Also I think this would make it more similar architectures with unconditional HAS_IOPORT that thus don't need "depends on HAS_IOPORT" in their "config ISA" either. As also pointed by your comment below for x86. So will try to go this route.
Quoted 6 lines
Quoted 6 lines
arch/parisc/Kconfig +0
-0select HAVE_DEBUG_STACKOVERFLOW select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_HASH@@ -131,6 +132,7 @@ config STACKTRACE_SUPPORT
Quoted 7 lines
arch/parisc/Kconfig config STACKTRACE_SUPPORT · line 136
Quoted 4 lines
arch/parisc/Kconfig +1
-0config ISA_DMA_API bool + depends on HAS_IOPORTThis line is not really needed since there is no way to enable
ISA_DMA_API.
Removed
Quoted 15 lines
Quoted 15 lines
arch/powerpc/Kconfig +1
-0@@ -188,6 +188,7 @@ config PPC select GENERIC_SMP_IDLE_THREAD select GENERIC_TIME_VSYSCALL select GENERIC_VDSO_TIME_NS + select HAS_IOPORT if PCI select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_HUGE_VMALLOC if HAVE_ARCH_HUGE_VMAP select HAVE_ARCH_HUGE_VMAP if PPC_RADIX_MMU || PPC_8xx@@ -1070,7 +1071,6 @@ menu "Bus options"
Quoted 9 lines
arch/powerpc/Kconfig menu "Bus options" · line 1076
Quoted 6 lines
arch/powerpc/Kconfig +0
-1config ISA bool "Support for ISA-bus hardware" - depends on PPC_CHRP select PPC_I8259 help Find out whether you have ISA slots on your motherboard. ISA is theThis line looks wrong, I think we should keep that dependency. Did you get a circular dependency if you leave it in?
I don't recall why this was removed. I guess it happened when I was experimenting with adding "depends on HAS_IOPORT" for the ISA config options but that ultimately lead to circular dependencies, must have messed up when removing this here.
Quoted 15 lines
Quoted 15 lines
arch/x86/Kconfig +1
-0@@ -162,6 +162,7 @@ config X86 select GUP_GET_PXX_LOW_HIGH if X86_PAE select HARDIRQS_SW_RESEND select HARDLOCKUP_CHECK_TIMESTAMP if X86_64 + select HAS_IOPORT select HAVE_ACPI_APEI if ACPI select HAVE_ACPI_APEI_NMI if ACPI select HAVE_ALIGNED_STRUCT_PAGE if SLUB@@ -2893,6 +2894,7 @@ if X86_32
Quoted 7 lines
arch/x86/Kconfig if X86_32 · line 2898
Quoted 4 lines
arch/x86/Kconfig +1
-0config ISA bool "ISA support" + depends on HAS_IOPORT help
HAS_IOPORTis selected unconditionally already, so this doesn't really do anything.
Removed.
Quoted 19 lines
lib/Kconfig.kgdb config KDB_DEFAULT_ENABLE · line 126
Quoted 13 lines
lib/Kconfig.kgdb +2
-1@@ -121,7 +121,8 @@ config KDB_DEFAULT_ENABLE config KDB_KEYBOARD bool "KGDB_KDB: keyboard as input device" - depends on VT && KGDB_KDB && !PARISC + depends on HAS_IOPORT + depends on VT && KGDB_KDB default nThis loses the !PARISC dependency, which I don't think is intentional. The added
HAS_IOPORTdependency makes sense here, but I think this should be in a different patch and not in the preparation.
Quoted 1 line
Arnd
Agree will put into its own patch and re-add the !PARISC
Re: [PATCH v3 01/38] Kconfig: introduce HAS_IOPORT option and select it as necessary
In reply to Niklas SchnelleQuoted 7 lines · Niklas Schnelle
We introduce a new
HAS_IOPORTKconfigoption to indicate support for I/O Port access. In a future patch HAS_IOPORT=n will disable compilation of the I/O accessor functions inb()/outb() and friends on architectures which can not meaningfully support legacy I/O spaces such as s390. Also add dependencies onHAS_IOPORTfor the ISA andHAVE_EISAconfig options as these busses always go along withHAS_IOPORT.
Quoted 8 lines
The "depends on" relations on
HAS_IOPORTin drivers as well as ifdefs forHAS_IOPORTspecific sections will be added in subsequent patches on a per subsystem basis.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>---
@Arnd, I swear I asked you and then added Signed-off-bys for all these Co-developed-bys as suggested by checkpatch. Sadly that must have been during my failed attempt of converting to b4 prep / b4 send before sending this last Friday and then it got lost. It almost worked and is a very nice work flow except that b4 currently can only use a single list of To/Cc fields and for this treewide series that would probably hit mail server limits. Added it now.
Thanks,
Niklas
PATCH v3 2/38 ata: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/ata/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/ata/Kconfig +1 -0
@@ -342,6 +342,7 @@ endif # HAS_DMA config ATA_SFF bool "ATA SFF support (for legacy IDE and PATA)" + depends on HAS_IOPORT default y help This option adds support for ATA controllers with SFF
Signature · 1 line
2.37.2
Re: [PATCH v3 02/38] ata: add HAS_IOPORT dependencies
Quoted 3 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.
I do not see HAS_IOPORT=y defined anywhere in 6.3-rc. Is that in linux-next ? There is a HAS_IOPORT_MAP, but I guess it is different.
Quoted 19 lines
Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/ata/Kconfig | 1 + 1 file changed, 1 insertion(+)drivers/ata/Kconfig +1
-0@@ -342,6 +342,7 @@ endif # HAS_DMA config ATA_SFF bool "ATA SFF support (for legacy IDE and PATA)" + depends on HAS_IOPORT default y help This option adds support for ATA controllers with SFF
Signature · 2 lines
Damien Le Moal Western Digital Research
Arnd Bergmann
maintainerRe: [PATCH v3 02/38] ata: add HAS_IOPORT dependencies
Quoted 7 lines · Damien Le Moal
Quoted 3 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.I do not see HAS_IOPORT=y defined anywhere in 6.3-rc. Is that in linux-next ? There is a
HAS_IOPORT_MAP, but I guess it is different.
It's defined in patch 1 of the series, so the later patches can't be applied into subsystem trees without that.
We can either merge patch 1 as a preparation first, or keep it all together as a series.
Arnd
Re: [PATCH v3 02/38] ata: add HAS_IOPORT dependencies
Quoted 6 lines · Arnd Bergmann
Quoted 5 lines · Damien Le Moal
Quoted 3 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.
Quoted 8 lines
Quoted 2 lines
I do not see HAS_IOPORT=y defined anywhere in 6.3-rc. Is that in linux-next ? There is a
HAS_IOPORT_MAP, but I guess it is different.It's defined in patch 1 of the series, so the later patches can't be applied into subsystem trees without that.
We can either merge patch 1 as a preparation first, or keep it all together as a series.
Got it. Either is fine with me. To allow option 2, I will send my ack. Thanks !
Quoted 2 lines
Arnd
Signature · 2 lines
Damien Le Moal Western Digital Research
Re: [PATCH v3 02/38] ata: add HAS_IOPORT dependencies
In reply to Niklas SchnelleQuoted 15 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/ata/Kconfig | 1 + 1 file changed, 1 insertion(+)drivers/ata/Kconfig +0
-0
drivers/ata/Kconfig endif # HAS_DMA · line 348
Quoted 7 lines
drivers/ata/Kconfig +1
-0@@ -342,6 +342,7 @@ endif # HAS_DMA config ATA_SFF bool "ATA SFF support (for legacy IDE and PATA)" + depends on HAS_IOPORT default y help This option adds support for ATA controllers with SFF
Signature · 2 lines
Damien Le Moal Western Digital Research
Geert Uytterhoeven
maintainerRe: [PATCH v3 02/38] ata: add HAS_IOPORT dependencies
In reply to Niklas SchnelleHi Niklas,
Quoted 6 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>
Thanks for your patch!
drivers/ata/Kconfig endif # HAS_DMA · line 348
Quoted 10 lines
drivers/ata/Kconfig +1
-0@@ -342,6 +342,7 @@ endif # HAS_DMA config ATA_SFF bool "ATA SFF support (for legacy IDE and PATA)" + depends on HAS_IOPORT default y help This option adds support for ATA controllers with SFF
ATA_SFF is a dependency for lots of (S)ATA drivers. (at least) The following don't use I/O port access:
CONFIG_SATA_RCAR (arm/arm64)
CONFIG_PATA_FALCON (m68k/atari and m68k/q40)
CONFIG_PATA_GAYLE (m68k/amiga)
CONFIG_PATA_BUDDHA (m68k/amiga)(at least) The following can use either MMIO or I/O port accesses:
CONFIG_PATA_PLATFORM (m68k/mac)
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Re: [PATCH v3 02/38] ata: add HAS_IOPORT dependencies
Quoted 26 lines · Geert Uytterhoeven
Hi Niklas,
Quoted 6 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>Thanks for your patch!
drivers/ata/Kconfig endif # HAS_DMA · line 348
Quoted 10 lines
drivers/ata/Kconfig +1
-0@@ -342,6 +342,7 @@ endif # HAS_DMA config ATA_SFF bool "ATA SFF support (for legacy IDE and PATA)" + depends on HAS_IOPORT default y help This option adds support for ATA controllers with SFF
ATA_SFFis a dependency for lots of (S)ATA drivers. (at least) The following don't use I/O port access:
Quoted 8 lines
CONFIG_SATA_RCAR (arm/arm64) CONFIG_PATA_FALCON (m68k/atari and m68k/q40) CONFIG_PATA_GAYLE (m68k/amiga) CONFIG_PATA_BUDDHA (m68k/amiga)(at least) The following can use either MMIO or I/O port accesses:
CONFIG_PATA_PLATFORM(m68k/mac)
But for these arch/platforms, would there be any reason to not have HAS_IOPORT ? It is supported right now, so we should have HAS_IOPORT for them.
Quoted 5 lines
Gr{oetje,eeting}s,
Geert
Signature · 2 lines
Damien Le Moal Western Digital Research
Geert Uytterhoeven
maintainerRe: [PATCH v3 02/38] ata: add HAS_IOPORT dependencies
Hi Damien,
Quoted 30 lines · Damien Le Moal
Quoted 29 lines · Geert Uytterhoeven
Quoted 6 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>Thanks for your patch!
drivers/ata/Kconfig endif # HAS_DMA · line 348
Quoted 10 lines
drivers/ata/Kconfig +1
-0@@ -342,6 +342,7 @@ endif # HAS_DMA config ATA_SFF bool "ATA SFF support (for legacy IDE and PATA)" + depends on HAS_IOPORT default y help This option adds support for ATA controllers with SFF
ATA_SFFis a dependency for lots of (S)ATA drivers. (at least) The following don't use I/O port access:CONFIG_SATA_RCAR (arm/arm64) CONFIG_PATA_FALCON (m68k/atari and m68k/q40) CONFIG_PATA_GAYLE (m68k/amiga) CONFIG_PATA_BUDDHA (m68k/amiga)
Quoted 6 lines
Quoted 3 lines
(at least) The following can use either MMIO or I/O port accesses:
CONFIG_PATA_PLATFORM(m68k/mac)But for these
arch/platforms, would there be any reason to not haveHAS_IOPORT? It is supported right now, so we should haveHAS_IOPORTfor them.
That's the point: on Amiga and Atari, HAS_IOPORT is optional, and not related to IDE support. On Mac, it is never present.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Re: [PATCH v3 02/38] ata: add HAS_IOPORT dependencies
Quoted 36 lines · Geert Uytterhoeven
Hi Damien,
Quoted 32 lines · Damien Le Moal
Quoted 31 lines · Geert Uytterhoeven
Quoted 6 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>Thanks for your patch!
drivers/ata/Kconfig endif # HAS_DMA · line 348
Quoted 10 lines
drivers/ata/Kconfig +1
-0@@ -342,6 +342,7 @@ endif # HAS_DMA config ATA_SFF bool "ATA SFF support (for legacy IDE and PATA)" + depends on HAS_IOPORT default y help This option adds support for ATA controllers with SFF
ATA_SFFis a dependency for lots of (S)ATA drivers. (at least) The following don't use I/O port access:CONFIG_SATA_RCAR (arm/arm64) CONFIG_PATA_FALCON (m68k/atari and m68k/q40) CONFIG_PATA_GAYLE (m68k/amiga) CONFIG_PATA_BUDDHA (m68k/amiga)(at least) The following can use either MMIO or I/O port accesses:
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
CONFIG_PATA_PLATFORM(m68k/mac)But for these
arch/platforms, would there be any reason to not haveHAS_IOPORT? It is supported right now, so we should haveHAS_IOPORTfor them.That's the point: on Amiga and Atari,
HAS_IOPORTis optional, and not related to IDE support. On Mac, it is never present.
Ah. OK. I see now. So indeed, applying the dependency on the entire ATA_SFF group of drivers is very coarse.
Niklas,
Can you change this to apply the dependency per driver ?
Signature · 2 lines
Damien Le Moal Western Digital Research
Arnd Bergmann
maintainerRe: [PATCH v3 02/38] ata: add HAS_IOPORT dependencies
Quoted 7 lines · Damien Le Moal
On 2023/03/15 20:36, Geert Uytterhoeven wrote:
Ah. OK. I see now. So indeed, applying the dependency on the entire
ATA_SFFgroup of drivers is very coarse.Can you change this to apply the dependency per driver ?
I think that will fail to build because of this function on architectures that drop their non-functional inb/outb helpers:
int ata_pci_bmdma_clear_simplex(struct pci_dev *pdev)
{
unsigned long bmdma = pci_resource_start(pdev, 4);
u8 simplex;
if (bmdma == 0)
return -ENOENT;
simplex = inb(bmdma + 0x02);
outb(simplex & 0x60, bmdma + 0x02);
simplex = inb(bmdma + 0x02);
if (simplex & 0x80)
return -EOPNOTSUPP;
return 0;
}This is only called from five pata drivers (ali, amd, cmd64x, netcell, serverworks), so an easy workaround would be to make sure those depend on HAS_IOPORT and enclose the function definition in an #ifdef.
Arnd
Re: [PATCH v3 02/38] ata: add HAS_IOPORT dependencies
Quoted 29 lines · Arnd Bergmann
Quoted 7 lines · Damien Le Moal
On 2023/03/15 20:36, Geert Uytterhoeven wrote:
Ah. OK. I see now. So indeed, applying the dependency on the entire
ATA_SFFgroup of drivers is very coarse.Can you change this to apply the dependency per driver ?
I think that will fail to build because of this function on architectures that drop their non-functional inb/outb helpers:
int
ata_pci_bmdma_clear_simplex(struct pci_dev *pdev){ unsigned long bmdma = pci_resource_start(pdev, 4); u8 simplex; if (bmdma == 0) return -ENOENT; simplex = inb(bmdma + 0x02); outb(simplex & 0x60, bmdma + 0x02); simplex = inb(bmdma + 0x02); if (simplex & 0x80) return -EOPNOTSUPP; return 0; }
Quoted 6 lines
This is only called from five pata drivers (ali, amd, cmd64x, netcell, serverworks), so an easy workaround would be to make sure those depend on
HAS_IOPORTand enclose the function definition in an #ifdef.Arnd
There were a few additional inb()/outb() uses so a few more drivers had to have the dependency added but for v4 it will no longer be on the ATA_SFF option and I used your suggestion above for this function. There was another call to it in ata_generic_init_one() that is only done for PCI_VENDOR_ID_AL so I added an #ifdef CONFIG_PATA_ALI around that.
Thanks,
Niklas
PATCH v3 3/38 char: impi, tpm: depend on HAS_IOPORT
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add this dependency and ifdef sections of code using inb()/outb() as alternative access methods.
--- drivers/char/Kconfig | 3 ++- drivers/char/ipmi/Makefile | 11 ++++------- drivers/char/ipmi/ipmi_si_intf.c | 3 ++- drivers/char/ipmi/ipmi_si_pci.c | 3 +++ drivers/char/pcmcia/Kconfig | 8 ++++---- drivers/char/tpm/Kconfig | 1 + drivers/char/tpm/tpm_infineon.c | 14 ++++++++++---- drivers/char/tpm/tpm_tis_core.c | 19 ++++++++----------- 8 files changed, 34 insertions(+), 28 deletions(-)
drivers/char/Kconfig +2 -1
@@ -34,6 +34,7 @@ config TTY_PRINTK_LEVEL config PRINTER tristate "Parallel printer support" depends on PARPORT + depends on HAS_IOPORT help If you intend to attach a printer to the parallel port of your Linux box (as opposed to using a serial printer; if the connector at the
@@ -342,7 +343,7 @@ config NVRAM config DEVPORT bool "/dev/port character device" - depends on ISA || PCI + depends on HAS_IOPORT default y help Say Y here if you want to support the /dev/port device. The /dev/port
drivers/char/ipmi/Makefile +4 -7
@@ -5,13 +5,10 @@ ipmi_si-y := ipmi_si_intf.o ipmi_kcs_sm.o ipmi_smic_sm.o ipmi_bt_sm.o \ ipmi_si_hotmod.o ipmi_si_hardcode.o ipmi_si_platform.o \ - ipmi_si_port_io.o ipmi_si_mem_io.o -ifdef CONFIG_PCI -ipmi_si-y += ipmi_si_pci.o -endif -ifdef CONFIG_PARISC -ipmi_si-y += ipmi_si_parisc.o -endif + ipmi_si_mem_io.o +ipmi_si-$(CONFIG_HAS_IOPORT) += ipmi_si_port_io.o +ipmi_si-$(CONFIG_PCI) += ipmi_si_pci.o +ipmi_si-$(CONFIG_PARISC) += ipmi_si_parisc.o obj-$(CONFIG_IPMI_HANDLER) += ipmi_msghandler.o obj-$(CONFIG_IPMI_DEVICE_INTERFACE) += ipmi_devintf.o
drivers/char/ipmi/ipmi_si_intf.c +2 -1
@@ -1882,7 +1882,8 @@ int ipmi_si_add_smi(struct si_sm_io *io) }if (!io->io_setup) { -if (io->addr_space ==IPMI_IO_ADDR_SPACE ) { +if (IS_ENABLED (CONFIG_HAS_IOPORT ) && + io->addr_space ==IPMI_IO_ADDR_SPACE ) { io->io_setup = ipmi_si_port_setup; }else if (io->addr_space ==IPMI_MEM_ADDR_SPACE ) { io->io_setup = ipmi_si_mem_setup;
drivers/char/ipmi/ipmi_si_pci.c +3 -0
@@ -97,6 +97,9 @@ static int ipmi_pci_probe(struct pci_dev *pdev, }if (pci_resource_flags (pdev,0 ) &IORESOURCE_IO ) { +if (!IS_ENABLED (CONFIG_HAS_IOPORT )) +return -ENXIO ; + io.addr_space =IPMI_IO_ADDR_SPACE ; io.io_setup = ipmi_si_port_setup; }else {
drivers/char/pcmcia/Kconfig +4 -4
@@ -8,7 +8,7 @@ menu "PCMCIA character devices" config SYNCLINK_CS tristate "SyncLink PC Card support" - depends on PCMCIA && TTY + depends on PCMCIA && TTY && HAS_IOPORT help Enable support for the SyncLink PC Card serial adapter, running asynchronous and HDLC communications up to 512Kbps. The port is
@@ -21,7 +21,7 @@ config SYNCLINK_CS config CARDMAN_4000 tristate "Omnikey Cardman 4000 support" - depends on PCMCIA + depends on PCMCIA && HAS_IOPORT select BITREVERSE help Enable support for the Omnikey Cardman 4000 PCMCIA Smartcard
@@ -33,7 +33,7 @@ config CARDMAN_4000 config CARDMAN_4040 tristate "Omnikey CardMan 4040 support" - depends on PCMCIA + depends on PCMCIA && HAS_IOPORT help Enable support for the Omnikey CardMan 4040 PCMCIA Smartcard reader.
@@ -57,7 +57,7 @@ config SCR24X config IPWIRELESS tristate "IPWireless 3G UMTS PCMCIA card support" - depends on PCMCIA && NETDEVICES && TTY + depends on PCMCIA && NETDEVICES && TTY && HAS_IOPORT select PPP help This is a driver for 3G UMTS PCMCIA card from IPWireless company. In
drivers/char/tpm/Kconfig +1 -0
@@ -149,6 +149,7 @@ config TCG_NSC config TCG_ATMEL tristate "Atmel TPM Interface" depends on PPC64 || HAS_IOPORT_MAP + depends on HAS_IOPORT help If you have a TPM security chip from Atmel say Yes and it will be accessible from within Linux. To compile this driver
drivers/char/tpm/tpm_infineon.c +10 -4
@@ -51,34 +51,40 @@ static struct tpm_inf_dev tpm_dev;static inline void tpm_data_out (unsigned char data,unsigned char offset) { +#ifdef CONFIG_HAS_IOPORT if (tpm_dev.iotype ==TPM_INF_IO_PORT )outb (data, tpm_dev.data_regs + offset); else +#endif writeb (data, tpm_dev.mem_base + tpm_dev.data_regs + offset); }static inline unsigned char tpm_data_in (unsigned char offset) { +#ifdef CONFIG_HAS_IOPORT if (tpm_dev.iotype ==TPM_INF_IO_PORT )return inb (tpm_dev.data_regs + offset); -else -return readb (tpm_dev.mem_base + tpm_dev.data_regs + offset); +#endif +return readb (tpm_dev.mem_base + tpm_dev.data_regs + offset); }static inline void tpm_config_out (unsigned char data,unsigned char offset) { +#ifdef CONFIG_HAS_IOPORT if (tpm_dev.iotype ==TPM_INF_IO_PORT )outb (data, tpm_dev.config_port + offset); else +#endif writeb (data, tpm_dev.mem_base + tpm_dev.index_off + offset); }static inline unsigned char tpm_config_in (unsigned char offset) { +#ifdef CONFIG_HAS_IOPORT if (tpm_dev.iotype ==TPM_INF_IO_PORT )return inb (tpm_dev.config_port + offset); -else -return readb (tpm_dev.mem_base + tpm_dev.index_off + offset); +#endif +return readb (tpm_dev.mem_base + tpm_dev.index_off + offset); }/* TPM header definitions */
drivers/char/tpm/tpm_tis_core.c +8 -11
@@ -897,11 +897,6 @@ static void tpm_tis_clkrun_enable(struct tpm_chip *chip, bool value) clkrun_val &= ~LPC_CLKRUN_EN ;iowrite32 (clkrun_val, data->ilb_base_addr +LPC_CNTRL_OFFSET ); -/* -* Write any random value on port 0x80 which is on LPC, to make -* sure LPC clock is running before sending any TPM command. -*/ -outb (0xCC ,0x80 ); }else { data->clkrun_enabled--;if (data->clkrun_enabled)
@@ -912,13 +907,15 @@ static void tpm_tis_clkrun_enable(struct tpm_chip *chip, bool value)/* Enable LPC CLKRUN# */ clkrun_val |=LPC_CLKRUN_EN ;iowrite32 (clkrun_val, data->ilb_base_addr +LPC_CNTRL_OFFSET ); - -/* -* Write any random value on port 0x80 which is on LPC, to make -* sure LPC clock is running before sending any TPM command. -*/ -outb (0xCC ,0x80 ); } + +#ifdef CONFIG_HAS_IOPORT +/* +* Write any random value on port 0x80 which is on LPC, to make +* sure LPC clock is running before sending any TPM command. +*/ +outb (0xCC ,0x80 ); +#endif }static const struct tpm_class_ops tpm_tis = {
Signature · 1 line
2.37.2
Re: [PATCH v3 03/38] char: impi, tpm: depend on HAS_IOPORT
Quoted 230 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add this dependency and ifdef sections of code using inb()/outb() as alternative access methods.
Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/char/Kconfig | 3 ++- drivers/char/ipmi/Makefile | 11 ++++------- drivers/char/ipmi/ipmi_si_intf.c | 3 ++- drivers/char/ipmi/ipmi_si_pci.c | 3 +++ drivers/char/pcmcia/Kconfig | 8 ++++---- drivers/char/tpm/Kconfig | 1 + drivers/char/tpm/tpm_infineon.c | 14 ++++++++++---- drivers/char/tpm/tpm_tis_core.c | 19 ++++++++----------- 8 files changed, 34 insertions(+), 28 deletions(-)drivers/char/Kconfig +2
-1@@ -34,6 +34,7 @@ config TTY_PRINTK_LEVEL config PRINTER tristate "Parallel printer support" depends on PARPORT + depends on HAS_IOPORT help If you intend to attach a printer to the parallel port of your Linux box (as opposed to using a serial printer; if the connector at the@@ -342,7 +343,7 @@ config NVRAM config DEVPORT bool "/dev/port character device" - depends on ISA || PCI + depends on HAS_IOPORT default y help Say Y here if you want to support the /dev/port device. The /dev/portdrivers/char/ipmi/Makefile +4
-7@@ -5,13 +5,10 @@ ipmi_si-y := ipmi_si_intf.o ipmi_kcs_sm.o ipmi_smic_sm.o ipmi_bt_sm.o \ ipmi_si_hotmod.o ipmi_si_hardcode.o ipmi_si_platform.o \ - ipmi_si_port_io.o ipmi_si_mem_io.o -ifdef CONFIG_PCI -ipmi_si-y += ipmi_si_pci.o -endif -ifdef CONFIG_PARISC -ipmi_si-y += ipmi_si_parisc.o -endif + ipmi_si_mem_io.o +ipmi_si-$(CONFIG_HAS_IOPORT) += ipmi_si_port_io.o +ipmi_si-$(CONFIG_PCI) += ipmi_si_pci.o +ipmi_si-$(CONFIG_PARISC) += ipmi_si_parisc.o obj-$(CONFIG_IPMI_HANDLER) += ipmi_msghandler.o obj-$(CONFIG_IPMI_DEVICE_INTERFACE) += ipmi_devintf.odrivers/char/ipmi/ipmi_si_intf.c +2
-1@@ -1882,7 +1882,8 @@ int ipmi_si_add_smi(struct si_sm_io *io) }if (!io->io_setup) { -if (io->addr_space ==IPMI_IO_ADDR_SPACE ) { +if (IS_ENABLED (CONFIG_HAS_IOPORT ) && + io->addr_space ==IPMI_IO_ADDR_SPACE ) { io->io_setup = ipmi_si_port_setup; }else if (io->addr_space ==IPMI_MEM_ADDR_SPACE ) { io->io_setup = ipmi_si_mem_setup;drivers/char/ipmi/ipmi_si_pci.c +3
-0@@ -97,6 +97,9 @@ static int ipmi_pci_probe(struct pci_dev *pdev, }if (pci_resource_flags (pdev,0 ) &IORESOURCE_IO ) { +if (!IS_ENABLED (CONFIG_HAS_IOPORT )) +return -ENXIO ; + io.addr_space =IPMI_IO_ADDR_SPACE ; io.io_setup = ipmi_si_port_setup; }else {drivers/char/pcmcia/Kconfig +4
-4@@ -8,7 +8,7 @@ menu "PCMCIA character devices" config SYNCLINK_CS tristate "SyncLink PC Card support" - depends on PCMCIA && TTY + depends on PCMCIA && TTY && HAS_IOPORT help Enable support for the SyncLink PC Card serial adapter, running asynchronous and HDLC communications up to 512Kbps. The port is@@ -21,7 +21,7 @@ config SYNCLINK_CS config CARDMAN_4000 tristate "Omnikey Cardman 4000 support" - depends on PCMCIA + depends on PCMCIA && HAS_IOPORT select BITREVERSE help Enable support for the Omnikey Cardman 4000 PCMCIA Smartcard@@ -33,7 +33,7 @@ config CARDMAN_4000 config CARDMAN_4040 tristate "Omnikey CardMan 4040 support" - depends on PCMCIA + depends on PCMCIA && HAS_IOPORT help Enable support for the Omnikey CardMan 4040 PCMCIA Smartcard reader.@@ -57,7 +57,7 @@ config SCR24X config IPWIRELESS tristate "IPWireless 3G UMTS PCMCIA card support" - depends on PCMCIA && NETDEVICES && TTY + depends on PCMCIA && NETDEVICES && TTY && HAS_IOPORT select PPP help This is a driver for 3G UMTS PCMCIA card from IPWireless company. Indrivers/char/tpm/Kconfig +1
-0@@ -149,6 +149,7 @@ config TCG_NSC config TCG_ATMEL tristate "Atmel TPM Interface" depends on PPC64 || HAS_IOPORT_MAP + depends on HAS_IOPORT help If you have a TPM security chip from Atmel say Yes and it will be accessible from within Linux. To compile this driverdrivers/char/tpm/tpm_infineon.c +10
-4@@ -51,34 +51,40 @@ static struct tpm_inf_dev tpm_dev;static inline void tpm_data_out (unsigned char data,unsigned char offset) { +#ifdef CONFIG_HAS_IOPORT if (tpm_dev.iotype ==TPM_INF_IO_PORT )outb (data, tpm_dev.data_regs + offset); else +#endif writeb (data, tpm_dev.mem_base + tpm_dev.data_regs + offset); }static inline unsigned char tpm_data_in (unsigned char offset) { +#ifdef CONFIG_HAS_IOPORT if (tpm_dev.iotype ==TPM_INF_IO_PORT )return inb (tpm_dev.data_regs + offset); -else -return readb (tpm_dev.mem_base + tpm_dev.data_regs + offset); +#endif +return readb (tpm_dev.mem_base + tpm_dev.data_regs + offset); }static inline void tpm_config_out (unsigned char data,unsigned char offset) { +#ifdef CONFIG_HAS_IOPORT if (tpm_dev.iotype ==TPM_INF_IO_PORT )outb (data, tpm_dev.config_port + offset); else +#endif writeb (data, tpm_dev.mem_base + tpm_dev.index_off + offset); }static inline unsigned char tpm_config_in (unsigned char offset) { +#ifdef CONFIG_HAS_IOPORT if (tpm_dev.iotype ==TPM_INF_IO_PORT )return inb (tpm_dev.config_port + offset); -else -return readb (tpm_dev.mem_base + tpm_dev.index_off + offset); +#endif +return readb (tpm_dev.mem_base + tpm_dev.index_off + offset); }/* TPM header definitions */ drivers/char/tpm/tpm_tis_core.c +8
-11@@ -897,11 +897,6 @@ static void tpm_tis_clkrun_enable(struct tpm_chip *chip, bool value) clkrun_val &= ~LPC_CLKRUN_EN ;iowrite32 (clkrun_val, data->ilb_base_addr +LPC_CNTRL_OFFSET ); -/* -* Write any random value on port 0x80 which is on LPC, to make -* sure LPC clock is running before sending any TPM command. -*/ -outb (0xCC ,0x80 ); }else { data->clkrun_enabled--;if (data->clkrun_enabled)@@ -912,13 +907,15 @@ static void tpm_tis_clkrun_enable(struct tpm_chip *chip, bool value)/* Enable LPC CLKRUN# */ clkrun_val |=LPC_CLKRUN_EN ;iowrite32 (clkrun_val, data->ilb_base_addr +LPC_CNTRL_OFFSET ); - -/* -* Write any random value on port 0x80 which is on LPC, to make -* sure LPC clock is running before sending any TPM command. -*/ -outb (0xCC ,0x80 ); } + +#ifdef CONFIG_HAS_IOPORT +/* +* Write any random value on port 0x80 which is on LPC, to make +* sure LPC clock is running before sending any TPM command. +*/ +outb (0xCC ,0x80 ); +#endif }static const struct tpm_class_ops tpm_tis = {Signature · 1 line
2.37.2
Who should pick this?
BR, Jarkko
Arnd Bergmann
maintainerRe: [PATCH v3 03/38] char: impi, tpm: depend on HAS_IOPORT
Quoted 5 lines · Jarkko Sakkinen
On Tue, Mar 14, 2023 at 01:11:41PM +0100, Niklas Schnelle wrote:
Reviewed-by Jarkko Sakkinen <[email protected]>Who should pick this?
All patches in this series depend on patch 1, so either I merge them all through the asm-generic tree, or I ask Linus to apply just patch 1 for now, and then each subsystem can pick up their own patches based on top of that.
Arnd
Re: [PATCH v3 03/38] char: impi, tpm: depend on HAS_IOPORT
In reply to Niklas SchnelleQuoted 3 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add this dependency and ifdef sections of code using inb()/outb() as alternative access methods.
For the IPMI portions, this looks good.
Thanks
-corey
Quoted 227 lines
Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/char/Kconfig | 3 ++- drivers/char/ipmi/Makefile | 11 ++++------- drivers/char/ipmi/ipmi_si_intf.c | 3 ++- drivers/char/ipmi/ipmi_si_pci.c | 3 +++ drivers/char/pcmcia/Kconfig | 8 ++++---- drivers/char/tpm/Kconfig | 1 + drivers/char/tpm/tpm_infineon.c | 14 ++++++++++---- drivers/char/tpm/tpm_tis_core.c | 19 ++++++++----------- 8 files changed, 34 insertions(+), 28 deletions(-)drivers/char/Kconfig +2
-1@@ -34,6 +34,7 @@ config TTY_PRINTK_LEVEL config PRINTER tristate "Parallel printer support" depends on PARPORT + depends on HAS_IOPORT help If you intend to attach a printer to the parallel port of your Linux box (as opposed to using a serial printer; if the connector at the@@ -342,7 +343,7 @@ config NVRAM config DEVPORT bool "/dev/port character device" - depends on ISA || PCI + depends on HAS_IOPORT default y help Say Y here if you want to support the /dev/port device. The /dev/portdrivers/char/ipmi/Makefile +4
-7@@ -5,13 +5,10 @@ ipmi_si-y := ipmi_si_intf.o ipmi_kcs_sm.o ipmi_smic_sm.o ipmi_bt_sm.o \ ipmi_si_hotmod.o ipmi_si_hardcode.o ipmi_si_platform.o \ - ipmi_si_port_io.o ipmi_si_mem_io.o -ifdef CONFIG_PCI -ipmi_si-y += ipmi_si_pci.o -endif -ifdef CONFIG_PARISC -ipmi_si-y += ipmi_si_parisc.o -endif + ipmi_si_mem_io.o +ipmi_si-$(CONFIG_HAS_IOPORT) += ipmi_si_port_io.o +ipmi_si-$(CONFIG_PCI) += ipmi_si_pci.o +ipmi_si-$(CONFIG_PARISC) += ipmi_si_parisc.o obj-$(CONFIG_IPMI_HANDLER) += ipmi_msghandler.o obj-$(CONFIG_IPMI_DEVICE_INTERFACE) += ipmi_devintf.odrivers/char/ipmi/ipmi_si_intf.c +2
-1@@ -1882,7 +1882,8 @@ int ipmi_si_add_smi(struct si_sm_io *io) }if (!io->io_setup) { -if (io->addr_space ==IPMI_IO_ADDR_SPACE ) { +if (IS_ENABLED (CONFIG_HAS_IOPORT ) && + io->addr_space ==IPMI_IO_ADDR_SPACE ) { io->io_setup = ipmi_si_port_setup; }else if (io->addr_space ==IPMI_MEM_ADDR_SPACE ) { io->io_setup = ipmi_si_mem_setup;drivers/char/ipmi/ipmi_si_pci.c +3
-0@@ -97,6 +97,9 @@ static int ipmi_pci_probe(struct pci_dev *pdev, }if (pci_resource_flags (pdev,0 ) &IORESOURCE_IO ) { +if (!IS_ENABLED (CONFIG_HAS_IOPORT )) +return -ENXIO ; + io.addr_space =IPMI_IO_ADDR_SPACE ; io.io_setup = ipmi_si_port_setup; }else {drivers/char/pcmcia/Kconfig +4
-4@@ -8,7 +8,7 @@ menu "PCMCIA character devices" config SYNCLINK_CS tristate "SyncLink PC Card support" - depends on PCMCIA && TTY + depends on PCMCIA && TTY && HAS_IOPORT help Enable support for the SyncLink PC Card serial adapter, running asynchronous and HDLC communications up to 512Kbps. The port is@@ -21,7 +21,7 @@ config SYNCLINK_CS config CARDMAN_4000 tristate "Omnikey Cardman 4000 support" - depends on PCMCIA + depends on PCMCIA && HAS_IOPORT select BITREVERSE help Enable support for the Omnikey Cardman 4000 PCMCIA Smartcard@@ -33,7 +33,7 @@ config CARDMAN_4000 config CARDMAN_4040 tristate "Omnikey CardMan 4040 support" - depends on PCMCIA + depends on PCMCIA && HAS_IOPORT help Enable support for the Omnikey CardMan 4040 PCMCIA Smartcard reader.@@ -57,7 +57,7 @@ config SCR24X config IPWIRELESS tristate "IPWireless 3G UMTS PCMCIA card support" - depends on PCMCIA && NETDEVICES && TTY + depends on PCMCIA && NETDEVICES && TTY && HAS_IOPORT select PPP help This is a driver for 3G UMTS PCMCIA card from IPWireless company. Indrivers/char/tpm/Kconfig +1
-0@@ -149,6 +149,7 @@ config TCG_NSC config TCG_ATMEL tristate "Atmel TPM Interface" depends on PPC64 || HAS_IOPORT_MAP + depends on HAS_IOPORT help If you have a TPM security chip from Atmel say Yes and it will be accessible from within Linux. To compile this driverdrivers/char/tpm/tpm_infineon.c +10
-4@@ -51,34 +51,40 @@ static struct tpm_inf_dev tpm_dev;static inline void tpm_data_out (unsigned char data,unsigned char offset) { +#ifdef CONFIG_HAS_IOPORT if (tpm_dev.iotype ==TPM_INF_IO_PORT )outb (data, tpm_dev.data_regs + offset); else +#endif writeb (data, tpm_dev.mem_base + tpm_dev.data_regs + offset); }static inline unsigned char tpm_data_in (unsigned char offset) { +#ifdef CONFIG_HAS_IOPORT if (tpm_dev.iotype ==TPM_INF_IO_PORT )return inb (tpm_dev.data_regs + offset); -else -return readb (tpm_dev.mem_base + tpm_dev.data_regs + offset); +#endif +return readb (tpm_dev.mem_base + tpm_dev.data_regs + offset); }static inline void tpm_config_out (unsigned char data,unsigned char offset) { +#ifdef CONFIG_HAS_IOPORT if (tpm_dev.iotype ==TPM_INF_IO_PORT )outb (data, tpm_dev.config_port + offset); else +#endif writeb (data, tpm_dev.mem_base + tpm_dev.index_off + offset); }static inline unsigned char tpm_config_in (unsigned char offset) { +#ifdef CONFIG_HAS_IOPORT if (tpm_dev.iotype ==TPM_INF_IO_PORT )return inb (tpm_dev.config_port + offset); -else -return readb (tpm_dev.mem_base + tpm_dev.index_off + offset); +#endif +return readb (tpm_dev.mem_base + tpm_dev.index_off + offset); }/* TPM header definitions */ drivers/char/tpm/tpm_tis_core.c +8
-11@@ -897,11 +897,6 @@ static void tpm_tis_clkrun_enable(struct tpm_chip *chip, bool value) clkrun_val &= ~LPC_CLKRUN_EN ;iowrite32 (clkrun_val, data->ilb_base_addr +LPC_CNTRL_OFFSET ); -/* -* Write any random value on port 0x80 which is on LPC, to make -* sure LPC clock is running before sending any TPM command. -*/ -outb (0xCC ,0x80 ); }else { data->clkrun_enabled--;if (data->clkrun_enabled)@@ -912,13 +907,15 @@ static void tpm_tis_clkrun_enable(struct tpm_chip *chip, bool value)/* Enable LPC CLKRUN# */ clkrun_val |=LPC_CLKRUN_EN ;iowrite32 (clkrun_val, data->ilb_base_addr +LPC_CNTRL_OFFSET ); - -/* -* Write any random value on port 0x80 which is on LPC, to make -* sure LPC clock is running before sending any TPM command. -*/ -outb (0xCC ,0x80 ); } + +#ifdef CONFIG_HAS_IOPORT +/* +* Write any random value on port 0x80 which is on LPC, to make +* sure LPC clock is running before sending any TPM command. +*/ +outb (0xCC ,0x80 ); +#endif }static const struct tpm_class_ops tpm_tis = {Signature · 1 line
2.37.2
Geert Uytterhoeven
maintainerRe: [PATCH v3 03/38] char: impi, tpm: depend on HAS_IOPORT
In reply to Niklas SchnelleHi Niklas,
Quoted 6 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add this dependency and ifdef sections of code using inb()/outb() as alternative access methods.
Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>
Thanks for your patch!
drivers/char/Kconfig config TTY_PRINTK_LEVEL · line 37
Quoted 7 lines
drivers/char/Kconfig +1
-0@@ -34,6 +34,7 @@ config TTY_PRINTK_LEVEL config PRINTER tristate "Parallel printer support" depends on PARPORT + depends on HAS_IOPORT
This looks wrong to me.drivers/char/lp.c uses the parport API, no direct I/O port access.
drivers/char/Kconfig config TTY_PRINTK_LEVEL · line 40
Quoted 3 lines
drivers/char/Kconfig +0
-0help If you intend to attach a printer to the parallel port of your Linux box (as opposed to using a serial printer; if the connector at the
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Arnd Bergmann
maintainerRe: [PATCH v3 03/38] char: impi, tpm: depend on HAS_IOPORT
Quoted 10 lines · Geert Uytterhoeven
drivers/char/Kconfig config TTY_PRINTK_LEVEL · line 37
Quoted 7 lines
drivers/char/Kconfig +1
-0@@ -34,6 +34,7 @@ config TTY_PRINTK_LEVEL config PRINTER tristate "Parallel printer support" depends on PARPORT + depends on HAS_IOPORTThis looks wrong to me.
drivers/char/lp.cuses the parport API, no direct I/O port access.
It looks like include/linux/parport.h requires I/O port access when PARPORT_PC is enabled and PARPORT_NOT_PC is disabled. Maybe this would work:
depends on PARPORT
depends on HAS_IOPORT || PARPORT_NOT_PC
Arnd
Jason Gunthorpe
reviewerRe: [PATCH v3 03/38] char: impi, tpm: depend on HAS_IOPORT
In reply to Niklas Schnelledrivers/char/tpm/tpm_infineon.c static struct tpm_inf_dev tpm_dev; · line 56
Quoted 11 lines · Niklas Schnelle
drivers/char/tpm/tpm_infineon.c +1
-0@@ -51,34 +51,40 @@ static struct tpm_inf_dev tpm_dev;static inline void tpm_data_out (unsigned char data,unsigned char offset) { +#ifdef CONFIG_HAS_IOPORT if (tpm_dev.iotype ==TPM_INF_IO_PORT )outb (data, tpm_dev.data_regs + offset);
You should ifdef away TPM_INF_IO_PORT as well
Jason
PATCH v3 4/38 comedi: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/comedi/Kconfig | 103 +++++++++++++++++++++++++++-------------- 1 file changed, 68 insertions(+), 35 deletions(-)
drivers/comedi/Kconfig +68 -35
@@ -67,6 +67,7 @@ config COMEDI_TEST config COMEDI_PARPORT tristate "Parallel port support" + depends on HAS_IOPORT help Enable support for the standard parallel port. A cheap and easy way to get a few more digital I/O lines. Steal
@@ -79,6 +80,7 @@ config COMEDI_PARPORT config COMEDI_SSV_DNP tristate "SSV Embedded Systems DIL/Net-PC support" depends on X86_32 || COMPILE_TEST + depends on HAS_IOPORT help Enable support for SSV Embedded Systems DIL/Net-PC
@@ -89,6 +91,7 @@ endif # COMEDI_MISC_DRIVERS menuconfig COMEDI_ISA_DRIVERS bool "Comedi ISA and PC/104 drivers" + depends on ISA help Enable comedi ISA and PC/104 drivers to be built
@@ -100,7 +103,8 @@ if COMEDI_ISA_DRIVERS config COMEDI_PCL711 tristate "Advantech PCL-711/711b and ADlink ACL-8112 ISA card support" - select COMEDI_8254 + depends on HAS_IOPORT + depends on COMEDI_8254 help Enable support for Advantech PCL-711 and 711b, ADlink ACL-8112
@@ -161,8 +165,9 @@ config COMEDI_PCL730 config COMEDI_PCL812 tristate "Advantech PCL-812/813 and ADlink ACL-8112/8113/8113/8216" + depends on HAS_IOPORT select COMEDI_ISADMA if ISA_DMA_API - select COMEDI_8254 + depends on COMEDI_8254 help Enable support for Advantech PCL-812/PG, PCL-813/B, ADLink ACL-8112DG/HG/PG, ACL-8113, ACL-8216, ICP DAS A-821PGH/PGL/PGL-NDA,
@@ -173,8 +178,9 @@ config COMEDI_PCL812 config COMEDI_PCL816 tristate "Advantech PCL-814 and PCL-816 ISA card support" + depends on HAS_IOPORT select COMEDI_ISADMA if ISA_DMA_API - select COMEDI_8254 + depends on COMEDI_8254 help Enable support for Advantech PCL-814 and PCL-816 ISA cards
@@ -183,8 +189,9 @@ config COMEDI_PCL816 config COMEDI_PCL818 tristate "Advantech PCL-718 and PCL-818 ISA card support" + depends on HAS_IOPORT select COMEDI_ISADMA if ISA_DMA_API - select COMEDI_8254 + depends on COMEDI_8254 help Enable support for Advantech PCL-818 ISA cards PCL-818L, PCL-818H, PCL-818HD, PCL-818HG, PCL-818 and PCL-718
@@ -203,7 +210,7 @@ config COMEDI_PCM3724 config COMEDI_AMPLC_DIO200_ISA tristate "Amplicon PC212E/PC214E/PC215E/PC218E/PC272E" - select COMEDI_AMPLC_DIO200 + depends on COMEDI_AMPLC_DIO200 help Enable support for Amplicon PC212E, PC214E, PC215E, PC218E and PC272E ISA DIO boards
@@ -255,7 +262,8 @@ config COMEDI_DAC02 config COMEDI_DAS16M1 tristate "MeasurementComputing CIO-DAS16/M1DAS-16 ISA card support" - select COMEDI_8254 + depends on HAS_IOPORT + depends on COMEDI_8254 select COMEDI_8255 help Enable support for Measurement Computing CIO-DAS16/M1 ISA cards.
@@ -265,7 +273,7 @@ config COMEDI_DAS16M1 config COMEDI_DAS08_ISA tristate "DAS-08 compatible ISA and PC/104 card support" - select COMEDI_DAS08 + depends on COMEDI_DAS08 help Enable support for Keithley Metrabyte/ComputerBoards DAS08 and compatible ISA and PC/104 cards:
@@ -278,8 +286,9 @@ config COMEDI_DAS08_ISA config COMEDI_DAS16 tristate "DAS-16 compatible ISA and PC/104 card support" + depends on HAS_IOPORT select COMEDI_ISADMA if ISA_DMA_API - select COMEDI_8254 + depends on COMEDI_8254 select COMEDI_8255 help Enable support for Keithley Metrabyte/ComputerBoards DAS16
@@ -296,7 +305,8 @@ config COMEDI_DAS16 config COMEDI_DAS800 tristate "DAS800 and compatible ISA card support" - select COMEDI_8254 + depends on HAS_IOPORT + depends on COMEDI_8254 help Enable support for Keithley Metrabyte DAS800 and compatible ISA cards Keithley Metrabyte DAS-800, DAS-801, DAS-802
@@ -308,8 +318,9 @@ config COMEDI_DAS800 config COMEDI_DAS1800 tristate "DAS1800 and compatible ISA card support" + depends on HAS_IOPORT select COMEDI_ISADMA if ISA_DMA_API - select COMEDI_8254 + depends on COMEDI_8254 help Enable support for DAS1800 and compatible ISA cards Keithley Metrabyte DAS-1701ST, DAS-1701ST-DA, DAS-1701/AO,
@@ -323,7 +334,8 @@ config COMEDI_DAS1800 config COMEDI_DAS6402 tristate "DAS6402 and compatible ISA card support" - select COMEDI_8254 + depends on HAS_IOPORT + depends on COMEDI_8254 help Enable support for DAS6402 and compatible ISA cards Computerboards, Keithley Metrabyte DAS6402 and compatibles
@@ -402,7 +414,8 @@ config COMEDI_FL512 config COMEDI_AIO_AIO12_8 tristate "I/O Products PC/104 AIO12-8 Analog I/O Board support" - select COMEDI_8254 + depends on HAS_IOPORT + depends on COMEDI_8254 select COMEDI_8255 help Enable support for I/O Products PC/104 AIO12-8 Analog I/O Board
@@ -456,8 +469,9 @@ config COMEDI_ADQ12B config COMEDI_NI_AT_A2150 tristate "NI AT-A2150 ISA card support" + depends on HAS_IOPORT select COMEDI_ISADMA if ISA_DMA_API - select COMEDI_8254 + depends on COMEDI_8254 help Enable support for National Instruments AT-A2150 cards
@@ -466,7 +480,8 @@ config COMEDI_NI_AT_A2150 config COMEDI_NI_AT_AO tristate "NI AT-AO-6/10 EISA card support" - select COMEDI_8254 + depends on HAS_IOPORT + depends on COMEDI_8254 help Enable support for National Instruments AT-AO-6/10 cards
@@ -497,7 +512,7 @@ config COMEDI_NI_ATMIO16D config COMEDI_NI_LABPC_ISA tristate "NI Lab-PC and compatibles ISA support" - select COMEDI_NI_LABPC + depends on COMEDI_NI_LABPC help Enable support for National Instruments Lab-PC and compatibles Lab-PC-1200, Lab-PC-1200AI, Lab-PC+.
@@ -561,7 +576,7 @@ endif # COMEDI_ISA_DRIVERS menuconfig COMEDI_PCI_DRIVERS tristate "Comedi PCI drivers" - depends on PCI + depends on PCI && HAS_IOPORT help Enable support for comedi PCI drivers.
@@ -710,7 +725,8 @@ config COMEDI_ADL_PCI8164 config COMEDI_ADL_PCI9111 tristate "ADLink PCI-9111HR support" - select COMEDI_8254 + depends on HAS_IOPORT + depends on COMEDI_8254 help Enable support for ADlink PCI9111 cards
@@ -720,7 +736,7 @@ config COMEDI_ADL_PCI9111 config COMEDI_ADL_PCI9118 tristate "ADLink PCI-9118DG, PCI-9118HG, PCI-9118HR support" depends on HAS_DMA - select COMEDI_8254 + depends on COMEDI_8254 help Enable support for ADlink PCI-9118DG, PCI-9118HG, PCI-9118HR cards
@@ -729,7 +745,8 @@ config COMEDI_ADL_PCI9118 config COMEDI_ADV_PCI1710 tristate "Advantech PCI-171x and PCI-1731 support" - select COMEDI_8254 + depends on HAS_IOPORT + depends on COMEDI_8254 help Enable support for Advantech PCI-1710, PCI-1710HG, PCI-1711, PCI-1713 and PCI-1731
@@ -773,7 +790,8 @@ config COMEDI_ADV_PCI1760 config COMEDI_ADV_PCI_DIO tristate "Advantech PCI DIO card support" - select COMEDI_8254 + depends on HAS_IOPORT + depends on COMEDI_8254 select COMEDI_8255 help Enable support for Advantech PCI DIO cards
@@ -786,7 +804,7 @@ config COMEDI_ADV_PCI_DIO config COMEDI_AMPLC_DIO200_PCI tristate "Amplicon PCI215/PCI272/PCIe215/PCIe236/PCIe296 DIO support" - select COMEDI_AMPLC_DIO200 + depends on COMEDI_AMPLC_DIO200 help Enable support for Amplicon PCI215, PCI272, PCIe215, PCIe236 and PCIe296 DIO boards.
@@ -814,7 +832,8 @@ config COMEDI_AMPLC_PC263_PCI config COMEDI_AMPLC_PCI224 tristate "Amplicon PCI224 and PCI234 support" - select COMEDI_8254 + depends on HAS_IOPORT + depends on COMEDI_8254 help Enable support for Amplicon PCI224 and PCI234 AO boards
@@ -823,7 +842,8 @@ config COMEDI_AMPLC_PCI224 config COMEDI_AMPLC_PCI230 tristate "Amplicon PCI230 and PCI260 support" - select COMEDI_8254 + depends on HAS_IOPORT + depends on COMEDI_8254 select COMEDI_8255 help Enable support for Amplicon PCI230 and PCI260 Multifunction I/O
@@ -842,7 +862,7 @@ config COMEDI_CONTEC_PCI_DIO config COMEDI_DAS08_PCI tristate "DAS-08 PCI support" - select COMEDI_DAS08 + depends on COMEDI_DAS08 help Enable support for PCI DAS-08 cards.
@@ -929,7 +949,8 @@ config COMEDI_CB_PCIDAS64 config COMEDI_CB_PCIDAS tristate "MeasurementComputing PCI-DAS support" - select COMEDI_8254 + depends on HAS_IOPORT + depends on COMEDI_8254 select COMEDI_8255 help Enable support for ComputerBoards/MeasurementComputing PCI-DAS with
@@ -953,7 +974,8 @@ config COMEDI_CB_PCIDDA config COMEDI_CB_PCIMDAS tristate "MeasurementComputing PCIM-DAS1602/16, PCIe-DAS1602/16 support" - select COMEDI_8254 + depends on HAS_IOPORT + depends on COMEDI_8254 select COMEDI_8255 help Enable support for ComputerBoards/MeasurementComputing PCI Migration
@@ -973,7 +995,8 @@ config COMEDI_CB_PCIMDDA config COMEDI_ME4000 tristate "Meilhaus ME-4000 support" - select COMEDI_8254 + depends on HAS_IOPORT + depends on COMEDI_8254 help Enable support for Meilhaus PCI data acquisition cards ME-4650, ME-4670i, ME-4680, ME-4680i and ME-4680is
@@ -1031,7 +1054,7 @@ config COMEDI_NI_670X config COMEDI_NI_LABPC_PCI tristate "NI Lab-PC PCI-1200 support" - select COMEDI_NI_LABPC + depends on COMEDI_NI_LABPC help Enable support for National Instruments Lab-PC PCI-1200.
@@ -1053,6 +1076,7 @@ config COMEDI_NI_PCIDIO config COMEDI_NI_PCIMIO tristate "NI PCI-MIO-E series and M series support" depends on HAS_DMA + depends on HAS_IOPORT select COMEDI_NI_TIOCMD select COMEDI_8255 help
@@ -1074,7 +1098,8 @@ config COMEDI_NI_PCIMIO config COMEDI_RTD520 tristate "Real Time Devices PCI4520/DM7520 support" - select COMEDI_8254 + depends on HAS_IOPORT + depends on COMEDI_8254 help Enable support for Real Time Devices PCI4520/DM7520
@@ -1114,7 +1139,8 @@ if COMEDI_PCMCIA_DRIVERS config COMEDI_CB_DAS16_CS tristate "CB DAS16 series PCMCIA support" - select COMEDI_8254 + depends on HAS_IOPORT + depends on COMEDI_8254 help Enable support for the ComputerBoards/MeasurementComputing PCMCIA cards DAS16/16, PCM-DAS16D/12 and PCM-DAS16s/16
@@ -1124,7 +1150,7 @@ config COMEDI_CB_DAS16_CS config COMEDI_DAS08_CS tristate "CB DAS08 PCMCIA support" - select COMEDI_DAS08 + depends on COMEDI_DAS08 help Enable support for the ComputerBoards/MeasurementComputing DAS-08 PCMCIA card
@@ -1134,6 +1160,7 @@ config COMEDI_DAS08_CS config COMEDI_NI_DAQ_700_CS tristate "NI DAQCard-700 PCMCIA support" + depends on HAS_IOPORT help Enable support for the National Instruments PCMCIA DAQCard-700 DIO
@@ -1142,6 +1169,7 @@ config COMEDI_NI_DAQ_700_CS config COMEDI_NI_DAQ_DIO24_CS tristate "NI DAQ-Card DIO-24 PCMCIA support" + depends on HAS_IOPORT select COMEDI_8255 help Enable support for the National Instruments PCMCIA DAQ-Card DIO-24
@@ -1151,7 +1179,7 @@ config COMEDI_NI_DAQ_DIO24_CS config COMEDI_NI_LABPC_CS tristate "NI DAQCard-1200 PCMCIA support" - select COMEDI_NI_LABPC + depends on COMEDI_NI_LABPC help Enable support for the National Instruments PCMCIA DAQCard-1200
@@ -1160,6 +1188,7 @@ config COMEDI_NI_LABPC_CS config COMEDI_NI_MIO_CS tristate "NI DAQCard E series PCMCIA support" + depends on HAS_IOPORT select COMEDI_NI_TIO select COMEDI_8255 help
@@ -1172,6 +1201,7 @@ config COMEDI_NI_MIO_CS config COMEDI_QUATECH_DAQP_CS tristate "Quatech DAQP PCMCIA data capture card support" + depends on HAS_IOPORT help Enable support for the Quatech DAQP PCMCIA data capture cards DAQP-208 and DAQP-308
@@ -1248,12 +1278,14 @@ endif # COMEDI_USB_DRIVERS config COMEDI_8254 tristate + depends on HAS_IOPORT config COMEDI_8255 tristate config COMEDI_8255_SA tristate "Standalone 8255 support" + depends on HAS_IOPORT select COMEDI_8255 help Enable support for 8255 digital I/O as a standalone driver.
@@ -1285,7 +1317,7 @@ config COMEDI_KCOMEDILIB called kcomedilib. config COMEDI_AMPLC_DIO200 - select COMEDI_8254 + depends on COMEDI_8254 tristate config COMEDI_AMPLC_PC236
@@ -1294,7 +1326,7 @@ config COMEDI_AMPLC_PC236 config COMEDI_DAS08 tristate - select COMEDI_8254 + depends on COMEDI_8254 select COMEDI_8255 config COMEDI_ISADMA
@@ -1302,7 +1334,8 @@ config COMEDI_ISADMA config COMEDI_NI_LABPC tristate - select COMEDI_8254 + depends on HAS_IOPORT + depends on COMEDI_8254 select COMEDI_8255 config COMEDI_NI_LABPC_ISADMA
Signature · 1 line
2.37.2
PATCH v3 5/38 counter: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/counter/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/counter/Kconfig +1 -0
@@ -15,6 +15,7 @@ if COUNTER config 104_QUAD_8 tristate "ACCES 104-QUAD-8 driver" depends on (PC104 && X86) || COMPILE_TEST + depends on HAS_IOPORT select ISA_BUS_API help Say yes here to build support for the ACCES 104-QUAD-8 quadrature
Signature · 1 line
2.37.2
Re: [PATCH v3 05/38] counter: add HAS_IOPORT dependencies
Quoted 24 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/counter/Kconfig | 1 + 1 file changed, 1 insertion(+)drivers/counter/Kconfig +1
-0@@ -15,6 +15,7 @@ if COUNTER config 104_QUAD_8 tristate "ACCES 104-QUAD-8 driver" depends on (PC104 && X86) || COMPILE_TEST + depends on HAS_IOPORT select ISA_BUS_API help Say yes here to build support for the ACCES 104-QUAD-8 quadratureSignature · 1 line
2.37.2
Is HAS_IOPORT needed because this driver uses devm_ioport_map()? The inb()/outb() functions and such are not used in this driver, so would it suffice to depend on HAS_IOPORT_MAP instead?
William Breathitt Gray
Re: [PATCH v3 05/38] counter: add HAS_IOPORT dependencies
Quoted 30 lines · William Breathitt Gray
Quoted 24 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/counter/Kconfig | 1 + 1 file changed, 1 insertion(+)drivers/counter/Kconfig +1
-0@@ -15,6 +15,7 @@ if COUNTER config 104_QUAD_8 tristate "ACCES 104-QUAD-8 driver" depends on (PC104 && X86) || COMPILE_TEST + depends on HAS_IOPORT select ISA_BUS_API help Say yes here to build support for the ACCES 104-QUAD-8 quadratureSignature · 1 line
2.37.2Is
HAS_IOPORTneeded because this driver usesdevm_ioport_map()? The inb()/outb() functions and such are not used in this driver, so would it suffice to depend onHAS_IOPORT_MAPinstead?
Quoted 1 line
William Breathitt Gray
Yes, good catch HAS_IOPORT_MAP indeed seems to be enough. Will be changed in v4. Thankfully the Kconfig change to add HAS_IOPORT has already landed in Linus' tree so for the future these per subsystem patches can be merged independently.
Thanks,
Niklas
PATCH v3 6/38 /dev/port: don't compile file operations without CONFIG_DEVPORT
In reply to Niklas SchnelleIn the future inb() and friends will not be available when compiling with CONFIG_HAS_IOPORT=n so we must only try to access them here if CONFIG_DEVPORT is set which depends on HAS_IOPORT.
--- drivers/char/mem.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/char/mem.c +5 -1
@@ -402,6 +402,7 @@ static int mmap_mem(struct file *file, struct vm_area_struct *vma)return 0 ; } +#ifdef CONFIG_DEVPORT static ssize_t read_port (struct file *file,char __user *buf,size_t count,loff_t *ppos) {
@@ -443,6 +444,7 @@ static ssize_t write_port(struct file *file, const char __user *buf, *ppos = i; return tmp-buf; } +#endif static ssize_t read_null (struct file *file,char __user *buf,size_t count,loff_t *ppos)
@@ -671,12 +673,14 @@ static const struct file_operations null_fops = { .uring_cmd = uring_cmd_null, }; -static const struct file_operations __maybe_unused port_fops = { +#ifdef CONFIG_DEVPORT +static const struct file_operations port_fops = { .llseek = memory_lseek, .read = read_port, .write = write_port, .open = open_port, }; +#endif static const struct file_operations zero_fops = { .llseek = zero_lseek,
Signature · 1 line
2.37.2
PATCH v3 7/38 drm: handle HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them. In the bochs driver there is optional MMIO support detected at runtime, warn if this isn't taken when HAS_IOPORT is not defined.
There is also a direct and hard coded use in cirrus.c which according to the comment is only necessary during resume. Let's just skip this as for example s390 which doesn't have I/O port support also doesen't support suspend/resume.
--- drivers/gpu/drm/qxl/Kconfig | 1 + drivers/gpu/drm/tiny/bochs.c | 19 +++++++++++++++++++ drivers/gpu/drm/tiny/cirrus.c | 2 ++ 3 files changed, 22 insertions(+)
drivers/gpu/drm/qxl/Kconfig +1 -0
@@ -2,6 +2,7 @@ config DRM_QXL tristate "QXL virtual GPU" depends on DRM && PCI && MMU + depends on HAS_IOPORT select DRM_KMS_HELPER select DRM_TTM select DRM_TTM_HELPER
drivers/gpu/drm/tiny/bochs.c +19 -0
@@ -2,6 +2,7 @@#include <linux/module.h> #include <linux/pci.h> +#include <asm/bug.h> #include <drm/drm_aperture.h> #include <drm/drm_atomic_helper.h>
@@ -105,7 +106,11 @@ static void bochs_vga_writeb(struct bochs_device *bochs, u16 ioport, u8 val)writeb (val, bochs->mmio + offset); }else { +#ifdef HAS_IOPORT outb (val, ioport); +#else +WARN_ONCE (1 ,"Non-MMIO bochs device needs HAS_IOPORT" ); +#endif } }
@@ -119,7 +124,12 @@ static u8 bochs_vga_readb(struct bochs_device *bochs, u16 ioport)return readb (bochs->mmio + offset); }else { +#ifdef HAS_IOPORT return inb (ioport); +#else +WARN_ONCE (1 ,"Non-MMIO bochs device needs HAS_IOPORT" ); +return 0xff ; +#endif } }
@@ -132,8 +142,13 @@ static u16 bochs_dispi_read(struct bochs_device *bochs, u16 reg) ret =readw (bochs->mmio + offset); }else { +#ifdef HAS_IOPORT outw (reg,VBE_DISPI_IOPORT_INDEX ); ret =inw (VBE_DISPI_IOPORT_DATA ); +#else +WARN_ONCE (1 ,"Non-MMIO bochs device needs HAS_IOPORT" ); + ret =0xffff ; +#endif }return ret; }
@@ -145,8 +160,12 @@ static void bochs_dispi_write(struct bochs_device *bochs, u16 reg, u16 val)writew (val, bochs->mmio + offset); }else { +#ifdef HAS_IOPORT outw (reg,VBE_DISPI_IOPORT_INDEX );outw (val,VBE_DISPI_IOPORT_DATA ); +#else +WARN_ONCE (1 ,"Non-MMIO bochs device needs HAS_IOPORT" ); +#endif } }
drivers/gpu/drm/tiny/cirrus.c +2 -0
@@ -308,8 +308,10 @@ static int cirrus_mode_set(struct cirrus_device *cirrus,cirrus_set_start_address (cirrus,0 ); +#ifdef CONFIG_HAS_IOPORT /* Unblank (needed on S3 resume, vgabios doesn't do it then) */ outb (0x20 ,0x3c0 ); +#endif drm_dev_exit (idx);return 0 ;
Signature · 1 line
2.37.2
Re: [PATCH v3 07/38] drm: handle HAS_IOPORT dependencies
Quoted 5 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them. In the bochs driver there is optional MMIO support detected at runtime, warn if this isn't taken whenHAS_IOPORTis not defined.
Not that I care a whole lot, but there should really only be one warning or even failure to probe at bochs_hw_init() for !bochs->mmio && !IS_ENABLED(CONFIG_HAS_IOPORT), not warnings all over the place.
Moreover, the config macro is CONFIG_HAS_IOPORT instead of HAS_IOPORT that you check for below.
BR,
Jani.
Quoted 104 lines
There is also a direct and hard coded use in
cirrus.cwhich according to the comment is only necessary during resume. Let's just skip this as for example s390 which doesn't have I/O port support also doesen't support suspend/resume.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/gpu/drm/qxl/Kconfig | 1 + drivers/gpu/drm/tiny/bochs.c | 19 +++++++++++++++++++ drivers/gpu/drm/tiny/cirrus.c | 2 ++ 3 files changed, 22 insertions(+)drivers/gpu/drm/qxl/Kconfig +1
-0@@ -2,6 +2,7 @@ config DRM_QXL tristate "QXL virtual GPU" depends on DRM && PCI && MMU + depends on HAS_IOPORT select DRM_KMS_HELPER select DRM_TTM select DRM_TTM_HELPERdrivers/gpu/drm/tiny/bochs.c +19
-0@@ -2,6 +2,7 @@#include <linux/module.h> #include <linux/pci.h> +#include <asm/bug.h> #include <drm/drm_aperture.h> #include <drm/drm_atomic_helper.h> @@ -105,7 +106,11 @@ static void bochs_vga_writeb(struct bochs_device *bochs, u16 ioport, u8 val)writeb (val, bochs->mmio + offset); }else { +#ifdef HAS_IOPORT outb (val, ioport); +#else +WARN_ONCE (1 ,"Non-MMIO bochs device needs HAS_IOPORT" ); +#endif } }@@ -119,7 +124,12 @@ static u8 bochs_vga_readb(struct bochs_device *bochs, u16 ioport)return readb (bochs->mmio + offset); }else { +#ifdef HAS_IOPORT return inb (ioport); +#else +WARN_ONCE (1 ,"Non-MMIO bochs device needs HAS_IOPORT" ); +return 0xff ; +#endif } }@@ -132,8 +142,13 @@ static u16 bochs_dispi_read(struct bochs_device *bochs, u16 reg) ret =readw (bochs->mmio + offset); }else { +#ifdef HAS_IOPORT outw (reg,VBE_DISPI_IOPORT_INDEX ); ret =inw (VBE_DISPI_IOPORT_DATA ); +#else +WARN_ONCE (1 ,"Non-MMIO bochs device needs HAS_IOPORT" ); + ret =0xffff ; +#endif }return ret; }@@ -145,8 +160,12 @@ static void bochs_dispi_write(struct bochs_device *bochs, u16 reg, u16 val)writew (val, bochs->mmio + offset); }else { +#ifdef HAS_IOPORT outw (reg,VBE_DISPI_IOPORT_INDEX );outw (val,VBE_DISPI_IOPORT_DATA ); +#else +WARN_ONCE (1 ,"Non-MMIO bochs device needs HAS_IOPORT" ); +#endif } }drivers/gpu/drm/tiny/cirrus.c +2
-0@@ -308,8 +308,10 @@ static int cirrus_mode_set(struct cirrus_device *cirrus,cirrus_set_start_address (cirrus,0 ); +#ifdef CONFIG_HAS_IOPORT /* Unblank (needed on S3 resume, vgabios doesn't do it then) */ outb (0x20 ,0x3c0 ); +#endif drm_dev_exit (idx);return 0 ;
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [PATCH v3 07/38] drm: handle HAS_IOPORT dependencies
Quoted 11 lines · Jani Nikula
Quoted 5 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them. In the bochs driver there is optional MMIO support detected at runtime, warn if this isn't taken whenHAS_IOPORTis not defined.Not that I care a whole lot, but there should really only be one warning or even failure to probe at
bochs_hw_init()for !bochs->mmio && !IS_ENABLED(CONFIG_HAS_IOPORT), not warnings all over the place.
Quoted 6 lines
Moreover, the config macro is
CONFIG_HAS_IOPORTinstead ofHAS_IOPORTthat you check for below.BR,
Jani.
Good Find! Yes the #ifdefs need CONFIG_HAS_IOPORT I even had it correctly for cirrus in the same patch. For v4 I remove the separate warnings and instead went with the below:
@@ -229,6 +242,10 @@ static int bochs_hw_init(struct drm_device *dev)
return -ENOMEM;
}
} else {+ if (!IS_ENABLED(CONFIG_HAS_IOPORT)) {
+ DRM_ERROR("I/O ports are not supported\n");
+ return -EIO;
+ }
ioaddr = VBE_DISPI_IOPORT_INDEX;
iosize = 2;
if (!request_region(ioaddr, iosize, "bochs-drm")) {Thanks,
Niklas
PATCH v3 8/38 firmware: dmi-sysfs: handle HAS_IOPORT=n
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to guard sections of code calling them as alternative access methods.
--- drivers/firmware/dmi-sysfs.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/firmware/dmi-sysfs.c +4 -0
@@ -310,6 +310,7 @@ static struct kobj_type dmi_system_event_log_ktype = { .default_groups = dmi_sysfs_sel_groups, }; +#ifdef CONFIG_HAS_IOPORT typedef u8 (*sel_io_reader )(const struct dmi_system_event_log *sel,loff_t offset);
@@ -374,6 +375,7 @@ static ssize_t dmi_sel_raw_read_io(struct dmi_sysfs_entry *entry,return wrote; } +#endif static ssize_t dmi_sel_raw_read_phys32(struct dmi_sysfs_entry *entry, const struct dmi_system_event_log *sel,
@@ -409,11 +411,13 @@ static ssize_t dmi_sel_raw_read_helper(struct dmi_sysfs_entry *entry,memcpy (&sel, dh,sizeof (sel));switch (sel.access_method) { +#ifdef CONFIG_HAS_IOPORT case DMI_SEL_ACCESS_METHOD_IO8 :case DMI_SEL_ACCESS_METHOD_IO2x8:case DMI_SEL_ACCESS_METHOD_IO16 :return dmi_sel_raw_read_io (entry, &sel, state->buf, state->pos, state->count); +#endif case DMI_SEL_ACCESS_METHOD_PHYS32 :return dmi_sel_raw_read_phys32 (entry, &sel, state->buf, state->pos, state->count);
Signature · 1 line
2.37.2
PATCH v3 9/38 gpio: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/gpio/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/Kconfig +1 -1
@@ -688,7 +688,7 @@ config GPIO_VISCONTI config GPIO_VX855 tristate "VIA VX855/VX875 GPIO" - depends on (X86 || COMPILE_TEST) && PCI + depends on (X86 || COMPILE_TEST) && PCI && HAS_IOPORT select MFD_CORE select MFD_VX855 help
Signature · 1 line
2.37.2
Re: [PATCH v3 09/38] gpio: add HAS_IOPORT dependencies
Hi Niklas,
thanks for your patch!
Quoted 16 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/gpio/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpio/Kconfig +0
-0
drivers/gpio/Kconfig config GPIO_VISCONTI · line 691
Quoted 5 lines
drivers/gpio/Kconfig +1
-1@@ -688,7 +688,7 @@ config GPIO_VISCONTI config GPIO_VX855 tristate "VIA VX855/VX875 GPIO" - depends on (X86 || COMPILE_TEST) && PCI + depends on (X86 || COMPILE_TEST) && PCI && HAS_IOPORT
But is this the right fix? Further down in the Kconfig we have:
menu "Port-mapped I/O GPIO drivers"
depends on X86 # Unconditional I/O space access
config GPIO_I8255
tristate
select GPIO_REGMAP
(...)
Isn't the right fix to:
1) Move this Kconfig entry (VX855) down under the Port-mapped /O drivers, and then:
2) Make the whole submenu for port-mapped IO drivers depend on X86 && HAS_IOPORT
Yours,
Linus Walleij
Re: [PATCH v3 09/38] gpio: add HAS_IOPORT dependencies
Quoted 40 lines · Linus Walleij
Hi Niklas,
thanks for your patch!
Quoted 16 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/gpio/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpio/Kconfig +0
-0drivers/gpio/Kconfig config GPIO_VISCONTI · line 691
Quoted 5 lines
drivers/gpio/Kconfig +1
-1@@ -688,7 +688,7 @@ config GPIO_VISCONTI config GPIO_VX855 tristate "VIA VX855/VX875 GPIO" - depends on (X86 || COMPILE_TEST) && PCI + depends on (X86 || COMPILE_TEST) && PCI && HAS_IOPORTBut is this the right fix? Further down in the
Kconfigwe have:menu "Port-mapped I/O GPIO drivers"
depends on X86 # Unconditional I/O space accessconfig
GPIO_I8255
tristate
selectGPIO_REGMAP(...)
Isn't the right fix to:
Quoted 8 lines
1) Move this
Kconfigentry (VX855) down under the Port-mapped /O drivers, and then:2) Make the whole submenu for port-mapped IO drivers depend on X86 &&
HAS_IOPORTYours,
Linus Walleij
Makes sense I changed it to the above approach for v4. One thing this makes me wonder is if then one should change the X86 dependency to at least X86 || COMPILE_TEST or even remove it and rely on HAS_IOPORT. The comment there at least suggests that it is there only for the I/O space access.
Thanks,
Niklas
Re: [PATCH v3 09/38] gpio: add HAS_IOPORT dependencies
Quoted 3 lines · Niklas Schnelle
Makes sense I changed it to the above approach for v4. One thing this makes me wonder is if then one should change the X86 dependency to at least X86 ||
COMPILE_TESTor even remove it and rely onHAS_IOPORT.
Hm it makes sense I think. I don't know if there may be other X86 deps in these drivers but we don't know until we tried.
Yours,
Linus Walleij
PATCH v3 10/38 hwmon: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/hwmon/Kconfig | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
drivers/hwmon/Kconfig +18 -3
@@ -578,6 +578,7 @@ config SENSORS_SPARX5 config SENSORS_F71805F tristate "Fintek F71805F/FG, F71806F/FG and F71872F/FG" + depends on HAS_IOPORT depends on !PPC help If you say yes here you get support for hardware monitoring
@@ -589,6 +590,7 @@ config SENSORS_F71805F config SENSORS_F71882FG tristate "Fintek F71882FG and compatibles" + depends on HAS_IOPORT depends on !PPC help If you say yes here you get support for hardware monitoring
@@ -801,6 +803,7 @@ config SENSORS_CORETEMP config SENSORS_IT87 tristate "ITE IT87xx and compatibles" + depends on HAS_IOPORT depends on !PPC select HWMON_VID help
@@ -1465,6 +1468,7 @@ config SENSORS_LM95245 config SENSORS_PC87360 tristate "National Semiconductor PC87360 family" + depends on HAS_IOPORT depends on !PPC select HWMON_VID help
@@ -1479,6 +1483,7 @@ config SENSORS_PC87360 config SENSORS_PC87427 tristate "National Semiconductor PC87427" + depends on HAS_IOPORT depends on !PPC help If you say yes here you get access to the hardware monitoring
@@ -1510,6 +1515,7 @@ config SENSORS_NTC_THERMISTOR config SENSORS_NCT6683 tristate "Nuvoton NCT6683D" + depends on HAS_IOPORT depends on !PPC help If you say yes here you get support for the hardware monitoring
@@ -1531,6 +1537,7 @@ config SENSORS_NCT6775_CORE config SENSORS_NCT6775 tristate "Platform driver for Nuvoton NCT6775F and compatibles" + depends on HAS_IOPORT depends on !PPC depends on ACPI || ACPI=n select HWMON_VID
@@ -1767,7 +1774,7 @@ config SENSORS_SHTC1 config SENSORS_SIS5595 tristate "Silicon Integrated Systems Corp. SiS5595" - depends on PCI + depends on PCI && HAS_IOPORT help If you say yes here you get support for the integrated sensors in SiS5595 South Bridges.
@@ -1787,6 +1794,7 @@ config SENSORS_SY7636A config SENSORS_DME1737 tristate "SMSC DME1737, SCH311x and compatibles" + depends on HAS_IOPORT depends on I2C && !PPC select HWMON_VID help
@@ -1843,6 +1851,7 @@ config SENSORS_EMC6W201 config SENSORS_SMSC47M1 tristate "SMSC LPC47M10x and compatibles" + depends on HAS_IOPORT depends on !PPC help If you say yes here you get support for the integrated fan
@@ -1877,6 +1886,7 @@ config SENSORS_SMSC47M192 config SENSORS_SMSC47B397 tristate "SMSC LPC47B397-NC" + depends on HAS_IOPORT depends on !PPC help If you say yes here you get support for the SMSC LPC47B397-NC
@@ -1890,6 +1900,7 @@ config SENSORS_SCH56XX_COMMON config SENSORS_SCH5627 tristate "SMSC SCH5627" + depends on HAS_IOPORT depends on !PPC && WATCHDOG select SENSORS_SCH56XX_COMMON select WATCHDOG_CORE
@@ -1903,6 +1914,7 @@ config SENSORS_SCH5627 config SENSORS_SCH5636 tristate "SMSC SCH5636" + depends on HAS_IOPORT depends on !PPC && WATCHDOG select SENSORS_SCH56XX_COMMON select WATCHDOG_CORE
@@ -2145,7 +2157,7 @@ config SENSORS_VIA_CPUTEMP config SENSORS_VIA686A tristate "VIA686A" - depends on PCI + depends on PCI && HAS_IOPORT help If you say yes here you get support for the integrated sensors in Via 686A/B South Bridges.
@@ -2155,6 +2167,7 @@ config SENSORS_VIA686A config SENSORS_VT1211 tristate "VIA VT1211" + depends on HAS_IOPORT depends on !PPC select HWMON_VID help
@@ -2166,7 +2179,7 @@ config SENSORS_VT1211 config SENSORS_VT8231 tristate "VIA VT8231" - depends on PCI + depends on PCI && HAS_IOPORT select HWMON_VID help If you say yes here then you get support for the integrated sensors
@@ -2274,6 +2287,7 @@ config SENSORS_W83L786NG config SENSORS_W83627HF tristate "Winbond W83627HF, W83627THF, W83637HF, W83687THF, W83697HF" + depends on HAS_IOPORT depends on !PPC select HWMON_VID help
@@ -2286,6 +2300,7 @@ config SENSORS_W83627HF config SENSORS_W83627EHF tristate "Winbond W83627EHF/EHG/DHG/UHG, W83667HG" + depends on HAS_IOPORT depends on !PPC select HWMON_VID help
Signature · 1 line
2.37.2
PATCH v3 11/38 i2c: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/i2c/busses/Kconfig | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)
drivers/i2c/busses/Kconfig +17 -14
@@ -18,7 +18,7 @@ config I2C_CCGX_UCSI config I2C_ALI1535 tristate "ALI 1535" - depends on PCI + depends on PCI && HAS_IOPORT help If you say yes to this option, support will be included for the SMB Host controller on Acer Labs Inc. (ALI) M1535 South Bridges. The SMB
@@ -30,7 +30,7 @@ config I2C_ALI1535 config I2C_ALI1563 tristate "ALI 1563" - depends on PCI + depends on PCI && HAS_IOPORT help If you say yes to this option, support will be included for the SMB Host controller on Acer Labs Inc. (ALI) M1563 South Bridges. The SMB
@@ -42,7 +42,7 @@ config I2C_ALI1563 config I2C_ALI15X3 tristate "ALI 15x3" - depends on PCI + depends on PCI && HAS_IOPORT help If you say yes to this option, support will be included for the Acer Labs Inc. (ALI) M1514 and M1543 motherboard I2C interfaces.
@@ -52,7 +52,7 @@ config I2C_ALI15X3 config I2C_AMD756 tristate "AMD 756/766/768/8111 and nVidia nForce" - depends on PCI + depends on PCI && HAS_IOPORT help If you say yes to this option, support will be included for the AMD 756/766/768 mainboard I2C interfaces. The driver also includes
@@ -77,7 +77,7 @@ config I2C_AMD756_S4882 config I2C_AMD8111 tristate "AMD 8111" - depends on PCI + depends on PCI && HAS_IOPORT help If you say yes to this option, support will be included for the second (SMBus 2.0) AMD 8111 mainboard I2C interface.
@@ -107,7 +107,7 @@ config I2C_HIX5HD2 config I2C_I801 tristate "Intel 82801 (ICH/PCH)" - depends on PCI + depends on PCI && HAS_IOPORT select P2SB if X86 select CHECK_SIGNATURE if X86 && DMI select I2C_SMBUS
@@ -164,7 +164,7 @@ config I2C_I801 config I2C_ISCH tristate "Intel SCH SMBus 1.0" - depends on PCI + depends on PCI && HAS_IOPORT select LPC_SCH help Say Y here if you want to use SMBus controller on the Intel SCH
@@ -185,7 +185,7 @@ config I2C_ISMT config I2C_PIIX4 tristate "Intel PIIX4 and compatible (ATI/AMD/Serverworks/Broadcom/SMSC)" - depends on PCI + depends on PCI && HAS_IOPORT help If you say yes to this option, support will be included for the Intel PIIX4 family of mainboard I2C interfaces. Specifically, the following
@@ -231,7 +231,7 @@ config I2C_CHT_WC config I2C_NFORCE2 tristate "Nvidia nForce2, nForce3 and nForce4" - depends on PCI + depends on PCI && HAS_IOPORT help If you say yes to this option, support will be included for the Nvidia nForce2, nForce3 and nForce4 families of mainboard I2C interfaces.
@@ -264,7 +264,7 @@ config I2C_NVIDIA_GPU config I2C_SIS5595 tristate "SiS 5595" - depends on PCI + depends on PCI && HAS_IOPORT help If you say yes to this option, support will be included for the SiS5595 SMBus (a subset of I2C) interface.
@@ -274,7 +274,7 @@ config I2C_SIS5595 config I2C_SIS630 tristate "SiS 630/730/964" - depends on PCI + depends on PCI && HAS_IOPORT help If you say yes to this option, support will be included for the SiS630, SiS730 and SiS964 SMBus (a subset of I2C) interface.
@@ -284,7 +284,7 @@ config I2C_SIS630 config I2C_SIS96X tristate "SiS 96x" - depends on PCI + depends on PCI && HAS_IOPORT help If you say yes to this option, support will be included for the SiS 96x SMBus (a subset of I2C) interfaces. Specifically, the following
@@ -302,7 +302,7 @@ config I2C_SIS96X config I2C_VIA tristate "VIA VT82C586B" - depends on PCI + depends on PCI && HAS_IOPORT select I2C_ALGOBIT help If you say yes to this option, support will be included for the VIA
@@ -313,7 +313,7 @@ config I2C_VIA config I2C_VIAPRO tristate "VIA VT82C596/82C686/82xx and CX700/VX8xx/VX900" - depends on PCI + depends on PCI && HAS_IOPORT help If you say yes to this option, support will be included for the VIA VT82C596 and later SMBus interface. Specifically, the following
@@ -881,6 +881,7 @@ config I2C_NPCM config I2C_OCORES tristate "OpenCores I2C Controller" + depends on HAS_IOPORT help If you say yes to this option, support will be included for the OpenCores I2C controller. For details see
@@ -1274,6 +1275,7 @@ config I2C_CP2615 config I2C_PARPORT tristate "Parallel port adapter" depends on PARPORT + depends on HAS_IOPORT select I2C_ALGOBIT select I2C_SMBUS help
@@ -1382,6 +1384,7 @@ config I2C_ICY config I2C_MLXCPLD tristate "Mellanox I2C driver" depends on X86_64 || COMPILE_TEST + depends on HAS_IOPORT help This exposes the Mellanox platform I2C busses to the linux I2C layer for X86 based systems.
Signature · 1 line
2.37.2
PATCH v3 12/38 iio: ad7606: Kconfig: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/iio/adc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/Kconfig +1 -1
@@ -145,7 +145,7 @@ config AD7606 config AD7606_IFACE_PARALLEL tristate "Analog Devices AD7606 ADC driver with parallel interface support" - depends on HAS_IOMEM + depends on HAS_IOPORT select AD7606 help Say yes here to build parallel interface support for Analog Devices:
Signature · 1 line
2.37.2
PATCH v3 13/38 Input: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/input/serio/Kconfig | 2 ++ drivers/input/touchscreen/Kconfig | 1 + 2 files changed, 3 insertions(+)
drivers/input/serio/Kconfig +2 -0
@@ -75,6 +75,7 @@ config SERIO_Q40KBD config SERIO_PARKBD tristate "Parallel port keyboard adapter" depends on PARPORT + depends on HAS_IOPORT help Say Y here if you built a simple parallel port adapter to attach an additional AT keyboard, XT keyboard or PS/2 mouse.
@@ -148,6 +149,7 @@ config HIL_MLC config SERIO_PCIPS2 tristate "PCI PS/2 keyboard and PS/2 mouse controller" depends on PCI + depends on HAS_IOPORT help Say Y here if you have a Mobility Docking station with PS/2 keyboard and mice ports.
drivers/input/touchscreen/Kconfig +1 -0
@@ -690,6 +690,7 @@ config TOUCHSCREEN_INEXIO config TOUCHSCREEN_MK712 tristate "ICS MicroClock MK712 touchscreen" + depends on ISA help Say Y here if you have the ICS MicroClock MK712 touchscreen controller chip in your system.
Signature · 1 line
2.37.2
Geert Uytterhoeven
maintainerRe: [PATCH v3 13/38] Input: add HAS_IOPORT dependencies
Hi Niklas,
Quoted 6 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>
Thanks for your patch!
drivers/input/serio/Kconfig config SERIO_Q40KBD · line 81
Quoted 10 lines
drivers/input/serio/Kconfig +1
-0@@ -75,6 +75,7 @@ config SERIO_Q40KBD config SERIO_PARKBD tristate "Parallel port keyboard adapter" depends on PARPORT + depends on HAS_IOPORT help Say Y here if you built a simple parallel port adapter to attach an additional AT keyboard, XT keyboard or PS/2 mouse.
This driver seems to use only the parport and serio APIs, so it might work on systems without HAS_IOPORT. Dunno for sure.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Re: [PATCH v3 13/38] Input: add HAS_IOPORT dependencies
Quoted 26 lines · Geert Uytterhoeven
Hi Niklas,
Quoted 6 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>Thanks for your patch!
drivers/input/serio/Kconfig config SERIO_Q40KBD · line 81
Quoted 10 lines
drivers/input/serio/Kconfig +1
-0@@ -75,6 +75,7 @@ config SERIO_Q40KBD config SERIO_PARKBD tristate "Parallel port keyboard adapter" depends on PARPORT + depends on HAS_IOPORT help Say Y here if you built a simple parallel port adapter to attach an additional AT keyboard, XT keyboard or PS/2 mouse.This driver seems to use only the parport and serio APIs, so it might work on systems without
HAS_IOPORT. Dunno for sure.
Quoted 4 lines
Gr{oetje,eeting}s,
Geert
Thanks, yes you're right this driver compiles fine without inb()/outb() etc. I removed the dependency, not sure if it used to have a dependency or this was a mixup but it's corrected for v4.
Thanks,
Niklas
PATCH v3 14/38 Input: gameport: add ISA and HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. As ISA already implies HAS_IOPORT we can simply add this dependency and guard sections of code using inb()/outb() as alternative access methods.
--- drivers/input/gameport/Kconfig | 4 +++- include/linux/gameport.h | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-)
drivers/input/gameport/Kconfig +3 -1
@@ -25,6 +25,7 @@ if GAMEPORT config GAMEPORT_NS558 tristate "Classic ISA and PnP gameport support" + depends on ISA help Say Y here if you have an ISA or PnP gameport.
@@ -35,6 +36,7 @@ config GAMEPORT_NS558 config GAMEPORT_L4 tristate "PDPI Lightning 4 gamecard support" + depends on ISA help Say Y here if you have a PDPI Lightning 4 gamecard.
@@ -53,7 +55,7 @@ config GAMEPORT_EMU10K1 config GAMEPORT_FM801 tristate "ForteMedia FM801 gameport support" - depends on PCI + depends on PCI && HAS_IOPORT help Say Y here if you have ForteMedia FM801 PCI audio controller (Abit AU10, Genius Sound Maker, HP Workstation zx2000,
include/linux/gameport.h +7 -2
@@ -167,16 +167,21 @@ static inline void gameport_trigger(struct gameport *gameport) {if (gameport->trigger) gameport->trigger (gameport); +#ifdef CONFIG_HAS_IOPORT else outb(0xff, gameport->io); +#endif }static inline unsigned char gameport_read (struct gameport *gameport) {if (gameport->read)return gameport->read (gameport); -else -return inb (gameport->io); +#ifdef CONFIG_HAS_IOPORT +return inb (gameport->io); +#else +return 0xff ; +#endif }static inline int gameport_cooked_read (struct gameport *gameport,int *axes,int *buttons)
Signature · 1 line
2.37.2
PATCH v3 15/38 leds: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/leds/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/leds/Kconfig +1 -1
@@ -662,7 +662,7 @@ config LEDS_LM355x config LEDS_OT200 tristate "LED support for the Bachmann OT200" - depends on LEDS_CLASS && HAS_IOMEM && (X86_32 || COMPILE_TEST) + depends on LEDS_CLASS && HAS_IOPORT && (X86_32 || COMPILE_TEST) help This option enables support for the LEDs on the Bachmann OT200. Say Y to enable LEDs on the Bachmann OT200.
Signature · 1 line
2.37.2
Re: [PATCH v3 15/38] leds: add HAS_IOPORT dependencies
Quoted 10 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Acked-by Pavel Machek <[email protected]>Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/leds/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied, thanks
--
Lee Jones [李琼斯]
Re: [PATCH v3 15/38] leds: add HAS_IOPORT dependencies
Quoted 6 lines · Lee Jones
Quoted 4 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.
Quoted 8 lines
Quoted 6 lines
Acked-by Pavel Machek <[email protected]>Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/leds/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Applied, thanks
Sorry should have maybe been more clear, without patch 1 of this series this won't work as the HAS_IOPORT config option is new and will be missing otherwise. There's currently two options of merging this, either all at once or first only patch 1 and then the additional patches per subsystem until finally the last patch can remove inb()/outb() and friends when HAS_IOPORT is unset.
Thanks,
Niklas
Arnd Bergmann
maintainerRe: [PATCH v3 15/38] leds: add HAS_IOPORT dependencies
Quoted 14 lines · Niklas Schnelle
Quoted 13 lines · Lee Jones
Quoted 10 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Acked-by Pavel Machek <[email protected]>Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/leds/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 8 lines
Quoted 1 line
Applied, thanks
Sorry should have maybe been more clear, without patch 1 of this series this won't work as the
HAS_IOPORTconfig option is new and will be missing otherwise. There's currently two options of merging this, either all at once or first only patch 1 and then the additional patches per subsystem until finally the last patch can remove inb()/outb() and friends whenHAS_IOPORTis unset.
It's probably too late now to squeeze patch 1 into linux-6.3 as a late preparation patch for the rest of the series in 6.4.
It would be good if you could respin that patch separately anyway, so I can add it to the asm-generic tree and make sure we get it ready for the next merge window.
Arnd
Re: [PATCH v3 15/38] leds: add HAS_IOPORT dependencies
Quoted 24 lines · Arnd Bergmann
Quoted 14 lines · Niklas Schnelle
Quoted 13 lines · Lee Jones
Quoted 10 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Acked-by Pavel Machek <[email protected]>Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/leds/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Quoted 8 lines
Quoted 1 line
Applied, thanks
Sorry should have maybe been more clear, without patch 1 of this series this won't work as the
HAS_IOPORTconfig option is new and will be missing otherwise. There's currently two options of merging this, either all at once or first only patch 1 and then the additional patches per subsystem until finally the last patch can remove inb()/outb() and friends whenHAS_IOPORTis unset.
Quoted 8 lines
It's probably too late now to squeeze patch 1 into linux-6.3 as a late preparation patch for the rest of the series in 6.4.
It would be good if you could respin that patch separately anyway, so I can add it to the asm-generic tree and make sure we get it ready for the next merge window.
Arnd
Yes, sorry I was traveling Thursday to Monday and then spent some time catching up and investigating an internal issue. I'm currently going through the patches one by one incorporating comments. I fear the split of the USB patch as well as the suggestions for video might take a bit of time, so if you prefer I could also send just an updated patch 1 separately. How would I do this cleanly? Send as v4 without(?) a cover letter and add a Note after the '---'?
Thanks,
Niklas
Arnd Bergmann
maintainerRe: [PATCH v3 15/38] leds: add HAS_IOPORT dependencies
Quoted 5 lines · Niklas Schnelle
Quoted 3 lines · Arnd Bergmann
Quoted 2 lines · Niklas Schnelle
Quoted 1 line · Lee Jones
On Tue, 14 Mar 2023, Niklas Schnelle wrote:
Quoted 7 lines
Yes, sorry I was traveling Thursday to Monday and then spent some time catching up and investigating an internal issue. I'm currently going through the patches one by one incorporating comments. I fear the split of the USB patch as well as the suggestions for video might take a bit of time, so if you prefer I could also send just an updated patch 1 separately. How would I do this cleanly? Send as v4 without(?) a cover letter and add a Note after the '---'?
Yes, that sounds good to me. In case you need multiple versions, I would suggest you continue counting at v4 independently for both the preparation patch and the rest of the series.
Arnd
Geert Uytterhoeven
maintainerRe: [PATCH v3 15/38] leds: add HAS_IOPORT dependencies
In reply to Arnd BergmannHi Arnd,
Quoted 24 lines · Arnd Bergmann
Quoted 14 lines · Niklas Schnelle
Quoted 13 lines · Lee Jones
Quoted 10 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Acked-by Pavel Machek <[email protected]>Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/leds/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Quoted 8 lines
Quoted 1 line
Applied, thanks
Sorry should have maybe been more clear, without patch 1 of this series this won't work as the
HAS_IOPORTconfig option is new and will be missing otherwise. There's currently two options of merging this, either all at once or first only patch 1 and then the additional patches per subsystem until finally the last patch can remove inb()/outb() and friends whenHAS_IOPORTis unset.
Quoted 6 lines
It's probably too late now to squeeze patch 1 into linux-6.3 as a late preparation patch for the rest of the series in 6.4.
It would be good if you could respin that patch separately anyway, so I can add it to the asm-generic tree and make sure we get it ready for the next merge window.
Through an immutable branch, else all dependencies have to wait for v6.5?
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Arnd Bergmann
maintainerRe: [PATCH v3 15/38] leds: add HAS_IOPORT dependencies
Quoted 5 lines · Geert Uytterhoeven
Quoted 1 line · Arnd Bergmann
On Thu, Mar 23, 2023, at 13:42, Niklas Schnelle wrote:
Through an immutable branch, else all dependencies have to wait for v6.5?
Sure, will do. I suspect that there will still be something left behind that doesn't make it into 6.4, so the final bit (dropping broken inb/outb implementations) will have to be 6.5 material anyway, but at least we can aim on getting most of it into 6.4.
Arnd
Lee Jones
maintainerRe: [PATCH v3 15/38] leds: add HAS_IOPORT dependencies
In reply to Niklas SchnelleQuoted 14 lines · Niklas Schnelle
Quoted 13 lines · Lee Jones
Quoted 10 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Acked-by Pavel Machek <[email protected]>Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/leds/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 8 lines
Quoted 1 line
Applied, thanks
Sorry should have maybe been more clear, without patch 1 of this series this won't work as the
HAS_IOPORTconfig option is new and will be missing otherwise. There's currently two options of merging this, either all at once or first only patch 1 and then the additional patches per subsystem until finally the last patch can remove inb()/outb() and friends whenHAS_IOPORTis unset.
You only sent me this patch.
If there are in-set dependencies, you need to send everyone the whole set so that we can organise a suitable merge strategy between us.
I'll revert the patch for now.
--
Lee Jones [李琼斯]
Re: [PATCH v3 15/38] leds: add HAS_IOPORT dependencies
Quoted 27 lines · Lee Jones
Quoted 14 lines · Niklas Schnelle
Quoted 13 lines · Lee Jones
Quoted 10 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Acked-by Pavel Machek <[email protected]>Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/leds/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Quoted 8 lines
Quoted 1 line
Applied, thanks
Sorry should have maybe been more clear, without patch 1 of this series this won't work as the
HAS_IOPORTconfig option is new and will be missing otherwise. There's currently two options of merging this, either all at once or first only patch 1 and then the additional patches per subsystem until finally the last patch can remove inb()/outb() and friends whenHAS_IOPORTis unset.You only sent me this patch.
Quoted 7 lines
If there are in-set dependencies, you need to send everyone the whole set so that we can organise a suitable merge strategy between us.
I'll revert the patch for now.
--
Lee Jones [李琼斯]
I know this isn't ideal and I'm sorry for the confusion, extra work and churn. As far as I know sadly it's not possible to Cc everyone for such treewide series because the recipient list will hit the limits supported by some systems and mails get dropped which sucks even more. Maybe this can be solved in the future though, Konstantin Ryabitsev actually reached out because I mentioned that I tried using b4 prep / b4 send but couldn't exactly because it only supports a global recipient list.
Thanks,
Niklas
PATCH v3 16/38 media: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/media/pci/dm1105/Kconfig | 2 +- drivers/media/radio/Kconfig | 14 +++++++++++++- drivers/media/rc/Kconfig | 6 ++++++ 3 files changed, 20 insertions(+), 2 deletions(-)
drivers/media/pci/dm1105/Kconfig +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config DVB_DM1105 tristate "SDMC DM1105 based PCI cards" - depends on DVB_CORE && PCI && I2C && I2C_ALGOBIT + depends on DVB_CORE && PCI && I2C && I2C_ALGOBIT && HAS_IOPORT select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT select DVB_STV0288 if MEDIA_SUBDRV_AUTOSELECT
drivers/media/radio/Kconfig +13 -1
@@ -15,7 +15,7 @@ if RADIO_ADAPTERS config RADIO_MAXIRADIO tristate "Guillemot MAXI Radio FM 2000 radio" - depends on PCI + depends on PCI && HAS_IOPORT select RADIO_TEA575X help Choose Y here if you have this radio card. This card may also be
@@ -232,6 +232,7 @@ source "drivers/media/radio/wl128x/Kconfig" menuconfig V4L_RADIO_ISA_DRIVERS bool "ISA radio devices" depends on ISA || COMPILE_TEST + depends on HAS_IOPORT help Say Y here to enable support for these ISA drivers.
@@ -240,6 +241,7 @@ if V4L_RADIO_ISA_DRIVERS config RADIO_AZTECH tristate "Aztech/Packard Bell Radio" depends on ISA || COMPILE_TEST + depends on HAS_IOPORT select RADIO_ISA help Choose Y here if you have one of these FM radio cards, and then fill
@@ -260,6 +262,7 @@ config RADIO_AZTECH_PORT config RADIO_CADET tristate "ADS Cadet AM/FM Tuner" depends on ISA || COMPILE_TEST + depends on HAS_IOPORT help Choose Y here if you have one of these AM/FM radio cards, and then fill in the port address below.
@@ -270,6 +273,7 @@ config RADIO_CADET config RADIO_GEMTEK tristate "GemTek Radio card (or compatible) support" depends on ISA || COMPILE_TEST + depends on HAS_IOPORT select RADIO_ISA help Choose Y here if you have this FM radio card, and then fill in the
@@ -309,6 +313,7 @@ config RADIO_GEMTEK_PROBE config RADIO_ISA depends on ISA || COMPILE_TEST + depends on HAS_IOPORT tristate config RADIO_MIROPCM20
@@ -329,6 +334,7 @@ config RADIO_MIROPCM20 config RADIO_RTRACK tristate "AIMSlab RadioTrack (aka RadioReveal) support" depends on ISA || COMPILE_TEST + depends on HAS_IOPORT select RADIO_ISA help Choose Y here if you have one of these FM radio cards, and then fill
@@ -383,6 +389,7 @@ config RADIO_RTRACK_PORT config RADIO_SF16FMI tristate "SF16-FMI/SF16-FMP/SF16-FMD Radio" depends on ISA || COMPILE_TEST + depends on HAS_IOPORT help Choose Y here if you have one of these FM radio cards.
@@ -392,6 +399,7 @@ config RADIO_SF16FMI config RADIO_SF16FMR2 tristate "SF16-FMR2/SF16-FMD2 Radio" depends on ISA || COMPILE_TEST + depends on HAS_IOPORT select RADIO_TEA575X help Choose Y here if you have one of these FM radio cards.
@@ -402,6 +410,7 @@ config RADIO_SF16FMR2 config RADIO_TERRATEC tristate "TerraTec ActiveRadio ISA Standalone" depends on ISA || COMPILE_TEST + depends on HAS_IOPORT select RADIO_ISA help Choose Y here if you have this FM radio card.
@@ -416,6 +425,7 @@ config RADIO_TERRATEC config RADIO_TRUST tristate "Trust FM radio card" depends on ISA || COMPILE_TEST + depends on HAS_IOPORT select RADIO_ISA help This is a driver for the Trust FM radio cards. Say Y if you have
@@ -439,6 +449,7 @@ config RADIO_TRUST_PORT config RADIO_TYPHOON tristate "Typhoon Radio (a.k.a. EcoRadio)" depends on ISA || COMPILE_TEST + depends on HAS_IOPORT select RADIO_ISA help Choose Y here if you have one of these FM radio cards, and then fill
@@ -473,6 +484,7 @@ config RADIO_TYPHOON_PORT config RADIO_ZOLTRIX tristate "Zoltrix Radio" depends on ISA || COMPILE_TEST + depends on HAS_IOPORT select RADIO_ISA help Choose Y here if you have one of these FM radio cards, and then fill
drivers/media/rc/Kconfig +6 -0
@@ -148,6 +148,7 @@ if RC_DEVICES config IR_ENE tristate "ENE eHome Receiver/Transceiver (pnp id: ENE0100/ENE02xxx)" depends on PNP || COMPILE_TEST + depends on HAS_IOPORT help Say Y here to enable support for integrated infrared receiver /transceiver made by ENE.
@@ -161,6 +162,7 @@ config IR_ENE config IR_FINTEK tristate "Fintek Consumer Infrared Transceiver" depends on PNP || COMPILE_TEST + depends on HAS_IOPORT help Say Y here to enable support for integrated infrared receiver /transceiver made by Fintek. This chip is found on assorted
@@ -249,6 +251,7 @@ config IR_IMON_RAW config IR_ITE_CIR tristate "ITE Tech Inc. IT8712/IT8512 Consumer Infrared Transceiver" depends on PNP || COMPILE_TEST + depends on HAS_IOPORT help Say Y here to enable support for integrated infrared receivers /transceivers made by ITE Tech Inc. These are found in
@@ -301,6 +304,7 @@ config IR_MTK config IR_NUVOTON tristate "Nuvoton w836x7hg Consumer Infrared Transceiver" depends on PNP || COMPILE_TEST + depends on HAS_IOPORT help Say Y here to enable support for integrated infrared receiver /transceiver made by Nuvoton (formerly Winbond). This chip is
@@ -345,6 +349,7 @@ config IR_RX51 config IR_SERIAL tristate "Homebrew Serial Port Receiver" + depends on HAS_IOPORT help Say Y if you want to use Homebrew Serial Port Receivers and Transceivers.
@@ -412,6 +417,7 @@ config IR_TTUSBIR config IR_WINBOND_CIR tristate "Winbond IR remote control" depends on (X86 && PNP) || COMPILE_TEST + depends on HAS_IOPORT select NEW_LEDS select LEDS_CLASS select BITREVERSE
Signature · 1 line
2.37.2
PATCH v3 17/38 misc: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/misc/altera-stapl/Makefile | 3 ++- drivers/misc/altera-stapl/altera.c | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/misc/altera-stapl/Makefile +2 -1
@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -altera-stapl-objs = altera-lpt.o altera-jtag.o altera-comp.o altera.o +altera-stapl-y = altera-jtag.o altera-comp.o altera.o +altera-stapl-$(CONFIG_HAS_IOPORT) += altera-lpt.o obj-$(CONFIG_ALTERA_STAPL) += altera-stapl.o
drivers/misc/altera-stapl/altera.c +5 -1
@@ -2407,6 +2407,10 @@ int altera_init(struct altera_config *config, const struct firmware *fw) astate->config = config;if (!astate->config->jtag_io) { +if (!IS_ENABLED (CONFIG_HAS_IOPORT )) { + retval = -ENODEV ; + goto free_state; + }dprintk ("%s: using byteblaster!\n" , __func__); astate->config->jtag_io = netup_jtag_io_lpt; }
@@ -2481,7 +2485,7 @@ int altera_init(struct altera_config *config, const struct firmware *fw) }else if (exec_result)printk (KERN_ERR "%s: error %d\n" , __func__, exec_result); - +free_state:kfree (astate); free_value:kfree (value);
Signature · 1 line
2.37.2
PATCH v3 18/38 mISDN: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them. With that the !S390 dependency on ISDN can be removed as all drivers without HAS_IOPORT requirement now build.
--- drivers/isdn/Kconfig | 1 - drivers/isdn/hardware/mISDN/Kconfig | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-)
drivers/isdn/Kconfig +0 -1
@@ -6,7 +6,6 @@ menuconfig ISDN bool "ISDN support" depends on NET && NETDEVICES - depends on !S390 && !UML help ISDN ("Integrated Services Digital Network", called RNIS in France) is a fully digital telephone service that can be used for voice and
drivers/isdn/hardware/mISDN/Kconfig +6 -6
@@ -14,7 +14,7 @@ config MISDN_HFCPCI config MISDN_HFCMULTI tristate "Support for HFC multiport cards (HFC-4S/8S/E1)" - depends on PCI || CPM1 + depends on (PCI || CPM1) && HAS_IOPORT depends on MISDN help Enable support for cards with Cologne Chip AG's HFC multiport
@@ -43,7 +43,7 @@ config MISDN_HFCUSB config MISDN_AVMFRITZ tristate "Support for AVM FRITZ!CARD PCI" depends on MISDN - depends on PCI + depends on PCI && HAS_IOPORT select MISDN_IPAC help Enable support for AVMs FRITZ!CARD PCI cards
@@ -51,7 +51,7 @@ config MISDN_AVMFRITZ config MISDN_SPEEDFAX tristate "Support for Sedlbauer Speedfax+" depends on MISDN - depends on PCI + depends on PCI && HAS_IOPORT select MISDN_IPAC select MISDN_ISAR help
@@ -60,7 +60,7 @@ config MISDN_SPEEDFAX config MISDN_INFINEON tristate "Support for cards with Infineon chipset" depends on MISDN - depends on PCI + depends on PCI && HAS_IOPORT select MISDN_IPAC help Enable support for cards with ISAC + HSCX, IPAC or IPAC-SX
@@ -69,14 +69,14 @@ config MISDN_INFINEON config MISDN_W6692 tristate "Support for cards with Winbond 6692" depends on MISDN - depends on PCI + depends on PCI && HAS_IOPORT help Enable support for Winbond 6692 PCI chip based cards. config MISDN_NETJET tristate "Support for NETJet cards" depends on MISDN - depends on PCI + depends on PCI && HAS_IOPORT depends on TTY select MISDN_IPAC select MISDN_HDLC
Signature · 1 line
2.37.2
Re: [PATCH v3 18/38] mISDN: add HAS_IOPORT dependencies
Quoted 7 lines · On Tue, 14 Mar 2023 13:11:56 +0100 Niklas Schnelle wrote:
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them. With that the !S390 dependency on ISDN can be removed as all drivers withoutHAS_IOPORTrequirement now build.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>
I'm guessing this is going via some global route so:
PATCH v3 19/38 mpt fusion: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/message/fusion/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/message/fusion/Kconfig +1 -1
@@ -2,7 +2,7 @@ menuconfig FUSION bool "Fusion MPT device support" - depends on PCI + depends on PCI && HAS_IOPORT help Say Y here to get to see options for Fusion Message Passing Technology (MPT) drivers.
Signature · 1 line
2.37.2
PATCH v3 20/38 net: handle HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers requiring them. For the DEFXX driver there use of I/O ports is optional and we only need to fence those paths.can It also turns out that with HAS_IOPORT handled explicitly HAMRADIO does not need the !S390 dependency and successfully builds the bpqether driver.
--- drivers/net/Kconfig | 2 +- drivers/net/arcnet/Kconfig | 2 +- drivers/net/can/cc770/Kconfig | 1 + drivers/net/can/sja1000/Kconfig | 1 + drivers/net/ethernet/3com/Kconfig | 4 ++-- drivers/net/ethernet/8390/Kconfig | 6 +++--- drivers/net/ethernet/amd/Kconfig | 4 ++-- drivers/net/ethernet/fujitsu/Kconfig | 2 +- drivers/net/ethernet/intel/Kconfig | 2 +- drivers/net/ethernet/sis/Kconfig | 4 ++-- drivers/net/ethernet/smsc/Kconfig | 2 +- drivers/net/ethernet/ti/Kconfig | 2 +- drivers/net/ethernet/via/Kconfig | 1 + drivers/net/ethernet/xircom/Kconfig | 2 +- drivers/net/fddi/Kconfig | 2 +- drivers/net/fddi/defxx.c | 2 +- drivers/net/hamradio/Kconfig | 6 +++--- drivers/net/wan/Kconfig | 2 +- net/ax25/Kconfig | 2 +- 19 files changed, 26 insertions(+), 23 deletions(-)
drivers/net/Kconfig +1 -1
@@ -474,7 +474,7 @@ source "drivers/net/ipa/Kconfig" config NET_SB1000 tristate "General Instruments Surfboard 1000" - depends on PNP + depends on ISA && PNP help This is a driver for the General Instrument (also known as NextLevel) SURFboard 1000 internal
drivers/net/arcnet/Kconfig +1 -1
@@ -4,7 +4,7 @@ # menuconfig ARCNET - depends on NETDEVICES && (ISA || PCI || PCMCIA) + depends on NETDEVICES && (ISA || PCI || PCMCIA) && HAS_IOPORT tristate "ARCnet support" help If you have a network card of this type, say Y and check out the
drivers/net/can/cc770/Kconfig +1 -0
@@ -7,6 +7,7 @@ if CAN_CC770 config CAN_CC770_ISA tristate "ISA Bus based legacy CC770 driver" + depends on ISA help This driver adds legacy support for CC770 and AN82527 chips connected to the ISA bus using I/O port, memory mapped or
drivers/net/can/sja1000/Kconfig +1 -0
@@ -87,6 +87,7 @@ config CAN_PLX_PCI config CAN_SJA1000_ISA tristate "ISA Bus based legacy SJA1000 driver" + depends on ISA help This driver adds legacy support for SJA1000 chips connected to the ISA bus using I/O port, memory mapped or indirect access.
drivers/net/ethernet/3com/Kconfig +2 -2
@@ -44,7 +44,7 @@ config 3C515 config PCMCIA_3C574 tristate "3Com 3c574 PCMCIA support" - depends on PCMCIA + depends on PCMCIA && HAS_IOPORT help Say Y here if you intend to attach a 3Com 3c574 or compatible PCMCIA (PC-card) Fast Ethernet card to your computer.
@@ -54,7 +54,7 @@ config PCMCIA_3C574 config PCMCIA_3C589 tristate "3Com 3c589 PCMCIA support" - depends on PCMCIA + depends on PCMCIA && HAS_IOPORT help Say Y here if you intend to attach a 3Com 3c589 or compatible PCMCIA (PC-card) Ethernet card to your computer.
drivers/net/ethernet/8390/Kconfig +3 -3
@@ -19,7 +19,7 @@ if NET_VENDOR_8390 config PCMCIA_AXNET tristate "Asix AX88190 PCMCIA support" - depends on PCMCIA + depends on PCMCIA && HAS_IOPORT help Say Y here if you intend to attach an Asix AX88190-based PCMCIA (PC-card) Fast Ethernet card to your computer. These cards are
@@ -117,7 +117,7 @@ config NE2000 config NE2K_PCI tristate "PCI NE2000 and clones support (see help)" - depends on PCI + depends on PCI && HAS_IOPORT select CRC32 help This driver is for NE2000 compatible PCI cards. It will not work
@@ -146,7 +146,7 @@ config APNE config PCMCIA_PCNET tristate "NE2000 compatible PCMCIA support" - depends on PCMCIA + depends on PCMCIA && HAS_IOPORT select CRC32 help Say Y here if you intend to attach an NE2000 compatible PCMCIA
drivers/net/ethernet/amd/Kconfig +2 -2
@@ -56,7 +56,7 @@ config LANCE config PCNET32 tristate "AMD PCnet32 PCI support" - depends on PCI + depends on PCI && HAS_IOPORT select CRC32 select MII help
@@ -122,7 +122,7 @@ config MVME147_NET config PCMCIA_NMCLAN tristate "New Media PCMCIA support" - depends on PCMCIA + depends on PCMCIA && HAS_IOPORT help Say Y here if you intend to attach a New Media Ethernet or LiveWire PCMCIA (PC-card) Ethernet card to your computer.
drivers/net/ethernet/fujitsu/Kconfig +1 -1
@@ -18,7 +18,7 @@ if NET_VENDOR_FUJITSU config PCMCIA_FMVJ18X tristate "Fujitsu FMV-J18x PCMCIA support" - depends on PCMCIA + depends on PCMCIA && HAS_IOPORT select CRC32 help Say Y here if you intend to attach a Fujitsu FMV-J18x or compatible
drivers/net/ethernet/intel/Kconfig +1 -1
@@ -41,7 +41,7 @@ config E100 config E1000 tristate "Intel(R) PRO/1000 Gigabit Ethernet support" - depends on PCI + depends on PCI && HAS_IOPORT help This driver supports Intel(R) PRO/1000 gigabit ethernet family of adapters. For more information on how to identify your adapter, go
drivers/net/ethernet/sis/Kconfig +2 -2
@@ -19,7 +19,7 @@ if NET_VENDOR_SIS config SIS900 tristate "SiS 900/7016 PCI Fast Ethernet Adapter support" - depends on PCI + depends on PCI && HAS_IOPORT select CRC32 select MII help
@@ -35,7 +35,7 @@ config SIS900 config SIS190 tristate "SiS190/SiS191 gigabit ethernet support" - depends on PCI + depends on PCI && HAS_IOPORT select CRC32 select MII help
drivers/net/ethernet/smsc/Kconfig +1 -1
@@ -54,7 +54,7 @@ config SMC91X config PCMCIA_SMC91C92 tristate "SMC 91Cxx PCMCIA support" - depends on PCMCIA + depends on PCMCIA && HAS_IOPORT select CRC32 select MII help
drivers/net/ethernet/ti/Kconfig +1 -1
@@ -161,7 +161,7 @@ config TI_KEYSTONE_NETCP_ETHSS config TLAN tristate "TI ThunderLAN support" - depends on (PCI || EISA) + depends on (PCI || EISA) && HAS_IOPORT help If you have a PCI Ethernet network card based on the ThunderLAN chip which is supported by this driver, say Y here.
drivers/net/ethernet/via/Kconfig +1 -0
@@ -20,6 +20,7 @@ config VIA_RHINE tristate "VIA Rhine support" depends on PCI || (OF_IRQ && GENERIC_PCI_IOMAP) depends on PCI || ARCH_VT8500 || COMPILE_TEST + depends on HAS_IOPORT depends on HAS_DMA select CRC32 select MII
drivers/net/ethernet/xircom/Kconfig +1 -1
@@ -19,7 +19,7 @@ if NET_VENDOR_XIRCOM config PCMCIA_XIRC2PS tristate "Xircom 16-bit PCMCIA support" - depends on PCMCIA + depends on PCMCIA && HAS_IOPORT help Say Y here if you intend to attach a Xircom 16-bit PCMCIA (PC-card) Ethernet or Fast Ethernet card to your computer.
drivers/net/fddi/Kconfig +1 -1
@@ -29,7 +29,7 @@ config DEFZA config DEFXX tristate "Digital DEFTA/DEFEA/DEFPA adapter support" - depends on FDDI && (PCI || EISA || TC) + depends on FDDI && (PCI || EISA || TC) && HAS_IOPORT help This is support for the DIGITAL series of TURBOchannel (DEFTA), EISA (DEFEA) and PCI (DEFPA) controllers which can connect you
drivers/net/fddi/defxx.c +1 -1
@@ -254,7 +254,7 @@ static const char version[] =#define DFX_BUS_TC (dev) 0#endif -#if defined(CONFIG_EISA ) || defined(CONFIG_PCI ) +#ifdef HAS_IOPORT #define dfx_use_mmio bp->mmio#else #define dfx_use_mmio true
drivers/net/hamradio/Kconfig +3 -3
@@ -83,7 +83,7 @@ config SCC_TRXECHO config BAYCOM_SER_FDX tristate "BAYCOM ser12 fullduplex driver for AX.25" - depends on AX25 && !S390 + depends on AX25 && HAS_IOPORT select CRC_CCITT help This is one of two drivers for Baycom style simple amateur radio
@@ -103,7 +103,7 @@ config BAYCOM_SER_FDX config BAYCOM_SER_HDX tristate "BAYCOM ser12 halfduplex driver for AX.25" - depends on AX25 && !S390 + depends on AX25 && HAS_IOPORT select CRC_CCITT help This is one of two drivers for Baycom style simple amateur radio
@@ -151,7 +151,7 @@ config BAYCOM_EPP config YAM tristate "YAM driver for AX.25" - depends on AX25 && !S390 + depends on AX25 && HAS_IOPORT help The YAM is a modem for packet radio which connects to the serial port and includes some of the functions of a Terminal Node
drivers/net/wan/Kconfig +1 -1
@@ -178,7 +178,7 @@ config C101 config FARSYNC tristate "FarSync T-Series support" - depends on HDLC && PCI + depends on HDLC && PCI && HAS_IOPORT help Support for the FarSync T-Series X.21 (and V.35/V.24) cards by FarSite Communications Ltd.
net/ax25/Kconfig +1 -1
@@ -4,7 +4,7 @@ # menuconfig HAMRADIO - depends on NET && !S390 + depends on NET bool "Amateur Radio support" help If you want to connect your Linux box to an amateur radio, answer Y
Signature · 1 line
2.37.2
Re: [PATCH v3 20/38] net: handle HAS_IOPORT dependencies
Quoted 6 lines · On Tue, 14 Mar 2023 13:11:58 +0100 Niklas Schnelle wrote:
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers requiring them. For the DEFXX driver there use of I/O ports is optional and we only need to fence those paths.can It also turns out that withHAS_IOPORThandled explicitly HAMRADIO does not need the !S390 dependency and successfully builds the bpqether driver.
Maciej W. Rozycki
maintainerRe: [PATCH v3 20/38] net: handle HAS_IOPORT dependencies
In reply to Niklas SchnelleQuoted 2 lines · Niklas Schnelle
those drivers requiring them. For the DEFXX driver there use of I/O ports is optional and we only need to fence those paths.can It also
Some writing mess-up here, should it read:
"For the DEFXX driver the use of I/O ports is optional and we only need to fence those paths. It also [...]"
?
drivers/net/fddi/Kconfig config DEFZA · line 32
Quoted 10 lines
drivers/net/fddi/Kconfig +1
-1@@ -29,7 +29,7 @@ config DEFZA config DEFXX tristate "Digital DEFTA/DEFEA/DEFPA adapter support" - depends on FDDI && (PCI || EISA || TC) + depends on FDDI && (PCI || EISA || TC) && HAS_IOPORT
This part would incorrectly disable the driver for !HAS_IOPORT and is not
needed given the change below:
drivers/net/fddi/defxx.c static const char version[] = · line 260
Quoted 13 lines
drivers/net/fddi/defxx.c +1
-1@@ -254,7 +254,7 @@ static const char version[] =#define DFX_BUS_TC (dev) 0#endif -#if defined(CONFIG_EISA ) || defined(CONFIG_PCI ) +#ifdef HAS_IOPORT #define dfx_use_mmio bp->mmio#else #define dfx_use_mmio true
is it?
Maciej
PATCH v3 21/38 parport: PC style parport depends on HAS_IOPORT
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. As PC style parport uses these functions we need to handle this dependency.
--- drivers/parport/Kconfig | 4 ++-- include/linux/parport.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/parport/Kconfig +2 -2
@@ -14,7 +14,6 @@ config ARCH_MIGHT_HAVE_PC_PARPORT menuconfig PARPORT tristate "Parallel port support" - depends on HAS_IOMEM help If you want to use devices connected to your machine's parallel port (the connector at the computer with 25 holes), e.g. printer, ZIP
@@ -42,7 +41,8 @@ if PARPORT config PARPORT_PC tristate "PC-style hardware" - depends on ARCH_MIGHT_HAVE_PC_PARPORT || (PCI && !S390) + depends on ARCH_MIGHT_HAVE_PC_PARPORT + depends on HAS_IOPORT help You should say Y here if you have a PC-style parallel port. All IBM PC compatible computers and some Alphas have PC-style
include/linux/parport.h +1 -1
@@ -514,7 +514,7 @@ extern int parport_device_proc_register(struct pardevice *device);extern int parport_device_proc_unregister (struct pardevice *device);/* If PC hardware is the only type supported, we can optimise a bit. */ -#if !defined(CONFIG_PARPORT_NOT_PC ) +#if !defined(CONFIG_PARPORT_NOT_PC ) && defined(CONFIG_PARPORT_PC )#include <linux/parport_pc.h> #define parport_write_data (p,x) parport_pc_write_data(p,x)
Signature · 1 line
2.37.2
Arnd Bergmann
maintainerRe: [PATCH v3 21/38] parport: PC style parport depends on HAS_IOPORT
drivers/parport/Kconfig config ARCH_MIGHT_HAVE_PC_PARPORT · line 17
Quoted 11 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. As PC style parport uses these functions we need to handle this dependency.
Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>menuconfig PARPORT
drivers/parport/Kconfig +0
-1tristate "Parallel port support" - depends on HAS_IOMEM
I would leave this dependency, or maybe make it 'HAS_IOMEM || HAS_IOPORT'. at least the parport_atari driver uses MMIO instead of PIO.
drivers/parport/Kconfig if PARPORT · line 48
Quoted 13 lines
drivers/parport/Kconfig +2
-1help If you want to use devices connected to your machine's parallel port (the connector at the computer with 25 holes), e.g. printer, ZIP@@ -42,7 +41,8 @@ if PARPORT config PARPORT_PC tristate "PC-style hardware" - depends on ARCH_MIGHT_HAVE_PC_PARPORT || (PCI && !S390) + depends on ARCH_MIGHT_HAVE_PC_PARPORT + depends on HAS_IOPORT help You should say Y here if you have a PC-style parallel port. All IBM PC compatible computers and some Alphas have PC-style
This would revert 66bcd06099bb ("parport_pc: Also enable driver for PCI systems"), so I think this is wrong. You can drop the !S390 by adding HAS_IOPORT as a dependency, but the other line should still be
depends on ARCH_MIGHT_HAVE_PC_PARPORT || PCI
ArndRe: [PATCH v3 21/38] parport: PC style parport depends on HAS_IOPORT
Quoted 35 lines · Arnd Bergmann
Quoted 35 lines · Niklas Schnelle
Quoted 11 lines
drivers/parport/Kconfig config ARCH_MIGHT_HAVE_PC_PARPORT · line 17
Quoted 11 lines
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. As PC style parport uses these functions we need to handle this dependency.
Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>menuconfig PARPORT
drivers/parport/Kconfig +0
-1tristate "Parallel port support" - depends on HAS_IOMEMI would leave this dependency, or maybe make it '
HAS_IOMEM||HAS_IOPORT'. at least theparport_ataridriver uses MMIO instead of PIO.Quoted 5 lines
Quoted 5 lines
drivers/parport/Kconfig +0
-0help If you want to use devices connected to your machine's parallel port (the connector at the computer with 25 holes), e.g. printer, ZIP@@ -42,7 +41,8 @@ if PARPORTQuoted 8 lines
drivers/parport/Kconfig if PARPORT · line 48
Quoted 8 lines
drivers/parport/Kconfig +2
-1config PARPORT_PC tristate "PC-style hardware" - depends on ARCH_MIGHT_HAVE_PC_PARPORT || (PCI && !S390) + depends on ARCH_MIGHT_HAVE_PC_PARPORT + depends on HAS_IOPORT help You should say Y here if you have a PC-style parallel port. All IBM PC compatible computers and some Alphas have PC-styleThis would revert
66bcd06099bb("parport_pc: Also enable driver for PCI systems"), so I think this is wrong. You can drop the !S390 by addingHAS_IOPORTas a dependency, but the other line should still be
Quoted 4 lines
Quoted 4 lines
depends on ARCH_MIGHT_HAVE_PC_PARPORT || PCI Arnd
Ok changed for v4. Just saw that commit even nicely references our lack of I/O ports :-)
Re: [PATCH v3 21/38] parport: PC style parport depends on HAS_IOPORT
In reply to Niklas SchnelleThe wording of this subject line is a bit ambiguous and doesn't quite say what the patch does.
It reads like a statement of fact, i.e., "this is the current state," but I think the patch actually *adds* a HAS_IOPORT dependency like many of the other patches.
I guess it also *removes* a HAS_IOMEM dependency; I didn't investigate to figure out why that is or whether it's even related (I guess it is, but I don't know how).
Quoted 49 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. As PC style parport uses these functions we need to handle this dependency.
Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/parport/Kconfig | 4 ++-- include/linux/parport.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)drivers/parport/Kconfig +2
-2@@ -14,7 +14,6 @@ config ARCH_MIGHT_HAVE_PC_PARPORT menuconfig PARPORT tristate "Parallel port support" - depends on HAS_IOMEM help If you want to use devices connected to your machine's parallel port (the connector at the computer with 25 holes), e.g. printer, ZIP@@ -42,7 +41,8 @@ if PARPORT config PARPORT_PC tristate "PC-style hardware" - depends on ARCH_MIGHT_HAVE_PC_PARPORT || (PCI && !S390) + depends on ARCH_MIGHT_HAVE_PC_PARPORT + depends on HAS_IOPORT help You should say Y here if you have a PC-style parallel port. All IBM PC compatible computers and some Alphas have PC-styleinclude/linux/parport.h +1
-1@@ -514,7 +514,7 @@ extern int parport_device_proc_register(struct pardevice *device);extern int parport_device_proc_unregister (struct pardevice *device);/* If PC hardware is the only type supported, we can optimise a bit. */ -#if !defined(CONFIG_PARPORT_NOT_PC ) +#if !defined(CONFIG_PARPORT_NOT_PC ) && defined(CONFIG_PARPORT_PC )#include <linux/parport_pc.h> #define parport_write_data (p,x) parport_pc_write_data(p,x)Signature · 1 line
2.37.2
PATCH v3 22/38 PCI: Make quirk using inw() depend on HAS_IOPORT
In reply to Niklas SchnelleIn the future inw() and friends will not be compiled on architectures without I/O port support.
--- drivers/pci/quirks.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pci/quirks.c +2 -0
@@ -268,6 +268,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_2, quirk_isa_dDECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_NEC ,PCI_DEVICE_ID_NEC_CBUS_3 , quirk_isa_dma_hangs);#endif +#ifdef CONFIG_HAS_IOPORT /* * Intel NM10 "TigerPoint" LPC PM1a_STS.BM_STS must be clear * for some HT machines to use C4 w/o hanging.
@@ -287,6 +288,7 @@ static void quirk_tigerpoint_bm_sts(struct pci_dev *dev) } }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_TGP_LPC , quirk_tigerpoint_bm_sts); +#endif /* Chipsets where PCI->PCI transfers vanish or hang */ static void quirk_nopcipci (struct pci_dev *dev)
Signature · 1 line
2.37.2
PATCH v3 23/38 PCI/sysfs: Make I/O resource depend on HAS_IOPORT
In reply to Niklas SchnelleIf legacy I/O spaces are not supported simply return an error when trying to access them via pci_resource_io(). This allows inb() and friends to become undefined when they are known at compile time to be non-functional in a later patch.
--- drivers/pci/pci-sysfs.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/pci/pci-sysfs.c +4 -0
@@ -1083,6 +1083,7 @@ static ssize_t pci_resource_io(struct file *filp, struct kobject *kobj, struct bin_attribute *attr, char *buf, loff_t off, size_t count, bool write) { +#ifdef CONFIG_HAS_IOPORT struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj));int bar = (unsigned long )attr->private;unsigned long port = off;
@@ -1116,6 +1117,9 @@ static ssize_t pci_resource_io(struct file *filp, struct kobject *kobj,return 4 ; }return -EINVAL ; +#else +return -ENXIO ; +#endif } static ssize_t pci_read_resource_io(struct file *filp, struct kobject *kobj,
Signature · 1 line
2.37.2
Re: [PATCH v3 23/38] PCI/sysfs: Make I/O resource depend on HAS_IOPORT
Quoted 7 lines · Niklas Schnelle
If legacy I/O spaces are not supported simply return an error when trying to access them via
pci_resource_io(). This allowsinb()and friends to become undefined when they are known at compile time to be non-functional in a later patch.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>
Quoted 29 lines
--- drivers/pci/pci-sysfs.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/pci/pci-sysfs.c +4
-0@@ -1083,6 +1083,7 @@ static ssize_t pci_resource_io(struct file *filp, struct kobject *kobj, struct bin_attribute *attr, char *buf, loff_t off, size_t count, bool write) { +#ifdef CONFIG_HAS_IOPORT struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj));int bar = (unsigned long )attr->private;unsigned long port = off;@@ -1116,6 +1117,9 @@ static ssize_t pci_resource_io(struct file *filp, struct kobject *kobj,return 4 ; }return -EINVAL ; +#else +return -ENXIO ; +#endif } static ssize_t pci_read_resource_io(struct file *filp, struct kobject *kobj,Signature · 1 line
2.37.2
PATCH v3 24/38 pcmcia: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. Add dependencies for those drivers that use them.
--- drivers/pcmcia/Kconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/pcmcia/Kconfig +2 -3
@@ -5,7 +5,6 @@ menuconfig PCCARD tristate "PCCard (PCMCIA/CardBus) support" - depends on !UML help Say Y here if you want to attach PCMCIA- or PC-cards to your Linux computer. These are credit-card size devices such as network cards,
@@ -113,7 +112,7 @@ config YENTA_TOSHIBA config PD6729 tristate "Cirrus PD6729 compatible bridge support" - depends on PCMCIA && PCI + depends on PCMCIA && PCI && HAS_IOPORT select PCCARD_NONSTATIC help This provides support for the Cirrus PD6729 PCI-to-PCMCIA bridge
@@ -121,7 +120,7 @@ config PD6729 config I82092 tristate "i82092 compatible bridge support" - depends on PCMCIA && PCI + depends on PCMCIA && PCI && HAS_IOPORT select PCCARD_NONSTATIC help This provides support for the Intel I82092AA PCI-to-PCMCIA bridge device,
Signature · 1 line
2.37.2
PATCH v3 25/38 platform: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/platform/chrome/Kconfig | 1 + drivers/platform/chrome/wilco_ec/Kconfig | 1 + 2 files changed, 2 insertions(+)
drivers/platform/chrome/Kconfig +1 -0
@@ -132,6 +132,7 @@ config CROS_EC_UART config CROS_EC_LPC tristate "ChromeOS Embedded Controller (LPC)" depends on CROS_EC && ACPI && (X86 || COMPILE_TEST) + depends on HAS_IOPORT help If you say Y here, you get support for talking to the ChromeOS EC over an LPC bus, including the LPC Microchip EC (MEC) variant.
drivers/platform/chrome/wilco_ec/Kconfig +1 -0
@@ -3,6 +3,7 @@ config WILCO_EC tristate "ChromeOS Wilco Embedded Controller" depends on X86 || COMPILE_TEST depends on ACPI && CROS_EC_LPC && LEDS_CLASS + depends on HAS_IOPORT help If you say Y here, you get support for talking to the ChromeOS Wilco EC over an eSPI bus. This uses a simple byte-level protocol
Signature · 1 line
2.37.2
Re: [PATCH v3 25/38] platform: add HAS_IOPORT dependencies
Quoted 6 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>
PATCH v3 26/38 pnp: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to depend on HAS_IOPORT even when compile testing only.
--- drivers/pnp/isapnp/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pnp/isapnp/Kconfig +1 -1
@@ -4,7 +4,7 @@ # config ISAPNP bool "ISA Plug and Play support" - depends on ISA || COMPILE_TEST + depends on ISA || (HAS_IOPORT && COMPILE_TEST) help Say Y here if you would like support for ISA Plug and Play devices. Some information is in <file:Documentation/driver-api/isapnp.rst>.
Signature · 1 line
2.37.2
Re: [PATCH v3 26/38] pnp: add HAS_IOPORT dependencies
Quoted 16 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to depend on
HAS_IOPORTeven when compile testing only.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/pnp/isapnp/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pnp/isapnp/Kconfig +0
-0
drivers/pnp/isapnp/Kconfig
Quoted 9 lines
drivers/pnp/isapnp/Kconfig +1
-2@@ -4,7 +4,7 @@ # config ISAPNP bool "ISA Plug and Play support" - depends on ISA || COMPILE_TEST + depends on ISA || (HAS_IOPORT && COMPILE_TEST) help Say Y here if you would like support for ISA Plug and Play devices. Some information is in <file:Documentation/driver-api/isapnp.rst>. --
Applied as 6.4 material, thanks!
Rafael J. Wysocki
maintainerRe: [PATCH v3 26/38] pnp: add HAS_IOPORT dependencies
Quoted 13 lines · Rafael J. Wysocki
Quoted 11 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to depend on
HAS_IOPORTeven when compile testing only.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/pnp/isapnp/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 10 lines
drivers/pnp/isapnp/Kconfig line 7
Quoted 10 lines
drivers/pnp/isapnp/Kconfig +1
-1@@ -4,7 +4,7 @@ # config ISAPNP bool "ISA Plug and Play support" - depends on ISA || COMPILE_TEST + depends on ISA || (HAS_IOPORT && COMPILE_TEST)
This breaks code selecting ISAPNP and not depending on it. See
https://lore.kernel.org/linux-acpi/[email protected]/T/#u
for example.
I'm dropping the patch now, please fix and resend.
Quoted 6 lines
drivers/pnp/isapnp/Kconfig
Quoted 4 lines
drivers/pnp/isapnp/Kconfig +0
-1help Say Y here if you would like support for ISA Plug and Play devices. Some information is in <file:Documentation/driver-api/isapnp.rst>. --Applied as 6.4 material, thanks!
Re: [PATCH v3 26/38] pnp: add HAS_IOPORT dependencies
Quoted 29 lines · Rafael J. Wysocki
Quoted 13 lines · Rafael J. Wysocki
Quoted 11 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to depend on
HAS_IOPORTeven when compile testing only.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/pnp/isapnp/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Quoted 10 lines
drivers/pnp/isapnp/Kconfig line 7
Quoted 10 lines
drivers/pnp/isapnp/Kconfig +1
-1@@ -4,7 +4,7 @@ # config ISAPNP bool "ISA Plug and Play support" - depends on ISA || COMPILE_TEST + depends on ISA || (HAS_IOPORT && COMPILE_TEST)This breaks code selecting ISAPNP and not depending on it. See
https://lore.kernel.org/linux-acpi/[email protected]/T/#u
for example.
Quoted 3 lines
I'm dropping the patch now, please fix and resend.
Quoted 1 line
Sorry if this wasn't super clear but all patches in this series depend on patch 1 which introduces the HAS_IOPORT Kconfig option. There's really two options, either the whole series goes via e.g. Arnd's tree at once or we first only merge patch 1 and then add the rest per subsystem until finally the last patch can remove inb()/outb() when HAS_IOPORT is unset.
That said I'm a little unsure about the linked error if that is just due to missing HAS_IOPORT or something else. I'll still have to try with the instructions in that mail and will report back if it is something else.
Thanks,
Niklas
Re: [PATCH v3 26/38] pnp: add HAS_IOPORT dependencies
Quoted 27 lines · Niklas Schnelle
Quoted 26 lines · Rafael J. Wysocki
Quoted 11 lines · Rafael J. Wysocki
Quoted 10 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to depend on
HAS_IOPORTeven when compile testing only.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/pnp/isapnp/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Quoted 10 lines
drivers/pnp/isapnp/Kconfig line 7
Quoted 10 lines
drivers/pnp/isapnp/Kconfig +1
-1@@ -4,7 +4,7 @@ # config ISAPNP bool "ISA Plug and Play support" - depends on ISA || COMPILE_TEST + depends on ISA || (HAS_IOPORT && COMPILE_TEST)This breaks code selecting ISAPNP and not depending on it. See
https://lore.kernel.org/linux-acpi/[email protected]/T/#u
for example.
Quoted 8 lines
Quoted 2 lines
I'm dropping the patch now, please fix and resend.
Sorry if this wasn't super clear but all patches in this series depend on patch 1 which introduces the
HAS_IOPORTKconfigoption. There's really two options, either the whole series goes via e.g. Arnd's tree at once or we first only merge patch 1 and then add the rest per subsystem until finally the last patch can remove inb()/outb() whenHAS_IOPORTis unset.
Well, it looks like you need to decide on the approach then and tell people what it is.
If I see an individual patch without context, this is quite hard to figure out.
Quoted 7 lines
That said I'm a little unsure about the linked error if that is just due to missing
HAS_IOPORTor something else. I'll still have to try with the instructions in that mail and will report back if it is something else.Thanks,
Niklas
PATCH v3 27/38 power: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/power/reset/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/power/reset/Kconfig +1 -0
@@ -158,6 +158,7 @@ config POWER_RESET_OXNAS config POWER_RESET_PIIX4_POWEROFF tristate "Intel PIIX4 power-off driver" depends on PCI + depends on HAS_IOPORT depends on MIPS || COMPILE_TEST help This driver supports powering off a system using the Intel PIIX4
Signature · 1 line
2.37.2
Re: [PATCH v3 27/38] power: add HAS_IOPORT dependencies
Hi,
Quoted 7 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>---
-- Sebastian
Quoted 18 lines
drivers/power/reset/Kconfig | 1 + 1 file changed, 1 insertion(+)drivers/power/reset/Kconfig +1
-0@@ -158,6 +158,7 @@ config POWER_RESET_OXNAS config POWER_RESET_PIIX4_POWEROFF tristate "Intel PIIX4 power-off driver" depends on PCI + depends on HAS_IOPORT depends on MIPS || COMPILE_TEST help This driver supports powering off a system using the Intel PIIX4Signature · 1 line
2.37.2
PATCH v3 28/38 rtc: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/rtc/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/rtc/Kconfig +3 -1
@@ -956,6 +956,7 @@ comment "Platform RTC drivers" config RTC_DRV_CMOS tristate "PC-style 'CMOS'" depends on X86 || ARM || PPC || MIPS || SPARC64 + depends on HAS_IOPORT default y if X86 select RTC_MC146818_LIB help
@@ -976,6 +977,7 @@ config RTC_DRV_CMOS config RTC_DRV_ALPHA bool "Alpha PC-style CMOS" depends on ALPHA + depends on HAS_IOPORT select RTC_MC146818_LIB default y help
@@ -1193,7 +1195,7 @@ config RTC_DRV_MSM6242 config RTC_DRV_BQ4802 tristate "TI BQ4802" - depends on HAS_IOMEM + depends on HAS_IOMEM && HAS_IOPORT help If you say Y here you will get support for the TI BQ4802 RTC chip.
Signature · 1 line
2.37.2
Alexandre Belloni
maintainerRe: [PATCH v3 28/38] rtc: add HAS_IOPORT dependencies
Hello,
Quoted 15 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/rtc/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/rtc/Kconfig +0
-0
drivers/rtc/Kconfig comment "Platform RTC drivers" · line 959
Quoted 4 lines
drivers/rtc/Kconfig +1
-0@@ -956,6 +956,7 @@ comment "Platform RTC drivers" config RTC_DRV_CMOS tristate "PC-style 'CMOS'" depends on X86 || ARM || PPC || MIPS || SPARC64 + depends on HAS_IOPORT
Did you check that this will not break platforms that doesn't have RTC_PORT defined?
Quoted 23 lines
drivers/rtc/Kconfig +2
-1default y if X86 select RTC_MC146818_LIB help@@ -976,6 +977,7 @@ config RTC_DRV_CMOS config RTC_DRV_ALPHA bool "Alpha PC-style CMOS" depends on ALPHA + depends on HAS_IOPORT select RTC_MC146818_LIB default y help@@ -1193,7 +1195,7 @@ config RTC_DRV_MSM6242 config RTC_DRV_BQ4802 tristate "TI BQ4802" - depends on HAS_IOMEM + depends on HAS_IOMEM && HAS_IOPORT help If you say Y here you will get support for the TI BQ4802 RTC chip.Signature · 1 line
2.37.2
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [PATCH v3 28/38] rtc: add HAS_IOPORT dependencies
Quoted 13 lines · Alexandre Belloni
Hello,
Quoted 10 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/rtc/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Quoted 12 lines
drivers/rtc/Kconfig comment "Platform RTC drivers" · line 959
Quoted 9 lines
drivers/rtc/Kconfig +1
-0@@ -956,6 +956,7 @@ comment "Platform RTC drivers" config RTC_DRV_CMOS tristate "PC-style 'CMOS'" depends on X86 || ARM || PPC || MIPS || SPARC64 + depends on HAS_IOPORTDid you check that this will not break platforms that doesn't have
RTC_PORTdefined?Quoted 1 line
From what I can tell the CMOS_READ() macro this driver relies on uses some form of inb() style I/O port access in all its definitions. So my understanding is that this device is always accessed via I/O ports even if the variants differ slightly and would make no sense on a platform without any way of accessing I/O ports which is what lack of HAS_IOPORT means. From what I can see even without RTC_PORT being defined the CMOS_READ is still used. Hope that answers your question?
Arnd Bergmann
maintainerRe: [PATCH v3 28/38] rtc: add HAS_IOPORT dependencies
Quoted 27 lines · Niklas Schnelle
Quoted 13 lines · Alexandre Belloni
Hello,
Quoted 10 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/rtc/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)Quoted 12 lines
drivers/rtc/Kconfig comment "Platform RTC drivers" · line 959
Quoted 9 lines
drivers/rtc/Kconfig +1
-0@@ -956,6 +956,7 @@ comment "Platform RTC drivers" config RTC_DRV_CMOS tristate "PC-style 'CMOS'" depends on X86 || ARM || PPC || MIPS || SPARC64 + depends on HAS_IOPORTDid you check that this will not break platforms that doesn't have
RTC_PORTdefined?Quoted 1 line
Quoted 7 lines
From what I can tell the
CMOS_READ()macro this driver relies on uses some form ofinb()style I/O port access in all its definitions. So my understanding is that this device is always accessed via I/O ports even if the variants differ slightly and would make no sense on a platform without any way of accessing I/O ports which is what lack ofHAS_IOPORTmeans. From what I can see even withoutRTC_PORTbeing defined theCMOS_READis still used. Hope that answers your question?
I think the m68k/atari and mips/dec variants don't necessarily qualify as PIO, those are really just pointer dereferences, and they don't use the actual inb/outb functions.
On atari, it looks like HAS_IOPORT may be set if ATARI_ROM_ISA is, but on dec it's never enabled.
Arnd
Geert Uytterhoeven
maintainerRe: [PATCH v3 28/38] rtc: add HAS_IOPORT dependencies
Hi Arnd,
Quoted 34 lines · Arnd Bergmann
Quoted 25 lines · Niklas Schnelle
Quoted 11 lines · Alexandre Belloni
Quoted 10 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>--- drivers/rtc/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)Quoted 12 lines
drivers/rtc/Kconfig comment "Platform RTC drivers" · line 959
Quoted 9 lines
drivers/rtc/Kconfig +1
-0@@ -956,6 +956,7 @@ comment "Platform RTC drivers" config RTC_DRV_CMOS tristate "PC-style 'CMOS'" depends on X86 || ARM || PPC || MIPS || SPARC64 + depends on HAS_IOPORTDid you check that this will not break platforms that doesn't have
RTC_PORTdefined?Quoted 1 line
Quoted 7 lines
From what I can tell the
CMOS_READ()macro this driver relies on uses some form ofinb()style I/O port access in all its definitions. So my understanding is that this device is always accessed via I/O ports even if the variants differ slightly and would make no sense on a platform without any way of accessing I/O ports which is what lack ofHAS_IOPORTmeans. From what I can see even withoutRTC_PORTbeing defined theCMOS_READis still used. Hope that answers your question?
Quoted 6 lines
I think the m68k/atari and mips/dec variants don't necessarily qualify as PIO, those are really just pointer dereferences, and they don't use the actual inb/outb functions.
On atari, it looks like
HAS_IOPORTmay be set ifATARI_ROM_ISAis, but on dec it's never enabled.
Atari does not use RTC_DRV_CMOS, but still relies on generic RTC instead.
Last time (in 2013?) I tried converting to RTC_DRV_CMOS by registering an "rtc_cmos" platform device, I couldn't get it to work.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Arnd Bergmann
maintainerRe: [PATCH v3 28/38] rtc: add HAS_IOPORT dependencies
Quoted 7 lines · Geert Uytterhoeven
Quoted 6 lines · Arnd Bergmann
On Mon, May 8, 2023, at 17:36, Niklas Schnelle wrote:
I think the m68k/atari and mips/dec variants don't necessarily qualify as PIO, those are really just pointer dereferences, and they don't use the actual inb/outb functions.
Quoted 5 lines
Quoted 2 lines
On atari, it looks like
HAS_IOPORTmay be set ifATARI_ROM_ISAis, but on dec it's never enabled.Atari does not use
RTC_DRV_CMOS, but still relies on generic RTC instead.
Ah right, I now remember working on that code, so we're good on m68k then. I think it should work for everyone using
depends on HAS_IOPORT || ARCH_DECSTATION
in that case, as that is the only exception.
Quoted 2 lines
Last time (in 2013?) I tried converting to
RTC_DRV_CMOSby registering an "rtc_cmos" platform device, I couldn't get it to work.
If you ever want to revisit this, I suspect the harder part here is to detach arch/m68k/ from the RTC_DRV_GENERIC code first, pushing the device registration into the individual machine specific time.c code. It's probably not even worth trying to share the rtc-cmos driver, but it might be useful to share the library code like RTC_DRV_ALPHA does.
Arnd
Geert Uytterhoeven
maintainerRe: [PATCH v3 28/38] rtc: add HAS_IOPORT dependencies
Hi Arnd,
Quoted 24 lines · Arnd Bergmann
Quoted 7 lines · Geert Uytterhoeven
Quoted 6 lines · Arnd Bergmann
On Mon, May 8, 2023, at 17:36, Niklas Schnelle wrote:
I think the m68k/atari and mips/dec variants don't necessarily qualify as PIO, those are really just pointer dereferences, and they don't use the actual inb/outb functions.
Quoted 5 lines
Quoted 2 lines
On atari, it looks like
HAS_IOPORTmay be set ifATARI_ROM_ISAis, but on dec it's never enabled.Atari does not use
RTC_DRV_CMOS, but still relies on generic RTC instead.Ah right, I now remember working on that code, so we're good on m68k then. I think it should work for everyone using
depends on HAS_IOPORT || ARCH_DECSTATIONin that case, as that is the only exception.
Quoted 2 lines
Last time (in 2013?) I tried converting to
RTC_DRV_CMOSby registering an "rtc_cmos" platform device, I couldn't get it to work.
Quoted 6 lines
If you ever want to revisit this, I suspect the harder part here is to detach
arch/m68k/from theRTC_DRV_GENERICcode first, pushing the device registration into the individual machine specifictime.ccode. It's probably not even worth trying to share the rtc-cmos driver, but it might be useful to share the library code likeRTC_DRV_ALPHAdoes.
Arch/m68k is not that entangled with RTC_DRV_GENERIC, as amiga_defconfig does not enable it, but enables CONFIG_RTC_DRV_MSM6242 and CONFIG_RTC_DRV_RP5C01 instead.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Arnd Bergmann
maintainerRe: [PATCH v3 28/38] rtc: add HAS_IOPORT dependencies
Quoted 9 lines · Geert Uytterhoeven
Quoted 7 lines · Arnd Bergmann
On Tue, May 9, 2023, at 08:38, Geert Uytterhoeven wrote:
If you ever want to revisit this, I suspect the harder part here is to detacharch/m68k/from theRTC_DRV_GENERICcode first, pushing the device registration into the individual machine specifictime.ccode. It's probably not even worth trying to share the rtc-cmos driver, but it might be useful to share the library code likeRTC_DRV_ALPHAdoes.
Quoted 3 lines
Arch/m68k is not that entangled with
RTC_DRV_GENERIC, asamiga_defconfigdoes not enable it, but enablesCONFIG_RTC_DRV_MSM6242andCONFIG_RTC_DRV_RP5C01instead.
Ah, I see now, I misremembered this part. The only bit that is shared on m68k is the mach_hwclk() function that is used for either read_persistent_clock64() or rtc_generic on platforms that have one. So any platform could indeed be converted from mach_hwclk() to a custom rtc driver without affecting the others.
Arnd
PATCH v3 29/38 scsi: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/scsi/Kconfig | 25 +++++++++++++------------ drivers/scsi/aic7xxx/Kconfig.aic79xx | 2 +- drivers/scsi/aic7xxx/Kconfig.aic7xxx | 2 +- drivers/scsi/aic94xx/Kconfig | 2 +- drivers/scsi/megaraid/Kconfig.megaraid | 6 +++--- drivers/scsi/mvsas/Kconfig | 2 +- drivers/scsi/pcmcia/Kconfig | 6 +++++- drivers/scsi/qla2xxx/Kconfig | 2 +- 8 files changed, 26 insertions(+), 21 deletions(-)
drivers/scsi/Kconfig +13 -12
@@ -334,7 +334,7 @@ config SGIWD93_SCSI config BLK_DEV_3W_XXXX_RAID tristate "3ware 5/6/7/8xxx ATA-RAID support" - depends on PCI && SCSI + depends on PCI && HAS_IOPORT && SCSI help 3ware is the only hardware ATA-Raid product in Linux to date. This card is 2,4, or 8 channel master mode support only.
@@ -381,7 +381,7 @@ config SCSI_3W_SAS config SCSI_ACARD tristate "ACARD SCSI support" - depends on PCI && SCSI + depends on PCI && HAS_IOPORT && SCSI help This driver supports the ACARD SCSI host adapter. Support Chip <ATP870 ATP876 ATP880 ATP885>
@@ -462,7 +462,7 @@ config SCSI_MVUMI config SCSI_ADVANSYS tristate "AdvanSys SCSI support" depends on SCSI - depends on ISA || EISA || PCI + depends on (ISA || EISA || PCI) && HAS_IOPORT depends on ISA_DMA_API || !ISA help This is a driver for all SCSI host adapters manufactured by
@@ -503,7 +503,7 @@ config SCSI_HPTIOP config SCSI_BUSLOGIC tristate "BusLogic SCSI support" - depends on PCI && SCSI + depends on SCSI && PCI && HAS_IOPORT help This is support for BusLogic MultiMaster and FlashPoint SCSI Host Adapters. Consult the SCSI-HOWTO, available from
@@ -518,7 +518,7 @@ config SCSI_BUSLOGIC config SCSI_FLASHPOINT bool "FlashPoint support" - depends on SCSI_BUSLOGIC && PCI + depends on SCSI_BUSLOGIC && PCI && HAS_IOPORT help This option allows you to add FlashPoint support to the BusLogic SCSI driver. The FlashPoint SCCB Manager code is
@@ -632,7 +632,7 @@ config SCSI_SNIC_DEBUG_FS config SCSI_DMX3191D tristate "DMX3191D SCSI support" - depends on PCI && SCSI + depends on PCI && HAS_IOPORT && SCSI select SCSI_SPI_ATTRS help This is support for Domex DMX3191D SCSI Host Adapters.
@@ -646,7 +646,7 @@ config SCSI_FDOMAIN config SCSI_FDOMAIN_PCI tristate "Future Domain TMC-3260/AHA-2920A PCI SCSI support" - depends on PCI && SCSI + depends on PCI && HAS_IOPORT && SCSI select SCSI_FDOMAIN help This is support for Future Domain's PCI SCSI host adapters (TMC-3260)
@@ -699,7 +699,7 @@ config SCSI_GENERIC_NCR5380 config SCSI_IPS tristate "IBM ServeRAID support" - depends on PCI && SCSI + depends on PCI && HAS_IOPORT && SCSI help This is support for the IBM ServeRAID hardware RAID controllers. See <http://www.developer.ibm.com/welcome/netfinity/serveraid.html>
@@ -759,7 +759,7 @@ config SCSI_IBMVFC_TRACE config SCSI_INITIO tristate "Initio 9100U(W) support" - depends on PCI && SCSI + depends on PCI && HAS_IOPORT && SCSI help This is support for the Initio 91XXU(W) SCSI host adapter. Please read the SCSI-HOWTO, available from
@@ -770,7 +770,7 @@ config SCSI_INITIO config SCSI_INIA100 tristate "Initio INI-A100U2W support" - depends on PCI && SCSI + depends on PCI && HAS_IOPORT && SCSI help This is support for the Initio INI-A100U2W SCSI host adapter. Please read the SCSI-HOWTO, available from
@@ -782,6 +782,7 @@ config SCSI_INIA100 config SCSI_PPA tristate "IOMEGA parallel port (ppa - older drives)" depends on SCSI && PARPORT_PC + depends on HAS_IOPORT help This driver supports older versions of IOMEGA's parallel port ZIP drive (a 100 MB removable media device).
@@ -1176,7 +1177,7 @@ config SCSI_SIM710 config SCSI_DC395x tristate "Tekram DC395(U/UW/F) and DC315(U) SCSI support" - depends on PCI && SCSI + depends on PCI && HAS_IOPORT && SCSI select SCSI_SPI_ATTRS help This driver supports PCI SCSI host adapters based on the ASIC
@@ -1208,7 +1209,7 @@ config SCSI_AM53C974 config SCSI_NSP32 tristate "Workbit NinjaSCSI-32Bi/UDE support" - depends on PCI && SCSI && !64BIT + depends on PCI && SCSI && !64BIT && HAS_IOPORT help This is support for the Workbit NinjaSCSI-32Bi/UDE PCI/Cardbus SCSI host adapter. Please read the SCSI-HOWTO, available from
drivers/scsi/aic7xxx/Kconfig.aic79xx +1 -1
@@ -5,7 +5,7 @@ # config SCSI_AIC79XX tristate "Adaptec AIC79xx U320 support" - depends on PCI && SCSI + depends on PCI && HAS_IOPORT && SCSI select SCSI_SPI_ATTRS help This driver supports all of Adaptec's Ultra 320 PCI-X
drivers/scsi/aic7xxx/Kconfig.aic7xxx +1 -1
@@ -5,7 +5,7 @@ # config SCSI_AIC7XXX tristate "Adaptec AIC7xxx Fast -> U160 support" - depends on (PCI || EISA) && SCSI + depends on (PCI || EISA) && HAS_IOPORT && SCSI select SCSI_SPI_ATTRS help This driver supports all of Adaptec's Fast through Ultra 160 PCI
drivers/scsi/aic94xx/Kconfig +1 -1
@@ -8,7 +8,7 @@ config SCSI_AIC94XX tristate "Adaptec AIC94xx SAS/SATA support" - depends on PCI + depends on PCI && HAS_IOPORT select SCSI_SAS_LIBSAS select FW_LOADER help
drivers/scsi/megaraid/Kconfig.megaraid +3 -3
@@ -1,13 +1,13 @@ # SPDX-License-Identifier: GPL-2.0-only config MEGARAID_NEWGEN bool "LSI Logic New Generation RAID Device Drivers" - depends on PCI && SCSI + depends on PCI && HAS_IOPORT && SCSI help LSI Logic RAID Device Drivers config MEGARAID_MM tristate "LSI Logic Management Module (New Driver)" - depends on PCI && SCSI && MEGARAID_NEWGEN + depends on PCI && HAS_IOPORT && SCSI && MEGARAID_NEWGEN help Management Module provides ioctl, sysfs support for LSI Logic RAID controllers.
@@ -67,7 +67,7 @@ config MEGARAID_MAILBOX config MEGARAID_LEGACY tristate "LSI Logic Legacy MegaRAID Driver" - depends on PCI && SCSI + depends on PCI && HAS_IOPORT && SCSI help This driver supports the LSI MegaRAID 418, 428, 438, 466, 762, 490 and 467 SCSI host adapters. This driver also support the all U320
drivers/scsi/mvsas/Kconfig +1 -1
@@ -9,7 +9,7 @@ config SCSI_MVSAS tristate "Marvell 88SE64XX/88SE94XX SAS/SATA support" - depends on PCI + depends on PCI && HAS_IOPORT select SCSI_SAS_LIBSAS select FW_LOADER help
drivers/scsi/pcmcia/Kconfig +5 -1
@@ -12,6 +12,7 @@ if SCSI_LOWLEVEL_PCMCIA && SCSI && PCMCIA && m config PCMCIA_AHA152X tristate "Adaptec AHA152X PCMCIA support" + depends on HAS_IOPORT select SCSI_SPI_ATTRS help Say Y here if you intend to attach this type of PCMCIA SCSI host
@@ -22,6 +23,7 @@ config PCMCIA_AHA152X config PCMCIA_FDOMAIN tristate "Future Domain PCMCIA support" + depends on HAS_IOPORT select SCSI_FDOMAIN help Say Y here if you intend to attach this type of PCMCIA SCSI host
@@ -32,7 +34,7 @@ config PCMCIA_FDOMAIN config PCMCIA_NINJA_SCSI tristate "NinjaSCSI-3 / NinjaSCSI-32Bi (16bit) PCMCIA support" - depends on !64BIT || COMPILE_TEST + depends on (!64BIT || COMPILE_TEST) && HAS_IOPORT help If you intend to attach this type of PCMCIA SCSI host adapter to your computer, say Y here and read
@@ -66,6 +68,7 @@ config PCMCIA_NINJA_SCSI config PCMCIA_QLOGIC tristate "Qlogic PCMCIA support" + depends on HAS_IOPORT help Say Y here if you intend to attach this type of PCMCIA SCSI host adapter to your computer.
@@ -75,6 +78,7 @@ config PCMCIA_QLOGIC config PCMCIA_SYM53C500 tristate "Symbios 53c500 PCMCIA support" + depends on HAS_IOPORT help Say Y here if you have a New Media Bus Toaster or other PCMCIA SCSI adapter based on the Symbios 53c500 controller.
drivers/scsi/qla2xxx/Kconfig +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config SCSI_QLA_FC tristate "QLogic QLA2XXX Fibre Channel Support" - depends on PCI && SCSI + depends on PCI && HAS_IOPORT && SCSI depends on SCSI_FC_ATTRS depends on NVME_FC || !NVME_FC select FW_LOADER
Signature · 1 line
2.37.2
PATCH v3 30/38 sound: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- sound/drivers/Kconfig | 3 +++ sound/isa/Kconfig | 31 ++++++++++++++++++++++++++--- sound/pci/Kconfig | 45 ++++++++++++++++++++++++++++++++----------- sound/pcmcia/Kconfig | 2 ++ 4 files changed, 67 insertions(+), 14 deletions(-)
sound/drivers/Kconfig +3 -0
@@ -128,6 +128,7 @@ config SND_VIRMIDI config SND_MTPAV tristate "MOTU MidiTimePiece AV multiport MIDI" + depends on HAS_IOPORT select SND_RAWMIDI help To use a MOTU MidiTimePiece AV multiport MIDI adapter
@@ -152,6 +153,7 @@ config SND_MTS64 config SND_SERIAL_U16550 tristate "UART16550 serial MIDI driver" + depends on HAS_IOPORT select SND_RAWMIDI help To include support for MIDI serial port interfaces, say Y here
@@ -185,6 +187,7 @@ config SND_SERIAL_GENERIC config SND_MPU401 tristate "Generic MPU-401 UART driver" + depends on HAS_IOPORT select SND_MPU401_UART help Say Y here to include support for MIDI ports compatible with
sound/isa/Kconfig +28 -3
@@ -23,6 +23,7 @@ menuconfig SND_ISA bool "ISA sound devices" depends on ISA || COMPILE_TEST depends on ISA_DMA_API + depends on HAS_IOPORT default y help Support for sound devices connected via the ISA bus.
@@ -31,6 +32,7 @@ if SND_ISA config SND_ADLIB tristate "AdLib FM card" + depends on HAS_IOPORT select SND_OPL3_LIB help Say Y here to include support for AdLib FM cards.
@@ -41,6 +43,7 @@ config SND_ADLIB config SND_AD1816A tristate "Analog Devices SoundPort AD1816A" depends on PNP + depends on HAS_IOPORT select ISAPNP select SND_OPL3_LIB select SND_MPU401_UART
@@ -69,6 +72,7 @@ config SND_AD1848 config SND_ALS100 tristate "Diamond Tech. DT-019x and Avance Logic ALSxxx" depends on PNP + depends on HAS_IOPORT select ISAPNP select SND_OPL3_LIB select SND_MPU401_UART
@@ -84,6 +88,7 @@ config SND_ALS100 config SND_AZT1605 tristate "Aztech AZT1605 Driver" depends on SND + depends on HAS_IOPORT select SND_WSS_LIB select SND_MPU401_UART select SND_OPL3_LIB
@@ -97,6 +102,7 @@ config SND_AZT1605 config SND_AZT2316 tristate "Aztech AZT2316 Driver" depends on SND + depends on HAS_IOPORT select SND_WSS_LIB select SND_MPU401_UART select SND_OPL3_LIB
@@ -110,6 +116,7 @@ config SND_AZT2316 config SND_AZT2320 tristate "Aztech Systems AZT2320" depends on PNP + depends on HAS_IOPORT select ISAPNP select SND_OPL3_LIB select SND_MPU401_UART
@@ -123,6 +130,7 @@ config SND_AZT2320 config SND_CMI8328 tristate "C-Media CMI8328" + depends on HAS_IOPORT select SND_WSS_LIB select SND_OPL3_LIB select SND_MPU401_UART
@@ -135,6 +143,7 @@ config SND_CMI8328 config SND_CMI8330 tristate "C-Media CMI8330" + depends on HAS_IOPORT select SND_WSS_LIB select SND_SB16_DSP select SND_OPL3_LIB
@@ -148,6 +157,7 @@ config SND_CMI8330 config SND_CS4231 tristate "Generic Cirrus Logic CS4231 driver" + depends on HAS_IOPORT select SND_MPU401_UART select SND_WSS_LIB help
@@ -159,6 +169,7 @@ config SND_CS4231 config SND_CS4236 tristate "Generic Cirrus Logic CS4232/CS4236+ driver" + depends on HAS_IOPORT select SND_OPL3_LIB select SND_MPU401_UART select SND_WSS_LIB
@@ -172,6 +183,7 @@ config SND_CS4236 config SND_ES1688 tristate "Generic ESS ES688/ES1688 and ES968 PnP driver" + depends on HAS_IOPORT select SND_OPL3_LIB select SND_MPU401_UART select SND_PCM
@@ -184,6 +196,7 @@ config SND_ES1688 config SND_ES18XX tristate "Generic ESS ES18xx driver" + depends on HAS_IOPORT select SND_OPL3_LIB select SND_MPU401_UART select SND_PCM
@@ -195,7 +208,7 @@ config SND_ES18XX config SND_SC6000 tristate "Gallant SC-6000/6600/7000 and Audio Excel DSP 16" - depends on HAS_IOPORT_MAP + depends on HAS_IOPORT_MAP && HAS_IOPORT select SND_WSS_LIB select SND_OPL3_LIB select SND_MPU401_UART
@@ -223,6 +236,7 @@ config SND_GUSCLASSIC config SND_GUSEXTREME tristate "Gravis UltraSound Extreme" + depends on HAS_IOPORT select SND_OPL3_LIB select SND_MPU401_UART select SND_PCM
@@ -273,6 +287,7 @@ config SND_INTERWAVE_STB config SND_JAZZ16 tristate "Media Vision Jazz16 card and compatibles" + depends on HAS_IOPORT select SND_OPL3_LIB select SND_MPU401_UART select SND_SB8_DSP
@@ -289,6 +304,7 @@ config SND_JAZZ16 config SND_OPL3SA2 tristate "Yamaha OPL3-SA2/SA3" + depends on HAS_IOPORT select SND_OPL3_LIB select SND_MPU401_UART select SND_WSS_LIB
@@ -301,6 +317,7 @@ config SND_OPL3SA2 config SND_OPTI92X_AD1848 tristate "OPTi 82C92x - AD1848" + depends on HAS_IOPORT select SND_OPL3_LIB select SND_OPL4_LIB select SND_MPU401_UART
@@ -314,6 +331,7 @@ config SND_OPTI92X_AD1848 config SND_OPTI92X_CS4231 tristate "OPTi 82C92x - CS4231" + depends on HAS_IOPORT select SND_OPL3_LIB select SND_OPL4_LIB select SND_MPU401_UART
@@ -327,6 +345,7 @@ config SND_OPTI92X_CS4231 config SND_OPTI93X tristate "OPTi 82C93x" + depends on HAS_IOPORT select SND_OPL3_LIB select SND_MPU401_UART select SND_WSS_LIB
@@ -339,6 +358,7 @@ config SND_OPTI93X config SND_MIRO tristate "Miro miroSOUND PCM1pro/PCM12/PCM20radio driver" + depends on HAS_IOPORT select SND_OPL4_LIB select SND_WSS_LIB select SND_MPU401_UART
@@ -352,6 +372,7 @@ config SND_MIRO config SND_SB8 tristate "Sound Blaster 1.0/2.0/Pro (8-bit)" + depends on HAS_IOPORT select SND_OPL3_LIB select SND_RAWMIDI select SND_SB8_DSP
@@ -364,6 +385,7 @@ config SND_SB8 config SND_SB16 tristate "Sound Blaster 16 (PnP)" + depends on HAS_IOPORT select SND_OPL3_LIB select SND_MPU401_UART select SND_SB16_DSP
@@ -376,6 +398,7 @@ config SND_SB16 config SND_SBAWE tristate "Sound Blaster AWE (32,64) (PnP)" + depends on HAS_IOPORT select SND_OPL3_LIB select SND_MPU401_UART select SND_SB16_DSP
@@ -405,6 +428,7 @@ config SND_SB16_CSP config SND_SSCAPE tristate "Ensoniq SoundScape driver" + depends on HAS_IOPORT select SND_MPU401_UART select SND_WSS_LIB select FW_LOADER
@@ -426,6 +450,7 @@ config SND_SSCAPE config SND_WAVEFRONT tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)" + depends on HAS_IOPORT select FW_LOADER select SND_OPL3_LIB select SND_MPU401_UART
@@ -439,7 +464,7 @@ config SND_WAVEFRONT config SND_MSND_PINNACLE tristate "Turtle Beach MultiSound Pinnacle/Fiji driver" - depends on X86 + depends on X86 && HAS_IOPORT select FW_LOADER select SND_MPU401_UART select SND_PCM
@@ -452,7 +477,7 @@ config SND_MSND_PINNACLE config SND_MSND_CLASSIC tristate "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey" - depends on X86 + depends on X86 && HAS_IOPORT select FW_LOADER select SND_MPU401_UART select SND_PCM
sound/pci/Kconfig +34 -11
249 lines not on this page · raw message
sound/pcmcia/Kconfig +2 -0
@@ -13,6 +13,7 @@ if SND_PCMCIA && PCMCIA config SND_VXPOCKET tristate "Digigram VXpocket" select SND_VX_LIB + depends on HAS_IOPORT help Say Y here to include support for Digigram VXpocket and VXpocket 440 soundcards.
@@ -22,6 +23,7 @@ config SND_VXPOCKET config SND_PDAUDIOCF tristate "Sound Core PDAudioCF" + depends on HAS_IOPORT select SND_PCM help Say Y here to include support for Sound Core PDAudioCF
Signature · 1 line
2.37.2
Re: [PATCH v3 30/38] sound: add HAS_IOPORT dependencies
sound/isa/Kconfig menuconfig SND_ISA · line 29
Quoted 10 lines · Niklas Schnelle
sound/isa/Kconfig +1
-0@@ -23,6 +23,7 @@ menuconfig SND_ISA bool "ISA sound devices" depends on ISA || COMPILE_TEST depends on ISA_DMA_API + depends on HAS_IOPORT default y help Support for sound devices connected via the ISA bus.
With this dependency, ...
sound/isa/Kconfig if SND_ISA · line 38
Quoted 8 lines
sound/isa/Kconfig +1
-0@@ -31,6 +32,7 @@ if SND_ISA config SND_ADLIB tristate "AdLib FM card" + depends on HAS_IOPORT select SND_OPL3_LIB help Say Y here to include support for AdLib FM cards.
... this and lots of other similar changes become redundant, as they already depend on CONFIG_SND_ISA.
Quoted 11 lines
sound/pcmcia/Kconfig +1
-0@@ -13,6 +13,7 @@ if SND_PCMCIA && PCMCIA config SND_VXPOCKET tristate "Digigram VXpocket" select SND_VX_LIB + depends on HAS_IOPORT help Say Y here to include support for Digigram VXpocket and VXpocket 440 soundcards.
sound/pcmcia/Kconfig config SND_VXPOCKET · line 29
Quoted 7 lines
sound/pcmcia/Kconfig +1
-0@@ -22,6 +23,7 @@ config SND_VXPOCKET config SND_PDAUDIOCF tristate "Sound Core PDAudioCF" + depends on HAS_IOPORT select SND_PCM help Say Y here to include support for Sound Core PDAudioCF
I guess it's easier to make CONFIG_SND_PCMCIA depending on CONFIG_HAS_IOPORT (like done for CONFIG_SND_ISA).
thanks,
Takashi
Re: [PATCH v3 30/38] sound: add HAS_IOPORT dependencies
Quoted 17 lines · Takashi Iwai
sound/isa/Kconfig menuconfig SND_ISA · line 29
Quoted 10 lines · Niklas Schnelle
sound/isa/Kconfig +1
-0@@ -23,6 +23,7 @@ menuconfig SND_ISA bool "ISA sound devices" depends on ISA || COMPILE_TEST depends on ISA_DMA_API + depends on HAS_IOPORT default y help Support for sound devices connected via the ISA bus.With this dependency, ...
Quoted 2 lines
sound/isa/Kconfig +0
-0@@ -31,6 +32,7 @@ if SND_ISA
Quoted 10 lines
sound/isa/Kconfig if SND_ISA · line 38
Quoted 6 lines
sound/isa/Kconfig +1
-0config SND_ADLIB tristate "AdLib FM card" + depends on HAS_IOPORT select SND_OPL3_LIB help Say Y here to include support for AdLib FM cards.... this and lots of other similar changes become redundant, as they already depend on
CONFIG_SND_ISA.
Good point and semantically it makes sense too since ISA is closely associated with I/O ports.
Quoted 12 lines
Quoted 12 lines
sound/pcmcia/Kconfig +1
-0@@ -13,6 +13,7 @@ if SND_PCMCIA && PCMCIA config SND_VXPOCKET tristate "Digigram VXpocket" select SND_VX_LIB + depends on HAS_IOPORT help Say Y here to include support for Digigram VXpocket and VXpocket 440 soundcards.@@ -22,6 +23,7 @@ config SND_VXPOCKET
Quoted 10 lines
sound/pcmcia/Kconfig config SND_VXPOCKET · line 29
Quoted 6 lines
sound/pcmcia/Kconfig +1
-0config SND_PDAUDIOCF tristate "Sound Core PDAudioCF" + depends on HAS_IOPORT select SND_PCM help Say Y here to include support for Sound Core PDAudioCFI guess it's easier to make
CONFIG_SND_PCMCIAdepending onCONFIG_HAS_IOPORT(like done forCONFIG_SND_ISA).
In principle I think there could be a MMIO based PCMCIA sound card but it appears there is none currently supported and I doubt someone adds one so yeah that makes sense even if it isn't as clear cut as with CONFIG_SND_ISA.
I've changed both vor v4. Thanks!
PATCH v3 31/38 speakup: add HAS_IOPORT dependency for SPEAKUP_SERIALIO
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. SPEAKUP_SERIALIO thus needs to depend on HAS_IOPORT.
--- drivers/accessibility/speakup/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/accessibility/speakup/Kconfig +1 -0
@@ -46,6 +46,7 @@ if SPEAKUP config SPEAKUP_SERIALIO def_bool y depends on ISA || COMPILE_TEST + depends on HAS_IOPORT config SPEAKUP_SYNTH_ACNTSA tristate "Accent SA synthesizer support"
Signature · 1 line
2.37.2
PATCH v3 32/38 staging: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/staging/sm750fb/Kconfig | 2 +- drivers/staging/vt6655/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/sm750fb/Kconfig +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 config FB_SM750 tristate "Silicon Motion SM750 framebuffer support" - depends on FB && PCI + depends on FB && PCI && HAS_IOPORT select FB_MODE_HELPERS select FB_CFB_FILLRECT select FB_CFB_COPYAREA
drivers/staging/vt6655/Kconfig +1 -1
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 config VT6655 tristate "VIA Technologies VT6655 support" - depends on PCI && MAC80211 && m + depends on PCI && HAS_IOPORT && MAC80211 && m help This is a vendor-written driver for VIA VT6655.
Signature · 1 line
2.37.2
PATCH v3 33/38 tty: serial: handle HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them unconditionally. For 8250 based drivers some support MMIO only use so fence only the parts requiring I/O ports.
--- drivers/tty/Kconfig | 2 +- drivers/tty/serial/8250/8250_early.c | 4 +++ drivers/tty/serial/8250/8250_pci.c | 14 +++++++++ drivers/tty/serial/8250/8250_port.c | 44 +++++++++++++++++++++++----- drivers/tty/serial/8250/Kconfig | 5 ++-- drivers/tty/serial/Kconfig | 2 +- 6 files changed, 59 insertions(+), 12 deletions(-)
drivers/tty/Kconfig +1 -1
@@ -222,7 +222,7 @@ config MOXA_INTELLIO config MOXA_SMARTIO tristate "Moxa SmartIO support v. 2.0" - depends on SERIAL_NONSTANDARD && PCI + depends on SERIAL_NONSTANDARD && PCI && HAS_IOPORT help Say Y here if you have a Moxa SmartIO multiport serial card and/or want to help develop a new version of this driver.
drivers/tty/serial/8250/8250_early.c +4 -0
@@ -48,8 +48,10 @@ static unsigned int serial8250_early_in(struct uart_port *port, int offset)return readl (port->membase + offset);case UPIO_MEM32BE :return ioread32be (port->membase + offset); +#ifdef CONFIG_HAS_IOPORT case UPIO_PORT :return inb (port->iobase + offset); +#endif case UPIO_AU :return port->serial_in (port, reg_offset);default :
@@ -75,9 +77,11 @@ static void serial8250_early_out(struct uart_port *port, int offset, int value)case UPIO_MEM32BE :iowrite32be (value, port->membase + offset);break ; +#ifdef CONFIG_HAS_IOPORT case UPIO_PORT :outb (value, port->iobase + offset);break ; +#endif case UPIO_AU : port->serial_out (port, reg_offset, value);break ;
drivers/tty/serial/8250/8250_pci.c +14 -0
@@ -847,6 +847,7 @@ static int pci_netmos_init(struct pci_dev *dev)return num_serial; } +#ifdef CONFIG_HAS_IOPORT /* * These chips are available with optionally one parallel port and up to * two serial ports. Unfortunately they all have the same product id.
@@ -973,6 +974,7 @@ static void pci_ite887x_exit(struct pci_dev *dev) ioport &=0xffff ; release_region(ioport, ITE_887x_IOSIZE); } +#endif /* CONFIG_HAS_IOPORT */ /* * Oxford Semiconductor Inc.
@@ -1255,6 +1257,7 @@ static int pci_asix_setup(struct serial_private *priv,#define QOPR_CLOCK_X8 0x0003#define QOPR_CLOCK_RATE_MASK 0x0003 +#ifdef CONFIG_HAS_IOPORT /* Quatech devices have their own extra interface features */ static struct pci_device_id quatech_cards[] = { { PCI_DEVICE_DATA(QUATECH, QSC100, 1) },
@@ -1474,6 +1477,7 @@ static int pci_quatech_setup(struct serial_private *priv,pci_warn (priv->dev,"software control of RS422 features not currently supported.\n" );return pci_default_setup (priv, board, port, idx); } +#endif /* CONFIG_HAS_IOPORT */ static int pci_default_setup(struct serial_private *priv, const struct pciserial_board *board,
@@ -1753,6 +1757,7 @@ static int skip_tx_en_setup(struct serial_private *priv,return pci_default_setup (priv, board, port, idx); } +#ifdef CONFIG_HAS_IOPORT static void kt_handle_break (struct uart_port *p) {struct uart_8250_port *up =up_to_u8250p (p);
@@ -1796,6 +1801,7 @@ static int kt_serial_setup(struct serial_private *priv, port->port.handle_break = kt_handle_break; return skip_tx_en_setup(priv, board, port, idx); } +#endif /* CONFIG_HAS_IOPORT */ static int pci_eg20t_init (struct pci_dev *dev) {
@@ -1840,6 +1846,7 @@ pci_wch_ch38x_setup(struct serial_private *priv,#define CH384_XINT_ENABLE_REG 0xEB#define CH384_XINT_ENABLE_BIT 0x02 +#ifdef CONFIG_HAS_IOPORT static int pci_wch_ch38x_init (struct pci_dev *dev) {int max_port;
@@ -1867,6 +1874,7 @@ static void pci_wch_ch38x_exit(struct pci_dev *dev) iobase =pci_resource_start (dev,0 );outb (0x0 , iobase +CH384_XINT_ENABLE_REG ); } +#endif /* CONFIG_HAS_IOPORT */ static int
@@ -2070,6 +2078,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = { .subdevice = PCI_ANY_ID, .setup = ce4100_serial_setup, }, +#ifdef CONFIG_HAS_IOPORT { .vendor = PCI_VENDOR_ID_INTEL, .device = PCI_DEVICE_ID_INTEL_PATSBURG_KT,
@@ -2089,6 +2098,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = { .setup = pci_default_setup, .exit = pci_ite887x_exit, }, +#endif /* * National Instruments */
@@ -2210,6 +2220,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = { .exit = pci_ni8430_exit, },/* Quatech */ +#ifdef CONFIG_HAS_IOPORT { .vendor = PCI_VENDOR_ID_QUATECH, .device = PCI_ANY_ID,
@@ -2218,6 +2229,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = { .init = pci_quatech_init, .setup = pci_quatech_setup, }, +#endif /* * Panacom */
@@ -2588,6 +2600,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = { .subdevice = PCI_ANY_ID, .setup = pci_wch_ch38x_setup, }, +#ifdef CONFIG_HAS_IOPORT /* WCH CH384 8S card (16850 clone) */ { .vendor = PCIE_VENDOR_ID_WCH,
@@ -2598,6 +2611,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = { .exit = pci_wch_ch38x_exit, .setup = pci_wch_ch38x_setup, }, +#endif /* * ASIX devices with FIFO bug */
drivers/tty/serial/8250/8250_port.c +37 -7
123 lines not on this page · raw message
drivers/tty/serial/8250/Kconfig +2 -3
@@ -6,7 +6,6 @@ config SERIAL_8250 tristate "8250/16550 and compatible serial support" - depends on !S390 select SERIAL_CORE select SERIAL_MCTRL_GPIO if GPIOLIB help
@@ -72,7 +71,7 @@ config SERIAL_8250_16550A_VARIANTS config SERIAL_8250_FINTEK bool "Support for Fintek F81216A LPC to 4 UART RS485 API" - depends on SERIAL_8250 + depends on SERIAL_8250 && HAS_IOPORT help Selecting this option will add support for the RS485 capabilities of the Fintek F81216A LPC to 4 UART.
@@ -160,7 +159,7 @@ config SERIAL_8250_HP300 config SERIAL_8250_CS tristate "8250/16550 PCMCIA device support" - depends on PCMCIA && SERIAL_8250 + depends on PCMCIA && SERIAL_8250 && HAS_IOPORT help Say Y here to enable support for 16-bit PCMCIA serial devices, including serial port cards, modems, and the modem functions of
drivers/tty/serial/Kconfig +1 -1
@@ -878,7 +878,7 @@ config SERIAL_TXX9_STDSERIAL config SERIAL_JSM tristate "Digi International NEO and Classic PCI Support" - depends on PCI + depends on PCI && HAS_IOPORT select SERIAL_CORE help This is a driver for Digi International's Neo and Classic series
Signature · 1 line
2.37.2
PATCH v3 34/38 usb: handle HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to guard sections of code calling them as alternative access methods with CONFIG_HAS_IOPORT checks. Similarly drivers requiring these functions need to depend on HAS_IOPORT.
--- drivers/usb/core/hcd-pci.c | 2 + drivers/usb/host/Kconfig | 4 +- drivers/usb/host/pci-quirks.c | 125 ++++++++++++++++++---------------- drivers/usb/host/pci-quirks.h | 31 ++++++--- drivers/usb/host/uhci-hcd.c | 2 +- drivers/usb/host/uhci-hcd.h | 36 ++++++---- 6 files changed, 117 insertions(+), 83 deletions(-)
drivers/usb/core/hcd-pci.c +2 -0
@@ -206,8 +206,10 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct hc_driver *driver) goto free_irq_vectors; } +#ifdef CONFIG_USB_PCI_AMD hcd->amd_resume_bug = (usb_hcd_amd_remote_wakeup_quirk (dev) && driver->flags & (HCD_USB11 |HCD_USB3 )) ?1 :0 ; +#endif if (driver->flags &HCD_MEMORY ) {/* EHCI, OHCI */
drivers/usb/host/Kconfig +2 -2
@@ -376,7 +376,7 @@ config USB_ISP116X_HCD config USB_ISP1362_HCD tristate "ISP1362 HCD support" - depends on HAS_IOMEM + depends on HAS_IOPORT depends on COMPILE_TEST # nothing uses this help Supports the Philips ISP1362 chip as a host controller
@@ -578,7 +578,7 @@ endif # USB_OHCI_HCD config USB_UHCI_HCD tristate "UHCI HCD (most Intel and VIA) support" - depends on USB_PCI || USB_UHCI_SUPPORT_NON_PCI_HC + depends on (USB_PCI && HAS_IOPORT) || USB_UHCI_SUPPORT_NON_PCI_HC help The Universal Host Controller Interface is a standard by Intel for accessing the USB hardware in the PC (which is also called the USB
drivers/usb/host/pci-quirks.c +66 -59
168 lines not on this page · raw message
drivers/usb/host/pci-quirks.h +23 -8
@@ -2,33 +2,48 @@#ifndef __LINUX_USB_PCI_QUIRKS_H#define __LINUX_USB_PCI_QUIRKS_H -#ifdef CONFIG_USB_PCI void uhci_reset_hc (struct pci_dev *pdev,unsigned long base);int uhci_check_and_reset_hc (struct pci_dev *pdev,unsigned long base); -int usb_hcd_amd_remote_wakeup_quirk (struct pci_dev *pdev); + +#ifdef CONFIG_USB_PCI_AMD bool usb_amd_hang_symptom_quirk (void );bool usb_amd_prefetch_quirk (void );void usb_amd_dev_put (void );bool usb_amd_quirk_pll_check (void );void usb_amd_quirk_pll_disable (void );void usb_amd_quirk_pll_enable (void ); -void usb_asmedia_modifyflowcontrol (struct pci_dev *pdev); -void usb_enable_intel_xhci_ports (struct pci_dev *xhci_pdev); -void usb_disable_xhci_ports (struct pci_dev *xhci_pdev);void sb800_prefetch (struct device *dev,int on);bool usb_amd_pt_check_port (struct device *device,int port);#else -struct pci_dev ; +static inline bool usb_amd_hang_symptom_quirk (void ) +{ +return false; +}; +static inline bool usb_amd_prefetch_quirk (void ) +{ +return false; +} +static inline bool usb_amd_quirk_pll_check (void ) +{ +return false; +}static inline void usb_amd_quirk_pll_disable (void ) {}static inline void usb_amd_quirk_pll_enable (void ) {} -static inline void usb_asmedia_modifyflowcontrol (struct pci_dev *pdev) {}static inline void usb_amd_dev_put (void ) {} -static inline void usb_disable_xhci_ports (struct pci_dev *xhci_pdev) {}static inline void sb800_prefetch (struct device *dev,int on) {}static inline bool usb_amd_pt_check_port (struct device *device,int port) {return false; } +#endif /* CONFIG_USB_PCI_AMD */ + +#ifdef CONFIG_USB_PCI +void usb_asmedia_modifyflowcontrol (struct pci_dev *pdev); +void usb_enable_intel_xhci_ports (struct pci_dev *xhci_pdev); +void usb_disable_xhci_ports (struct pci_dev *xhci_pdev); +#else +static inline void usb_asmedia_modifyflowcontrol (struct pci_dev *pdev) {} +static inline void usb_disable_xhci_ports (struct pci_dev *xhci_pdev) {}#endif /* CONFIG_USB_PCI */ #endif /* __LINUX_USB_PCI_QUIRKS_H */
drivers/usb/host/uhci-hcd.c +1 -1
@@ -841,7 +841,7 @@ static int uhci_count_ports(struct usb_hcd *hcd)static const char hcd_name[] ="uhci_hcd" ; -#ifdef CONFIG_USB_PCI +#if defined(CONFIG_USB_PCI ) && defined(CONFIG_HAS_IOPORT )#include "uhci-pci.c" #define PCI_DRIVER uhci_pci_driver#endif
drivers/usb/host/uhci-hcd.h +23 -13
@@ -505,41 +505,49 @@ static inline bool uhci_is_aspeed(const struct uhci_hcd *uhci)* we use memory mapped registers. */ +#ifdef CONFIG_HAS_IOPORT +#define UHCI_IN (x) x +#define UHCI_OUT (x) x +#else +#define UHCI_IN (x) 0 +#define UHCI_OUT (x) +#endif +#ifndef CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC /* Support PCI only */ static inline u32 uhci_readl (const struct uhci_hcd *uhci,int reg) { -return inl (uhci->io_addr + reg); +return UHCI_IN (inl (uhci->io_addr + reg)); }static inline void uhci_writel (const struct uhci_hcd *uhci,u32 val,int reg) { -outl (val, uhci->io_addr + reg); +UHCI_OUT (outl (val, uhci->io_addr + reg)); }static inline u16 uhci_readw (const struct uhci_hcd *uhci,int reg) { -return inw (uhci->io_addr + reg); +return UHCI_IN (inw (uhci->io_addr + reg)); }static inline void uhci_writew (const struct uhci_hcd *uhci,u16 val,int reg) { -outw (val, uhci->io_addr + reg); +UHCI_OUT (outw (val, uhci->io_addr + reg)); }static inline u8 uhci_readb (const struct uhci_hcd *uhci,int reg) { -return inb (uhci->io_addr + reg); +return UHCI_IN (inb (uhci->io_addr + reg)); }static inline void uhci_writeb (const struct uhci_hcd *uhci,u8 val,int reg) { -outb (val, uhci->io_addr + reg); +UHCI_OUT (outb (val, uhci->io_addr + reg)); }#else /* Support non-PCI host controllers */ -#ifdef CONFIG_USB_PCI +#if defined(CONFIG_USB_PCI ) && defined(HAS_IOPORT )/* Support PCI and non-PCI host controllers */ #define uhci_has_pci_registers (u) ((u)->io_addr != 0)#else
@@ -587,7 +595,7 @@ static inline int uhci_aspeed_reg(unsigned int reg)static inline u32 uhci_readl (const struct uhci_hcd *uhci,int reg) {if (uhci_has_pci_registers (uhci)) -return inl (uhci->io_addr + reg); +return UHCI_IN (inl (uhci->io_addr + reg));else if (uhci_is_aspeed (uhci))return readl (uhci->regs +uhci_aspeed_reg (reg));#ifdef CONFIG_USB_UHCI_BIG_ENDIAN_MMIO
@@ -601,7 +609,7 @@ static inline u32 uhci_readl(const struct uhci_hcd *uhci, int reg)static inline void uhci_writel (const struct uhci_hcd *uhci,u32 val,int reg) {if (uhci_has_pci_registers (uhci)) -outl (val, uhci->io_addr + reg); +UHCI_OUT (outl (val, uhci->io_addr + reg));else if (uhci_is_aspeed (uhci))writel (val, uhci->regs +uhci_aspeed_reg (reg));#ifdef CONFIG_USB_UHCI_BIG_ENDIAN_MMIO
@@ -615,7 +623,7 @@ static inline void uhci_writel(const struct uhci_hcd *uhci, u32 val, int reg)static inline u16 uhci_readw (const struct uhci_hcd *uhci,int reg) {if (uhci_has_pci_registers (uhci)) -return inw (uhci->io_addr + reg); +return UHCI_IN (inw (uhci->io_addr + reg));else if (uhci_is_aspeed (uhci))return readl (uhci->regs +uhci_aspeed_reg (reg));#ifdef CONFIG_USB_UHCI_BIG_ENDIAN_MMIO
@@ -629,7 +637,7 @@ static inline u16 uhci_readw(const struct uhci_hcd *uhci, int reg)static inline void uhci_writew (const struct uhci_hcd *uhci,u16 val,int reg) {if (uhci_has_pci_registers (uhci)) -outw (val, uhci->io_addr + reg); +UHCI_OUT (outw (val, uhci->io_addr + reg));else if (uhci_is_aspeed (uhci))writel (val, uhci->regs +uhci_aspeed_reg (reg));#ifdef CONFIG_USB_UHCI_BIG_ENDIAN_MMIO
@@ -643,7 +651,7 @@ static inline void uhci_writew(const struct uhci_hcd *uhci, u16 val, int reg)static inline u8 uhci_readb (const struct uhci_hcd *uhci,int reg) {if (uhci_has_pci_registers (uhci)) -return inb (uhci->io_addr + reg); +return UHCI_IN (inb (uhci->io_addr + reg));else if (uhci_is_aspeed (uhci))return readl (uhci->regs +uhci_aspeed_reg (reg));#ifdef CONFIG_USB_UHCI_BIG_ENDIAN_MMIO
@@ -657,7 +665,7 @@ static inline u8 uhci_readb(const struct uhci_hcd *uhci, int reg)static inline void uhci_writeb (const struct uhci_hcd *uhci,u8 val,int reg) {if (uhci_has_pci_registers (uhci)) -outb (val, uhci->io_addr + reg); +UHCI_OUT (outb (val, uhci->io_addr + reg));else if (uhci_is_aspeed (uhci))writel (val, uhci->regs +uhci_aspeed_reg (reg));#ifdef CONFIG_USB_UHCI_BIG_ENDIAN_MMIO
@@ -668,6 +676,8 @@ static inline void uhci_writeb(const struct uhci_hcd *uhci, u8 val, int reg) writeb(val, uhci->regs + reg); }#endif /* CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC */ +#undef UHCI_IN +#undef UHCI_OUT/* * The GRLIB GRUSBHC controller can use big endian format for its descriptors.
Signature · 1 line
2.37.2
Arnd Bergmann
maintainerRe: [PATCH v3 34/38] usb: handle HAS_IOPORT dependencies
Quoted 7 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to guard sections of code calling them as alternative access methods with
CONFIG_HAS_IOPORTchecks. Similarly drivers requiring these functions need to depend onHAS_IOPORT.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>
I would suggest splitting this patch up into separate bits for the AMD quirks and the UHCI driver, possibly more if there are other parts unrelated to that.
Quoted 4 lines
+#ifdef
CONFIG_HAS_IOPORT
/*
* Make sure the controller is completely inactive, unable to
* generate interrupts or do DMA.
Maybe check for both HAS_IOPORT and USB_UHCI_HCD ?
Quoted 34 lines
static inline int io_type_enabled(struct
pci_dev*pdev, unsigned int
mask)
{drivers/usb/host/pci-quirks.c +2
-0@@ -725,6 +730,7 @@ static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)static void quirk_usb_handoff_uhci (struct pci_dev *pdev) { +#ifdef HAS_IOPORT unsigned long base =0 ;int i;@@ -739,6 +745,7 @@ static void quirk_usb_handoff_uhci(struct pci_dev *pdev)if (base)uhci_check_and_reset_hc (pdev, base); +#endif }drivers/usb/host/uhci-hcd.h +6
-0@@ -505,41 +505,49 @@ static inline bool uhci_is_aspeed(const structuhci_hcd *uhci) * we use memory mapped registers. */ +#ifdef CONFIG_HAS_IOPORT +#define UHCI_IN (x) x +#define UHCI_OUT (x) x +#else +#define UHCI_IN (x) 0 +#define UHCI_OUT (x)
drivers/usb/host/uhci-hcd.h static inline bool uhci_is_aspeed(const struct · line 523
Quoted 10 lines
drivers/usb/host/uhci-hcd.h +3
-1+#endif +#ifndef CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC /* Support PCI only */ static inline u32 uhci_readl (const struct uhci_hcd *uhci,int reg) { -return inl (uhci->io_addr + reg); +return UHCI_IN (inl (uhci->io_addr + reg)); }
This looks a bit ugly, though I can't think of a version I really like here though. Possibly merging this together with the generic version would result in something better, like
#if defined(CONFIG_USB_UHCI_PCI) && defined(CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC) /* Support PCI and non-PCI host controllers */
#define uhci_has_pci_registers(u) ((u)->io_addr != 0)
#elif defined(CONFIG_USB_UHCI_PCI)
#define uhci_has_pci_registers(u) 1
#else
/* Support non-PCI host controllers only */
#define uhci_has_pci_registers(u) 0
#endif
static inline u32 uhci_readl(const struct uhci_hcd *uhci, int reg) {
#ifdef CONfIG_USB_UHCI_PCI
if (uhci_has_pci_registers(uhci))
return inl(uhci->io_addr + reg);
else
#endif
if (uhci_is_aspeed(uhci))
return readl(uhci->regs + uhci_aspeed_reg(reg));
else
#ifdef CONFIG_USB_UHCI_BIG_ENDIAN_MMIO
if (uhci_big_endian_mmio(uhci))
return readl_be(uhci->regs + reg);
else
#endif
return readl(uhci->regs + reg);
}Obviously still ugly, not sure if anyone can come up with a better version.
Arnd
PATCH v3 35/38 video: handle HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them and guard inline code in headers.
--- drivers/video/console/Kconfig | 1 + drivers/video/fbdev/Kconfig | 25 +++++++++++++------------ include/video/vga.h | 8 ++++++++ 3 files changed, 22 insertions(+), 12 deletions(-)
drivers/video/console/Kconfig +1 -0
@@ -10,6 +10,7 @@ config VGA_CONSOLE depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC && !SUPERH && \ (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \ !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && !S390 && !UML + depends on HAS_IOPORT select APERTURE_HELPERS if (DRM || FB || VFIO_PCI_CORE) default y help
drivers/video/fbdev/Kconfig +13 -12
@@ -338,7 +338,7 @@ config FB_IMX config FB_CYBER2000 tristate "CyberPro 2000/2010/5000 support" - depends on FB && PCI && (BROKEN || !SPARC64) + depends on FB && PCI && HAS_IOPORT && (BROKEN || !SPARC64) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
@@ -432,6 +432,7 @@ config FB_FM2 config FB_ARC tristate "Arc Monochrome LCD board support" depends on FB && (X86 || COMPILE_TEST) + depends on HAS_IOPORT select FB_SYS_FILLRECT select FB_SYS_COPYAREA select FB_SYS_IMAGEBLIT
@@ -1260,7 +1261,7 @@ config FB_RADEON_DEBUG config FB_ATY128 tristate "ATI Rage128 display support" - depends on FB && PCI + depends on FB && PCI && HAS_IOPORT select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
@@ -1284,7 +1285,7 @@ config FB_ATY128_BACKLIGHT config FB_ATY tristate "ATI Mach64 display support" if PCI || ATARI - depends on FB && !SPARC32 + depends on FB && HAS_IOPORT && !SPARC32 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
@@ -1335,7 +1336,7 @@ config FB_ATY_BACKLIGHT config FB_S3 tristate "S3 Trio/Virge support" - depends on FB && PCI + depends on FB && PCI && HAS_IOPORT select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
@@ -1396,7 +1397,7 @@ config FB_SAVAGE_ACCEL config FB_SIS tristate "SiS/XGI display support" - depends on FB && PCI + depends on FB && PCI && HAS_IOPORT select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
@@ -1427,7 +1428,7 @@ config FB_SIS_315 config FB_VIA tristate "VIA UniChrome (Pro) and Chrome9 display support" - depends on FB && PCI && GPIOLIB && I2C && (X86 || COMPILE_TEST) + depends on FB && PCI && GPIOLIB && I2C && HAS_IOPORT && (X86 || COMPILE_TEST) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
@@ -1466,7 +1467,7 @@ endif config FB_NEOMAGIC tristate "NeoMagic display support" - depends on FB && PCI + depends on FB && PCI && HAS_IOPORT select FB_MODE_HELPERS select FB_CFB_FILLRECT select FB_CFB_COPYAREA
@@ -1496,7 +1497,7 @@ config FB_KYRO config FB_3DFX tristate "3Dfx Banshee/Voodoo3/Voodoo5 display support" - depends on FB && PCI + depends on FB && PCI && HAS_IOPORT select FB_CFB_IMAGEBLIT select FB_CFB_FILLRECT select FB_CFB_COPYAREA
@@ -1546,7 +1547,7 @@ config FB_VOODOO1 config FB_VT8623 tristate "VIA VT8623 support" - depends on FB && PCI + depends on FB && PCI && HAS_IOPORT select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
@@ -1561,7 +1562,7 @@ config FB_VT8623 config FB_TRIDENT tristate "Trident/CyberXXX/CyberBlade support" - depends on FB && PCI + depends on FB && PCI && HAS_IOPORT select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
@@ -1584,7 +1585,7 @@ config FB_TRIDENT config FB_ARK tristate "ARK 2000PV support" - depends on FB && PCI + depends on FB && PCI && HAS_IOPORT select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
@@ -2198,7 +2199,7 @@ config FB_SSD1307 config FB_SM712 tristate "Silicon Motion SM712 framebuffer support" - depends on FB && PCI + depends on FB && PCI && HAS_IOPORT select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
include/video/vga.h +8 -0
@@ -203,18 +203,26 @@ extern int restore_vga(struct vgastate *state);static inline unsigned char vga_io_r (unsigned short port) { +#ifdef CONFIG_HAS_IOPORT return inb_p (port); +#else +return 0xff ; +#endif }static inline void vga_io_w (unsigned short port,unsigned char val) { +#ifdef CONFIG_HAS_IOPORT outb_p (val, port); +#endif }static inline void vga_io_w_fast (unsigned short port,unsigned char reg,unsigned char val) { +#ifdef CONFIG_HAS_IOPORT outw (VGA_OUT16VAL (val, reg), port); +#endif }static inline unsigned char vga_mm_r (void __iomem *regbase,unsigned short port)
Signature · 1 line
2.37.2
Geert Uytterhoeven
maintainerRe: [PATCH v3 35/38] video: handle HAS_IOPORT dependencies
Hi Niklas,
Quoted 6 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them and guard inline code in headers.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>
Thanks for your patch!
drivers/video/fbdev/Kconfig config FB_ATY128_BACKLIGHT · line 1288
Quoted 9 lines
drivers/video/fbdev/Kconfig +1
-1@@ -1284,7 +1285,7 @@ config FB_ATY128_BACKLIGHT config FB_ATY tristate "ATI Mach64 display support" if PCI || ATARI - depends on FB && !SPARC32 + depends on FB && HAS_IOPORT && !SPARC32
On Atari, this works without ATARI_ROM_ISA, hence it must not depend on HAS_IOPORT.
The only call to inb() is inside a section protected by #ifdef CONFIG_PCI. So:
depends on FB && !SPARC32
depends on ATARI || HAS_IOPORTdrivers/video/fbdev/Kconfig config FB_IMX · line 344
Quoted 3 lines
drivers/video/fbdev/Kconfig +0
-0select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Re: [PATCH v3 35/38] video: handle HAS_IOPORT dependencies
Quoted 17 lines · Geert Uytterhoeven
Hi Niklas,
Quoted 6 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them and guard inline code in headers.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>Thanks for your patch!
Quoted 5 lines
drivers/video/fbdev/Kconfig +0
-0@@ -1284,7 +1285,7 @@ config FB_ATY128_BACKLIGHT
Quoted 9 lines
drivers/video/fbdev/Kconfig config FB_ATY128_BACKLIGHT · line 1288
Quoted 4 lines
drivers/video/fbdev/Kconfig +1
-1config FB_ATY tristate "ATI Mach64 display support" if PCI || ATARI - depends on FB && !SPARC32 + depends on FB && HAS_IOPORT && !SPARC32On Atari, this works without
ATARI_ROM_ISA, hence it must not depend onHAS_IOPORT.
The only call toinb()is inside a section protected by #ifdefCONFIG_PCI. So:
That piece of code is a nop anyway. We immediately overwrite clk_wr_offset with a hardcoded selection after the register reads. So if you nuke that nop code then no IOPORT dependency required at all.
Quoted 18 lines
depends on FB && !SPARC32 depends on ATARI || HAS_IOPORTdrivers/video/fbdev/Kconfig config FB_IMX · line 344
Quoted 3 lines
drivers/video/fbdev/Kconfig +0
-0select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLITGr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Signature · 2 lines
Ville Syrjälä Intel
Re: [PATCH v3 35/38] video: handle HAS_IOPORT dependencies
Quoted 28 lines · Ville Syrjälä
Quoted 17 lines · Geert Uytterhoeven
Hi Niklas,
Quoted 6 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them and guard inline code in headers.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>Thanks for your patch!
Quoted 5 lines
drivers/video/fbdev/Kconfig +0
-0@@ -1284,7 +1285,7 @@ config FB_ATY128_BACKLIGHTQuoted 9 lines
drivers/video/fbdev/Kconfig config FB_ATY128_BACKLIGHT · line 1288
Quoted 4 lines
drivers/video/fbdev/Kconfig +1
-1config FB_ATY tristate "ATI Mach64 display support" if PCI || ATARI - depends on FB && !SPARC32 + depends on FB && HAS_IOPORT && !SPARC32On Atari, this works without
ATARI_ROM_ISA, hence it must not depend onHAS_IOPORT.
The only call toinb()is inside a section protected by #ifdefCONFIG_PCI. So:
Quoted 5 lines
That piece of code is a nop anyway. We immediately overwrite
clk_wr_offsetwith a hardcoded selection after the register reads. So if you nuke that nop code then no IOPORT dependency required at all.
I agree this "looks" like a nop but are we sure the inb() doesn't have side effects?
(for reference drivers/video/fbdev/aty/aty/atyfb_base.c:atyfb_setup_generc() towards the end)
It does feel a bit out of scope for this series but if it's really a nop nuking it surely is the cleaner solution.
Thanks,
Niklas
Re: [PATCH v3 35/38] video: handle HAS_IOPORT dependencies
Quoted 29 lines · Niklas Schnelle
Quoted 28 lines · Ville Syrjälä
Quoted 26 lines · Geert Uytterhoeven
Hi Niklas,
Quoted 6 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them and guard inline code in headers.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>Thanks for your patch!
drivers/video/fbdev/Kconfig config FB_ATY128_BACKLIGHT · line 1288
Quoted 9 lines
drivers/video/fbdev/Kconfig +1
-1@@ -1284,7 +1285,7 @@ config FB_ATY128_BACKLIGHT config FB_ATY tristate "ATI Mach64 display support" if PCI || ATARI - depends on FB && !SPARC32 + depends on FB && HAS_IOPORT && !SPARC32On Atari, this works without
ATARI_ROM_ISA, hence it must not depend onHAS_IOPORT.
The only call toinb()is inside a section protected by #ifdefCONFIG_PCI. So:
Quoted 8 lines
Quoted 5 lines
That piece of code is a nop anyway. We immediately overwrite
clk_wr_offsetwith a hardcoded selection after the register reads. So if you nuke that nop code then no IOPORT dependency required at all.I agree this "looks" like a nop but are we sure the
inb()doesn't have side effects?
Yes. It's just trying to check which PLL dividers/etc. are currently used. In VGA mode it gets it from a the GENMO and in non-VGA mode from CLOCK_CNTL. And then it says "screw that" and just uses index 3 instead.
Though I must say that mach64 GX seems to use that clk_wr_offset very differently so I'm not sure the PCI+GX combo is even working currently, assuming those even exist. I don't think I have anything older than a PCI mach64 VT myself.
Quoted 8 lines
(for reference
drivers/video/fbdev/aty/aty/atyfb_base.c:atyfb_setup_generc()towards the end)It does feel a bit out of scope for this series but if it's really a nop nuking it surely is the cleaner solution.
Thanks,
Niklas
Signature · 2 lines
Ville Syrjälä Intel
Re: [PATCH v3 35/38] video: handle HAS_IOPORT dependencies
Quoted 36 lines · Ville Syrjälä
Quoted 35 lines · Niklas Schnelle
Quoted 33 lines · Ville Syrjälä
Quoted 17 lines · Geert Uytterhoeven
Hi Niklas,
Quoted 6 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them and guard inline code in headers.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>Thanks for your patch!
Quoted 5 lines
drivers/video/fbdev/Kconfig +0
-0@@ -1284,7 +1285,7 @@ config FB_ATY128_BACKLIGHTQuoted 9 lines
drivers/video/fbdev/Kconfig config FB_ATY128_BACKLIGHT · line 1288
Quoted 4 lines
drivers/video/fbdev/Kconfig +1
-1config FB_ATY tristate "ATI Mach64 display support" if PCI || ATARI - depends on FB && !SPARC32 + depends on FB && HAS_IOPORT && !SPARC32On Atari, this works without
ATARI_ROM_ISA, hence it must not depend onHAS_IOPORT.
The only call toinb()is inside a section protected by #ifdefCONFIG_PCI. So:That piece of code is a nop anyway. We immediately overwrite
clk_wr_offsetwith a hardcoded selection after the register reads. So if you nuke that nop code then no IOPORT dependency required at all.
Quoted 7 lines
Quoted 2 lines
I agree this "looks" like a nop but are we sure the
inb()doesn't have side effects?Yes. It's just trying to check which PLL dividers/etc. are currently used. In VGA mode it gets it from a the GENMO and in non-VGA mode from
CLOCK_CNTL. And then it says "screw that" and just uses index 3 instead.
Ok, I've added a patch to remove this part of the code and with that the driver actually builds on s390 (no HAS_IOPORT) so I also removed the HAS_IOPORT dependency. Both will be in my v4.
Thanks,
Niklas
PATCH v3 36/38 watchdog: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/watchdog/Kconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/watchdog/Kconfig +4 -2
@@ -453,6 +453,7 @@ config 21285_WATCHDOG config 977_WATCHDOG tristate "NetWinder WB83C977 watchdog" depends on (FOOTBRIDGE && ARCH_NETWINDER) || (ARM && COMPILE_TEST) + depends on HAS_IOPORT help Say Y here to include support for the WB977 watchdog included in NetWinder machines. Alternatively say M to compile the driver as
@@ -1271,6 +1272,7 @@ config ITCO_WDT select WATCHDOG_CORE depends on I2C || I2C=n depends on MFD_INTEL_PMC_BXT || !MFD_INTEL_PMC_BXT + depends on HAS_IOPORT # for I2C_I801 select LPC_ICH if !EXPERT select I2C_I801 if !EXPERT && I2C help
@@ -2148,7 +2150,7 @@ comment "PCI-based Watchdog Cards" config PCIPCWATCHDOG tristate "Berkshire Products PCI-PC Watchdog" - depends on PCI + depends on PCI && HAS_IOPORT help This is the driver for the Berkshire Products PCI-PC Watchdog card. This card simply watches your kernel to make sure it doesn't freeze,
@@ -2163,7 +2165,7 @@ config PCIPCWATCHDOG config WDTPCI tristate "PCI-WDT500/501 Watchdog timer" - depends on PCI + depends on PCI && HAS_IOPORT help If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.
Signature · 1 line
2.37.2
Re: [PATCH v3 36/38] watchdog: add HAS_IOPORT dependencies
Quoted 6 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>
Quoted 42 lines
--- drivers/watchdog/Kconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/watchdog/Kconfig +4
-2@@ -453,6 +453,7 @@ config 21285_WATCHDOG config 977_WATCHDOG tristate "NetWinder WB83C977 watchdog" depends on (FOOTBRIDGE && ARCH_NETWINDER) || (ARM && COMPILE_TEST) + depends on HAS_IOPORT help Say Y here to include support for the WB977 watchdog included in NetWinder machines. Alternatively say M to compile the driver as@@ -1271,6 +1272,7 @@ config ITCO_WDT select WATCHDOG_CORE depends on I2C || I2C=n depends on MFD_INTEL_PMC_BXT || !MFD_INTEL_PMC_BXT + depends on HAS_IOPORT # for I2C_I801 select LPC_ICH if !EXPERT select I2C_I801 if !EXPERT && I2C help@@ -2148,7 +2150,7 @@ comment "PCI-based Watchdog Cards" config PCIPCWATCHDOG tristate "Berkshire Products PCI-PC Watchdog" - depends on PCI + depends on PCI && HAS_IOPORT help This is the driver for the Berkshire Products PCI-PC Watchdog card. This card simply watches your kernel to make sure it doesn't freeze,@@ -2163,7 +2165,7 @@ config PCIPCWATCHDOG config WDTPCI tristate "PCI-WDT500/501 Watchdog timer" - depends on PCI + depends on PCI && HAS_IOPORT help If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.
PATCH v3 37/38 wireless: add HAS_IOPORT dependencies
In reply to Niklas SchnelleIn a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them.
--- drivers/net/wireless/atmel/Kconfig | 2 +- drivers/net/wireless/intersil/hostap/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/atmel/Kconfig +1 -1
@@ -14,7 +14,7 @@ if WLAN_VENDOR_ATMEL config ATMEL tristate "Atmel at76c50x chipset 802.11b support" - depends on CFG80211 && (PCI || PCMCIA) + depends on CFG80211 && (PCI || PCMCIA) && HAS_IOPORT select WIRELESS_EXT select WEXT_PRIV select FW_LOADER
drivers/net/wireless/intersil/hostap/Kconfig +1 -1
@@ -56,7 +56,7 @@ config HOSTAP_FIRMWARE_NVRAM config HOSTAP_PLX tristate "Host AP driver for Prism2/2.5/3 in PLX9052 PCI adaptors" - depends on PCI && HOSTAP + depends on PCI && HOSTAP && HAS_IOPORT help Host AP driver's version for Prism2/2.5/3 PC Cards in PLX9052 based PCI adaptors.
Signature · 1 line
2.37.2
Re: [PATCH v3 37/38] wireless: add HAS_IOPORT dependencies
Quoted 6 lines · Niklas Schnelle
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add
HAS_IOPORTas dependency for those drivers using them.Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Niklas Schnelle <[email protected]>
Let me know if I should take this to wireless-next.
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH v3 38/38 asm-generic/io.h: drop inb() etc for HAS_IOPORT=n
In reply to Niklas SchnelleWith all subsystems and drivers either declaring their dependence on HAS_IOPORT or fencing I/O port specific code sections we can finally make inb()/outb() and friends compile-time dependent on HAS_IOPORT as suggested by Linus in the linked mail. The main benefit of this is that on platforms such as s390 which have no meaningful way of implementing inb()/outb() their use without the proper HAS_IOPORT dependency will result in easy to catch and fix compile-time errors instead of compiling code that can never work.
--- include/asm-generic/io.h | 60 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+)
include/asm-generic/io.h +60 -0
@@ -539,6 +539,7 @@ static inline void writesq(volatile void __iomem *addr, const void *buffer, #if !defined(inb) && !defined(_inb) #define _inb _inb +#ifdef CONFIG_HAS_IOPORT static inline u8 _inb(unsigned long addr) { u8 val;
@@ -548,10 +549,15 @@ static inline u8 _inb(unsigned long addr)__io_par (val);return val; } +#else +u8 _inb(unsigned long addr) + __compiletime_error("inb()) requires CONFIG_HAS_IOPORT"); +#endif #endif #if !defined(inw) && !defined(_inw) #define _inw _inw +#ifdef CONFIG_HAS_IOPORT static inline u16 _inw(unsigned long addr) { u16 val;
@@ -561,10 +567,15 @@ static inline u16 _inw(unsigned long addr)__io_par (val);return val; } +#else +u16 _inw(unsigned long addr) + __compiletime_error("inw() requires CONFIG_HAS_IOPORT"); +#endif #endif #if !defined(inl) && !defined(_inl) #define _inl _inl +#ifdef CONFIG_HAS_IOPORT static inline u32 _inl(unsigned long addr) { u32 val;
@@ -574,36 +585,55 @@ static inline u32 _inl(unsigned long addr)__io_par (val);return val; } +#else +u32 _inl(unsigned long addr) + __compiletime_error("inl() requires CONFIG_HAS_IOPORT"); +#endif #endif #if !defined(outb) && !defined(_outb)#define _outb _outb +#ifdef CONFIG_HAS_IOPORT static inline void _outb (u8 value,unsigned long addr) {__io_pbw ();__raw_writeb (value,PCI_IOBASE + addr);__io_paw (); } +#else +void _outb(u8 value, unsigned long addr) + __compiletime_error("outb() requires CONFIG_HAS_IOPORT"); +#endif #endif #if !defined(outw) && !defined(_outw)#define _outw _outw +#ifdef CONFIG_HAS_IOPORT static inline void _outw (u16 value,unsigned long addr) {__io_pbw ();__raw_writew ((u16 __force )cpu_to_le16 (value),PCI_IOBASE + addr);__io_paw (); } +#else +void _outw(u16 value, unsigned long addr) + __compiletime_error("outw() requires CONFIG_HAS_IOPORT"); +#endif #endif #if !defined(outl) && !defined(_outl)#define _outl _outl +#ifdef CONFIG_HAS_IOPORT static inline void _outl (u32 value,unsigned long addr) {__io_pbw ();__raw_writel ((u32 __force )cpu_to_le32 (value),PCI_IOBASE + addr);__io_paw (); } +#else +void _outl(u32 value, unsigned long addr) + __compiletime_error("outl() requires CONFIG_HAS_IOPORT"); +#endif #endif #include <linux/logic_pio.h>
@@ -687,53 +717,83 @@ static inline void outl_p(u32 value, unsigned long addr)#ifndef insb#define insb insb +#ifdef CONFIG_HAS_IOPORT static inline void insb (unsigned long addr,void *buffer,unsigned int count) {readsb (PCI_IOBASE + addr, buffer, count); } +#else +void insb(unsigned long addr, void *buffer, unsigned int count) + __compiletime_error("insb() requires HAS_IOPORT"); +#endif #endif #ifndef insw#define insw insw +#ifdef CONFIG_HAS_IOPORT static inline void insw (unsigned long addr,void *buffer,unsigned int count) {readsw (PCI_IOBASE + addr, buffer, count); } +#else +void insw(unsigned long addr, void *buffer, unsigned int count) + __compiletime_error("insw() requires HAS_IOPORT"); +#endif #endif #ifndef insl#define insl insl +#ifdef CONFIG_HAS_IOPORT static inline void insl (unsigned long addr,void *buffer,unsigned int count) {readsl (PCI_IOBASE + addr, buffer, count); } +#else +void insl(unsigned long addr, void *buffer, unsigned int count) + __compiletime_error("insl() requires HAS_IOPORT"); +#endif #endif #ifndef outsb#define outsb outsb +#ifdef CONFIG_HAS_IOPORT static inline void outsb (unsigned long addr,const void *buffer,unsigned int count) {writesb (PCI_IOBASE + addr, buffer, count); } +#else +void outsb(unsigned long addr, const void *buffer, unsigned int count) + __compiletime_error("outsb() requires HAS_IOPORT"); +#endif #endif #ifndef outsw#define outsw outsw +#ifdef CONFIG_HAS_IOPORT static inline void outsw (unsigned long addr,const void *buffer,unsigned int count) {writesw (PCI_IOBASE + addr, buffer, count); } +#else +void outsw(unsigned long addr, const void *buffer, unsigned int count) + __compiletime_error("outsw() requires HAS_IOPORT"); +#endif #endif #ifndef outsl#define outsl outsl +#ifdef CONFIG_HAS_IOPORT static inline void outsl (unsigned long addr,const void *buffer,unsigned int count) {writesl (PCI_IOBASE + addr, buffer, count); } +#else +void outsl(unsigned long addr, const void *buffer, unsigned int count) + __compiletime_error("outsl() requires HAS_IOPORT"); +#endif #endif #ifndef insb_p
Signature · 1 line
2.37.2
Arnd Bergmann
maintainerQuoted 17 lines · Niklas Schnelle
Hello Kernel Hackers,
Some platforms such as s390 do not support PCI I/O spaces. On such platforms I/O space accessors like inb()/outb() are stubs that can never actually work. The way these stubs are implemented in
asm-generic/io.hleads to compiler warnings because any use will be a NULL pointer access on these platforms. In a previous patch we tried handling this with a run-time warning on access. This approach however was rejected by Linus[0] with the argument that this really should be a compile-time check and, though a much more invasive change, we believe that is indeed the right approach.This patch series aims to do exactly that by introducing a
HAS_IOPORTconfig option akin to the existingHAS_IOMEM. When this is unset inb()/outb() and friends may not be defined. This is also the same approach originally planned by Uwe Kleine-König as mentioned in commitce816fa88cca("Kconfig: renameHAS_IOPORTtoHAS_IOPORT_MAP").
Quoted 7 lines
This series builds heavily on an original patch for demonstating the concept by Arnd Bergmann[1] and incoporates feedback of previous RFC versions [2] and [3].
This version is based on v6.3-rc1 and is also available on my kernel.org tree in the
has_ioport_v3branch with the PGP signed taghas_ioport_v3_signed:https://git.kernel.org/pub/scm/linux/kernel/git/niks/linux.git
Thanks a lot for the rebase, hopefully we can finally get this merged. I'll go through all patches and note everything I spot that should be improved. I'd like to make sure that at least the first patch can get merged quickly so we can continue on the rest.
Since this is all related to asm-generic/io.h and cross-architecture work, I can pick up anything that has nobody else maintaining it through the asm-generic tree.
Arnd