This is a note to let you know that I've just added the patch titled
i2c: piix4: Add EFCH MMIO support to SMBus base address detect
to the 5.17-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
i2c-piix4-add-efch-mmio-support-to-smbus-base-address-detect.patch
and it can be found in the queue-5.17 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 46967bc1ee93acd1d8953c87dc16f43de4076f93 Mon Sep 17 00:00:00 2001
From: Terry Bowman <terry.bowman@xxxxxxx>
Date: Wed, 9 Feb 2022 11:27:15 -0600
Subject: i2c: piix4: Add EFCH MMIO support to SMBus base address detect
From: Terry Bowman <terry.bowman@xxxxxxx>
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@xxxxxxx>
Reviewed-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
Reviewed-by: Jean Delvare <jdelvare@xxxxxxx>
Signed-off-by: Wolfram Sang <wsa@xxxxxxxxxx>
Cc: Mario Limonciello <Mario.Limonciello@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/i2c/busses/i2c-piix4.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
--- 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
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);
Patches currently in stable-queue which might be from terry.bowman@xxxxxxx are
queue-5.17/watchdog-sp5100_tco-add-initialization-using-efch-mmio.patch
queue-5.17/i2c-piix4-add-efch-mmio-support-to-region-request-and-release.patch
queue-5.17/i2c-piix4-move-smbus-port-selection-into-function.patch
queue-5.17/i2c-piix4-add-efch-mmio-support-to-smbus-base-address-detect.patch
queue-5.17/i2c-piix4-move-port-i-o-region-request-release-code-into-functions.patch
queue-5.17/i2c-piix4-replace-hardcoded-memory-map-size-with-a-define.patch
queue-5.17/kernel-resource-introduce-request_mem_region_muxed.patch
queue-5.17/i2c-piix4-enable-efch-mmio-for-family-17h.patch
queue-5.17/watchdog-sp5100_tco-enable-family-17h-cpus.patch
queue-5.17/watchdog-sp5100_tco-move-timer-initialization-into-function.patch
queue-5.17/i2c-piix4-add-efch-mmio-support-for-smbus-port-select.patch
queue-5.17/watchdog-sp5100_tco-refactor-mmio-base-address-initialization.patch
queue-5.17/i2c-piix4-move-smbus-controller-base-address-detect-into-function.patch
