Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenFirmware on machines with the "Grackle" bridge assign an 'AAPL,interrupts' 

property instead of 'interrupt-map' and 'interrupt-map-mask' properties.
Adjust for this by checking for the latter, and if they're not present
(and the parent isn't 'pci-bridge'), then look for 'AAPL,interrupts'.

Problem analyzed and patched by Tim Kelly on port-macppc.  I modified the
patch to move the fallback into find_node_intr(), tweaking some previously-
disabled code.
This commit is contained in:
briggs 2004-12-07 13:22:51 +00:00
parent 540bb5dcef
commit 6fec1d4f73
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/arch/macppc/pci/pci_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci_machdep.c,v 1.25 2004/04/08 23:58:24 matt Exp $ */
/* $NetBSD: pci_machdep.c,v 1.26 2004/12/07 13:22:51 briggs Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.25 2004/04/08 23:58:24 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.26 2004/12/07 13:22:51 briggs Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -494,12 +494,13 @@ nomap:
#endif
}
#if 0
/* XXX This may be wrong... */
len = OF_getprop(node, "interrupts", intr, 4) ;
/*
* If all else fails, attempt to get AAPL, interrupts property.
* Grackle, at least, uses this instead of above in some cases.
*/
len = OF_getprop(node, "AAPL,interrupts", intr, 4) ;
if (len == 4)
return len;
#endif
return -1;
}