Skip to contentSkip to conversation

ACPI: bus: Fix platform-level _OSC handling and avoid CPPC is not supported

PATCH In review Rafael J. Wysocki 4 participants 6 messages Mar 16, 2022 – Mar 17, 2022

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

cover ACPI: bus: Fix platform-level _OSC handling and avoid CPPC is not supported

Hi All,

The following two patches revert a commit that caused the handling of platform-level _OSC to fail in some legitimate cases and address the CPPC handling breakage that was the motivation for the reverted commit.

Please refer to the patch changelogs for details.

Thanks!

#1 lore raw

PATCH 1/2 Revert "ACPI: Pass the same capabilities to the _OSC regardless of the query flag"

From: Rafael J. Wysocki <[email protected]>

Revert commit 159d8c274fd9 ("ACPI: Pass the same capabilities to the _OSC regardless of the query flag") which caused legitimate usage scenarios (when the platform firmware does not want the OS to control certain platform features controlled by the system bus scope _OSC) to break and was misguided by some misleading language in the _OSC definition in the ACPI specification (in particular, Section 6.2.11.1.3 "Sequence of _OSC Calls" that contradicts other perts of the _OSC definition).

---
 drivers/acpi/bus.c |   27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)
drivers/acpi/bus.c +19 -8
Index: linux-pm/drivers/acpi/bus.c
===================================================================
@@ -333,21 +333,32 @@ static void acpi_bus_osc_negotiate_platf
 	if (ACPI_FAILURE(acpi_run_osc(handle, &context)))
 		return;
 
-	kfree(context.ret.pointer);
+	capbuf_ret = context.ret.pointer;
+	if (context.ret.length <= OSC_SUPPORT_DWORD) {
+		kfree(context.ret.pointer);
+		return;
+	}
 
-	/* Now run _OSC again with query flag clear */
+	/*
+	 * Now run _OSC again with query flag clear and with the caps
+	 * supported by both the OS and the platform.
+	 */
 	capbuf[OSC_QUERY_DWORD] = 0;
+	capbuf[OSC_SUPPORT_DWORD] = capbuf_ret[OSC_SUPPORT_DWORD];
+	kfree(context.ret.pointer);
 
 	if (ACPI_FAILURE(acpi_run_osc(handle, &context)))
 		return;
 
 	capbuf_ret = context.ret.pointer;
-	osc_sb_apei_support_acked =
-		capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_APEI_SUPPORT;
-	osc_pc_lpi_support_confirmed =
-		capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_PCLPI_SUPPORT;
-	osc_sb_native_usb4_support_confirmed =
-		capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_NATIVE_USB4_SUPPORT;
+	if (context.ret.length > OSC_SUPPORT_DWORD) {
+		osc_sb_apei_support_acked =
+			capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_APEI_SUPPORT;
+		osc_pc_lpi_support_confirmed =
+			capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_PCLPI_SUPPORT;
+		osc_sb_native_usb4_support_confirmed =
+			capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_NATIVE_USB4_SUPPORT;
+	}
 
 	kfree(context.ret.pointer);
 }
#2 lore raw

PATCH 2/2 ACPI: bus: Avoid using CPPC if not supported by firmware

In reply to Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

If the platform firmware indicates that it does not support CPPC by clearing the OSC_SB_CPC_SUPPORT and OSC_SB_CPCV2_SUPPORT bits in the platform _OSC capabilities mask, avoid attempting to evaluate _CPC which may fail in that case.

Because the OSC_SB_CPC_SUPPORT and OSC_SB_CPCV2_SUPPORT bits are only added to the supported platform capabilities mask on x86, when X86_FEATURE_HWP is supported, allow _CPC to be evaluated regardless in the other cases.

---
 drivers/acpi/bus.c       |    8 ++++++++
 drivers/acpi/cppc_acpi.c |    3 +++
 include/linux/acpi.h     |    1 +
 3 files changed, 12 insertions(+)
