[illumos-gate merge]

commit 1cdca625ac0e1e0a31db02a0dc4be33ae14b64cc
    9534 xhci_portsc should only be installed on x86
commit fcd69270d3e30d8121da73f26d9d8aec4375ecd4
    9550 Create hub symlinks for xhci devices
commit 0df48811699b83d09c552548effcb1718d6ff1d0
    9545 Global visibility of C11 functions in C++11 and C++17 in stdlib.h

	Conflicts:
	usr/src/uts/common/sys/smbios_impl.h
	usr/src/common/smbios/smb_info.c
	usr/src/common/smbios/mktables.sh

5 files changed, 42 insertions, 26 deletions

diff --git a/usr/src/cmd/Makefile b/usr/src/cmd/Makefile
index ea615f12c1..5bc1979193 100644
--- a/usr/src/cmd/Makefile
+++ b/usr/src/cmd/Makefile
@@ -27,6 +27,7 @@
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
 # Copyright 2016 Toomas Soome <tsoome@me.com>
 # Copyright 2016 Nexenta Systems, Inc.
+# Copyright 2018 Gary Mills
 #
 
 include ../Makefile.master
@@ -457,7 +458,6 @@ COMMON_SUBDIRS=		\
 	wracct		\
 	write		\
 	xargs		\
-	xhci		\
 	xstr		\
 	yes		\
 	ypcmd		\
@@ -490,6 +490,7 @@ i386_SUBDIRS=		\
 	nvmeadm		\
 	rtc		\
 	ucodeadm	\
+	xhci		\
 	xvm
 
 sparc_SUBDIRS=		\
diff --git a/usr/src/cmd/devfsadm/usb_link.c b/usr/src/cmd/devfsadm/usb_link.c
index d47c4931eb..ac6a8447fb 100644
--- a/usr/src/cmd/devfsadm/usb_link.c
+++ b/usr/src/cmd/devfsadm/usb_link.c
@@ -61,6 +61,8 @@ static devfsadm_create_t usb_cbt[] = {
 						ILEVEL_0, usb_process },
 	{ "usb", DDI_NT_NEXUS, "ehci",	DRV_EXACT|TYPE_EXACT,
 						ILEVEL_0, usb_process },
