ACPI: processor: Rename ACPI_PDC symbols

The prefix in the names of the ACPI_PDC symbols suggests that they are
only relevant for _PDC, but in fact they can also be used in the _OSC.

Change that prefix to a more generic ACPI_PROC_CAP that will better
reflect the purpose of those symbols as they represent bits in a general
processor capabilities buffer.

Rename pdc_intel.h to proc_cap_intel.h to follow the change of the
symbol name prefix.

No intentional functional impact.

Suggested-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Michal Wilczynski <michal.wilczynski@intel.com>
[ rjw: Subject and changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h
index 43797cb..58500a9 100644 (file)
--- a/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@ -11,7 +11,7 @@
 
 #ifdef __KERNEL__
 
-#include <acpi/pdc_intel.h>
+#include <acpi/proc_cap_intel.h>
 
 #include <linux/init.h>
 #include <linux/numa.h>
@@ -71,7 +71,7 @@ extern int __initdata nid_to_pxm_map[MAX_NUMNODES];
 static inline bool arch_has_acpi_pdc(void) { return true; }
 static inline void arch_acpi_set_proc_cap_bits(u32 *cap)
 {
-       *cap |= ACPI_PDC_EST_CAPABILITY_SMP;
+       *cap |= ACPI_PROC_CAP_EST_CAPABILITY_SMP;
 }
 
 #ifdef CONFIG_ACPI_NUMA

diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 6a498d1..ce5ad6a 100644 (file)
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -6,7 +6,7 @@
  *  Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
  *  Copyright (C) 2001 Patrick Mochel <mochel@osdl.org>
  */
-#include <acpi/pdc_intel.h>
+#include <acpi/proc_cap_intel.h>
 
 #include <asm/numa.h>
 #include <asm/fixmap.h>
@@ -104,19 +104,20 @@ static inline void arch_acpi_set_proc_cap_bits(u32 *cap)
 {
        struct cpuinfo_x86 *c = &cpu_data(0);
 
-       *cap |= ACPI_PDC_C_CAPABILITY_SMP;
+       *cap |= ACPI_PROC_CAP_C_CAPABILITY_SMP;
 
        if (cpu_has(c, X86_FEATURE_EST))
-               *cap |= ACPI_PDC_EST_CAPABILITY_SWSMP;
+               *cap |= ACPI_PROC_CAP_EST_CAPABILITY_SWSMP;
 
        if (cpu_has(c, X86_FEATURE_ACPI))
-               *cap |= ACPI_PDC_T_FFH;
+               *cap |= ACPI_PROC_CAP_T_FFH;
 
        /*
         * If mwait/monitor is unsupported, C2/C3_FFH will be disabled
         */
        if (!cpu_has(c, X86_FEATURE_MWAIT))
-               *cap &= ~(ACPI_PDC_C_C2C3_FFH);
+               *cap &= ~(ACPI_PROC_CAP_C_C2C3_FFH);
+
 }
 
 static inline bool acpi_has_cpu_in_madt(void)

diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c
index 93b6582..a3864e2 100644 (file)
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@ -79,7 +79,7 @@
 #ifdef CONFIG_ACPI
 #include <linux/acpi.h>
 #include <asm/acpi.h>
-#include <acpi/pdc_intel.h>
+#include <acpi/proc_cap_intel.h>
 #include <acpi/processor.h>
 #include <xen/interface/platform.h>
 #endif
@@ -288,17 +288,17 @@ static bool __init xen_check_mwait(void)
 
        native_cpuid(&ax, &bx, &cx, &dx);
 
-       /* Ask the Hypervisor whether to clear ACPI_PDC_C_C2C3_FFH. If so,
+       /* Ask the Hypervisor whether to clear ACPI_PROC_CAP_C_C2C3_FFH. If so,
         * don't expose MWAIT_LEAF and let ACPI pick the IOPORT version of C3.
         */
        buf[0] = ACPI_PDC_REVISION_ID;
        buf[1] = 1;
-       buf[2] = (ACPI_PDC_C_CAPABILITY_SMP | ACPI_PDC_EST_CAPABILITY_SWSMP);
+       buf[2] = (ACPI_PROC_CAP_C_CAPABILITY_SMP | ACPI_PROC_CAP_EST_CAPABILITY_SWSMP);
 
        set_xen_guest_handle(op.u.set_pminfo.pdc, buf);
 
        if ((HYPERVISOR_platform_op(&op) == 0) &&
-           (buf[2] & (ACPI_PDC_C_C1_FFH | ACPI_PDC_C_C2C3_FFH))) {
+           (buf[2] & (ACPI_PROC_CAP_C_C1_FFH | ACPI_PROC_CAP_C_C2C3_FFH))) {
                cpuid_leaf5_ecx_val = cx;
                cpuid_leaf5_edx_val = dx;
        }

diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
index 9e7b5dd..7948b5d 100644 (file)
--- a/drivers/acpi/processor_pdc.c
+++ b/drivers/acpi/processor_pdc.c
@@ -21,7 +21,7 @@ static void acpi_set_pdc_bits(u32 *buf)
        buf[1] = 1;
 
        /* Enable coordination with firmware's _TSD info */
-       buf[2] = ACPI_PDC_SMP_T_SWCOORD;
+       buf[2] = ACPI_PROC_CAP_SMP_T_SWCOORD;
 
        /* Twiddle arch-specific bits needed for _PDC */
        arch_acpi_set_proc_cap_bits(&buf[2]);

diff --git a/include/acpi/pdc_intel.h b/include/acpi/pdc_intel.h
deleted file mode 100644 (file)
index 967c552..0000000
--- a/include/acpi/pdc_intel.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-
-/* _PDC bit definition for Intel processors */
-
-#ifndef __PDC_INTEL_H__
-#define __PDC_INTEL_H__
-
-#define ACPI_PDC_P_FFH                 (0x0001)
-#define ACPI_PDC_C_C1_HALT             (0x0002)
-#define ACPI_PDC_T_FFH                 (0x0004)
-#define ACPI_PDC_SMP_C1PT              (0x0008)
-#define ACPI_PDC_SMP_C2C3              (0x0010)
-#define ACPI_PDC_SMP_P_SWCOORD         (0x0020)
-#define ACPI_PDC_SMP_C_SWCOORD         (0x0040)
-#define ACPI_PDC_SMP_T_SWCOORD         (0x0080)
-#define ACPI_PDC_C_C1_FFH              (0x0100)
-#define ACPI_PDC_C_C2C3_FFH            (0x0200)
-#define ACPI_PDC_SMP_P_HWCOORD         (0x0800)
-
-#define ACPI_PDC_EST_CAPABILITY_SMP    (ACPI_PDC_SMP_C1PT | \
-                                        ACPI_PDC_C_C1_HALT | \
-                                        ACPI_PDC_P_FFH)
-
-#define ACPI_PDC_EST_CAPABILITY_SWSMP  (ACPI_PDC_SMP_C1PT | \
-                                        ACPI_PDC_C_C1_HALT | \
-                                        ACPI_PDC_SMP_P_SWCOORD | \
-                                        ACPI_PDC_SMP_P_HWCOORD | \
-                                        ACPI_PDC_P_FFH)
-
-#define ACPI_PDC_C_CAPABILITY_SMP      (ACPI_PDC_SMP_C2C3  | \
-                                        ACPI_PDC_SMP_C1PT  | \
-                                        ACPI_PDC_C_C1_HALT | \
-                                        ACPI_PDC_C_C1_FFH  | \
-                                        ACPI_PDC_C_C2C3_FFH)
-
-#endif                         /* __PDC_INTEL_H__ */

