Page MenuHomeFreeBSD
Files F163266418

D56751.diff
No OneTemporary
Actions

D56751.diff
View Options

diff --git a/sys/powerpc/include/openpicvar.h b/sys/powerpc/include/openpicvar.h
--- a/sys/powerpc/include/openpicvar.h
+++ b/sys/powerpc/include/openpicvar.h
@@ -36,6 +36,7 @@
#define OPENPIC_QUIRK_SINGLE_BIND 1 /* Bind interrupts to only 1 CPU */
#define OPENPIC_QUIRK_HIDDEN_IRQS 2 /* May have IRQs beyond FRR[NIRQ] */
+#define OPENPIC_QUIRK_WHOAMI_WORKS 4 /* WHOAMI register is present */
/* Names match the macros in openpicreg.h. */
struct openpic_timer {
diff --git a/sys/powerpc/ofw/openpic_ofw.c b/sys/powerpc/ofw/openpic_ofw.c
--- a/sys/powerpc/ofw/openpic_ofw.c
+++ b/sys/powerpc/ofw/openpic_ofw.c
@@ -125,6 +125,7 @@
if (ofw_bus_is_compatible(dev, "fsl,mpic")) {
sc->sc_quirks = OPENPIC_QUIRK_SINGLE_BIND;
sc->sc_quirks |= OPENPIC_QUIRK_HIDDEN_IRQS;
+ sc->sc_quirks |= OPENPIC_QUIRK_WHOAMI_WORKS;
}
return (openpic_common_attach(dev, xref));
diff --git a/sys/powerpc/powerpc/openpic.c b/sys/powerpc/powerpc/openpic.c
--- a/sys/powerpc/powerpc/openpic.c
+++ b/sys/powerpc/powerpc/openpic.c
@@ -469,8 +469,23 @@
if (dev != root_pic)
return;
+ /*
+ * Not everything implements the full OpenPIC specification.
+ *
+ * Notably the CPC945 Bridge and Memory Controller User Manual, which
+ * is in the PPC 970 (ie Apple G5) CPUs, calls out a set of
+ * deviations from the specification. Thus we can't just assume
+ * WHOAMI is available everywhere.
+ *
+ * See 9.5.3.3 - Deviations from the OpenPIC specification.
+ * Notably - the WhoAmI register is actually 0xF8000050 for all CPUs.
+ */
+
sc = device_get_softc(dev);
- PCPU_SET(pic, bus_read_4(sc->sc_memr, OPENPIC_WHOAMI));
+ if (sc->sc_quirks & OPENPIC_QUIRK_WHOAMI_WORKS)
+ PCPU_SET(pic, bus_read_4(sc->sc_memr, OPENPIC_WHOAMI));
+ else
+ PCPU_SET(pic, PCPU_GET(cpuid));
}
static device_method_t openpic_methods[] = {

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 22, 2:23 PM (7 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35367029
Default Alt Text
D56751.diff (1 KB)

Event Timeline