Commit da3fb3c9 authored by Finn Thain's avatar Finn Thain Committed by Geert Uytterhoeven
Browse files

m68k/mac: oss irq fixes 



The IOP driver calls into the OSS driver to enable its IRQ. This undesirable coupling between drivers only exists because the OSS driver doesn't correctly handle all of its machspec IRQs.

Fix OSS handling of enable/disable for VIA1 IRQs (8 thru 15) which includes MAC_IRQ_ADB.

Back when I implemented pmac_zilog support I redefined IRQ_MAC_SCC incorrectly. Change this to a machspec IRQ so that it works on OSS.

Clean up the unused OSS audio IRQ and OSS_IRQLEV_* cruft that only confuses things.

Fix the OSS description in macints.c and remove an obsolete comment.

Don't enable the VIA1 irq before registering the handler.

Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent c4af5da7

arch/m68k/include/asm/mac_oss.h

+0 −19
Original line number Diff line number Diff line
@@ -58,25 +58,6 @@ 


#define OSS_POWEROFF	0x80



/*

 * OSS Interrupt levels for various sub-systems

 *

 * This mapping is laid out with two things in mind: first, we try to keep

 * things on their own levels to avoid having to do double-dispatches. Second,

 * the levels match as closely as possible the alternate IRQ mapping mode (aka

 * "A/UX mode") available on some VIA machines.

 */



#define OSS_IRQLEV_DISABLED	0

#define OSS_IRQLEV_IOPISM	1	/* ADB? */

#define OSS_IRQLEV_SCSI		IRQ_AUTO_2

#define OSS_IRQLEV_NUBUS	IRQ_AUTO_3	/* keep this on its own level */

#define OSS_IRQLEV_IOPSCC	IRQ_AUTO_4	/* matches VIA alternate mapping */

#define OSS_IRQLEV_SOUND	IRQ_AUTO_5	/* matches VIA alternate mapping */

#define OSS_IRQLEV_60HZ		6	/* matches VIA alternate mapping */

#define OSS_IRQLEV_VIA1		IRQ_AUTO_6	/* matches VIA alternate mapping */

#define OSS_IRQLEV_PARITY	7	/* matches VIA alternate mapping */



#ifndef __ASSEMBLY__



struct mac_oss {

arch/m68k/include/asm/macints.h

+3 −3
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ 
#define IRQ_PSC4_3	  (35)

#define IRQ_MAC_MACE_DMA  IRQ_PSC4_3



/* OSS Level 4 interrupts */

#define IRQ_MAC_SCC	  (33)



/* Level 5 (PSC, AV Macs only) interrupts */

#define IRQ_PSC5_0	  (40)

#define IRQ_PSC5_1	  (41)
@@ -131,9 +134,6 @@ 
#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)

arch/m68k/mac/config.c

+8 −2
Original line number Diff line number Diff line
@@ -893,8 +893,14 @@ static void __init mac_identify(void) 
		scc_b_rsrcs[1].start = scc_b_rsrcs[1].end = IRQ_MAC_SCC_B;

		break;

	default:

		/* On non-PSC machines, the serial ports share an IRQ. */

		if (macintosh_config->ident == MAC_MODEL_IIFX) {

			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;

		} else {

			scc_a_rsrcs[1].start = scc_a_rsrcs[1].end = IRQ_AUTO_4;

			scc_b_rsrcs[1].start = scc_b_rsrcs[1].end = IRQ_AUTO_4;

		}

		break;

	}

arch/m68k/mac/iop.c

+2 −6
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ 
#include <asm/macintosh.h>

#include <asm/macints.h>

#include <asm/mac_iop.h>

#include <asm/mac_oss.h>



/*#define DEBUG_IOP*/
@@ -149,8 +148,6 @@ static struct listener iop_listeners[NUM_IOPS][NUM_IOP_CHAN]; 


irqreturn_t iop_ism_irq(int, void *);



extern void oss_irq_enable(int);



/*

 * Private access functions

 */
@@ -304,11 +301,10 @@ void __init iop_init(void) 
void __init iop_register_interrupts(void)

