[PATCH v1 0/3] Fixes: update Tiger Lake ACPI device IDs

[PATCH v1 0/3] Fixes: update Tiger Lake ACPI device IDs

[Gayatri Kammela]

Hi,

The hardware IDs for devices supported by Tiger Lake for various drivers
such as DPTF, fan, Intel thermal and intel-hid are added with missing 'C'
which makes them invalid. Hence fix these IDs by updating.

For instance, the updated ID now looks like
INT1047 --> INTC1047

Patch 1: Update Tiger Lake ACPI device IDs for DPTF and fan drivers
Patch 2: Update Tiger Lake ACPI device ID for intel-hid driver
Patch 3: Update Tiger Lake ACPI device IDs for thermal driver

Gayatri Kammela (3):
  ACPI: fix: Update Tiger Lake ACPI device IDs
  platform/x86: intel-hid: fix: Update Tiger Lake ACPI device ID
  thermal: int340x_thermal: fix: Update Tiger Lake ACPI device IDs

 drivers/acpi/device_pm.c                                | 2 +-
 drivers/acpi/dptf/dptf_power.c                          | 2 +-
 drivers/acpi/dptf/int340x_thermal.c                     | 8 ++++----
 drivers/platform/x86/intel-hid.c                        | 2 +-
 drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 2 +-
 drivers/thermal/intel/int340x_thermal/int3403_thermal.c | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-- 
2.17.1

[PATCH v1 1/3] ACPI: fix: Update Tiger Lake ACPI device IDs

[Gayatri Kammela]

Tiger Lake's new unique ACPI device IDs for DPTF and fan drivers are not
valid as the IDs are missing 'C'. Fix the IDs by updating them.

After the update, the new IDs should now look like
INT1047 --> INTC1047
INT1040 --> INTC1040
INT1043 --> INTC1043
INT1044 --> INTC1044

Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Suggested-by: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
Signed-off-by: Gayatri Kammela <gayatri.kammela@intel.com>
---
 drivers/acpi/device_pm.c            | 2 +-
 drivers/acpi/dptf/dptf_power.c      | 2 +-
 drivers/acpi/dptf/int340x_thermal.c | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index b64c62bfcea5..80dae3b3c36a 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -1321,7 +1321,7 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
 	 */
 	static const struct acpi_device_id special_pm_ids[] = {
 		{"PNP0C0B", }, /* Generic ACPI fan */
-		{"INT1044", }, /* Fan for Tiger Lake generation */
+		{"INTC1044", }, /* Fan for Tiger Lake generation */
 		{"INT3404", }, /* Fan */
 		{}
 	};
diff --git a/drivers/acpi/dptf/dptf_power.c b/drivers/acpi/dptf/dptf_power.c
index 387f27ef3368..e5fb34bfa52c 100644
--- a/drivers/acpi/dptf/dptf_power.c
+++ b/drivers/acpi/dptf/dptf_power.c
@@ -97,7 +97,7 @@ static int dptf_power_remove(struct platform_device *pdev)
 }
 
 static const struct acpi_device_id int3407_device_ids[] = {
-	{"INT1047", 0},
+	{"INTC1047", 0},
 	{"INT3407", 0},
 	{"", 0},
 };
diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340x_thermal.c
index 1ec7b6900662..29b5c77256dd 100644
--- a/drivers/acpi/dptf/int340x_thermal.c
+++ b/drivers/acpi/dptf/int340x_thermal.c
@@ -13,10 +13,10 @@
 
 #define INT3401_DEVICE 0X01
 static const struct acpi_device_id int340x_thermal_device_ids[] = {
-	{"INT1040"},
-	{"INT1043"},
-	{"INT1044"},
-	{"INT1047"},
+	{"INTC1040"},
+	{"INTC1043"},
+	{"INTC1044"},
+	{"INTC1047"},
 	{"INT3400"},
 	{"INT3401", INT3401_DEVICE},
 	{"INT3402"},
-- 
2.17.1

Re: [PATCH v1 1/3] ACPI: fix: Update Tiger Lake ACPI device IDs

[Pandruvada, Srinivas]

On Fri, 2020-03-27 at 13:24 -0700, Gayatri Kammela wrote:
> Tiger Lake's new unique ACPI device IDs for DPTF and fan drivers are
> not
> valid as the IDs are missing 'C'. Fix the IDs by updating them.
> 
> After the update, the new IDs should now look like
> INT1047 --> INTC1047
> INT1040 --> INTC1040
> INT1043 --> INTC1043
> INT1044 --> INTC1044
> 
We need Fixes tag.

For example

Fixes: 55cfe6a5c582 ("ACPI: DPTF: Add Tiger Lake ACPI device IDs")
Cc: 5.6+ <stable@vger.kernel.org> # 5.6+

By the time this patch is merged I guess the 5.6 will be out.

> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Cc: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
> Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Suggested-by: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
> Signed-off-by: Gayatri Kammela <gayatri.kammela@intel.com>
> ---
>  drivers/acpi/device_pm.c            | 2 +-
>  drivers/acpi/dptf/dptf_power.c      | 2 +-
>  drivers/acpi/dptf/int340x_thermal.c | 8 ++++----
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
> index b64c62bfcea5..80dae3b3c36a 100644
> --- a/drivers/acpi/device_pm.c
> +++ b/drivers/acpi/device_pm.c
> @@ -1321,7 +1321,7 @@ int acpi_dev_pm_attach(struct device *dev, bool
> power_on)
>  	 */
>  	static const struct acpi_device_id special_pm_ids[] = {
>  		{"PNP0C0B", }, /* Generic ACPI fan */
> -		{"INT1044", }, /* Fan for Tiger Lake generation */
> +		{"INTC1044", }, /* Fan for Tiger Lake generation */
>  		{"INT3404", }, /* Fan */
>  		{}
>  	};
> diff --git a/drivers/acpi/dptf/dptf_power.c
> b/drivers/acpi/dptf/dptf_power.c
> index 387f27ef3368..e5fb34bfa52c 100644
> --- a/drivers/acpi/dptf/dptf_power.c
> +++ b/drivers/acpi/dptf/dptf_power.c
> @@ -97,7 +97,7 @@ static int dptf_power_remove(struct platform_device
> *pdev)
>  }
>  
>  static const struct acpi_device_id int3407_device_ids[] = {
> -	{"INT1047", 0},
> +	{"INTC1047", 0},
>  	{"INT3407", 0},
>  	{"", 0},
>  };
> diff --git a/drivers/acpi/dptf/int340x_thermal.c
> b/drivers/acpi/dptf/int340x_thermal.c
> index 1ec7b6900662..29b5c77256dd 100644
> --- a/drivers/acpi/dptf/int340x_thermal.c
> +++ b/drivers/acpi/dptf/int340x_thermal.c
> @@ -13,10 +13,10 @@
>  
>  #define INT3401_DEVICE 0X01
>  static const struct acpi_device_id int340x_thermal_device_ids[] = {
> -	{"INT1040"},
> -	{"INT1043"},
> -	{"INT1044"},
> -	{"INT1047"},
> +	{"INTC1040"},
> +	{"INTC1043"},
> +	{"INTC1044"},
> +	{"INTC1047"},
>  	{"INT3400"},
>  	{"INT3401", INT3401_DEVICE},
>  	{"INT3402"},

RE: [PATCH v1 1/3] ACPI: fix: Update Tiger Lake ACPI device IDs

[Kammela, Gayatri]

> -----Original Message-----
> From: Pandruvada, Srinivas <srinivas.pandruvada@intel.com>
> Sent: Friday, March 27, 2020 1:37 PM
> To: linux-pm@vger.kernel.org; Kammela, Gayatri
> <gayatri.kammela@intel.com>
> Cc: dvhart@infradead.org; alex.hung@canonical.com;
> daniel.lezcano@linaro.org; amit.kucheria@verdurent.com; lenb@kernel.org;
> peterz@infradead.org; Zhang, Rui <rui.zhang@intel.com>; linux-
> kernel@vger.kernel.org; andriy.shevchenko@linux.intel.com; Westerberg,
> Mika <mika.westerberg@intel.com>; Prestopine, Charles D
> <charles.d.prestopine@intel.com>; platform-driver-x86@vger.kernel.org;
> Wysocki, Rafael J <rafael.j.wysocki@intel.com>
> Subject: Re: [PATCH v1 1/3] ACPI: fix: Update Tiger Lake ACPI device IDs
> 
> On Fri, 2020-03-27 at 13:24 -0700, Gayatri Kammela wrote:
> > Tiger Lake's new unique ACPI device IDs for DPTF and fan drivers are
> > not valid as the IDs are missing 'C'. Fix the IDs by updating them.
> >
> > After the update, the new IDs should now look like
> > INT1047 --> INTC1047
> > INT1040 --> INTC1040
> > INT1043 --> INTC1043
> > INT1044 --> INTC1044
> >
> We need Fixes tag.
> 
> For example
> 
> Fixes: 55cfe6a5c582 ("ACPI: DPTF: Add Tiger Lake ACPI device IDs")
> Cc: 5.6+ <stable@vger.kernel.org> # 5.6+

Thanks Srinivas! I will add the fixes tag and send v2

> 
> By the time this patch is merged I guess the 5.6 will be out.
> 
> > Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > Cc: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
> > Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > Suggested-by: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
> > Signed-off-by: Gayatri Kammela <gayatri.kammela@intel.com>
> > ---
> >  drivers/acpi/device_pm.c            | 2 +-
> >  drivers/acpi/dptf/dptf_power.c      | 2 +-
> >  drivers/acpi/dptf/int340x_thermal.c | 8 ++++----
> >  3 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index
> > b64c62bfcea5..80dae3b3c36a 100644
> > --- a/drivers/acpi/device_pm.c
> > +++ b/drivers/acpi/device_pm.c
> > @@ -1321,7 +1321,7 @@ int acpi_dev_pm_attach(struct device *dev, bool
> > power_on)
> >  	 */
> >  	static const struct acpi_device_id special_pm_ids[] = {
> >  		{"PNP0C0B", }, /* Generic ACPI fan */
> > -		{"INT1044", }, /* Fan for Tiger Lake generation */
> > +		{"INTC1044", }, /* Fan for Tiger Lake generation */
> >  		{"INT3404", }, /* Fan */
> >  		{}
> >  	};
> > diff --git a/drivers/acpi/dptf/dptf_power.c
> > b/drivers/acpi/dptf/dptf_power.c index 387f27ef3368..e5fb34bfa52c
> > 100644
> > --- a/drivers/acpi/dptf/dptf_power.c
> > +++ b/drivers/acpi/dptf/dptf_power.c
> > @@ -97,7 +97,7 @@ static int dptf_power_remove(struct platform_device
> > *pdev)
> >  }
> >
> >  static const struct acpi_device_id int3407_device_ids[] = {
> > -	{"INT1047", 0},
> > +	{"INTC1047", 0},
> >  	{"INT3407", 0},
> >  	{"", 0},
> >  };
> > diff --git a/drivers/acpi/dptf/int340x_thermal.c
> > b/drivers/acpi/dptf/int340x_thermal.c
> > index 1ec7b6900662..29b5c77256dd 100644
> > --- a/drivers/acpi/dptf/int340x_thermal.c
> > +++ b/drivers/acpi/dptf/int340x_thermal.c
> > @@ -13,10 +13,10 @@
> >
> >  #define INT3401_DEVICE 0X01
> >  static const struct acpi_device_id int340x_thermal_device_ids[] = {
> > -	{"INT1040"},
> > -	{"INT1043"},
> > -	{"INT1044"},
> > -	{"INT1047"},
> > +	{"INTC1040"},
> > +	{"INTC1043"},
> > +	{"INTC1044"},
> > +	{"INTC1047"},
> >  	{"INT3400"},
> >  	{"INT3401", INT3401_DEVICE},
> >  	{"INT3402"},

[PATCH v1 2/3] platform/x86: intel-hid: fix: Update Tiger Lake ACPI device ID

[Gayatri Kammela]

Tiger Lake's new unique ACPI device IDs for intel-hid driver is not
valid because of missing 'C' in the ID. Fix the ID by updating it.

After the update, the new ID should now look like
INT1051 --> INTC1051

Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Suggested-by: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
Signed-off-by: Gayatri Kammela <gayatri.kammela@intel.com>
---
 drivers/platform/x86/intel-hid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c
index 43d590250228..c0a4696803eb 100644
--- a/drivers/platform/x86/intel-hid.c
+++ b/drivers/platform/x86/intel-hid.c
@@ -19,7 +19,7 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Alex Hung");
 
 static const struct acpi_device_id intel_hid_ids[] = {
-	{"INT1051", 0},
+	{"INTC1051", 0},
 	{"INT33D5", 0},
 	{"", 0},
 };
-- 
2.17.1

[PATCH v1 3/3] thermal: int340x_thermal: fix: Update Tiger Lake ACPI device IDs

[Gayatri Kammela]

Tiger Lake's new unique ACPI device IDs for Intel thermal driver are not
valid because of missing 'C' in the IDs. Fix the IDs by updating them.

After the update, the new IDs should now look like
INT1040 --> INTC1040
INT1043 --> INTC1043

Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Suggested-by: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
Signed-off-by: Gayatri Kammela <gayatri.kammela@intel.com>
---
 drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 2 +-
 drivers/thermal/intel/int340x_thermal/int3403_thermal.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
index efae0c02d898..71a9877b85a5 100644
--- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
+++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
@@ -369,7 +369,7 @@ static int int3400_thermal_remove(struct platform_device *pdev)
 }
 
 static const struct acpi_device_id int3400_thermal_match[] = {
-	{"INT1040", 0},
+	{"INTC1040", 0},
 	{"INT3400", 0},
 	{}
 };
diff --git a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
index aeece1e136a5..3849d5869609 100644
--- a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
+++ b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
@@ -282,7 +282,7 @@ static int int3403_remove(struct platform_device *pdev)
 }
 
 static const struct acpi_device_id int3403_device_ids[] = {
-	{"INT1043", 0},
+	{"INTC1043", 0},
 	{"INT3403", 0},
 	{"", 0},
 };
-- 
2.17.1