Author: jkim
Date: Thu May 21 19:31:10 2015
New Revision: 283261
URL: https://svnweb.freebsd.org/changeset/base/283261
Log:
Do not probe Intel PIIX4 south bridge quirks on amd64. These quirky south
bridges only supported Intel Pentium and Pentium II era processors and there
is no reason for hardware virtualizations to emulate these quirks.
MFC after: 1 week
Modified:
head/sys/dev/acpica/acpi_cpu.c
head/sys/dev/acpica/acpi_throttle.c
Modified: head/sys/dev/acpica/acpi_cpu.c
==============================================================================
--- head/sys/dev/acpica/acpi_cpu.c Thu May 21 19:16:28 2015
(r283260)
+++ head/sys/dev/acpica/acpi_cpu.c Thu May 21 19:31:10 2015
(r283261)
@@ -185,7 +185,8 @@ static void acpi_cpu_startup_cx(struct a
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_usage_counters_sysctl(SYSCTL_HANDLER_ARGS);
static int acpi_cpu_set_cx_lowest(struct acpi_cpu_softc *sc);
@@ -1239,12 +1240,9 @@ acpi_cpu_notify(ACPI_HANDLE h, UINT32 no
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__);
/*
@@ -1278,6 +1276,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)) {
@@ -1326,8 +1334,7 @@ acpi_cpu_quirks(void)
break;
}
}
-
- return (0);
+#endif
}
static int
Modified: head/sys/dev/acpica/acpi_throttle.c
==============================================================================
--- head/sys/dev/acpica/acpi_throttle.c Thu May 21 19:16:28 2015
(r283260)
+++ head/sys/dev/acpica/acpi_throttle.c Thu May 21 19:31:10 2015
(r283261)
@@ -96,7 +96,7 @@ static void acpi_throttle_identify(drive
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_throt
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_throttl
break;
}
}
-
- return (0);
+#endif
}
static int
_______________________________________________
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"
