Skip to contentSkip to conversation

Fixes: update Tiger Lake ACPI device IDs

PATCH In review Gayatri Kammela 5 participants 11 messages Mar 27, 2020 – Apr 1, 2020

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

v2 cover Fixes: update Tiger Lake ACPI device IDs

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

Changes since v1:
1) Added fixes tag to each patch

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 <[email protected]>
Cc Srinivas Pandruvada <[email protected]>
Cc Rafael J. Wysocki <[email protected]>
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/3 ACPI: fix: Update Tiger Lake ACPI device IDs

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

Fixes 55cfe6a5c582 ("ACPI: DPTF: Add Tiger Lake ACPI device IDs")
Fixes c248dfe7e0ca ("ACPI: fan: Add Tiger Lake ACPI device ID")
Cc 5.6+ <[email protected]> # 5.6+
Cc Andy Shevchenko <[email protected]>
Cc Srinivas Pandruvada <[email protected]>
Cc Rafael J. Wysocki <[email protected]>
---
 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(-)
drivers/acpi/device_pm.c +1 -1
index b64c62bfcea5..80dae3b3c36a 100644
@@ -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 */
 		{}
 	};
drivers/acpi/dptf/dptf_power.c +1 -1
index 387f27ef3368..e5fb34bfa52c 100644
@@ -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},
 };
drivers/acpi/dptf/int340x_thermal.c +4 -4
index 1ec7b6900662..29b5c77256dd 100644
@@ -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"},
Signature · 1 line
2.17.1
#2 lore raw

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

Quoted 60 lines · 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

Fixes 55cfe6a5c582 ("ACPI: DPTF: Add Tiger Lake ACPI device IDs")
Fixes c248dfe7e0ca ("ACPI: fan: Add Tiger Lake ACPI device ID")
Cc 5.6+ <[email protected]> # 5.6+
Cc Andy Shevchenko <[email protected]>
Cc Srinivas Pandruvada <[email protected]>
Cc Rafael J. Wysocki <[email protected]>
---
 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(-)
drivers/acpi/device_pm.c +1 -1
index b64c62bfcea5..80dae3b3c36a 100644
@@ -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 */
                {}
        };
drivers/acpi/dptf/dptf_power.c +1 -1
index 387f27ef3368..e5fb34bfa52c 100644
@@ -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},
 };
