[PATCH] m68k mac VIA2 fixes and cleanups, new diff
On Tue, 23 May 2006, Christian T. Steigies wrote:
> On Tue, May 23, 2006 at 07:22:18PM +0200, Alex Teclo wrote:
> > 2006/5/23, Finn Thain <fthain@telegraphics.com.au>:
> > >
> > >
> > >On Tue, 23 May 2006, Kars de Jong wrote:
> > >
> > >[snip]
> > >> Finn and me debugged this back in september 2004.
> > >>
> > >
> > >Was it that long ago!
> > >
> > >> You probably need the following patch from Finn Thain:
> > >>
> > >> [PATCH] m68k mac VIA2 fixes and cleanups
> > >>
> > >> http://marc.theaimsgroup.com/?l=linux-m68k&m=113923540116280&w=2
> > >>
> > >> It must have slipped through. Finn, do you want me to commit this
> > >> patch to the Linux/m68k CVS repository?
> > >
> > >Please do. I've posted it to the lists once too often. Last time I
> > >did so, I was expecting it would get into the mainline [1]. Since it
> > >is a regression (against linux-2.2!) maybe there is still some hope
> > >for inclusion in 2.6.17.
>
> Finn, the patch does not apply cleanly because of some irq function
> renaming. I cleaned that up and am building a new mac image. Updated
> patch attached.
Only problem is you dropped one of the edits to the comments. Here's the
version I'd like to see committed (once the repo is up again).
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
diff -pruN a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
--- a/arch/m68k/mac/config.c 2006-05-24 12:51:18.157898278 +1000
+++ b/arch/m68k/mac/config.c 2006-05-24 12:51:38.210094122 +1000
@@ -89,24 +89,11 @@ extern void mac_debugging_long(int, long
static void mac_get_model(char *str);
-void mac_bang(int irq, void *vector, struct pt_regs *p)
-{
- printk(KERN_INFO "Resetting ...\n");
- mac_reset();
-}
-
static void mac_sched_init(irqreturn_t (*vector)(int, void *, struct pt_regs *))
{
via_init_clock(vector);
}
-#if 0
-void mac_waitbut (void)
-{
- ;
-}
-#endif
-
/*
* Parse a Macintosh-specific record in the bootinfo
*/
diff -pruN a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c
--- a/arch/m68k/mac/macints.c 2006-05-24 12:51:18.157898278 +1000
+++ b/arch/m68k/mac/macints.c 2006-05-24 12:51:38.230096313 +1000
@@ -208,7 +208,6 @@ static void scc_irq_disable(unsigned int
* console_loglevel determines NMI handler function
*/
-extern irqreturn_t mac_bang(int, void *, struct pt_regs *);
irqreturn_t mac_nmi_handler(int, void *, struct pt_regs *);
irqreturn_t mac_debug_handler(int, void *, struct pt_regs *);
diff -pruN a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
--- a/arch/m68k/mac/via.c 2006-05-24 12:51:18.157898278 +1000
+++ b/arch/m68k/mac/via.c 2006-05-24 12:51:38.250098503 +1000
@@ -25,7 +25,6 @@
#include <linux/init.h>
#include <linux/ide.h>
-#include <asm/traps.h>
#include <asm/bootinfo.h>
#include <asm/macintosh.h>
#include <asm/macints.h>
@@ -71,7 +70,6 @@ void via_irq_enable(int irq);
void via_irq_disable(int irq);
void via_irq_clear(int irq);
-extern irqreturn_t mac_bang(int, void *, struct pt_regs *);
extern irqreturn_t mac_scc_dispatch(int, void *, struct pt_regs *);
extern int oss_present;
@@ -212,11 +210,6 @@ void __init via_init(void)
break;
}
#else
- /* The alernate IRQ mapping seems to just not work. Anyone with a */
- /* supported machine is welcome to take a stab at fixing it. It */
- /* _should_ work on the following Quadras: 610,650,700,800,900,950 */
- /* - 1999-06-12 (jmt) */
-
via_alt_mapping = 0;
#endif
@@ -270,12 +263,6 @@ void __init via_register_interrupts(void
request_irq(IRQ_AUTO_1, via1_irq,
IRQ_FLG_LOCK|IRQ_FLG_FAST, "via1",
(void *) via1);
-#if 0 /* interferes with serial on some machines */
- if (!psc_present) {
- request_irq(IRQ_AUTO_6, mac_bang, IRQ_FLG_LOCK,
- "Off Switch", mac_bang);
- }
-#endif
}
request_irq(IRQ_AUTO_2, via2_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST,
"via2", (void *) via2);
@@ -471,8 +458,8 @@ irqreturn_t via2_irq(int irq, void *dev_
for (i = 0, irq_bit = 1 ; i < 7 ; i++, irq_bit <<= 1)
if (events & irq_bit) {
via2[gIER] = irq_bit;
- m68k_handle_int(VIA2_SOURCE_BASE + i, regs);
via2[gIFR] = irq_bit | rbv_clear;
+ m68k_handle_int(VIA2_SOURCE_BASE + i, regs);
via2[gIER] = irq_bit | 0x80;
}
return IRQ_HANDLED;
@@ -529,6 +516,7 @@ void via_irq_enable(int irq) {
}
via2[gIER] = irq_bit | 0x80;
} else if (irq_src == 7) {
+ nubus_active |= irq_bit;
if (rbv_present) {
/* enable the slot interrupt. SIER works like IER. */
via2[rSIER] = IER_SET_BIT(irq_idx);
@@ -550,7 +538,6 @@ void via_irq_enable(int irq) {
}
}
}
- nubus_active |= irq_bit;
}
}
Reply to: