lkml.org 
[lkml]   [2021]   [Dec]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC 05/32] char: impi, tpm: depend on HAS_IOPORT
    Date
    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: 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/tpm/Kconfig | 1 +
    drivers/char/tpm/tpm_infineon.c | 14 ++++++++++----
    drivers/char/tpm/tpm_tis_core.c | 19 ++++++++-----------
    7 files changed, 30 insertions(+), 24 deletions(-)

    diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
    index 740811893c57..3d046e364e53 100644
    --- a/drivers/char/Kconfig
    +++ b/drivers/char/Kconfig
    @@ -33,6 +33,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
    @@ -346,7 +347,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 7ce790efad92..439bed4feb3a 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 64dedb3ef8ec..e8094b4007de 100644
    --- a/drivers/char/ipmi/ipmi_si_intf.c
    +++ b/drivers/char/ipmi/ipmi_si_intf.c
    @@ -1881,7 +1881,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/tpm/Kconfig b/drivers/char/tpm/Kconfig
    index 4a5516406c22..4bc52ed08015 100644
    --- a/drivers/char/tpm/Kconfig
    +++ b/drivers/char/tpm/Kconfig
    @@ -137,6 +137,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 b2659a4c4016..eb298e82861e 100644
    --- a/drivers/char/tpm/tpm_tis_core.c
    +++ b/drivers/char/tpm/tpm_tis_core.c
    @@ -879,11 +879,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)
    @@ -894,13 +889,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.32.0
    \
     
     \ /
      Last update: 2021-12-27 17:45    [W:4.229 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site