[src/trunk]: src/sys/arch/arm Fix more pci_conf_interrupt/pci_conf_hook problems

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

details:   https://anonhg.NetBSD.org/src/rev/3ad500df49a4
branches:  trunk
changeset: 781451:3ad500df49a4
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Sep 07 03:05:11 2012 +0000

description:
Fix more pci_conf_interrupt/pci_conf_hook problems

diffstat:

 sys/arch/arm/gemini/gemini_pci.c   |   6 +++---
 sys/arch/arm/ixp12x0/ixp12x0_pci.c |   8 +++++---
 sys/arch/arm/marvell/pci_machdep.c |   9 +++++----
 sys/arch/arm/s3c2xx0/s3c2800_pci.c |  16 ++++++++++------
 sys/arch/arm/xscale/i80312_pci.c   |   8 +++++---
 sys/arch/arm/xscale/i80321_pci.c   |   8 +++++---
 sys/arch/arm/xscale/ixp425_pci.c   |   8 +++++---
 7 files changed, 38 insertions(+), 25 deletions(-)

diffs (294 lines):

diff -r 6155df37fb44 -r 3ad500df49a4 sys/arch/arm/gemini/gemini_pci.c
--- a/sys/arch/arm/gemini/gemini_pci.c  Fri Sep 07 02:42:13 2012 +0000
+++ b/sys/arch/arm/gemini/gemini_pci.c  Fri Sep 07 03:05:11 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gemini_pci.c,v 1.12 2012/09/06 02:02:04 matt Exp $     */
+/*     $NetBSD: gemini_pci.c,v 1.13 2012/09/07 03:05:11 matt Exp $     */
 
 /* adapted from:
  *     NetBSD: i80312_pci.c,v 1.9 2005/12/11 12:16:51 christos Exp
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_pci.c,v 1.12 2012/09/06 02:02:04 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_pci.c,v 1.13 2012/09/07 03:05:11 matt Exp $");
 
 #include <sys/cdefs.h>
 
@@ -84,7 +84,7 @@
 pcireg_t       gemini_pci_conf_read(void *, pcitag_t, int);
 void           gemini_pci_conf_write(void *, pcitag_t, int, pcireg_t);
 int            gemini_pci_conf_hook(void *, int, int, int, pcireg_t);
-int            gemini_pci_conf_interrupt(void *, int, int, int, int, int *);
+void           gemini_pci_conf_interrupt(void *, int, int, int, int, int *);
 
 int            gemini_pci_intr_map(const struct pci_attach_args *,
                    pci_intr_handle_t *);
diff -r 6155df37fb44 -r 3ad500df49a4 sys/arch/arm/ixp12x0/ixp12x0_pci.c
--- a/sys/arch/arm/ixp12x0/ixp12x0_pci.c        Fri Sep 07 02:42:13 2012 +0000
+++ b/sys/arch/arm/ixp12x0/ixp12x0_pci.c        Fri Sep 07 03:05:11 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_pci.c,v 1.11 2012/01/27 18:52:51 para Exp $ */
+/* $NetBSD: ixp12x0_pci.c,v 1.12 2012/09/07 03:05:12 matt Exp $ */
 /*
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_pci.c,v 1.11 2012/01/27 18:52:51 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_pci.c,v 1.12 2012/09/07 03:05:12 matt Exp $");
 
 /*
  * PCI configuration support for IXP12x0 Network Processor chip.
@@ -60,6 +60,7 @@
 void ixp12x0_pci_decompose_tag(void *, pcitag_t, int *, int *, int *);
 pcireg_t ixp12x0_pci_conf_read(void *, pcitag_t, int);
 void ixp12x0_pci_conf_write(void *, pcitag_t, int, pcireg_t);
+void ixp12x0_pci_conf_interrupt(void *, int, int, int, int, int *);
 
 static vaddr_t ixp12x0_pci_conf_setup(void *, struct ixp12x0_softc *, pcitag_t, int);
 
@@ -92,6 +93,7 @@
        pc->pc_decompose_tag = ixp12x0_pci_decompose_tag;
        pc->pc_conf_read = ixp12x0_pci_conf_read;
        pc->pc_conf_write = ixp12x0_pci_conf_write;
+       pc->pc_conf_interrupt = ixp12x0_pci_conf_interrupt;
 
 #if NPCI > 0 && defined(PCI_NETBSD_CONFIGURE)
        ioext  = extent_create("pciio", 0, IXP12X0_PCI_IO_SIZE - 1,
@@ -111,7 +113,7 @@
 }
 
 void
-pci_conf_interrupt(pci_chipset_tag_t pc, int a, int b, int c, int d, int *p)
+ixp12x0_pci_conf_interrupt(void *v, int a, int b, int c, int d, int *p)
 {
        /* Nothing */
 }
