Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/powerpc/pci temporary kludge for G5 - on mine some ...



details:   https://anonhg.NetBSD.org/src/rev/39f4c4fa2bdb
branches:  trunk
changeset: 786025:39f4c4fa2bdb
user:      macallan <macallan%NetBSD.org@localhost>
date:      Thu Apr 11 18:14:40 2013 +0000

description:
temporary kludge for G5 - on mine some devices are configured with interrupt
pin 0 but a valid IRQ line, so don't treat that as an error if PMAC_G5 is set

diffstat:

 sys/arch/powerpc/pci/pci_machdep_common.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 9247fdc11010 -r 39f4c4fa2bdb sys/arch/powerpc/pci/pci_machdep_common.c
--- a/sys/arch/powerpc/pci/pci_machdep_common.c Thu Apr 11 18:04:20 2013 +0000
+++ b/sys/arch/powerpc/pci/pci_machdep_common.c Thu Apr 11 18:14:40 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep_common.c,v 1.16 2013/01/18 06:21:12 matt Exp $ */
+/* $NetBSD: pci_machdep_common.c,v 1.17 2013/04/11 18:14:40 macallan Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep_common.c,v 1.16 2013/01/18 06:21:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep_common.c,v 1.17 2013/04/11 18:14:40 macallan Exp $");
 
 #define _POWERPC_BUS_DMA_PRIVATE
 
@@ -167,12 +167,17 @@
        printf("%s: pin: %d, line: %d\n", __func__, pin, line);
 #endif
 
+/*
+ * XXX
+ * on my G5 some devices are configured with pin == 0 but a valid IRQ line
+ */
+#ifndef PMAC_G5
        if (pin == 0) {
                /* No IRQ used. */
                aprint_error("pci_intr_map: interrupt pin %d\n", pin);
                goto bad;
        }
-
+#endif
        if (pin > 4) {
                aprint_error("pci_intr_map: bad interrupt pin %d\n", pin);
                goto bad;



Home | Main Index | Thread Index | Old Index