replace m68k-via patch with Finn Thain's version
svn path=/dists/sid/linux-2.6/; revision=6726
This commit is contained in:
Christian T. Steigies
parent
b4cdd512ef
commit
ea92d7fa14
|
|
@ -5,7 +5,7 @@ linux-2.6 (2.6.16-15) UNRELEASED; urgency=low
|
|||
- NETFILTER: SNMP NAT: fix memory corruption (CVE-2006-2444)
|
||||
|
||||
[ Christian T. Steigies ]
|
||||
* [m68k] Add mac via patch.
|
||||
* [m68k] Add mac via patch from Finn Thain.
|
||||
* [m68k] Enable INPUT_EVDEV.
|
||||
|
||||
[ Martin Michlmayr ]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,134 @@
|
|||
Log message:
|
||||
Some fixes and cleanups from the linux-mac68k repo. Fix mac_esp by clearing
|
||||
the VIA2 SCSI IRQ flag before the SCSI IRQ handler is invoked.
|
||||
Also fix a race condition caused by unmasking a nubus slot IRQ then
|
||||
setting the relevant nubus_active bit. (From Finn Thain)
|
||||
|
||||
Modified files:
|
||||
linux/arch/m68k/mac:
|
||||
config.c macints.c via.c
|
||||
|
||||
|
||||
Index: linux/arch/m68k/mac/config.c
|
||||
Stats: 13 deletions
|
||||
http://linux-m68k-cvs.ubb.ca/c/cvsweb/linux/arch/m68k/mac/config%2ec.diff?r1=1.21&r2=1.22
|
||||
========================================================================
|
||||
--- linux/arch/m68k/mac/config.c 28 Jan 2006 21:36:16 -0000 1.21
|
||||
+++ linux/arch/m68k/mac/config.c 26 May 2006 09:53:40 -0000 1.22
|
||||
@@ -89,24 +89,11 @@
|
||||
|
||||
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
|
||||
*/
|
||||
Index: linux/arch/m68k/mac/macints.c
|
||||
Stats: 1 deletion
|
||||
http://linux-m68k-cvs.ubb.ca/c/cvsweb/linux/arch/m68k/mac/macints%2ec.diff?r1=1.12&r2=1.13
|
||||
========================================================================
|
||||
--- linux/arch/m68k/mac/macints.c 28 Jan 2006 21:36:16 -0000 1.12
|
||||
+++ linux/arch/m68k/mac/macints.c 26 May 2006 09:53:40 -0000 1.13
|
||||
@@ -208,7 +208,6 @@
|
||||
* 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 *);
|
||||
|
||||
Index: linux/arch/m68k/mac/via.c
|
||||
Stats: 2 insertions, 15 deletions
|
||||
http://linux-m68k-cvs.ubb.ca/c/cvsweb/linux/arch/m68k/mac/via%2ec.diff?r1=1.7&r2=1.8
|
||||
========================================================================
|
||||
--- linux/arch/m68k/mac/via.c 28 Jan 2006 21:36:16 -0000 1.7
|
||||
+++ linux/arch/m68k/mac/via.c 26 May 2006 09:53:40 -0000 1.8
|
||||
@@ -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_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 @@
|
||||
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 @@
|
||||
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 @@
|
||||
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 @@
|
||||
}
|
||||
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 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
- nubus_active |= irq_bit;
|
||||
}
|
||||
}
|
||||
|
||||
-
|
||||
To unsubscribe from this list: send the line "unsubscribe linux-m68k-cvscommit" in
|
||||
the body of a message to majordomo@vger.kernel.org
|
||||
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
||||
|
||||
|
|
@ -1,95 +0,0 @@
|
|||
--- source-m68k-none/arch/m68k/mac/config.c.orig 2006-05-23 22:55:56.000000000 +0200
|
||||
+++ source-m68k-none/arch/m68k/mac/config.c 2006-05-23 22:58:52.000000000 +0200
|
||||
@@ -89,24 +89,11 @@
|
||||
|
||||
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
|
||||
*/
|
||||
|
||||
--- source/arch/m68k/mac/macints.c.orig 2006-03-20 06:53:29.000000000 +0100
|
||||
+++ source/arch/m68k/mac/macints.c 2006-05-23 22:46:25.000000000 +0200
|
||||
@@ -216,7 +216,6 @@
|
||||
* 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 *);
|
||||
|
||||
--- source-m68k-none/arch/m68k/mac/via.c.orig 2006-05-23 23:03:13.000000000 +0200
|
||||
+++ source-m68k-none/arch/m68k/mac/via.c 2006-05-23 23:05:43.000000000 +0200
|
||||
@@ -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_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;
|
||||
|
||||
@@ -270,12 +268,6 @@
|
||||
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 +463,8 @@
|
||||
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 +521,7 @@
|
||||
}
|
||||
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 +543,6 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
- nubus_active |= irq_bit;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
#+ m68k-dma.patch m68k
|
||||
#+ m68k-via2-scsi.patch m68k
|
||||
+ m68k-mac68k.patch m68k
|
||||
+ mips-dec-serial.patch mipsel
|
||||
+ mips-dec-scsi.patch mipsel
|
||||
+ mips-dec-rtc.patch mipsel
|
||||
|
|
|
|||
Loading…
Reference in New Issue