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

ACPI: processor: Move MWAIT quirk out of acpi_processor.c 



Commit 2a2a6471 ("ACPI: Disable MWAIT via DMI on broken Compal board")
introduced a workaround for MWAIT for a specific x86 system.

Move the code outside of acpi_processor.c to acpi/x86/ directory for
consistency and rename the functions associated with it, so their names
start with "acpi_proc_quirk_" to make the goal obvious.

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, two function names changed ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 06c2afb8

drivers/acpi/internal.h

+2 −0
Original line number Diff line number Diff line
@@ -153,6 +153,8 @@ int acpi_wakeup_device_init(void); 
   -------------------------------------------------------------------------- */

#ifdef CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC

void acpi_early_processor_set_pdc(void);



void acpi_proc_quirk_mwait_check(void);

#else

static inline void acpi_early_processor_set_pdc(void) {}

#endif

drivers/acpi/processor_pdc.c

+1 −28
Original line number Diff line number Diff line
@@ -174,36 +174,9 @@ early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv) 
	return AE_OK;

}



static int __init set_no_mwait(const struct dmi_system_id *id)

{

	pr_notice("%s detected - disabling mwait for CPU C-states\n",

		  id->ident);

	boot_option_idle_override = IDLE_NOMWAIT;

	return 0;

}



static const struct dmi_system_id processor_idle_dmi_table[] __initconst = {

	{

	set_no_mwait, "Extensa 5220", {

	DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),

	DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

	DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),

	DMI_MATCH(DMI_BOARD_NAME, "Columbia") }, NULL},

	{},

};



static void __init processor_dmi_check(void)

{

	/*

	 * Check whether the system is DMI table. If yes, OSPM

	 * should not use mwait for CPU-states.

	 */

	dmi_check_system(processor_idle_dmi_table);

}



void __init acpi_early_processor_set_pdc(void)

{

	processor_dmi_check();

	acpi_proc_quirk_mwait_check();



	acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT,

			    ACPI_UINT32_MAX,

drivers/acpi/x86/utils.c

+35 −0
Original line number Diff line number Diff line
@@ -518,3 +518,38 @@ bool acpi_quirk_skip_acpi_ac_and_battery(void) 
	return false;

}

EXPORT_SYMBOL_GPL(acpi_quirk_skip_acpi_ac_and_battery);



/* This section provides a workaround for a specific x86 system

 * which requires disabling of mwait to work correctly.

 */

static int __init acpi_proc_quirk_set_no_mwait(const struct dmi_system_id *id)

{

	pr_notice("%s detected - disabling mwait for CPU C-states\n",

		  id->ident);

	boot_option_idle_override = IDLE_NOMWAIT;

	return 0;

}



static const struct dmi_system_id acpi_proc_quirk_mwait_dmi_table[] __initconst = {

	{

		.callback = acpi_proc_quirk_set_no_mwait,

		.ident = "Extensa 5220",

		.matches =  {

			DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),

			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

			DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),

			DMI_MATCH(DMI_BOARD_NAME, "Columbia"),

		},

		.driver_data = NULL,

	},

	{}

};



void __init acpi_proc_quirk_mwait_check(void)

{

	/*

	 * Check whether the system is DMI table. If yes, OSPM

	 * should not use mwait for CPU-states.

	 */

	dmi_check_system(acpi_proc_quirk_mwait_dmi_table);

}