Merge: Fix the broken CPPC check for non-X86 systems

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/1971

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2164217

The ACPI v5.18 rebase had a commit that was backported with conflicts. In
resolving the conflicts, I accidentally hid the enable of the CPPC cpufreq
driver behind CONFIG_X86. Non-x86 systems stopped being able to use cpufreq.

Revert the bad commit and re-apply it correctly to resolve the issue.

Signed-off-by: Mark Langsdorf <mlangsdo@redhat.com>

Approved-by: Steve Best <sbest@redhat.com>
Approved-by: Prarit Bhargava <prarit@redhat.com>

Signed-off-by: Herton R. Krzesinski <herton@redhat.com>

Author: Herton R. Krzesinski

drivers/acpi/bus.c

@@ -370,7 +370,7 @@ static void acpi_bus_osc_negotiate_platform_control(void)
 
 	capbuf_ret = context.ret.pointer;
 	if (context.ret.length > OSC_SUPPORT_DWORD) {
-#ifdef CONFIG_X86
+#ifdef CONFIG_ACPI_CPPC_LIB
 		osc_sb_cppc2_support_acked = capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_CPCV2_SUPPORT;
 #endif
 

drivers/acpi/cppc_acpi.c

@@ -675,8 +675,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)
 
 	if (!osc_sb_cppc2_support_acked) {
 		pr_debug("CPPC v2 _OSC not acked\n");
-		if (!cpc_supported_by_cpu())
-			return -ENODEV;
+		return -ENODEV;
 	}
 
 	/* Parse the ACPI _CPC table for this CPU. */