[illumos-gate merge]release-20200409

commit 62366fbbe8edca853fee6c14327d822239ba914f
    12466 Enable IPv6 TSO Support for vioif
commit d240edaf609c558d5a1f981b09a577823b54fae2
    12465 vioif needs length for tso checksum
commit 425251fd07ab465313fb50dea0f1ac795be10e05
    9059 Simplify SMAP relocations with krtld
commit 28e0ac9c914344194ef919b0271895d33f83d396
    12433 efcode: NULL pointer errors
commit 31aa620247ae407b2bee2dccd71693d1938f54d6
    12452 Want support for AMD Zen 2 CPC Events

	Conflicts:
	usr/src/uts/i86pc/os/machdep.c
	usr/src/uts/common/io/dld/dld_proto.c
	usr/src/uts/common/inet/ip/ip_if.c

9 files changed, 44 insertions, 63 deletions

diff --git a/usr/src/lib/efcode/engine/env.c b/usr/src/lib/efcode/engine/env.c
index 0fe815baed..16431b21dd 100644
--- a/usr/src/lib/efcode/engine/env.c
+++ b/usr/src/lib/efcode/engine/env.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <ctype.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -230,7 +228,7 @@ typedef struct CMN_MSG_T cmn_msg_t;
 struct CMN_MSG_T {
 	char		buf[CMN_MSG_SIZE];
 	int		level;
-	int 		len;
+	int		len;
 	cmn_msg_t	*prev;
 	cmn_msg_t	*next;
 };
@@ -243,7 +241,7 @@ struct CMN_FMT_T {
 	char	format; /* format type */
 };
 
-static cmn_msg_t 	*root = NULL;
+static cmn_msg_t	*root = NULL;
 static int		cmn_msg_level = 0;
 
 /*
@@ -271,7 +269,7 @@ static int		cmn_msg_level = 0;
  * For valid formatting, caller's supplied cmn_fmt_t elements are
  * filled in:
  *	fwidth:
- * 		> 0 - returned value is the field width
+ *		> 0 - returned value is the field width
  *		< 0 - returned value is negation of field width for
  *			64 bit data formats
  *	cwidth:
@@ -296,7 +294,7 @@ validfmt(char *fmt, cmn_fmt_t *cfstr)
 	cwidth = &cfstr->cwidth;
 	format = &cfstr->format;
 	*fwidth = *cwidth = 0;
-	*format = NULL;
+	*format = '\0';
 	dig1 = dig2 = NULL;
 
 	/* check for left justification character */
@@ -361,7 +359,7 @@ validfmt(char *fmt, cmn_fmt_t *cfstr)
 		(*fwidth)++;
 		break;
 	case 'p':
-		isll = 1; 		/* uses 64 bit format */
+		isll = 1;		/* uses 64 bit format */
 		*format = *fmt;
 		(*fwidth)++;
 		break;
@@ -392,7 +390,7 @@ validfmt(char *fmt, cmn_fmt_t *cfstr)
 
 static void
 fmt_args(fcode_env_t *env, int cw, int fw, char format, long *arg,
-	long long *llarg)
+    long long *llarg)
 {
 	char	*cbuf;
 	char	snf[3];
@@ -423,8 +421,8 @@ fmt_args(fcode_env_t *env, int cw, int fw, char format, long *arg,
 			return;
 		default:
 			log_message(MSG_ERROR,
-				"fmt_args:invalid format type! (%s)\n",
-					&format);
+			    "fmt_args:invalid format type! (%s)\n",
+			    &format);
 			return;
 		}
 
@@ -436,9 +434,9 @@ fmt_args(fcode_env_t *env, int cw, int fw, char format, long *arg,
 
 			if (snprintf(cbuf, cbsize, snf, *arg) < 0)
 				log_message(MSG_ERROR,
-					"fmt_args: snprintf output error\n");
-			while ((cbuf[ndigits] != NULL) &&
-				(ndigits < cbsize))
+				    "fmt_args: snprintf output error\n");
+			while ((cbuf[ndigits] != '\0') &&
+			    (ndigits < cbsize))
 				ndigits++;
 
 			/* if truncation is necessary, do it */
@@ -449,8 +447,7 @@ fmt_args(fcode_env_t *env, int cw, int fw, char format, long *arg,
 					str = (char *)*arg;
 					str[cw] = 0;
 				} else
-					*arg = strtol(cbuf,
-						(char **)NULL, cnv);
+					*arg = strtol(cbuf, (char **)NULL, cnv);
 			}
 			free(cbuf);
 		}
