|
|
@@ -44,47 +44,6 @@
|
|
|
#define _COMPONENT ACPI_PROCESSOR_COMPONENT
|
|
|
ACPI_MODULE_NAME("processor_thermal");
|
|
|
|
|
|
-/* --------------------------------------------------------------------------
|
|
|
- Limit Interface
|
|
|
- -------------------------------------------------------------------------- */
|
|
|
-static int acpi_processor_apply_limit(struct acpi_processor *pr)
|
|
|
-{
|
|
|
- int result = 0;
|
|
|
- u16 px = 0;
|
|
|
- u16 tx = 0;
|
|
|
-
|
|
|
-
|
|
|
- if (!pr)
|
|
|
- return -EINVAL;
|
|
|
-
|
|
|
- if (!pr->flags.limit)
|
|
|
- return -ENODEV;
|
|
|
-
|
|
|
- if (pr->flags.throttling) {
|
|
|
- if (pr->limit.user.tx > tx)
|
|
|
- tx = pr->limit.user.tx;
|
|
|
- if (pr->limit.thermal.tx > tx)
|
|
|
- tx = pr->limit.thermal.tx;
|
|
|
-
|
|
|
- result = acpi_processor_set_throttling(pr, tx, false);
|
|
|
- if (result)
|
|
|
- goto end;
|
|
|
- }
|
|
|
-
|
|
|
- pr->limit.state.px = px;
|
|
|
- pr->limit.state.tx = tx;
|
|
|
-
|
|
|
- ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
|
|
- "Processor [%d] limit set to (P%d:T%d)\n", pr->id,
|
|
|
- pr->limit.state.px, pr->limit.state.tx));
|
|
|
-
|
|
|
- end:
|
|
|
- if (result)
|
|
|
- printk(KERN_ERR PREFIX "Unable to set limit\n");
|
|
|
-
|
|
|
- return result;
|
|
|
-}
|
|
|
-
|
|
|
#ifdef CONFIG_CPU_FREQ
|
|
|
|
|
|
/* If a passive cooling situation is detected, primarily CPUfreq is used, as it
|
|
|
@@ -107,36 +66,6 @@ static int cpu_has_cpufreq(unsigned int cpu)
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-static int acpi_thermal_cpufreq_increase(unsigned int cpu)
|
|
|
-{
|
|
|
- if (!cpu_has_cpufreq(cpu))
|
|
|
- return -ENODEV;
|
|
|
-
|
|
|
- if (per_cpu(cpufreq_thermal_reduction_pctg, cpu) <
|
|
|
- CPUFREQ_THERMAL_MAX_STEP) {
|
|
|
- per_cpu(cpufreq_thermal_reduction_pctg, cpu)++;
|
|
|
- cpufreq_update_policy(cpu);
|
|
|
- return 0;
|
|
|
- }
|
|
|
-
|
|
|
- return -ERANGE;
|
|
|
-}
|
|
|
-
|
|
|
-static int acpi_thermal_cpufreq_decrease(unsigned int cpu)
|
|
|
-{
|
|
|
- if (!cpu_has_cpufreq(cpu))
|
|
|
- return -ENODEV;
|
|
|
-
|
|
|
- if (per_cpu(cpufreq_thermal_reduction_pctg, cpu) >
|
|
|
- (CPUFREQ_THERMAL_MIN_STEP + 1))
|
|
|
- per_cpu(cpufreq_thermal_reduction_pctg, cpu)--;
|
|
|
- else
|
|
|
- per_cpu(cpufreq_thermal_reduction_pctg, cpu) = 0;
|
|
|
- cpufreq_update_policy(cpu);
|
|
|
- /* We reached max freq again and can leave passive mode */
|
|
|
- return !per_cpu(cpufreq_thermal_reduction_pctg, cpu);
|
|
|
-}
|
|
|
-
|
|
|
static int acpi_thermal_cpufreq_notifier(struct notifier_block *nb,
|
|
|
unsigned long event, void *data)
|
|
|
{
|
|
|
@@ -238,113 +167,6 @@ static int acpi_thermal_cpufreq_decrease(unsigned int cpu)
|
|
|
|
|
|
#endif
|
|
|
|
|
|
-int acpi_processor_set_thermal_limit(acpi_handle handle, int type)
|
|
|
-{
|
|
|
- int result = 0;
|
|
|
- struct acpi_processor *pr = NULL;
|
|
|
- struct acpi_device *device = NULL;
|
|
|
- int tx = 0, max_tx_px = 0;
|
|
|
-
|
|
|
-
|
|
|
- if ((type < ACPI_PROCESSOR_LIMIT_NONE)
|
|
|
- || (type > ACPI_PROCESSOR_LIMIT_DECREMENT))
|
|
|
- return -EINVAL;
|
|
|
-
|
|
|
- result = acpi_bus_get_device(handle, &device);
|
|
|
- if (result)
|
|
|
- return result;
|
|
|
-
|
|
|
- pr = acpi_driver_data(device);
|
|
|
- if (!pr)
|
|
|
- return -ENODEV;
|
|
|
-
|
|
|
- /* Thermal limits are always relative to the current Px/Tx state. */
|
|
|
- if (pr->flags.throttling)
|
|
|
- pr->limit.thermal.tx = pr->throttling.state;
|
|
|
-
|
|
|
- /*
|
|
|
- * Our default policy is to only use throttling at the lowest
|
|
|
- * performance state.
|
|
|
- */
|
|
|
-
|
|
|
- tx = pr->limit.thermal.tx;
|
|
|
-
|
|
|
- switch (type) {
|
|
|
-
|
|
|
- case ACPI_PROCESSOR_LIMIT_NONE:
|
|
|
- do {
|
|
|
- result = acpi_thermal_cpufreq_decrease(pr->id);
|
|
|
- } while (!result);
|
|
|
- tx = 0;
|
|
|
- break;
|
|
|
-
|
|
|
- case ACPI_PROCESSOR_LIMIT_INCREMENT:
|
|
|
- /* if going up: P-states first, T-states later */
|
|
|
-
|
|
|
- result = acpi_thermal_cpufreq_increase(pr->id);
|
|
|
- if (!result)
|
|
|
- goto end;
|
|
|
- else if (result == -ERANGE)
|
|
|
- ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
|
|
- "At maximum performance state\n"));
|
|
|
-
|
|
|
- if (pr->flags.throttling) {
|
|
|
- if (tx == (pr->throttling.state_count - 1))
|
|
|
- ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
|
|
- "At maximum throttling state\n"));
|
|
|
- else
|
|
|
- tx++;
|
|
|
- }
|
|
|
- break;
|
|
|
-
|
|
|
- case ACPI_PROCESSOR_LIMIT_DECREMENT:
|
|
|
- /* if going down: T-states first, P-states later */
|
|
|
-
|
|
|
- if (pr->flags.throttling) {
|
|
|
- if (tx == 0) {
|
|
|
- max_tx_px = 1;
|
|
|
- ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
|
|
- "At minimum throttling state\n"));
|
|
|
- } else {
|
|
|
- tx--;
|
|
|
- goto end;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- result = acpi_thermal_cpufreq_decrease(pr->id);
|
|
|
- if (result) {
|
|
|
- /*
|
|
|
- * We only could get -ERANGE, 1 or 0.
|
|
|
- * In the first two cases we reached max freq again.
|
|
|
- */
|
|
|
- ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
|
|
- "At minimum performance state\n"));
|
|
|
- max_tx_px = 1;
|
|
|
- } else
|
|
|
- max_tx_px = 0;
|
|
|
-
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- end:
|
|
|
- if (pr->flags.throttling) {
|
|
|
- pr->limit.thermal.px = 0;
|
|
|
- pr->limit.thermal.tx = tx;
|
|
|
-
|
|
|
- result = acpi_processor_apply_limit(pr);
|
|
|
- if (result)
|
|
|
- printk(KERN_ERR PREFIX "Unable to set thermal limit\n");
|
|
|
-
|
|
|
- ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Thermal limit now (P%d:T%d)\n",
|
|
|
- pr->limit.thermal.px, pr->limit.thermal.tx));
|
|
|
- } else
|
|
|
- result = 0;
|
|
|
- if (max_tx_px)
|
|
|
- return 1;
|
|
|
- else
|
|
|
- return result;
|
|
|
-}
|
|
|
-
|
|
|
int acpi_processor_get_limit_info(struct acpi_processor *pr)
|
|
|
{
|
|
|
|
Len Brown