diff options
| author | jkim <jkim@FreeBSD.org> | 2015-06-01 19:26:24 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-06-01 19:26:24 +0000 |
| commit | 045ad2b6bb72117e61dea0f407ced7d7dc2221e8 (patch) | |
| tree | a5757920b2b8d9d151f479e8ad9f9b96cba4cffe /sys/dev/acpica | |
| parent | 34dd7e04e0d09812f05591fc803ce58d0708ead1 (diff) | |
| download | FreeBSD-src-045ad2b6bb72117e61dea0f407ced7d7dc2221e8.zip FreeBSD-src-045ad2b6bb72117e61dea0f407ced7d7dc2221e8.tar.gz | |
MFC: r283261
Do not probe Intel PIIX4 south bridge quirks on amd64.
Diffstat (limited to 'sys/dev/acpica')
| -rw-r--r-- | sys/dev/acpica/acpi_cpu.c | 21 | ||||
| -rw-r--r-- | sys/dev/acpica/acpi_throttle.c | 8 |
2 files changed, 18 insertions, 11 deletions
diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c index 958ff9f..fc60bc8c 100644 --- a/sys/dev/acpica/acpi_cpu.c +++ b/sys/dev/acpica/acpi_cpu.c @@ -171,7 +171,8 @@ static void acpi_cpu_startup_cx(struct acpi_cpu_softc *sc); static void acpi_cpu_cx_list(struct acpi_cpu_softc *sc); static void acpi_cpu_idle(sbintime_t sbt); static void acpi_cpu_notify(ACPI_HANDLE h, UINT32 notify, void *context); -static int acpi_cpu_quirks(void); +static void acpi_cpu_quirks(void); +static void acpi_cpu_quirks_piix4(void); static int acpi_cpu_usage_sysctl(SYSCTL_HANDLER_ARGS); static int acpi_cpu_set_cx_lowest(struct acpi_cpu_softc *sc); static int acpi_cpu_cx_lowest_sysctl(SYSCTL_HANDLER_ARGS); @@ -1125,12 +1126,9 @@ acpi_cpu_notify(ACPI_HANDLE h, UINT32 notify, void *context) acpi_UserNotify("PROCESSOR", sc->cpu_handle, notify); } -static int +static void acpi_cpu_quirks(void) { - device_t acpi_dev; - uint32_t val; - ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* @@ -1164,6 +1162,16 @@ acpi_cpu_quirks(void) } /* Look for various quirks of the PIIX4 part. */ + acpi_cpu_quirks_piix4(); +} + +static void +acpi_cpu_quirks_piix4(void) +{ +#ifdef __i386__ + device_t acpi_dev; + uint32_t val; + acpi_dev = pci_find_device(PCI_VENDOR_INTEL, PCI_DEVICE_82371AB_3); if (acpi_dev != NULL) { switch (pci_get_revid(acpi_dev)) { @@ -1212,8 +1220,7 @@ acpi_cpu_quirks(void) break; } } - - return (0); +#endif } static int diff --git a/sys/dev/acpica/acpi_throttle.c b/sys/dev/acpica/acpi_throttle.c index ca14215..883b5d3 100644 --- a/sys/dev/acpica/acpi_throttle.c +++ b/sys/dev/acpica/acpi_throttle.c @@ -96,7 +96,7 @@ static void acpi_throttle_identify(driver_t *driver, device_t parent); static int acpi_throttle_probe(device_t dev); static int acpi_throttle_attach(device_t dev); static int acpi_throttle_evaluate(struct acpi_throttle_softc *sc); -static int acpi_throttle_quirks(struct acpi_throttle_softc *sc); +static void acpi_throttle_quirks(struct acpi_throttle_softc *sc); static int acpi_thr_settings(device_t dev, struct cf_setting *sets, int *count); static int acpi_thr_set(device_t dev, const struct cf_setting *set); @@ -314,9 +314,10 @@ acpi_throttle_evaluate(struct acpi_throttle_softc *sc) return (0); } -static int +static void acpi_throttle_quirks(struct acpi_throttle_softc *sc) { +#ifdef __i386__ device_t acpi_dev; /* Look for various quirks of the PIIX4 part. */ @@ -339,8 +340,7 @@ acpi_throttle_quirks(struct acpi_throttle_softc *sc) break; } } - - return (0); +#endif } static int |
