Author: avg
Date: Wed Aug 29 08:47:43 2012
New Revision: 239812
URL: http://svn.freebsd.org/changeset/base/239812
Log:
MFC r238193: acpi_cpu_cx_list: there is no need to re-evaluate
cpu_non_c3 here
Modified:
stable/9/sys/dev/acpica/acpi_cpu.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/acpica/acpi_cpu.c
==============================================================================
--- stable/9/sys/dev/acpica/acpi_cpu.c Wed Aug 29 08:46:04 2012
(r239811)
+++ stable/9/sys/dev/acpica/acpi_cpu.c Wed Aug 29 08:47:43 2012
(r239812)
@@ -671,6 +671,7 @@ acpi_cpu_generic_cx_probe(struct acpi_cp
cx_ptr->trans_lat = AcpiGbl_FADT.C3Latency;
cx_ptr++;
sc->cpu_cx_count++;
+ cpu_can_deep_sleep = 1;
}
}
}
@@ -762,7 +763,8 @@ acpi_cpu_cx_cst(struct acpi_cpu_softc *s
"acpi_cpu%d: C3[%d] not available.\n",
device_get_unit(sc->cpu_dev), i));
continue;
- }
+ } else
+ cpu_can_deep_sleep = 1;
break;
}
@@ -869,16 +871,10 @@ acpi_cpu_cx_list(struct acpi_cpu_softc *
/*
* Set up the list of Cx states
*/
- sc->cpu_non_c3 = 0;
sbuf_new(&sb, sc->cpu_cx_supported, sizeof(sc->cpu_cx_supported),
SBUF_FIXEDLEN);
- for (i = 0; i < sc->cpu_cx_count; i++) {
+ for (i = 0; i < sc->cpu_cx_count; i++)
sbuf_printf(&sb, "C%d/%d ", i + 1, sc->cpu_cx_states[i].trans_lat);
- if (sc->cpu_cx_states[i].type < ACPI_STATE_C3)
- sc->cpu_non_c3 = i;
- else
- cpu_can_deep_sleep = 1;
- }
sbuf_trim(&sb);
sbuf_finish(&sb);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
