alpha: fixes for specific machine types
Files: arch/alpha/kernel/core_mcpcia.c arch/alpha/kernel/sys_rawhide.c include/asm-alpha/core_mcpcia.h Determine correct hose configuration; RAWHIDE family can have 2 or 4 hoses, so make sure non-existent hoses are ignored. arch/alpha/kernel/err_titan.c Supply a needed #include <asm/irq_regs.h> arch/alpha/kernel/module.c Add some useful output to the relocation overflow messages. arch/alpha/kernel/sys_noritake.c Supply necessary noritake_end_irq() to correct interrupt handling. This fixes a problem first noted by hangs during boot probing with a DE500-BA TULIP NIC present. arch/alpha/kernel/sys_sio.c Correct saving of original PIRQ register (PCI IRQ routing); change default PIRQ setting to leave PCI IRQs 9 and 14 free to be used for sound (Multia) and IDE (any), respectively. include/asm-alpha/io.h Supply the "isa_virt_to_bus" routine. Signed-off-by: Jay Estabrook <jay.estabrook@hp.com> Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Richard Henderson <rth@twiddle.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
8a93258ce3
commit
1b75b05b73
@@ -52,6 +52,9 @@ rawhide_update_irq_hw(int hose, int mask)
|
||||
*(vuip)MCPCIA_INT_MASK0(MCPCIA_HOSE2MID(hose));
|
||||
}
|
||||
|
||||
#define hose_exists(h) \
|
||||
(((h) < MCPCIA_MAX_HOSES) && (cached_irq_masks[(h)] != 0))
|
||||
|
||||
static inline void
|
||||
rawhide_enable_irq(unsigned int irq)
|
||||
{
|
||||
@@ -59,6 +62,9 @@ rawhide_enable_irq(unsigned int irq)
|
||||
|
||||
irq -= 16;
|
||||
hose = irq / 24;
|
||||
if (!hose_exists(hose)) /* if hose non-existent, exit */
|
||||
return;
|
||||
|
||||
irq -= hose * 24;
|
||||
mask = 1 << irq;
|
||||
|
||||
@@ -76,6 +82,9 @@ rawhide_disable_irq(unsigned int irq)
|
||||
|
||||
irq -= 16;
|
||||
hose = irq / 24;
|
||||
if (!hose_exists(hose)) /* if hose non-existent, exit */
|
||||
return;
|
||||
|
||||
irq -= hose * 24;
|
||||
mask = ~(1 << irq) | hose_irq_masks[hose];
|
||||
|
||||
@@ -93,6 +102,9 @@ rawhide_mask_and_ack_irq(unsigned int irq)
|
||||
|
||||
irq -= 16;
|
||||
hose = irq / 24;
|
||||
if (!hose_exists(hose)) /* if hose non-existent, exit */
|
||||
return;
|
||||
|
||||
irq -= hose * 24;
|
||||
mask1 = 1 << irq;
|
||||
mask = ~mask1 | hose_irq_masks[hose];
|
||||
@@ -169,6 +181,9 @@ rawhide_init_irq(void)
|
||||
|
||||
mcpcia_init_hoses();
|
||||
|
||||
/* Clear them all; only hoses that exist will be non-zero. */
|
||||
for (i = 0; i < MCPCIA_MAX_HOSES; i++) cached_irq_masks[i] = 0;
|
||||
|
||||
for (hose = hose_head; hose; hose = hose->next) {
|
||||
unsigned int h = hose->index;
|
||||
unsigned int mask = hose_irq_masks[h];
|
||||
|
Reference in New Issue
Block a user