[src/netbsd-1-5]: src/sys/arch/alpha/pci Pull up revisions 1.20-1.21 (request...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fab677c42d52
branches:  netbsd-1-5
changeset: 491086:fab677c42d52
user:      he <he%NetBSD.org@localhost>
date:      Wed Apr 04 18:00:17 2001 +0000

description:
Pull up revisions 1.20-1.21 (requested by ross):
  Fix a Miata panic-on-boot due to an unusual SRM irq routing.

diffstat:

 sys/arch/alpha/pci/pci_550.c |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (49 lines):

diff -r 2a8c2657e424 -r fab677c42d52 sys/arch/alpha/pci/pci_550.c
--- a/sys/arch/alpha/pci/pci_550.c      Wed Apr 04 17:56:40 2001 +0000
+++ b/sys/arch/alpha/pci/pci_550.c      Wed Apr 04 18:00:17 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_550.c,v 1.17 2000/06/06 00:50:15 thorpej Exp $ */
+/* $NetBSD: pci_550.c,v 1.17.2.1 2001/04/04 18:00:17 he Exp $ */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_550.c,v 1.17 2000/06/06 00:50:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_550.c,v 1.17.2.1 2001/04/04 18:00:17 he Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -120,11 +120,10 @@
 /*
  * Some Miata models, notably models with a Cypress PCI-ISA bridge, have
  * a PCI device (the OHCI USB controller) with interrupts tied to ISA IRQ
- * lines.  This IRQ is encoded as:
- *
- *     line = 0xe0 | isa_irq;
+ * lines.  This IRQ is encoded as: line = FLAG | isa_irq. Usually FLAG
+ * is 0xe0, however, it can be 0xf0.  We don't allow 0xf0 | irq15.
  */
-#define        DEC_550_LINE_IS_ISA(line)       ((line) >= 0xe0 && (line) <= 0xef)
+#define        DEC_550_LINE_IS_ISA(line)       ((line) >= 0xe0 && (line) <= 0xfe)
 #define        DEC_550_LINE_ISA_IRQ(line)      ((line) & 0x0f)
 
 struct alpha_shared_intr *dec_550_pci_intr;
@@ -253,10 +252,11 @@
        }
 #endif
 
-       if (DEC_550_LINE_IS_ISA(line) == 0 && line >= DEC_550_MAX_IRQ)
-               panic("dec_550_intr_map: dec 550 irq too large (%d)\n",
-                   line);
-
+       if (DEC_550_LINE_IS_ISA(line) == 0 && line >= DEC_550_MAX_IRQ) {
+               printf("dec_550_intr_map: irq %d out of range %d/%d/%d\n",
+                   line, bus, device, function);
+               return (1);
+       }
        *ihp = line;
        return (0);
 }