@@ -470,7 +467,7 @@ fmt_args(fcode_env_t *env, int cw, int fw, char format, long *arg,
 				cnv = 16;
 				if (snprintf(cbuf, cbsize, "%p", *llarg) < 0)
 					log_message(MSG_ERROR,
-						"fmt_args: snprintf error\n");
+					    "fmt_args: snprintf error\n");
 				break;
 			case 'x':
 				cnv = 16;
@@ -481,17 +478,17 @@ fmt_args(fcode_env_t *env, int cw, int fw, char format, long *arg,
 			case 'd':
 				if (snprintf(cbuf, cbsize, "%ld", *llarg) < 0)
 					log_message(MSG_ERROR,
-						"fmt_args: snprintf error\n");
+					    "fmt_args: snprintf error\n");
 				break;
 			default:
 				log_message(MSG_ERROR,
 				    "invalid long format type! (l%s)\n",
-						&format);
+				    &format);
 				free(cbuf);
 				return;
 			}
-			while ((cbuf[ndigits] != NULL) &&
-				(ndigits < cbsize)) {
+			while ((cbuf[ndigits] != '\0') &&
+			    (ndigits < cbsize)) {
 				ndigits++;
 			}
 			/* if truncation is necessary, do it */
@@ -561,8 +558,8 @@ fmt_str(fcode_env_t *env, char *fmt, char *fmtbuf, int bsize)
 			tbuf[bytes] = 0;
 
 			log_message(MSG_ERROR,
-				"fmt_str: invalid format type! (%s)\n",
-				tbuf+bytes-3);
+			    "fmt_str: invalid format type! (%s)\n",
+			    tbuf+bytes-3);
 
 			strncpy(fmtbuf, tbuf, bsize);
 			return;
@@ -589,8 +586,8 @@ fmt_str(fcode_env_t *env, char *fmt, char *fmtbuf, int bsize)
 
 		/* if more input buffer to process, recurse */
 		if ((l - abs(fw)) != 0) {
-		    fmt_str(env, pct+abs(fw), (tbuf + strlen(tbuf)),
-				CMN_MSG_SIZE - strlen(tbuf));
+			fmt_str(env, pct+abs(fw), (tbuf + strlen(tbuf)),
+			    CMN_MSG_SIZE - strlen(tbuf));
 		}
 
 		/* call to extract args for snprintf() calls below */
@@ -611,7 +608,7 @@ fmt_str(fcode_env_t *env, char *fmt, char *fmtbuf, int bsize)
 			default:
 				log_message(MSG_ERROR,
 				    "fmt_str: invalid format (%s)\n",
-					fmptr);
+				    fmptr);
 				return;
 			}
 
@@ -642,7 +639,7 @@ fc_cmn_append(fcode_env_t *env)
 
 	if (root == NULL) {
 		log_message(MSG_ERROR,
-			"fc_cmn_append: no message context for append\n");
+		    "fc_cmn_append: no message context for append\n");
 		return;
 	}
 