drivers/acpi/dptf/int340x_thermal.c +0 -2
index 1ec7b6900662..29b5c77256dd 100644
@@ -13,10 +13,10 @@
 
 #define INT3401_DEVICE 0X01
 static const struct acpi_device_id int340x_thermal_device_ids[] = {
-       {"INT1040"},
-       {"INT1043"},

drivers/acpi/dptf/int340x_thermal.c

Quoted 10 lines
drivers/acpi/dptf/int340x_thermal.c +4 -3
-       {"INT1044"},
-       {"INT1047"},
+       {"INTC1040"},
+       {"INTC1043"},
+       {"INTC1044"},
+       {"INTC1047"},
        {"INT3400"},
        {"INT3401", INT3401_DEVICE},
        {"INT3402"},
--

I can take this along with the other two patches in the series if that is fine by Andy and Rui.

Thanks!

Reviewed-by
#3 lore raw

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

Quoted 14 lines · Rafael J. Wysocki

drivers/acpi/dptf/int340x_thermal.c

Quoted 10 lines · Gayatri Kammela
drivers/acpi/dptf/int340x_thermal.c +4 -3
-       {"INT1044"},
-       {"INT1047"},
+       {"INTC1040"},
+       {"INTC1043"},
+       {"INTC1044"},
+       {"INTC1047"},
        {"INT3400"},
        {"INT3401", INT3401_DEVICE},
        {"INT3402"},
--
Quoted 2 lines

I can take this along with the other two patches in the series if that is fine by Andy and Rui.

One nit is to fix the ordering to be alphanumeric or close enough (I admit in some cases it might require unneeded churn) to that.

Otherwise,

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#4 lore raw

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

Quoted 33 lines

-----Original Message-----
From: Andy Shevchenko <[email protected]>
Sent: Monday, March 30, 2020 10:25 AM
To: Rafael J. Wysocki <[email protected]>
Cc: Kammela, Gayatri <[email protected]>; Zhang, Rui <[email protected]>; Linux PM <[email protected]>; Platform Driver <[email protected]>; Linux Kernel Mailing List <[email protected]>; Len Brown <[email protected]>; Darren Hart <[email protected]>; Alex Hung <[email protected]>; Daniel Lezcano <[email protected]>; Amit Kucheria <[email protected]>; Westerberg, Mika <[email protected]>; Peter Zijlstra <[email protected]>; Prestopine, Charles D <[email protected]>; 5 . 6+ <[email protected]>; Pandruvada, Srinivas <[email protected]>; Wysocki, Rafael J <[email protected]>
Subject: Re: [PATCH v2 1/3] ACPI: fix: Update Tiger Lake ACPI device IDs

Quoted 14 lines · Rafael J. Wysocki
Quoted 10 lines · Gayatri Kammela
drivers/acpi/dptf/int340x_thermal.c +4 -3
-       {"INT1044"},
-       {"INT1047"},
+       {"INTC1040"},
+       {"INTC1043"},
+       {"INTC1044"},
+       {"INTC1047"},
        {"INT3400"},
        {"INT3401", INT3401_DEVICE},
        {"INT3402"},
--
Quoted 5 lines
Quoted 2 lines

I can take this along with the other two patches in the series if that is fine by Andy and Rui.

One nit is to fix the ordering to be alphanumeric or close enough (I admit in some cases it might require unneeded churn) to that.

Thanks Andy and Rafael! Should I send v3 for this series with right ordering this time?

Quoted 8 lines

Otherwise,

--
With Best Regards,
Andy Shevchenko

#5 lore raw

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

Quoted 34 lines · Gayatri
Quoted 34 lines

-----Original Message-----
From: Andy Shevchenko <[email protected]>
Sent: Monday, March 30, 2020 10:25 AM
To: Rafael J. Wysocki <[email protected]>
Cc: Kammela, Gayatri <[email protected]>; Zhang, Rui <[email protected]>; Linux PM <[email protected]>; Platform Driver <[email protected]>; Linux Kernel Mailing List <[email protected]>; Len Brown <[email protected]>; Darren Hart <[email protected]>; Alex Hung <[email protected]>; Daniel Lezcano <[email protected]>; Amit Kucheria <[email protected]>; Westerberg, Mika <[email protected]>; Peter Zijlstra <[email protected]>; Prestopine, Charles D <[email protected]>; 5 . 6+ <[email protected]>; Pandruvada, Srinivas <[email protected]>; Wysocki, Rafael J <[email protected]>
Subject: Re: [PATCH v2 1/3] ACPI: fix: Update Tiger Lake ACPI device IDs

Quoted 14 lines · Rafael J. Wysocki
Quoted 10 lines · Gayatri Kammela
drivers/acpi/dptf/int340x_thermal.c +4 -3
-       {"INT1044"},
-       {"INT1047"},
+       {"INTC1040"},
+       {"INTC1043"},
+       {"INTC1044"},
+       {"INTC1047"},
        {"INT3400"},
        {"INT3401", INT3401_DEVICE},
        {"INT3402"},
--
Quoted 6 lines
Quoted 5 lines
Quoted 2 lines

I can take this along with the other two patches in the series if that is fine by Andy and Rui.

One nit is to fix the ordering to be alphanumeric or close enough (I admit in some cases it might require unneeded churn) to that.

Thanks Andy and Rafael! Should I send v3 for this series with right ordering this time?

No need, I can fix up the ordering just fine.

Quoted 2 lines
Quoted 2 lines

Otherwise,

Thanks!

#6 lore raw

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

Quoted 42 lines · Rafael J. Wysocki
Quoted 39 lines · Gayatri
Quoted 39 lines

-----Original Message-----
From: Andy Shevchenko <[email protected]>
Sent: Monday, March 30, 2020 10:25 AM
To: Rafael J. Wysocki <[email protected]>
Cc: Kammela, Gayatri <[email protected]>; Zhang, Rui <[email protected]>; Linux PM <[email protected]>; Platform Driver <[email protected]>; Linux Kernel Mailing List <[email protected]>; Len Brown <[email protected]>; Darren Hart <[email protected]>; Alex Hung <[email protected]>; Daniel Lezcano <[email protected]>; Amit Kucheria <[email protected]>; Westerberg, Mika <[email protected]>; Peter Zijlstra <[email protected]>; Prestopine, Charles D <[email protected]>; 5 . 6+ <[email protected]>; Pandruvada, Srinivas <[email protected]>; Wysocki, Rafael J <[email protected]>
Subject: Re: [PATCH v2 1/3] ACPI: fix: Update Tiger Lake ACPI device IDs

Quoted 14 lines · Rafael J. Wysocki

drivers/acpi/dptf/int340x_thermal.c

Quoted 10 lines · Gayatri Kammela
drivers/acpi/dptf/int340x_thermal.c +4 -3
-       {"INT1044"},
-       {"INT1047"},
+       {"INTC1040"},
+       {"INTC1043"},
+       {"INTC1044"},
+       {"INTC1047"},
        {"INT3400"},
        {"INT3401", INT3401_DEVICE},
        {"INT3402"},
--
Quoted 2 lines

I can take this along with the other two patches in the series if that is fine by Andy and Rui.

One nit is to fix the ordering to be alphanumeric or close enough (I admit in some cases it might require unneeded churn) to that.

Quoted 8 lines
Quoted 1 line

Thanks Andy and Rafael! Should I send v3 for this series with right ordering this time?

No need, I can fix up the ordering just fine.

Quoted 2 lines
Quoted 2 lines

Otherwise,

Thanks!

Now applied as 5.7 material with the changes mentioned above.

Please check the bleeding-edge branch in my tree.

#7 lore raw

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

In reply to 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

Fixes bdd11b654035 ("platform/x86: intel-hid: Add Tiger Lake ACPI device ID")
Cc 5.6+ <[email protected]> # 5.6+
Cc Andy Shevchenko <[email protected]>
Cc Srinivas Pandruvada <[email protected]>
Cc Rafael J. Wysocki <[email protected]>
---
 drivers/platform/x86/intel-hid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/intel-hid.c +1 -1
index 43d590250228..c0a4696803eb 100644
@@ -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},
 };
