1 files changed, 166 insertions, 118 deletions

diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
index e27735be2924..d5cac72eb3db 100644
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
@@ -13,6 +13,10 @@
  * for info.  A full-text web search on 6522 AND VIA will probably also
  * net some usefulness. <cananian@alumni.princeton.edu> 20apr1999
  *
+ * Additional data is here (the SY6522 was used in the Mac II etc):
+ *     http://www.6502.org/documents/datasheets/synertek/synertek_sy6522.pdf
+ *     http://www.6502.org/documents/datasheets/synertek/synertek_sy6522_programming_reference.pdf
+ *
  * PRAM/RTC access algorithms are from the NetBSD RTC toolkit version 1.08b
  * by Erik Vogan and adapted to Linux by Joshua M. Thompson (funaho@jurai.org)
  *
@@ -37,7 +41,7 @@ volatile __u8 *via1, *via2;
 /* See note in mac_via.h about how this is possibly not useful */
 volatile long *via_memory_bogon=(long *)&via_memory_bogon;
 #endif
-int  rbv_present,via_alt_mapping;
+int rbv_present, via_alt_mapping;
 __u8 rbv_clear;
 
 /*
@@ -60,7 +64,19 @@ static int gIER,gIFR,gBufA,gBufB;
 #define MAC_CLOCK_LOW           (MAC_CLOCK_TICK&0xFF)
 #define MAC_CLOCK_HIGH          (MAC_CLOCK_TICK>>8)
 
-static int  nubus_active;
+/* To disable a NuBus slot on Quadras we make the slot IRQ lines outputs, set
+ * high. On RBV we just use the slot interrupt enable register. On Macs with
+ * genuine VIA chips we must use nubus_disabled to keep track of disabled slot
+ * interrupts. When any slot IRQ is disabled we mask the (edge triggered) CA1
+ * or "SLOTS" interrupt. When no slot is disabled, we unmask the CA1 interrupt.
+ * So, on genuine VIAs, having more than one NuBus IRQ can mean trouble,
+ * because closing one of those drivers can mask all of the NuBus interrupts.
+ * Also, since we can't mask the unregistered slot IRQs on genuine VIAs, it's
+ * possible to get interrupts from cards that MacOS or the ROM has configured
+ * but we have not. FWIW, "Designing Cards and Drivers for Macintosh II and
+ * Macintosh SE", page 9-8, says, a slot IRQ with no driver would crash MacOS.
+ */
+static u8 nubus_disabled;
 
 void via_debug_dump(void);
 irqreturn_t via1_irq(int, void *);
@@ -138,11 +154,11 @@ void __init via_init(void)
 
         printk(KERN_INFO "VIA2 at %p is ", via2);
         if (rbv_present) {
-                printk(KERN_INFO "an RBV\n");
+                printk("an RBV\n");
         } else if (oss_present) {
-                printk(KERN_INFO "an OSS\n");
+                printk("an OSS\n");
         } else {
-                printk(KERN_INFO "a 6522 or clone\n");
+                printk("a 6522 or clone\n");
         }
 
 #ifdef DEBUG_VIA
@@ -163,6 +179,7 @@ void __init via_init(void)
         via1[vT2CL] = 0;
         via1[vT2CH] = 0;
         via1[vACR] &= 0x3F;
+        via1[vACR] &= ~0x03; /* disable port A & B latches */
 
         /*
          * SE/30: disable video IRQ
@@ -193,8 +210,14 @@ void __init via_init(void)
         /* that the IIfx emulates this alternate mapping using the OSS. */
 
         switch(macintosh_config->ident) {
+                case MAC_MODEL_P475:
+                case MAC_MODEL_P475F:
+                case MAC_MODEL_P575:
+                case MAC_MODEL_Q605:
+                case MAC_MODEL_Q605_ACC:
                 case MAC_MODEL_C610:
                 case MAC_MODEL_Q610:
+                case MAC_MODEL_Q630:
                 case MAC_MODEL_C650:
                 case MAC_MODEL_Q650:
                 case MAC_MODEL_Q700:
@@ -228,6 +251,22 @@ void __init via_init(void)
                 via2[vT2CL] = 0;
                 via2[vT2CH] = 0;
                 via2[vACR] &= 0x3F;
+                via2[vACR] &= ~0x03; /* disable port A & B latches */
+        }
+
+        /*
+         * Set vPCR for SCSI interrupts (but not on RBV)
+         */
+        if (!rbv_present) {
+                if (macintosh_config->scsi_type == MAC_SCSI_OLD) {
+                        /* CB2 (IRQ) indep. input, positive edge */
+                        /* CA2 (DRQ) indep. input, positive edge */
+                        via2[vPCR] = 0x66;
+                } else {
+                        /* CB2 (IRQ) indep. input, negative edge */
+                        /* CA2 (DRQ) indep. input, negative edge */
+                        via2[vPCR] = 0x22;
+                }
         }
 }
 
