[illumos-gate merge]

commit 430062b0bc38ddbe5eda3921705af71cd2c44260
    14333 libsmedia: this 'if' clause does not guard...
commit 9ccfd38e64be4d6a2c01daa15fe7f5627122bdc2
    14338 units: this 'if' clause does not guard...
commit a73f84128431389b9c4004ced8cbbe6945a2bd45
    14339 bhyve: build errors with gcc 11
commit d9339210baa8b029caa3e70d216a09ec1bbc7647
    14331 mr_sas: this 'if' clause does not guard...
commit 3d6d4f792e72bec8b227212e65f7555396295d84
    14342 svccfg cleanup dumps core in create_instance_list
commit b3619796d92b4472acfed6b7c813f83cef335013
    14257 Errors for ct_pr_event_get_senderct in the manual
commit 3a27ad4a9822ecb5402cb375bd3250c9ce715439
    14324 December 2021 hwdata update
commit 7957df47ba71407f1d0517aa3f34f1bdde135b84
    14357 Update prototypes to 2022
commit a7aaa5137d50ab434a012fa67192f75b383f3d48
    14313 smbios(1) does not check for success on libsmbios calls
commit 058c1d469107d655c5b92e9ffb2f0d30314f9e78
    14312 bhyve smbios type 3 structure is incorrect

30 files changed, 522 insertions, 112 deletions

diff --git a/usr/src/cmd/bhyve/Makefile b/usr/src/cmd/bhyve/Makefile
index c29270bb25..59568ecc9b 100644
--- a/usr/src/cmd/bhyve/Makefile
+++ b/usr/src/cmd/bhyve/Makefile
@@ -135,13 +135,16 @@ CPPFLAGS =	-I$(COMPAT)/bhyve -I$(CONTRIB)/bhyve \
 
 pci_nvme.o := CERRWARN += -_gcc=-Wno-pointer-sign
 pci_nvme.o := CERRWARN += -_gcc10=-Wno-address-of-packed-member
+pci_nvme.o := CERRWARN += -_gcc11=-Wno-address-of-packed-member
 pci_nvme.o := SMOFF += kmalloc_wrong_size
 
 pci_passthru.o := CERRWARN += -_gcc10=-Wno-address-of-packed-member
+pci_passthru.o := CERRWARN += -_gcc11=-Wno-address-of-packed-member
 
 pci_virtio_9p.o := SMOFF += kmalloc_wrong_size
 
 pci_xhci.o := CERRWARN += -_gcc10=-Wno-address-of-packed-member
+pci_xhci.o := CERRWARN += -_gcc11=-Wno-address-of-packed-member
 
 SMOFF += all_func_returns,leaks,no_if_block
 
diff --git a/usr/src/cmd/bhyve/pci_passthru.c b/usr/src/cmd/bhyve/pci_passthru.c
index 30f0823726..55e2f66e99 100644
--- a/usr/src/cmd/bhyve/pci_passthru.c
+++ b/usr/src/cmd/bhyve/pci_passthru.c
@@ -662,6 +662,7 @@ passthru_init(struct vmctx *ctx, struct pci_devinst *pi, nvlist_t *nvl)
 	struct passthru_softc *sc;
 	const char *path;
 
+	pptfd = -1;
 	sc = NULL;
 	error = 1;
 
@@ -700,7 +701,8 @@ passthru_init(struct vmctx *ctx, struct pci_devinst *pi, nvlist_t *nvl)
 done:
 	if (error) {
 		free(sc);
-		vm_unassign_pptdev(ctx, pptfd);
+		if (pptfd != -1)
+			vm_unassign_pptdev(ctx, pptfd);
 	}
 	return (error);
 }
