Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/pci Add Quark X1000 devices.



details:   https://anonhg.NetBSD.org/src/rev/3742ed5b96ba
branches:  trunk
changeset: 791179:3742ed5b96ba
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Nov 07 18:44:09 2013 +0000

description:
Add Quark X1000 devices.

diffstat:

 sys/dev/pci/if_bge.c       |     6 +-
 sys/dev/pci/pcidevs        |    13 +-
 sys/dev/pci/pcidevs.h      |    13 +-
 sys/dev/pci/pcidevs_data.h |  8785 ++++++++++++++++++++++---------------------
 4 files changed, 4434 insertions(+), 4383 deletions(-)

diffs (truncated from 11682 to 300 lines):

diff -r 9ad37c18b418 -r 3742ed5b96ba sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c      Thu Nov 07 18:18:59 2013 +0000
+++ b/sys/dev/pci/if_bge.c      Thu Nov 07 18:44:09 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bge.c,v 1.262 2013/10/31 06:01:39 msaitoh Exp $     */
+/*     $NetBSD: if_bge.c,v 1.263 2013/11/07 18:44:09 msaitoh Exp $     */
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.262 2013/10/31 06:01:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.263 2013/11/07 18:44:09 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -3724,6 +3724,7 @@
        else
                sc->bge_dmatag = pa->pa_dmat;
 
+#if 0
        /* 40bit DMA workaround */
        if (sizeof(bus_addr_t) > 4) {
                if ((sc->bge_flags & BGEF_40BIT_BUG) != 0) {
@@ -3739,6 +3740,7 @@
                        }
                }
        }
