Attachment #4170 for bug #3410

Lines 562-569 acpi_thermal_passive ( Link Here

(-)v2.6-bk/drivers/acpi/thermal.c~state_fix (-2 / +12 lines)
562	* assume symmetry.	562	* assume symmetry.
563	*/	563	*/
564	else if (tz->trips.passive.flags.enabled) {	564	else if (tz->trips.passive.flags.enabled) {
		565	result = 1;
565	for (i=0; i<passive->devices.count; i++)	566	for (i=0; i<passive->devices.count; i++)
566	result = acpi_processor_set_thermal_limit(	567	result &= acpi_processor_set_thermal_limit(
567	passive->devices.handles[i],	568	passive->devices.handles[i],
568	ACPI_PROCESSOR_LIMIT_DECREMENT);	569	ACPI_PROCESSOR_LIMIT_DECREMENT);
569	if (result == 1) {	570	if (result == 1) {
Lines 721-733 acpi_thermal_check ( Link Here
721	*/	722	*/
722	if (tz->trips.critical.flags.enabled)	723	if (tz->trips.critical.flags.enabled)
723	tz->state.critical = 1;	724	tz->state.critical = 1;
		725	else
		726	tz->state.critical = 0;
724	if (tz->trips.hot.flags.enabled)	727	if (tz->trips.hot.flags.enabled)
725	tz->state.hot = 1;	728	tz->state.hot = 1;
		729	else
		730	tz->state.hot = 0;
726	if (tz->trips.passive.flags.enabled)	731	if (tz->trips.passive.flags.enabled)
727	tz->state.passive = 1;	732	tz->state.passive = 1;
		733	else
		734	tz->state.passive = 0;
		735	result = 0;
728	for (i=0; i<ACPI_THERMAL_MAX_ACTIVE; i++)	736	for (i=0; i<ACPI_THERMAL_MAX_ACTIVE; i++)
729	if (tz->trips.active[i].flags.enabled)	737	if (tz->trips.active[i].flags.enabled)
730	tz->state.active = 1;	738	tz->state.active = 1, result = 1;
		739	if (!result)
		740	tz->state.active = 0;
731		741
732	/*	742	/*
733	* Calculate Sleep Time	743	* Calculate Sleep Time

Lines 1862-1870 acpi_processor_set_thermal_limit ( Link Here

(-)v2.6-bk/drivers/acpi/processor.c~limit_fix (-2 / +6 lines)
1862	/* if going down: T-states first, P-states later */	1862	/* if going down: T-states first, P-states later */
1863		1863
1864	if (pr->flags.throttling) {	1864	if (pr->flags.throttling) {
1865	if (tx == 0)	1865	if (tx == 0) {
1866	ACPI_DEBUG_PRINT((ACPI_DB_INFO,	1866	ACPI_DEBUG_PRINT((ACPI_DB_INFO,
1867	"At minimum throttling state\n"));	1867	"At minimum throttling state\n"));
		1868	return_VALUE(1);
		1869	}
1868	else {	1870	else {
1869	tx--;	1871	tx--;
1870	goto end;	1872	goto end;
Lines 1872-1880 acpi_processor_set_thermal_limit ( Link Here
1872	}	1874	}
1873		1875
1874	result = acpi_thermal_cpufreq_decrease(pr->id);	1876	result = acpi_thermal_cpufreq_decrease(pr->id);
1875	if (result == -ERANGE)	1877	if (result == -ERANGE) {
1876	ACPI_DEBUG_PRINT((ACPI_DB_INFO,	1878	ACPI_DEBUG_PRINT((ACPI_DB_INFO,
1877	"At minimum performance state\n"));	1879	"At minimum performance state\n"));
		1880	return_VALUE(1);
		1881	}
1878		1882
1879	break;	1883	break;
1880	}	1884	}

Return to bug 3410