This is a note to let you know that I've just added the patch titled
i2c: piix4: Move SMBus port selection into function
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-move-smbus-port-selection-into-function.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 fbafbd51bff52cb3a920fd98d4dae2a78dd433d0 Mon Sep 17 00:00:00 2001
From: Terry Bowman <terry.bowman@xxxxxxx>
Date: Wed, 9 Feb 2022 11:27:13 -0600
Subject: i2c: piix4: Move SMBus port selection into function
From: Terry Bowman <terry.bowman@xxxxxxx>
commit fbafbd51bff52cb3a920fd98d4dae2a78dd433d0 upstream.
Move port selection code into a separate function. Refactor is in
preparation for following MMIO changes.
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 | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -698,6 +698,20 @@ static void piix4_imc_wakeup(void)
release_region(KERNCZ_IMC_IDX, 2);
}
+static int piix4_sb800_port_sel(u8 port)
+{
+ u8 smba_en_lo, val;
+
+ outb_p(piix4_port_sel_sb800, SB800_PIIX4_SMB_IDX);
+ smba_en_lo = inb_p(SB800_PIIX4_SMB_IDX + 1);
+
+ val = (smba_en_lo & ~piix4_port_mask_sb800) | port;
+ if (smba_en_lo != val)
+ outb_p(val, SB800_PIIX4_SMB_IDX + 1);
+
+ return (smba_en_lo & piix4_port_mask_sb800);
+}
+
/*
* Handles access to multiple SMBus ports on the SB800.
* The port is selected by bits 2:1 of the smb_en register (0x2c).
@@ -714,8 +728,7 @@ static s32 piix4_access_sb800(struct i2c
unsigned short piix4_smba = adapdata->smba;
int retries = MAX_TIMEOUT;
int smbslvcnt;
- u8 smba_en_lo;
- u8 port;
+ u8 prev_port;
int retval;
retval = piix4_sb800_region_request(&adap->dev);
@@ -775,18 +788,12 @@ static s32 piix4_access_sb800(struct i2c
}
}
- outb_p(piix4_port_sel_sb800, SB800_PIIX4_SMB_IDX);
- smba_en_lo = inb_p(SB800_PIIX4_SMB_IDX + 1);
-
- port = adapdata->port;
- if ((smba_en_lo & piix4_port_mask_sb800) != port)
- outb_p((smba_en_lo & ~piix4_port_mask_sb800) | port,
- SB800_PIIX4_SMB_IDX + 1);
+ prev_port = piix4_sb800_port_sel(adapdata->port);
retval = piix4_access(adap, addr, flags, read_write,
command, size, data);
- outb_p(smba_en_lo, SB800_PIIX4_SMB_IDX + 1);
+ piix4_sb800_port_sel(prev_port);
/* Release the semaphore */
outb_p(smbslvcnt | 0x20, SMBSLVCNT);
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