@@ -651,11 +648,11 @@ fc_cmn_append(fcode_env_t *env)
 
 	if ((root->len + len) < CMN_MSG_SIZE) {
 		fmt_str(env, str, root->buf+root->len, CMN_MSG_SIZE -
-			root->len);
+		    root->len);
 		root->len += len;
 	} else
 		log_message(MSG_ERROR,
-			"fc_cmn_append: append exceeds max msg size\n");
+		    "fc_cmn_append: append exceeds max msg size\n");
 }
 
 /*
diff --git a/usr/src/lib/efcode/engine/mcookie.c b/usr/src/lib/efcode/engine/mcookie.c
index 7f25a321cd..2bcc02af1a 100644
--- a/usr/src/lib/efcode/engine/mcookie.c
+++ b/usr/src/lib/efcode/engine/mcookie.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -116,7 +114,7 @@ delete_mapping(fstack_t mcookie)
 		}
 	}
 	log_message(MSG_WARN, "Warning: delete_mapping: invalid"
-		" mcookie: %llx\n", (uint64_t)mcookie);
+	    " mcookie: %llx\n", (uint64_t)mcookie);
 }
 
 int
@@ -209,7 +207,7 @@ add_map(fcode_env_t *env)
 
 	size = POP(DS);
 	addr = POP(DS);
-	addr = mapping_to_mcookie(addr, size, NULL, NULL);
+	addr = mapping_to_mcookie(addr, size, 0, 0);
 	PUSH(DS, addr);
 }
 
diff --git a/usr/src/lib/efcode/fcdriver/build_tree.c b/usr/src/lib/efcode/fcdriver/build_tree.c
index 9abcbe9fbc..6882b7ba0a 100644
--- a/usr/src/lib/efcode/fcdriver/build_tree.c
+++ b/usr/src/lib/efcode/fcdriver/build_tree.c
@@ -24,8 +24,6 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -47,7 +45,7 @@ fc_nodeop(common_data_t *cdp, fc_phandle_t node, char *svc)
 
 	error = fc_run_priv(cdp, svc, 1, 1, fc_phandle2cell(node), &hcell);
 	if (error)
-		return (NULL);
+		return (0);
 	return (fc_cell2phandle(hcell));
 }
 
@@ -85,7 +83,7 @@ get_prom_nodeid(fcode_env_t *env, device_t *d)
 	name = get_package_name(env, d);
 	debug_msg(DEBUG_UPLOAD, "Node %s: %p (%p)\n", name, d, pd);
 	if (d->parent) {
-		private_data_t *ppd = (private_data_t *) d->parent->private;
+		private_data_t *ppd = (private_data_t *)d->parent->private;
 		fc_phandle_t thisnode;
 
 		if (os_get_prop_common(cdp, ppd->node, "name",
@@ -94,7 +92,7 @@ get_prom_nodeid(fcode_env_t *env, device_t *d)
 		debug_msg(DEBUG_UPLOAD, "Parent: %p (%p) %s = %p\n", d->parent,
 		    ppd, namebuf, ppd->node);
 		for (thisnode = fc_nodeop(cdp, ppd->node, FC_CHILD_FCODE);
-		    thisnode != NULL;
+		    thisnode != 0;
 		    thisnode = fc_nodeop(cdp, thisnode, FC_PEER_FCODE)) {
 			int status;
 
diff --git a/usr/src/lib/efcode/fcdriver/get_req.c b/usr/src/lib/efcode/fcdriver/get_req.c
index 1423524a5d..2fd07e4fec 100644
--- a/usr/src/lib/efcode/fcdriver/get_req.c
+++ b/usr/src/lib/efcode/fcdriver/get_req.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -81,7 +79,7 @@ fc_get_request(common_data_t *cdp)
 		return (0);
 	}
 
-	if ((cdp->attach = fc_get_ap(cdp)) == NULL)
+	if ((cdp->attach = fc_get_ap(cdp)) == 0)
 		return (0);
 
 	return (1);
@@ -355,7 +353,7 @@ get_efdaemon_request(fcode_env_t *env)
 		exit(1);
 	}
 
-	if ((cdp->attach = fc_get_ap(cdp)) == NULL)
+	if ((cdp->attach = fc_get_ap(cdp)) == 0)
 		exit(1);
 
 	get_my_args(env);
diff --git a/usr/src/lib/efcode/fcdriver/property.c b/usr/src/lib/efcode/fcdriver/property.c
index 5634d1407d..97a9f5ea0d 100644
--- a/usr/src/lib/efcode/fcdriver/property.c
+++ b/usr/src/lib/efcode/fcdriver/property.c
@@ -24,8 +24,6 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -129,7 +127,7 @@ os_get_prop(fcode_env_t *env, int inherit, device_t *dev)
 	name = pop_a_string(env, &len);
 
 	node = pd->node;
-	if (node == NULL) {
+	if (node == 0) {
 		log_message(MSG_ERROR, "os_get_prop: NULL node: %s\n",
 		    get_path(env, dev));
 		PUSH(DS, TRUE);
diff --git a/usr/src/lib/efcode/gp2/gp2.c b/usr/src/lib/efcode/gp2/gp2.c
index 8832230f76..bdc8f2d72f 100644
--- a/usr/src/lib/efcode/gp2/gp2.c
+++ b/usr/src/lib/efcode/gp2/gp2.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
@@ -40,7 +38,7 @@ mem_map_in(fcode_env_t *env, fstack_t hi, fstack_t lo, fstack_t len)
 {
 	private_data_t *pdp = DEVICE_PRIVATE(env);
 	fc_cell_t virt;
-	fstack_t mcookie = NULL;
+	fstack_t mcookie = 0;
 	char *service = "map-in";
 	int error;
 	int offset = 0;
@@ -60,9 +58,9 @@ mem_map_in(fcode_env_t *env, fstack_t hi, fstack_t lo, fstack_t len)
 	if (error)
 		throw_from_fclib(env, 1, "gp2:%s: failed\n", service);
 
-	mcookie = mapping_to_mcookie(virt, len, NULL, NULL);
+	mcookie = mapping_to_mcookie(virt, len, 0, 0);
 
-	if (mcookie == NULL)
+	if (mcookie == 0)
 		throw_from_fclib(env, 1, "gp2:%s: mapping_to_mcookie failed\n",
 		    service);
 
@@ -294,7 +292,7 @@ do_device_id(fcode_env_t *env)
 
 	/* Try to read the wci_id register */
 	rc = fc_run_priv(pdp->common, "rx@", 1, 1, virtaddr + 0xe0,
-		    &wci_id_reg);
+	    &wci_id_reg);
 
 	mem_map_out(env, addr, 0x100);
 
