On Wed, Aug 28, 2019 at 03:24:20PM +0200, Jean Delvare wrote:
> Hi Mika,
Hi,
> On Fri, 9 Aug 2019 15:45:53 +0300, Mika Westerberg wrote:
> > 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.
>
> Looks overall good, with just minor comments inline below.
>
> >
> > Signed-off-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
> > ---
> > drivers/i2c/busses/i2c-i801.c | 138 +++++++++++++++++++++-------------
> > 1 file changed, 86 insertions(+), 52 deletions(-)
> >
> > diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
> > index f2956936c3f2..6918406d00a5 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,37 @@ 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 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 const struct itco_wdt_platform_data spt_tco_platform_data = {
> > .name = "Intel PCH",
> > .version = 4,
> > };
>
> I think it would make more sense to put the oldest code (v4) first and
> then the newest code (v6)?
Makes sense. I'll do that in v2.
> > (...)
> > @@ -1695,13 +1719,23 @@ 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;
> > + /* If we have ACPI based watchdog use that instead */
> > + if (!acpi_has_watchdog())
>
> What about setting the flag unconditionally and moving the call to
> acpi_has_watchdog() inside i801_add_tco()? To avoid the duplication of
> comment and call, and make future v7 easier too.
Yes, works for me.
> > + 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:
> > @@ -1713,7 +1747,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
> > 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;
> >
>
> Reviewed-by: Jean Delvare <jdelvare@xxxxxxx>
Thanks!