diff -r 6155df37fb44 -r 3ad500df49a4 sys/arch/arm/marvell/pci_machdep.c
--- a/sys/arch/arm/marvell/pci_machdep.c        Fri Sep 07 02:42:13 2012 +0000
+++ b/sys/arch/arm/marvell/pci_machdep.c        Fri Sep 07 03:05:11 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_machdep.c,v 1.2 2011/04/04 20:37:46 dyoung Exp $   */
+/*     $NetBSD: pci_machdep.c,v 1.3 2012/09/07 03:05:12 matt Exp $     */
 /*
  * Copyright (c) 2008 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.2 2011/04/04 20:37:46 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.3 2012/09/07 03:05:12 matt Exp $");
 
 #include "opt_mvsoc.h"
 #include "gtpci.h"
@@ -97,6 +97,7 @@
 #ifdef __HAVE_PCI_CONF_HOOK
        gtpci_conf_hook,
 #endif
+       gtpci_conf_interrupt,
 };
 #endif
 
@@ -148,13 +149,13 @@
 #ifdef __HAVE_PCI_CONF_HOOK
        mvpex_conf_hook,
 #endif
+       mvpex_conf_interrupt,
 };
 #endif
 
 
 void
-pci_conf_interrupt(pci_chipset_tag_t v, int bus, int dev, int pin, int swiz,
-                  int *iline)
+gtpci_conf_interrupt(void *v, int bus, int dev, int pin, int swiz, int *iline)
 {
 
        /* nothing */
diff -r 6155df37fb44 -r 3ad500df49a4 sys/arch/arm/s3c2xx0/s3c2800_pci.c
--- a/sys/arch/arm/s3c2xx0/s3c2800_pci.c        Fri Sep 07 02:42:13 2012 +0000
+++ b/sys/arch/arm/s3c2xx0/s3c2800_pci.c        Fri Sep 07 03:05:11 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: s3c2800_pci.c,v 1.17 2012/01/27 18:52:51 para Exp $    */
+/*     $NetBSD: s3c2800_pci.c,v 1.18 2012/09/07 03:05:12 matt Exp $    */
 
 /*
  * Copyright (c) 2002 Fujitsu Component Limited
@@ -100,7 +100,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2800_pci.c,v 1.17 2012/01/27 18:52:51 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2800_pci.c,v 1.18 2012/09/07 03:05:12 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -144,6 +144,7 @@
 void   s3c2800_pci_decompose_tag(void *, pcitag_t, int *, int *, int *);
 pcireg_t s3c2800_pci_conf_read(void *, pcitag_t, int);
 void   s3c2800_pci_conf_write(void *, pcitag_t, int, pcireg_t);
+void   s3c2800_pci_conf_interrupt(void *, int, int, int, int, int *);
 int    s3c2800_pci_intr_map(const struct pci_attach_args *,
            pci_intr_handle_t *);
 const char *s3c2800_pci_intr_string(void *, pci_intr_handle_t);
@@ -206,7 +207,11 @@
        s3c2800_pci_intr_string,
        s3c2800_pci_intr_evcnt,
        s3c2800_pci_intr_establish,
-       s3c2800_pci_intr_disestablish
+       s3c2800_pci_intr_disestablish,
+#ifdef __HAVE_PCI_CONF_HOOK
+       NULL,
+#endif
+       s3c2800_pci_conf_interrupt,
 };
 
 
@@ -383,11 +388,10 @@
 
 
 void
-pci_conf_interrupt(pci_chipset_tag_t pc, int bus, int dev, int func,
-                  int swiz, int *iline)
+s3c2800_pci_conf_interrupt(void *v, int bus, int dev, int ipin, int swiz, int *iline)
 {
 #ifdef PCI_DEBUG
-       printf("pci_conf_interrupt(pc(%lx), bus(%d), dev(%d), func(%d), swiz(%d), *iline(%p)\n", (unsigned long) pc, bus, dev, func, swiz, iline);
+       printf("pci_conf_interrupt(v(%p), bus(%d), dev(%d), ipin(%d), swiz(%d), *iline(%p)\n", v, bus, dev, ipin, swiz, iline);
 #endif
        if (bus == 0) {
                *iline = dev;
diff -r 6155df37fb44 -r 3ad500df49a4 sys/arch/arm/xscale/i80312_pci.c
--- a/sys/arch/arm/xscale/i80312_pci.c  Fri Sep 07 02:42:13 2012 +0000
+++ b/sys/arch/arm/xscale/i80312_pci.c  Fri Sep 07 03:05:11 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i80312_pci.c,v 1.11 2012/01/27 18:52:51 para Exp $     */
+/*     $NetBSD: i80312_pci.c,v 1.12 2012/09/07 03:05:12 matt Exp $     */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80312_pci.c,v 1.11 2012/01/27 18:52:51 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80312_pci.c,v 1.12 2012/09/07 03:05:12 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -69,6 +69,7 @@
                    int *);
 pcireg_t       i80312_pci_conf_read(void *, pcitag_t, int);
 void           i80312_pci_conf_write(void *, pcitag_t, int, pcireg_t);
