mac68k: replace mac68k SCC code with platform device
Remove the old 68k Mac serial port code and a lot of related cruft. Add new SCC platform devices to mac 68k platform. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Finn Thain
Geert Uytterhoeven
parent
ec9cbe0989
commit
80614e5ab1
@ -536,10 +536,6 @@ config GVPIOEXT_PLIP
|
||||
Say Y to enable doing IP over the parallel port on your GVP
|
||||
IO-Extender card, N otherwise.
|
||||
|
||||
config MAC_SCC
|
||||
tristate "Macintosh serial support"
|
||||
depends on MAC
|
||||
|
||||
config MAC_HID
|
||||
bool
|
||||
depends on INPUT_ADBHID
|
||||
@ -595,7 +591,7 @@ config DN_SERIAL
|
||||
|
||||
config SERIAL_CONSOLE
|
||||
bool "Support for serial port console"
|
||||
depends on (AMIGA || ATARI || MAC || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || MAC_SCC=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)
|
||||
depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)
|
||||
---help---
|
||||
If you say Y here, it will be possible to use a serial port as the
|
||||
system console (the system console is the device which receives all
|
||||
|
||||
@ -839,9 +839,7 @@ CONFIG_HIDRAW=y
|
||||
#
|
||||
# Character devices
|
||||
#
|
||||
CONFIG_MAC_SCC=y
|
||||
CONFIG_MAC_HID=y
|
||||
CONFIG_SERIAL_CONSOLE=y
|
||||
|
||||
#
|
||||
# File systems
|
||||
|
||||
@ -987,7 +987,6 @@ CONFIG_ATARI_MIDI=y
|
||||
CONFIG_ATARI_DSP56K=m
|
||||
CONFIG_AMIGA_BUILTIN_SERIAL=y
|
||||
CONFIG_MULTIFACE_III_TTY=m
|
||||
CONFIG_MAC_SCC=y
|
||||
CONFIG_MAC_HID=y
|
||||
CONFIG_MVME147_SCC=y
|
||||
CONFIG_SERIAL167=y
|
||||
|
||||
@ -21,29 +21,4 @@
|
||||
#define VIDEOMEMSIZE (4096*1024)
|
||||
#define VIDEOMEMMASK (-4096*1024)
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
#if 0
|
||||
/*
|
||||
** SCC Z8530
|
||||
*/
|
||||
|
||||
#define MAC_SCC_BAS (0x50F04000)
|
||||
struct MAC_SCC
|
||||
{
|
||||
u_char cha_a_ctrl;
|
||||
u_char char_dummy1;
|
||||
u_char cha_a_data;
|
||||
u_char char_dummy2;
|
||||
u_char cha_b_ctrl;
|
||||
u_char char_dummy3;
|
||||
u_char cha_b_data;
|
||||
};
|
||||
# define mac_scc ((*(volatile struct SCC*)MAC_SCC_BAS))
|
||||
#endif
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
#endif /* linux/machw.h */
|
||||
|
||||
@ -37,7 +37,6 @@
|
||||
|
||||
#define VIA1_SOURCE_BASE 8
|
||||
#define VIA2_SOURCE_BASE 16
|
||||
#define MAC_SCC_SOURCE_BASE 24
|
||||
#define PSC3_SOURCE_BASE 24
|
||||
#define PSC4_SOURCE_BASE 32
|
||||
#define PSC5_SOURCE_BASE 40
|
||||
@ -96,26 +95,12 @@
|
||||
#define IRQ_PSC3_2 (26)
|
||||
#define IRQ_PSC3_3 (27)
|
||||
|
||||
/* Level 4 (SCC) interrupts */
|
||||
#define IRQ_SCC (32)
|
||||
#define IRQ_SCCA (33)
|
||||
#define IRQ_SCCB (34)
|
||||
#if 0 /* FIXME: are there multiple interrupt conditions on the SCC ?? */
|
||||
/* SCC interrupts */
|
||||
#define IRQ_SCCB_TX (32)
|
||||
#define IRQ_SCCB_STAT (33)
|
||||
#define IRQ_SCCB_RX (34)
|
||||
#define IRQ_SCCB_SPCOND (35)
|
||||
#define IRQ_SCCA_TX (36)
|
||||
#define IRQ_SCCA_STAT (37)
|
||||
#define IRQ_SCCA_RX (38)
|
||||
#define IRQ_SCCA_SPCOND (39)
|
||||
#endif
|
||||
|
||||
/* Level 4 (PSC, AV Macs only) interrupts */
|
||||
#define IRQ_PSC4_0 (32)
|
||||
#define IRQ_PSC4_1 (33)
|
||||
#define IRQ_MAC_SCC_A IRQ_PSC4_1
|
||||
#define IRQ_PSC4_2 (34)
|
||||
#define IRQ_MAC_SCC_B IRQ_PSC4_2
|
||||
#define IRQ_PSC4_3 (35)
|
||||
#define IRQ_MAC_MACE_DMA IRQ_PSC4_3
|
||||
|
||||
@ -146,6 +131,9 @@
|
||||
#define IRQ_BABOON_2 (66)
|
||||
#define IRQ_BABOON_3 (67)
|
||||
|
||||
/* On non-PSC machines, the serial ports share an IRQ */
|
||||
#define IRQ_MAC_SCC IRQ_AUTO_4
|
||||
|
||||
#define SLOT2IRQ(x) (x + 47)
|
||||
#define IRQ2SLOT(x) (x - 47)
|
||||
|
||||
|
||||
@ -3,4 +3,4 @@
|
||||
#
|
||||
|
||||
obj-y := config.o macints.o iop.o via.o oss.o psc.o \
|
||||
baboon.o macboing.o debug.o misc.o
|
||||
baboon.o macboing.o misc.o
|
||||
|
||||
@ -792,6 +792,32 @@ static struct mac_model mac_data_table[] = {
|
||||
}
|
||||
};
|
||||
|
||||
static struct resource scc_a_rsrcs[] = {
|
||||
{ .flags = IORESOURCE_MEM },
|
||||
{ .flags = IORESOURCE_IRQ },
|
||||
};
|
||||
|
||||
static struct resource scc_b_rsrcs[] = {
|
||||
{ .flags = IORESOURCE_MEM },
|
||||
{ .flags = IORESOURCE_IRQ },
|
||||
};
|
||||
|
||||
struct platform_device scc_a_pdev = {
|
||||
.name = "scc",
|
||||
.id = 0,
|
||||
.num_resources = ARRAY_SIZE(scc_a_rsrcs),
|
||||
.resource = scc_a_rsrcs,
|
||||
};
|
||||
EXPORT_SYMBOL(scc_a_pdev);
|
||||
|
||||
struct platform_device scc_b_pdev = {
|
||||
.name = "scc",
|
||||
.id = 1,
|
||||
.num_resources = ARRAY_SIZE(scc_b_rsrcs),
|
||||
.resource = scc_b_rsrcs,
|
||||
};
|
||||
EXPORT_SYMBOL(scc_b_pdev);
|
||||
|
||||
static void __init mac_identify(void)
|
||||
{
|
||||
struct mac_model *m;
|
||||
@ -814,6 +840,24 @@ static void __init mac_identify(void)
|
||||
}
|
||||
}
|
||||
|
||||
/* Set up serial port resources for the console initcall. */
|
||||
|
||||
scc_a_rsrcs[0].start = (resource_size_t) mac_bi_data.sccbase + 2;
|
||||
scc_a_rsrcs[0].end = scc_a_rsrcs[0].start;
|
||||
scc_b_rsrcs[0].start = (resource_size_t) mac_bi_data.sccbase;
|
||||
scc_b_rsrcs[0].end = scc_b_rsrcs[0].start;
|
||||
|
||||
switch (macintosh_config->scc_type) {
|
||||
case MAC_SCC_PSC:
|
||||
scc_a_rsrcs[1].start = scc_a_rsrcs[1].end = IRQ_MAC_SCC_A;
|
||||
scc_b_rsrcs[1].start = scc_b_rsrcs[1].end = IRQ_MAC_SCC_B;
|
||||
break;
|
||||
default:
|
||||
scc_a_rsrcs[1].start = scc_a_rsrcs[1].end = IRQ_MAC_SCC;
|
||||
scc_b_rsrcs[1].start = scc_b_rsrcs[1].end = IRQ_MAC_SCC;
|
||||
break;
|
||||
}
|
||||
|
||||
/*
|
||||
* We need to pre-init the IOPs, if any. Otherwise
|
||||
* the serial console won't work if the user had
|
||||
@ -871,6 +915,13 @@ int __init mac_platform_init(void)
|
||||
{
|
||||
u8 *swim_base;
|
||||
|
||||
/*
|
||||
* Serial devices
|
||||
*/
|
||||
|
||||
platform_device_register(&scc_a_pdev);
|
||||
platform_device_register(&scc_b_pdev);
|
||||
|
||||
/*
|
||||
* Floppy device
|
||||
*/
|
||||
|
||||
@ -1,365 +0,0 @@
|
||||
/*
|
||||
* linux/arch/m68k/mac/debug.c
|
||||
*
|
||||
* Shamelessly stolen (SCC code and general framework) from:
|
||||
*
|
||||
* linux/arch/m68k/atari/debug.c
|
||||
*
|
||||
* Atari debugging and serial console stuff
|
||||
*
|
||||
* Assembled of parts of former atari/config.c 97-12-18 by Roman Hodek
|
||||
*
|
||||
* This file is subject to the terms and conditions of the GNU General Public
|
||||
* License. See the file COPYING in the main directory of this archive
|
||||
* for more details.
|
||||
*/
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/tty.h>
|
||||
#include <linux/console.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/delay.h>
|
||||
|
||||
#define BOOTINFO_COMPAT_1_0
|
||||
#include <asm/setup.h>
|
||||
#include <asm/bootinfo.h>
|
||||
#include <asm/macints.h>
|
||||
|
||||
extern unsigned long mac_videobase;
|
||||
extern unsigned long mac_rowbytes;
|
||||
|
||||
extern void mac_serial_print(const char *);
|
||||
|
||||
#define DEBUG_HEADS
|
||||
#undef DEBUG_SCREEN
|
||||
#define DEBUG_SERIAL
|
||||
|
||||
/*
|
||||
* These two auxiliary debug functions should go away ASAP. Only usage:
|
||||
* before the console output is up (after head.S come some other crucial
|
||||
* setup routines :-) it permits writing 'data' to the screen as bit patterns
|
||||
* (good luck reading those). Helped to figure that the bootinfo contained
|
||||
* garbage data on the amount and size of memory chunks ...
|
||||
*
|
||||
* The 'pos' argument now simply means 'linefeed after print' ...
|
||||
*/
|
||||
|
||||
#ifdef DEBUG_SCREEN
|
||||
static int peng, line;
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
|
||||
void mac_debugging_short(int pos, short num)
|
||||
{
|
||||
#ifdef DEBUG_SCREEN
|
||||
unsigned char *pengoffset;
|
||||
unsigned char *pptr;
|
||||
int i;
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG_SERIAL
|
||||
printk("debug: %d !\n", num);
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG_SCREEN
|
||||
if (!MACH_IS_MAC) {
|
||||
/* printk("debug: %d !\n", num); */
|
||||
return;
|
||||
}
|
||||
|
||||
/* calculate current offset */
|
||||
pengoffset = (unsigned char *)mac_videobase +
|
||||
(150+line*2) * mac_rowbytes + 80 * peng;
|
||||
|
||||
pptr = pengoffset;
|
||||
|
||||
for (i = 0; i < 8 * sizeof(short); i++) { /* # of bits */
|
||||
/* value mask for bit i, reverse order */
|
||||
*pptr++ = (num & (1 << (8*sizeof(short)-i-1)) ? 0xFF : 0x00);
|
||||
}
|
||||
|
||||
peng++;
|
||||
|
||||
if (pos) {
|
||||
line++;
|
||||
peng = 0;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void mac_debugging_long(int pos, long addr)
|
||||
{
|
||||
#ifdef DEBUG_SCREEN
|
||||
unsigned char *pengoffset;
|
||||
unsigned char *pptr;
|
||||
int i;
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG_SERIAL
|
||||
printk("debug: #%ld !\n", addr);
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG_SCREEN
|
||||
if (!MACH_IS_MAC) {
|
||||
/* printk("debug: #%ld !\n", addr); */
|
||||
return;
|
||||
}
|
||||
|
||||
pengoffset=(unsigned char *)(mac_videobase+(150+line*2)*mac_rowbytes)
|
||||
+80*peng;
|
||||
|
||||
pptr = pengoffset;
|
||||
|
||||
for (i = 0; i < 8 * sizeof(long); i++) { /* # of bits */
|
||||
*pptr++ = (addr & (1 << (8*sizeof(long)-i-1)) ? 0xFF : 0x00);
|
||||
}
|
||||
|
||||
peng++;
|
||||
|
||||
if (pos) {
|
||||
line++;
|
||||
peng = 0;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif /* 0 */
|
||||
|
||||
#ifdef DEBUG_SERIAL
|
||||
/*
|
||||
* TODO: serial debug code
|
||||
*/
|
||||
|
||||
struct mac_SCC {
|
||||
u_char cha_b_ctrl;
|
||||
u_char char_dummy1;
|
||||
u_char cha_a_ctrl;
|
||||
u_char char_dummy2;
|
||||
u_char cha_b_data;
|
||||
u_char char_dummy3;
|
||||
u_char cha_a_data;
|
||||
};
|
||||
|
||||
# define scc (*((volatile struct mac_SCC*)mac_bi_data.sccbase))
|
||||
|
||||
static int scc_port = -1;
|
||||
|
||||
static struct console mac_console_driver = {
|
||||
.name = "debug",
|
||||
.flags = CON_PRINTBUFFER,
|
||||
.index = -1,
|
||||
};
|
||||
|
||||
/*
|
||||
* Crude hack to get console output to the screen before the framebuffer
|
||||
* is initialized (happens a lot later in 2.1!).
|
||||
* We just use the console routines declared in head.S, this will interfere
|
||||
* with regular framebuffer console output and should be used exclusively
|
||||
* to debug kernel problems manifesting before framebuffer init (aka WSOD)
|
||||
*
|
||||
* To keep this hack from interfering with the regular console driver, either
|
||||
* deregister this driver before/on framebuffer console init, or silence this
|
||||
* function after the fbcon driver is running (will lose console messages!?).
|
||||
* To debug real early bugs, need to write a 'mac_register_console_hack()'
|
||||
* that is called from start_kernel() before setup_arch() and just registers
|
||||
* this driver if Mac.
|
||||
*/
|
||||
|
||||
static void mac_debug_console_write(struct console *co, const char *str,
|
||||
unsigned int count)
|
||||
{
|
||||
mac_serial_print(str);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Mac: loops_per_jiffy min. 19000 ^= .5 us; MFPDELAY was 0.6 us*/
|
||||
|
||||
#define uSEC 1
|
||||
|
||||
static inline void mac_sccb_out(char c)
|
||||
{
|
||||
int i;
|
||||
|
||||
do {
|
||||
for (i = uSEC; i > 0; --i)
|
||||
barrier();
|
||||
} while (!(scc.cha_b_ctrl & 0x04)); /* wait for tx buf empty */
|
||||
for (i = uSEC; i > 0; --i)
|
||||
barrier();
|
||||
scc.cha_b_data = c;
|
||||
}
|
||||
|
||||
static inline void mac_scca_out(char c)
|
||||
{
|
||||
int i;
|
||||
|
||||
do {
|
||||
for (i = uSEC; i > 0; --i)
|
||||
barrier();
|
||||
} while (!(scc.cha_a_ctrl & 0x04)); /* wait for tx buf empty */
|
||||
for (i = uSEC; i > 0; --i)
|
||||
barrier();
|
||||
scc.cha_a_data = c;
|
||||
}
|
||||
|
||||
static void mac_sccb_console_write(struct console *co, const char *str,
|
||||
unsigned int count)
|
||||
{
|
||||
while (count--) {
|
||||
if (*str == '\n')
|
||||
mac_sccb_out('\r');
|
||||
mac_sccb_out(*str++);
|
||||
}
|
||||
}
|
||||
|
||||
static void mac_scca_console_write(struct console *co, const char *str,
|
||||
unsigned int count)
|
||||
{
|
||||
while (count--) {
|
||||
if (*str == '\n')
|
||||
mac_scca_out('\r');
|
||||
mac_scca_out(*str++);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* The following two functions do a quick'n'dirty initialization of the MFP or
|
||||
* SCC serial ports. They're used by the debugging interface, kgdb, and the
|
||||
* serial console code. */
|
||||
#define SCCB_WRITE(reg,val) \
|
||||
do { \
|
||||
int i; \
|
||||
scc.cha_b_ctrl = (reg); \
|
||||
for (i = uSEC; i > 0; --i) \
|
||||
barrier(); \
|
||||
scc.cha_b_ctrl = (val); \
|
||||
for (i = uSEC; i > 0; --i) \
|
||||
barrier(); \
|
||||
} while(0)
|
||||
|
||||
#define SCCA_WRITE(reg,val) \
|
||||
do { \
|
||||
int i; \
|
||||
scc.cha_a_ctrl = (reg); \
|
||||
for (i = uSEC; i > 0; --i) \
|
||||
barrier(); \
|
||||
scc.cha_a_ctrl = (val); \
|
||||
for (i = uSEC; i > 0; --i) \
|
||||
barrier(); \
|
||||
} while(0)
|
||||
|
||||
/* loops_per_jiffy isn't initialized yet, so we can't use udelay(). This does a
|
||||
* delay of ~ 60us. */
|
||||
/* Mac: loops_per_jiffy min. 19000 ^= .5 us; MFPDELAY was 0.6 us*/
|
||||
#define LONG_DELAY() \
|
||||
do { \
|
||||
int i; \
|
||||
for (i = 60*uSEC; i > 0; --i) \
|
||||
barrier(); \
|
||||
} while(0)
|
||||
|
||||
static void __init mac_init_scc_port(int cflag, int port)
|
||||
{
|
||||
/*
|
||||
* baud rates: 1200, 1800, 2400, 4800, 9600, 19.2k, 38.4k, 57.6k, 115.2k
|
||||
*/
|
||||
|
||||
static int clksrc_table[9] =
|
||||
/* reg 11: 0x50 = BRG, 0x00 = RTxC, 0x28 = TRxC */
|
||||
{ 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x00, 0x00 };
|
||||
static int clkmode_table[9] =
|
||||
/* reg 4: 0x40 = x16, 0x80 = x32, 0xc0 = x64 */
|
||||
{ 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0xc0, 0x80 };
|
||||
static int div_table[9] =
|
||||
/* reg12 (BRG low) */
|
||||
{ 94, 62, 46, 22, 10, 4, 1, 0, 0 };
|
||||
|
||||
int baud = cflag & CBAUD;
|
||||
int clksrc, clkmode, div, reg3, reg5;
|
||||
|
||||
if (cflag & CBAUDEX)
|
||||
baud += B38400;
|
||||
if (baud < B1200 || baud > B38400+2)
|
||||
baud = B9600; /* use default 9600bps for non-implemented rates */
|
||||
baud -= B1200; /* tables starts at 1200bps */
|
||||
|
||||
clksrc = clksrc_table[baud];
|
||||
clkmode = clkmode_table[baud];
|
||||
div = div_table[baud];
|
||||
|
||||
reg3 = (((cflag & CSIZE) == CS8) ? 0xc0 : 0x40);
|
||||
reg5 = (((cflag & CSIZE) == CS8) ? 0x60 : 0x20) | 0x82 /* assert DTR/RTS */;
|
||||
|
||||
if (port == 1) {
|
||||
(void)scc.cha_b_ctrl; /* reset reg pointer */
|
||||
SCCB_WRITE(9, 0xc0); /* reset */
|
||||
LONG_DELAY(); /* extra delay after WR9 access */
|
||||
SCCB_WRITE(4, (cflag & PARENB) ? ((cflag & PARODD) ? 0x01 : 0x03) : 0 |
|
||||
0x04 /* 1 stopbit */ |
|
||||
clkmode);
|
||||
SCCB_WRITE(3, reg3);
|
||||
SCCB_WRITE(5, reg5);
|
||||
SCCB_WRITE(9, 0); /* no interrupts */
|
||||
LONG_DELAY(); /* extra delay after WR9 access */
|
||||
SCCB_WRITE(10, 0); /* NRZ mode */
|
||||
SCCB_WRITE(11, clksrc); /* main clock source */
|
||||
SCCB_WRITE(12, div); /* BRG value */
|
||||
SCCB_WRITE(13, 0); /* BRG high byte */
|
||||
SCCB_WRITE(14, 1);
|
||||
SCCB_WRITE(3, reg3 | 1);
|
||||
SCCB_WRITE(5, reg5 | 8);
|
||||
} else if (port == 0) {
|
||||
(void)scc.cha_a_ctrl; /* reset reg pointer */
|
||||
SCCA_WRITE(9, 0xc0); /* reset */
|
||||
LONG_DELAY(); /* extra delay after WR9 access */
|
||||
SCCA_WRITE(4, (cflag & PARENB) ? ((cflag & PARODD) ? 0x01 : 0x03) : 0 |
|
||||
0x04 /* 1 stopbit */ |
|
||||
clkmode);
|
||||
SCCA_WRITE(3, reg3);
|
||||
SCCA_WRITE(5, reg5);
|
||||
SCCA_WRITE(9, 0); /* no interrupts */
|
||||
LONG_DELAY(); /* extra delay after WR9 access */
|
||||
SCCA_WRITE(10, 0); /* NRZ mode */
|
||||
SCCA_WRITE(11, clksrc); /* main clock source */
|
||||
SCCA_WRITE(12, div); /* BRG value */
|
||||
SCCA_WRITE(13, 0); /* BRG high byte */
|
||||
SCCA_WRITE(14, 1);
|
||||
SCCA_WRITE(3, reg3 | 1);
|
||||
SCCA_WRITE(5, reg5 | 8);
|
||||
}
|
||||
}
|
||||
#endif /* DEBUG_SERIAL */
|
||||
|
||||
static int __init mac_debug_setup(char *arg)
|
||||
{
|
||||
if (!MACH_IS_MAC)
|
||||
return 0;
|
||||
|
||||
#ifdef DEBUG_SERIAL
|
||||
if (!strcmp(arg, "ser") || !strcmp(arg, "ser1")) {
|
||||
/* Mac modem port */
|
||||
mac_init_scc_port(B9600|CS8, 0);
|
||||
mac_console_driver.write = mac_scca_console_write;
|
||||
scc_port = 0;
|
||||
} else if (!strcmp(arg, "ser2")) {
|
||||
/* Mac printer port */
|
||||
mac_init_scc_port(B9600|CS8, 1);
|
||||
mac_console_driver.write = mac_sccb_console_write;
|
||||
scc_port = 1;
|
||||
}
|
||||
#endif
|
||||
#ifdef DEBUG_HEADS
|
||||
if (!strcmp(arg, "scn") || !strcmp(arg, "con")) {
|
||||
/* display, using head.S console routines */
|
||||
mac_console_driver.write = mac_debug_console_write;
|
||||
}
|
||||
#endif
|
||||
if (mac_console_driver.write)
|
||||
register_console(&mac_console_driver);
|
||||
return 0;
|
||||
}
|
||||
|
||||
early_param("debug", mac_debug_setup);
|
||||
@ -34,9 +34,7 @@
|
||||
*
|
||||
* 3 - unused (?)
|
||||
*
|
||||
* 4 - SCC (slot number determined by reading RR3 on the SSC itself)
|
||||
* - slot 1: SCC channel A
|
||||
* - slot 2: SCC channel B
|
||||
* 4 - SCC
|
||||
*
|
||||
* 5 - unused (?)
|
||||
* [serial errors or special conditions seem to raise level 6
|
||||
@ -55,8 +53,6 @@
|
||||
* - slot 5: Slot $E
|
||||
*
|
||||
* 4 - SCC IOP
|
||||
* - slot 1: SCC channel A
|
||||
* - slot 2: SCC channel B
|
||||
*
|
||||
* 5 - ISM IOP (ADB?)
|
||||
*
|
||||
@ -136,13 +132,8 @@
|
||||
#include <asm/irq_regs.h>
|
||||
#include <asm/mac_oss.h>
|
||||
|
||||
#define DEBUG_SPURIOUS
|
||||
#define SHUTUP_SONIC
|
||||
|
||||
/* SCC interrupt mask */
|
||||
|
||||
static int scc_mask;
|
||||
|
||||
/*
|
||||
* VIA/RBV hooks
|
||||
*/
|
||||
@ -190,13 +181,6 @@ extern void baboon_irq_enable(int);
|
||||
extern void baboon_irq_disable(int);
|
||||
extern void baboon_irq_clear(int);
|
||||
|
||||
/*
|
||||
* SCC interrupt routines
|
||||
*/
|
||||
|
||||
static void scc_irq_enable(unsigned int);
|
||||
static void scc_irq_disable(unsigned int);
|
||||
|
||||
/*
|
||||
* console_loglevel determines NMI handler function
|
||||
*/
|
||||
@ -221,8 +205,6 @@ void __init mac_init_IRQ(void)
|
||||
#ifdef DEBUG_MACINTS
|
||||
printk("mac_init_IRQ(): Setting things up...\n");
|
||||
#endif
|
||||
scc_mask = 0;
|
||||
|
||||
m68k_setup_irq_controller(&mac_irq_controller, IRQ_USER,
|
||||
NUM_MAC_SOURCES - IRQ_USER);
|
||||
/* Make sure the SONIC interrupt is cleared or things get ugly */
|
||||
@ -283,15 +265,16 @@ void mac_enable_irq(unsigned int irq)
|
||||
via_irq_enable(irq);
|
||||
break;
|
||||
case 3:
|
||||
case 4:
|
||||
case 5:
|
||||
case 6:
|
||||
if (psc_present)
|
||||
psc_irq_enable(irq);
|
||||
else if (oss_present)
|
||||
oss_irq_enable(irq);
|
||||
else if (irq_src == 4)
|
||||
scc_irq_enable(irq);
|
||||
break;
|
||||
case 4:
|
||||
if (psc_present)
|
||||
psc_irq_enable(irq);
|
||||
break;
|
||||
case 8:
|
||||
if (baboon_present)
|
||||
@ -316,15 +299,16 @@ void mac_disable_irq(unsigned int irq)
|
||||
via_irq_disable(irq);
|
||||
break;
|
||||
case 3:
|
||||
case 4:
|
||||
case 5:
|
||||
case 6:
|
||||
if (psc_present)
|
||||
psc_irq_disable(irq);
|
||||
else if (oss_present)
|
||||
oss_irq_disable(irq);
|
||||
else if (irq_src == 4)
|
||||
scc_irq_disable(irq);
|
||||
break;
|
||||
case 4:
|
||||
if (psc_present)
|
||||
psc_irq_disable(irq);
|
||||
break;
|
||||
case 8:
|
||||
if (baboon_present)
|
||||
@ -347,7 +331,6 @@ void mac_clear_irq(unsigned int irq)
|
||||
via_irq_clear(irq);
|
||||
break;
|
||||
case 3:
|
||||
case 4:
|
||||
case 5:
|
||||
case 6:
|
||||
if (psc_present)
|
||||
@ -355,6 +338,10 @@ void mac_clear_irq(unsigned int irq)
|
||||
else if (oss_present)
|
||||
oss_irq_clear(irq);
|
||||
break;
|
||||
case 4:
|
||||
if (psc_present)
|
||||
psc_irq_clear(irq);
|
||||
break;
|
||||
case 8:
|
||||
if (baboon_present)
|
||||
baboon_irq_clear(irq);
|
||||
@ -374,13 +361,17 @@ int mac_irq_pending(unsigned int irq)
|
||||
else
|
||||
return via_irq_pending(irq);
|
||||
case 3:
|
||||
case 4:
|
||||
case 5:
|
||||
case 6:
|
||||
if (psc_present)
|
||||
return psc_irq_pending(irq);
|
||||
else if (oss_present)
|
||||
return oss_irq_pending(irq);
|
||||
break;
|
||||
case 4:
|
||||
if (psc_present)
|
||||
psc_irq_pending(irq);
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -448,59 +439,3 @@ irqreturn_t mac_nmi_handler(int irq, void *dev_id)
|
||||
in_nmi--;
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
/*
|
||||
* Simple routines for masking and unmasking
|
||||
* SCC interrupts in cases where this can't be
|
||||
* done in hardware (only the PSC can do that.)
|
||||
*/
|
||||
|
||||
static void scc_irq_enable(unsigned int irq)
|
||||
{
|
||||
int irq_idx = IRQ_IDX(irq);
|
||||
|
||||
scc_mask |= (1 << irq_idx);
|
||||
}
|
||||
|
||||
static void scc_irq_disable(unsigned int irq)
|
||||
{
|
||||
int irq_idx = IRQ_IDX(irq);
|
||||
|
||||
scc_mask &= ~(1 << irq_idx);
|
||||
}
|
||||
|
||||
/*
|
||||
* SCC master interrupt handler. We have to do a bit of magic here
|
||||
* to figure out what channel gave us the interrupt; putting this
|
||||
* here is cleaner than hacking it into drivers/char/macserial.c.
|
||||
*/
|
||||
|
||||
void mac_scc_dispatch(int irq, void *dev_id)
|
||||
{
|
||||
volatile unsigned char *scc = (unsigned char *) mac_bi_data.sccbase + 2;
|
||||
unsigned char reg;
|
||||
unsigned long flags;
|
||||
|
||||
/* Read RR3 from the chip. Always do this on channel A */
|
||||
/* This must be an atomic operation so disable irqs. */
|
||||
|
||||
local_irq_save(flags);
|
||||
*scc = 3;
|
||||
reg = *scc;
|
||||
local_irq_restore(flags);
|
||||
|
||||
/* Now dispatch. Bits 0-2 are for channel B and */
|
||||
/* bits 3-5 are for channel A. We can safely */
|
||||
/* ignore the remaining bits here. */
|
||||
/* */
|
||||
/* Note that we're ignoring scc_mask for now. */
|
||||
/* If we actually mask the ints then we tend to */
|
||||
/* get hammered by very persistent SCC irqs, */
|
||||
/* and since they're autovector interrupts they */
|
||||
/* pretty much kill the system. */
|
||||
|
||||
if (reg & 0x38)
|
||||
m68k_handle_int(IRQ_SCCA);
|
||||
if (reg & 0x07)
|
||||
m68k_handle_int(IRQ_SCCB);
|
||||
}
|
||||
|
||||
@ -33,7 +33,6 @@ static irqreturn_t oss_irq(int, void *);
|
||||
static irqreturn_t oss_nubus_irq(int, void *);
|
||||
|
||||
extern irqreturn_t via1_irq(int, void *);
|
||||
extern irqreturn_t mac_scc_dispatch(int, void *);
|
||||
|
||||
/*
|
||||
* Initialize the OSS
|
||||
@ -69,9 +68,6 @@ void __init oss_register_interrupts(void)
|
||||
if (request_irq(OSS_IRQLEV_SCSI, oss_irq, IRQ_FLG_LOCK,
|
||||
"scsi", (void *) oss))
|
||||
pr_err("Couldn't register %s interrupt\n", "scsi");
|
||||
if (request_irq(OSS_IRQLEV_IOPSCC, mac_scc_dispatch, IRQ_FLG_LOCK,
|
||||
"scc", mac_scc_dispatch))
|
||||
pr_err("Couldn't register %s interrupt\n", "scc");
|
||||
if (request_irq(OSS_IRQLEV_NUBUS, oss_nubus_irq, IRQ_FLG_LOCK,
|
||||
"nubus", (void *) oss))
|
||||
pr_err("Couldn't register %s interrupt\n", "nubus");
|
||||
@ -172,9 +168,7 @@ void oss_irq_enable(int irq) {
|
||||
printk("oss_irq_enable(%d)\n", irq);
|
||||
#endif
|
||||
switch(irq) {
|
||||
case IRQ_SCC:
|
||||
case IRQ_SCCA:
|
||||
case IRQ_SCCB:
|
||||
case IRQ_MAC_SCC:
|
||||
oss->irq_level[OSS_IOPSCC] = OSS_IRQLEV_IOPSCC;
|
||||
break;
|
||||
case IRQ_MAC_ADB:
|
||||
@ -212,9 +206,7 @@ void oss_irq_disable(int irq) {
|
||||
printk("oss_irq_disable(%d)\n", irq);
|
||||
#endif
|
||||
switch(irq) {
|
||||
case IRQ_SCC:
|
||||
case IRQ_SCCA:
|
||||
case IRQ_SCCB:
|
||||
case IRQ_MAC_SCC:
|
||||
oss->irq_level[OSS_IOPSCC] = OSS_IRQLEV_DISABLED;
|
||||
break;
|
||||
case IRQ_MAC_ADB:
|
||||
@ -250,9 +242,7 @@ void oss_irq_disable(int irq) {
|
||||
void oss_irq_clear(int irq) {
|
||||
/* FIXME: how to do this on OSS? */
|
||||
switch(irq) {
|
||||
case IRQ_SCC:
|
||||
case IRQ_SCCA:
|
||||
case IRQ_SCCB:
|
||||
case IRQ_MAC_SCC:
|
||||
oss->irq_pending &= ~OSS_IP_IOPSCC;
|
||||
break;
|
||||
case IRQ_MAC_ADB:
|
||||
@ -280,9 +270,7 @@ void oss_irq_clear(int irq) {
|
||||
int oss_irq_pending(int irq)
|
||||
{
|
||||
switch(irq) {
|
||||
case IRQ_SCC:
|
||||
case IRQ_SCCA:
|
||||
case IRQ_SCCB:
|
||||
case IRQ_MAC_SCC:
|
||||
return oss->irq_pending & OSS_IP_IOPSCC;
|
||||
break;
|
||||
case IRQ_MAC_ADB:
|
||||
|
||||
@ -84,8 +84,6 @@ void via_irq_enable(int irq);
|
||||
void via_irq_disable(int irq);
|
||||
void via_irq_clear(int irq);
|
||||
|
||||
extern irqreturn_t mac_scc_dispatch(int, void *);
|
||||
|
||||
/*
|
||||
* Initialize the VIAs
|
||||
*
|
||||
@ -311,11 +309,6 @@ void __init via_register_interrupts(void)
|
||||
if (request_irq(IRQ_AUTO_2, via2_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST,
|
||||
"via2", (void *) via2))
|
||||
pr_err("Couldn't register %s interrupt\n", "via2");
|
||||
if (!psc_present) {
|
||||
if (request_irq(IRQ_AUTO_4, mac_scc_dispatch, IRQ_FLG_LOCK,
|
||||
"scc", mac_scc_dispatch))
|
||||
pr_err("Couldn't register %s interrupt\n", "scc");
|
||||
}
|
||||
if (request_irq(IRQ_MAC_NUBUS, via_nubus_irq,
|
||||
IRQ_FLG_LOCK|IRQ_FLG_FAST, "nubus", (void *) via2))
|
||||
pr_err("Couldn't register %s interrupt\n", "nubus");
|
||||
|
||||
Loading…
Reference in New Issue
Block a user