[PATCH] Updated quirk-driven R3000Z patches

[Jung-uk Kim]

On Tuesday 15 February 2005 05:37 pm, Coleman Kane wrote:
> Hi, I tested the patch posted by John on a compaq R3000. Works
> great, except still requires device atpic (for the mixed_mode
> operation I think). Kim posted a patch in this email:
> http://lists.freebsd.org/pipermail/freebsd-amd64/2005-January/00337
>6.html. I dunno if the patch is kosher or not, however. It does
> allow me to run without using atpic.

Ouch, you're absolutely correct.  jhb's patch wasn't complete for 
amd64.  The missing piece is attached.  Can you please re-test?

Thanks,

Jung-uk Kim
-------------- next part --------------
--- src/sys/amd64/amd64/io_apic.c.orig	Mon Aug 16 19:12:29 2004
+++ src/sys/amd64/amd64/io_apic.c	Wed Feb 16 00:21:23 2005
@@ -548,10 +548,11 @@
 
 		/*
 		 * Assume that pin 0 on the first I/O APIC is an ExtINT pin
-		 * and that pins 1-15 are ISA interrupts.  Assume that all
+		 * if mixed mode is enabled and an ISA interrupt if not.
+		 * Assume that pins 1-15 are ISA interrupts and that all
 		 * other pins are PCI interrupts.
 		 */
-		if (intpin->io_vector == 0)
+		if (intpin->io_vector == 0 && mixed_mode_enabled)
 			ioapic_set_extint(io, i);
 		else if (intpin->io_vector < IOAPIC_ISA_INTS) {
 			intpin->io_bus = APIC_BUS_ISA;