+void           i80312_pci_conf_interrupt(void *, int, int, int, int, int *);
 
 #define        PCI_CONF_LOCK(s)        (s) = disable_interrupts(I32_bit)
 #define        PCI_CONF_UNLOCK(s)      restore_interrupts((s))
@@ -90,6 +91,7 @@
        pc->pc_decompose_tag = i80312_pci_decompose_tag;
        pc->pc_conf_read = i80312_pci_conf_read;
        pc->pc_conf_write = i80312_pci_conf_write;
+       pc->pc_conf_interrupt = i80312_pci_conf_interrupt;
 
 #if NPCI > 0 && defined(PCI_NETBSD_CONFIGURE)
        /*
@@ -122,7 +124,7 @@
 }
 
 void
-pci_conf_interrupt(pci_chipset_tag_t pc, int a, int b, int c, int d, int *p)
+i80312_pci_conf_interrupt(void *v, int a, int b, int c, int d, int *p)
 {
 }
 
diff -r 6155df37fb44 -r 3ad500df49a4 sys/arch/arm/xscale/i80321_pci.c
--- a/sys/arch/arm/xscale/i80321_pci.c  Fri Sep 07 02:42:13 2012 +0000
+++ b/sys/arch/arm/xscale/i80321_pci.c  Fri Sep 07 03:05:11 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i80321_pci.c,v 1.12 2012/02/12 16:31:01 matt Exp $     */
+/*     $NetBSD: i80321_pci.c,v 1.13 2012/09/07 03:05:12 matt Exp $     */
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80321_pci.c,v 1.12 2012/02/12 16:31:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80321_pci.c,v 1.13 2012/09/07 03:05:12 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -70,6 +70,7 @@
                    int *);
 pcireg_t       i80321_pci_conf_read(void *, pcitag_t, int);
 void           i80321_pci_conf_write(void *, pcitag_t, int, pcireg_t);
+void           i80321_pci_conf_interrupt(void *, int, int, int, int, int *);
 
 #define        PCI_CONF_LOCK(s)        (s) = disable_interrupts(I32_bit)
 #define        PCI_CONF_UNLOCK(s)      restore_interrupts((s))
@@ -90,6 +91,7 @@
        pc->pc_decompose_tag = i80321_pci_decompose_tag;
        pc->pc_conf_read = i80321_pci_conf_read;
        pc->pc_conf_write = i80321_pci_conf_write;
+       pc->pc_conf_interrupt = i80321_pci_conf_interrupt;
 
 #if NPCI > 0 && defined(PCI_NETBSD_CONFIGURE)
        /*
@@ -131,7 +133,7 @@
 }
 
 void
-pci_conf_interrupt(pci_chipset_tag_t pc, int a, int b, int c, int d, int *p)
+i80321_pci_conf_interrupt(void *v, int a, int b, int c, int d, int *p)
 {
 }
 
diff -r 6155df37fb44 -r 3ad500df49a4 sys/arch/arm/xscale/ixp425_pci.c
--- a/sys/arch/arm/xscale/ixp425_pci.c  Fri Sep 07 02:42:13 2012 +0000
+++ b/sys/arch/arm/xscale/ixp425_pci.c  Fri Sep 07 03:05:11 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixp425_pci.c,v 1.8 2012/01/27 18:52:51 para Exp $ */
+/*     $NetBSD: ixp425_pci.c,v 1.9 2012/09/07 03:05:12 matt Exp $ */
 
 /*
  * Copyright (c) 2003
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp425_pci.c,v 1.8 2012/01/27 18:52:51 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_pci.c,v 1.9 2012/09/07 03:05:12 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -58,6 +58,7 @@
 void   ixp425_pci_decompose_tag(void *, pcitag_t, int *, int *, int *);
 void   ixp425_pci_conf_setup(void *, struct ixp425_softc *, pcitag_t, int);
 void   ixp425_pci_conf_write(void *, pcitag_t, int, pcireg_t);
+void   ixp425_pci_conf_interrupt(void *, int, int, int, int, int *);
 pcitag_t ixp425_pci_make_tag(void *, int, int, int);
 pcireg_t ixp425_pci_conf_read(void *, pcitag_t, int);
 
@@ -80,6 +81,7 @@
        pc->pc_decompose_tag = ixp425_pci_decompose_tag;
        pc->pc_conf_read = ixp425_pci_conf_read;
        pc->pc_conf_write = ixp425_pci_conf_write;
+       pc->pc_conf_interrupt = ixp425_pci_conf_interrupt;
 
        /*
         * Initialize the bus space tags.
@@ -105,7 +107,7 @@
 }
 
 void
-pci_conf_interrupt(pci_chipset_tag_t pc, int a, int b, int c, int d, int *p)
+ixp425_pci_conf_interrupt(void *v, int a, int b, int c, int d, int *p)
 {
 }