diff --git a/usr/src/lib/efcode/jupiter/jupiter.c b/usr/src/lib/efcode/jupiter/jupiter.c
index 821a24656a..823cbe1b5f 100644
--- a/usr/src/lib/efcode/jupiter/jupiter.c
+++ b/usr/src/lib/efcode/jupiter/jupiter.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
@@ -52,7 +50,7 @@ mem_map_in(fcode_env_t *env, fstack_t hi, fstack_t lo, fstack_t len)
 {
 	private_data_t	*pdp = DEVICE_PRIVATE(env);
 	fc_cell_t	virt;
-	fstack_t	mcookie = NULL;
+	fstack_t	mcookie = 0;
 	char		*service = "map-in";
 	int		error;
 	int		offset = 0;
@@ -72,9 +70,9 @@ mem_map_in(fcode_env_t *env, fstack_t hi, fstack_t lo, fstack_t len)
 	if (error)
 		throw_from_fclib(env, 1, "jupiter:%s: failed\n", service);
 
-	mcookie = mapping_to_mcookie(virt, len, NULL, NULL);
+	mcookie = mapping_to_mcookie(virt, len, 0, 0);
 
-	if (mcookie == NULL)
+	if (mcookie == 0)
 		throw_from_fclib(env, 1,
 		    "jupiter:%s: mapping_to_mcookie failed\n", service);
 
@@ -420,7 +418,7 @@ do_get_interrupt_target(fcode_env_t *env)
 
 	PUSH(DS, mid);
 	debug_msg(DEBUG_REG_ACCESS,
-		"jupiter:get-interrupt-target ( ) -> %x\n", mid);
+	    "jupiter:get-interrupt-target ( ) -> %x\n", mid);
 }
 
 
diff --git a/usr/src/lib/efcode/packages/memalloc.c b/usr/src/lib/efcode/packages/memalloc.c
index 5e8d365d17..b32b1e5228 100644
--- a/usr/src/lib/efcode/packages/memalloc.c
+++ b/usr/src/lib/efcode/packages/memalloc.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
@@ -55,7 +53,7 @@ claim(fcode_env_t *env)
 	    fc_int2cell(align), fc_size2cell(size), fc_ptr2cell(hint), &vaddr);
 	if (error)
 		throw_from_fclib(env, 1, "client-services/claim failed\n");
-	vaddr = mapping_to_mcookie(vaddr, size, NULL, NULL);
+	vaddr = mapping_to_mcookie(vaddr, size, 0, 0);
 	PUSH(DS, (fstack_t)vaddr);
 }
 
diff --git a/usr/src/lib/efcode/pci/pci.c b/usr/src/lib/efcode/pci/pci.c
index 53aa22cdf9..2ee4fc02c2 100644
--- a/usr/src/lib/efcode/pci/pci.c
+++ b/usr/src/lib/efcode/pci/pci.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
@@ -43,7 +41,7 @@ mem_map_in(fcode_env_t *env, fstack_t hi, fstack_t mid, fstack_t lo,
 	int error;
 	fc_cell_t requested_virt, adjusted_virt;
 	char *service = "map-in";
-	fstack_t mcookie = NULL;
+	fstack_t mcookie = 0;
 	int pa_offset = 0, va_offset = 0;
 	fstack_t adjusted_len = 0;
 
@@ -83,7 +81,7 @@ mem_map_in(fcode_env_t *env, fstack_t hi, fstack_t mid, fstack_t lo,
 	mcookie = mapping_to_mcookie(requested_virt, requested_len,
 	    adjusted_virt, adjusted_len);
 
-	if (mcookie == NULL)
+	if (mcookie == 0)
 		throw_from_fclib(env, 1, "pci-mapin-> pci:%s:"
 		    " mapping_to_mcookie failed\n", service);
 	/*