Commit c9e6c5e6 authored by Michal Wilczynski's avatar Michal Wilczynski Committed by Rafael J. Wysocki
Browse files

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarMichal Wilczynski <michal.wilczynski@intel.com>
[ rjw: Subject and changelog edits ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c5e4d05d

arch/ia64/include/asm/acpi.h

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/x86/include/asm/acpi.h

+6 −5
Original line number Diff line number Diff line
@@ -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)

arch/x86/xen/enlighten_pv.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	}

drivers/acpi/processor_pdc.c

+1 −1
Original line number Diff line number Diff line
@@ -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]);

include/acpi/pdc_intel.h

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
/* 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__ */