Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Add a new member, pc_super, to x86's pci_chipset_ta...
details: https://anonhg.NetBSD.org/src/rev/f213802f836d
branches: trunk
changeset: 753017:f213802f836d
user: dyoung <dyoung%NetBSD.org@localhost>
date: Sun Mar 14 20:19:06 2010 +0000
description:
Add a new member, pc_super, to x86's pci_chipset_tag: pc.pc_super points
to the tag that pc inherits its behavior from. Add code to deal with
pc.pc_super.
Pull identical declarations out of xen/include/pci_machdep.h and
x86/include/pci_machdep.h into x86/include/pci_machdep_common.h.
diffstat:
sys/arch/x86/include/pci_machdep.h | 120 +----------------------
sys/arch/x86/include/pci_machdep_common.h | 157 ++++++++++++++++++++++++++++++
sys/arch/x86/pci/pci_intr_machdep.c | 55 ++++++++--
sys/arch/x86/pci/pci_machdep.c | 46 ++++++--
sys/arch/xen/include/pci_machdep.h | 104 +------------------
5 files changed, 242 insertions(+), 240 deletions(-)
diffs (truncated from 620 to 300 lines):
diff -r 2b5e705ff959 -r f213802f836d sys/arch/x86/include/pci_machdep.h
--- a/sys/arch/x86/include/pci_machdep.h Sun Mar 14 19:30:50 2010 +0000
+++ b/sys/arch/x86/include/pci_machdep.h Sun Mar 14 20:19:06 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.13 2010/02/25 20:48:34 dyoung Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.14 2010/03/14 20:19:06 dyoung Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -34,126 +34,10 @@
#define _X86_PCI_MACHDEP_H_
/*
- * Machine-specific definitions for PCI autoconfiguration.
- */
-#define __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH
-
-/*
- * i386-specific PCI structure and type definitions.
- * NOT TO BE USED DIRECTLY BY MACHINE INDEPENDENT CODE.
- *
- * Configuration tag; created from a {bus,device,function} triplet by
- * pci_make_tag(), and passed to pci_conf_read() and pci_conf_write().
- * We could instead always pass the {bus,device,function} triplet to
- * the read and write routines, but this would cause extra overhead.
- *
- * Mode 2 is historical and deprecated by the Revision 2.0 specification.
- */
-union x86_pci_tag_u {
- uint32_t mode1;
- struct {
- uint16_t port;
- uint8_t enable;
- uint8_t forward;
- } mode2;
-};
-
-extern struct x86_bus_dma_tag pci_bus_dma_tag;
-#ifdef _LP64
-extern struct x86_bus_dma_tag pci_bus_dma64_tag;
-#endif
-
-struct pci_chipset_tag;
-struct pci_attach_args;
-
-/*
* Types provided to machine-independent PCI code
*/
-typedef struct pci_chipset_tag *pci_chipset_tag_t;
-typedef union x86_pci_tag_u pcitag_t;
typedef int pci_intr_handle_t;
-struct pci_chipset_tag {
- pcireg_t (*pc_conf_read)(pci_chipset_tag_t, pcitag_t, int);
-
- void (*pc_conf_write)(pci_chipset_tag_t, pcitag_t, int, pcireg_t);
-
-#if 0
- int (*pc_find_rom)(struct pci_attach_args *, bus_space_tag_t,
- bus_space_handle_t, int, bus_space_handle_t *, bus_space_size_t *);
-#endif
-
- int (*pc_intr_map)(struct pci_attach_args *, pci_intr_handle_t *);
-
- const char *(*pc_intr_string)(pci_chipset_tag_t, pci_intr_handle_t);
-
- const struct evcnt *(*pc_intr_evcnt)(pci_chipset_tag_t,
- pci_intr_handle_t);
-
- void *(*pc_intr_establish)(pci_chipset_tag_t, pci_intr_handle_t, int,
- int (*)(void *), void *);
-
- void (*pc_intr_disestablish)(pci_chipset_tag_t, void *);
-
- pcitag_t (*pc_make_tag)(pci_chipset_tag_t, int, int, int);
-
- void (*pc_decompose_tag)(pci_chipset_tag_t, pcitag_t,
- int *, int *, int *);
-};
-
-/*
- * i386-specific PCI variables and functions.
- * NOT TO BE USED DIRECTLY BY MACHINE INDEPENDENT CODE.
- */
-void pci_mode_set(int);
-int pci_mode_detect(void);
-int pci_bus_flags(void);
-
-/*
- * Functions provided to machine-independent PCI code.
- */
-void pci_attach_hook(struct device *, struct device *,
- struct pcibus_attach_args *);
-int pci_bus_maxdevs(pci_chipset_tag_t, int);
-pcitag_t pci_make_tag(pci_chipset_tag_t, int, int, int);
-void pci_decompose_tag(pci_chipset_tag_t, pcitag_t,
- int *, int *, int *);
-pcireg_t pci_conf_read(pci_chipset_tag_t, pcitag_t, int);
-void pci_conf_write(pci_chipset_tag_t, pcitag_t, int,
- pcireg_t);
-int pci_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
-const char *pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t);
-const struct evcnt *pci_intr_evcnt(pci_chipset_tag_t, pci_intr_handle_t);
-void *pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
- int, int (*)(void *), void *);
-void pci_intr_disestablish(pci_chipset_tag_t, void *);
-
-
-/*
- * ALL OF THE FOLLOWING ARE MACHINE-DEPENDENT, AND SHOULD NOT BE USED
- * BY PORTABLE CODE.
- */
-
-/* Extract Bus Number for a host bridge or -1 if unknown. */
-int pchb_get_bus_number(pci_chipset_tag_t, pcitag_t);
-
-/*
- * Section 6.2.4, `Miscellaneous Functions' of the PCI Specification,
- * says that 255 means `unknown' or `no connection' to the interrupt
- * controller on a PC.
- */
-#define X86_PCI_INTERRUPT_LINE_NO_CONNECTION 0xff
-
-void pci_device_foreach(pci_chipset_tag_t, int,
- void (*)(pci_chipset_tag_t, pcitag_t, void*),
- void *);
-
-void pci_device_foreach_min(pci_chipset_tag_t, int, int,
- void (*)(pci_chipset_tag_t, pcitag_t, void*),
- void *);
-
-void pci_bridge_foreach(pci_chipset_tag_t, int, int,
- void (*) (pci_chipset_tag_t, pcitag_t, void *), void *);
-
+#include <x86/pci_machdep_common.h>
#endif /* _X86_PCI_MACHDEP_H_ */
diff -r 2b5e705ff959 -r f213802f836d sys/arch/x86/include/pci_machdep_common.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/x86/include/pci_machdep_common.h Sun Mar 14 20:19:06 2010 +0000
@@ -0,0 +1,157 @@
+/* $NetBSD: pci_machdep_common.h,v 1.1 2010/03/14 20:19:06 dyoung Exp $ */
+
+/*
+ * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
+ * Copyright (c) 1994 Charles M. Hannum. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Charles M. Hannum.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _X86_PCI_MACHDEP_COMMON_H_
+#define _X86_PCI_MACHDEP_COMMON_H_
+
+/*
+ * Machine-specific definitions for PCI autoconfiguration.
+ */
+#define __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH
+
+/*
+ * i386-specific PCI structure and type definitions.
+ * NOT TO BE USED DIRECTLY BY MACHINE INDEPENDENT CODE.
+ *
+ * Configuration tag; created from a {bus,device,function} triplet by
+ * pci_make_tag(), and passed to pci_conf_read() and pci_conf_write().
+ * We could instead always pass the {bus,device,function} triplet to
+ * the read and write routines, but this would cause extra overhead.
+ *
+ * Mode 2 is historical and deprecated by the Revision 2.0 specification.
+ */
+union x86_pci_tag_u {
+ uint32_t mode1;
+ struct {
+ uint16_t port;
+ uint8_t enable;
+ uint8_t forward;
+ } mode2;
+};
+
+extern struct x86_bus_dma_tag pci_bus_dma_tag;
+#ifdef _LP64
+extern struct x86_bus_dma_tag pci_bus_dma64_tag;
+#endif
+
+struct pci_attach_args;
+struct pci_chipset_tag;
+
+/*
+ * Types provided to machine-independent PCI code
+ */
+typedef struct pci_chipset_tag *pci_chipset_tag_t;
+typedef union x86_pci_tag_u pcitag_t;
+
+struct pci_chipset_tag {
+ pci_chipset_tag_t pc_super;
+ pcireg_t (*pc_conf_read)(pci_chipset_tag_t, pcitag_t, int);
+
+ void (*pc_conf_write)(pci_chipset_tag_t, pcitag_t, int, pcireg_t);
+
+#if 0
+ int (*pc_find_rom)(struct pci_attach_args *, bus_space_tag_t,
+ bus_space_handle_t, int, bus_space_handle_t *, bus_space_size_t *);
+#endif
+
+ int (*pc_intr_map)(struct pci_attach_args *, pci_intr_handle_t *);
+
+ const char *(*pc_intr_string)(pci_chipset_tag_t, pci_intr_handle_t);
+
+ const struct evcnt *(*pc_intr_evcnt)(pci_chipset_tag_t,
+ pci_intr_handle_t);
+
+ void *(*pc_intr_establish)(pci_chipset_tag_t, pci_intr_handle_t, int,
+ int (*)(void *), void *);
+
+ void (*pc_intr_disestablish)(pci_chipset_tag_t, void *);
+
+ pcitag_t (*pc_make_tag)(pci_chipset_tag_t, int, int, int);
+
+ void (*pc_decompose_tag)(pci_chipset_tag_t, pcitag_t,
+ int *, int *, int *);
+};
+
+/*
+ * i386-specific PCI variables and functions.
+ * NOT TO BE USED DIRECTLY BY MACHINE INDEPENDENT CODE.
+ */
+int pci_bus_flags(void);
+int pci_mode_detect(void);
+void pci_mode_set(int);
+
+/*
+ * Functions provided to machine-independent PCI code.
+ */
+void pci_attach_hook(device_t, device_t,
+ struct pcibus_attach_args *);
+int pci_bus_maxdevs(pci_chipset_tag_t, int);
+pcitag_t pci_make_tag(pci_chipset_tag_t, int, int, int);
+void pci_decompose_tag(pci_chipset_tag_t, pcitag_t,
+ int *, int *, int *);
+pcireg_t pci_conf_read(pci_chipset_tag_t, pcitag_t, int);
+void pci_conf_write(pci_chipset_tag_t, pcitag_t, int,
+ pcireg_t);
+int pci_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
+const char *pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t);
+const struct evcnt *pci_intr_evcnt(pci_chipset_tag_t, pci_intr_handle_t);
+void *pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
+ int, int (*)(void *), void *);
+void pci_intr_disestablish(pci_chipset_tag_t, void *);
+
+/*
+ * ALL OF THE FOLLOWING ARE MACHINE-DEPENDENT, AND SHOULD NOT BE USED
+ * BY PORTABLE CODE.
+ */
+
+/* Extract Bus Number for a host bridge or -1 if unknown. */
+int pchb_get_bus_number(pci_chipset_tag_t, pcitag_t);
+
+/*
+ * Section 6.2.4, `Miscellaneous Functions' of the PCI Specification,
+ * says that 255 means `unknown' or `no connection' to the interrupt
+ * controller on a PC.
+ */
+#define X86_PCI_INTERRUPT_LINE_NO_CONNECTION 0xff
+
+void pci_device_foreach(pci_chipset_tag_t, int,
+ void (*)(pci_chipset_tag_t, pcitag_t, void*),
+ void *);
+
+void pci_device_foreach_min(pci_chipset_tag_t, int, int,
+ void (*)(pci_chipset_tag_t, pcitag_t, void*),
+ void *);
+
+void pci_bridge_foreach(pci_chipset_tag_t, int, int,
+ void (*) (pci_chipset_tag_t, pcitag_t, void *), void *);
+
+#endif /* _X86_PCI_MACHDEP_COMMON_H_ */
diff -r 2b5e705ff959 -r f213802f836d sys/arch/x86/pci/pci_intr_machdep.c
--- a/sys/arch/x86/pci/pci_intr_machdep.c Sun Mar 14 19:30:50 2010 +0000
Home |
Main Index |
Thread Index |
Old Index