4 files changed, 15 insertions, 353 deletions

diff --git a/usr/src/lib/libprtdiag/common/display_sun4u.c b/usr/src/lib/libprtdiag/common/display_sun4u.c
index a68246600f..56e2716e38 100644
--- a/usr/src/lib/libprtdiag/common/display_sun4u.c
+++ b/usr/src/lib/libprtdiag/common/display_sun4u.c
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020 Peter Tribble.
  */
 
 #include <stdio.h>
@@ -62,7 +63,6 @@ display(Sys_tree *tree,
 	int exit_code = 0;	/* init to all OK */
 	void *value;		/* used for opaque PROM data */
 	struct mem_total memory_total;	/* Total memory in system */
-	struct grp_info grps;	/* Info on all groups in system */
 
 	sys_clk = -1;  /* System clock freq. (in MHz) */
 
@@ -96,7 +96,7 @@ display(Sys_tree *tree,
 		}
 
 		/* Display the Memory Size */
-		display_memorysize(tree, kstats, &grps, &memory_total);
+		display_memorysize(tree, kstats, &memory_total);
 
 		/* Display platform specific configuration info */
 		display_platform_specific_header();
@@ -105,7 +105,7 @@ display(Sys_tree *tree,
 		display_cpu_devices(tree);
 
 		/* Display the Memory configuration */
-		display_memoryconf(tree, &grps);
+		display_memoryconf(tree);
 
 		/* Display all the IO cards. */
 		(void) display_io_devices(tree);
diff --git a/usr/src/lib/libprtdiag/common/display_sun4v.c b/usr/src/lib/libprtdiag/common/display_sun4v.c
index e4a2408537..9ec03878b5 100644
--- a/usr/src/lib/libprtdiag/common/display_sun4v.c
+++ b/usr/src/lib/libprtdiag/common/display_sun4v.c
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020 Peter Tribble.
  */
 
 #include <stdio.h>
@@ -119,7 +120,6 @@ sun4v_display(Sys_tree *tree, Prom_node *root, int log,
 {
 	void *value;		/* used for opaque PROM data */
 	struct mem_total memory_total;	/* Total memory in system */
-	struct grp_info grps;	/* Info on all groups in system */
 	char machine[MAXSTRLEN];
 	int	exit_code = 0;
 
@@ -155,7 +155,7 @@ sun4v_display(Sys_tree *tree, Prom_node *root, int log,
 		}
 
 		/* Display the Memory Size */
-		display_memorysize(tree, NULL, &grps, &memory_total);
+		display_memorysize(tree, NULL, &memory_total);
 
 		/* Display the CPU devices */
 		sun4v_display_cpu_devices(plafh);
diff --git a/usr/src/lib/libprtdiag/common/kstat.c b/usr/src/lib/libprtdiag/common/kstat.c
index 1c29e96642..5aaf523441 100644
--- a/usr/src/lib/libprtdiag/common/kstat.c
+++ b/usr/src/lib/libprtdiag/common/kstat.c
@@ -22,10 +22,9 @@
 /*
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
+ * Copyright (c) 2020 Peter Tribble.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -54,369 +53,33 @@
 
 /*
  * This module does the reading and interpreting of sun4u system
- * kstats. These kstats are created by the following drivers:
- * fhc, environ, sysctrl. Each board in the tree should have
- * kstats created for it.  There are also system wide kstats that
- * are created.
+ * kstats. It is overlaid by a platform-specific implementation as
+ * appropriate.
  */
 void
 read_platform_kstats(Sys_tree *tree, struct system_kstat_data *sys_kstat,
-	struct bd_kstat_data *bdp, struct envctrl_kstat_data *ep)
+	struct envctrl_kstat_data *ep)
 {
-	Board_node	*bnode;
-	kstat_ctl_t	*kc;
-	kstat_t		*ksp;
-	kstat_named_t	*knp;
-	int		i;
-	struct hp_info	*hp;
-
-#ifdef lint
-	ep = ep;
-#endif
-	if ((kc = kstat_open()) == NULL) {
-		return;
-	}
-
-	/* For each board in the system, read the kstats for it. */
-	for (bnode = tree->bd_list; bnode != NULL; bnode = bnode->next) {
-		int board;
-
-		/*
-		 * Kstat instances numbers are set by fhc, ac, simmstat,
-		 * and environ drivers based on their board# property.
-		 */
-		board = bnode->board_num;
-		bdp = &sys_kstat->bd_ksp_list[board];
-
-		/* Try to find an FHC instance for this board number */
-		ksp = kstat_lookup(kc, UNIX, board, FHC_KSTAT_NAME);
-
-		/* Atempt to read the FHC kstat */
-		if ((ksp != NULL) && (kstat_read(kc, ksp, NULL) == -1)) {
-			ksp = NULL;
-		}
-
-		/* Now read out the data if the kstat read OK */
-		if (ksp != NULL) {
-			/*
-			 * We set the kstats_ok flag to good here. If we
-			 * fail one of the data reads, we set it to bad.
-			 */
-			bdp->fhc_kstats_ok = 1;
-
-			/*
-			 * For each data value, If the Kstat named struct
-			 * is found, then get the data out.
-			 */
-			knp = kstat_data_lookup(ksp, CSR_KSTAT_NAMED);
-			if (knp != NULL) {
-				bdp->fhc_csr = knp->value.ul;
-			} else {
-				bdp->fhc_kstats_ok = 0;
-			}
-			knp = kstat_data_lookup(ksp, BSR_KSTAT_NAMED);
-			if (knp != NULL) {
-				bdp->fhc_bsr = knp->value.ul;
-			} else {
-				bdp->fhc_kstats_ok = 0;
-			}
-		}
-
-		/* Try to find an AC instance for this board number */
-		ksp = kstat_lookup(kc, UNIX, board, AC_KSTAT_NAME);
-
-		/* Attempt to read the AC kstat. */
-		if ((ksp != NULL) && (kstat_read(kc, ksp, NULL) == -1)) {
-			ksp = NULL;
-		}
-
-		/* If the AC kstat exists, try to read the data from it. */
-		if (ksp != NULL) {
-			/*
-			 * We set the kstats_ok flag to good here. If we
-			 * fail one of the data reads, we set it to bad.
-			 */
-			bdp->ac_kstats_ok = 1;
-			bdp->ac_memstat_ok = 1;
-
-			/*
-			 * For each data value, If the Kstat named struct
-			 * is found, then get the data out.
-			 */
-
-			knp = kstat_data_lookup(ksp, MEMCTL_KSTAT_NAMED);
-			if (knp != NULL) {
-				bdp->ac_memctl = knp->value.ull;
-			} else {
-				bdp->ac_kstats_ok = 0;
-			}
-
-			knp = kstat_data_lookup(ksp, MEMDECODE0_KSTAT_NAMED);
-			if (knp != NULL) {
-				bdp->ac_memdecode[0] = knp->value.ull;
-			} else {
-				bdp->ac_kstats_ok = 0;
-			}
-
-			knp = kstat_data_lookup(ksp, MEMDECODE1_KSTAT_NAMED);
-			if (knp != NULL) {
-				bdp->ac_memdecode[1] = knp->value.ull;
-			} else {
-				bdp->ac_kstats_ok = 0;
-			}
-
-			knp = kstat_data_lookup(ksp, BANK_0_KSTAT_NAMED);
-			if (knp != NULL) {
-				bdp->mem_stat[0].status = knp->value.c[0];
-				bdp->mem_stat[0].condition = knp->value.c[1];
-			} else {
-				bdp->ac_memstat_ok = 0;
-			}
-
-			knp = kstat_data_lookup(ksp, BANK_1_KSTAT_NAMED);
-			if (knp != NULL) {
-				bdp->mem_stat[1].status = knp->value.c[0];
-				bdp->mem_stat[1].condition = knp->value.c[1];
-			} else {
-				bdp->ac_memstat_ok = 0;
-			}
-
-		}
-
-		/* Try to find an simmstat instance for this board number */
-		ksp = kstat_lookup(kc, UNIX, board, SIMMSTAT_KSTAT_NAME);
-
-		if (ksp != NULL) {
-			if (kstat_read(kc, ksp, NULL) == -1) {
-				bdp->simmstat_kstats_ok = 0;
-			} else {
-				bdp->simmstat_kstats_ok = 1;
-				(void) memcpy(&bdp->simm_status, ksp->ks_data,
-					sizeof (bdp->simm_status));
-			}
-		}
-
-		/* Try to find an overtemp kstat instance for this board */
-		ksp = kstat_lookup(kc, UNIX, board, OVERTEMP_KSTAT_NAME);
-
-		if (ksp != NULL) {
-			if (kstat_read(kc, ksp, NULL) == -1) {
-				bdp->temp_kstat_ok = 0;
-			} else {
-				bdp->temp_kstat_ok = 1;
-				(void) memcpy(&bdp->tempstat, ksp->ks_data,
-					sizeof (bdp->tempstat));
-				/* XXX - this is for 2.5.1 testing.  remove */
-				if (sizeof (bdp->tempstat) > ksp->ks_data_size)
-					bdp->tempstat.trend = TREND_UNKNOWN;
-			}
-		}
-	}
-
-	/* Read the kstats for the system control board */
-	ksp = kstat_lookup(kc, UNIX, 0, SYSCTRL_KSTAT_NAME);
-
-	if ((ksp != NULL) && (kstat_read(kc, ksp, NULL) == -1)) {
-		sys_kstat->sys_kstats_ok = 0;
-		ksp = NULL;
-	}
-
-	if (ksp != NULL) {
-		sys_kstat->sys_kstats_ok = 1;
-
-		knp = kstat_data_lookup(ksp, CSR_KSTAT_NAMED);
-		if (knp != NULL) {
-			sys_kstat->sysctrl = knp->value.c[0];
-		} else {
-			sys_kstat->sys_kstats_ok = 0;
-		}
-
-		knp = kstat_data_lookup(ksp, STAT1_KSTAT_NAMED);
-		if (knp != NULL) {
-			sys_kstat->sysstat1 = knp->value.c[0];
-		} else {
-			sys_kstat->sys_kstats_ok = 0;
-		}
-
-		knp = kstat_data_lookup(ksp, STAT2_KSTAT_NAMED);
-		if (knp != NULL) {
-			sys_kstat->sysstat2 = knp->value.c[0];
-		} else {
-			sys_kstat->sys_kstats_ok = 0;
-		}
-
-		knp = kstat_data_lookup(ksp, CLK_FREQ2_KSTAT_NAMED);
-		if (knp != NULL) {
-			sys_kstat->clk_freq2 = knp->value.c[0];
-		} else {
-			sys_kstat->sys_kstats_ok = 0;
-		}
-
-		knp = kstat_data_lookup(ksp, FAN_KSTAT_NAMED);
-		if (knp != NULL) {
-			sys_kstat->fan_status = knp->value.c[0];
-		} else {
-			sys_kstat->sys_kstats_ok = 0;
-		}
-
-		knp = kstat_data_lookup(ksp, KEY_KSTAT_NAMED);
-		if (knp != NULL) {
-			sys_kstat->keysw_status = knp->value.c[0];
-		} else {
-			sys_kstat->sys_kstats_ok = 0;
-		}
-
-		knp = kstat_data_lookup(ksp, POWER_KSTAT_NAMED);
-		if (knp != NULL) {
-			sys_kstat->power_state =
-				(enum power_state)knp->value.l;
-		} else {
-			sys_kstat->sys_kstats_ok = 0;
-		}
-
-		knp = kstat_data_lookup(ksp, CLK_VER_KSTAT_NAME);
-		if (knp != NULL) {
-			sys_kstat->clk_ver = knp->value.c[0];
-		} else {
-			/*
-			 * the clock version register only appears
-			 * on new clock boards
-			 */
-			sys_kstat->clk_ver = 0;
-		}
-
-	}
-
-	/* Read the kstats for the power supply stats */
-	ksp = kstat_lookup(kc, UNIX, 0, PSSHAD_KSTAT_NAME);
-
-	if ((ksp != NULL) && (kstat_read(kc, ksp, NULL) != -1)) {
-		sys_kstat->psstat_kstat_ok = 1;
-		(void) memcpy(&sys_kstat->ps_shadow[0], ksp->ks_data,
-			sizeof (sys_kstat->ps_shadow));
-	} else {
-		sys_kstat->psstat_kstat_ok = 0;
-	}
-
-	/* read the overtemp kstat for the system control board */
-	/* Try to find an overtemp kstat instance for this board */
-	ksp = kstat_lookup(kc, UNIX, CLOCK_BOARD_INDEX, OVERTEMP_KSTAT_NAME);
-
-	if (ksp != NULL) {
-		if (kstat_read(kc, ksp, NULL) == -1) {
-			sys_kstat->temp_kstat_ok = 0;
-		} else {
-			sys_kstat->temp_kstat_ok = 1;
-			(void) memcpy(&sys_kstat->tempstat, ksp->ks_data,
-				sizeof (sys_kstat->tempstat));
-			/* XXX - this is for 2.5.1 testing.  remove */
-			if (sizeof (sys_kstat->tempstat) > ksp->ks_data_size)
-				sys_kstat->tempstat.trend = TREND_UNKNOWN;
-		}
-	}
-
-	/* Read the reset-info kstat from one of the boards. */
-	ksp = kstat_lookup(kc, UNIX, 0, RESETINFO_KSTAT_NAME);
-
-	if (ksp == NULL) {
-		sys_kstat->reset_kstats_ok = 0;
-	} else if (kstat_read(kc, ksp, NULL) == -1) {
-		sys_kstat->reset_kstats_ok = 0;
-	} else {
-		sys_kstat->reset_kstats_ok = 1;
-		(void) memcpy(&sys_kstat->reset_info, ksp->ks_data,
-			sizeof (sys_kstat->reset_info));
-	}
-
-	/* read kstats for hotplugged boards */
-	for (i = 0, hp = &sys_kstat->hp_info[0]; i < MAX_BOARDS; i++, hp++) {
-		ksp = kstat_lookup(kc, UNIX, i, BDLIST_KSTAT_NAME);
-
-		if (ksp == NULL) {
-			continue;
-		}
-
-		if (kstat_read(kc, ksp, NULL) == -1) {
-			hp->kstat_ok = 0;
-		} else {
-			hp->kstat_ok = 1;
-			(void) memcpy(&hp->bd_info, ksp->ks_data,
-				sizeof (hp->bd_info));
-		}
-	}
-
-	/* read in the kstat for the fault list. */
-	ksp = kstat_lookup(kc, UNIX, 0, FT_LIST_KSTAT_NAME);
-
-	if (ksp == NULL) {
-		sys_kstat->ft_kstat_ok = 0;
-	} else {
-		if (kstat_read(kc, ksp, NULL) == -1) {
-			perror("kstat read");
-			sys_kstat->ft_kstat_ok = 0;
-			return;
-		}
-
-		sys_kstat->nfaults = ksp->ks_data_size /
-			sizeof (struct ft_list);
-
-		sys_kstat->ft_array =
-			(struct ft_list *)malloc(ksp->ks_data_size);
-
-		if (sys_kstat->ft_array == NULL) {
-			perror("Malloc");
-			exit(2);
-		}
-		sys_kstat->ft_kstat_ok = 1;
-		(void) memcpy(sys_kstat->ft_array, ksp->ks_data,
-			ksp->ks_data_size);
-	}
 }
 
 /*
  * This function does the reading and interpreting of sun4u system
- * kstats. These kstats are created by the following drivers:
- * fhc, environ, sysctrl. Each board in the tree should have
- * kstats created for it.  There are also system wide kstats that
- * are created.
+ * kstats.
  */
 void
 read_sun4u_kstats(Sys_tree *tree, struct system_kstat_data *sys_kstat)
 {
-#if 0
-	Board_node 	*bnode;
-	kstat_t		*ksp;
-	kstat_named_t	*knp;
-	struct hp_info *hp;
-	struct envctrltwo_kstat_data *ecp;
-#endif
-	kstat_ctl_t 	*kc;
+	kstat_ctl_t	*kc;
 	int		i;
-	struct bd_kstat_data *bdp;
 	struct envctrl_kstat_data *ep;
 
 	if ((kc = kstat_open()) == NULL) {
 		return;
 	}
-#ifdef lint
-	kc = kc;
-#endif
 
 	/* Initialize the kstats structure */
 	sys_kstat->sys_kstats_ok = 0;
-	sys_kstat->temp_kstat_ok = 0;
-	sys_kstat->reset_kstats_ok = 0;
-	sys_kstat->ft_kstat_ok = 0;
 	sys_kstat->envctrl_kstat_ok = 0;
-	for (i = 0; i < MAX_BOARDS; i++) {
-		bdp = &sys_kstat->bd_ksp_list[i];
-		bdp->ac_kstats_ok = 0;
-		bdp->fhc_kstats_ok = 0;
-		bdp->simmstat_kstats_ok = 0;
-		bdp->temp_kstat_ok = 0;
-
-		sys_kstat->hp_info[i].kstat_ok = 0;
-	}
 	for (i = 0; i < MAX_DEVS; i++) {
 		ep = &sys_kstat->env_data;
 		ep->ps_kstats[i].instance = I2C_NODEV;
@@ -424,5 +87,5 @@ read_sun4u_kstats(Sys_tree *tree, struct system_kstat_data *sys_kstat)
 		ep->encl_kstats[i].instance = I2C_NODEV;
 	}
 
-	read_platform_kstats(tree, sys_kstat, bdp, ep);
+	read_platform_kstats(tree, sys_kstat, ep);
 }
diff --git a/usr/src/lib/libprtdiag/common/memory.c b/usr/src/lib/libprtdiag/common/memory.c
index 1e1aaff425..575f94e956 100644
--- a/usr/src/lib/libprtdiag/common/memory.c
+++ b/usr/src/lib/libprtdiag/common/memory.c
@@ -22,10 +22,9 @@
 /*
  * Copyright (c) 1999-2001 by Sun Microsystems, Inc.
  * All rights reserved.
+ * Copyright (c) 2020 Peter Tribble.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -86,7 +85,7 @@ static memory_seg_t *match_seg(uint64_t);
 /*ARGSUSED0*/
 void
 display_memorysize(Sys_tree *tree, struct system_kstat_data *kstats,
-	struct grp_info *grps, struct mem_total *memory_total)
+	struct mem_total *memory_total)
 {
 	log_printf(dgettext(TEXT_DOMAIN, "Memory size: "), 0);
 
@@ -110,7 +109,7 @@ display_memorysize(Sys_tree *tree, struct system_kstat_data *kstats,
 
 /*ARGSUSED0*/
 void
-display_memoryconf(Sys_tree *tree, struct grp_info *grps)
+display_memoryconf(Sys_tree *tree)
 {
 	/*
 	 * This function is intentionally blank