i2c: i801: Use iTCO version 6 in Cannon Lake PCH and beyond

Intel Cannon Lake PCH moved the NO_REBOOT bit to reside as part of the
TCO registers instead so update the i2c-i801 driver so that for Cannon
Lake and beyond register platform device for iTCO using version 6. The
affected PCHs are Cannon Lake, Cedar Fork, Comet Lake, Elkhart Lake and
Ice Lake.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

1 files changed, 88 insertions, 54 deletions

diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index a6469978e735..38afd16c857a 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -292,7 +292,8 @@ struct i801_priv {
 #define FEATURE_HOST_NOTIFY     BIT(5)
 /* Not really a feature, but it's convenient to handle it as such */
 #define FEATURE_IDF             BIT(15)
-#define FEATURE_TCO             BIT(16)
+#define FEATURE_TCO_SPT         BIT(16)
+#define FEATURE_TCO_CNL         BIT(17)
 
 static const char *i801_feature_names[] = {
         "SMBus PEC",
@@ -1491,57 +1492,23 @@ static inline unsigned int i801_get_adapter_class(struct i801_priv *priv)
 }
 #endif
 
-static const struct itco_wdt_platform_data tco_platform_data = {
+static const struct itco_wdt_platform_data spt_tco_platform_data = {
         .name = "Intel PCH",
         .version = 4,
 };
 
 static DEFINE_SPINLOCK(p2sb_spinlock);
 
-static void i801_add_tco(struct i801_priv *priv)
+static struct platform_device *
+i801_add_tco_spt(struct i801_priv *priv, struct pci_dev *pci_dev,
+                 struct resource *tco_res)
 {
-        struct pci_dev *pci_dev = priv->pci_dev;
-        struct resource tco_res[3], *res;
-        struct platform_device *pdev;
+        struct resource *res;
         unsigned int devfn;
-        u32 tco_base, tco_ctl;
-        u32 base_addr, ctrl_val;
         u64 base64_addr;
+        u32 base_addr;
         u8 hidden;
 
-        if (!(priv->features & FEATURE_TCO))
-                return;
-
-        pci_read_config_dword(pci_dev, TCOBASE, &tco_base);
-        pci_read_config_dword(pci_dev, TCOCTL, &tco_ctl);
-        if (!(tco_ctl & TCOCTL_EN))
-                return;
-
-        memset(tco_res, 0, sizeof(tco_res));
-
-        res = &tco_res[ICH_RES_IO_TCO];
-        res->start = tco_base & ~1;
-        res->end = res->start + 32 - 1;
-        res->flags = IORESOURCE_IO;
-
-        /*
-         * Power Management registers.
-         */
-        devfn = PCI_DEVFN(PCI_SLOT(pci_dev->devfn), 2);
-        pci_bus_read_config_dword(pci_dev->bus, devfn, ACPIBASE, &base_addr);
-
-        res = &tco_res[ICH_RES_IO_SMI];
-        res->start = (base_addr & ~1) + ACPIBASE_SMI_OFF;
-        res->end = res->start + 3;
-        res->flags = IORESOURCE_IO;
-
-        /*
-         * Enable the ACPI I/O space.
-         */
-        pci_bus_read_config_dword(pci_dev->bus, devfn, ACPICTRL, &ctrl_val);
-        ctrl_val |= ACPICTRL_EN;
-        pci_bus_write_config_dword(pci_dev->bus, devfn, ACPICTRL, ctrl_val);
-
         /*
          * We must access the NO_REBOOT bit over the Primary to Sideband
          * bridge (P2SB). The BIOS prevents the P2SB device from being
@@ -1577,15 +1544,76 @@ static void i801_add_tco(struct i801_priv *priv)
         res->end = res->start + 3;
         res->flags = IORESOURCE_MEM;
 
-        pdev = platform_device_register_resndata(&pci_dev->dev, "iTCO_wdt", -1,
-                                                 tco_res, 3, &tco_platform_data,
-                                                 sizeof(tco_platform_data));
-        if (IS_ERR(pdev)) {
-                dev_warn(&pci_dev->dev, "failed to create iTCO device\n");
+        return platform_device_register_resndata(&pci_dev->dev, "iTCO_wdt", -1,
+                                        tco_res, 3, &spt_tco_platform_data,
+                                        sizeof(spt_tco_platform_data));
+}
+
+static const struct itco_wdt_platform_data cnl_tco_platform_data = {
+        .name = "Intel PCH",
+        .version = 6,
+};
+
+static struct platform_device *
+i801_add_tco_cnl(struct i801_priv *priv, struct pci_dev *pci_dev,
+                 struct resource *tco_res)
+{
+        return platform_device_register_resndata(&pci_dev->dev, "iTCO_wdt", -1,
+                                        tco_res, 2, &cnl_tco_platform_data,
+                                        sizeof(cnl_tco_platform_data));
+}
+
+static void i801_add_tco(struct i801_priv *priv)
+{
+        u32 base_addr, tco_base, tco_ctl, ctrl_val;
+        struct pci_dev *pci_dev = priv->pci_dev;
+        struct resource tco_res[3], *res;
+        unsigned int devfn;
+
+        /* If we have ACPI based watchdog use that instead */
+        if (acpi_has_watchdog())
+                return;
+
+        if (!(priv->features & (FEATURE_TCO_SPT | FEATURE_TCO_CNL)))
                 return;
-        }
 
-        priv->tco_pdev = pdev;
+        pci_read_config_dword(pci_dev, TCOBASE, &tco_base);
+        pci_read_config_dword(pci_dev, TCOCTL, &tco_ctl);
+        if (!(tco_ctl & TCOCTL_EN))
+                return;
+
+        memset(tco_res, 0, sizeof(tco_res));
+
+        res = &tco_res[ICH_RES_IO_TCO];
+        res->start = tco_base & ~1;
+        res->end = res->start + 32 - 1;
+        res->flags = IORESOURCE_IO;
+
+        /*
+         * Power Management registers.
+         */
+        devfn = PCI_DEVFN(PCI_SLOT(pci_dev->devfn), 2);
+        pci_bus_read_config_dword(pci_dev->bus, devfn, ACPIBASE, &base_addr);
+
+        res = &tco_res[ICH_RES_IO_SMI];
+        res->start = (base_addr & ~1) + ACPIBASE_SMI_OFF;
+        res->end = res->start + 3;
+        res->flags = IORESOURCE_IO;
+
+        /*
+         * Enable the ACPI I/O space.
+         */
+        pci_bus_read_config_dword(pci_dev->bus, devfn, ACPICTRL, &ctrl_val);
+        ctrl_val |= ACPICTRL_EN;
+        pci_bus_write_config_dword(pci_dev->bus, devfn, ACPICTRL, ctrl_val);
+
+        if (priv->features & FEATURE_TCO_CNL)
+                priv->tco_pdev = i801_add_tco_cnl(priv, pci_dev, tco_res);
+        else
+                priv->tco_pdev = i801_add_tco_spt(priv, pci_dev, tco_res);
+
+        if (IS_ERR(priv->tco_pdev))
+                dev_warn(&pci_dev->dev, "failed to create iTCO device\n");
 }
 
 #ifdef CONFIG_ACPI
@@ -1695,13 +1723,21 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
         switch (dev->device) {
         case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_SMBUS:
         case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_SMBUS:
-        case PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS:
-        case PCI_DEVICE_ID_INTEL_CANNONLAKE_LP_SMBUS:
         case PCI_DEVICE_ID_INTEL_LEWISBURG_SMBUS:
         case PCI_DEVICE_ID_INTEL_LEWISBURG_SSKU_SMBUS:
-        case PCI_DEVICE_ID_INTEL_CDF_SMBUS:
         case PCI_DEVICE_ID_INTEL_DNV_SMBUS:
         case PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS:
+                priv->features |= FEATURE_I2C_BLOCK_READ;
+                priv->features |= FEATURE_IRQ;
+                priv->features |= FEATURE_SMBUS_PEC;
+                priv->features |= FEATURE_BLOCK_BUFFER;
+                priv->features |= FEATURE_TCO_SPT;
+                priv->features |= FEATURE_HOST_NOTIFY;
+                break;
+
+        case PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS:
+        case PCI_DEVICE_ID_INTEL_CANNONLAKE_LP_SMBUS:
+        case PCI_DEVICE_ID_INTEL_CDF_SMBUS:
         case PCI_DEVICE_ID_INTEL_ICELAKE_LP_SMBUS:
         case PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS:
         case PCI_DEVICE_ID_INTEL_ELKHART_LAKE_SMBUS:
@@ -1711,9 +1747,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
                 priv->features |= FEATURE_IRQ;
                 priv->features |= FEATURE_SMBUS_PEC;
                 priv->features |= FEATURE_BLOCK_BUFFER;
-                /* If we have ACPI based watchdog use that instead */
-                if (!acpi_has_watchdog())
-                        priv->features |= FEATURE_TCO;
+                priv->features |= FEATURE_TCO_CNL;
                 priv->features |= FEATURE_HOST_NOTIFY;
                 break;