--- src/sys/dev/acpica5/acpi_cpu.c 2007/01/17 17:31:19 1.18 +++ src/sys/dev/acpica5/acpi_cpu.c 2007/03/21 22:49:48 1.18.2.1 @@ -117,7 +117,6 @@ static uint32_t cpu_duty_width; /* Platform hardware resource information. */ static uint32_t cpu_smi_cmd; /* Value to write to SMI_CMD. */ -static uint8_t cpu_pstate_cnt;/* Register to take over throttling. */ static uint8_t cpu_cst_cnt; /* Indicate we are _CST aware. */ static int cpu_rid; /* Driver-wide resource id. */ static int cpu_quirks; /* Indicate any hardware bugs. */ @@ -339,7 +338,7 @@ acpi_pcpu_get_id(uint32_t idx, uint32_t KASSERT(acpi_id != NULL, ("Null acpi_id")); KASSERT(cpu_id != NULL, ("Null cpu_id")); - for (i = 0; i <= ncpus; i++) { + for (i = 0; i < ncpus; i++) { if ((smp_active_mask & (1 << i)) == 0) continue; md = (struct mdglobaldata *)globaldata_find(i); @@ -397,7 +396,6 @@ acpi_cpu_throttle_probe(struct acpi_cpu_ /* Get throttling parameters from the FADT. 0 means not supported. */ if (device_get_unit(sc->cpu_dev) == 0) { cpu_smi_cmd = AcpiGbl_FADT.SmiCommand; - cpu_pstate_cnt = AcpiGbl_FADT.PstateControl; cpu_cst_cnt = AcpiGbl_FADT.CstControl; cpu_duty_offset = AcpiGbl_FADT.DutyOffset; cpu_duty_width = AcpiGbl_FADT.DutyWidth; @@ -784,12 +782,8 @@ acpi_cpu_startup_throttling(void) CTLTYPE_INT | CTLFLAG_RW, &cpu_throttle_economy, 0, acpi_cpu_throttle_sysctl, "I", "economy CPU speed"); - /* If ACPI 2.0+, signal platform that we are taking over throttling. */ - ACPI_LOCK; - if (cpu_pstate_cnt != 0) - AcpiOsWritePort(cpu_smi_cmd, cpu_pstate_cnt, 8); - /* Set initial speed to maximum. */ + ACPI_LOCK; acpi_cpu_throttle_set(cpu_throttle_max); ACPI_UNLOCK;