+#endif
        DPRINTFN(5, ("bus_dmamem_alloc\n"));
        if (bus_dmamem_alloc(sc->bge_dmatag, sizeof(struct bge_ring_data),
                             PAGE_SIZE, 0, &sc->bge_ring_seg, 1,
diff -r 9ad37c18b418 -r 3742ed5b96ba sys/dev/pci/pcidevs
--- a/sys/dev/pci/pcidevs       Thu Nov 07 18:18:59 2013 +0000
+++ b/sys/dev/pci/pcidevs       Thu Nov 07 18:44:09 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1163 2013/11/07 14:33:09 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1164 2013/11/07 18:44:09 msaitoh Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2556,6 +2556,15 @@
 product INTEL WIFI_LINK_2230_1 0x0887  Centrino Wireless-N 2230
 product INTEL WIFI_LINK_2230_2 0x0888  Centrino Wireless-N 2230
 product INTEL WIFI_LINK_6235   0x088e  Centrino Advanced-N 6235
+product INTEL X1000_SDIO_EMMC  0x08a7  Quark X1000 SDIO/eMMC
+product INTEL X1000_I2C_GPIO   0x0934  Quark X1000 I2C and GPIO
+product INTEL X1000_SPI                0x0935  Quark X1000 SPI
+product INTEL X1000_HS_UART    0x0936  Quark X1000 HS-UART
+product INTEL X1000_MAC                0x0937  Quark X1000 10/100 Ethernet MAC
+product INTEL X1000_EHCI       0x0939  Quark X1000 EHCI
+product INTEL X1000_OHCI       0x093a  Quark X1000 OHCI
+product INTEL X1000_HB         0x0958  Quark X1000 Host Bridge
+product INTEL X1000_LB         0x095e  Quark X1000 Legacy Bridge
 product INTEL 80960RM          0x0962  i960 RM PCI-PCI
 product INTEL 80960RN          0x0964  i960 RN PCI-PCI
 product INTEL CORE4G_D_ULT_GT1 0x0a02  HD Graphics
@@ -2725,6 +2734,8 @@
 product INTEL 82815_FULL_GRAPH 0x1132  82815 Graphics
 product INTEL 82806AA          0x1161  82806AA PCI64 Hub Advanced Programmable Interrupt Controller
 product INTEL ADI_BECC         0x1162  ADI i80200 Big Endian Companion Chip
+product INTEL X1000_PCIE_0     0x11c3  Quark X1000 PCIe Root Port
+product INTEL X1000_PCIE_1     0x11c4  Quark X1000 PCIe Root Port
 product INTEL IXP1200          0x1200  IXP1200 Network Processor
 product INTEL 82559ER          0x1209  82559ER Fast Ethernet LAN Controller
 product INTEL 82092AA          0x1222  82092AA IDE Controller
diff -r 9ad37c18b418 -r 3742ed5b96ba sys/dev/pci/pcidevs.h
--- a/sys/dev/pci/pcidevs.h     Thu Nov 07 18:18:59 2013 +0000
+++ b/sys/dev/pci/pcidevs.h     Thu Nov 07 18:44:09 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcidevs.h,v 1.1155 2013/11/07 14:33:33 msaitoh Exp $   */
+/*     $NetBSD: pcidevs.h,v 1.1156 2013/11/07 18:44:09 msaitoh Exp $   */
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -2563,6 +2563,15 @@
 #define        PCI_PRODUCT_INTEL_WIFI_LINK_2230_1      0x0887          /* Centrino Wireless-N 2230 */
 #define        PCI_PRODUCT_INTEL_WIFI_LINK_2230_2      0x0888          /* Centrino Wireless-N 2230 */
 #define        PCI_PRODUCT_INTEL_WIFI_LINK_6235        0x088e          /* Centrino Advanced-N 6235 */
+#define        PCI_PRODUCT_INTEL_X1000_SDIO_EMMC       0x08a7          /* Quark X1000 SDIO/eMMC */
+#define        PCI_PRODUCT_INTEL_X1000_I2C_GPIO        0x0934          /* Quark X1000 I2C and GPIO */
+#define        PCI_PRODUCT_INTEL_X1000_SPI     0x0935          /* Quark X1000 SPI */
+#define        PCI_PRODUCT_INTEL_X1000_HS_UART 0x0936          /* Quark X1000 HS-UART */
+#define        PCI_PRODUCT_INTEL_X1000_MAC     0x0937          /* Quark X1000 10/100 Ethernet MAC */
+#define        PCI_PRODUCT_INTEL_X1000_EHCI    0x0939          /* Quark X1000 EHCI */
+#define        PCI_PRODUCT_INTEL_X1000_OHCI    0x093a          /* Quark X1000 OHCI */
+#define        PCI_PRODUCT_INTEL_X1000_HB      0x0958          /* Quark X1000 Host Bridge */
+#define        PCI_PRODUCT_INTEL_X1000_LB      0x095e          /* Quark X1000 Legacy Bridge */
 #define        PCI_PRODUCT_INTEL_80960RM       0x0962          /* i960 RM PCI-PCI */
 #define        PCI_PRODUCT_INTEL_80960RN       0x0964          /* i960 RN PCI-PCI */
 #define        PCI_PRODUCT_INTEL_CORE4G_D_ULT_GT1      0x0a02          /* HD Graphics */
@@ -2732,6 +2741,8 @@
 #define        PCI_PRODUCT_INTEL_82815_FULL_GRAPH      0x1132          /* 82815 Graphics */
 #define        PCI_PRODUCT_INTEL_82806AA       0x1161          /* 82806AA PCI64 Hub Advanced Programmable Interrupt Controller */
 #define        PCI_PRODUCT_INTEL_ADI_BECC      0x1162          /* ADI i80200 Big Endian Companion Chip */
+#define        PCI_PRODUCT_INTEL_X1000_PCIE_0  0x11c3          /* Quark X1000 PCIe Root Port */
+#define        PCI_PRODUCT_INTEL_X1000_PCIE_1  0x11c4          /* Quark X1000 PCIe Root Port */
 #define        PCI_PRODUCT_INTEL_IXP1200       0x1200          /* IXP1200 Network Processor */
 #define        PCI_PRODUCT_INTEL_82559ER       0x1209          /* 82559ER Fast Ethernet LAN Controller */
 #define        PCI_PRODUCT_INTEL_82092AA       0x1222          /* 82092AA IDE Controller */
diff -r 9ad37c18b418 -r 3742ed5b96ba sys/dev/pci/pcidevs_data.h
--- a/sys/dev/pci/pcidevs_data.h        Thu Nov 07 18:18:59 2013 +0000
+++ b/sys/dev/pci/pcidevs_data.h        Thu Nov 07 18:44:09 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcidevs_data.h,v 1.1154 2013/11/07 14:33:33 msaitoh Exp $      */
+/*     $NetBSD: pcidevs_data.h,v 1.1155 2013/11/07 18:44:09 msaitoh Exp $      */
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -3886,28 +3886,46 @@
            16880, 16915, 17081, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6235, 
            16880, 16889, 17086, 0,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X1000_SDIO_EMMC, 
+           17091, 17097, 17103, 0,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X1000_I2C_GPIO, 
+           17091, 17097, 17113, 558, 17117, 0,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X1000_SPI, 
+           17091, 17097, 17122, 0,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X1000_HS_UART, 
+           17091, 17097, 17126, 0,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X1000_MAC, 
+           17091, 17097, 5596, 5494, 17134, 0,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X1000_EHCI, 
+           17091, 17097, 8031, 0,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X1000_OHCI, 
+           17091, 17097, 8026, 0,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X1000_HB, 
+           17091, 17097, 6736, 6340, 0,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X1000_LB, 
+           17091, 17097, 17138, 6340, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_80960RM, 
-           17091, 17096, 8062, 0,
+           17145, 17150, 8062, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_80960RN, 
-           17091, 17099, 8062, 0,
+           17145, 17153, 8062, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE4G_D_ULT_GT1, 
            8269, 1716, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE4G_M_HOST_DRAM, 
-           17102, 17107, 17110, 6736, 17119, 7774, 0,
+           17156, 17161, 17164, 6736, 17173, 7774, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE4G_M_ULT_GT1, 
-           8269, 1716, 17127, 0,
+           8269, 1716, 17181, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE4G_S_ULT_GT1, 
            8269, 1716, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE4G_R_ULT_GT1_1, 
            8269, 1716, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE4G_M_MINI_HDA, 
-           17102, 17107, 17110, 17133, 8269, 17138, 0,
+           17156, 17161, 17164, 17187, 8269, 17192, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE4G_R_ULT_GT1_2, 
            8269, 1716, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE4G_D_ULT_GT2, 
            8269, 1716, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE4G_M_ULT_GT2, 
-           8269, 1716, 17144, 0,
+           8269, 1716, 17198, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE4G_S_ULT_GT2, 
            8269, 1716, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE4G_R_ULT_GT2_1, 
@@ -3917,431 +3935,435 @@
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE4G_D_ULT_GT3, 
            8269, 1716, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE4G_M_ULT_GT3, 
-           8269, 1716, 17150, 17155, 0,
+           8269, 1716, 17204, 17209, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE4G_S_ULT_GT3, 
            8269, 1716, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE4G_R_ULT_GT3_1, 
            8269, 1716, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE4G_R_ULT_GT3_2, 
-           17161, 1716, 17166, 0,
+           17215, 1716, 17220, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_HASWELL_HOST_DRAM, 
-           17011, 6736, 17119, 7774, 0,
+           17011, 6736, 17173, 7774, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_HASWELL_PCIE16, 
-           17011, 15626, 17171, 6232, 0,
+           17011, 15626, 17225, 6232, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_HASWELL_PCIE8, 
-           17011, 15626, 17175, 6232, 0,
+           17011, 15626, 17229, 6232, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_HASWELL_PCIE4, 
-           17011, 15626, 17178, 6232, 0,
+           17011, 15626, 17232, 6232, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_HASWELL_MINI_HDA, 
-           17011, 17133, 8269, 6831, 6232, 0,
+           17011, 17187, 8269, 6831, 6232, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82542, 
-           17181, 5486, 5494, 0,
+           17235, 5486, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_FIBER, 
-           17188, 17197, 5494, 0,
+           17242, 17251, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_MODEM56, 
            5711, 5541, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_COPPER, 
-           17207, 7654, 5494, 0,
+           17261, 7654, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_COPPER, 
-           17216, 7654, 5494, 0,
+           17270, 7654, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_FIBER, 
-           17216, 17197, 5494, 0,
+           17270, 17251, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC_COPPER, 
-           17225, 7654, 5494, 0,
+           17279, 7654, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC_LOM, 
-           17225, 17234, 5486, 5494, 0,
+           17279, 17288, 5486, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EM, 
-           17240, 7654, 5494, 0,
+           17294, 7654, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_COPPER, 
-           17249, 7654, 5494, 0,
+           17303, 7654, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_COPPER, 
-           17258, 7654, 5494, 0,
+           17312, 7654, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_FIBER, 
-           17249, 17197, 5494, 0,
+           17303, 17251, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_FIBER, 
-           17258, 17197, 5494, 0,
+           17312, 17251, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI, 
-           17267, 5486, 5494, 0,
+           17321, 5486, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541ER_LOM, 
-           17276, 17234, 5486, 5494, 0,
+           17330, 17288, 5486, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EM_LOM, 
-           17240, 17234, 5486, 5494, 0,
+           17294, 17288, 5486, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LOM, 
-           17285, 17234, 5486, 5494, 0,
+           17339, 17288, 5486, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP, 
-           17285, 5486, 5494, 0,
+           17339, 5486, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MOBILE, 
-           17267, 17294, 5486, 5494, 0,
+           17321, 17348, 5486, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI, 
-           17301, 5486, 5494, 0,
+           17355, 5486, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_MOBILE, 
-           17301, 17294, 5486, 5494, 0,
+           17355, 17348, 5486, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_QUAD, 
-           17258, 7654, 5494, 0,
+           17312, 7654, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LP, 
-           17285, 5486, 5494, 0,
+           17339, 5486, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_COPPER, 
-           17310, 7654, 5494, 0,
+           17364, 7654, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_FIBER, 
-           17310, 17197, 5494, 0,
+           17364, 17251, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_SERDES, 
-           17310, 5486, 5494, 17319, 0,
+           17364, 5486, 5494, 17373, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_100, 
-           17328, 5494, 0,
+           17382, 5494, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_IN_BUSINESS, 
-           17336, 2439, 5494, 4534, 6232, 0,
+           17390, 2439, 5494, 4534, 6232, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_100_VE_0, 
-           17328, 17347, 3888, 6232, 0,
+           17382, 17401, 3888, 6232, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_100_VE_1, 
-           17328, 17347, 3888, 6232, 0,
+           17382, 17401, 3888, 6232, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_100_VM_0, 
-           17328, 17350, 3888, 6232, 0,
+           17382, 17404, 3888, 6232, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_100_VM_1, 
-           17328, 17350, 3888, 6232, 0,
+           17382, 17404, 3888, 6232, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82562EH_HPNA_0, 
-           17353, 7926, 3888, 6232, 0,
+           17407, 7926, 3888, 6232, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82562EH_HPNA_1, 
-           17353, 7926, 3888, 6232, 0,
+           17407, 7926, 3888, 6232, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82562EH_HPNA_2, 
-           17353, 7926, 3888, 6232, 0,
+           17407, 7926, 3888, 6232, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_100_VM_2, 
-           17328, 17350, 3888, 6232, 0,
+           17382, 17404, 3888, 6232, 0,
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_100_VE_2, 



Home | Main Index | Thread Index | Old Index