Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e483969 authored by David Shaohua Li's avatar David Shaohua Li Committed by Len Brown
Browse files

[ACPI] correct earlier SMP deep C-states on HT patch 

http://bugzilla.kernel.org/show_bug.cgi?id=5165



Change polarity of test for PLVL2_UP flag.
Skip promotion/demotion code when not needed.

Signed-off-by: default avatarShaohua Li <shaohua.li@intel.com>
Signed-off-by: default avatarVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 4c033552

drivers/acpi/processor_idle.c

+15 −5
Original line number Diff line number Diff line
@@ -278,8 +278,6 @@ static void acpi_processor_idle(void) 
		}

	}



	cx->usage++;



#ifdef CONFIG_HOTPLUG_CPU

	/*

	 * Check for P_LVL2_UP flag before entering C2 and above on
@@ -287,9 +285,12 @@ static void acpi_processor_idle(void) 
	 * detection phase, to work cleanly with logical CPU hotplug.

	 */

	if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) && 

	    !pr->flags.has_cst && acpi_fadt.plvl2_up)

		cx->type = ACPI_STATE_C1;

	    !pr->flags.has_cst && !acpi_fadt.plvl2_up)

		cx = &pr->power.states[ACPI_STATE_C1];

#endif



	cx->usage++;



	/*

	 * Sleep:

	 * ------
@@ -378,6 +379,15 @@ static void acpi_processor_idle(void) 


	next_state = pr->power.state;



#ifdef CONFIG_HOTPLUG_CPU

	/* Don't do promotion/demotion */

	if ((cx->type == ACPI_STATE_C1) && (num_online_cpus() > 1) &&

	    !pr->flags.has_cst && !acpi_fadt.plvl2_up) {

		next_state = cx;

		goto end;

	}

#endif



	/*

	 * Promotion?

	 * ----------
@@ -549,7 +559,7 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr) 
	 * Check for P_LVL2_UP flag before entering C2 and above on

	 * an SMP system. 

	 */

	if ((num_online_cpus() > 1) && acpi_fadt.plvl2_up)

	if ((num_online_cpus() > 1) && !acpi_fadt.plvl2_up)

		return_VALUE(-ENODEV);

#endif