Skip to contentSkip to conversation

i2c: i801: Add support for Intel Meteor Lake-S SoC

PATCH In review Jarkko Nikula 3 participants 6 messages Apr 24, 2023 – May 3, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 i2c: i801: Add support for Intel Meteor Lake-S SoC

Add SMBus PCI ID on Intel Meteor Lake-S SoC South.

---
v2: Keep PCI ID define list sorted and define
PCI_DEVICE_ID_INTEL_METEOR_LAKE_S_SMBUS in correct place.

---
 drivers/i2c/busses/i2c-i801.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/i2c/busses/i2c-i801.c +3 -0
index ac5326747c51..86a1054ee9e4 100644
@@ -77,6 +77,7 @@
  * Alder Lake-M (PCH)		0x54a3	32	hard	yes	yes	yes
  * Raptor Lake-S (PCH)		0x7a23	32	hard	yes	yes	yes
  * Meteor Lake-P (SOC)		0x7e22	32	hard	yes	yes	yes
+ * Meteor Lake-S (SOC)		0xae22	32	hard	yes	yes	yes
  *
  * Features supported by this driver:
  * Software PEC				no
@@ -250,6 +251,7 @@
 #define PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS	0xa2a3
 #define PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS		0xa323
 #define PCI_DEVICE_ID_INTEL_COMETLAKE_V_SMBUS		0xa3a3
+#define PCI_DEVICE_ID_INTEL_METEOR_LAKE_S_SMBUS		0xae22
 
 struct i801_mux_config {
 	char *gpio_chip;
@@ -1038,6 +1040,7 @@ static const struct pci_device_id i801_ids[] = {
 	{ PCI_DEVICE_DATA(INTEL, ALDER_LAKE_M_SMBUS,	FEATURES_ICH5 | FEATURE_TCO_CNL) },
 	{ PCI_DEVICE_DATA(INTEL, RAPTOR_LAKE_S_SMBUS,	FEATURES_ICH5 | FEATURE_TCO_CNL) },
 	{ PCI_DEVICE_DATA(INTEL, METEOR_LAKE_P_SMBUS,	FEATURES_ICH5 | FEATURE_TCO_CNL) },
+	{ PCI_DEVICE_DATA(INTEL, METEOR_LAKE_S_SMBUS,	FEATURES_ICH5 | FEATURE_TCO_CNL) },
 	{ 0, }
 };
 
Signature · 1 line
2.39.2
#1 lore raw

PATCH v2 2/2 i2c: i801: Add support for Intel Meteor Lake PCH-S

Add SMBus PCI ID on Intel Meteor Lake PCH-S. Also called as Meteor Point-S which is used in the code to distinguish from Meteor Lake-S SoC but call both as Meteor Lake in documentation and Kconfig.

---
Hi Jean. This is essentially the same than v1 with following minor changes:
v2: "SOC/PCH" -> "SOC and PCH" in documentation and Kconfig. PCI ID
define according to updated patch 1/2.

---
 Documentation/i2c/busses/i2c-i801.rst | 2 +-
 drivers/i2c/busses/Kconfig            | 2 +-
 drivers/i2c/busses/i2c-i801.c         | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)
Documentation/i2c/busses/i2c-i801.rst +1 -1
index ab9e850e8fe0..e76e68ccf718 100644
@@ -46,7 +46,7 @@ Supported adapters:
   * Intel Emmitsburg (PCH)
   * Intel Alder Lake (PCH)
   * Intel Raptor Lake (PCH)
-  * Intel Meteor Lake (SOC)
+  * Intel Meteor Lake (SOC and PCH)
 
    Datasheets: Publicly available at the Intel website
 
drivers/i2c/busses/Kconfig +1 -1
index 87600b4aacb3..3144ef99f040 100644
@@ -157,7 +157,7 @@ config I2C_I801
 	    Emmitsburg (PCH)
 	    Alder Lake (PCH)
 	    Raptor Lake (PCH)
-	    Meteor Lake (SOC)
+	    Meteor Lake (SOC and PCH)
 
 	  This driver can also be built as a module.  If so, the module
 	  will be called i2c-i801.
drivers/i2c/busses/i2c-i801.c +3 -0
index 86a1054ee9e4..7217263088c3 100644
@@ -78,6 +78,7 @@
  * Raptor Lake-S (PCH)		0x7a23	32	hard	yes	yes	yes
  * Meteor Lake-P (SOC)		0x7e22	32	hard	yes	yes	yes
  * Meteor Lake-S (SOC)		0xae22	32	hard	yes	yes	yes
+ * Meteor Point-S (PCH)		0x7f23	32	hard	yes	yes	yes
  *
  * Features supported by this driver:
  * Software PEC				no
@@ -234,6 +235,7 @@
 #define PCI_DEVICE_ID_INTEL_RAPTOR_LAKE_S_SMBUS		0x7a23
 #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_S_SMBUS		0x7aa3
 #define PCI_DEVICE_ID_INTEL_METEOR_LAKE_P_SMBUS		0x7e22
