Skip to content

Commit b58b2ba

Browse files
niklas88martinkpetersen
niklas88
authored and
martinkpetersen
committed
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>
1 parent c3f9034 commit b58b2ba

8 files changed

Lines changed: 26 additions & 21 deletions

File tree

‎drivers/scsi/Kconfig‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ config SGIWD93_SCSI
334334

335335
config BLK_DEV_3W_XXXX_RAID
336336
tristate "3ware 5/6/7/8xxx ATA-RAID support"
337-
depends on PCI && SCSI
337+
depends on PCI && HAS_IOPORT && SCSI
338338
help
339339
3ware is the only hardware ATA-Raid product in Linux to date.
340340
This card is 2,4, or 8 channel master mode support only.
@@ -381,7 +381,7 @@ config SCSI_3W_SAS
381381

382382
config SCSI_ACARD
383383
tristate "ACARD SCSI support"
384-
depends on PCI && SCSI
384+
depends on PCI && HAS_IOPORT && SCSI
385385
help
386386
This driver supports the ACARD SCSI host adapter.
387387
Support Chip <ATP870 ATP876 ATP880 ATP885>
@@ -462,7 +462,7 @@ config SCSI_MVUMI
462462
config SCSI_ADVANSYS
463463
tristate "AdvanSys SCSI support"
464464
depends on SCSI
465-
depends on ISA || EISA || PCI
465+
depends on (ISA || EISA || PCI) && HAS_IOPORT
466466
depends on ISA_DMA_API || !ISA
467467
help
468468
This is a driver for all SCSI host adapters manufactured by
@@ -503,7 +503,7 @@ config SCSI_HPTIOP
503503

504504
config SCSI_BUSLOGIC
505505
tristate "BusLogic SCSI support"
506-
depends on PCI && SCSI
506+
depends on SCSI && PCI && HAS_IOPORT
507507
help
508508
This is support for BusLogic MultiMaster and FlashPoint SCSI Host
509509
Adapters. Consult the SCSI-HOWTO, available from
@@ -518,7 +518,7 @@ config SCSI_BUSLOGIC
518518

519519
config SCSI_FLASHPOINT
520520
bool "FlashPoint support"
521-
depends on SCSI_BUSLOGIC && PCI
521+
depends on SCSI_BUSLOGIC && PCI && HAS_IOPORT
522522
help
523523
This option allows you to add FlashPoint support to the
524524
BusLogic SCSI driver. The FlashPoint SCCB Manager code is
@@ -632,7 +632,7 @@ config SCSI_SNIC_DEBUG_FS
632632

633633
config SCSI_DMX3191D
634634
tristate "DMX3191D SCSI support"
635-
depends on PCI && SCSI
635+
depends on PCI && HAS_IOPORT && SCSI
636636
select SCSI_SPI_ATTRS
637637
help
638638
This is support for Domex DMX3191D SCSI Host Adapters.
@@ -646,7 +646,7 @@ config SCSI_FDOMAIN
646646

647647
config SCSI_FDOMAIN_PCI
648648
tristate "Future Domain TMC-3260/AHA-2920A PCI SCSI support"
649-
depends on PCI && SCSI
649+
depends on PCI && HAS_IOPORT && SCSI
650650
select SCSI_FDOMAIN
651651
help
652652
This is support for Future Domain's PCI SCSI host adapters (TMC-3260)
@@ -699,7 +699,7 @@ config SCSI_GENERIC_NCR5380
699699

700700
config SCSI_IPS
701701
tristate "IBM ServeRAID support"
702-
depends on PCI && SCSI
702+
depends on PCI && HAS_IOPORT && SCSI
703703
help
704704
This is support for the IBM ServeRAID hardware RAID controllers.
705705
See <http://www.developer.ibm.com/welcome/netfinity/serveraid.html>
@@ -759,7 +759,7 @@ config SCSI_IBMVFC_TRACE
759759

760760
config SCSI_INITIO
761761
tristate "Initio 9100U(W) support"
762-
depends on PCI && SCSI
762+
depends on PCI && HAS_IOPORT && SCSI
763763
help
764764
This is support for the Initio 91XXU(W) SCSI host adapter. Please
765765
read the SCSI-HOWTO, available from
@@ -770,7 +770,7 @@ config SCSI_INITIO
770770

771771
config SCSI_INIA100
772772
tristate "Initio INI-A100U2W support"
773-
depends on PCI && SCSI
773+
depends on PCI && HAS_IOPORT && SCSI
774774
help
775775
This is support for the Initio INI-A100U2W SCSI host adapter.
776776
Please read the SCSI-HOWTO, available from
@@ -782,6 +782,7 @@ config SCSI_INIA100
782782
config SCSI_PPA
783783
tristate "IOMEGA parallel port (ppa - older drives)"
784784
depends on SCSI && PARPORT_PC
785+
depends on HAS_IOPORT
785786
help
786787
This driver supports older versions of IOMEGA's parallel port ZIP
787788
drive (a 100 MB removable media device).
@@ -1175,7 +1176,7 @@ config SCSI_SIM710
11751176

11761177
config SCSI_DC395x
11771178
tristate "Tekram DC395(U/UW/F) and DC315(U) SCSI support"
1178-
depends on PCI && SCSI
1179+
depends on PCI && HAS_IOPORT && SCSI
11791180
select SCSI_SPI_ATTRS
11801181
help
11811182
This driver supports PCI SCSI host adapters based on the ASIC
@@ -1207,7 +1208,7 @@ config SCSI_AM53C974
12071208

