Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-10]: src/sys/dev/pci Pull up following revision(s) (requested by ...
details: https://anonhg.NetBSD.org/src/rev/5e19ab0cc371
branches: netbsd-10
changeset: 373099:5e19ab0cc371
user: martin <martin%NetBSD.org@localhost>
date: Wed Jan 18 19:21:49 2023 +0000
description:
Pull up following revision(s) (requested by msaitoh in ticket #50):
sys/dev/pci/sdhc_pci.c: revision 1.20
sys/dev/pci/pcidevs: revision 1.1472
sys/dev/pci/pcidevs: revision 1.1473
sys/dev/pci/pcidevs: revision 1.1474
sys/dev/pci/pcidevs: revision 1.1475
sys/dev/pci/pcidevs: revision 1.1476
Update Intel Elkhart Lake devices.
Add Elkhart Lake Shared SRAM.
Fix typo. s/SSC/SCC/.
Fix typo. No functional change.
add Aquantia (Marvell) AQC113 ethernet devices and the variants
Add AMD Family 19h/1xh devices.
diffstat:
sys/dev/pci/pcidevs | 62 +++++++++++++++++++++++++++++++++++++++++++------
sys/dev/pci/sdhc_pci.c | 6 ++--
2 files changed, 57 insertions(+), 11 deletions(-)
diffs (184 lines):
diff -r 7032762871cb -r 5e19ab0cc371 sys/dev/pci/pcidevs
--- a/sys/dev/pci/pcidevs Fri Jan 13 19:15:32 2023 +0000
+++ b/sys/dev/pci/pcidevs Wed Jan 18 19:21:49 2023 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1471 2022/11/22 14:55:28 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1471.2.1 2023/01/18 19:21:49 martin Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -1054,11 +1054,38 @@
product AMD F17_7X_CCP 0x1486 Family17h/7xh Crypto
product AMD F17_3X_HDA 0x1487 17h/7xh HD Audio
product AMD F17_7X_USB3 0x149c Family17h/7xh USB 3.0 Host Controller
+product AMD F19_1X_IOMMU 0x149e 19h/7xh IOMMU
+product AMD F19_1X_PCIE_DUMMY_HB 0x149f 19h/7xh PCIe Dummy Host Bridge
+product AMD F19_1X_RC 0x14a4 19h/1xh Root Complex
+product AMD F19_1X_GPPB_0 0x14a5 19h/1xh PCIe GPP Bridge
+product AMD F19_1X_RCEC 0x14a6 19h/1xh RCEC
+product AMD F19_1X_INTNL_GPPB 0x14a7 19h/1xh Internal PCIe GPP Bridge
+product AMD F19_1X_GPPB_1 0x14aa 19h/1xh PCIe GPP Bridge
+product AMD F19_1X_GPPB_2 0x14ab 19h/1xh PCIe GPP Bridge
+product AMD F19_1X_PCIE_DUMMY_0 0x14ac 19h/1xh PCIe Dummy Function
+product AMD F19_1X_DF_0 0x14ad 19h/1xh Data Fabric
+product AMD F19_1X_DF_1 0x14ae 19h/1xh Data Fabric
+product AMD F19_1X_DF_2 0x14af 19h/1xh Data Fabric
+product AMD F19_1X_DF_3 0x14b0 19h/1xh Data Fabric
+product AMD F19_1X_DF_4 0x14b1 19h/1xh Data Fabric
+product AMD F19_1X_DF_5 0x14b2 19h/1xh Data Fabric
+product AMD F19_1X_DF_6 0x14b3 19h/1xh Data Fabric
+product AMD F19_1X_DF_7 0x14b4 19h/1xh Data Fabric
product AMD F17_AX_RC 0x14b5 17h/Axh Root Complex
product AMD F17_AX_IOMMU 0x14b6 17h/Axh IOMMU
product AMD F17_AX_PCIE_DUMMY_HB 0x14b7 17h/Axh PCIe Dummy Host Bridge
product AMD F17_AX_INTNL_GPPB_0 0x14b9 17h/Axh Internal GPP Bridge 0
product AMD F17_AX_GPPB 0x14ba 17h/Axh PCIe GPP Bridge
+product AMD F19_1X_NTB_0 0x14c0 19h/1xh Primary PCIe Non Transparent Bridge
+product AMD F19_1X_VNTB 0x14c1 19h/1xh Secondary vNTB
+product AMD F19_1X_PCIE_DUMMY_1 0x14c2 19h/1xh PCIe Dummy Function
+product AMD F19_1X_NTB_1 0x14c3 19h/1xh PCIe Non Transparent Bridge
+product AMD F19_1X_SWDS 0x14c4 19h/1xh Swith NBIF DS
+product AMD F19_1X_NVME 0x14c5 19h/1xh NVMe
+product AMD F19_1X_SWUS 0x14c6 19h/1xh Swith US in PCIe
+product AMD F19_1X_PSP 0x14ca 19h/1xh PSP
+product AMD F19_1X_ACP 0x14cb 19h/1xh ACP
+product AMD F19_1X_HDA 0x14cc 19h/1xh HD Audio
product AMD F19_6X_RC 0x14d8 19h/6xh Root Complex
product AMD F17_AX_XHCI_0 0x1503 17h/Axh USB 3.1 xHCI
product AMD F17_AX_XHCI_1 0x1504 17h/Axh USB 3.1 xHCI
@@ -1095,6 +1122,7 @@
product AMD F15_6X_HB 0x157b 15h/6xh Host Bridge
product AMD F15_6X_RP 0x157c 15h/6xh Root Port
product AMD F15_6X_HB_2 0x157d 15h/6xh Host Bridge
+product AMD F19_1X_XHCI 0x157f 19h/1xh USB 3.2
product AMD F16_30_HT 0x1580 Family16h HyperTransport Configuration
product AMD F16_30_ADDR 0x1581 Family16h Address Map Configuration
product AMD F16_30_DRAM 0x1582 Family16h DRAM Configuration
@@ -1404,17 +1432,25 @@
/* Aquantia Corp. */
product AQUANTIA AQC100 0x00b1 AQC100 10 Gigabit Network Adapter
+product AQUANTIA AQC113DEV 0x00c0 AQC113DEV 10 Gigabit Network Adapter
+product AQUANTIA AQC113 0x04c0 AQC113 10 Gigabit Network Adapter
product AQUANTIA AQC107 0x07b1 AQC107 10 Gigabit Network Adapter
product AQUANTIA AQC108 0x08b1 AQC108 5 Gigabit Network Adapter
product AQUANTIA AQC109 0x09b1 AQC109 2.5 Gigabit Network Adapter
product AQUANTIA AQC111 0x11b1 AQC111 5 Gigabit Network Adapter
+product AQUANTIA AQC116C 0x11c0 AQC116C Gigabit Network Adapter
product AQUANTIA AQC112 0x12b1 AQC112 2.5 Gigabit Network Adapter
+product AQUANTIA AQC115C 0x12c0 AQC115C 2.5 Gigabit Network Adapter
+product AQUANTIA AQC113C 0x14c0 AQC113C 10 Gigabit Network Adapter
+product AQUANTIA AQC113CA 0x34c0 AQC113CA 10 Gigabit Network Adapter
product AQUANTIA AQC100S 0x80b1 AQC100S 10 Gigabit Network Adapter
product AQUANTIA AQC107S 0x87b1 AQC107S 10 Gigabit Network Adapter
product AQUANTIA AQC108S 0x88b1 AQC108S 5 Gigabit Network Adapter
product AQUANTIA AQC109S 0x89b1 AQC109S 2.5 Gigabit Network Adapter
product AQUANTIA AQC111S 0x91b1 AQC111S 5 Gigabit Network Adapter
product AQUANTIA AQC112S 0x92b1 AQC112S 2.5 Gigabit Network Adapter
+product AQUANTIA AQC114CS 0x93c0 AQC114CS 5 Gigabit Network Adapter
+product AQUANTIA AQC113CS 0x94c0 AQC113CS 10 Gigabit Network Adapter
product AQUANTIA D100 0xd100 D100 10 Gigabit Network Adapter
product AQUANTIA D107 0xd107 D107 10 Gigabit Network Adapter
product AQUANTIA D108 0xd108 D108 5 Gigabit Network Adapter
@@ -4660,9 +4696,9 @@
product INTEL Z8K_LPIO1_SPI_1 0x228e Atom Z8000 LPIO1 SPI1
product INTEL Z8K_LPIO1_SPI_2 0x2290 Atom Z8000 LPIO1 SPI2
product INTEL BSW_PCU_SMB 0x2292 Braswell PCU SMBus
-product INTEL BSW_SSC_MMC 0x2294 Braswell SCC MMC Port
-product INTEL BSW_SSC_SDIO 0x2295 Braswell SCC SDIO Port
-product INTEL BSW_SSC_SD 0x2296 Braswell SCC SD Port
+product INTEL BSW_SCC_MMC 0x2294 Braswell SCC MMC Port
+product INTEL BSW_SCC_SDIO 0x2295 Braswell SCC SDIO Port
+product INTEL BSW_SCC_SD 0x2296 Braswell SCC SD Port
product INTEL BSW_TXE 0x2298 Braswell TXE
product INTEL BSW_PCU_LPC 0x229c Braswell PCU LPC
product INTEL BSW_AHCI 0x22a3 Braswell AHCI
@@ -5782,25 +5818,33 @@
product INTEL 5HS_H_ISH 0x43fc 500 Series PCH-H Integrated Sensor Hub
product INTEL 5HS_H_GSPI_3 0x43fd 500 Series PCH-H GSPI 3
product INTEL EHL_DPTF 0x4503 Elkhart Lake DPTF
+product INTEL EHL_TROUTER_2C_S 0x4510 Elkhart Lake Transaction Router (2C, Super SKU)
product INTEL EHL_GNA 0x4511 Elkhart Lake GNA
product INTEL EHL_TROUTER_3 0x4512 Elkhart Lake Transaction Router (SKU 3)
product INTEL EHL_TROUTER_5 0x4514 Elkhart Lake Transaction Router (SKU 5)
product INTEL EHL_TROUTER_8 0x4516 Elkhart Lake Transaction Router (SKU 8)
product INTEL EHL_TROUTER_12 0x4518 Elkhart Lake Transaction Router (SKU 12)
product INTEL EHL_TROUTER_3A 0x451e Elkhart Lake Transaction Router (SKU 3A)
+product INTEL EHL_TROUTER_4C_S 0x4520 Elkhart Lake Transaction Router (4C, Super SKU)
product INTEL EHL_TROUTER_1 0x4522 Elkhart Lake Transaction Router (SKU 1)
+product INTEL EHL_TROUTER_2_PREQS 0x4524 Elkhart Lake Transaction Router (SKU 2, pre-QS)
product INTEL EHL_TROUTER_4 0x4526 Elkhart Lake Transaction Router (SKU 4)
product INTEL EHL_TROUTER_6 0x4528 Elkhart Lake Transaction Router (SKU 6)
product INTEL EHL_TRACE_2 0x4529 Elkhart Lake Trace Hub (Compute Die)
product INTEL EHL_TROUTER_7 0x452a Elkhart Lake Transaction Router (SKU 7)
product INTEL EHL_TROUTER_9 0x452c Elkhart Lake Transaction Router (SKU 9)
product INTEL EHL_TROUTER_10 0x452e Elkhart Lake Transaction Router (SKU 10)
+product INTEL EHL_TROUTER_4C_S_2 0x4530 Elkhart Lake Transaction Router (4C, Super SKU)
product INTEL EHL_TROUTER_11 0x4532 Elkhart Lake Transaction Router (SKU 11)
product INTEL EHL_TROUTER_1A 0x4538 Elkhart Lake Transaction Router (SKU 1A)
product INTEL EHL_TROUTER_2 0x453a Elkhart Lake Transaction Router (SKU 2)
-product INTEL EHL_GPU_16 0x4551 Elkhart Lake GPU (16EU)
-product INTEL EHL_GPU_32_SUPER 0x4551 Elkhart Lake GPU (32EU Super)
-product INTEL EHL_GPU_32 0x4551 Elkhart Lake GPU (32EU)
+product INTEL EHL_GPU_8EU_S 0x4540 Elkhart Lake GPU (8EU Super)
+product INTEL EHL_GPU_8EU 0x4541 Elkhart Lake GPU (8EU Super)
+product INTEL EHL_GPU_16EU_S 0x4550 Elkhart Lake GPU (16EU Super)
+product INTEL EHL_GPU_16EU_OLD 0x4551 Elkhart Lake GPU (16EU)
+product INTEL EHL_GPU_16EU 0x4555 Elkhart Lake GPU (16EU)
+product INTEL EHL_GPU_32_S 0x4570 Elkhart Lake GPU (32EU Super)
+product INTEL EHL_GPU_32 0x4571 Elkhart Lake GPU (32EU)
product INTEL ADL_U15_2_8_HOST 0x4601 Alder Lake (U15,2+8) Host
product INTEL ADL_U9_2_8_HOST 0x4602 Alder Lake (U9,2+8) Host
product INTEL ADL_U15_2_4_HOST 0x4609 Alder Lake (U15,2+4) Host
@@ -5889,6 +5933,7 @@
product INTEL EHL_CAVS_7 0x4b5b Elkhart Lake cAVS
product INTEL EHL_CAVS_8 0x4b5c Elkhart Lake cAVS
product INTEL EHL_AHCI 0x4b60 Elkhart Lake AHCI
+product INTEL EHL_AHCI_2 0x4b63 Elkhart Lake AHCI
product INTEL EHL_HPET 0x4b68 Elkhart Lake HPET
product INTEL EHL_IOAPIC 0x4b69 Elkhart Lake IOAPIC
product INTEL EHL_CSE_PTTDMA 0x4b6b Elkhart Lake CSE PTT DMA
@@ -5903,6 +5948,7 @@
product INTEL EHL_SIO_I2C_3 0x4b7b Elkhart Lake SIO I2C 3
product INTEL EHL_XHCI 0x4b7d Elkhart Lake xHCI
product INTEL EHL_XDCI 0x4b7e Elkhart Lake xDCI
+product INTEL EHL_SSRAM 0x4b7f Elkhart Lake Shared SRAM
product INTEL EHL_PSE_QEP_1 0x4b81 Elkhart Lake PSE QEP 1
product INTEL EHL_PSE_QEP_2 0x4b82 Elkhart Lake PSE QEP 2
product INTEL EHL_PSE_QEP_3 0x4b83 Elkhart Lake PSE QEP 3
@@ -5925,7 +5971,7 @@
product INTEL EHL_PSE_ETH_0_SGMII_2_5G 0x4ba2 Elkhart Lake PSE Ethernet 0 (SGMII 2.5G)
product INTEL EHL_PSE_ETH_1_RGMII 0x4bb0 Elkhart Lake PSE Ethernet 1 (RGMII 1G)
product INTEL EHL_PSE_ETH_1_SGMII_1G 0x4bb1 Elkhart Lake PSE Ethernet 1 (SGMII 1G)
-product INTEL EHL_PSE_ETH_1_SGMII_2_5G 0x4bb2 Elkhart Lake PSE Ethernet 1 (SGMII 1G)
+product INTEL EHL_PSE_ETH_1_SGMII_2_5G 0x4bb2 Elkhart Lake PSE Ethernet 1 (SGMII 2.5G)
product INTEL EHL_PSE_LH2OSE 0x4bb3 Elkhart Lake PSE LH2OSE
product INTEL EHL_PSE_DMA_0 0x4bb4 Elkhart Lake PSE DMA 0
product INTEL EHL_PSE_DMA_1 0x4bb5 Elkhart Lake PSE DMA 1
diff -r 7032762871cb -r 5e19ab0cc371 sys/dev/pci/sdhc_pci.c
--- a/sys/dev/pci/sdhc_pci.c Fri Jan 13 19:15:32 2023 +0000
+++ b/sys/dev/pci/sdhc_pci.c Wed Jan 18 19:21:49 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc_pci.c,v 1.19 2022/10/14 07:54:49 jmcneill Exp $ */
+/* $NetBSD: sdhc_pci.c,v 1.19.2.1 2023/01/18 19:21:49 martin Exp $ */
/* $OpenBSD: sdhc_pci.c,v 1.7 2007/10/30 18:13:45 chl Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc_pci.c,v 1.19 2022/10/14 07:54:49 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc_pci.c,v 1.19.2.1 2023/01/18 19:21:49 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -157,7 +157,7 @@
{
PCI_VENDOR_INTEL,
- PCI_PRODUCT_INTEL_BSW_SSC_MMC,
+ PCI_PRODUCT_INTEL_BSW_SCC_MMC,
0xffff,
0xffff,
~0,
Home |
Main Index |
Thread Index |
Old Index