Signature · 1 line
2.17.1
#8 lore raw

PATCH v2 3/3 thermal: int340x_thermal: fix: Update Tiger Lake ACPI device IDs

In reply to 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

Fixes 9b1b5535dfc9 ("thermal: int340x_thermal: Add Tiger Lake ACPI device IDs")
Cc 5.6+ <[email protected]> # 5.6+
Cc Andy Shevchenko <[email protected]>
Cc Srinivas Pandruvada <[email protected]>
Cc Rafael J. Wysocki <[email protected]>
---
 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(-)
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +1 -1
index efae0c02d898..71a9877b85a5 100644
@@ -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},
 	{}
 };
drivers/thermal/intel/int340x_thermal/int3403_thermal.c +1 -1
index aeece1e136a5..3849d5869609 100644
@@ -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},
 };
Signature · 1 line
2.17.1
reviewer Acked-by on v2 3/3
#9 lore raw

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

Quoted 9 lines · 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

Quoted 8 lines
Fixes 9b1b5535dfc9 ("thermal: int340x_thermal: Add Tiger Lake ACPI

device IDs")

Cc 5.6+ <[email protected]> # 5.6+
Cc Andy Shevchenko <[email protected]>
Cc Srinivas Pandruvada <[email protected]>
Cc Rafael J. Wysocki <[email protected]>

thanks,
rui

Quoted 35 lines
---
 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(-)
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +1 -1
index efae0c02d898..71a9877b85a5 100644
@@ -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},
 	{}

};

drivers/thermal/intel/int340x_thermal/int3403_thermal.c +1 -1
index aeece1e136a5..3849d5869609 100644
@@ -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},

};

#10 lore raw
In reply to Gayatri Kammela
Quoted 7 lines · 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.

Quoted 7 lines

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

Please, keep the IDs sorted (INTC should go after INT, etc). Also I will need an Ack for patch 1 (at least).

Quoted 22 lines

Changes since v1:
1) Added fixes tag to each patch

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 <[email protected]>
Cc: Srinivas Pandruvada <[email protected]>
Cc: Rafael J. Wysocki <[email protected]> --
2.17.1

Signature · 2 lines
With Best Regards,
Andy Shevchenko