Author: jkim
Date: Mon Jun 1 19:26:24 2015
New Revision: 283892
URL: https://svnweb.freebsd.org/changeset/base/283892
Log:
MFC: r283261
Do not probe Intel PIIX4 south bridge quirks on amd64.
Modified:
stable/10/sys/dev/acpica/acpi_cpu.c
stable/10/sys/dev/acpica/acpi_throttle.c
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/8/sys/dev/acpica/acpi_cpu.c
stable/8/sys/dev/acpica/acpi_throttle.c
stable/9/sys/dev/acpica/acpi_cpu.c
stable/9/sys/dev/acpica/acpi_throttle.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/acpica/ (props changed)
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/10/sys/dev/acpica/acpi_cpu.c
==============================================================================
--- stable/10/sys/dev/acpica/acpi_cpu.c Mon Jun 1 18:49:31 2015
(r283891)
+++ stable/10/sys/dev/acpica/acpi_cpu.c Mon Jun 1 19:26:24 2015
(r283892)
@@ -171,7 +171,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_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 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__);
/*
@@ -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
Modified: stable/10/sys/dev/acpica/acpi_throttle.c
==============================================================================
--- stable/10/sys/dev/acpica/acpi_throttle.c Mon Jun 1 18:49:31 2015
(r283891)
+++ stable/10/sys/dev/acpica/acpi_throttle.c Mon Jun 1 19:26:24 2015
(r283892)
@@ -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-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
