i2c: piix4: Fix port selection for AMD Family 16h Model 30h [Linux 4.19.70]

This Linux kernel change "i2c: piix4: Fix port selection for AMD Family 16h Model 30h" is included in the Linux 4.19.70 release. This change is authored by Andrew Cooks <andrew.cooks [at] opengear.com> on Fri Aug 2 14:52:46 2019 +0200. The commit for this change in Linux stable tree is 3b26fa9 (patch) which is from upstream commit c7c06a1. The same Linux upstream change may have been applied to various maintained Linux releases and you can find all Linux releases containing changes from upstream c7c06a1.

i2c: piix4: Fix port selection for AMD Family 16h Model 30h

[ Upstream commit c7c06a1532f3fe106687ac82a13492c6a619ff1c ]

Family 16h Model 30h SMBus controller needs the same port selection fix
as described and fixed in commit 0fe16195f891 ("i2c: piix4: Fix SMBus port
selection for AMD Family 17h chips")

commit 6befa3fde65f ("i2c: piix4: Support alternative port selection
register") also fixed the port selection for Hudson2, but unfortunately
this is not the exact same device and the AMD naming and PCI Device IDs
aren't particularly helpful here.

The SMBus port selection register is common to the following Families
and models, as documented in AMD's publicly available BIOS and Kernel
Developer Guides:

 50742 - Family 15h Model 60h-6Fh (PCI_DEVICE_ID_AMD_KERNCZ_SMBUS)
 55072 - Family 15h Model 70h-7Fh (PCI_DEVICE_ID_AMD_KERNCZ_SMBUS)
 52740 - Family 16h Model 30h-3Fh (PCI_DEVICE_ID_AMD_HUDSON2_SMBUS)

The Hudson2 PCI Device ID (PCI_DEVICE_ID_AMD_HUDSON2_SMBUS) is shared
between Bolton FCH and Family 16h Model 30h, but the location of the
SmBus0Sel port selection bits are different:

 51192 - Bolton Register Reference Guide

We distinguish between Bolton and Family 16h Model 30h using the PCI
Revision ID:

  Bolton is device 0x780b, revision 0x15
  Family 16h Model 30h is device 0x780b, revision 0x1F
  Family 15h Model 60h and 70h are both device 0x790b, revision 0x4A.

The following additional public AMD BKDG documents were checked and do
not share the same port selection register:

 42301 - Family 15h Model 00h-0Fh doesn't mention any
 42300 - Family 15h Model 10h-1Fh doesn't mention any
 49125 - Family 15h Model 30h-3Fh doesn't mention any

 48751 - Family 16h Model 00h-0Fh uses the previously supported
         index register SB800_PIIX4_PORT_IDX_ALT at 0x2e

Signed-off-by: Andrew Cooks <andrew.cooks@opengear.com>
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: stable@vger.kernel.org [v4.6+]
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

There are 12 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/i2c/busses/i2c-piix4.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 90946a8..9ff3371 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -98,7 +98,7 @@
 #define SB800_PIIX4_PORT_IDX_MASK  0x06
 #define SB800_PIIX4_PORT_IDX_SHIFT 1

-/* On kerncz, SmBus0Sel is at bit 20:19 of PMx00 DecodeEn */
+/* On kerncz and Hudson2, SmBus0Sel is at bit 20:19 of PMx00 DecodeEn */
 #define SB800_PIIX4_PORT_IDX_KERNCZ        0x02
 #define SB800_PIIX4_PORT_IDX_MASK_KERNCZ   0x18
 #define SB800_PIIX4_PORT_IDX_SHIFT_KERNCZ  3
@@ -362,18 +362,16 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,

    /* Find which register is used for port selection */
    if (PIIX4_dev->vendor == PCI_VENDOR_ID_AMD) {
-       switch (PIIX4_dev->device) {
-       case PCI_DEVICE_ID_AMD_KERNCZ_SMBUS:
+       if (PIIX4_dev->device == PCI_DEVICE_ID_AMD_KERNCZ_SMBUS ||
+           (PIIX4_dev->device == PCI_DEVICE_ID_AMD_HUDSON2_SMBUS &&
+            PIIX4_dev->revision >= 0x1F)) {
            piix4_port_sel_sb800 = SB800_PIIX4_PORT_IDX_KERNCZ;
            piix4_port_mask_sb800 = SB800_PIIX4_PORT_IDX_MASK_KERNCZ;
            piix4_port_shift_sb800 = SB800_PIIX4_PORT_IDX_SHIFT_KERNCZ;
-           break;
-       case PCI_DEVICE_ID_AMD_HUDSON2_SMBUS:
-       default:
+       } else {
            piix4_port_sel_sb800 = SB800_PIIX4_PORT_IDX_ALT;
            piix4_port_mask_sb800 = SB800_PIIX4_PORT_IDX_MASK;
            piix4_port_shift_sb800 = SB800_PIIX4_PORT_IDX_SHIFT;
-           break;
        }
    } else {
        if (!request_muxed_region(SB800_PIIX4_SMB_IDX, 2,

Leave a Reply

Your email address will not be published. Required fields are marked *