+	{ "usb", DDI_NT_NEXUS, "xhci",	DRV_EXACT|TYPE_EXACT,
+						ILEVEL_0, usb_process },
 	{ "usb", DDI_NT_SCSI_NEXUS, "scsa2usb",	DRV_EXACT|TYPE_EXACT,
 						ILEVEL_0, usb_process },
 	{ "usb", DDI_NT_UGEN, "scsa2usb",	DRV_EXACT|TYPE_EXACT,
@@ -189,28 +191,29 @@ minor_fini(void)
 }
 
 typedef enum {
-	DRIVER_HUBD	= 0,
-	DRIVER_OHCI	= 1,
-	DRIVER_EHCI	= 2,
-	DRIVER_UHCI	= 3,
-	DRIVER_USB_AC	= 4,
-	DRIVER_USB_AS	= 5,
-	DRIVER_HID	= 6,
-	DRIVER_USB_MID	= 7,
-	DRIVER_DDIVS_USBC = 8,
-	DRIVER_SCSA2USB = 9,
-	DRIVER_USBPRN	= 10,
-	DRIVER_UGEN	= 11,
-	DRIVER_VIDEO	= 12,
-	DRIVER_HWAHC	= 13,
-	DRIVER_HWARC	= 14,
-	DRIVER_WUSB_CA	= 15,
-	DRIVER_UNKNOWN	= 16
+	DRIVER_HUBD,
+	DRIVER_OHCI,
+	DRIVER_EHCI,
+	DRIVER_UHCI,
+	DRIVER_XHCI,
+	DRIVER_USB_AC,
+	DRIVER_USB_AS,
+	DRIVER_HID,
+	DRIVER_USB_MID,
+	DRIVER_DDIVS_USBC,
+	DRIVER_SCSA2USB,
+	DRIVER_USBPRN,
+	DRIVER_UGEN,
+	DRIVER_VIDEO,
+	DRIVER_HWAHC,
+	DRIVER_HWARC,
+	DRIVER_WUSB_CA,
+	DRIVER_UNKNOWN
 } driver_defs_t;
 
 typedef struct {
 	char	*driver_name;
-	int	index;
+	driver_defs_t	index;
 } driver_name_table_entry_t;
 
 driver_name_table_entry_t driver_name_table[] = {
@@ -218,6 +221,7 @@ driver_name_table_entry_t driver_name_table[] = {
 	{ "ohci",	DRIVER_OHCI },
 	{ "ehci",	DRIVER_EHCI },
 	{ "uhci",	DRIVER_UHCI },
+	{ "xhci",	DRIVER_XHCI },
 	{ "usb_ac",	DRIVER_USB_AC },
 	{ "usb_as",	DRIVER_USB_AS },
 	{ "hid",	DRIVER_HID },
@@ -244,7 +248,8 @@ usb_process(di_minor_t minor, di_node_t node)
 	devfsadm_enumerate_t rules[1];
 	char *l_path, *p_path, *buf, *devfspath;
 	char *minor_nm, *drvr_nm, *name = (char *)NULL;
-	int i, index;
+	int i;
+	driver_defs_t index;
 	int flags = 0;
 	int create_secondary_link = 0;
 
@@ -307,6 +312,7 @@ usb_process(di_minor_t minor, di_node_t node)
 	case DRIVER_OHCI:
 	case DRIVER_EHCI:
 	case DRIVER_UHCI:
+	case DRIVER_XHCI:
 		rules[0] = hub_rules[0];	/* For HUBs */
 		name = "hub";
 
diff --git a/usr/src/cmd/smbios/smbios.c b/usr/src/cmd/smbios/smbios.c
index f7c9ed1133..34764f3828 100644
--- a/usr/src/cmd/smbios/smbios.c
+++ b/usr/src/cmd/smbios/smbios.c
@@ -570,9 +570,9 @@ print_processor(smbios_hdl_t *shp, id_t id, FILE *fp)
 	else
 		oprintf(fp, "  Current Speed: Unknown\n");
 
-	id_printf(fp, "  L1 Cache: ", p.smbp_l1cache);
-	id_printf(fp, "  L2 Cache: ", p.smbp_l2cache);
-	id_printf(fp, "  L3 Cache: ", p.smbp_l3cache);
+	id_printf(fp, "  L1 Cache Handle: ", p.smbp_l1cache);
+	id_printf(fp, "  L2 Cache Handle: ", p.smbp_l2cache);
+	id_printf(fp, "  L3 Cache Handle: ", p.smbp_l3cache);
 }
 
 static void
diff --git a/usr/src/head/stdlib.h b/usr/src/head/stdlib.h
index 8583aa51bd..6ec82aa1c2 100644
--- a/usr/src/head/stdlib.h
+++ b/usr/src/head/stdlib.h
@@ -80,6 +80,18 @@ using std::wcstombs;
 using std::wctomb;
 #endif
 
+/*
+ * Allow global visibility for symbols defined in
+ * C++ "std" namespace in <iso/stdlib_c11.h>.
+ */
+#if __cplusplus >= 201103L
+using std::at_quick_exit;
+using std::quick_exit;
+#endif
+#if __cplusplus >= 201703L
+using std::aligned_alloc;
+#endif
+
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/common/sys/smbios_impl.h b/usr/src/uts/common/sys/smbios_impl.h
index 66edfb027a..dbb4c86262 100644
--- a/usr/src/uts/common/sys/smbios_impl.h
+++ b/usr/src/uts/common/sys/smbios_impl.h
@@ -555,9 +555,6 @@ typedef struct smb_powersup {
 #define	SMB_PSU_CHARS_STATUS(x)		(((x) >> 7) & 0x7)
 #define	SMB_PSU_CHARS_TYPE(x)		(((x) >> 10) & 0xf)
 
-/*
- * SMBIOS implementation structure for SMB_TYPE_OBDEVEXT.
- */
 typedef struct smb_obdev_ext {
 	smb_header_t smbobe_hdr;	/* structure header */
 	uint8_t smbobe_name;		/* reference designation */