[src/trunk]: src/sys/arch/hppa/dev config space accesses to device 15 functio...

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

details:   https://anonhg.NetBSD.org/src/rev/b4d6ad970409
branches:  trunk
changeset: 1015173:b4d6ad970409
user:      macallan <macallan%NetBSD.org@localhost>
date:      Fri Oct 16 17:59:46 2020 +0000

description:
config space accesses to device 15 function 7 cause a machine check exception
on my C200, so weed them out.
Now we can scan the PCI buses without crashing.

diffstat:

 sys/arch/hppa/dev/dino.c |  20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r d934a6f6f998 -r b4d6ad970409 sys/arch/hppa/dev/dino.c
--- a/sys/arch/hppa/dev/dino.c  Fri Oct 16 17:50:44 2020 +0000
+++ b/sys/arch/hppa/dev/dino.c  Fri Oct 16 17:59:46 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dino.c,v 1.6 2020/06/14 01:40:04 chs Exp $ */
+/*     $NetBSD: dino.c,v 1.7 2020/10/16 17:59:46 macallan Exp $ */
 
 /*     $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.6 2020/06/14 01:40:04 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.7 2020/10/16 17:59:46 macallan Exp $");
 
 /* #include "cardbus.h" */
 
@@ -345,10 +345,17 @@
        if ((unsigned int)reg >= PCI_CONF_SIZE)
                return (pcireg_t) -1;
 
+       /*
+        * XXX
+        * accessing dev 1f / func 7 on the 2nd Dino causes a machine check
+        * exception on my C200
+        */
+       if ((tag & 0xff00) == 0xff00) return -1;
+
        /* fix arbitration errata by disabling all pci devs on config read */
        pamr = r->pamr;
        r->pamr = 0;
-
+       
        r->pci_addr = tag | reg;
        data = r->pci_conf_data;
 
@@ -368,6 +375,13 @@
        if ((unsigned int)reg >= PCI_CONF_SIZE)
                return;
 
+       /*
+        * XXX
+        * accessing dev 1f / func 7 on the 2nd Dino causes a machine check
+        * exception on my C200
+        */
+       if ((tag & 0xff00) == 0xff00) return;
+
        /* fix arbitration errata by disabling all pci devs on config read */
        pamr = r->pamr;
        r->pamr = 0;