{

	if (iop_ism_present) {

		if (oss_present) {

			if (request_irq(OSS_IRQLEV_IOPISM, iop_ism_irq, 0,

		if (macintosh_config->ident == MAC_MODEL_IIFX) {

			if (request_irq(IRQ_MAC_ADB, iop_ism_irq, 0,

					"ISM IOP", (void *)IOP_NUM_ISM))

				pr_err("Couldn't register ISM IOP interrupt\n");

			oss_irq_enable(IRQ_MAC_ADB);

		} else {

			if (request_irq(IRQ_VIA2_0, iop_ism_irq, 0, "ISM IOP",

					(void *)IOP_NUM_ISM))

arch/m68k/mac/macints.c

+10 −35
Original line number Diff line number Diff line
@@ -26,10 +26,6 @@ 
 *		  - slot 6: timer 1 (not on IIci)

 *		  - slot 7: status of IRQ; signals 'any enabled int.'

 *

 *	2	- OSS (IIfx only?)

 *		  - slot 0: SCSI interrupt

 *		  - slot 1: Sound interrupt

 *

 * Levels 3-6 vary by machine type. For VIA or RBV Macintoshes:

 *

 *	3	- unused (?)
@@ -54,21 +50,18 @@ 
 *

 *	6	- VIA1

 *

 * For OSS Macintoshes (IIfx only at this point):

 * For OSS Macintoshes (IIfx only), we apply an interrupt mapping similar to

 * the Quadra (A/UX) mapping:

 *

 *	3	- Nubus interrupt

 *		  - slot 0: Slot $9

 *		  - slot 1: Slot $A

 *		  - slot 2: Slot $B

 *		  - slot 3: Slot $C

 *		  - slot 4: Slot $D

 *		  - slot 5: Slot $E

 *	1	- ISM IOP (ADB)

 *

 *	4	- SCC IOP

 *	2	- SCSI

 *

 *	3	- NuBus

 *

 *	5	- ISM IOP (ADB?)

 *	4	- SCC IOP

 *

 *	6	- unused

 *	6	- VIA1

 *

 * For PSC Macintoshes (660AV, 840AV):

 *
@@ -112,14 +105,6 @@ 
 *   case. They're hidden behind the Nubus slot $C interrupt thus adding a

 *   third layer of indirection. Why oh why did the Apple engineers do that?

 *

 * - We support "fast" and "slow" handlers, just like the Amiga port. The

 *   fast handlers are called first and with all interrupts disabled. They

 *   are expected to execute quickly (hence the name). The slow handlers are

 *   called last with interrupts enabled and the interrupt level restored.

 *   They must therefore be reentrant.

 *

 *   TODO:

 *

 */



#include <linux/types.h>
@@ -216,8 +201,6 @@ void mac_irq_enable(struct irq_data *data) 


	switch(irq_src) {

	case 1:

		via_irq_enable(irq);

		break;

	case 2:

	case 7:

		if (oss_present)
@@ -226,6 +209,7 @@ void mac_irq_enable(struct irq_data *data) 
			via_irq_enable(irq);

		break;

	case 3:

	case 4:

	case 5:

	case 6:

		if (psc_present)
@@ -233,10 +217,6 @@ void mac_irq_enable(struct irq_data *data) 
		else if (oss_present)

			oss_irq_enable(irq);

		break;

	case 4:

		if (psc_present)

			psc_irq_enable(irq);

		break;

	case 8:

		if (baboon_present)

			baboon_irq_enable(irq);
@@ -251,8 +231,6 @@ void mac_irq_disable(struct irq_data *data) 


	switch(irq_src) {

	case 1:

		via_irq_disable(irq);

		break;

	case 2:

	case 7:

		if (oss_present)
@@ -261,6 +239,7 @@ void mac_irq_disable(struct irq_data *data) 
			via_irq_disable(irq);

		break;

	case 3:

	case 4:

	case 5:

	case 6:

		if (psc_present)
@@ -268,10 +247,6 @@ void mac_irq_disable(struct irq_data *data) 
		else if (oss_present)

			oss_irq_disable(irq);

		break;

	case 4:

		if (psc_present)

			psc_irq_disable(irq);

		break;

	case 8:

		if (baboon_present)

			baboon_irq_disable(irq);

CRA Git | Maintained and supported by SUSTech CRA and CCSE