From: Jarkko Sakkinen <jarkko@kernel.org>
To: Niklas Schnelle <schnelle@linux.ibm.com>
Cc: "Arnd Bergmann" <arnd@arndb.de>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Corey Minyard" <minyard@acm.org>,
"Peter Huewe" <peterhuewe@gmx.de>,
"Jason Gunthorpe" <jgg@ziepe.ca>,
"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>,
openipmi-developer@lists.sourceforge.net,
linux-integrity@vger.kernel.org
Subject: Re: [PATCH v3 03/38] char: impi, tpm: depend on HAS_IOPORT
Date: Tue, 14 Mar 2023 14:20:56 +0200 [thread overview]
Message-ID: <ZBBmqKDh97KexRH9@kernel.org> (raw)
In-Reply-To: <20230314121216.413434-4-schnelle@linux.ibm.com>
On Tue, Mar 14, 2023 at 01:11:41PM +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 this dependency and ifdef
> sections of code using inb()/outb() as alternative access methods.
>
> Co-developed-by: Arnd Bergmann <arnd@kernel.org>
> Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
> ---
> 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(-)
>
> diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
> index 30fe9848dac1..c34679c6da70 100644
> --- a/drivers/char/Kconfig
> +++ b/drivers/char/Kconfig
> @@ -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
> diff --git a/drivers/char/ipmi/Makefile b/drivers/char/ipmi/Makefile
> index cb6138b8ded9..e0944547c9d0 100644
> --- a/drivers/char/ipmi/Makefile
> +++ b/drivers/char/ipmi/Makefile
> @@ -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
> diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
> index abddd7e43a9a..edbbdb804913 100644
> --- a/drivers/char/ipmi/ipmi_si_intf.c
> +++ b/drivers/char/ipmi/ipmi_si_intf.c
> @@ -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;
> diff --git a/drivers/char/ipmi/ipmi_si_pci.c b/drivers/char/ipmi/ipmi_si_pci.c
> index 74fa2055868b..b83d55685b22 100644
> --- a/drivers/char/ipmi/ipmi_si_pci.c
> +++ b/drivers/char/ipmi/ipmi_si_pci.c
> @@ -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 {
> diff --git a/drivers/char/pcmcia/Kconfig b/drivers/char/pcmcia/Kconfig
> index f5d589b2be44..788422627b43 100644
> --- a/drivers/char/pcmcia/Kconfig
> +++ b/drivers/char/pcmcia/Kconfig
> @@ -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
> diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
> index 927088b2c3d3..418c9ed59ffd 100644
> --- a/drivers/char/tpm/Kconfig
> +++ b/drivers/char/tpm/Kconfig
> @@ -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
> diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
> index 9c924a1440a9..2d2ae37153ba 100644
> --- a/drivers/char/tpm/tpm_infineon.c
> +++ b/drivers/char/tpm/tpm_infineon.c
> @@ -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 */
> diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
> index 3f98e587b3e8..e43d2a1da3ea 100644
> --- a/drivers/char/tpm/tpm_tis_core.c
> +++ b/drivers/char/tpm/tpm_tis_core.c
> @@ -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 = {
> --
> 2.37.2
>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Who should pick this?
BR, Jarkko
next prev parent reply other threads:[~2023-03-14 12:40 UTC|newest]
Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-14 12:11 [PATCH v3 00/38] Kconfig: Introduce HAS_IOPORT config option Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 01/38] Kconfig: introduce HAS_IOPORT option and select it as necessary Niklas Schnelle
2023-03-14 12:37 ` Johannes Berg
2023-03-23 13:23 ` Niklas Schnelle
2023-03-14 12:48 ` Geert Uytterhoeven
2023-03-14 13:29 ` Arnd Bergmann
2023-03-14 16:11 ` Niklas Schnelle
2023-03-14 16:37 ` Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 02/38] ata: add HAS_IOPORT dependencies Niklas Schnelle
2023-03-15 1:23 ` Damien Le Moal
2023-03-15 6:46 ` Arnd Bergmann
2023-03-15 7:15 ` Damien Le Moal
2023-03-15 7:15 ` Damien Le Moal
2023-03-15 8:39 ` Geert Uytterhoeven
2023-03-15 9:12 ` Damien Le Moal
2023-03-15 11:36 ` Geert Uytterhoeven
2023-03-15 23:57 ` Damien Le Moal
2023-03-16 15:21 ` Arnd Bergmann
2023-04-28 13:32 ` Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 03/38] char: impi, tpm: depend on HAS_IOPORT Niklas Schnelle
2023-03-14 12:20 ` Jarkko Sakkinen [this message]
2023-03-14 14:01 ` Arnd Bergmann
2023-03-14 13:52 ` Corey Minyard
2023-03-14 14:17 ` Geert Uytterhoeven
2023-03-14 15:08 ` Arnd Bergmann
2023-03-21 14:33 ` Jason Gunthorpe
2023-03-14 12:11 ` [PATCH v3 04/38] comedi: add HAS_IOPORT dependencies Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 05/38] counter: " Niklas Schnelle
2023-03-14 12:41 ` William Breathitt Gray
2023-04-28 13:27 ` Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 06/38] /dev/port: don't compile file operations without CONFIG_DEVPORT Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 07/38] drm: handle HAS_IOPORT dependencies Niklas Schnelle
2023-03-15 11:54 ` Jani Nikula
2023-03-23 15:05 ` Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 08/38] firmware: dmi-sysfs: handle HAS_IOPORT=n Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 09/38] gpio: add HAS_IOPORT dependencies Niklas Schnelle
2023-03-15 8:42 ` Linus Walleij
2023-04-28 14:41 ` Niklas Schnelle
2023-05-01 12:29 ` Linus Walleij
2023-03-14 12:11 ` [PATCH v3 10/38] hwmon: " Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 11/38] i2c: " Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 12/38] iio: ad7606: Kconfig: " Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 13/38] Input: " Niklas Schnelle
2023-03-15 8:22 ` Geert Uytterhoeven
2023-04-28 14:50 ` Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 14/38] Input: gameport: add ISA and " Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 15/38] leds: add " Niklas Schnelle
2023-03-16 16:14 ` Lee Jones
2023-03-23 12:42 ` Niklas Schnelle
2023-03-23 13:32 ` Arnd Bergmann
2023-03-23 14:02 ` Niklas Schnelle
2023-03-23 14:05 ` Arnd Bergmann
2023-03-23 16:11 ` Geert Uytterhoeven
2023-03-23 16:25 ` Arnd Bergmann
2023-03-23 14:53 ` Lee Jones
2023-03-23 15:33 ` Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 16/38] media: " Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 17/38] misc: " Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 18/38] mISDN: " Niklas Schnelle
2023-03-15 5:41 ` Jakub Kicinski
2023-03-14 12:11 ` [PATCH v3 19/38] mpt fusion: " Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 20/38] net: handle " Niklas Schnelle
2023-03-15 5:41 ` Jakub Kicinski
2023-03-15 9:47 ` Maciej W. Rozycki
2023-03-14 12:11 ` [PATCH v3 21/38] parport: PC style parport depends on HAS_IOPORT Niklas Schnelle
2023-03-14 14:12 ` Arnd Bergmann
2023-05-02 13:40 ` Niklas Schnelle
2023-05-02 15:30 ` Bjorn Helgaas
2023-03-14 12:12 ` [PATCH v3 22/38] PCI: Make quirk using inw() depend " Niklas Schnelle
2023-03-14 12:12 ` [PATCH v3 23/38] PCI/sysfs: Make I/O resource " Niklas Schnelle
2023-03-14 16:05 ` Bjorn Helgaas
2023-03-14 12:12 ` [PATCH v3 24/38] pcmcia: add HAS_IOPORT dependencies Niklas Schnelle
2023-03-14 12:12 ` [PATCH v3 25/38] platform: " Niklas Schnelle
2023-03-15 2:21 ` Tzung-Bi Shih
2023-03-14 12:12 ` [PATCH v3 26/38] pnp: " Niklas Schnelle
2023-03-20 17:37 ` Rafael J. Wysocki
2023-03-21 13:56 ` Rafael J. Wysocki
2023-03-23 12:55 ` Niklas Schnelle
2023-03-24 18:45 ` Wysocki, Rafael J
2023-03-14 12:12 ` [PATCH v3 27/38] power: " Niklas Schnelle
2023-03-29 23:01 ` Sebastian Reichel
2023-03-14 12:12 ` [PATCH v3 28/38] rtc: " Niklas Schnelle
2023-03-14 12:52 ` Alexandre Belloni
2023-05-08 15:36 ` Niklas Schnelle
2023-05-08 20:01 ` Arnd Bergmann
2023-05-09 6:38 ` Geert Uytterhoeven
2023-05-09 8:22 ` Arnd Bergmann
2023-05-09 8:51 ` Geert Uytterhoeven
2023-05-09 9:46 ` Arnd Bergmann
2023-03-14 12:12 ` [PATCH v3 29/38] scsi: " Niklas Schnelle
2023-03-14 12:12 ` [PATCH v3 30/38] sound: " Niklas Schnelle
2023-03-14 12:33 ` Takashi Iwai
2023-05-08 16:41 ` Niklas Schnelle
2023-03-14 12:12 ` [PATCH v3 31/38] speakup: add HAS_IOPORT dependency for SPEAKUP_SERIALIO Niklas Schnelle
2023-03-14 12:12 ` [PATCH v3 32/38] staging: add HAS_IOPORT dependencies Niklas Schnelle
2023-03-14 12:12 ` [PATCH v3 33/38] tty: serial: handle " Niklas Schnelle
2023-03-14 12:12 ` [PATCH v3 34/38] usb: " Niklas Schnelle
2023-03-14 14:56 ` Arnd Bergmann
2023-03-14 12:12 ` [PATCH v3 35/38] video: " Niklas Schnelle
2023-03-15 8:16 ` Geert Uytterhoeven
2023-03-15 10:19 ` Ville Syrjälä
2023-03-23 14:17 ` Niklas Schnelle
2023-03-23 16:08 ` Ville Syrjälä
2023-05-08 17:09 ` Niklas Schnelle
2023-03-14 12:12 ` [PATCH v3 36/38] watchdog: add " Niklas Schnelle
2023-03-14 14:21 ` Guenter Roeck
2023-03-14 12:12 ` [PATCH v3 37/38] wireless: " Niklas Schnelle
2023-03-15 5:26 ` Kalle Valo
2023-03-14 12:12 ` [PATCH v3 38/38] asm-generic/io.h: drop inb() etc for HAS_IOPORT=n Niklas Schnelle
2023-03-14 14:05 ` [PATCH v3 00/38] Kconfig: Introduce HAS_IOPORT config option Arnd Bergmann
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=ZBBmqKDh97KexRH9@kernel.org \
--to=jarkko@kernel.org \
--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=jgg@ziepe.ca \
--cc=linux-arch@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=minyard@acm.org \
--cc=openipmi-developer@lists.sourceforge.net \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=peterhuewe@gmx.de \
--cc=rafael@kernel.org \
--cc=schnelle@linux.ibm.com \
--cc=stern@rowland.harvard.edu \
--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).