12289 remove sunfire-specific code from libprtdiag

Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>

3 files changed, 22 insertions, 208 deletions

diff --git a/usr/src/lib/libprtdiag/inc/libprtdiag.h b/usr/src/lib/libprtdiag/inc/libprtdiag.h
index e9361b8e9c..41e6227c18 100644
--- a/usr/src/lib/libprtdiag/inc/libprtdiag.h
+++ b/usr/src/lib/libprtdiag/inc/libprtdiag.h
@@ -21,13 +21,12 @@
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright 2020 Peter Tribble.
  */
 
 #ifndef	_SYS_LIBPRTDIAG_H
 #define	_SYS_LIBPRTDIAG_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -132,15 +131,15 @@ void	decode_qlc_card_model_prop(Prom_node *card_node, struct io_card *card);
  */
 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);
 void	read_sun4u_kstats(Sys_tree *, struct system_kstat_data *);
 
 /*
  * memory functions
  */
 void	display_memorysize(Sys_tree *tree, struct system_kstat_data *kstats,
-	    struct grp_info *grps, struct mem_total *memory_total);
-void	display_memoryconf(Sys_tree *tree, struct grp_info *grps);
+	    struct mem_total *memory_total);
+void	display_memoryconf(Sys_tree *tree);
 
 /*
  * prom functions
diff --git a/usr/src/lib/libprtdiag/inc/pdevinfo_sun4u.h b/usr/src/lib/libprtdiag/inc/pdevinfo_sun4u.h
index 7273d62b8d..c4038e4535 100644
--- a/usr/src/lib/libprtdiag/inc/pdevinfo_sun4u.h
+++ b/usr/src/lib/libprtdiag/inc/pdevinfo_sun4u.h
@@ -22,68 +22,45 @@
 /*
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
+ * Copyright (c) 2020 Peter Tribble.
  */
 
 #ifndef	_PDEVINFO_SUN4U_H
 #define	_PDEVINFO_SUN4U_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/obpdefs.h>
-#include <sys/fhc.h>
-#include <sys/sysctrl.h>
-#include <sys/environ.h>
 #include <sys/envctrl_gen.h>
 #include <sys/envctrl_ue250.h>
 #include <sys/envctrl_ue450.h>