+#define PCI_DEVICE_ID_INTEL_METEOR_POINT_S_SMBUS	0x7f23
 #define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS		0x8c22
 #define PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS		0x8ca2
 #define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS		0x8d22
@@ -1041,6 +1043,7 @@ static const struct pci_device_id i801_ids[] = {
 	{ PCI_DEVICE_DATA(INTEL, RAPTOR_LAKE_S_SMBUS,	FEATURES_ICH5 | FEATURE_TCO_CNL) },
 	{ PCI_DEVICE_DATA(INTEL, METEOR_LAKE_P_SMBUS,	FEATURES_ICH5 | FEATURE_TCO_CNL) },
 	{ PCI_DEVICE_DATA(INTEL, METEOR_LAKE_S_SMBUS,	FEATURES_ICH5 | FEATURE_TCO_CNL) },
+	{ PCI_DEVICE_DATA(INTEL, METEOR_POINT_S_SMBUS,	FEATURES_ICH5 | FEATURE_TCO_CNL) },
 	{ 0, }
 };
 
Signature · 1 line
2.39.2
maintainer Reviewed-by on v2 2/2
#2 lore raw

Re: [PATCH v2 2/2] i2c: i801: Add support for Intel Meteor Lake PCH-S

Hi Jarkko,

Quoted 5 lines · Jarkko Nikula

Add SMBus PCI ID on Intel Meteor Lake PCH-S. Also called as Meteor Point-S which is used in the code to distinguish from Meteor Lake-S SoC but call both as Meteor Lake in documentation and Kconfig.

Andi

#3 lore raw

Re: [PATCH v2 2/2] i2c: i801: Add support for Intel Meteor Lake PCH-S

In reply to Jarkko Nikula

Hi Jarkko,

Quoted 10 lines · Jarkko Nikula

Add SMBus PCI ID on Intel Meteor Lake PCH-S. Also called as Meteor Point-S which is used in the code to distinguish from Meteor Lake-S SoC but call both as Meteor Lake in documentation and Kconfig.

---
Hi Jean. This is essentially the same than v1 with following minor changes:
v2: "SOC/PCH" -> "SOC and PCH" in documentation and Kconfig. PCI ID
define according to updated patch 1/2.

My initial concerns partly stand. You add a device named "Meteor Point-S" to the driver, but you list that device under name "Meteor Lake-S" in the documentation (and Kconfig). This is confusing and I can't see the rationale. Surely the device has one name, and you should use that name both in the driver and the documentation.

Thanks,

Signature · 2 lines
Jean Delvare
SUSE L3 Support
Reviewed-by on v2 1/2
#5 lore raw
In reply to Jarkko Nikula
Quoted 31 lines · Jarkko Nikula

Add SMBus PCI ID on Intel Meteor Lake-S SoC South.

---
v2: Keep PCI ID define list sorted and define
PCI_DEVICE_ID_INTEL_METEOR_LAKE_S_SMBUS in correct place.

---
 drivers/i2c/busses/i2c-i801.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/i2c/busses/i2c-i801.c +2 -0
index ac5326747c51..86a1054ee9e4 100644
@@ -77,6 +77,7 @@
  * Alder Lake-M (PCH)		0x54a3	32	hard	yes	yes	yes
  * Raptor Lake-S (PCH)		0x7a23	32	hard	yes	yes	yes
  * Meteor Lake-P (SOC)		0x7e22	32	hard	yes	yes	yes
+ * Meteor Lake-S (SOC)		0xae22	32	hard	yes	yes	yes
  *
  * Features supported by this driver:
  * Software PEC				no
@@ -250,6 +251,7 @@
 #define PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS	0xa2a3
 #define PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS		0xa323
 #define PCI_DEVICE_ID_INTEL_COMETLAKE_V_SMBUS		0xa3a3
+#define PCI_DEVICE_ID_INTEL_METEOR_LAKE_S_SMBUS		0xae22
 
 struct i801_mux_config {
 	char *gpio_chip;

drivers/i2c/busses/i2c-i801.c static const struct pci_device_id i801_ids[] = { · line 1046

Quoted 7 lines
drivers/i2c/busses/i2c-i801.c +1 -0
@@ -1038,6 +1040,7 @@ static const struct pci_device_id i801_ids[] = {
 	{ PCI_DEVICE_DATA(INTEL, ALDER_LAKE_M_SMBUS,	FEATURES_ICH5 | FEATURE_TCO_CNL) },
 	{ PCI_DEVICE_DATA(INTEL, RAPTOR_LAKE_S_SMBUS,	FEATURES_ICH5 | FEATURE_TCO_CNL) },
 	{ PCI_DEVICE_DATA(INTEL, METEOR_LAKE_P_SMBUS,	FEATURES_ICH5 | FEATURE_TCO_CNL) },
+	{ PCI_DEVICE_DATA(INTEL, METEOR_LAKE_S_SMBUS,	FEATURES_ICH5 | FEATURE_TCO_CNL) },
 	{ 0, }
 };
 
Signature · 2 lines
Jean Delvare
SUSE L3 Support