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

public inbox for linux-i2c@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH 1/2] i2c: i801: Add support for Intel Meteor Lake-S SoC
@ 2023-03-30 10:55 Jarkko Nikula
  2023-03-30 10:55 ` [PATCH 2/2] i2c: i801: Add support for Intel Meteor Lake PCH-S Jarkko Nikula
  2023-04-03 15:34 ` [PATCH 1/2] i2c: i801: Add support for Intel Meteor Lake-S SoC Jean Delvare
  0 siblings, 2 replies; 6+ messages in thread
From: Jarkko Nikula @ 2023-03-30 10:55 UTC (permalink / raw)
  To: linux-i2c; +Cc: Jean Delvare, Wolfram Sang, Jarkko Nikula

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

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---
 drivers/i2c/busses/i2c-i801.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index ac5326747c51..8172e2767b25 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -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
@@ -233,6 +234,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_LAKE_S_SMBUS		0xae22
 #define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS		0x8c22
 #define PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS		0x8ca2
 #define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS		0x8d22
@@ -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, }
 };
 
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/2] i2c: i801: Add support for Intel Meteor Lake PCH-S
  2023-03-30 10:55 [PATCH 1/2] i2c: i801: Add support for Intel Meteor Lake-S SoC Jarkko Nikula
@ 2023-03-30 10:55 ` Jarkko Nikula
  2023-04-03 16:03   ` Jean Delvare
  2023-04-03 15:34 ` [PATCH 1/2] i2c: i801: Add support for Intel Meteor Lake-S SoC Jean Delvare
  1 sibling, 1 reply; 6+ messages in thread
From: Jarkko Nikula @ 2023-03-30 10:55 UTC (permalink / raw)
  To: linux-i2c; +Cc: Jean Delvare, Wolfram Sang, 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.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---
 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(-)

diff --git a/Documentation/i2c/busses/i2c-i801.rst b/Documentation/i2c/busses/i2c-i801.rst
index ab9e850e8fe0..e62a62323f36 100644
--- a/Documentation/i2c/busses/i2c-i801.rst
+++ b/Documentation/i2c/busses/i2c-i801.rst
@@ -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/PCH)
 
    Datasheets: Publicly available at the Intel website
 
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 9fa4a7bb5c8b..93bb71bdf64d 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -157,7 +157,7 @@ config I2C_I801
 	    Emmitsburg (PCH)
 	    Alder Lake (PCH)
 	    Raptor Lake (PCH)
-	    Meteor Lake (SOC)
+	    Meteor Lake (SOC/PCH)
 
 	  This driver can also be built as a module.  If so, the module
 	  will be called i2c-i801.
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 8172e2767b25..dca605d8cdc2 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -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_METEOR_LAKE_S_SMBUS		0xae22
 #define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS		0x8c22
 #define PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS		0x8ca2
@@ -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, }
 };
 
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] i2c: i801: Add support for Intel Meteor Lake PCH-S
  2023-03-30 10:55 ` [PATCH 2/2] i2c: i801: Add support for Intel Meteor Lake PCH-S Jarkko Nikula
@ 2023-04-03 16:03   ` Jean Delvare
  2023-04-04  7:55     ` Jarkko Nikula
  0 siblings, 1 reply; 6+ messages in thread
From: Jean Delvare @ 2023-04-03 16:03 UTC (permalink / raw)
  To: Jarkko Nikula; +Cc: linux-i2c, Wolfram Sang

Hi Jarkko,

On Thu, 30 Mar 2023 13:55:02 +0300, Jarkko Nikula wrote:
> 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.
> 
> Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
> ---
>  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(-)
> 
> diff --git a/Documentation/i2c/busses/i2c-i801.rst b/Documentation/i2c/busses/i2c-i801.rst
> index ab9e850e8fe0..e62a62323f36 100644
> --- a/Documentation/i2c/busses/i2c-i801.rst
> +++ b/Documentation/i2c/busses/i2c-i801.rst
> @@ -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/PCH)

I'm confused. The patch actually adds support for Meteor Point (S). So
shouldn't you add:
    * Intel Meteor Point (PCH)

instead of modifying the existing line?

>  
>     Datasheets: Publicly available at the Intel website
>  
> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
> index 9fa4a7bb5c8b..93bb71bdf64d 100644
> --- a/drivers/i2c/busses/Kconfig
> +++ b/drivers/i2c/busses/Kconfig
> @@ -157,7 +157,7 @@ config I2C_I801
>  	    Emmitsburg (PCH)
>  	    Alder Lake (PCH)
>  	    Raptor Lake (PCH)
> -	    Meteor Lake (SOC)
> +	    Meteor Lake (SOC/PCH)

Ditto.

>  
  	  This driver can also be built as a module.  If so, the module
>  	  will be called i2c-i801.
> diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
> index 8172e2767b25..dca605d8cdc2 100644
> --- a/drivers/i2c/busses/i2c-i801.c
> +++ b/drivers/i2c/busses/i2c-i801.c
> @@ -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_METEOR_LAKE_S_SMBUS		0xae22
>  #define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS		0x8c22
>  #define PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS		0x8ca2
> @@ -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, }
>  };
>  

Rest looks good.

Reviewed-by: Jean Delvare <jdelvare@suse.de>

-- 
Jean Delvare
SUSE L3 Support

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] i2c: i801: Add support for Intel Meteor Lake PCH-S
  2023-04-03 16:03   ` Jean Delvare
@ 2023-04-04  7:55     ` Jarkko Nikula
  0 siblings, 0 replies; 6+ messages in thread