drivers/acpi/bus.c +8 -0
Index: linux-pm/drivers/acpi/bus.c
===================================================================
@@ -284,6 +284,8 @@ EXPORT_SYMBOL_GPL(osc_pc_lpi_support_con
 bool osc_sb_native_usb4_support_confirmed;
 EXPORT_SYMBOL_GPL(osc_sb_native_usb4_support_confirmed);
 
+bool osc_sb_cppc_not_supported;
+
 static u8 sb_uuid_str[] = "0811B06E-4A27-44F9-8D60-3CBBC22E7B48";
 static void acpi_bus_osc_negotiate_platform_control(void)
 {
@@ -339,6 +341,12 @@ static void acpi_bus_osc_negotiate_platf
 		return;
 	}
 
+#ifdef CONFIG_X86
+	if (boot_cpu_has(X86_FEATURE_HWP))
+		osc_sb_cppc_not_supported = !(capbuf_ret[OSC_SUPPORT_DWORD] &
+				(OSC_SB_CPC_SUPPORT | OSC_SB_CPCV2_SUPPORT));
+#endif
+
 	/*
 	 * Now run _OSC again with query flag clear and with the caps
 	 * supported by both the OS and the platform.
drivers/acpi/cppc_acpi.c +3 -0
Index: linux-pm/drivers/acpi/cppc_acpi.c
===================================================================
@@ -656,6 +656,9 @@ int acpi_cppc_processor_probe(struct acp
 	acpi_status status;
 	int ret = -EFAULT;
 
+	if (osc_sb_cppc_not_supported)
+		return -ENODEV;
+
 	/* Parse the ACPI _CPC table for this CPU. */
 	status = acpi_evaluate_object_typed(handle, "_CPC", NULL, &output,
 			ACPI_TYPE_PACKAGE);
include/linux/acpi.h +1 -0
Index: linux-pm/include/linux/acpi.h
===================================================================
@@ -580,6 +580,7 @@ acpi_status acpi_run_osc(acpi_handle han
 extern bool osc_sb_apei_support_acked;
 extern bool osc_pc_lpi_support_confirmed;
 extern bool osc_sb_native_usb4_support_confirmed;
+extern bool osc_sb_cppc_not_supported;
 
 /* USB4 Capabilities */
 #define OSC_USB_USB3_TUNNELING			0x00000001
Tested-by on the v1 series
#3 lore raw
In reply to Rafael J. Wysocki

[Public]

Quoted 14 lines

-----Original Message-----
From: Rafael J. Wysocki <[email protected]>
Sent: Wednesday, March 16, 2022 07:35
To: Linux ACPI <[email protected]>
Cc: Linux PM <[email protected]>; LKML <linux- [email protected]>; Mika Westerberg <[email protected]>; Hans de Goede <[email protected]>; Limonciello, Mario <[email protected]>
Subject: [PATCH v1 0/2] ACPI: bus: Fix platform-level _OSC handling and avoid CPPC is not supported

Hi All,

Quoted 9 lines

The following two patches revert a commit that caused the handling of platform-level _OSC to fail in some legitimate cases and address the CPPC handling breakage that was the motivation for the reverted commit.

Please refer to the patch changelogs for details.

Thanks!

Thanks! For both patches:

#4 lore raw

Re: [PATCH v1 0/2] ACPI: bus: Fix platform-level _OSC handling and avoid CPPC is not supportedg

In reply to Rafael J. Wysocki
Quoted 8 lines · Rafael J. Wysocki

Hi All,

The following two patches revert a commit that caused the handling of platform-level _OSC to fail in some legitimate cases and address the CPPC handling breakage that was the motivation for the reverted commit.

Please refer to the patch changelogs for details.

Series are Acked-by: Huang Rui <[email protected]>

Reviewed-by on the v1 series
#5 lore raw
In reply to Rafael J. Wysocki

Hi Rafael,

Quoted 7 lines · Rafael J. Wysocki

Hi All,

The following two patches revert a commit that caused the handling of platform-level _OSC to fail in some legitimate cases and address the CPPC handling breakage that was the motivation for the reverted commit.

Please refer to the patch changelogs for details.

For both,