[johnnym]

IP28 kernel fixed for OpenBSD/sgi 7.3

So bringing back a "clock0" to IP28 indeed solved/worked around the breakage introduced by the two commits mentioned earlier. Together with the fix/workaround for the IP28 problem in OpenBSD/sgi 7.2 things are working again for IP28 in 7.3, see this log from yesterday. My patch is simple:

Code:

diff --git a/sys/arch/sgi/conf/GENERIC-IP28 b/sys/arch/sgi/conf/GENERIC-IP28
index 9918a08414c..afcae927626 100644
--- a/sys/arch/sgi/conf/GENERIC-IP28
+++ b/sys/arch/sgi/conf/GENERIC-IP28
@@ -37,6 +37,7 @@ config        bsd    swap generic
#
mainbus0    at root
cpu*        at mainbus0
+clock0        at mainbus0

int0        at mainbus0    # Interrupt Controller and scheduling clock
imc0        at mainbus0    # Memory Controller
diff --git a/sys/arch/sgi/conf/RAMDISK-IP28 b/sys/arch/sgi/conf/RAMDISK-IP28
index e07ea14fbe7..389b0d3655d 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP28
+++ b/sys/arch/sgi/conf/RAMDISK-IP28
@@ -31,6 +31,7 @@ config        bsd root on rd0a swap on rd0b

mainbus0    at root
cpu*        at mainbus0
+clock0        at mainbus0

int0        at mainbus0        # Interrupt Controller and scheduling clock
imc0        at mainbus0        # Memory Controller
diff --git a/sys/arch/sgi/localbus/int.c b/sys/arch/sgi/localbus/int.c
index c76df00762d..09c06291ce5 100644
--- a/sys/arch/sgi/localbus/int.c
+++ b/sys/arch/sgi/localbus/int.c
@@ -375,8 +375,7 @@ int2_attach(struct device *parent, struct device *self, void *aux)
    /*
     * The 8254 timer does not interrupt on (some?) IP24 systems.
     */
-    if (sys_config.system_type == SGI_IP20 ||
-        sys_config.system_subtype == IP22_INDIGO2)
+    if (sys_config.system_type == SGI_IP20)
        int_8254_cal();
}

...and could be refined a little for the if clause condition: Because "IP22_INDIGO2" actually includes IP22 (R4000, R4400, R4600 Indigo²), IP26 (R8000 Indigo²) and IP28 (R10000 Indigo²), so would also affect IP22 and IP26. But as I only reproduced the IP28 kernel and the patch is not yet included in any branch it doesn't really matter.

---

So with the kernel fixed now for IP28, I consider the OpenBSD/sgi 7.3 release complete. The next release is still half a year away or so, so plenty of time for other things now...