12081209
config SCSI_NSP32
12091210
tristate "Workbit NinjaSCSI-32Bi/UDE support"
1210-
depends on PCI && SCSI && !64BIT
1211+
depends on PCI && SCSI && !64BIT && HAS_IOPORT
12111212
help
12121213
This is support for the Workbit NinjaSCSI-32Bi/UDE PCI/Cardbus
12131214
SCSI host adapter. Please read the SCSI-HOWTO, available from

‎drivers/scsi/aic7xxx/Kconfig.aic79xx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
config SCSI_AIC79XX
77
tristate "Adaptec AIC79xx U320 support"
8-
depends on PCI && SCSI
8+
depends on PCI && HAS_IOPORT && SCSI
99
select SCSI_SPI_ATTRS
1010
help
1111
This driver supports all of Adaptec's Ultra 320 PCI-X

‎drivers/scsi/aic7xxx/Kconfig.aic7xxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
config SCSI_AIC7XXX
77
tristate "Adaptec AIC7xxx Fast -> U160 support"
8-
depends on (PCI || EISA) && SCSI
8+
depends on (PCI || EISA) && HAS_IOPORT && SCSI
99
select SCSI_SPI_ATTRS
1010
help
1111
This driver supports all of Adaptec's Fast through Ultra 160 PCI

‎drivers/scsi/aic94xx/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
config SCSI_AIC94XX
1010
tristate "Adaptec AIC94xx SAS/SATA support"
11-
depends on PCI
11+
depends on PCI && HAS_IOPORT
1212
select SCSI_SAS_LIBSAS
1313
select FW_LOADER
1414
help

‎drivers/scsi/megaraid/Kconfig.megaraid‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
config MEGARAID_NEWGEN
33
bool "LSI Logic New Generation RAID Device Drivers"
4-
depends on PCI && SCSI
4+
depends on PCI && HAS_IOPORT && SCSI
55
help
66
LSI Logic RAID Device Drivers
77

88
config MEGARAID_MM
99
tristate "LSI Logic Management Module (New Driver)"
10-
depends on PCI && SCSI && MEGARAID_NEWGEN
10+
depends on PCI && HAS_IOPORT && SCSI && MEGARAID_NEWGEN
1111
help
1212
Management Module provides ioctl, sysfs support for LSI Logic
1313
RAID controllers.
@@ -67,7 +67,7 @@ config MEGARAID_MAILBOX
6767

6868
config MEGARAID_LEGACY
6969
tristate "LSI Logic Legacy MegaRAID Driver"
70-
depends on PCI && SCSI
70+
depends on PCI && HAS_IOPORT && SCSI
7171
help
7272
This driver supports the LSI MegaRAID 418, 428, 438, 466, 762, 490
7373
and 467 SCSI host adapters. This driver also support the all U320

‎drivers/scsi/mvsas/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
config SCSI_MVSAS
1111
tristate "Marvell 88SE64XX/88SE94XX SAS/SATA support"
12-
depends on PCI
12+
depends on PCI && HAS_IOPORT
1313
select SCSI_SAS_LIBSAS
1414
select FW_LOADER
1515
help

‎drivers/scsi/pcmcia/Kconfig‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ if SCSI_LOWLEVEL_PCMCIA && SCSI && PCMCIA && m
1212

1313
config PCMCIA_AHA152X
1414
tristate "Adaptec AHA152X PCMCIA support"
15+
depends on HAS_IOPORT
1516
select SCSI_SPI_ATTRS
1617
help
1718
Say Y here if you intend to attach this type of PCMCIA SCSI host
@@ -22,6 +23,7 @@ config PCMCIA_AHA152X
2223

2324
config PCMCIA_FDOMAIN
2425
tristate "Future Domain PCMCIA support"
26+
depends on HAS_IOPORT
2527
select SCSI_FDOMAIN
2628
help
2729
Say Y here if you intend to attach this type of PCMCIA SCSI host
@@ -32,7 +34,7 @@ config PCMCIA_FDOMAIN
3234

3335
config PCMCIA_NINJA_SCSI
3436
tristate "NinjaSCSI-3 / NinjaSCSI-32Bi (16bit) PCMCIA support"
35-
depends on !64BIT || COMPILE_TEST
37+
depends on (!64BIT || COMPILE_TEST) && HAS_IOPORT
3638
help
3739
If you intend to attach this type of PCMCIA SCSI host adapter to
3840
your computer, say Y here and read
@@ -66,6 +68,7 @@ config PCMCIA_NINJA_SCSI
6668

6769
config PCMCIA_QLOGIC
6870
tristate "Qlogic PCMCIA support"
71+
depends on HAS_IOPORT
6972
help
7073
Say Y here if you intend to attach this type of PCMCIA SCSI host
7174
adapter to your computer.
@@ -75,6 +78,7 @@ config PCMCIA_QLOGIC
7578

7679
config PCMCIA_SYM53C500
7780
tristate "Symbios 53c500 PCMCIA support"
81+
depends on HAS_IOPORT
7882
help
7983
Say Y here if you have a New Media Bus Toaster or other PCMCIA
8084
SCSI adapter based on the Symbios 53c500 controller.

‎drivers/scsi/qla2xxx/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
config SCSI_QLA_FC
33
tristate "QLogic QLA2XXX Fibre Channel Support"
4-
depends on PCI && SCSI
4+
depends on PCI && HAS_IOPORT && SCSI
55
depends on SCSI_FC_ATTRS
66
depends on NVME_FC || !NVME_FC
77
select FW_LOADER

0 commit comments

Comments
 (0)