@@ -356,78 +395,75 @@ int via_get_cache_disable(void)
 
 void __init via_nubus_init(void)
 {
-        /* don't set nubus_active = 0 here, it kills the Baboon */
-        /* interrupt that we've already registered.             */
-
         /* unlock nubus transactions */
 
-        if (!rbv_present) {
+        if ((macintosh_config->adb_type != MAC_ADB_PB1) &&
+            (macintosh_config->adb_type != MAC_ADB_PB2)) {
                 /* set the line to be an output on non-RBV machines */
-                if ((macintosh_config->adb_type != MAC_ADB_PB1) &&
-                   (macintosh_config->adb_type != MAC_ADB_PB2)) {
+                if (!rbv_present)
                         via2[vDirB] |= 0x02;
-                }
-        }
 
-        /* this seems to be an ADB bit on PMU machines */
-        /* according to MkLinux.  -- jmt               */
-
-        if ((macintosh_config->adb_type != MAC_ADB_PB1) &&
-            (macintosh_config->adb_type != MAC_ADB_PB2)) {
+                /* this seems to be an ADB bit on PMU machines */
+                /* according to MkLinux.  -- jmt               */
                 via2[gBufB] |= 0x02;
         }
 
-        /* disable nubus slot interrupts. */
-        if (rbv_present) {
+        /* Disable all the slot interrupts (where possible). */
+
+        switch (macintosh_config->via_type) {
+        case MAC_VIA_II:
+                /* Just make the port A lines inputs. */
+                switch(macintosh_config->ident) {
+                case MAC_MODEL_II:
+                case MAC_MODEL_IIX:
+                case MAC_MODEL_IICX:
+                case MAC_MODEL_SE30:
+                        /* The top two bits are RAM size outputs. */
+                        via2[vDirA] &= 0xC0;
+                        break;
+                default:
+                        via2[vDirA] &= 0x80;
+                }
+                break;
+        case MAC_VIA_IIci:
+                /* RBV. Disable all the slot interrupts. SIER works like IER. */
                 via2[rSIER] = 0x7F;
-                via2[rSIER] = nubus_active | 0x80;
-        } else {
-                /* These are ADB bits on PMU */
+                break;
+        case MAC_VIA_QUADRA:
+                /* Disable the inactive slot interrupts by making those lines outputs. */
                 if ((macintosh_config->adb_type != MAC_ADB_PB1) &&
-                   (macintosh_config->adb_type != MAC_ADB_PB2)) {
-                        switch(macintosh_config->ident)
-                        {
-                                case MAC_MODEL_II:
-                                case MAC_MODEL_IIX:
-                                case MAC_MODEL_IICX:
-                                case MAC_MODEL_SE30:
-                                        via2[vBufA] |= 0x3F;
-                                        via2[vDirA] = ~nubus_active | 0xc0;
-                                        break;
-                                default:
-                                        via2[vBufA] = 0xFF;
-                                        via2[vDirA] = ~nubus_active;
-                        }
+                    (macintosh_config->adb_type != MAC_ADB_PB2)) {
+                        via2[vBufA] |= 0x7F;
+                        via2[vDirA] |= 0x7F;
                 }
+                break;
         }
 }
 
 /*
  * The generic VIA interrupt routines (shamelessly stolen from Alan Cox's
  * via6522.c :-), disable/pending masks added.
- *
- * The new interrupt architecture in macints.c takes care of a lot of the
- * gruntwork for us, including tallying the interrupts and calling the
- * handlers on the linked list. All we need to do here is basically generate
- * the machspec interrupt number after clearing the interrupt.
  */
 
 irqreturn_t via1_irq(int irq, void *dev_id)
 {
-        int irq_bit, i;
-        unsigned char events, mask;
+        int irq_num;
+        unsigned char irq_bit, events;
 
-        mask = via1[vIER] & 0x7F;
-        if (!(events = via1[vIFR] & mask))
+        events = via1[vIFR] & via1[vIER] & 0x7F;
+        if (!events)
                 return IRQ_NONE;
 
-        for (i = 0, irq_bit = 1 ; i < 7 ; i++, irq_bit <<= 1)
+        irq_num = VIA1_SOURCE_BASE;
+        irq_bit = 1;
+        do {
                 if (events & irq_bit) {
-                        via1[vIER] = irq_bit;
-                        m68k_handle_int(VIA1_SOURCE_BASE + i);
                         via1[vIFR] = irq_bit;
-                        via1[vIER] = irq_bit | 0x80;
+                        m68k_handle_int(irq_num);
                 }
+                ++irq_num;
+                irq_bit <<= 1;
+        } while (events >= irq_bit);
 
 #if 0 /* freakin' pmu is doing weird stuff */
         if (!oss_present) {
@@ -448,20 +484,23 @@ irqreturn_t via1_irq(int irq, void *dev_id)
 
 irqreturn_t via2_irq(int irq, void *dev_id)
 {
-        int irq_bit, i;
-        unsigned char events, mask;
+        int irq_num;
+        unsigned char irq_bit, events;
 
-        mask = via2[gIER] & 0x7F;
-        if (!(events = via2[gIFR] & mask))
+        events = via2[gIFR] & via2[gIER] & 0x7F;
+        if (!events)
                 return IRQ_NONE;
 
-        for (i = 0, irq_bit = 1 ; i < 7 ; i++, irq_bit <<= 1)
+        irq_num = VIA2_SOURCE_BASE;
+        irq_bit = 1;
+        do {
                 if (events & irq_bit) {
-                        via2[gIER] = irq_bit;
                         via2[gIFR] = irq_bit | rbv_clear;
-                        m68k_handle_int(VIA2_SOURCE_BASE + i);
-                        via2[gIER] = irq_bit | 0x80;
+                        m68k_handle_int(irq_num);
                 }
+                ++irq_num;
+                irq_bit <<= 1;
+        } while (events >= irq_bit);
         return IRQ_HANDLED;
 }
 
@@ -472,71 +511,75 @@ irqreturn_t via2_irq(int irq, void *dev_id)
 
 irqreturn_t via_nubus_irq(int irq, void *dev_id)
 {
-        int irq_bit, i;
-        unsigned char events;
-
-        if (!(events = ~via2[gBufA] & nubus_active))
+        int slot_irq;
+        unsigned char slot_bit, events;
+
+        events = ~via2[gBufA] & 0x7F;
+        if (rbv_present)
+                events &= via2[rSIER];
+        else
+                events &= ~via2[vDirA];
+        if (!events)
                 return IRQ_NONE;
 
-        for (i = 0, irq_bit = 1 ; i < 7 ; i++, irq_bit <<= 1) {
-                if (events & irq_bit) {
-                        via_irq_disable(NUBUS_SOURCE_BASE + i);
-                        m68k_handle_int(NUBUS_SOURCE_BASE + i);
-                        via_irq_enable(NUBUS_SOURCE_BASE + i);
-                }
-        }
+        do {
+                slot_irq = IRQ_NUBUS_F;
+                slot_bit = 0x40;
+                do {
+                        if (events & slot_bit) {
+                                events &= ~slot_bit;
+                                m68k_handle_int(slot_irq);
+                        }
+                        --slot_irq;
+                        slot_bit >>= 1;
+                } while (events);
+
+                /* clear the CA1 interrupt and make certain there's no more. */
+                via2[gIFR] = 0x02 | rbv_clear;
+                events = ~via2[gBufA] & 0x7F;
+                if (rbv_present)
+                        events &= via2[rSIER];
+                else
+                        events &= ~via2[vDirA];
+        } while (events);
         return IRQ_HANDLED;
 }
 
 void via_irq_enable(int irq) {
         int irq_src     = IRQ_SRC(irq);
         int irq_idx     = IRQ_IDX(irq);
-        int irq_bit     = 1 << irq_idx;
 
 #ifdef DEBUG_IRQUSE
         printk(KERN_DEBUG "via_irq_enable(%d)\n", irq);
 #endif
 
         if (irq_src == 1) {
-                via1[vIER] = irq_bit | 0x80;
+                via1[vIER] = IER_SET_BIT(irq_idx);
         } else if (irq_src == 2) {
-                /*
-                 * Set vPCR for SCSI interrupts (but not on RBV)
-                 */
-                if ((irq_idx == 0) && !rbv_present) {
-                        if (macintosh_config->scsi_type == MAC_SCSI_OLD) {
-                                /* CB2 (IRQ) indep. input, positive edge */
-                                /* CA2 (DRQ) indep. input, positive edge */
-                                via2[vPCR] = 0x66;
-                        } else {
-                                /* CB2 (IRQ) indep. input, negative edge */
-                                /* CA2 (DRQ) indep. input, negative edge */
-                                via2[vPCR] = 0x22;
-                        }
-                }
-                via2[gIER] = irq_bit | 0x80;
+                if (irq != IRQ_MAC_NUBUS || nubus_disabled == 0)
+                        via2[gIER] = IER_SET_BIT(irq_idx);
         } else if (irq_src == 7) {
-                nubus_active |= irq_bit;
-                if (rbv_present) {
-                        /* enable the slot interrupt. SIER works like IER. */
+                switch (macintosh_config->via_type) {
+                case MAC_VIA_II:
+                        nubus_disabled &= ~(1 << irq_idx);
+                        /* Enable the CA1 interrupt when no slot is disabled. */
+                        if (!nubus_disabled)
+                                via2[gIER] = IER_SET_BIT(1);
+                        break;
+                case MAC_VIA_IIci:
+                        /* On RBV, enable the slot interrupt.
+                         * SIER works like IER.
+                         */
                         via2[rSIER] = IER_SET_BIT(irq_idx);
-                } else {
-                        /* Make sure the bit is an input, to enable the irq */
-                        /* But not on PowerBooks, that's ADB... */
+                        break;
+                case MAC_VIA_QUADRA:
+                        /* Make the port A line an input to enable the slot irq.
+                         * But not on PowerBooks, that's ADB.
+                         */
                         if ((macintosh_config->adb_type != MAC_ADB_PB1) &&
-                           (macintosh_config->adb_type != MAC_ADB_PB2)) {
-                                switch(macintosh_config->ident)
-                                {
-                                        case MAC_MODEL_II:
-                                        case MAC_MODEL_IIX:
-                                        case MAC_MODEL_IICX:
-                                        case MAC_MODEL_SE30:
-                                                via2[vDirA] &= (~irq_bit | 0xc0);
-                                                break;
-                                        default:
-                                                via2[vDirA] &= ~irq_bit;
-                                }
-                        }
+                            (macintosh_config->adb_type != MAC_ADB_PB2))
+                                via2[vDirA] &= ~(1 << irq_idx);
+                        break;
                 }
         }
 }
@@ -544,29 +587,31 @@ void via_irq_enable(int irq) {
 void via_irq_disable(int irq) {
         int irq_src     = IRQ_SRC(irq);
         int irq_idx     = IRQ_IDX(irq);
-        int irq_bit     = 1 << irq_idx;
 
 #ifdef DEBUG_IRQUSE
         printk(KERN_DEBUG "via_irq_disable(%d)\n", irq);
 #endif
 
         if (irq_src == 1) {
-                via1[vIER] = irq_bit;
+                via1[vIER] = IER_CLR_BIT(irq_idx);
         } else if (irq_src == 2) {
-                via2[gIER] = irq_bit;
+                via2[gIER] = IER_CLR_BIT(irq_idx);
         } else if (irq_src == 7) {
-                if (rbv_present) {
-                        /* disable the slot interrupt.  SIER works like IER. */
+                switch (macintosh_config->via_type) {
+                case MAC_VIA_II:
+                        nubus_disabled |= 1 << irq_idx;
+                        if (nubus_disabled)
+                                via2[gIER] = IER_CLR_BIT(1);
+                        break;
+                case MAC_VIA_IIci:
                         via2[rSIER] = IER_CLR_BIT(irq_idx);
-                } else {
-                        /* disable the nubus irq by changing dir to output */
-                        /* except on PMU */
+                        break;
+                case MAC_VIA_QUADRA:
                         if ((macintosh_config->adb_type != MAC_ADB_PB1) &&
-                           (macintosh_config->adb_type != MAC_ADB_PB2)) {
-                                via2[vDirA] |= irq_bit;
-                        }
+                            (macintosh_config->adb_type != MAC_ADB_PB2))
+                                via2[vDirA] |= 1 << irq_idx;
+                        break;
                 }
-                nubus_active &= ~irq_bit;
         }
 }
 
@@ -580,7 +625,9 @@ void via_irq_clear(int irq) {
         } else if (irq_src == 2) {
                 via2[gIFR] = irq_bit | rbv_clear;
         } else if (irq_src == 7) {
-                /* FIXME: hmm.. */
+                /* FIXME: There is no way to clear an individual nubus slot
+                 * IRQ flag, other than getting the device to do it.
+                 */
         }
 }
 
@@ -600,6 +647,7 @@ int via_irq_pending(int irq)
         } else if (irq_src == 2) {
                 return via2[gIFR] & irq_bit;
         } else if (irq_src == 7) {
+                /* Always 0 for MAC_VIA_QUADRA if the slot irq is disabled. */
                 return ~via2[gBufA] & irq_bit;
         }
         return 0;