The branch main has been updated by mav:
URL:
https://cgit.FreeBSD.org/src/commit/?id=2a31a06bf1bb2d328d6672ed91c3e54734684cc0
commit 2a31a06bf1bb2d328d6672ed91c3e54734684cc0
Author: Alexander Motin <m...@freebsd.org>
AuthorDate: 2022-10-20 14:19:24 +0000
Commit: Alexander Motin <m...@freebsd.org>
CommitDate: 2022-10-20 14:19:24 +0000
Add random VMware device IDs.
Just to make dmesg look nicer there.
MFC after: 1 week
---
sys/dev/ahci/ahci_pci.c | 1 +
sys/dev/nvme/nvme_pci.c | 1 +
sys/dev/sound/pci/hda/hdac.c | 2 ++
sys/dev/sound/pci/hda/hdac.h | 9 +++++++++
sys/dev/sound/pci/hda/hdacc.c | 2 ++
sys/dev/usb/controller/ehci_pci.c | 6 ++++++
sys/dev/usb/controller/uhci_pci.c | 6 ++++++
sys/dev/usb/controller/xhci_pci.c | 8 ++++++++
8 files changed, 35 insertions(+)
diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c
index 15dbfe95ee3e..5bccb0dd914d 100644
--- a/sys/dev/ahci/ahci_pci.c
+++ b/sys/dev/ahci/ahci_pci.c
@@ -384,6 +384,7 @@ static const struct {
{0xa01c177d, 0x00, "ThunderX", AHCI_Q_ABAR0|AHCI_Q_1MSI},
{0x00311c36, 0x00, "Annapurna",
AHCI_Q_FORCE_PI|AHCI_Q_RESTORE_CAP|AHCI_Q_NOMSIX},
{0x1600144d, 0x00, "Samsung", AHCI_Q_NOMSI},
+ {0x07e015ad, 0x00, "VMware", 0},
{0x00000000, 0x00, NULL, 0}
};
diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c
index 73d319b37c62..5e7efa7f33bc 100644
--- a/sys/dev/nvme/nvme_pci.c
+++ b/sys/dev/nvme/nvme_pci.c
@@ -94,6 +94,7 @@ static struct _pcsid
{ 0x05401c5f, 0, 0, "Memblaze Pblaze4",
QUIRK_DELAY_B4_CHK_RDY },
{ 0xa821144d, 0, 0, "Samsung PM1725", QUIRK_DELAY_B4_CHK_RDY
},
{ 0xa822144d, 0, 0, "Samsung PM1725a", QUIRK_DELAY_B4_CHK_RDY
},
+ { 0x07f015ad, 0, 0, "VMware NVMe Controller" },
{ 0x00000000, 0, 0, NULL }
};
diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c
index 9db9db79a59f..39b5d5398bb3 100644
--- a/sys/dev/sound/pci/hda/hdac.c
+++ b/sys/dev/sound/pci/hda/hdac.c
@@ -200,6 +200,7 @@ static const struct {
{ HDA_AMD_HUDSON2, "AMD Hudson-2", 0, 0 },
{ HDA_RDC_M3010, "RDC M3010", 0, 0 },
{ HDA_VIA_VT82XX, "VIA VT8251/8237A",0, 0 },
+ { HDA_VMWARE, "VMware", 0, 0 },
{ HDA_SIS_966, "SiS 966/968", 0, 0 },
{ HDA_ULI_M5461, "ULI M5461", 0, 0 },
/* Unknown */
@@ -209,6 +210,7 @@ static const struct {
{ HDA_AMD_ALL, "AMD", 0, 0 },
{ HDA_CREATIVE_ALL, "Creative", 0, 0 },
{ HDA_VIA_ALL, "VIA", 0, 0 },
+ { HDA_VMWARE_ALL, "VMware", 0, 0 },
{ HDA_SIS_ALL, "SiS", 0, 0 },
{ HDA_ULI_ALL, "ULI", 0, 0 },
};
diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h
index 04dd9c643bcf..7c4e69b42bf8 100644
--- a/sys/dev/sound/pci/hda/hdac.h
+++ b/sys/dev/sound/pci/hda/hdac.h
@@ -201,6 +201,11 @@
#define HDA_VIA_VT82XX HDA_MODEL_CONSTRUCT(VIA, 0x3288)
#define HDA_VIA_ALL HDA_MODEL_CONSTRUCT(VIA, 0xffff)
+/* VMware */
+#define VMWARE_VENDORID 0x15ad
+#define HDA_VMWARE HDA_MODEL_CONSTRUCT(VMWARE, 0x1977)
+#define HDA_VMWARE_ALL HDA_MODEL_CONSTRUCT(VMWARE, 0xffff)
+
/* SiS */
#define SIS_VENDORID 0x1039
#define HDA_SIS_966 HDA_MODEL_CONSTRUCT(SIS, 0x7502)
@@ -841,6 +846,10 @@
#define HDA_CODEC_VT2020 HDA_CODEC_CONSTRUCT(VIA, 0x0441)
#define HDA_CODEC_VTXXXX HDA_CODEC_CONSTRUCT(VIA, 0xffff)
+/* VMware */
+#define HDA_CODEC_VMWARE HDA_CODEC_CONSTRUCT(VMWARE, 0x1975)
+#define HDA_CODEC_VMWAREXXXX HDA_CODEC_CONSTRUCT(VMWARE, 0xffff)
+
/* ATI */
#define HDA_CODEC_ATIRS600_1 HDA_CODEC_CONSTRUCT(ATI, 0x793c)
#define HDA_CODEC_ATIRS600_2 HDA_CODEC_CONSTRUCT(ATI, 0x7919)
diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c
index e48f0ec82f83..a91f1fa79dc0 100644
--- a/sys/dev/sound/pci/hda/hdacc.c
+++ b/sys/dev/sound/pci/hda/hdacc.c
@@ -397,6 +397,7 @@ static const struct {
{ HDA_CODEC_INTELALLK, 0, "Intel Alder Lake" },
{ HDA_CODEC_SII1390, 0, "Silicon Image SiI1390" },
{ HDA_CODEC_SII1392, 0, "Silicon Image SiI1392" },
+ { HDA_CODEC_VMWARE, 0, "VMware" },
/* Unknown CODECs */
{ HDA_CODEC_ADXXXX, 0, "Analog Devices" },
{ HDA_CODEC_AGEREXXXX, 0, "Lucent/Agere Systems" },
@@ -414,6 +415,7 @@ static const struct {
{ HDA_CODEC_NVIDIAXXXX, 0, "NVIDIA" },
{ HDA_CODEC_SIIXXXX, 0, "Silicon Image" },
{ HDA_CODEC_STACXXXX, 0, "Sigmatel" },
+ { HDA_CODEC_VMWAREXXXX, 0, "VMware" },
{ HDA_CODEC_VTXXXX, 0, "VIA" },
};
diff --git a/sys/dev/usb/controller/ehci_pci.c
b/sys/dev/usb/controller/ehci_pci.c
index ae285375228f..bee65e603a15 100644
--- a/sys/dev/usb/controller/ehci_pci.c
+++ b/sys/dev/usb/controller/ehci_pci.c
@@ -95,6 +95,7 @@ __FBSDID("$FreeBSD$");
#define PCI_EHCI_VENDORID_NVIDIA 0x12D2
#define PCI_EHCI_VENDORID_NVIDIA2 0x10DE
#define PCI_EHCI_VENDORID_VIA 0x1106
+#define PCI_EHCI_VENDORID_VMWARE 0x15ad
static device_probe_t ehci_pci_probe;
static device_attach_t ehci_pci_attach;
@@ -221,6 +222,8 @@ ehci_pci_match(device_t self)
case 0x31041106:
return ("VIA VT6202 USB 2.0 controller");
+ case 0x077015ad:
+ return ("VMware USB 2.0 controller");
default:
break;
}
@@ -403,6 +406,9 @@ ehci_pci_attach(device_t self)
case PCI_EHCI_VENDORID_VIA:
sprintf(sc->sc_vendor, "VIA");
break;
+ case PCI_EHCI_VENDORID_VMWARE:
+ sprintf(sc->sc_vendor, "VMware");
+ break;
default:
if (bootverbose)
device_printf(self, "(New EHCI DeviceId=0x%08x)\n",
diff --git a/sys/dev/usb/controller/uhci_pci.c
b/sys/dev/usb/controller/uhci_pci.c
index 370be7519109..f184713ecd8c 100644
--- a/sys/dev/usb/controller/uhci_pci.c
+++ b/sys/dev/usb/controller/uhci_pci.c
@@ -81,6 +81,7 @@ __FBSDID("$FreeBSD$");
#define PCI_UHCI_VENDORID_INTEL 0x8086
#define PCI_UHCI_VENDORID_HP 0x103c
#define PCI_UHCI_VENDORID_VIA 0x1106
+#define PCI_UHCI_VENDORID_VMWARE 0x15ad
/* PIIX4E has no separate stepping */
@@ -237,6 +238,8 @@ uhci_pci_match(device_t self)
case 0x30381106:
return ("VIA 83C572 USB controller");
+ case 0x077415ad:
+ return ("VMware USB controller");
default:
break;
}
@@ -327,6 +330,9 @@ uhci_pci_attach(device_t self)
case PCI_UHCI_VENDORID_VIA:
sprintf(sc->sc_vendor, "VIA");
break;
+ case PCI_UHCI_VENDORID_VMWARE:
+ sprintf(sc->sc_vendor, "VMware");
+ break;
default:
if (bootverbose) {
device_printf(self, "(New UHCI DeviceId=0x%08x)\n",
diff --git a/sys/dev/usb/controller/xhci_pci.c
b/sys/dev/usb/controller/xhci_pci.c
index e87489f32d14..95edb29422ed 100644
--- a/sys/dev/usb/controller/xhci_pci.c
+++ b/sys/dev/usb/controller/xhci_pci.c
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
#define PCI_XHCI_VENDORID_AMD 0x1022
#define PCI_XHCI_VENDORID_INTEL 0x8086
+#define PCI_XHCI_VENDORID_VMWARE 0x15ad
static device_probe_t xhci_pci_probe;
static device_detach_t xhci_pci_detach;
@@ -110,6 +111,10 @@ xhci_pci_match(device_t self)
case 0x79141022:
return ("AMD FCH USB 3.0 controller");
+ case 0x077815ad:
+ case 0x077915ad:
+ return ("VMware USB 3.0 controller");
+
case 0x145f1d94:
return ("Hygon USB 3.0 controller");
@@ -385,6 +390,9 @@ xhci_pci_attach(device_t self)
case PCI_XHCI_VENDORID_INTEL:
strlcpy(sc->sc_vendor, "Intel", sizeof(sc->sc_vendor));
break;
+ case PCI_XHCI_VENDORID_VMWARE:
+ strlcpy(sc->sc_vendor, "VMware", sizeof(sc->sc_vendor));
+ break;
default:
if (bootverbose)
device_printf(self, "(New XHCI DeviceId=0x%08x)\n",
