m68k/mac: Various cleanups and fixes
Subsystems (3)
cover m68k/mac: Various cleanups and fixes
Finn Thain (4):
m68k/mac: More printk modernization
m68k/mac: Disentangle VIA and OSS initialization m68k/mac: Disentangle VIA/RBV and NuBus initialization m68k/mac: Add mutual exclusion for IOP interrupt polling
arch/m68k/include/asm/mac_iop.h | 1 + arch/m68k/mac/baboon.c | 2 +- arch/m68k/mac/config.c | 2 +- arch/m68k/mac/iop.c | 13 ++++++++-- arch/m68k/mac/oss.c | 16 ++++--------- arch/m68k/mac/psc.c | 6 ++--- arch/m68k/mac/via.c | 53 ++++++++++++++++------------------------- drivers/macintosh/adb-iop.c | 4 +--- drivers/nubus/nubus.c | 13 ---------- 9 files changed, 42 insertions(+), 68 deletions(-)
Signature · 1 line
2.13.6
PATCH 1/4 m68k/mac: More printk modernization
Log message fragments used to be printed on one line but now get split up. Fix this. Also, suppress log spam that merely prints known pointer values.
--- arch/m68k/mac/baboon.c | 2 +- arch/m68k/mac/iop.c | 4 ++-- arch/m68k/mac/psc.c | 6 ++---- arch/m68k/mac/via.c | 18 +++++------------- 4 files changed, 10 insertions(+), 20 deletions(-)
arch/m68k/mac/baboon.c +1 -1
@@ -36,7 +36,7 @@ void __init baboon_init(void) baboon = (struct baboon *)BABOON_BASE ; baboon_present =1 ; -printk ("Baboon detected at %p\n" , baboon); +pr_debug ("Baboon detected at %p\n" , baboon); }/*
arch/m68k/mac/iop.c +2 -2
@@ -273,10 +273,10 @@ void __init iop_init(void)int i;if (iop_scc_present) { -pr_info ("IOP: detected SCC IOP at %p\n" , iop_base[IOP_NUM_SCC ]); +pr_debug ("SCC IOP detected at %p\n" , iop_base[IOP_NUM_SCC ]); }if (iop_ism_present) { -pr_info ("IOP: detected ISM IOP at %p\n" , iop_base[IOP_NUM_ISM ]); +pr_debug ("ISM IOP detected at %p\n" , iop_base[IOP_NUM_ISM ]);iop_start (iop_base[IOP_NUM_ISM ]);iop_alive (iop_base[IOP_NUM_ISM ]);/* clears the alive flag */ }
arch/m68k/mac/psc.c +2 -4
@@ -42,7 +42,7 @@ static void psc_debug_dump(void)return ;for (i =0x30 ; i <0x70 ; i +=0x10 ) { -printk ("PSC #%d: IFR = 0x%02X IER = 0x%02X\n" , +printk (KERN_DEBUG "PSC #%d: IFR = 0x%02X IER = 0x%02X\n" , i >>4 , (int )psc_read_byte (pIFRbase + i), (int )psc_read_byte (pIERbase + i));
@@ -59,14 +59,12 @@ static __init void psc_dma_die_die_die(void) {int i; -printk ("Killing all PSC DMA channels..." );for (i =0 ; i <9 ; i++) {psc_write_word (PSC_CTL_BASE + (i <<4 ),0x8800 );psc_write_word (PSC_CTL_BASE + (i <<4 ),0x1000 );psc_write_word (PSC_CMD_BASE + (i <<5 ),0x1100 );psc_write_word (PSC_CMD_BASE + (i <<5 ) +0x10 ,0x1100 ); } -printk ("done!\n" ); }/*
@@ -92,7 +90,7 @@ void __init psc_init(void) psc = (void *)PSC_BASE ; -printk ("PSC detected at %p\n" , psc); +pr_debug ("PSC detected at %p\n" , psc);psc_dma_die_die_die ();
arch/m68k/mac/via.c +5 -13
@@ -121,18 +121,21 @@ void via_debug_dump(void);void __init via_init (void ) { + via1 = (void *)VIA1_BASE ; +pr_debug ("VIA1 detected at %p\n" , via1); +switch (macintosh_config->via_type) {/* IIci, IIsi, IIvx, IIvi (P6xx), LC series */ case MAC_VIA_IICI : - via1 = (void *)VIA1_BASE ;if (macintosh_config->ident ==MAC_MODEL_IIFX ) { via2 =NULL ; rbv_present =0 ; oss_present =1 ; }else { via2 = (void *)RBV_BASE ; +pr_debug ("VIA2 (RBV) detected at %p\n" , via2); rbv_present =1 ; oss_present =0 ; }
@@ -154,8 +157,8 @@ void __init via_init(void)case MAC_VIA_QUADRA :case MAC_VIA_II : - via1 = (void *)VIA1_BASE ; via2 = (void *)VIA2_BASE ; +pr_debug ("VIA2 detected at %p\n" , via2); rbv_present =0 ; oss_present =0 ; rbv_clear =0x00 ;
@@ -168,17 +171,6 @@ void __init via_init(void)panic ("UNKNOWN VIA TYPE" ); } -printk (KERN_INFO "VIA1 at %p is a 6522 or clone\n" , via1); - -printk (KERN_INFO "VIA2 at %p is " , via2); -if (rbv_present) { -printk ("an RBV\n" ); - }else if (oss_present) { -printk ("an OSS\n" ); - }else { -printk ("a 6522 or clone\n" ); - } -#ifdef DEBUG_VIA via_debug_dump ();#endif
Signature · 1 line
2.13.6
Re: [PATCH 1/4] m68k/mac: More printk modernization
2017-10-27 4:45 GMT+02:00 Finn Thain <[email protected]>:
Quoted 11 lines
Log message fragments used to be printed on one line but now get split up. Fix this. Also, suppress log spam that merely prints known pointer values.
Tested-by Stan Johnson <[email protected]>Signed-off-by Finn Thain <[email protected]>--- arch/m68k/mac/baboon.c | 2 +- arch/m68k/mac/iop.c | 4 ++-- arch/m68k/mac/psc.c | 6 ++---- arch/m68k/mac/via.c | 18 +++++------------- 4 files changed, 10 insertions(+), 20 deletions(-)
...
arch/m68k/mac/psc.c static void psc_debug_dump(void) · line 48
Quoted 13 lines
arch/m68k/mac/psc.c +1
-1@@ -42,7 +42,7 @@ static void psc_debug_dump(void)return ;for (i =0x30 ; i <0x70 ; i +=0x10 ) { -printk ("PSC #%d: IFR = 0x%02X IER = 0x%02X\n" , +printk (KERN_DEBUG "PSC #%d: IFR = 0x%02X IER = 0x%02X\n" , i >>4 , (int )psc_read_byte (pIFRbase + i), (int )psc_read_byte (pIERbase + i));
Any particular reason why you didn't use pr_debug() here? I'm guessing it's because this is not a known pointer value?
Kars.
Re: [PATCH 1/4] m68k/mac: More printk modernization
Quoted 23 lines · Kars de Jong
2017-10-27 4:45 GMT+02:00 Finn Thain <[email protected]>:
Quoted 12 lines
Log message fragments used to be printed on one line but now get split up. Fix this. Also, suppress log spam that merely prints known pointer values.
Tested-by Stan Johnson <[email protected]>Signed-off-by Finn Thain <[email protected]>--- arch/m68k/mac/baboon.c | 2 +- arch/m68k/mac/iop.c | 4 ++-- arch/m68k/mac/psc.c | 6 ++---- arch/m68k/mac/via.c | 18 +++++------------- 4 files changed, 10 insertions(+), 20 deletions(-)...
Quoted 7 lines
arch/m68k/mac/psc.c +0
-0@@ -42,7 +42,7 @@ static void psc_debug_dump(void)return ;
Quoted 10 lines
arch/m68k/mac/psc.c static void psc_debug_dump(void) · line 48
Quoted 6 lines
arch/m68k/mac/psc.c +1
-1for (i =0x30 ; i <0x70 ; i +=0x10 ) { -printk ("PSC #%d: IFR = 0x%02X IER = 0x%02X\n" , +printk (KERN_DEBUG "PSC #%d: IFR = 0x%02X IER = 0x%02X\n" , i >>4 , (int )psc_read_byte (pIFRbase + i), (int )psc_read_byte (pIERbase + i));Any particular reason why you didn't use
pr_debug()here? I'm guessing it's because this is not a known pointer value?
It's because the call to psc_debug_dump() is already conditional on #ifdef DEBUG_PSC.
Having the printk conditional on both DEBUG and DEBUG_PSC would be annoying. And I didn't want an unconditional call to psc_debug_dump() because I think PSC_DEBUG could become more useful given that PSC support is woefully incomplete.
Generally, I like to avoid pr_debug(). But printk() now works differently, and now I have to avoid pr_cont(). And if I can avoid pr_cont() then it actually makes sense to use pr_debug().
Quoted 6 lines
Kars.
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/4] m68k/mac: More printk modernization
Quoted 4 lines · On Sat, 28 Oct 2017, I wrote:
Quoted 3 lines
Any particular reason why you didn't use
pr_debug()here? I'm guessing it's because this is not a known pointer value?
Quoted 8 lines
It's because the call to
psc_debug_dump()is already conditional on #ifdefDEBUG_PSC.Having the printk conditional on both DEBUG and
DEBUG_PSCwould be annoying. And I didn't want an unconditional call topsc_debug_dump()because I thinkPSC_DEBUGcould become more useful given that PSC support is woefully incomplete.
Perhaps PSC_DEBUG should be scrapped in favour of DEBUG. Presently DEBUG_PSC is set and I think that's useful as long as those drivers are incomplete. So we would end up with this:
#define DEBUG
#include ...
...
static void psc_debug_dump(void)
{
...
pr_debug(...);
...
}void __init psc_init(void)
{
...
#if DEBUG
psc_debug_dump()
#endif
...
}In this version, the "#define DEBUG" at the top of the file has obscure side effects (not just in printk.h) considering all of the headers that get included, and their includes, and so on. I still prefer the patch that I sent.
PATCH 2/4 m68k/mac: Disentangle VIA and OSS initialization
In reply to Finn Thainmacintosh_config->via_type is meaningless on Mac IIfx (i.e. the only model with OSS chip), so skip the via_type switch statement.
Call oss_init() before via_init() because it is more important and because that is the right place to initialize the oss_present flag.
On this model, bringing forward oss_init() and delaying via_init() is no problem because those functions are independent.
The only requirement here is that oss_register_interrupts() happens after via_init(). That is, mac_init_IRQ() happens after config_mac().
--- arch/m68k/mac/config.c | 2 +- arch/m68k/mac/oss.c | 8 ++++---- arch/m68k/mac/via.c | 32 +++++++++++++------------------- 3 files changed, 18 insertions(+), 24 deletions(-)
arch/m68k/mac/config.c +1 -1
@@ -898,8 +898,8 @@ static void __init mac_identify(void) mac_bi_data.id, mac_bi_data.cpuid, mac_bi_data.memsize);iop_init (); -via_init ();oss_init (); +via_init ();psc_init ();baboon_init ();
arch/m68k/mac/oss.c +4 -4
@@ -31,18 +31,18 @@ volatile struct mac_oss *oss;/* * Initialize the OSS -* -* The OSS "detection" code is actually in via_init() which is always called -* before us. Thus we can count on oss_present being valid on entry. */ void __init oss_init (void ) {int i; -if (!oss_present)return ; +if (macintosh_config->ident !=MAC_MODEL_IIFX ) +return ; oss = (struct mac_oss *)OSS_BASE ; +pr_debug ("OSS detected at %p" , oss); + oss_present =1 ;/* Disable all interrupts. Unlike a VIA it looks like we */ /* do this by setting the source's interrupt level to zero. */
arch/m68k/mac/via.c +13 -19
@@ -113,10 +113,6 @@ void via_debug_dump(void);* First we figure out where they actually _are_ as well as what type of * VIA we have for VIA2 (it could be a real VIA or an RBV or even an OSS.) * Then we pretty much clear them out and disable all IRQ sources. -* -* Note: the OSS is actually "detected" here and not in oss_init(). It just -* seems more logical to do it here since via_init() needs to know -* these things anyways. */ void __init via_init (void )
@@ -124,21 +120,18 @@ void __init via_init(void) via1 = (void *)VIA1_BASE ;pr_debug ("VIA1 detected at %p\n" , via1); -switch (macintosh_config->via_type) { +if (oss_present) { + via2 =NULL ; + rbv_present =0 ; + }else { +switch (macintosh_config->via_type) {/* IIci, IIsi, IIvx, IIvi (P6xx), LC series */ case MAC_VIA_IICI : -if (macintosh_config->ident ==MAC_MODEL_IIFX ) { - via2 =NULL ; - rbv_present =0 ; - oss_present =1 ; - }else { - via2 = (void *)RBV_BASE ; -pr_debug ("VIA2 (RBV) detected at %p\n" , via2); - rbv_present =1 ; - oss_present =0 ; - } + via2 = (void *)RBV_BASE ; +pr_debug ("VIA2 (RBV) detected at %p\n" , via2); + rbv_present =1 ;if (macintosh_config->ident ==MAC_MODEL_LCIII ) { rbv_clear =0x00 ; }else {
@@ -160,15 +153,16 @@ void __init via_init(void) via2 = (void *)VIA2_BASE ;pr_debug ("VIA2 detected at %p\n" , via2); rbv_present =0 ; - oss_present =0 ; rbv_clear =0x00 ; gIER = vIER; gIFR = vIFR; gBufA = vBufA; gBufB = vBufB;break ; +default :panic ("UNKNOWN VIA TYPE" ); + } }#ifdef DEBUG_VIA
@@ -295,9 +289,9 @@ void via_debug_dump(void) (uint) via1[vDirA], (uint) via1[vDirB], (uint) via1[vACR]);printk (KERN_DEBUG " PCR = 0x%02X IFR = 0x%02X IER = 0x%02X\n" , (uint ) via1[vPCR], (uint ) via1[vIFR], (uint ) via1[vIER]); -if (oss_present) { -printk (KERN_DEBUG "VIA2: <OSS>\n" ); - }else if (rbv_present) { +if (!via2) +return ; +if (rbv_present) {printk (KERN_DEBUG "VIA2: IFR = 0x%02X IER = 0x%02X\n" , (uint ) via2[rIFR], (uint ) via2[rIER]); printk(KERN_DEBUG " SIFR = 0x%02X SIER = 0x%02X\n",
Signature · 1 line
2.13.6
Re: [PATCH 2/4] m68k/mac: Disentangle VIA and OSS initialization
2017-10-27 4:45 GMT+02:00 Finn Thain <[email protected]>:
Quoted 7 lines
macintosh_config->via_typeis meaningless on Mac IIfx (i.e. the only model with OSS chip), so skip thevia_typeswitch statement.Call
oss_init()beforevia_init()because it is more important and because that is the right place to initialize theoss_presentflag.
Quoted 7 lines
On this model, bringing forward
oss_init()and delayingvia_init()is no problem because those functions are independent.The only requirement here is that
oss_register_interrupts()happens aftervia_init(). That is,mac_init_IRQ()happens afterconfig_mac().Tested-by Stan Johnson <[email protected]>
Was this tested on a Mac IIfx and on at least one other Mac?
Quoted 1 line
Signed-off-by Finn Thain <[email protected]>
Re: [PATCH 2/4] m68k/mac: Disentangle VIA and OSS initialization
In reply to Finn Thain2017-10-27 4:45 GMT+02:00 Finn Thain <[email protected]>:
Quoted 6 lines
macintosh_config->via_typeis meaningless on Mac IIfx (i.e. the only model with OSS chip), so skip thevia_typeswitch statement.Call
oss_init()beforevia_init()because it is more important and because that is the right place to initialize theoss_presentflag.
Quoted 7 lines
On this model, bringing forward
oss_init()and delayingvia_init()is no problem because those functions are independent.The only requirement here is that
oss_register_interrupts()happens aftervia_init(). That is,mac_init_IRQ()happens afterconfig_mac().Tested-by Stan Johnson <[email protected]>
Was this tested on a Mac IIfx and on at least one other Mac?
Quoted 1 line
Signed-off-by Finn Thain <[email protected]>
(Geert, Finn: sorry about the spam. Bloody Gmail...)
Kars.
A message that is not in the archive (sent off-list or not yet received): CACz-3rgGZcdd3RZZm8Q7PxVtWsMmYLaXk_qEnb8LN2oUHSz6pQ@mail.gmail.com
Re: [PATCH 2/4] m68k/mac: Disentangle VIA and OSS initialization
Quoted 11 lines · Kars de Jong
2017-10-27 4:45 GMT+02:00 Finn Thain <[email protected]>:
Quoted 9 lines
macintosh_config->via_typeis meaningless on Mac IIfx (i.e. the only model with OSS chip), so skip thevia_typeswitch statement.Call
oss_init()beforevia_init()because it is more important and because that is the right place to initialize theoss_presentflag.On this model, bringing forward
oss_init()and delayingvia_init()is no problem because those functions are independent.
Quoted 8 lines
Quoted 5 lines
The only requirement here is that
oss_register_interrupts()happens aftervia_init(). That is,mac_init_IRQ()happens afterconfig_mac().Tested-by Stan Johnson <[email protected]>Was this tested on a Mac IIfx and on at least one other Mac?
Yes, this works fine on IIfx and other Macs. And in theory, it should be safe to disable all OSS interrupts before messing with VIA1. (And if !oss_present, oss_init() does nothing anyway, so the sequence of calls unimportant.)
The comment implies that there is no better reason for the existing tangled code than "it seems more logical" (to that author anyway).
Quoted 6 lines
Quoted 3 lines
Signed-off-by Finn Thain <[email protected]>Reviewed-by Kars de Jong <[email protected]>
Thanks for the review.
Quoted 137 lines
Quoted 136 lines
--- arch/m68k/mac/config.c | 2 +- arch/m68k/mac/oss.c | 8 ++++---- arch/m68k/mac/via.c | 32 +++++++++++++------------------- 3 files changed, 18 insertions(+), 24 deletions(-)arch/m68k/mac/config.c +1
-1@@ -898,8 +898,8 @@ static void __init mac_identify(void) mac_bi_data.id, mac_bi_data.cpuid, mac_bi_data.memsize);iop_init (); -via_init ();oss_init (); +via_init ();psc_init ();baboon_init ();arch/m68k/mac/oss.c +0
-2@@ -31,18 +31,18 @@ volatile struct mac_oss *oss;/* * Initialize the OSS -* -* The OSS "detection" code is actually in via_init() which is always called
- * before us. Thus we can count onoss_presentbeing valid on entry. */void
__initoss_init(void){ int i;arch/m68k/mac/oss.c +4
-1-if (!oss_present)return ; +if (macintosh_config->ident !=MAC_MODEL_IIFX ) +return ; oss = (struct mac_oss *)OSS_BASE ; +pr_debug ("OSS detected at %p" , oss); + oss_present =1 ;/* Disable all interrupts. Unlike a VIA it looks like we */ /* do this by setting the source's interrupt level to zero. */ arch/m68k/mac/via.c +0
-2@@ -113,10 +113,6 @@ void via_debug_dump(void);* First we figure out where they actually _are_ as well as what type of * VIA we have for VIA2 (it could be a real VIA or an RBV or even an OSS.) * Then we pretty much clear them out and disable all IRQ sources. -* -* Note: the OSS is actually "detected" here and not in oss_init(). It just
- * seems more logical to do it here sincevia_init()needs to know
- * these things anyways.
*/void
__initvia_init(void)arch/m68k/mac/via.c +8
-11@@ -124,21 +120,18 @@ void __init via_init(void) via1 = (void *)VIA1_BASE ;pr_debug ("VIA1 detected at %p\n" , via1); -switch (macintosh_config->via_type) { +if (oss_present) { + via2 =NULL ; + rbv_present =0 ; + }else { +switch (macintosh_config->via_type) {/* IIci, IIsi, IIvx, IIvi (P6xx), LC series */ case MAC_VIA_IICI : -if (macintosh_config->ident ==MAC_MODEL_IIFX ) { - via2 =NULL ; - rbv_present =0 ; - oss_present =1 ; - }else { - via2 = (void *)RBV_BASE ; -pr_debug ("VIA2 (RBV) detected at %p\n" , via2); - rbv_present =1 ; - oss_present =0 ; - } + via2 = (void *)RBV_BASE ; +pr_debug ("VIA2 (RBV) detected at %p\n" , via2); + rbv_present =1 ;if (macintosh_config->ident ==MAC_MODEL_LCIII ) { rbv_clear =0x00 ;} else {arch/m68k/mac/via.c +5
-4@@ -160,15 +153,16 @@ void __init via_init(void) via2 = (void *)VIA2_BASE ;pr_debug ("VIA2 detected at %p\n" , via2); rbv_present =0 ; - oss_present =0 ; rbv_clear =0x00 ; gIER = vIER; gIFR = vIFR; gBufA = vBufA; gBufB = vBufB;break ; +default :panic ("UNKNOWN VIA TYPE" ); + } }#ifdef DEBUG_VIA @@ -295,9 +289,9 @@ void via_debug_dump(void) (uint) via1[vDirA], (uint) via1[vDirB], (uint) via1[vACR]);printk (KERN_DEBUG " PCR = 0x%02X IFR = 0x%02X IER = 0x%02X\n", (uint ) via1[vPCR], (uint ) via1[vIFR], (uint ) via1[vIER]); -if (oss_present) { -printk (KERN_DEBUG "VIA2: <OSS>\n" ); - }else if (rbv_present) { +if (!via2) +return ; +if (rbv_present) {printk (KERN_DEBUG "VIA2: IFR = 0x%02X IER = 0x%02X\n" , (uint ) via2[rIFR], (uint ) via2[rIER]);printk(KERN_DEBUG " SIFR = 0x%02X SIER = 0x%02X\n",--
2.13.6--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 3/4 m68k/mac: Disentangle VIA/RBV and NuBus initialization
In reply to Finn ThainThe Nubus subsystem should not be concerned with differences between VIA, RBV and OSS platforms. It should be portable across Macs and PowerMacs. This goal has implications for the initialization code relating to bus locking and slot interrupts.
During Nubus initialization, bus transactions are "unlocked": on VIA2 and RBV machines, via_nubus_init() sets a bit in the via2[gBufB] register to allow bus-mastering Nubus cards to arbitrate for the bus. This happens upon subsys_initcall(nubus_init). But because nubus_init() has no effect on card state, this sequence is arbitrary.
Moreover, when Penguin is used to boot Linux, the bus is already unlocked when Linux starts. On OSS machines there's no attempt to unlock Nubus transactions at all. (Maybe there's no benefit on that platform or maybe no-one knows how.)
All of this demonstrates that there's no benefit in locking out bus-mastering cards, as yet. (If the need arises, we could lock the bus for the duration of a timing-critical operation.) NetBSD unlocks the Nubus early (at VIA initialization) and we can do the same.
via_nubus_init() is also responsible for some VIA interrupt setup that should happen earlier than subsys_initcall(nubus_init). And actually, the Nubus subsystem need not be involved with slot interrupts: SLOT2IRQ works fine because Nubus slot IRQs are geographically assigned (regardless of platform).
For certain platforms with PDS slots, some Nubus IRQs may be platform IRQs and this is not something that the NuBus subsystem should worry about. So let's invoke via_nubus_init() earlier and make the platform responsible for bus unlocking and interrupt setup instead of the NuBus subsystem.
--- arch/m68k/mac/oss.c | 8 -------- arch/m68k/mac/via.c | 5 ++++- drivers/nubus/nubus.c | 13 ------------- 3 files changed, 4 insertions(+), 22 deletions(-)
arch/m68k/mac/oss.c +0 -8
@@ -52,14 +52,6 @@ void __init oss_init(void) }/* -* Initialize OSS for Nubus access -*/ - -void __init oss_nubus_init (void ) -{ -} - -/* * Handle miscellaneous OSS interrupts. */
arch/m68k/mac/via.c +4 -1
@@ -106,6 +106,7 @@ static int gIER,gIFR,gBufA,gBufB;static u8 nubus_disabled;void via_debug_dump (void ); +static void via_nubus_init (void );/* * Initialize the VIAs
@@ -238,6 +239,8 @@ void __init via_init(void) via2[vACR] &= ~0x03 ;/* disable port A & B latches */ } +via_nubus_init (); +/* Everything below this point is VIA2 only... */ if (rbv_present)
@@ -359,7 +362,7 @@ int via_get_cache_disable(void)* Initialize VIA2 for Nubus access */ -void __init via_nubus_init (void ) +static void __init via_nubus_init (void ) {/* unlock nubus transactions */
drivers/nubus/nubus.c +0 -13
@@ -18,11 +18,6 @@#include <asm/setup.h> #include <asm/page.h> #include <asm/hwtest.h> -#include <asm/mac_via.h> -#include <asm/mac_oss.h> - -extern void via_nubus_init (void ); -extern void oss_nubus_init (void );/* Constants */
@@ -840,14 +835,6 @@ static int __init nubus_init(void)if (!MACH_IS_MAC )return 0 ; -/* Initialize the NuBus interrupts */ -if (oss_present) { -oss_nubus_init (); - }else { -via_nubus_init (); - } - -/* And probe */ pr_info ("NuBus: Scanning NuBus slots.\n" ); nubus_devices =NULL ; nubus_boards =NULL ;
Signature · 1 line
2.13.6
PATCH 4/4 m68k/mac: Add mutual exclusion for IOP interrupt polling
In reply to Finn ThainThe IOP interrupt handler iop_ism_irq() is used by the adb-iop driver to poll for ADB request completion. Unfortunately, it is not re-entrant. Fix the race condition by adding an iop_ism_irq_poll() function with suitable mutual exclusion.
--- arch/m68k/include/asm/mac_iop.h | 1 + arch/m68k/mac/iop.c | 9 +++++++++ drivers/macintosh/adb-iop.c | 4 +--- 3 files changed, 11 insertions(+), 3 deletions(-)
arch/m68k/include/asm/mac_iop.h +1 -0
@@ -158,6 +158,7 @@ extern void iop_complete_message(struct iop_msg *);extern void iop_upload_code (uint ,__u8 *,uint ,__u16 );extern void iop_download_code (uint ,__u8 *,uint ,__u16 );extern __u8 *iop_compare_code (uint ,__u8 *,uint ,__u16 ); +extern void iop_ism_irq_poll (uint );extern void iop_register_interrupts (void );
arch/m68k/mac/iop.c +9 -0
@@ -598,3 +598,12 @@ irqreturn_t iop_ism_irq(int irq, void *dev_id) }return IRQ_HANDLED ; } + +void iop_ism_irq_poll (uint iop_num) +{ +unsigned long flags; + +local_irq_save (flags); +iop_ism_irq (0 , (void *)iop_num); +local_irq_restore (flags); +}
drivers/macintosh/adb-iop.c +1 -3
@@ -29,8 +29,6 @@/*#define DEBUG_ADB_IOP*/ -extern void iop_ism_irq (int ,void *); -static struct adb_request *current_req;static struct adb_request *last_req;#if 0
@@ -265,7 +263,7 @@ int adb_iop_autopoll(int devs)void adb_iop_poll (void ) {if (adb_iop_state == idle)adb_iop_start (); -iop_ism_irq (0 , (void *)ADB_IOP ); +iop_ism_irq_poll (ADB_IOP ); }int adb_iop_reset_bus (void )
Signature · 1 line
2.13.6
Hi Finn,
Quoted 5 lines · Finn Thain
Finn Thain (4):
m68k/mac: More printk modernization
m68k/mac: Disentangle VIA and OSS initialization m68k/mac: Disentangle VIA/RBV and NuBus initialization m68k/mac: Add mutual exclusion for IOP interrupt polling
Thanks, applied, and queued for v4.15.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds