From: Niklas Schnelle <schnelle@linux.ibm.com>
To: Arnd Bergmann <arnd@arndb.de>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Hannes Reinecke <hare@suse.com>,
Kashyap Desai <kashyap.desai@broadcom.com>,
Sumit Saxena <sumit.saxena@broadcom.com>,
Shivasharan S <shivasharan.srikanteshwara@broadcom.com>,
Nilesh Javali <njavali@marvell.com>,
GR-QLogic-Storage-Upstream@marvell.com
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Mauro Carvalho Chehab" <mchehab@kernel.org>,
"Alan Stern" <stern@rowland.harvard.edu>,
"Rafael J. Wysocki" <rafael@kernel.org>,
"Geert Uytterhoeven" <geert@linux-m68k.org>,
"Paul Walmsley" <paul.walmsley@sifive.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Albert Ou" <aou@eecs.berkeley.edu>,
linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
linux-pci@vger.kernel.org, "Arnd Bergmann" <arnd@kernel.org>,
linux-scsi@vger.kernel.org, megaraidlinux.pdl@broadcom.com
Subject: [PATCH v5 31/44] scsi: add HAS_IOPORT dependencies
Date: Mon, 22 May 2023 12:50:36 +0200 [thread overview]
Message-ID: <20230522105049.1467313-32-schnelle@linux.ibm.com> (raw)
In-Reply-To: <20230522105049.1467313-1-schnelle@linux.ibm.com>
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>
---
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(-)
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 0704809d9d99..4962ce989113 100644
--- 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 a47dbd500e9a..4bc53eec4c83 100644
--- 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 0cfd92ce750a..f0425145a5f4 100644
--- 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 71931c371b1c..aaa8dadc6e1c 100644
--- 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 2adc2afd9f91..3f2ce1eb081c 100644
--- 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 79812b80743b..5ac7fd593b17 100644
--- 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 9696b6b5591f..449bd85db7bb 100644
--- 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 802c373fd6d9..a584708d3056 100644
--- 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
--
2.39.2
next prev parent reply other threads:[~2023-05-22 11:50 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-22 10:50 [PATCH v5 00/44] treewide: Remove I/O port accessors for HAS_IOPORT=n Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 01/44] kgdb: add HAS_IOPORT dependency Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 02/44] ata: add HAS_IOPORT dependencies Niklas Schnelle
2023-05-22 11:49 ` Damien Le Moal
2023-05-22 10:50 ` [PATCH v5 03/44] char: " Niklas Schnelle
2023-07-04 8:09 ` Geert Uytterhoeven
2023-05-22 10:50 ` [PATCH v5 04/44] char: ipmi: handle " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 05/44] char: tpm: " Niklas Schnelle
2023-05-24 1:09 ` Jarkko Sakkinen
2023-05-24 3:13 ` Jarkko Sakkinen
2023-05-22 10:50 ` [PATCH v5 06/44] comedi: add " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 07/44] counter: add HAS_IOPORT_MAP dependency Niklas Schnelle
2023-06-08 14:59 ` William Breathitt Gray
2023-06-09 14:57 ` Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 08/44] /dev/port: don't compile file operations without CONFIG_DEVPORT Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 09/44] drm: handle HAS_IOPORT dependencies Niklas Schnelle
2023-05-22 12:38 ` Thomas Zimmermann
2023-05-22 13:06 ` Arnd Bergmann
2023-05-22 13:14 ` Gerd Hoffmann
2023-05-22 10:50 ` [PATCH v5 10/44] firmware: dmi-sysfs: handle HAS_IOPORT=n Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 11/44] gpio: add HAS_IOPORT dependencies Niklas Schnelle
2023-05-23 8:15 ` Bartosz Golaszewski
2023-05-22 10:50 ` [PATCH v5 12/44] hwmon: " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 13/44] i2c: " Niklas Schnelle
2023-09-24 21:01 ` Wolfram Sang
2023-10-23 15:36 ` Wolfram Sang
2023-05-22 10:50 ` [PATCH v5 14/44] iio: ad7606: Kconfig: " Niklas Schnelle
2023-05-28 18:55 ` Jonathan Cameron
2023-05-30 9:21 ` Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 15/44] Input: " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 16/44] Input: gameport: add ISA and " Niklas Schnelle
2023-05-22 22:16 ` Dmitry Torokhov
2023-05-22 10:50 ` [PATCH v5 17/44] leds: add " Niklas Schnelle
2023-05-25 11:21 ` Lee Jones
2023-05-22 10:50 ` [PATCH v5 18/44] media: " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 19/44] misc: " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 20/44] mISDN: " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 21/44] mpt fusion: " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 22/44] net: handle " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 23/44] parport: PC style parport depends on HAS_IOPORT Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 24/44] PCI: Make quirk using inw() depend " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 25/44] PCI/sysfs: Make I/O resource " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 26/44] pcmcia: add HAS_IOPORT dependencies Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 27/44] platform: " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 28/44] pnp: " Niklas Schnelle
2023-05-22 11:54 ` Jaroslav Kysela
2023-05-22 10:50 ` [PATCH v5 29/44] power: " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 30/44] rtc: " Niklas Schnelle
2023-05-22 13:09 ` Maciej W. Rozycki
2023-06-06 21:35 ` (subset) " Alexandre Belloni
2023-07-04 8:06 ` Geert Uytterhoeven
2023-07-04 11:25 ` Arnd Bergmann
2023-07-04 12:46 ` Geert Uytterhoeven
2023-05-22 10:50 ` Niklas Schnelle [this message]
2023-05-22 22:28 ` [PATCH v5 31/44] scsi: " Martin K. Petersen
2023-05-23 7:26 ` Niklas Schnelle
2023-06-01 0:00 ` Martin K. Petersen
2023-05-22 10:50 ` [PATCH v5 32/44] sound: " Niklas Schnelle
2023-05-22 11:55 ` Jaroslav Kysela
2023-05-22 11:59 ` Takashi Iwai
2023-05-22 13:54 ` Niklas Schnelle
2023-05-22 14:44 ` Takashi Iwai
2023-05-22 10:50 ` [PATCH v5 33/44] speakup: add HAS_IOPORT dependency for SPEAKUP_SERIALIO Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 34/44] staging: add HAS_IOPORT dependencies Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 35/44] tty: serial: handle " Niklas Schnelle
2023-05-30 14:39 ` Greg Kroah-Hartman
2023-05-22 10:50 ` [PATCH v5 36/44] usb: add " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 37/44] usb: uhci: handle " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 38/44] usb: pci-quirks: " Niklas Schnelle
2023-05-29 14:34 ` Greg Kroah-Hartman
2023-05-22 10:50 ` [PATCH v5 39/44] vgacon: add " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 40/44] fbdev: " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 41/44] video: Handle " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 42/44] watchdog: add " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 43/44] wireless: " Niklas Schnelle
2023-05-24 7:38 ` Kalle Valo
2023-05-25 12:01 ` Niklas Schnelle
2023-05-25 16:08 ` [v5,43/44] wifi: " Kalle Valo
2023-05-22 10:50 ` [PATCH v5 44/44] asm-generic/io.h: Remove I/O port accessors for HAS_IOPORT=n Niklas Schnelle
2023-05-22 11:29 ` [PATCH v5 00/44] treewide: " Arnd Bergmann
2023-06-27 9:12 ` Niklas Schnelle
2023-06-27 12:53 ` Arnd Bergmann
2023-06-29 13:26 ` Niklas Schnelle
2023-06-08 1:42 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230522105049.1467313-32-schnelle@linux.ibm.com \
--to=schnelle@linux.ibm.com \
--cc=GR-QLogic-Storage-Upstream@marvell.com \
--cc=aou@eecs.berkeley.edu \
--cc=arnd@arndb.de \
--cc=arnd@kernel.org \
--cc=bhelgaas@google.com \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=hare@suse.com \
--cc=jejb@linux.ibm.com \
--cc=kashyap.desai@broadcom.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mchehab@kernel.org \
--cc=megaraidlinux.pdl@broadcom.com \
--cc=njavali@marvell.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=rafael@kernel.org \
--cc=shivasharan.srikanteshwara@broadcom.com \
--cc=stern@rowland.harvard.edu \
--cc=sumit.saxena@broadcom.com \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).