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

ACPI: processor: Move processor_physically_present() to acpi_processor.c 



Since _PDC method is deprecated and a preferred method of communicating
OSPM processor power management capabilities is _OSC, there is a need to
move function checking whether processor is present as this logic is not
_PDC specific.

Move processor_physically_present() to acpi_processor.c.

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 0a0e2ea6

drivers/acpi/acpi_processor.c

+51 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include <linux/acpi.h>

#include <linux/device.h>

#include <linux/dmi.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/pci.h>
@@ -21,6 +22,8 @@ 


#include <asm/cpu.h>



#include <xen/xen.h>



#include "internal.h"



DEFINE_PER_CPU(struct acpi_processor *, processors);
@@ -508,7 +511,54 @@ static void acpi_processor_remove(struct acpi_device *device) 
}

#endif /* CONFIG_ACPI_HOTPLUG_CPU */



#ifdef CONFIG_X86

#ifdef CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC

bool __init processor_physically_present(acpi_handle handle)

{

	int cpuid, type;

	u32 acpi_id;

	acpi_status status;

	acpi_object_type acpi_type;

	unsigned long long tmp;

	union acpi_object object = {};

	struct acpi_buffer buffer = { sizeof(union acpi_object), &object };



	status = acpi_get_type(handle, &acpi_type);

	if (ACPI_FAILURE(status))

		return false;



	switch (acpi_type) {

	case ACPI_TYPE_PROCESSOR:

		status = acpi_evaluate_object(handle, NULL, NULL, &buffer);

		if (ACPI_FAILURE(status))

			return false;

		acpi_id = object.processor.proc_id;

		break;

	case ACPI_TYPE_DEVICE:

		status = acpi_evaluate_integer(handle, METHOD_NAME__UID,

					       NULL, &tmp);

		if (ACPI_FAILURE(status))

			return false;

		acpi_id = tmp;

		break;

	default:

		return false;

	}



	if (xen_initial_domain())

		/*

		 * When running as a Xen dom0 the number of processors Linux

		 * sees can be different from the real number of processors on

		 * the system, and we still need to execute _PDC or _OSC for

		 * all of them.

		 */

		return xen_processor_present(acpi_id);



	type = (acpi_type == ACPI_TYPE_DEVICE) ? 1 : 0;

	cpuid = acpi_get_cpuid(handle, type, acpi_id);



	return !invalid_logical_cpuid(cpuid);

}



static bool acpi_hwp_native_thermal_lvt_set;

static acpi_status __init acpi_hwp_native_thermal_lvt_osc(acpi_handle handle,

							  u32 lvl,

drivers/acpi/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ int acpi_wakeup_device_init(void); 
void acpi_early_processor_set_pdc(void);



void acpi_proc_quirk_mwait_check(void);

bool processor_physically_present(acpi_handle handle);

#else

static inline void acpi_early_processor_set_pdc(void) {}

#endif

drivers/acpi/processor_pdc.c

+0 −49
Original line number Diff line number Diff line
@@ -9,61 +9,12 @@ 


#define pr_fmt(fmt) "ACPI: " fmt



#include <linux/dmi.h>

#include <linux/slab.h>

#include <linux/acpi.h>

#include <acpi/processor.h>



#include <xen/xen.h>



#include "internal.h"



static bool __init processor_physically_present(acpi_handle handle)

{

	int cpuid, type;

	u32 acpi_id;

	acpi_status status;

	acpi_object_type acpi_type;

	unsigned long long tmp;

	union acpi_object object = { 0 };

	struct acpi_buffer buffer = { sizeof(union acpi_object), &object };



	status = acpi_get_type(handle, &acpi_type);

	if (ACPI_FAILURE(status))

		return false;



	switch (acpi_type) {

	case ACPI_TYPE_PROCESSOR:

		status = acpi_evaluate_object(handle, NULL, NULL, &buffer);

		if (ACPI_FAILURE(status))

			return false;

		acpi_id = object.processor.proc_id;

		break;

	case ACPI_TYPE_DEVICE:

		status = acpi_evaluate_integer(handle, "_UID", NULL, &tmp);

		if (ACPI_FAILURE(status))

			return false;

		acpi_id = tmp;

		break;

	default:

		return false;

	}



	if (xen_initial_domain())

		/*

		 * When running as a Xen dom0 the number of processors Linux

		 * sees can be different from the real number of processors on

		 * the system, and we still need to execute _PDC for all of

		 * them.

		 */

		return xen_processor_present(acpi_id);



	type = (acpi_type == ACPI_TYPE_DEVICE) ? 1 : 0;

	cpuid = acpi_get_cpuid(handle, type, acpi_id);



	return !invalid_logical_cpuid(cpuid);

}



static void acpi_set_pdc_bits(u32 *buf)

{

	buf[0] = ACPI_PDC_REVISION_ID;