-#include <sys/simmstat.h>
-#include <sys/ac.h>
-#include <sys/sram.h>
-#include <reset_info.h>
 
 #ifdef	__cplusplus
 extern "C" {
 #endif
 
-#define	UNIX	"unix"
+/*
+ * These were formerly defined in sys/ac.h, which was specific to sunfire,
+ * but usage has leaked into generic code.
+ */
+#ifndef	TRUE
+#define	TRUE (1)
+#endif
+#ifndef	FALSE
+#define	FALSE (0)
+#endif
+
+/*
+ * These were formerly defined as part of the board_type enum in sys/fhc.h,
+ * which was specific to sunfire, but usage has leaked into generic code.
+ */
+#define UNKNOWN_BOARD 1
+#define CPU_BOARD 2
 
 /* Define names of nodes to search for */
-#define	CPU_NAME	"SUNW,UltraSPARC"
 #define	SBUS_NAME	"sbus"
 #define	PCI_NAME	"pci"
 #define	FFB_NAME	"SUNW,ffb"
 #define	AFB_NAME	"SUNW,afb"
 
-struct mem_stat_data {
-	enum ac_bank_status status;	/* bank status values */
-	enum ac_bank_condition condition;	/* bank conditions */
-};
-
-struct bd_kstat_data {
-	u_longlong_t 	ac_memctl;	/* Memctl register contents */
-	u_longlong_t 	ac_memdecode[2]; /* memory decode registers . */
-	int	ac_kstats_ok;	/* successful kstat read occurred */
-	uint_t	fhc_bsr;	/* FHC Board Status Register */
-	uint_t	fhc_csr;	/* FHC Control Status Register */
-	int	fhc_kstats_ok;	/* successful kstat read occurred */
-	uchar_t	simm_status[SIMM_COUNT];	/* SIMM status */
-	int	simmstat_kstats_ok;	/* successful read occurred */
-	struct temp_stats tempstat;
-	int	temp_kstat_ok;
-	struct	mem_stat_data	mem_stat[2];	/* raw kstat bank information */
-	int	ac_memstat_ok;	/* successful read of memory status */
-};
-
-/*
- * Hot plug info structure. If a hotplug kstat is found, the bd_info
- * structure from the kstat is filled in the the hp_info structure
- * is marked OK.
- */
-struct hp_info {
-	struct bd_info bd_info;
-	int kstat_ok;
-};
-
 /* Environmental info for Tazmo */
 struct envctrl_kstat_data {
 	envctrl_ps_t ps_kstats[MAX_DEVS];  /* kstats for powersupplies */
@@ -106,69 +83,15 @@ struct envctrltwo_kstat_data {
 };
 
 struct system_kstat_data {
-	uchar_t	sysctrl;	/* sysctrl register contents */
-	uchar_t	sysstat1;	/* system status1 register contents. */
-	uchar_t	sysstat2;	/* system status2 register contents. */
-	uchar_t ps_shadow[SYS_PS_COUNT];	/* power supply shadow */
-	int	psstat_kstat_ok;
-	uchar_t	clk_freq2;	/* clock frequency register 2 contents */
-	uchar_t	fan_status;	/* shadow fan status */
-	uchar_t	keysw_status;	/* status of the key switch */
-	enum power_state power_state;	/* redundant power state */
-	uchar_t	clk_ver;	/* clock version register */
 	int	sys_kstats_ok;	/* successful kstat read occurred */
-	struct temp_stats tempstat;
-	int	temp_kstat_ok;
-	struct reset_info reset_info;
-	int	reset_kstats_ok;	/* kstat read OK */
-	struct bd_kstat_data bd_ksp_list[MAX_BOARDS];
-	struct hp_info hp_info[MAX_BOARDS];
-	struct ft_list *ft_array;	/* fault array */
-	int	nfaults;		/* number of faults in fault array */
-	int	ft_kstat_ok;		/* Fault kstats OK */
 	struct envctrl_kstat_data env_data;  /* environment data for Tazmo */
 	int	envctrl_kstat_ok;
 	struct envctrltwo_kstat_data envc_data;  /* environ data for Javelin */
 	int	envctrltwo_kstat_ok;
 };
 
-/* Description of a single memory group */
-struct grp {
-	int valid;			/* active memory group present */
-	u_longlong_t  base;		/* Phyiscal base of group */
-	uint_t size;			/* size in bytes */
-	uint_t curr_size;		/* current size in bytes */
-	int board;			/* board number */
-	enum board_type type;		/* board type */
-	int group;			/* group # on board (0 or 1) */
-	int factor;			/* interleave factor (0,2,4,8,16) */
-	int speed;			/* Memory speed (in ns) */
-	char groupid;			/* Alpha tag for group ID */
-	enum ac_bank_status status;	/* bank status values */
-	enum ac_bank_condition condition;	/* bank conditions */
-};
-
-#define	MAX_GROUPS	32
 #define	MAXSTRLEN	256
 
-/* Array of all possible groups in the system. */
-struct grp_info {
-	struct grp grp[MAX_GROUPS];
-};
-
-/* A memory interleave structure */
-struct inter_grp {
-	u_longlong_t base;	/* Physical base of group */
-	int valid;
-	int count;
-	char groupid;
-};
-
-/* Array of all possible memory interleave structures */
-struct mem_inter {
-	struct inter_grp i_grp[MAX_GROUPS];
-};
-
 /* FFB info structure */
 struct ffbinfo {
 	int board;
diff --git a/usr/src/lib/libprtdiag/inc/reset_info.h b/usr/src/lib/libprtdiag/inc/reset_info.h
deleted file mode 100644
index 8f94813a6f..0000000000
--- a/usr/src/lib/libprtdiag/inc/reset_info.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (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]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright (c) 1999 by Sun Microsystems, Inc.
- * All rights reserved.
- */
-
-#ifndef	_RESET_INFO_H
-#define	_RESET_INFO_H
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/*
- * All of the following data structures and defines come from sun4u server
- * POST. If the data in POST changes, then these structures must reflect
- * those changes.
- */
-
-#include <sys/fhc.h>	/* To get MAX_BOARDS constant	*/
-
-/* BDA bit assignments */
-#define	BOARD_PRESENT		(1<<0)
-#define	BOARD_OK		(1<<1)
-#define	BOARD_TYPE_MSK		(7<<2)
-#define	BOARD_TYPE(x)		(((x) & BOARD_TYPE_MSK) >> 2)
-
-/* Board state mask and defines */
-#define	BD_STATE_MASK		0x3
-#define	BD_LPM_FZN		0
-#define	BD_ONLINE_FAIL		1
-#define	BD_NOT_PRESENT		2
-#define	BD_ONLINE_NORMAL	3
-
-/* define CPU 0 fields */
-#define	CPU0_PRESENT		(1<<8)
-#define	CPU0_OK			(1<<9)
-#define	CPU0_FAIL_CODE_MSK	(7<<10)
-
-/* define CPU 1 fields */
-#define	CPU1_PRESENT		(1<<16)
-#define	CPU1_OK			(1<<17)
-#define	CPU1_FAIL_CODE_MSK	(7<<18)
-
-/* supported board types */
-#define	CPU_TYPE 0
-#define	MEM_TYPE 1		/* CPU/MEM board with only memory */
-#define	IO_TYPE1 2
-#define	IO_TYPE2 3
-#define	IO_TYPE3 4
-#define	IO_TYPE4 5		/* same as IO TYPE 1 but no HM or PHY chip */
-#define	CLOCK_TYPE 7
-
-/* for CPU type UPA ports */
-typedef struct {
-	u_longlong_t afsr;	/* Fault status register for CPU */
-	u_longlong_t afar;	/* Fault address register for CPU */
-} cpu_reset_state;
-
-/* For the clock board */
-typedef struct {
-	unsigned long clk_ssr_1;	/* reset status for the clock board */
-} clock_reset_state;
-
-struct board_info {
-	u_longlong_t board_desc;
-	cpu_reset_state cpu[2];	/* could be a CPU */
-	u_longlong_t ac_error_status;
-	u_longlong_t dc_shadow_chain;
-	uint_t fhc_csr;
-	uint_t fhc_rcsr;
-};
-
-struct reset_info {
-	int length;			/* size of the structure */
-	int version;			/* Version of the structure */
-	struct board_info bd_reset_info[MAX_BOARDS];
-	clock_reset_state clk;	/* one clock board */
-	unsigned char tod_timestamp[7];
-};
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* _RESET_INFO_H */