From: Jarkko Nikula @ 2023-04-04  7:55 UTC (permalink / raw)
  To: Jean Delvare; +Cc: linux-i2c, Wolfram Sang

On 4/3/23 19:03, Jean Delvare wrote:
> Hi Jarkko,
> 
> On Thu, 30 Mar 2023 13:55:02 +0300, Jarkko Nikula wrote:
>> 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.
>>
>> Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
>> ---
>>   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(-)
>>
>> diff --git a/Documentation/i2c/busses/i2c-i801.rst b/Documentation/i2c/busses/i2c-i801.rst
>> index ab9e850e8fe0..e62a62323f36 100644
>> --- a/Documentation/i2c/busses/i2c-i801.rst
>> +++ b/Documentation/i2c/busses/i2c-i801.rst
>> @@ -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/PCH)
> 
> I'm confused. The patch actually adds support for Meteor Point (S). So
> shouldn't you add:
>      * Intel Meteor Point (PCH)
> 
> instead of modifying the existing line?
> 
Idea was to follow my earlier commit 80d943ab19e9 ("i2c: i801: 
Consolidate chipset names in documentation and Kconfig") to use single 
name for the same family instead of listing all possible variants.

Like here we have already support for Meteor Lake -P SoC and now adding 
support for Meteor Lake -S that will have both in SoC SMBus and PCH 
SMBus controllers.

I realized actually Alder Lake (PCH) above may not be correct. True for 
Alder Lake -S PCH but now thinking -P and -M variants may be actually SoCs.

Confusing, yes I agree :-)


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/2] i2c: i801: Add support for Intel Meteor Lake-S SoC
  2023-03-30 10:55 [PATCH 1/2] i2c: i801: Add support for Intel Meteor Lake-S SoC Jarkko Nikula
  2023-03-30 10:55 ` [PATCH 2/2] i2c: i801: Add support for Intel Meteor Lake PCH-S Jarkko Nikula
@ 2023-04-03 15:34 ` Jean Delvare
  2023-04-04  7:30   ` Jarkko Nikula
  1 sibling, 1 reply; 6+ messages in thread
From: Jean Delvare @ 2023-04-03 15:34 UTC (permalink / raw)
  To: Jarkko Nikula; +Cc: linux-i2c, Wolfram Sang

Hi Jarkko,

On Thu, 30 Mar 2023 13:55:01 +0300, Jarkko Nikula wrote:
> Add SMBus PCI ID on Intel Meteor Lake-S SoC South.
> 
> Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
> ---
>  drivers/i2c/busses/i2c-i801.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
> index ac5326747c51..8172e2767b25 100644
> --- a/drivers/i2c/busses/i2c-i801.c
> +++ b/drivers/i2c/busses/i2c-i801.c
> @@ -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
> @@ -233,6 +234,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_LAKE_S_SMBUS		0xae22
>  #define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS		0x8c22
>  #define PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS		0x8ca2
>  #define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS		0x8d22

Sorry for nitpicking but since 34b57f40a6a2 ("i2c: i801: sort IDs
alphabetically") this list is supposed to be sorted by ID.

> @@ -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, }
>  };
>  

Other than that, looks good.

Reviewed-by: Jean Delvare <jdelvare@suse.de>

-- 
Jean Delvare
SUSE L3 Support

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/2] i2c: i801: Add support for Intel Meteor Lake-S SoC
  2023-04-03 15:34 ` [PATCH 1/2] i2c: i801: Add support for Intel Meteor Lake-S SoC Jean Delvare
@ 2023-04-04  7:30   ` Jarkko Nikula
  0 siblings, 0 replies; 6+ messages in thread
From: Jarkko Nikula @ 2023-04-04  7:30 UTC (permalink / raw)
  To: Jean Delvare; +Cc: linux-i2c, Wolfram Sang

On 4/3/23 18:34, Jean Delvare wrote:
> Hi Jarkko,
> 
> On Thu, 30 Mar 2023 13:55:01 +0300, Jarkko Nikula wrote:
>> Add SMBus PCI ID on Intel Meteor Lake-S SoC South.
>>
>> Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
>> ---
>>   drivers/i2c/busses/i2c-i801.c | 3 +++
>>   1 file changed, 3 insertions(+)
>>
>> diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
>> index ac5326747c51..8172e2767b25 100644
>> --- a/drivers/i2c/busses/i2c-i801.c
>> +++ b/drivers/i2c/busses/i2c-i801.c
>> @@ -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
>> @@ -233,6 +234,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_LAKE_S_SMBUS		0xae22
>>   #define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS		0x8c22
>>   #define PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS		0x8ca2
>>   #define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS		0x8d22
> 
> Sorry for nitpicking but since 34b57f40a6a2 ("i2c: i801: sort IDs
> alphabetically") this list is supposed to be sorted by ID.
> 
Ah, true. Will fix and resend.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2023-04-04  7:56 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-30 10:55 [PATCH 1/2] i2c: i801: Add support for Intel Meteor Lake-S SoC Jarkko Nikula
2023-03-30 10:55 ` [PATCH 2/2] i2c: i801: Add support for Intel Meteor Lake PCH-S Jarkko Nikula
2023-04-03 16:03   ` Jean Delvare
2023-04-04  7:55     ` Jarkko Nikula
2023-04-03 15:34 ` [PATCH 1/2] i2c: i801: Add support for Intel Meteor Lake-S SoC Jean Delvare
2023-04-04  7:30   ` Jarkko Nikula

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox