scsi: Add HAS_IOPORT dependencies

In 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.

Co-developed-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
Link: https://lore.kernel.org/r/20230522105049.1467313-32-schnelle@linux.ibm.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 0704809..4962ce9 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -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).
@@ -1175,7 +1176,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
@@ -1207,7 +1208,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

diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx
index a47dbd5..4bc53ee 100644 (file)
--- a/drivers/scsi/aic7xxx/Kconfig.aic79xx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx
@@ -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

diff --git a/drivers/scsi/aic7xxx/Kconfig.aic7xxx b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
index 0cfd92c..f042514 100644 (file)
--- a/drivers/scsi/aic7xxx/Kconfig.aic7xxx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
@@ -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

diff --git a/drivers/scsi/aic94xx/Kconfig b/drivers/scsi/aic94xx/Kconfig
index 71931c3..aaa8dad 100644 (file)
--- a/drivers/scsi/aic94xx/Kconfig
+++ b/drivers/scsi/aic94xx/Kconfig
@@ -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

diff --git a/drivers/scsi/megaraid/Kconfig.megaraid b/drivers/scsi/megaraid/Kconfig.megaraid
index 2adc2af..3f2ce1e 100644 (file)
--- a/drivers/scsi/megaraid/Kconfig.megaraid
+++ b/drivers/scsi/megaraid/Kconfig.megaraid
@@ -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

diff --git a/drivers/scsi/mvsas/Kconfig b/drivers/scsi/mvsas/Kconfig
index 79812b8..5ac7fd5 100644 (file)
--- a/drivers/scsi/mvsas/Kconfig
+++ b/drivers/scsi/mvsas/Kconfig
@@ -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

diff --git a/drivers/scsi/pcmcia/Kconfig b/drivers/scsi/pcmcia/Kconfig
index 9696b6b..449bd85 100644 (file)
--- a/drivers/scsi/pcmcia/Kconfig
+++ b/drivers/scsi/pcmcia/Kconfig
@@ -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.

diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig
index 802c373..a584708 100644 (file)
--- a/drivers/scsi/qla2xxx/Kconfig
+++ b/drivers/scsi/qla2xxx/Kconfig
@@ -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