@@ -733,10 +735,10 @@ msicap_access(struct passthru_softc *sc, int coff)
 static int
 msixcap_access(struct passthru_softc *sc, int coff)
 {
-	if (sc->psc_msix.capoff == 0) 
+	if (sc->psc_msix.capoff == 0)
 		return (0);
 
-	return (coff >= sc->psc_msix.capoff && 
+	return (coff >= sc->psc_msix.capoff &&
 	        coff < sc->psc_msix.capoff + MSIX_CAPLEN);
 }
 
diff --git a/usr/src/cmd/bhyve/smbiostbl.c b/usr/src/cmd/bhyve/smbiostbl.c
index 379374ea27..6fd8cbac81 100644
--- a/usr/src/cmd/bhyve/smbiostbl.c
+++ b/usr/src/cmd/bhyve/smbiostbl.c
@@ -200,6 +200,7 @@ struct smbios_table_type3 {
 	uint8_t			psstate;	/* power supply state */
 	uint8_t			tstate;		/* thermal state */
 	uint8_t			security;	/* security status */
+	uint32_t		oemdata;	/* OEM-specific data */
 	uint8_t			uheight;	/* height in 'u's */
 	uint8_t			cords;		/* number of power cords */
 	uint8_t			elems;		/* number of element records */
@@ -418,6 +419,7 @@ struct smbios_table_type3 smbios_type3_template = {
 	SMBIOS_CHST_SAFE,
 	SMBIOS_CHST_SAFE,
 	SMBIOS_CHSC_NONE,
+	0,		/* OEM specific data, we have none */
 	0,		/* height in 'u's (0=enclosure height unspecified) */
 	0,		/* number of power cords (0=number unspecified) */
 	0,		/* number of contained element records */
diff --git a/usr/src/cmd/smbios/smbios.c b/usr/src/cmd/smbios/smbios.c
index 31d12b77fc..bd6a009feb 100644
--- a/usr/src/cmd/smbios/smbios.c
+++ b/usr/src/cmd/smbios/smbios.c
@@ -373,7 +373,10 @@ print_bios(smbios_hdl_t *shp, FILE *fp)
 {
 	smbios_bios_t b;
 
-	(void) smbios_info_bios(shp, &b);
+	if (smbios_info_bios(shp, &b) == -1) {
+		smbios_warn(shp, "failed to read BIOS information");
+		return;
+	}
 
 	str_print(fp, "  Vendor", b.smbb_vendor);
 	str_print(fp, "  Version String", b.smbb_version);
@@ -423,7 +426,10 @@ print_system(smbios_hdl_t *shp, FILE *fp)
 	smbios_system_t s;
 	uint_t i;
 
-	(void) smbios_info_system(shp, &s);
+	if (smbios_info_system(shp, &s) == -1) {
+		smbios_warn(shp, "failed to read system information");
+		return;
+	}
 
 	/*
 	 * SMBIOS definition section 3.3.2.1 is clear that the first three
@@ -466,7 +472,10 @@ print_bboard(smbios_hdl_t *shp, id_t id, FILE *fp)
 	smbios_bboard_t b;
 	int chdl_cnt;
 
-	(void) smbios_info_bboard(shp, id, &b);
+	if (smbios_info_bboard(shp, id, &b) != 0) {
+		smbios_warn(shp, "failed to read baseboard information");
+		return;
+	}
 
 	oprintf(fp, "  Chassis: %u\n", (uint_t)b.smbb_chassis);
 
@@ -503,7 +512,10 @@ print_chassis(smbios_hdl_t *shp, id_t id, FILE *fp)
 	smbios_chassis_entry_t *elts;
 	uint_t nelts, i;
 
-	(void) smbios_info_chassis(shp, id, &c);
+	if (smbios_info_chassis(shp, id, &c) != 0) {
+		smbios_warn(shp, "failed to read chassis information");
+		return;
+	}
 
 	oprintf(fp, "  OEM Data: 0x%x\n", c.smbc_oemdata);
 	str_print(fp, "  SKU Number",
@@ -566,7 +578,10 @@ print_processor(smbios_hdl_t *shp, id_t id, FILE *fp)
 	smbios_processor_t p;
 	uint_t status;
 
-	(void) smbios_info_processor(shp, id, &p);
+	if (smbios_info_processor(shp, id, &p) != 0) {
+		smbios_warn(shp, "failed to read processor information");
+		return;
+	}
 	status = SMB_PRSTATUS_STATUS(p.smbp_status);
 
 	desc_printf(smbios_processor_family_desc(p.smbp_family),
@@ -656,7 +671,10 @@ print_cache(smbios_hdl_t *shp, id_t id, FILE *fp)
 {
 	smbios_cache_t c;
 
-	(void) smbios_info_cache(shp, id, &c);
+	if (smbios_info_cache(shp, id, &c) != 0) {
+		smbios_warn(shp, "failed to read cache information");
+		return;
+	}
 
 	oprintf(fp, "  Level: %u\n", c.smba_level);
 	oprintf(fp, "  Maximum Installed Size: %" PRIu64 " bytes\n",
@@ -705,7 +723,10 @@ print_port(smbios_hdl_t *shp, id_t id, FILE *fp)
 {
 	smbios_port_t p;
 
-	(void) smbios_info_port(shp, id, &p);
+	if (smbios_info_port(shp, id, &p) != 0) {
+		smbios_warn(shp, "failed to read port information");
+		return;
+	}
 
 	str_print(fp, "  Internal Reference Designator", p.smbo_iref);
 	str_print(fp, "  External Reference Designator", p.smbo_eref);
@@ -726,7 +747,10 @@ print_slot(smbios_hdl_t *shp, id_t id, FILE *fp)
 	smbios_slot_t s;
 	smbios_version_t v;
 
-	(void) smbios_info_slot(shp, id, &s);
+	if (smbios_info_slot(shp, id, &s) != 0) {
+		smbios_warn(shp, "failed to read slot information");
+		return;
+	}
 	smbios_info_smbios_version(shp, &v);
 
 	str_print(fp, "  Reference Designator", s.smbl_name);
@@ -828,7 +852,11 @@ print_obdevs_ext(smbios_hdl_t *shp, id_t id, FILE *fp)
 	smbios_obdev_ext_t oe;
 	const char *type;
 
-	(void) smbios_info_obdevs_ext(shp, id, &oe);
+	if (smbios_info_obdevs_ext(shp, id, &oe) != 0) {
+		smbios_warn(shp, "failed to read extended on-board devices "
+		    "information");
+		return;
+	}
 
 	/*
 	 * Bit 7 is always whether or not the device is enabled while bits 0:6
@@ -855,7 +883,11 @@ print_obdevs(smbios_hdl_t *shp, id_t id, FILE *fp)
 
 	if ((argc = smbios_info_obdevs(shp, id, 0, NULL)) > 0) {
 		argv = alloca(sizeof (smbios_obdev_t) * argc);
-		(void) smbios_info_obdevs(shp, id, argc, argv);
+		if (smbios_info_obdevs(shp, id, argc, argv) == -1) {
+			smbios_warn(shp, "failed to read on-board device "
+			    "information");
+			return;
+		}
 		for (i = 0; i < argc; i++)
 			str_print_nolabel(fp, "  ", argv[i].smbd_name);
 	}
@@ -869,7 +901,11 @@ print_strtab(smbios_hdl_t *shp, id_t id, FILE *fp)
 
 	if ((argc = smbios_info_strtab(shp, id, 0, NULL)) > 0) {
 		argv = alloca(sizeof (char *) * argc);
-		(void) smbios_info_strtab(shp, id, argc, argv);
+		if (smbios_info_strtab(shp, id, argc, argv) == -1) {
+			smbios_warn(shp, "failed to read string table "
+			    "information");
+			return;
+		}
 		for (i = 0; i < argc; i++)
 			str_print_nolabel(fp, "  ", argv[i]);
 	}
@@ -880,7 +916,10 @@ print_lang(smbios_hdl_t *shp, id_t id, FILE *fp)
 {
 	smbios_lang_t l;
 
-	(void) smbios_info_lang(shp, &l);
+	if (smbios_info_lang(shp, &l) == -1) {
+		smbios_warn(shp, "failed to read language information");
+		return;
+	}
 
 	str_print(fp, "  Current Language", l.smbla_cur);
 	oprintf(fp, "  Language String Format: %u\n", l.smbla_fmt);
@@ -897,7 +936,10 @@ print_evlog(smbios_hdl_t *shp, id_t id, FILE *fp)
 	smbios_evlog_t ev;
 	uint32_t i;
 
-	(void) smbios_info_eventlog(shp, &ev);
+	if (smbios_info_eventlog(shp, &ev) == -1) {
+		smbios_warn(shp, "failed to read event log information");
+		return;
+	}
 
 	oprintf(fp, "  Log Area Size: %lu bytes\n", (ulong_t)ev.smbev_size);
 	oprintf(fp, "  Header Offset: %lu\n", (ulong_t)ev.smbev_hdr);
@@ -983,7 +1025,10 @@ print_memarray(smbios_hdl_t *shp, id_t id, FILE *fp)
 {
 	smbios_memarray_t ma;
 
-	(void) smbios_info_memarray(shp, id, &ma);
+	if (smbios_info_memarray(shp, id, &ma) != 0) {
+		smbios_warn(shp, "failed to read memarray information");
+		return;
+	}
 
 	desc_printf(smbios_memarray_loc_desc(ma.smbma_location),
 	    fp, "  Location: %u", ma.smbma_location);
@@ -1005,7 +1050,10 @@ print_memdevice(smbios_hdl_t *shp, id_t id, FILE *fp)
 {
 	smbios_memdevice_t md;
 
-	(void) smbios_info_memdevice(shp, id, &md);
+	if (smbios_info_memdevice(shp, id, &md) != 0) {
+		smbios_warn(shp, "failed to read memory device information");
+		return;
+	}
 
 	id_printf(fp, "  Physical Memory Array: ", md.smbmd_array);
 	id_printf(fp, "  Memory Error Data: ", md.smbmd_error);
@@ -1160,7 +1208,10 @@ print_memarrmap(smbios_hdl_t *shp, id_t id, FILE *fp)
 {
 	smbios_memarrmap_t ma;
 
-	(void) smbios_info_memarrmap(shp, id, &ma);
+	if (smbios_info_memarrmap(shp, id, &ma) != 0) {
+		smbios_warn(shp, "failed to read memory array map information");
+		return;
+	}
 
 	id_printf(fp, "  Physical Memory Array: ", ma.smbmam_array);
 	oprintf(fp, "  Devices per Row: %u\n", ma.smbmam_width);
@@ -1174,7 +1225,11 @@ print_memdevmap(smbios_hdl_t *shp, id_t id, FILE *fp)
 {
 	smbios_memdevmap_t md;
 
-	(void) smbios_info_memdevmap(shp, id, &md);
+	if (smbios_info_memdevmap(shp, id, &md) != 0) {
+		smbios_warn(shp, "failed to read memory device map "
+		    "information");
+		return;
+	}
 
 	id_printf(fp, "  Memory Device: ", md.smbmdm_device);
 	id_printf(fp, "  Memory Array Mapped Address: ", md.smbmdm_arrmap);
@@ -1192,7 +1247,10 @@ print_hwsec(smbios_hdl_t *shp, FILE *fp)
 {
 	smbios_hwsec_t h;
 
-	(void) smbios_info_hwsec(shp, &h);
+	if (smbios_info_hwsec(shp, &h) == -1) {
+		smbios_warn(shp, "failed to read hwsec information");
+		return;
+	}
 
 	desc_printf(smbios_hwsec_desc(h.smbh_pwr_ps),
 	    fp, "  Power-On Password Status: %u", h.smbh_pwr_ps);
@@ -1430,7 +1488,10 @@ print_boot(smbios_hdl_t *shp, FILE *fp)
 {
 	smbios_boot_t b;
 
-	(void) smbios_info_boot(shp, &b);
+	if (smbios_info_boot(shp, &b) == -1) {
+		smbios_warn(shp, "failed to read boot information");
+		return;
+	}
 
 	desc_printf(smbios_boot_desc(b.smbt_status),
 	    fp, "  Boot Status Code: 0x%x", b.smbt_status);
@@ -1446,7 +1507,10 @@ print_ipmi(smbios_hdl_t *shp, FILE *fp)
 {
 	smbios_ipmi_t i;
 
-	(void) smbios_info_ipmi(shp, &i);
+	if (smbios_info_ipmi(shp, &i) == -1) {
+		smbios_warn(shp, "failed to read ipmi information");
+		return;
+	}
 
 	desc_printf(smbios_ipmi_type_desc(i.smbip_type),
 	    fp, "  Type: %u", i.smbip_type);
@@ -1644,7 +1708,11 @@ print_extprocessor(smbios_hdl_t *shp, id_t id, FILE *fp)
 	if (check_oem(shp) != 0)
 		return;
 
-	(void) smbios_info_extprocessor(shp, id, &ep);
+	if (smbios_info_extprocessor(shp, id, &ep) != 0) {
+		smbios_warn(shp, "failed to read extended processor "
+		    "information");
+		return;
+	}
 
 	oprintf(fp, "  Processor: %u\n", ep.smbpe_processor);
 	oprintf(fp, "  FRU: %u\n", ep.smbpe_fru);
@@ -1664,7 +1732,10 @@ print_extport(smbios_hdl_t *shp, id_t id, FILE *fp)
 	if (check_oem(shp) != 0)
 		return;
 
-	(void) smbios_info_extport(shp, id, &epo);
+	if (smbios_info_extport(shp, id, &epo) != 0) {
+		smbios_warn(shp, "failed to read extended port information");
+		return;
+	}
 
 	oprintf(fp, "  Chassis Handle: %u\n", epo.smbporte_chassis);
 	oprintf(fp, "  Port Connector Handle: %u\n", epo.smbporte_port);
@@ -1681,7 +1752,10 @@ print_pciexrc(smbios_hdl_t *shp, id_t id, FILE *fp)
 	if (check_oem(shp) != 0)
 		return;
 
-	(void) smbios_info_pciexrc(shp, id, &pcie);
+	if (smbios_info_pciexrc(shp, id, &pcie) != 0) {
+		smbios_warn(shp, "failed to read pciexrc information");
+		return;
+	}
 
 	oprintf(fp, "  Component ID: %u\n", pcie.smbpcie_bb);
 	oprintf(fp, "  BDF: 0x%x\n", pcie.smbpcie_bdf);
@@ -1695,7 +1769,10 @@ print_extmemarray(smbios_hdl_t *shp, id_t id, FILE *fp)
 	if (check_oem(shp) != 0)
 		return;
 
-	(void) smbios_info_extmemarray(shp, id, &em);
+	if (smbios_info_extmemarray(shp, id, &em) != 0) {
+		smbios_warn(shp, "failed to read extmemarray information");
+		return;
+	}
 
 	oprintf(fp, "  Physical Memory Array Handle: %u\n", em.smbmae_ma);
 	oprintf(fp, "  Component Parent Handle: %u\n", em.smbmae_comp);
@@ -1711,7 +1788,10 @@ print_extmemdevice(smbios_hdl_t *shp, id_t id, FILE *fp)
 	if (check_oem(shp) != 0)
 		return;
 
-	(void) smbios_info_extmemdevice(shp, id, &emd);
+	if (smbios_info_extmemdevice(shp, id, &emd) != 0) {
+		smbios_warn(shp, "failed to read extmemdevice information");
+		return;
+	}
 
 	oprintf(fp, "  Memory Device Handle: %u\n", emd.smbmdeve_md);
 	oprintf(fp, "  DRAM Channel: %u\n", emd.smbmdeve_drch);
diff --git a/usr/src/cmd/svc/svccfg/svccfg_libscf.c b/usr/src/cmd/svc/svccfg/svccfg_libscf.c
index 629d7817f7..1e565d795f 100644
--- a/usr/src/cmd/svc/svccfg/svccfg_libscf.c
+++ b/usr/src/cmd/svc/svccfg/svccfg_libscf.c
@@ -16254,7 +16254,7 @@ create_instance_list(scf_service_t *svc, int wohandcrafted)
 	scf_instance_t  *inst;
 	scf_iter_t	*inst_iter;
 	uu_list_t	*instances;
-	char		*instname;
+	char		*instname = NULL;
 	int		r;
 
 	inst_iter = scf_iter_create(g_hndl);
diff --git a/usr/src/cmd/units/units.c b/usr/src/cmd/units/units.c
index 9a25b9ff00..c7738ea6b3 100644
--- a/usr/src/cmd/units/units.c
+++ b/usr/src/cmd/units/units.c
@@ -4,7 +4,7 @@
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
+/*	  All Rights Reserved	*/
 
 /*
  * Copyright (c) 1980 Regents of the University of California.
@@ -12,8 +12,6 @@
  * specifies the terms and conditions for redistribution.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <locale.h>
 #include <signal.h>
@@ -39,7 +37,7 @@ struct prefix
 {
 	double	factor;
 	char	*pname;
-} prefix[] = 
+} prefix[] =
 {
 	1e-21,	"zepto",
 	1e-24,	"yocto",
@@ -93,7 +91,7 @@ main(int argc, char *argv[])
 	char *file;
 	struct unit u1, u2;
 	double f;
-	
+
 	(void) setlocale(LC_ALL, "");
 #if !defined(TEXT_DOMAIN)
 #define TEXT_DOMAIN "SYS_TEST"
@@ -177,11 +175,12 @@ pu(int u, int i, int f)
 		if(f&2)
 			putchar('-');
 		if(unames[i])
-			printf("%s", unames[i]); else
+			printf("%s", unames[i]);
+		else
 			printf(gettext("*%c*"), i+'a');
 		if(u > 1)
 			putchar(u+'0');
-			return(2);
+		return(2);
 	}
 	if(u < 0)
 		return(1);
diff --git a/usr/src/data/hwdata/pci.ids b/usr/src/data/hwdata/pci.ids
index 0e84563000..4c99c149f4 100644
--- a/usr/src/data/hwdata/pci.ids
+++ b/usr/src/data/hwdata/pci.ids
@@ -1,8 +1,8 @@
 #
 #	List of PCI ID's
 #
-#	Version: 2021.09.23
-#	Date:    2021-09-23 03:15:02
+#	Version: 2021.12.15
+#	Date:    2021-12-15 03:15:02
 #
 #	Maintained by Albert Pool, Martin Mares, and other volunteers from
 #	the PCI ID Project at https://pci-ids.ucw.cz/.
@@ -97,6 +97,23 @@
 0721  Sapphire, Inc.
 0731  Jingjia Microelectronics Co Ltd
 	7200  JM7200 Series GPU
+		0731 7201  JM7201
+		0731 7202  JM7202
+		0731 7208  JM7200
+		0731 7212  JM7200
+		0731 7214  JM7500
+		0731 7215  JM7200
+	9200  JM9200
+	920a  JH920
+	920b  JH920-I
+	920c  JH920-M
+	9210  JM9210
+	9211  JM9210-I
+	9230  JM9230
+	9231  JM9231-I
+	9250  JM9250
+	930a  JH930-I
+	930b  JH930-M
 0777  Ubiquiti Networks, Inc.
 0795  Wired Inc.
 	6663  Butane II (MPEG2 encoder board)
@@ -120,6 +137,7 @@
 	0905  R1T3 Single T3 Digital Telephony Card
 	0906  RCB24FXX 24-channel modular analog telephony card
 	0a06  RCB672FXX 672-channel modular analog telephony card
+0ccd  Preferred Networks, Inc.
 0e11  Compaq Computer Corporation
 	0001  PCI to EISA Bridge
 	0002  PCI to ISA Bridge
@@ -1017,7 +1035,7 @@
 	1551  Arlene
 	1552  Pooky
 	1561  Anubis
-	15d8  Picasso
+	15d8  Picasso/Raven 2 [Radeon Vega Series / Radeon Vega Mobile Series]
 		103c 8615  Pavilion Laptop 15-cw1xxx
 		17aa 3181  ThinkCentre M75n IoT
 		17aa 5124  ThinkPad E595
@@ -2035,6 +2053,8 @@
 	6658  Bonaire XTX [Radeon R7 260X/360]
 		1043 048f  R7260X-DC2OC-2GD5
 		1043 04d3  AMD Radeon R7 260X
+# GV-R726XOC-1GD
+		1458 227b  Radeon R7 260X
 		148c 0907  Radeon R7 360
 		1682 0907  Radeon R7 360
 		1682 7360  Radeon R7 360
@@ -2082,7 +2102,7 @@
 	6667  Jet ULT [Radeon R5 M230]
 	666f  Sun LE [Radeon HD 8550M / R5 M230]
 	66a0  Vega 20 [Radeon Instinct]
-	66a1  Vega 20 WKS GL-XE [Radeon Pro VII]
+	66a1  Vega 20 [Radeon Pro VII/Radeon Instinct MI50 32GB]
 	66a2  Vega 20
 	66a3  Vega 20 [Radeon Pro Vega II/Radeon Pro Vega II Duo]
 	66a7  Vega 20 [Radeon Pro Vega 20]
@@ -2567,6 +2587,7 @@
 		174b e164  Radeon HD 6450 1 GB DDR3
 		174b e180  Radeon HD 6450
 		174b e201  Radeon HD 6450
+		1787 2311  Radeon HD 6450
 		17af 8450  Radeon HD 8450 OEM
 		1b0a 9096  Radeon HD 6450
 		1b0a 9097  Radeon HD 6450
@@ -2695,6 +2716,7 @@
 	67cc  Ellesmere [Polaris10]
 	67cf  Ellesmere [Polaris10]
 	67d0  Ellesmere [Radeon Pro V7300X / V7350x2]
+	67d4  Ellesmere [Radeon Pro WX 7100 / Barco MXRT-8700]
 	67d7  Ellesmere [Radeon Pro WX 5100 / Barco MXRT-6700]
 	67df  Ellesmere [Radeon RX 470/480/570/570X/580/580X/590]
 		1002 0b37  Radeon RX 480
@@ -2741,7 +2763,7 @@
 		1849 5030  Phantom Gaming D Radeon RX580 8G OC
 		1da2 e353  Radeon RX 570 Pulse 4GB
 		1da2 e366  Nitro+ Radeon RX 570/580/590
-		1da2 e387  Radeon RX 570 Pulse 4GB
+		1da2 e387  Radeon RX 580 Pulse 4GB
 	67e0  Baffin [Radeon Pro WX 4170]
 		103c 8270  Radeon Pro WX 4170
 		103c 8272  Radeon Pro WX 4170
@@ -3010,6 +3032,8 @@
 	687f  Vega 10 XL/XT [Radeon RX Vega 56/64]
 		1002 0b36  RX Vega64
 		1002 6b76  RX Vega64
+# ROG-STRIX-RXVEGA64-O8G-GAMING
+		1043 04c4  Radeon RX Vega 64
 		1458 230c  Radeon RX VEGA 56 GAMING OC 8G
 		1da2 e376  Radeon RX VEGA 56 Pulse 8GB OC HBM2
 	6880  Lexington [Radeon HD 6550M]
@@ -3704,6 +3728,7 @@
 		1458 2313  Radeon RX 5700 XT Gaming OC
 		1682 5701  RX 5700 XT RAW II
 		1849 5120  Radeon RX 5600 XT
+		1da2 e409  Sapphire Technology Limited Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT]
 		1da2 e411  Radeon RX 5600 XT
 	7340  Navi 14 [Radeon RX 5500/5500M / Pro 5500M]
 	7341  Navi 14 [Radeon Pro W5500]
@@ -3712,8 +3737,8 @@
 	7360  Navi 12 [Radeon Pro 5600M / V520]
 	7362  Navi 12 [Radeon Pro V520]
 	7388  Arcturus GL-XL
-	738c  Arcturus GL-XL [AMD Instinct MI100]
-	738e  Arcturus GL-XL
+	738c  Arcturus GL-XL [Instinct MI100]
+	738e  Arcturus GL-XL [Instinct MI100]
 	73a2  Navi 21 Pro-XTA [Radeon Pro W6900X]
 	73a3  Navi 21 GL-XL [Radeon PRO W6800]
 	73a4  Navi 21 USB
@@ -3730,6 +3755,7 @@
 	73e3  Navi 23 WKS-XL [Radeon PRO W6600]
 	73e4  Navi 23 USB
 	73ff  Navi 23 [Radeon RX 6600/6600 XT/6600M]
+		148c 2412  PowerColor Red Devil RX 6600 XT
 	7408  Aldebaran
 	740c  Aldebaran
 	740f  Aldebaran
@@ -4526,6 +4552,8 @@
 	021b  GXT6500P Graphics Adapter
 	021c  GXT4500P Graphics Adapter
 	0233  GXT135P Graphics Adapter
+# Internal debugging card for CELL based systems
+	025a  Drone card
 	028c  Citrine chipset SCSI controller
 		1014 028d  Dual Channel PCI-X DDR SAS RAID Adapter (572E)
 		1014 02be  Dual Channel PCI-X DDR U320 SCSI RAID Adapter (571B)
@@ -4735,14 +4763,14 @@
 	1439  Family 16h Processor Functions 5:1
 	143a  Kingston/Clayton/Gladius/Montego Root Complex
 	143b  Kingston/Clayton/Gladius/Montego P2P Bridge for UMI Link
-	1440  Matisse Device 24: Function 0
-	1441  Matisse Device 24: Function 1
-	1442  Matisse Device 24: Function 2
-	1443  Matisse Device 24: Function 3
-	1444  Matisse Device 24: Function 4
-	1445  Matisse Device 24: Function 5
-	1446  Matisse Device 24: Function 6
-	1447  Matisse Device 24: Function 7
+	1440  Matisse/Vermeer Data Fabric: Device 18h; Function 0
+	1441  Matisse/Vermeer Data Fabric: Device 18h; Function 1
+	1442  Matisse/Vermeer Data Fabric: Device 18h; Function 2
+	1443  Matisse/Vermeer Data Fabric: Device 18h; Function 3
+	1444  Matisse/Vermeer Data Fabric: Device 18h; Function 4
+	1445  Matisse/Vermeer Data Fabric: Device 18h; Function 5
+	1446  Matisse/Vermeer Data Fabric: Device 18h; Function 6
+	1447  Matisse/Vermeer Data Fabric: Device 18h; Function 7
 	1448  Renoir Device 24: Function 0
 	1449  Renoir Device 24: Function 1
 	144a  Renoir Device 24: Function 2
@@ -4779,6 +4807,7 @@
 	1471  Vega 10 PCIe Bridge
 	1480  Starship/Matisse Root Complex
 		1462 7c37  X570-A PRO motherboard
+		15d9 1b95  H12SSL-i
 	1481  Starship/Matisse IOMMU
 	1482  Starship/Matisse PCIe Dummy Host Bridge
 	1483  Starship/Matisse GPP Bridge
@@ -4792,6 +4821,7 @@
 	148a  Starship/Matisse PCIe Dummy Function
 	148b  Starship/Matisse Non-Transparent Bridge
 	148c  Starship USB 3.0 Host Controller
+		15d9 145c  H12SSL-i
 	148d  Starship/Matisse Switch Upstream (PCIE SW.US)
 	148e  Starship/Matisse Switch Downstream (PCIE SW.DS)
 	148f  Starship Reserved SSP
@@ -5009,6 +5039,23 @@
 	1644  Renoir I2S
 	1648  VanGogh Root Complex
 	1649  VanGogh PSP/CCP
+	164f  Milan IOMMU
+	1650  Milan Data Fabric; Function 0
+	1651  Milan Data Fabric; Function 1
+	1652  Milan Data Fabric; Function 2
+	1653  Milan Data Fabric; Function 3
+	1654  Milan Data Fabric; Function 4
+	1655  Milan Data Fabric; Function 5
+	1656  Milan Data Fabric; Function 6
+	1657  Milan Data Fabric; Function 7
+	166a  Cezanne Data Fabric; Function 0
+	166b  Cezanne Data Fabric; Function 1
+	166c  Cezanne Data Fabric; Function 2
+	166d  Cezanne Data Fabric; Function 3
+	166e  Cezanne Data Fabric; Function 4
+	166f  Cezanne Data Fabric; Function 5
+	1670  Cezanne Data Fabric; Function 6
+	1671  Cezanne Data Fabric; Function 7
 	1700  Family 12h/14h Processor Function 0
 	1701  Family 12h/14h Processor Function 1
 	1702  Family 12h/14h Processor Function 2
@@ -5212,6 +5259,7 @@
 		103c 8615  Pavilion Laptop 15-cw1xxx
 		1043 876b  PRIME Motherboard
 		1462 7c37  X570-A PRO motherboard
+		15d9 7901  H12SSL-i
 		ea50 ce19  mCOM10-L1900
 	7902  FCH SATA Controller [RAID mode]
 	7903  FCH SATA Controller [RAID mode]
@@ -5222,12 +5270,14 @@
 		103c 8615  Pavilion Laptop 15-cw1xxx
 		1043 876b  PRIME Motherboard
 		1462 7c37  X570-A PRO motherboard
+		15d9 790b  H12SSL-i
 		17aa 5124  ThinkPad E595
 		ea50 ce19  mCOM10-L1900
 	790e  FCH LPC Bridge
 		103c 8615  Pavilion Laptop 15-cw1xxx
 		1043 876b  PRIME B450M-A Motherboard
 		1462 7c37  X570-A PRO motherboard
+		15d9 790e  H12SSL-i
 		17aa 5124  ThinkPad E595
 		ea50 ce19  mCOM10-L1900
 	790f  FCH PCI Bridge
@@ -10185,7 +10235,7 @@
 	0331  NV35 [GeForce FX 5900]
 		1043 8145  V9950GE
 	0332  NV35 [GeForce FX 5900XT]
-	0333  NV38 [GeForce FX 5950 Ultra / PCX 5950]
+	0333  NV38 [GeForce FX 5950 Ultra]
 	0334  NV35 [GeForce FX 5900ZT]
 		1462 9373  FX5900ZT-VTD128 (MS-8937)
 	0338  NV35GL [Quadro FX 3000]
@@ -10970,6 +11020,7 @@
 		1043 8334  EN210 SILENT
 		1458 36a9  GV-N210D3-1GI (rev. 6.0/6.1)
 		1462 8094  N210 [Geforce 210] PCIe graphics adapter
+		19da 7222  GeForce 210 1GB [Synergy Edition]
 	0a66  GT218 [GeForce 310]
 	0a67  GT218 [GeForce 315]
 	0a68  GT218M [GeForce G 105M]
@@ -12194,6 +12245,7 @@
 	1cfa  GP107GL [Quadro P2000]
 	1cfb  GP107GL [Quadro P1000]
 	1d01  GP108 [GeForce GT 1030]
+	1d02  GP108 [GeForce GT 1010]
 	1d10  GP108M [GeForce MX150]
 		17aa 225e  ThinkPad T480
 	1d11  GP108M [GeForce MX230]
@@ -12340,6 +12392,7 @@
 	21d1  TU116BM [GeForce GTX 1660 Ti Mobile]
 	2200  GA102
 	2204  GA102 [GeForce RTX 3090]
+		147d 10de  NVIDIA Geforce RTX 3090 Founders Edition
 	2205  GA102 [GeForce RTX 3080 Ti 20GB]
 	2206  GA102 [GeForce RTX 3080]
 		10de 1467  GA102 [GeForce RTX 3080]
@@ -12352,6 +12405,7 @@
 	222f  GA102 [GeForce RTX 3080 11GB / 12GB Engineering Sample]
 	2230  GA102GL [RTX A6000]
 	2231  GA102GL [RTX A5000]
+	2232  GA102GL [RTX A4500]
 	2235  GA102GL [A40]
 	2236  GA102GL [A10]
 	2237  GA102GL [A10G]
@@ -12360,6 +12414,7 @@
 	2296  Tegra PCIe Endpoint Virtual Network
 	2302  GA103
 	2321  GA103
+	2420  GA103M [GeForce RTX 3080 Ti Mobile]
 	2482  GA104 [GeForce RTX 3070 Ti]
 	2483  GA104
 	2484  GA104 [GeForce RTX 3070]
@@ -12373,6 +12428,7 @@
 	249c  GA104M [GeForce RTX 3080 Mobile / Max-Q 8GB/16GB]
 	249d  GA104M [GeForce RTX 3070 Mobile / Max-Q]
 	249f  GA104M
+	24a0  GA104 [Geforce RTX 3070 Ti Laptop GPU]
 	24ac  GA104 [GeForce RTX 30x0 Engineering Sample]
 	24ad  GA104 [GeForce RTX 3060 Engineering Sample]
 	24af  GA104 [GeForce RTX 3070 Engineering Sample]
@@ -12853,6 +12909,7 @@
 	7038  FPGA Card XC7VX690T
 		17aa 402f  FPGA XC7VX690T-3FFG1157E
 	8019  Memory controller
+		1eec 0201  VSEC10232X Dual-port 100Gb/s Etherent PCIe
 	8380  Ellips ProfiXpress Profibus Master
 	8381  Ellips Santos Frame Grabber
 	d154  Copley Controls CAN card (PCI-CAN-02)
@@ -15187,7 +15244,7 @@
 # Nee Galileo Technology, Inc.
 11ab  Marvell Technology Group Ltd.
 	0100  88F3700 [Armada 3700 Family] ARM SoC
-	0110  88F8040 PCI Express controller
+	0110  88F60x0/88F70x0/88F80x0/CN913x ARM SoC
 	0146  GT-64010/64010A System Controller
 	0f53  88E6318 Link Street network controller
 	11ab  MV88SE614x SATA II PCI-E controller
@@ -15222,6 +15279,7 @@
 	2b38  88W8897 [AVASTAR] 802.11ac Wireless
 	2b40  88W8964 [Avastar] 802.11ac Wireless
 	4101  OLPC Cafe Controller Secure Digital Controller
+	4146  GT-64111 System Controller
 	4320  88E8001 Gigabit Ethernet Controller
 		1019 0f38  Marvell 88E8001 Gigabit Ethernet Controller (ECS)
 		1019 8001  Marvell 88E8001 Gigabit Ethernet Controller (ECS)
@@ -15404,14 +15462,17 @@
 	6480  MV64460/64461/64462 System Controller
 		1775 c200  C2K CompactPCI single board computer
 	6485  MV64460/64461/64462 System Controller, Revision B
+	6560  88F6560 [Avanta] ARM SoC
+	6710  88F6710 [Armada 370] ARM SoC
 	6820  88F6820 [Armada 385] ARM SoC
 	6828  88F6828 [Armada 388] ARM SoC
+	6920  88F6920 [Armada 390] ARM SoC
 	7042  88SX7042 PCI-e 4-port SATA-II
 		16b8 434b  Tempo SATA E4P
 	7810  MV78100 [Discovery Innovation] ARM SoC
 	7820  MV78200 [Discovery Innovation] ARM SoC
 	7823  MV78230 [Armada XP] ARM SoC
-	7846  88F6820 [Armada 385] ARM SoC
+	7846  MV78460 [Armada XP] ARM SoC
 	d40f  Bobcat3 Ethernet Switch
 	f003  GT-64010 Primary Image Piranha Image Generator
 11ac  Canon Information Systems Research Aust.
@@ -18738,6 +18799,7 @@
 	a804  NVMe SSD Controller SM961/PM961/SM963
 		144d a801  SM963 2.5" NVMe PCIe SSD
 	a808  NVMe SSD Controller SM981/PM981/PM983
+		144d a801  SSD 970 EVO Plus 1TB
 		1d49 403b  Thinksystem U.2 PM983 NVMe SSD
 	a809  NVMe SSD Controller 980
 	a80a  NVMe SSD Controller PM9A1/PM9A3/980PRO
@@ -19300,6 +19362,7 @@
 		103c 2133  NC332i Adapter
 		103c 22e8  NC332i Adapter
 		103c 22eb  NC332i Adapter
+		15d9 165f  H12SSL-i
 	1662  NetXtreme II BCM57712 10 Gigabit Ethernet
 	1663  NetXtreme II BCM57712 10 Gigabit Ethernet Multi Function
 	1665  NetXtreme BCM5717 Gigabit Ethernet PCIe
@@ -19906,6 +19969,12 @@
 	b960  Broadcom BCM56960 Switch ASIC
 # Tomahawk4
 	b990  BCM56990 Switch ASIC
+# Tomahawk4G
+	b996  BCM56996 Tomahawk4G 106G Switch ASIC
+# Tomahawk4GT
+	b998  BCM56998 Tomahawk4GT 106G Switch ASIC
+# Tomahawk4D
+	b999  BCM56999 Tomahawk4D 106G Switch ASIC
 	c909  BCM78909 Switch ASIC
 	d802  BCM58802 Stingray 50Gb Ethernet SoC
 		14e4 8021  Stingray Dual-Port 25Gb Ethernet PCIe SmartNIC w16GB DRAM (Part No BCM958802A8046C)
@@ -20083,6 +20152,7 @@
 	2f30  SoftV92 SpeakerPhone SoftRing Modem with SmartSP
 		14f1 2014  Devolo MikroLink 56K Modem PCI
 	2f50  Conexant SoftK56 Data/Fax Modem
+	510f  Conexant CX 20751/20752
 	5b7a  CX23418 Single-Chip MPEG-2 Encoder with Integrated Analog Video/Broadcast Audio Decoder
 		0070 7444  WinTV HVR-1600
 		107d 6f34  WinFast DVR3100 H
@@ -20596,6 +20666,8 @@
 	021b  MT43162 Family [BlueField-3 Lx Secure Flash Recovery]
 	021c  MT43244 Family [BlueField-3 SoC Flash Recovery]
 	021d  MT43244 Family [BlueField-3 Secure Flash Recovery]
+	021e  CX8 Family [ConnectX-8 Flash Recovery]
+	021f  CX8 Family [ConnectX-8 Secure Flash Recovery]
 	024e  MT53100 [Spectrum-2, Flash recovery mode]
 	024f  MT53100 [Spectrum-2, Secure Flash recovery mode]
 	0250  Spectrum-3, Flash recovery mode
@@ -20610,9 +20682,11 @@
 	0262  MT27710 [ConnectX-4 Lx Programmable] EN
 	0263  MT27710 [ConnectX-4 Lx Programmable Virtual Function] EN
 	0264  Innova-2 Flex Burn image
+	0270  Spectrum-4L, Flash recovery mode
+	0271  Spectrum-4L, RMA
+	0274  Spectrum-4C, Flash recovery mode
+	0275  Spectrum-4C RMA
 	0281  NPS-600 Flash Recovery
-	0357  Abir GearBox in Flash Recovery Mode
-	0358  Abir GearBox in RMA
 	1002  MT25400 Family [ConnectX-2 Virtual Function]
 	1003  MT27500 Family [ConnectX-3]
 		1014 04b5  PCIe3 40GbE RoCE Converged Host Bus Adapter for Power
@@ -20708,6 +20782,7 @@
 	101f  MT2894 Family [ConnectX-6 Lx]
 	1020  MT28860
 	1021  MT2910 Family [ConnectX-7]
+	1023  CX8 Family [ConnectX-8]
 	1974  MT28800 Family [ConnectX-5 PCIe Bridge]
 	1975  MT416842 Family [BlueField SoC PCIe Bridge]
 	1976  MT28908 Family [ConnectX-6 PCIe Bridge]
@@ -20716,10 +20791,12 @@
 	1979  MT2910 Family [ConnectX-7 PCIe Bridge]
 	197a  MT43162 Family [BlueField-3 Lx SoC PCIe Bridge]
 	197b  MT43244 Family [BlueField-3 SoC PCIe Bridge]
+	197c  ConnectX/BlueField Family mlx5Gen PCIe Bridge [PCIe Bridge]
 	2020  MT2892 Family [ConnectX-6 Dx Emulated PCIe Bridge]
 	2021  MT42822 Family [BlueField-2 SoC Emulated PCIe Bridge]
 	2023  MT2910 Family [ConnectX-7 Emulated PCIe Bridge]
 	2024  MT43244 Family [BlueField-3 SoC Emulated PCIe Bridge]
+	2025  ConnectX/BlueField Family mlx5Gen Emulated PCIe Bridge [Emulated PCIe Bridge]
 	4117  MT27712A0-FDCF-AE
 		1bd4 0039  SN10XMP2P25
 		1bd4 003a  25G SFP28 SP EO251FM9 Adapter
@@ -20796,6 +20873,8 @@
 	cf6c  MT53100 [Spectrum-2]
 	cf70  Spectrum-3
 	cf80  Spectrum-4
+	cf82  Spectrum-4L
+	cf84  Spectrum-4C
 	d2f0  Quantum HDR (200Gbps) switch
 	d2f2  Quantum-2 NDR (400Gbps) switch
 15b4  CCI/TRIAD
@@ -20830,7 +20909,8 @@
 	500b  PC SN530 NVMe SSD
 		1414 500b  Xbox Series X
 	500d  WD Ultrastar DC SN340 NVMe SSD
-	5011  WD Black SN850
+	5011  WD PC SN810 / Black SN850 NVMe SSD
+	501a  WD Blue SN570 NVMe SSD
 15b8  ADDI-DATA GmbH
 	1001  APCI1516 SP controller (16 digi outputs)
 	1003  APCI1032 SP controller (32 digi inputs w/ opto coupler)
@@ -21372,6 +21452,7 @@
 	003e  QCA6174 802.11ac Wireless Network Adapter
 		1a56 143a  Killer 1435 Wireless-AC
 		1a56 1525  Killer N1525 Wireless-AC
+		1a56 1535  Killer Wireless-n/a/ac 1535 Wireless Network Adapter
 	0040  QCA9980/9990 802.11ac Wireless Network Adapter
 	0041  QCA6164 802.11ac Wireless Network Adapter
 	0042  QCA9377 802.11ac Wireless Network Adapter
@@ -22945,6 +23026,7 @@
 	1150  AST1150 PCI-to-PCI Bridge
 	2000  ASPEED Graphics Family
 		15d9 0832  X10SRL-F
+		15d9 1b95  H12SSL-i
 1a05  deltaww
 1a07  Kvaser AB
 	0006  CAN interface PC104+ HS/HS
@@ -23334,6 +23416,8 @@
 		1028 1fdf  BOSS-S1 Modular
 		1028 1fe2  BOSS-S1 Adapter
 		1028 2010  BOSS-S2 Adapter
+# RS0200L6R2iM2
+		1bd4 0073  RS0200L6R2iM2
 		1d49 0300  ThinkSystem M.2 with Mirroring Enablement Kit
 		1d49 0301  ThinkSystem SR630 x16 PCIE with 4 SATA ports Riser
 		1d49 0302  ThinkSystem SE350 M.2 SATA 4-Bay Data RAID Mirroring Enablement Kit
@@ -23628,10 +23712,11 @@
 	0001  Hunter PCI Express
 1c8c  Mobiveil, Inc.
 1cb0  Shannon Systems
-	8266  Andalusia Series SSD
-		1cb0 2021  Andalusia Series OCS U.2 SSD
-		1cb0 2121  Andalusia Series ZNS U.2 SSD
-		1cb0 2f21  Andalusia Series NVMe U.2 SSD
+	8266  SP4 Series SSD
+		1cb0 2021  SP4 Series OCS U.2 SSD
+		1cb0 2121  SP4 Series ZNS U.2 SSD
+		1cb0 2f21  SP4E Series NVMe U.2 SSD(1920/3840/7680GB)
+		1cb0 2f22  SP4X Series NVMe U.2 SSD(1600/3200/6400GB)
 	d000  Venice NVMe SSD
 		1cb0 2010  Venice-E Series OCS U.2
 		1cb0 2011  Venice Series OCS U.2
@@ -23778,6 +23863,12 @@
 	f410  ZX-100/ZX-D/ZX-E PCI Com Port
 1d18  RME
 	0001  Fireface UFX+
+# acquired by Intel
+1d1c  Barefoot Networks, Inc.
+	0001  Tofino 1
+	0010  Tofino 1
+	0100  Tofino 2
+	0110  Tofino 2
 1d1d  CNEX Labs
 	1f1f  QEMU NVM Express LightNVM Controller
 	2807  8800 series NVMe SSD
@@ -23965,6 +24056,7 @@
 1dc5  FADU Inc.
 1dcd  Liqid Inc.
 1dcf  Beijing Sinead Technology Co., Ltd.
+1dd3  Sage Microelectronics Corp.
 1dd8  Pensando Systems
 	0002  DSC2 Elba Upstream Port
 		1dd8 5001  DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card
@@ -24032,6 +24124,12 @@
 		1dd8 4014  DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card
 		1dd8 5001  DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card
 		1dd8 5003  DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card
+	1005  DSC NVMe Controller
+		1dd8 5001  DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card
+		1dd8 5003  DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card
+	1006  DSC NVMe Controller VF
+		1dd8 5001  DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card
+		1dd8 5003  DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card
 	1007  DSC Storage Accelerator
 		1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
 		1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
@@ -24058,6 +24156,12 @@
 	1000  IO Memory Controller
 	2000  NoLoad Hardware Development Kit
 	3000  eBPF-based PCIe Accelerator
+1ded  Alibaba (China) Co., Ltd.
+	8000  M1 Root Port
+	8001  ACC-RCiEP
+	8002  RCiEP VF
+	8003  RCEC PF
+	8004  RCEC VF
 1dee  Biwin Storage Technology Co., Ltd.
 1def  Ampere Computing, LLC
 	e005  eMAG PCI Express Root Port 0
@@ -24184,6 +24288,7 @@
 	0022  T20(64GB) [CloudBlazer]
 	0023  T21(32GB) [CloudBlazer]
 	0024  T21(64GB) [CloudBlazer]
+	8001  I20 [CloudBlazer]
 	8011  I10 [CloudBlazer]
 	8012  I10L [CloudBlazer]
 # nee Thinci, Inc
@@ -24192,6 +24297,35 @@
 # https://www.medion.com/
 1e39  MEDION AG
 1e3b  Shenzhen DAPU Microelectronics Co., Ltd
+	0600  NVMe SSD Controller DPU600
+		1e3b 0030  Enterprise NVMe SSD U.2 3.84TB (J5100)
+		1e3b 0031  Enterprise NVMe SSD U.2 7.68TB (J5100)
+		1e3b 0032  Enterprise NVMe SSD U.2 15.36TB (J5100)
+		1e3b 0033  Enterprise NVMe SSD U.2 3.20TB (J5300)
+		1e3b 0034  Enterprise NVMe SSD U.2 6.40TB (J5300)
+		1e3b 0035  Enterprise NVMe SSD U.2 12.80TB (J5300)
+		1e3b 0036  Enterprise NVMe SSD AIC 7.68TB (J5110)
+		1e3b 0037  Enterprise NVMe SSD AIC 6.40TB (J5310)
+		1e3b 003e  Enterprise NVMe SSD AIC 3.84TB (J5110)
+		1e3b 003f  Enterprise NVMe SSD AIC 3.20TB (J5310)
+		1e3b 0050  Enterprise NVMe SSD U.2 3.84TB (R5100)
+		1e3b 0051  Enterprise NVMe SSD U.2 7.68TB (R5100)
+		1e3b 0052  Enterprise NVMe SSD U.2 15.36TB (R5100)
+		1e3b 0053  Enterprise NVMe SSD U.2 3.20TB (R5300)
+		1e3b 0054  Enterprise NVMe SSD U.2 6.40TB (R5300)
+		1e3b 0055  Enterprise NVMe SSD U.2 12.80TB (R5300)
+		1e3b 0056  Enterprise NVMe SSD U.2 3.84TB (R5101)
+		1e3b 0059  Enterprise NVMe SSD U.2 3.20TB (R5301)
+		1e3b 0060  Enterprise NVMe SSD U.2 3.84TB (R5100D)
+		1e3b 0061  Enterprise NVMe SSD U.2 7.68TB (R5100D)
+		1e3b 0063  Enterprise NVMe SSD U.2 3.20TB (R5300D)
+		1e3b 0064  Enterprise NVMe SSD U.2 6.40TB (R5300D)
+		1e3b 00f0  Enterprise NVMe SSD U.2 0.40TB (X2900)
+		1e3b 00f1  Enterprise NVMe SSD U.2 0.80TB (X2900)
+		1e3b 00f2  Enterprise NVMe SSD U.2 1.60TB (X2900)
+		1e3b 00f3  Enterprise NVMe SSD U.2 3.20TB (X2900)
+		1e3b 00f5  Enterprise NVMe SSD U.2 0.40TB (X2900P)
+		1e3b 00f6  Enterprise NVMe SSD U.2 0.80TB (X2900P)
 	1098  Haishen NVMe SSD
 		1e3b 0001  Enterprise NVMe SSD U.2 0.8TB (H2100)
 		1e3b 0002  Enterprise NVMe SSD U.2 0.96TB (H2200)
@@ -24245,6 +24379,7 @@
 	0001  MinION Mk1C
 1e60  Hailo Technologies Ltd.
 	2864  Hailo-8 AI Processor
+1e68  Jiangsu Xinsheng Intelligent Technology Co., Ltd
 1e6b  Axiado Corp.
 1e7b  Dataland
 1e7c  Brainchip Inc
@@ -24267,8 +24402,12 @@
 # aka SED Systems
 1e94  Calian SED
 1e95  Solid State Storage Technology Corporation
+	1002  NVMe Datacenter LJ1 SSD [3DNAND, Rainier Controller]
+		1ea0 5636  TP1500 Series U.2 NVMe Datacenter SSD
+1e9f  Lynxi Technologies Co., Ltd.
 1ea0  Tencent Technology (Shenzhen) Company Limited
 	2a16  Cloud Intelligent Inference Controller
+	2a18  Video Transcode Controller
 1ea7  Intelliprop, Inc
 	223a  Typhon+ PCIe to Gen-Z Bridge
 	224a  IPA-PE224A CXL to Gen-Z Bridge [Sphinx]
@@ -24280,12 +24419,16 @@
 	1001  Video Accelerator
 1ebd  EMERGETECH Company Ltd.
 	0101  Seirios 2063 Video Codec
+1ed2  FuriosaAI, Inc.
+	0000  Warboy
 1ed3  Yeston
 1ed8  Digiteq Automotive
 	0101  FG4 PCIe Frame Grabber
 1ed9  Myrtle.ai
 1ee9  SUSE LLC
 1eec  Viscore Technologies Ltd
+	0102  VSE250231S Dual-port 10Gb/25Gb Ethernet PCIe
+	1eec  VSE250231S Dual-port 10Gb/25Gb Ethernet PCIe
 1efb  Flexxon Pte Ltd
 1f02  Beijing Dayu Technology
 1f03  Shenzhen Shichuangyi Electronics Co., Ltd
@@ -24297,6 +24440,7 @@
 	5236  IG5236-Based NVMe SSD
 	5636  IG5636-Based NVMe SSD
 1fab  Unifabrix Ltd.
+	0000  Nexus Alpha IVPU
 # nee Tumsan Oy
 1fc0  Ascom (Finland) Oy
 	0300  E2200 Dual E1/Rawpipe Card
@@ -24370,6 +24514,7 @@
 2048  Beijing SpaceControl Technology Co.Ltd
 20f4  TRENDnet
 2116  ZyDAS Technology Corp.
+21b4  Hunan Goke Microelectronics Co., Ltd
 21c3  21st Century Computer Corp.
 22b8  Flex-Logix Technologies
 	22a0  Flex Logix InferX X1 Inference Accelerator
@@ -24383,12 +24528,14 @@
 	2263  A2000 NVMe SSD
 	5008  U-SNS8154P3 NVMe SSD
 	500d  OM3PDP3 NVMe SSD
+	500e  SNVS2000G [NV1 NVMe PCIe SSD 2TB]
 270b  Xantel Corporation
 270f  Chaintech Computer Co. Ltd
 2711  AVID Technology Inc.
 2955  Connectix Virtual PC
 	6e61  OHCI USB 1.1 controller
 2a15  3D Vision(???)
+2a18  Video Transcode Controller
 2bd8  ROPEX Industrie-Elektronik GmbH
 3000  Hansol Electronics Inc.
 3112  Satelco Ingenieria S.A.
@@ -24429,6 +24576,7 @@
 	1783  AS-i 3.0 cPCI Master
 	1922  AS-i 3.0 PCI Master
 3475  Arista Networks, Inc.
+34ba  Ice Lake-LP PCI Express Root Port #3
 3513  ARCOM Control Systems Ltd
 37d9  ITD Firm ltd.
 	1138  SCHD-PH-8 Phase detector
@@ -24537,6 +24685,7 @@
 416c  Aladdin Knowledge Systems
 	0100  AladdinCARD
 	0200  CPC
+4242  Universall Answer Generators
 4254  DVBSky
 4321  Tata Power Strategic Electronics Division
 4348  WCH.CN
@@ -25206,7 +25355,7 @@
 	015d  Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port
 		1043 844d  P8 series motherboard
 	015e  Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller
-	0162  Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller
+	0162  IvyBridge GT2 [HD Graphics 4000]
 		1043 84ca  P8 series motherboard
 		1849 0162  Motherboard
 	0166  3rd Gen Core processor Graphics Controller
@@ -25339,6 +25488,8 @@
 		8086 01f7  SCRU32
 # uninitialized SRCU32 RAID Controller
 	061f  80303 I/O Processor
+	0684  H470 Chipset LPC/eSPI Controller
+	0687  Q470 Chipset LPC/eSPI Controller
 	068d  Comet Lake LPC Controller
 	06a3  Comet Lake PCH SMBus Controller
 	06a4  Comet Lake PCH SPI Controller
@@ -25352,6 +25503,8 @@
 	06c0  Comet Lake PCI Express Root Port #17
 	06c8  Comet Lake PCH cAVS
 	06d2  Comet Lake SATA AHCI Controller
+	06d6  Comet Lake PCH-H RAID
+	06d7  Comet Lake PCH-H RAID
 	06e0  Comet Lake HECI Controller
 	06e3  Comet Lake Keyboard and Text (KT) Redirection
 	06e8  Comet Lake PCH Serial IO I2C Controller #0
@@ -25856,7 +26009,9 @@
 		8086 8008  NVMe Datacenter SSD [3DNAND] SE 2.5" U.2 (P5510)
 		8086 8d08  NVMe Datacenter SSD [3DNAND] VE 2.5" U.2 (P5316)
 		8086 8d1d  NVMe Datacenter SSD [3DNAND] VE E1.L 9.5/18mm (P5316)
+		8086 c008  NVMe Datacenter SSD [3DNAND] SE U.2 15mm (P5530)
 	0bd0  Ponte Vecchio 2T
+	0bd5  Ponte Vecchio 1T
 	0be0  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
 	0be1  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
 		105b 0d7c  D270S/D250S Motherboard
@@ -25958,6 +26113,9 @@
 		8086 0000  Ethernet Controller XXV710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking
 		8086 0001  Ethernet Controller XXV710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking
 	0d9f  Ethernet Controller (2) I225-IT
+	0dd2  Ethernet Network Adapter I710
+		8086 000d  Ethernet Network Adapter I710-T4L
+		8086 0010  Ethernet Network Adapter I710-T4L for OCP 3.0
 	0e00  Xeon E7 v2/Xeon E5 v2/Core i7 DMI2
 		1028 04f7  Xeon E5 v2 on PowerEdge R320 server
 		15d9 066b  X9SRL-F
@@ -26994,6 +27152,7 @@
 		8086 00a2  Ethernet Server Adapter I350-T2
 		8086 00a3  Ethernet Network Adapter I350-T4 for OCP NIC 3.0
 		8086 00aa  Ethernet Network Adapter I350-T4 for OCP NIC 3.0
+		8086 4017  Ethernet Network Adapter I350-T4 for OCP NIC 3.0
 		8086 5001  Ethernet Server Adapter I350-T4
 		8086 5002  Ethernet Server Adapter I350-T2
 		8086 5003  Ethernet 1G 4P I350-t OCP
@@ -27053,6 +27212,7 @@
 	1530  X540 Virtual Function
 	1531  I210 Gigabit Unprogrammed
 	1533  I210 Gigabit Network Connection
+		1028 0b35  I210 Gigabit Network Connection
 		103c 0003  Ethernet I210-T1 GbE NIC
 		1059 0180  RD10019 1GbE interface
 		1093 7706  Compact Vision System Ethernet Adapter
@@ -27164,6 +27324,7 @@
 		1bd4 0042  10G SFP+ DP EP102Fi4 Adapter
 		1bd4 0056  Ethernet Network Adapter X710-BM2 for OCP NIC 3.0
 		1bd4 0065  F102IX710
+		1bd4 0074  Ethernet Network Adapter X710-BM2 for lldp
 		8086 0000  Ethernet Converged Network Adapter X710
 		8086 0001  Ethernet Converged Network Adapter X710-4
 		8086 0002  Ethernet Converged Network Adapter X710-4
@@ -27323,6 +27484,8 @@
 		1137 02be  E810XXVDA2 2x25/10 GbE SFP28 PCIe NIC
 		1bd4 0057  Ethernet Network Adapter E810-XXVAM2
 		1bd4 0058  Ethernet Network Adapter E810-XXVAM2 for OCP 3.0
+		1bd4 006e  Ethernet Network Adapter E810-XXVAM2 for BD
+		1eec 0102  VSE250241E Dual-port 10Gb/25Gb Ethernet PCIe
 		8086 0001  Ethernet 25G 2P E810-XXV OCP
 		8086 0002  Ethernet 25G 2P E810-XXV Adapter
 		8086 0003  Ethernet Network Adapter E810-XXV-2
@@ -27443,6 +27606,10 @@
 		8086 000b  Ethernet Network Adapter X710-T2L for OCP 3.0
 		8086 000c  Ethernet Network Adapter X710-T2L for OCP 3.0
 		8086 000f  Ethernet Network Adapter X710-T2L for OCP 3.0
+		8086 4009  Ethernet Network Adapter X710-T2L
+		8086 4012  Ethernet Network Adapter X710-T4L for OCP 3.0
+		8086 4018  Ethernet Network Adapter X710-T2L for OCP 3.0
+		8086 4019  Ethernet Network Adapter X710-T4L
 	1600  Broadwell-U Host Bridge -OPI
 	1601  Broadwell-U PCI Express x16 Controller
 	1602  Broadwell-U Integrated Graphics
@@ -31029,6 +31196,7 @@
 	34ab  Ice Lake-LP Serial IO SPI Controller #1
 	34b0  Ice Lake-LP PCI Express Root Port #9
 	34b7  Ice Lake-LP PCI Express Root Port #16
+	34ba  Ice Lake-LP PCI Express Root Port #3
 	34bc  Ice Lake-LP PCI Express Root Port #5
 	34c5  Ice Lake-LP Serial IO I2c Controller #4
 	34c6  Ice Lake-LP Serial IO I2c Controller #5
@@ -31284,6 +31452,9 @@
 		17aa 4025  Ethernet Connection X722 for 10GbE SFP+
 	37d4  Ethernet Connection X722 for 10GbE QSFP+
 	37d9  X722 Hyper-V Virtual Function
+	3882  Ice Lake LPC Controller
+	38a4  Ice Lake SPI Controller
+	38e0  Ice Lake Management Engine Interface
 	3a00  82801JD/DO (ICH10 Family) 4-port SATA IDE Controller
 	3a02  82801JD/DO (ICH10 Family) SATA AHCI Controller
 	3a05  82801JD/DO (ICH10 Family) SATA RAID Controller
@@ -31663,7 +31834,7 @@
 	3e89  8th Gen Core Processor PCIe Controller (x4)
 	3e90  CoffeeLake-S GT1 [UHD Graphics 610]
 	3e91  CoffeeLake-S GT2 [UHD Graphics 630]
-	3e92  CometLake-S GT2 [UHD Graphics 630]
+	3e92  CoffeeLake-S GT2 [UHD Graphics 630]
 		1028 0869  Vostro 3470
 	3e93  CoffeeLake-S GT1 [UHD Graphics 610]
 	3e96  CoffeeLake-S GT2 [UHD Graphics P630]
@@ -31825,16 +31996,25 @@
 		8086 0264  Wireless-AC 9461
 		8086 02a4  Wireless-AC 9462
 	444e  Turbo Memory Controller
+	460d  12th Gen Core Processor PCI Express x16 Controller #1
 	461e  Alder Lake-P Thunderbolt 4 USB Controller
 	461f  Alder Lake-P Thunderbolt 4 PCI Express Root Port #3
+	4629  12th Gen Core Processor Host Bridge/DRAM Registers
 	462f  Alder Lake-P Thunderbolt 4 PCI Express Root Port #2
+	463d  12th Gen Core Processor PCI Express x4 Controller #2
 	463e  Alder Lake-P Thunderbolt 4 NHI #0
 	463f  Alder Lake-P Thunderbolt 4 PCI Express Root Port #1
+	4641  12th Gen Core Processor Host Bridge/DRAM Registers
+	464d  12th Gen Core Processor PCI Express x4 Controller #0
+	464f  12th Gen Core Processor Gaussian & Neural Accelerator
 	466d  Alder Lake-P Thunderbolt 4 NHI #1
 	466e  Alder Lake-P Thunderbolt 4 PCI Express Root Port #0
+	467d  Platform Monitoring Technology
 	467f  Volume Management Device NVMe RAID Controller
 	4680  AlderLake-S GT1
 	46a0  AlderLake-P GT2
+	46a1  UHD Graphics
+	46a3  Alder Lake-P GT1 [UHD Graphics]
 	46c0  AlderLake-M GT1
 	4905  DG1 [Iris Xe MAX Graphics]
 	4906  DG1 [Iris Xe Pod]
@@ -31907,6 +32087,26 @@
 	504a  EP80579 Reserved
 	504b  EP80579 Reserved
 	504c  EP80579 Integrated Processor with QuickAssist TDM
+	5181  Alder Lake PCH-P LPC/eSPI Controller
+	51a3  Alder Lake PCH-P SMBus Host Controller
+	51a4  Alder Lake-P PCH SPI Controller
+	51bf  Alder Lake PCH-P PCI Express Root Port #9
+	51c5  Alder Lake-P Serial IO I2C Controller #0
+	51c6  Alder Lake-P Serial IO I2C Controller #1
+	51c8  Alder Lake PCH-P High Definition Audio Controller
+	51d3  Alder Lake-P SATA AHCI Controller
+	51e0  Alder Lake PCH HECI Controller
+	51e8  Alder Lake PCH Serial IO I2C Controller #0
+	51e9  Alder Lake PCH Serial IO I2C Controller #1
+	51ea  Alder Lake PCH Serial IO I2C Controller #2
+	51eb  Alder Lake PCH Serial IO I2C Controller #3
+	51ed  Alder Lake PCH USB 3.2 xHCI Host Controller
+	51ef  Alder Lake PCH Shared SRAM
+	51f0  Alder Lake-P PCH CNVi WiFi
+		8086 0034  Wireless-AC 9560 160MHz
+		8086 0070  Wi-Fi 6 AX201 160MHz
+		8086 0074  Wi-Fi 6 AX201 160MHz
+		8086 4070  Wi-Fi 6 AX201 160MHz
 	5200  EtherExpress PRO/100 Intelligent Server PCI Bridge
 	5201  EtherExpress PRO/100 Intelligent Server Fast Ethernet Controller
 		8086 0001  EtherExpress PRO/100 Server Ethernet Adapter
@@ -32343,6 +32543,7 @@
 	8a0d  Ice Lake Thunderbolt 3 NHI #1
 	8a12  Ice Lake-LP Processor Host Bridge/DRAM Registers
 	8a13  Ice Lake Thunderbolt 3 USB Controller
+	8a14  Ice Lake Processor Host Bridge/DRAM Registers
 	8a17  Ice Lake Thunderbolt 3 NHI #0
 	8a19  Image Signal Processor
 	8a1d  Ice Lake Thunderbolt 3 PCI Express Root Port #0
@@ -32628,6 +32829,7 @@
 	9a49  TigerLake-LP GT2 [Iris Xe Graphics]
 	9a60  TigerLake-H GT1 [UHD Graphics]
 	9a68  TigerLake-H GT1 [UHD Graphics]
+	9b33  Comet Lake-S 6c Host Bridge/DRAM Controller
 	9b41  CometLake-U GT2 [UHD Graphics]
 		1028 09bd  Latitude 7310
 		1028 09be  Latitude 7410
@@ -33200,6 +33402,7 @@
 	a2f0  200 Series PCH HD Audio
 		1462 7a72  H270 PC MATE
 		1462 fa72  H270 PC MATE
+	a303  H310 Chipset LPC/eSPI Controller
 	a304  H370 Chipset LPC/eSPI Controller
 		1028 0869  Vostro 3470
 	a305  Z390 Chipset LPC/eSPI Controller
@@ -33260,10 +33463,19 @@
 	a379  Cannon Lake PCH Thermal Controller
 		1028 0869  Vostro 3470
 	a382  400 Series Chipset Family SATA AHCI Controller
+	a394  Comet Lake PCI Express Root Port #05
+	a397  Comet Lake PCI Express Root Port #08
+	a398  Comet Lake PCI Express Root Port 9
+	a39a  Comet Lake PCI Express Root Port 11
 	a3a1  Memory controller
 	a3a3  Comet Lake PCH-V SMBus Host Controller
 	a3af  Comet Lake PCH-V USB Controller
 	a3b1  Comet Lake PCH-V Thermal Subsystem
+	a3ba  Comet Lake PCH-V HECI Controller
+	a3c8  B460 Chipset LPC/eSPI Controller
+	a3da  H410 Chipset LPC/eSPI Controller
+	a3eb  Comet Lake PCI Express Root Port #21
+	a3f0  Comet Lake PCH-V cAVS
 	a620  6400/6402 Advanced Memory Buffer (AMB)
 	abc0  Omni-Path Fabric Switch Silicon 100 Series
 	b152  21152 PCI-to-PCI Bridge
@@ -33309,6 +33521,7 @@
 		8086 390b  SSD Pro 7600p/760p/E 6100p Series [NVM Express]
 	f1a8  SSD 660P Series
 8088  Beijing Wangxun Technology Co., Ltd.
+	0100  WX1860AL-W Gigabit Ethernet Controller
 	0101  WX1860A2 Gigabit Ethernet Controller
 		8088 0201  Dual-Port Ethernet Network Adaptor SF200T
 		8088 4201  Dual-Port Ethernet Network Adaptor SF200T (WOL)
@@ -33738,6 +33951,20 @@
 		1bd4 004b  RAID PM8204-2GB
 		1bd4 004c  RAID PM8204-4GB
 		1bd4 004f  PM8222-HBA
+		1bd4 006b  RS0800M5H24I
+		1bd4 006c  RS0800M5E8i
+		1bd4 006d  RS0800M5H8i
+		1bd4 006f  RS0804M5R16i
+		1bd4 0070  RS0800M5E24i
+		1bd4 0071  RS0800M5H16i
+		1bd4 0072  RS0800M5E16i
+		1d49 0220  ThinkSystem 4350-8i SAS/SATA 12Gb HBA
+		1d49 0221  ThinkSystem 4350-16i SAS/SATA 12Gb HBA
+		1d49 0520  ThinkSystem RAID 5350-8i PCIe 12Gb Adapter
+		1d49 0620  ThinkSystem RAID 9350-8i 2GB Flash PCIe 12Gb Adapter
+		1d49 0621  ThinkSystem RAID 9350-8i 2GB Flash PCIe 12Gb Internal Adapter
+		1d49 0622  ThinkSystem RAID 9350-16i 4GB Flash PCIe 12Gb Adapter
+		1d49 0623  ThinkSystem RAID 9350-16i 4GB Flash PCIe 12Gb Internal Adapter
 		9005 0608  SmartRAID 3162-8i /e
 		9005 0800  SmartRAID 3154-8i
 		9005 0801  SmartRAID 3152-8i
@@ -34354,6 +34581,10 @@ C 04  Multimedia controller
 C 05  Memory controller
 	00  RAM memory
 	01  FLASH memory
+	02  CXL
+		00  CXL Memory Device - vendor specific
+# Devices compliant to CXL spec
+		10  CXL Memory Device (CXL 2.x)
 	80  Memory controller
 C 06  Bridge
 	00  Host bridge
@@ -34468,6 +34699,7 @@ C 0c  Serial bus controller
 		02  BT (Block Transfer)
 	08  SERCOS interface
 	09  CANBUS
+	80  Serial bus controller
 C 0d  Wireless controller
 	00  IRDA controller
 	01  Consumer IR controller
diff --git a/usr/src/data/hwdata/usb.ids b/usr/src/data/hwdata/usb.ids
index 6c3ecf99ed..1b9f9f82ba 100644
--- a/usr/src/data/hwdata/usb.ids
+++ b/usr/src/data/hwdata/usb.ids
@@ -9,8 +9,8 @@
 #	The latest version can be obtained from
 #		http://www.linux-usb.org/usb.ids
 #
-# Version: 2021.07.19
-# Date:    2021-07-19 20:34:10
+# Version: 2021.10.24
+# Date:    2021-10-24 20:34:08
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -120,6 +120,7 @@
 	2064  Interfaceless Control-Only LUFA Devices
 	2065  LUFA Test and Measurement Demo Application
 	2066  LUFA Multiple Report HID Demo
+	2067  LUFA HID Class Bootloader
 	2068  LUFA Virtual Serial/Mass Storage Demo
 	2069  LUFA Webserver Project
 	2103  JTAG ICE mkII
@@ -440,6 +441,7 @@
 	2805  Scanjet G2710
 	2811  PSC-2100
 	2817  Color LaserJet 2840
+	2841  OMEN MINDFRAME [3XT27AA]
 	2902  PhotoSmart A820 series
 	2911  PSC 2200
 	2917  LaserJet 2420
@@ -806,6 +808,7 @@
 	601f  Myriad-RF LimeSDR-Mini
 	6ee0  EZO Carrier Board
 	6f70  HB-RF-USB
+	7be8  FT232R
 	8028  Dev board JTAG (FT232H based)
 	8040  4 Port Hub
 	8070  7 Port Hub
@@ -900,6 +903,7 @@
 	d9ab  Actisense NGT-1 NMEA2000 Gateway
 	daf4  Qundis Serial Infrared Head
 	e0d0  Total Phase Aardvark I2C/SPI Host Adapter
+	e518  IBR IMB-usb
 	e521  EVER Sinline XL Series UPS
 	e6c8  PYRAMID Computer GmbH LCD
 	e700  Elster Unicom III Optical Probe
@@ -917,6 +921,7 @@
 	ed72  HAMEG HO720 Serial Port
 	ed73  HAMEG HO730 Serial Port
 	ed74  HAMEG HO820 Serial Port
+	eea2  PCStage Lite 32 channel DMX512 Interface
 	ef10  FT1245BL
 	f070  Serial Converter 422/485 [Vardaan VEUSB422R3]
 	f0c8  SPROG Decoder Programmer
@@ -1167,6 +1172,7 @@
 	4000  InkJet Color Printer
 	4021  Photo Printer 6800
 	4022  1400 Digital Photo Printer
+	4023  Photo Printer 8800 / 9810
 	402b  Photo Printer 6850
 	402e  605 Photo Printer
 	4034  805 Photo Printer
@@ -1673,6 +1679,7 @@
 	223a  8-in-1 Card Reader
 	2412  Hub
 	2503  USB 2.0 Hub
+	2504  Hub
 	2507  hub
 	2512  USB 2.0 Hub
 	2513  2.0 Hub
@@ -2055,6 +2062,7 @@
 	8043  Hub
 	8140  TUSB8041 4-Port Hub
 	8142  TUSB8041 4-Port Hub
+	9261  TUSB9261 SerialATA-Bridge
 	926b  TUSB9260 Boot Loader
 	bef3  CC1352R1 Launchpad
 	dbc0  Device Bay Controller
@@ -2624,6 +2632,7 @@
 	4e04  Lenovo Keyboard KB1021
 	4e22  Dell Mouse, 2 Buttons, Modell: MS111-P
 	4e6f  Acer Wired Keyboard Model KBAY211
+	4e72  Acer Wired Keyboard Model KBAY211
 0463  MGE UPS Systems
 	0001  UPS
 	ffff  UPS
@@ -2759,6 +2768,7 @@
 	08dd  QuickCam for Notebooks
 	08e0  QuickCam Express
 	08e1  Labtec Webcam
+	08e5  C920 PRO HD Webcam
 	08f0  QuickCam Messenger
 	08f1  QuickCam Express
 	08f2  Microphone (Messenger)
@@ -2821,6 +2831,7 @@
 	0a5d  G933 Headset Battery Charger
 	0a66  [G533 Wireless Headset Dongle]
 	0a8f  H390 headset with microphone
+	0aaa  Logitech G PRO X Gaming Headset
 	0b02  C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)
 	8801  Video Camera
 	b014  Bluetooth Mouse M336/M337/M535
@@ -3007,6 +3018,7 @@
 	c32b  G910 Orion Spark Mechanical Keyboard
 	c332  G502 Proteus Spectrum Optical Mouse
 	c335  G910 Orion Spectrum Mechanical Keyboard
+	c336  G213 Prodigy Gaming Keyboard
 	c33a  G413 Gaming Keyboard
 	c33f  G815 Mechanical Keyboard
 	c401  TrackMan Marble Wheel
@@ -3361,6 +3373,7 @@
 	0014  InTouch Module
 	0100  Stor.E Slim USB 3.0
 	0200  External Disk
+	0212  Toshiba Canvio Connect II 500GB Portable Hard Drive
 	0820  Canvio Advance Disk
 	0821  Canvio Advance 2TB model DTC920
 	0900  MQ04UBF100
@@ -3666,6 +3679,7 @@
 	6180  MP3 Player
 	6200  MP3 Player
 	7500  Hi-Speed Mass Storage Device
+	8001  BenQ ZOWIE Gaming Mouse
 	9000  AWL300 Wireless Adapter
 	9001  AWL400 Wireless Adapter
 	9213  Kbd Hub
@@ -4561,6 +4575,8 @@
 	5202  Combi Keyboard-Hub (Keyboard)
 	5500  HID->COM RS232 Adapter
 	5a9b  Dacal CD/DVD Library D-101/DC-300/DC-016RW
+	6022  Hantek DSO-6022BE
+	602a  Hantek DSO-6022BL
 	6370  ViewMate Desktop Mouse CC2201
 	6502  CY4609
 	6506  CY4603
@@ -4584,6 +4600,7 @@
 	f000  CY30700 Licorice evaluation board
 	f111  CY8CKIT-002 PSoC MiniProg3 Rev A Program and debug kit
 	f115  PSoC FirstTouch Programmer
+	f139  KitProg
 	f231  DELLY Changer 4in1 universal IR remote
 	f232  Mono embedded computer
 	fd10  Gembird MSIS-PM
@@ -4591,6 +4608,8 @@
 	fd15  Energenie EG-PMS2
 04b5  ROHM LSI Systems USA, LLC
 	3064  Hantek DSO-3064
+	6022  Hantek DSO-6022BE
+	602a  Hantek DSO-6022BL
 04b6  Hint Corp.
 04b7  Compal Electronics, Inc.
 04b8  Seiko Epson Corp.
@@ -4602,6 +4621,7 @@
 	0006  Printer
 	0007  Printer
 	0015  Stylus Photo R3000
+	0080  SC-P400 Series
 	0101  GT-7000U [Perfection 636]
 	0102  GT-2200
 	0103  GT-6600U [Perfection 610]
@@ -4927,6 +4947,7 @@
 	7022  HP HD Webcam
 	7025  HP HD Webcam
 	7046  TOSHIBA Web Camera - HD
+	7054  HP HD Webcam
 	9304  Hub
 	f01c  TT1280DA DVB-T TV Tuner
 04cb  Fuji Photo Film Co., Ltd
@@ -5023,6 +5044,7 @@
 	02c5  FinePix S9900W Digital Camera (PTP)
 	02e0  X-T200 Digital Camera
 	5006  ASK-300
+	5007  DX100
 04cc  ST-Ericsson
 	1122  Hub
 	1520  USB 2.0 Hub (Avocent KVM)
@@ -5110,6 +5132,7 @@
 04d9  Holtek Semiconductor, Inc.
 	0006  Wired Keyboard (78/79 key) [RPI Wired Keyboard 5]
 	0022  Portable Keyboard
+	0129  Keyboard [KBPV8000]
 	0348  Keyboard
 	0407  Keyboard [TEX Shinobi]
 	048e  Optical Mouse
@@ -5417,6 +5440,7 @@
 	3903  Xerox WorkCentre XK50cx
 	390f  InkJet Color Printer
 	3911  SCX-1020 series
+	4001  PSSD T7
 	4005  GT-S8000 Jet (msc)
 	4f1f  GT-S8000 Jet (mtp)
 	5000  YP-MF series
@@ -5679,6 +5703,7 @@
 	b3f6  HD WebCam (Acer)
 	b3fd  HD WebCam (Asus N-series)
 	b40e  HP Truevision HD camera
+	b420  Lenovo EasyCamera
 	b444  Lenovo Integrated Webcam
 	b49f  Bluetooth (RTL8723BE)
 	b563  Integrated Camera
@@ -6850,6 +6875,7 @@
 	07c4  ILCE-6000 (aka Alpha-6000) in Mass Storage mode
 	082f  Walkman NWZW Series
 	0847  WG-C10 Portable Wireless Server
+	0873  UP-971AD
 	0877  UP-D898/X898 series
 	0884  MDR-ZX770BN [Wireless Noise Canceling Stereo Headset]
 	088c  Portable Headphone Amplifier
@@ -6866,6 +6892,7 @@
 	0cd3  WH-1000XM3 [Wireless Noise-Canceling Headphones]
 	0cda  PlayStation Classic controller
 	0ce0  WF-1000XM3 [Wireless Noise-Canceling Headphones]
+	0ce6  DualSense wireless controller (PS5)
 	0cf0  MRW-G1
 	0d58  WH-1000XM4 [Wireless Noise-Canceling Headphones]
 	1000  Wireless Buzz! Receiver
@@ -7225,6 +7252,8 @@
 	039d  DTH-W1320 [MobileStudio Pro 16] internal hub
 	03aa  DTH-W1620 [MobileStudio Pro 16] tablet
 	03ac  DTH-W1620 [MobileStudio Pro 16] touchscreen
+	03c5  CTL-4100WL [Intuos BT (S)]
+	03c7  CTL-6100WL [Intuos BT (M)]
 	0400  PenPartner 4x5
 	4001  TPC4001
 	4004  TPC4004
@@ -8276,10 +8305,12 @@
 	8509  FaceTime HD Camera
 	850a  FaceTime Camera
 	8510  FaceTime HD Camera (Built-in)
+	8511  FaceTime HD Camera (Built-in)
 	8600  iBridge
 	911c  Hub in A1082 [Cinema HD Display 23"]
 	9127  Hub in Thunderbolt Display
 	912f  Hub in 30" Cinema Display
+	9210  Studio Display 21"
 	9215  Studio Display 15"
 	9217  Studio Display 17"
 	9218  Cinema Display 23"
@@ -8378,6 +8409,7 @@
 	9265  Asus Gobi 2000 Wireless Modem
 	9274  iRex Technologies Gobi 2000 Wireless Modem (QDL mode)
 	9275  iRex Technologies Gobi 2000 Wireless Modem
+	f000  TA-1004 [Nokia 8]
 	f003  Nokia 8110 4G
 05c7  Qtronix Corp.
 	0113  PC Line Mouse
@@ -8706,6 +8738,7 @@
 	1200  Bar Code Scanner
 	1701  Bar Code Scanner (CDC)
 	1900  SNAPI Imaging Device
+	1a00  CS4070 Barcode Scanner
 	2000  MC3090 Rugged Mobile Computer
 	200d  MC70 Rugged Mobile Computer
 05e1  Syntek Semiconductor Co., Ltd
@@ -8748,6 +8781,9 @@
 	0610  Hub
 	0612  Hub
 	0616  hub
+	0618  Hub
+	0620  GL3523 Hub
+	0626  Hub
 	0660  USB 2.0 Hub
 	0700  SIIG US2256 CompactFlash Card Reader
 	0701  USB 2.0 IDE Adapter
@@ -8785,6 +8821,7 @@
 	0748  All-in-One Cardreader
 	0749  SD Card Reader and Writer
 	0751  microSD Card Reader
+	0752  micros Reader
 	0760  USB 2.0 Card Reader/Writer
 	0761  Genesys Mass Storage Device
 	0780  USBFS DFU Adapter
@@ -9597,7 +9634,54 @@
 	01df  CX2633 Multifunction Printer
 	01e0  ES8460 Multifunction Printer
 	020b  OKI ES4140 Mono Printer
+	021f  ES8460 Multifunction Printer
+	026f  MC351 Multifunction Printer
+	0270  MC351 Multifunction Printer
+	0271  MC351 Multifunction Printer
+	0272  MC351 Multifunction Printer
+	0273  MC351 Multifunction Printer
+	0274  ES3451 Multifunction Printer
+	0275  MC351 Multifunction Printer
+	0276  MC351 Multifunction Printer
+	0277  MC351 Multifunction Printer
+	0278  MC351 Multifunction Printer
+	0279  MC361 Multifunction Printer
+	027a  MC361 Multifunction Printer
+	027b  MC361 Multifunction Printer
+	027c  MC361 Multifunction Printer
+	027d  MC361 Multifunction Printer
+	027e  ES3461 Multifunction Printer
+	027f  MC361 Multifunction Printer
+	0280  MC361 Multifunction Printer
+	0281  MC361 Multifunction Printer
+	0282  MC361 Multifunction Printer
+	0283  MC561 Multifunction Printer
+	0284  MC561 Multifunction Printer
+	0285  MC561 Multifunction Printer
+	0286  MC561 Multifunction Printer
+	0287  CX2731 Multifunction Printer
+	0288  ES5461 Multifunction Printer
+	0289  ES5461 Multifunction Printer
+	028a  MC561 Multifunction Printer
+	028b  MC561 Multifunction Printer
+	028c  MC561 Multifunction Printer
+	02b4  MC861 Multifunction Printer
+	02b5  ES8461 Multifunction Printer
+	02b6  MC851 Multifunction Printer
+	02b7  ES8451 Multifunction Printer
 	02bb  OKI PT390 POS Printer
+	02bd  MB461 Multifunction Printer
+	02be  MB471 Multifunction Printer
+	02bf  MB491 Multifunction Printer
+	02ca  ES4161 Multifunction Printer
+	02cb  ES4191 Multifunction Printer
+	02d4  MPS4200mb Multifunction Printer
+	02e7  MC352 Multifunction Printer
+	02e8  MC362 Multifunction Printer
+	02e9  MC562 Multifunction Printer
+	02ea  ES3452 Multifunction Printer
+	02eb  ES5462 Multifunction Printer
+	02ee  MB451 Multifunction Printer
 	0383  MC563 Multifunction Printer
 	0a91  B2500MFP (printer+scanner)
 	3801  B6100 Laser Printer
@@ -21774,6 +21858,24 @@
 	0014  Single User touchfoil(tm) (SU2-80)
 25da  Netatmo
 	0001  Weather Station
+25dd  Bit4id Srl
+	1101  miniLector-s
+	1201  cryptokey
+	2221  iAM
+	2311  keyfour-a1
+	2321  CKey4
+	2341  tokenME FIPS v3
+	2351  Digital DNA Key
+	2354  Digital-DNA Key
+	2361  Digital-DNA Key BT
+	2362  Digital-DNA Key
+	2371  TokenME EVO v2
+	23b4  ArubaKey AK901
+	3111  miniLector EVO
+	3211  miniLector AIR EVO
+	3403  miniLector AIR NFC v3
+	3503  mLector AIR DI V3
+	b001  miniLector Blue
 25e3  Lumigon
 25f0  ShanWan
 	c131  Gioteck PS3 2.4G Wireless Controller
diff --git a/usr/src/lib/libsmedia/plugins/blkdev/common/b_generic.c b/usr/src/lib/libsmedia/plugins/blkdev/common/b_generic.c
index 5bd8467603..281b7a6d45 100644
--- a/usr/src/lib/libsmedia/plugins/blkdev/common/b_generic.c
+++ b/usr/src/lib/libsmedia/plugins/blkdev/common/b_generic.c
@@ -25,7 +25,7 @@
 /*
  * b_generic.c :
  *      This file contains the functions for generic block devices
- * 	for libsmedia.
+ *	for libsmedia.
  */
 
 #include <stdio.h>
@@ -150,8 +150,8 @@ _m_get_device_info(rmedia_handle_t *handle, void *ip)
 	}
 	vendor_name = (char *)malloc(1);
 	if (vendor_name == NULL) {
-	if (!errno)
-		errno = ENOMEM;
+		if (!errno)
+			errno = ENOMEM;
 		return (-1);
 	}
 	product_name = (char *)malloc(1);
diff --git a/usr/src/man/man3contract/ct_pr_event_get_pid.3contract b/usr/src/man/man3contract/ct_pr_event_get_pid.3contract
index bdf1183ef1..d5fc60b400 100644
--- a/usr/src/man/man3contract/ct_pr_event_get_pid.3contract
+++ b/usr/src/man/man3contract/ct_pr_event_get_pid.3contract
@@ -1,16 +1,16 @@
 '\" te
 .\" Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved.
+.\" Copyright 2021 Peter Tribble.
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH CT_PR_EVENT_GET_PID 3CONTRACT "Jul 19, 2004"
+.TH CT_PR_EVENT_GET_PID 3CONTRACT "November 21, 2021"
 .SH NAME
 ct_pr_event_get_pid, ct_pr_event_get_ppid, ct_pr_event_get_signal,
 ct_pr_event_get_sender, ct_pr_event_get_senderct, ct_pr_event_get_exitstatus,
 ct_pr_event_get_pcorefile, ct_pr_event_get_gcorefile, ct_pr_event_get_zcorefile
 \- process contract event functions
 .SH SYNOPSIS
-.LP
 .nf
 cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-D_LARGEFILE64_SOURCE\fR \fB -lcontract \fR [ \fIlibrary\fR\&.\|.\|. ]
 #include <libcontract.h>
@@ -36,7 +36,7 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-D_LARGEFILE64_SOURCE\fR \fB -
 
 .LP
 .nf
-\fBint\fR \fBct_pr_event_get_senderct\fR(\fBct_evthdl_t\fR \fIevthdl\fR, \fBctid_t *\fR\fIpidp\fR);
+\fBint\fR \fBct_pr_event_get_senderct\fR(\fBct_evthdl_t\fR \fIevthdl\fR, \fBctid_t *\fR\fIctidp\fR);
 .fi
 
 .LP
@@ -60,8 +60,6 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-D_LARGEFILE64_SOURCE\fR \fB -
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 These functions read process contract event information from an event object
 returned by \fBct_event_read\fR(3CONTRACT) or
 \fBct_event_read_critical\fR(3CONTRACT).
@@ -85,10 +83,10 @@ signal's sender was not in the same zone as the signal's recipient, this
 information is available only to event consumers in the global zone.
 .sp
 .LP
-The ct_pr_event_get_senderct function reads the contract ID of the process that
-sent the signal that caused the CT_PR_EV_SIGNAL event. If the signal's sender
-was not in the same zone as the signal's recipient, this information is
-available only
+The \fBct_pr_event_get_senderct()\fR function reads the contract ID of the
+process that sent the signal that caused the \fBCT_PR_EV_SIGNAL\fR event. If
+the signal's sender was not in the same zone as the signal's recipient, this
+information is available only to event consumers in the global zone.
 .sp
 .LP
 The \fBct_pr_event_get_exitstatus()\fR function reads the exit status of the
@@ -114,8 +112,6 @@ event consumers in the global zone. A pointer to a character array is stored in
 *\fInamep\fR and is freed when \fBct_event_free()\fR is called on the event
 handle.
 .SH RETURN VALUES
-.sp
-.LP
 Upon successful completion, \fBct_pr_event_get_pid()\fR,
 \fBct_pr_event_get_ppid()\fR, \fBct_pr_event_get_signal()\fR,
 \fBct_pr_event_get_sender()\fR, \fBct_pr_event_get_senderct()\fR,
@@ -123,8 +119,6 @@ Upon successful completion, \fBct_pr_event_get_pid()\fR,
 \fBct_pr_event_get_gcorefile()\fR, and \fBct_pr_event_get_zcorefile()\fR return
 0. Otherwise, they return a non-zero error value.
 .SH ERRORS
-.sp
-.LP
 The \fBct_pr_event_get_pid()\fR, \fBct_pr_event_get_ppid()\fR,
 \fBct_pr_event_get_signal()\fR, \fBct_pr_event_get_sender()\fR,
 \fBct_pr_event_get_senderct()\fR, \fBct_pr_event_get_exitstatus()\fR,
@@ -157,15 +151,17 @@ The requested data do not match the event type.
 
 .sp
 .LP
-The \fBct_pr_event_get_sender()\fRa functions will fail if:
+The \fBct_pr_event_get_sender()\fR and \fBct_pr_event_get_senderct()\fR
+functions will fail if:
 .sp
 .ne 2
 .na
 \fB\fBENOENT\fR\fR
 .ad
 .RS 10n
-The process ID of the sender was not available, or the event object was read by
-a process running in a non-global zone and the sender was in a different zone.
+The process or contract ID of the sender was not available, or the event object
+was read by a process running in a non-global zone and the sender was in a
+different zone.
 .RE
 
 .sp
@@ -194,7 +190,6 @@ The event object was read by a process running in a non-global zone.
 .RE
 
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRPrint the instigator of all \fBCT_PR_EV_SIGNAL\fR events.
 .sp
 .LP
@@ -236,8 +231,6 @@ for (;;) {
 .in -2
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -254,8 +247,6 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBct_event_free\fR(3CONTRACT), \fBct_event_read\fR(3CONTRACT),
 \fBct_event_read_critical\fR(3CONTRACT), \fBlibcontract\fR(3LIB),
 \fBcontract\fR(4), \fBprocess\fR(4), \fBattributes\fR(5), \fBlfcompile\fR(5)
diff --git a/usr/src/pkg/manifests/system-data-hardware-registry.p5m b/usr/src/pkg/manifests/system-data-hardware-registry.p5m
index 4e569039d4..da733cd0c1 100644
--- a/usr/src/pkg/manifests/system-data-hardware-registry.p5m
+++ b/usr/src/pkg/manifests/system-data-hardware-registry.p5m
@@ -25,7 +25,7 @@
 #
 
 set name=pkg.fmri \
-    value=pkg:/system/data/hardware-registry@2021.9.23,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
+    value=pkg:/system/data/hardware-registry@2021.12.23,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
 set name=pkg.summary value="Hardware data files"
 set name=pkg.description \
     value="ASCII databases describing various PCI, USB and other hardware"
diff --git a/usr/src/prototypes/README b/usr/src/prototypes/README
index b377b9e60a..8dc7c6684c 100644
--- a/usr/src/prototypes/README
+++ b/usr/src/prototypes/README
@@ -17,5 +17,5 @@ CDDL version 1.0 for each new file introduced in illumos.
  */
 
 /*
- * Copyright 2021 <contributor>
+ * Copyright 2022 <contributor>
  */
diff --git a/usr/src/prototypes/prototype.Makefile b/usr/src/prototypes/prototype.Makefile
index f3d19ae8e3..bd70566a7f 100644
--- a/usr/src/prototypes/prototype.Makefile
+++ b/usr/src/prototypes/prototype.Makefile
@@ -10,6 +10,6 @@
 #
 
 #
-# Copyright 2021 <contributor>
+# Copyright 2022 <contributor>
 #
 
diff --git a/usr/src/prototypes/prototype.c b/usr/src/prototypes/prototype.c
index 36cd2f91ac..6d29a63e7b 100644
--- a/usr/src/prototypes/prototype.c
+++ b/usr/src/prototypes/prototype.c
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2021 <contributor>
+ * Copyright 2022 <contributor>
  */
 
 /*
diff --git a/usr/src/prototypes/prototype.csh b/usr/src/prototypes/prototype.csh
index 4f7d0b6f4e..ed35e114ff 100644
--- a/usr/src/prototypes/prototype.csh
+++ b/usr/src/prototypes/prototype.csh
@@ -12,6 +12,6 @@
 #
 
 #
-# Copyright 2021 <contributor>
+# Copyright 2022 <contributor>
 #
 
diff --git a/usr/src/prototypes/prototype.h b/usr/src/prototypes/prototype.h
index 6cdfd3116e..5601b7783b 100644
--- a/usr/src/prototypes/prototype.h
+++ b/usr/src/prototypes/prototype.h
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2021 <contributor>
+ * Copyright 2022 <contributor>
  */
 
 #ifndef _PROTOTYPE_H
diff --git a/usr/src/prototypes/prototype.java b/usr/src/prototypes/prototype.java
index f4997b9dc1..0165c9618d 100644
--- a/usr/src/prototypes/prototype.java
+++ b/usr/src/prototypes/prototype.java
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2021 <contributor>
+ * Copyright 2022 <contributor>
  */
 
 /*
diff --git a/usr/src/prototypes/prototype.ksh b/usr/src/prototypes/prototype.ksh
index b63044b74c..5efa35dda4 100644
--- a/usr/src/prototypes/prototype.ksh
+++ b/usr/src/prototypes/prototype.ksh
@@ -12,6 +12,6 @@
 #
 
 #
-# Copyright 2021 <contributor>
+# Copyright 2022 <contributor>
 #
 
diff --git a/usr/src/prototypes/prototype.man b/usr/src/prototypes/prototype.man
index bb262e9a5b..aed777a30b 100644
--- a/usr/src/prototypes/prototype.man
+++ b/usr/src/prototypes/prototype.man
@@ -9,5 +9,5 @@
 .\" http://www.illumos.org/license/CDDL.
 .\"
 .\"
-.\" Copyright 2021 <contributor>
+.\" Copyright 2022 <contributor>
 .\"
diff --git a/usr/src/prototypes/prototype.man1 b/usr/src/prototypes/prototype.man1
index d1e1d6fedf..f1551578b4 100644
--- a/usr/src/prototypes/prototype.man1
+++ b/usr/src/prototypes/prototype.man1
@@ -9,7 +9,7 @@
 .\" http://www.illumos.org/license/CDDL.
 .\"
 .\"
-.\" Copyright 2021 <contributor>
+.\" Copyright 2022 <contributor>
 .\"
 .Dd Month Day, Year
 .Dt COMMAND 1
diff --git a/usr/src/prototypes/prototype.man3x b/usr/src/prototypes/prototype.man3x
index c5ea8f639f..c707abe2d5 100644
--- a/usr/src/prototypes/prototype.man3x
+++ b/usr/src/prototypes/prototype.man3x
@@ -9,7 +9,7 @@
 .\" http://www.illumos.org/license/CDDL.
 .\"
 .\"
-.\" Copyright 2021 <contributor>
+.\" Copyright 2022 <contributor>
 .\"
 .Dd Month Day, Year
 .Dt MANUALPAGE 3SECTION
diff --git a/usr/src/prototypes/prototype.man7d b/usr/src/prototypes/prototype.man7d
index 12e25f490e..f41cd2e465 100644
--- a/usr/src/prototypes/prototype.man7d
+++ b/usr/src/prototypes/prototype.man7d
@@ -9,7 +9,7 @@
 .\" http://www.illumos.org/license/CDDL.
 .\"
 .\"
-.\" Copyright 2021 <contributor>
+.\" Copyright 2022 <contributor>
 .\"
 .Dd Month Day, Year
 .Dt DRIVERNAME 7D
diff --git a/usr/src/prototypes/prototype.man9e b/usr/src/prototypes/prototype.man9e
index 81c8f73e6e..a708745adf 100644
--- a/usr/src/prototypes/prototype.man9e
+++ b/usr/src/prototypes/prototype.man9e
@@ -9,7 +9,7 @@
 .\" http://www.illumos.org/license/CDDL.
 .\"
 .\"
-.\" Copyright 2021 <contributor>
+.\" Copyright 2022 <contributor>
 .\"
 .Dd Month Day, Year
 .Dt ENTRYNAME 9E
diff --git a/usr/src/prototypes/prototype.man9f b/usr/src/prototypes/prototype.man9f
index 5617e8c988..7d640429d0 100644
--- a/usr/src/prototypes/prototype.man9f
+++ b/usr/src/prototypes/prototype.man9f
@@ -9,7 +9,7 @@
 .\" http://www.illumos.org/license/CDDL.
 .\"
 .\"
-.\" Copyright 2021 <contributor>
+.\" Copyright 2022 <contributor>
 .\"
 .Dd Month Day, Year
 .Dt FUNCNAME 9F
diff --git a/usr/src/prototypes/prototype.mapfile-vers b/usr/src/prototypes/prototype.mapfile-vers
index 379b4bbca5..787e030801 100644
--- a/usr/src/prototypes/prototype.mapfile-vers
+++ b/usr/src/prototypes/prototype.mapfile-vers
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2021 <contributor>
+# Copyright 2022 <contributor>
 #
 
 #
diff --git a/usr/src/prototypes/prototype.pl b/usr/src/prototypes/prototype.pl
index 21590b137f..b49d8075cb 100644
--- a/usr/src/prototypes/prototype.pl
+++ b/usr/src/prototypes/prototype.pl
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright 2021 <contributor>
+# Copyright 2022 <contributor>
 #
 
 #
diff --git a/usr/src/prototypes/prototype.py b/usr/src/prototypes/prototype.py
index 391565ca96..4501c4f6d1 100644
--- a/usr/src/prototypes/prototype.py
+++ b/usr/src/prototypes/prototype.py
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright 2021 <contributor>
+# Copyright 2022 <contributor>
 #
 
 #
diff --git a/usr/src/prototypes/prototype.s b/usr/src/prototypes/prototype.s
index 8601df9754..ef3e45a16b 100644
--- a/usr/src/prototypes/prototype.s
+++ b/usr/src/prototypes/prototype.s
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2021 <contributor>
+ * Copyright 2022 <contributor>
  */
 
 	.file	"prototype.s"
diff --git a/usr/src/prototypes/prototype.sh b/usr/src/prototypes/prototype.sh
index 54f8dee725..892c98cbf1 100644
--- a/usr/src/prototypes/prototype.sh
+++ b/usr/src/prototypes/prototype.sh
@@ -12,6 +12,6 @@
 #
 
 #
-# Copyright 2021 <contributor>
+# Copyright 2022 <contributor>
 #
 
diff --git a/usr/src/uts/common/io/mr_sas/mr_sas.c b/usr/src/uts/common/io/mr_sas/mr_sas.c
index 0d23464dec..5a43a73c61 100644
--- a/usr/src/uts/common/io/mr_sas/mr_sas.c
+++ b/usr/src/uts/common/io/mr_sas/mr_sas.c
@@ -2530,10 +2530,9 @@ push_pending_mfi_pkt(struct mrsas_instance *instance, struct mrsas_cmd *cmd)
 			    cmd->frame_dma_obj.acc_handle, &hdr->timeout);
 			if (cmd->drv_pkt_time < debug_timeout_g)
 				cmd->drv_pkt_time = (uint16_t)debug_timeout_g;
-				con_log(CL_ANN1, (CE_CONT,
-				    "push_pending_pkt(): "
-				    "Called IO Timeout Value %x\n",
-				    cmd->drv_pkt_time));
+			con_log(CL_ANN1, (CE_CONT,
+			    "push_pending_pkt(): Called IO Timeout Value %x\n",
+			    cmd->drv_pkt_time));
 		}
 		if (hdr && instance->timeout_id == (timeout_id_t)-1) {
 			instance->timeout_id = timeout(io_timeout_checker,