diff --git a/include/acpi/proc_cap_intel.h b/include/acpi/proc_cap_intel.h
new file mode 100644 (file)
index 0000000..57e5e26
--- /dev/null
+++ b/include/acpi/proc_cap_intel.h
@@ -0,0 +1,39 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+/* Vendor specific processor capabilities bit definition
+ * for Intel processors. Those bits are used to convey OSPM
+ * power management capabilities to the platform.
+ */
+
+#ifndef __PROC_CAP_INTEL_H__
+#define __PROC_CAP_INTEL_H__
+
+#define ACPI_PROC_CAP_P_FFH                    (0x0001)
+#define ACPI_PROC_CAP_C_C1_HALT                        (0x0002)
+#define ACPI_PROC_CAP_T_FFH                    (0x0004)
+#define ACPI_PROC_CAP_SMP_C1PT                 (0x0008)
+#define ACPI_PROC_CAP_SMP_C2C3                 (0x0010)
+#define ACPI_PROC_CAP_SMP_P_SWCOORD            (0x0020)
+#define ACPI_PROC_CAP_SMP_C_SWCOORD            (0x0040)
+#define ACPI_PROC_CAP_SMP_T_SWCOORD            (0x0080)
+#define ACPI_PROC_CAP_C_C1_FFH                 (0x0100)
+#define ACPI_PROC_CAP_C_C2C3_FFH               (0x0200)
+#define ACPI_PROC_CAP_SMP_P_HWCOORD            (0x0800)
+
+#define ACPI_PROC_CAP_EST_CAPABILITY_SMP       (ACPI_PROC_CAP_SMP_C1PT | \
+                                                ACPI_PROC_CAP_C_C1_HALT | \
+                                                ACPI_PROC_CAP_P_FFH)
+
+#define ACPI_PROC_CAP_EST_CAPABILITY_SWSMP     (ACPI_PROC_CAP_SMP_C1PT | \
+                                                ACPI_PROC_CAP_C_C1_HALT | \
+                                                ACPI_PROC_CAP_SMP_P_SWCOORD | \
+                                                ACPI_PROC_CAP_SMP_P_HWCOORD | \
+                                                ACPI_PROC_CAP_P_FFH)
+
+#define ACPI_PROC_CAP_C_CAPABILITY_SMP         (ACPI_PROC_CAP_SMP_C2C3  | \
+                                                ACPI_PROC_CAP_SMP_C1PT  | \
+                                                ACPI_PROC_CAP_C_C1_HALT | \
+                                                ACPI_PROC_CAP_C_C1_FFH  | \
+                                                ACPI_PROC_CAP_C_C2C3_FFH)
+
+#endif /* __PROC_CAP_INTEL_H__ */