i2c: piix4: Add EFCH MMIO support to SMBus base address detect

commit 46967bc1ee93acd1d8953c87dc16f43de4076f93 upstream.

The EFCH SMBus controller's base address is determined using details in
FCH::PM::DECODEEN[smbusasfiobase] and FCH::PM::DECODEEN[smbusasfioen].These
register fields were accessed using cd6h/cd7h port I/O. cd6h/cd7h port I/O
is no longer available in later AMD processors. Change base address
detection to use MMIO instead of port I/O cd6h/cd7h.

Signed-off-by: Terry Bowman <terry.bowman@amd.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Cc: Mario Limonciello <Mario.Limonciello@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index d06998f..7f31217 100644 (file)
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -344,10 +344,15 @@ static int piix4_setup_sb800_smba(struct pci_dev *PIIX4_dev,
        if (retval)
                return retval;
 
-       outb_p(smb_en, SB800_PIIX4_SMB_IDX);
-       smba_en_lo = inb_p(SB800_PIIX4_SMB_IDX + 1);
-       outb_p(smb_en + 1, SB800_PIIX4_SMB_IDX);
-       smba_en_hi = inb_p(SB800_PIIX4_SMB_IDX + 1);
+       if (mmio_cfg.use_mmio) {
+               smba_en_lo = ioread8(mmio_cfg.addr);
+               smba_en_hi = ioread8(mmio_cfg.addr + 1);
+       } else {
+               outb_p(smb_en, SB800_PIIX4_SMB_IDX);
+               smba_en_lo = inb_p(SB800_PIIX4_SMB_IDX + 1);
+               outb_p(smb_en + 1, SB800_PIIX4_SMB_IDX);
+               smba_en_hi = inb_p(SB800_PIIX4_SMB_IDX + 1);
+       }
 
        piix4_sb800_region_release(&PIIX4_dev->dev, &mmio_cfg);