i2c: i801: Improve handling of chip-specific feature definitions
PATCH v2 1/1 i2c: i801: Improve handling of chip-specific feature definitions
Reduce source code and code size by defining the chip features statically.
Signed-off-by Heiner Kallweit <[email protected]>
---
v2:
- make checkpatch happy
- rename feature definitions to FEATURES_ICH4 and FEATURES_ICH5
- fix patch title typo
--- drivers/i2c/busses/i2c-i801.c | 191 ++++++++++++---------------------- 1 file changed, 66 insertions(+), 125 deletions(-)
drivers/i2c/busses/i2c-i801.c +66 -125
@@ -990,66 +990,72 @@ static const struct i2c_algorithm smbus_algorithm = { .functionality = i801_func, }; +#define FEATURES_ICH5 (FEATURE_BLOCK_PROC | FEATURE_I2C_BLOCK_READ | \ + FEATURE_IRQ | FEATURE_SMBUS_PEC | \ + FEATURE_BLOCK_BUFFER | FEATURE_HOST_NOTIFY) +#define FEATURES_ICH4 (FEATURE_SMBUS_PEC | FEATURE_BLOCK_BUFFER | \ + FEATURE_HOST_NOTIFY) +static const struct pci_device_id i801_ids[] = { - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82801AA_3 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82801AB_3 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82801BA_2 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82801CA_3 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82801DB_3 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82801EB_3 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ESB_4 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICH6_16 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICH7_17 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ESB2_17 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICH8_5 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICH9_6 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EP80579_1 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICH10_4 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICH10_5 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF0 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF1 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF2 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_PANTHERPOINT_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_AVOTON_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS0 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS1 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS2 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_COLETOCREEK_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_GEMINILAKE_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_BAYTRAIL_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_BRASWELL_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CDF_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_DNV_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EBG_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_BROXTON_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_LEWISBURG_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_LEWISBURG_SSKU_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CANNONLAKE_LP_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICELAKE_LP_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICELAKE_N_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_COMETLAKE_H_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_COMETLAKE_V_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ELKHART_LAKE_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_TIGERLAKE_LP_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_TIGERLAKE_H_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_JASPER_LAKE_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ALDER_LAKE_S_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ALDER_LAKE_P_SMBUS ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ALDER_LAKE_M_SMBUS ) }, + { PCI_DEVICE_DATA(INTEL, 82801AA_3, 0) }, + { PCI_DEVICE_DATA(INTEL, 82801AB_3, 0) }, + { PCI_DEVICE_DATA(INTEL, 82801BA_2, 0) }, + { PCI_DEVICE_DATA(INTEL, 82801CA_3, FEATURE_HOST_NOTIFY) }, + { PCI_DEVICE_DATA(INTEL, 82801DB_3, FEATURES_ICH4) }, + { PCI_DEVICE_DATA(INTEL, 82801EB_3, FEATURES_ICH5) }, + {PCI_DEVICE_DATA (INTEL ,ESB_4 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ICH6_16 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ICH7_17 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ESB2_17 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ICH8_5 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ICH9_6 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,EP80579_1 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ICH10_4 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ICH10_5 ,FEATURES_ICH5 ) }, + { PCI_DEVICE_DATA(INTEL, 5_3400_SERIES_SMBUS, FEATURES_ICH5) }, + {PCI_DEVICE_DATA (INTEL ,COUGARPOINT_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS_IDF0 ,FEATURES_ICH5 |FEATURE_IDF ) }, + {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS_IDF1 ,FEATURES_ICH5 |FEATURE_IDF ) }, + {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS_IDF2 ,FEATURES_ICH5 |FEATURE_IDF ) }, + {PCI_DEVICE_DATA (INTEL ,DH89XXCC_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,PANTHERPOINT_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,LYNXPOINT_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,LYNXPOINT_LP_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,AVOTON_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS_MS0 ,FEATURES_ICH5 |FEATURE_IDF ) }, + {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS_MS1 ,FEATURES_ICH5 |FEATURE_IDF ) }, + {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS_MS2 ,FEATURES_ICH5 |FEATURE_IDF ) }, + {PCI_DEVICE_DATA (INTEL ,COLETOCREEK_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,GEMINILAKE_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,WILDCATPOINT_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,WILDCATPOINT_LP_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,BAYTRAIL_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,BRASWELL_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,SUNRISEPOINT_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,SUNRISEPOINT_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,CDF_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,DNV_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,EBG_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,BROXTON_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,LEWISBURG_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,LEWISBURG_SSKU_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,KABYLAKE_PCH_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,CANNONLAKE_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,CANNONLAKE_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,ICELAKE_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,ICELAKE_N_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,COMETLAKE_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,COMETLAKE_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,COMETLAKE_V_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,ELKHART_LAKE_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,TIGERLAKE_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,TIGERLAKE_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,JASPER_LAKE_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,ALDER_LAKE_S_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,ALDER_LAKE_P_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,ALDER_LAKE_M_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, {0 , } };
@@ -1678,72 +1684,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)mutex_init (&priv->acpi_lock); priv->pci_dev = dev; -switch (dev->device) { -case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_SMBUS : -case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_SMBUS : -case PCI_DEVICE_ID_INTEL_LEWISBURG_SMBUS : -case PCI_DEVICE_ID_INTEL_LEWISBURG_SSKU_SMBUS : -case PCI_DEVICE_ID_INTEL_DNV_SMBUS : -case PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS : -case PCI_DEVICE_ID_INTEL_COMETLAKE_V_SMBUS : - priv->features |=FEATURE_BLOCK_PROC ; - 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_ICELAKE_N_SMBUS : -case PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS : -case PCI_DEVICE_ID_INTEL_COMETLAKE_H_SMBUS : -case PCI_DEVICE_ID_INTEL_ELKHART_LAKE_SMBUS : -case PCI_DEVICE_ID_INTEL_TIGERLAKE_LP_SMBUS : -case PCI_DEVICE_ID_INTEL_TIGERLAKE_H_SMBUS : -case PCI_DEVICE_ID_INTEL_JASPER_LAKE_SMBUS : -case PCI_DEVICE_ID_INTEL_EBG_SMBUS : -case PCI_DEVICE_ID_INTEL_ALDER_LAKE_S_SMBUS : -case PCI_DEVICE_ID_INTEL_ALDER_LAKE_P_SMBUS : -case PCI_DEVICE_ID_INTEL_ALDER_LAKE_M_SMBUS : - priv->features |=FEATURE_BLOCK_PROC ; - priv->features |=FEATURE_I2C_BLOCK_READ ; - priv->features |=FEATURE_IRQ ; - priv->features |=FEATURE_SMBUS_PEC ; - priv->features |=FEATURE_BLOCK_BUFFER ; - priv->features |=FEATURE_TCO_CNL ; - priv->features |=FEATURE_HOST_NOTIFY ; -break ; - -case PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF0 : -case PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF1 : -case PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF2 : -case PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS0 : -case PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS1 : -case PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS2 : - priv->features |=FEATURE_IDF ; - fallthrough; -default : - priv->features |=FEATURE_BLOCK_PROC ; - priv->features |=FEATURE_I2C_BLOCK_READ ; - priv->features |=FEATURE_IRQ ; - fallthrough; -case PCI_DEVICE_ID_INTEL_82801DB_3 : - priv->features |=FEATURE_SMBUS_PEC ; - priv->features |=FEATURE_BLOCK_BUFFER ; - fallthrough; -case PCI_DEVICE_ID_INTEL_82801CA_3 : - priv->features |=FEATURE_HOST_NOTIFY ; - fallthrough; -case PCI_DEVICE_ID_INTEL_82801BA_2 : -case PCI_DEVICE_ID_INTEL_82801AB_3 : -case PCI_DEVICE_ID_INTEL_82801AA_3 : -break ; - } + priv->features = id->driver_data;/* Disable features on user request */ for (i =0 ; i <ARRAY_SIZE (i801_feature_names); i++) {
Signature · 1 line
2.33.1
Quoted 9 lines · Heiner Kallweit
Reduce source code and code size by defining the chip features statically.
Signed-off-by Heiner Kallweit <[email protected]>---
v2:
- make checkpatch happy
- rename feature definitions toFEATURES_ICH4andFEATURES_ICH5
- fix patch title typo
Quoted 4 lines
--- drivers/i2c/busses/i2c-i801.c | 191 ++++++++++++---------------------- 1 file changed, 66 insertions(+), 125 deletions(-)(...)
Reviewed-by Jean Delvare <[email protected]>
Tested-by Jean Delvare <[email protected]>
Signature · 2 lines
Jean Delvare SUSE L3 Support
Wolfram Sang
AppliedQuoted 4 lines · Heiner Kallweit
Reduce source code and code size by defining the chip features statically.
Signed-off-by Heiner Kallweit <[email protected]>
Applied to for-next, thanks!