6307395 Excessive px debug print message on console is unacceptable during cpr suspend

5 files changed, 10 insertions, 68 deletions

diff --git a/usr/src/uts/sun4/io/px/px_debug.c b/usr/src/uts/sun4/io/px/px_debug.c
index 626d345bc6..af16f7b301 100644
--- a/usr/src/uts/sun4/io/px/px_debug.c
+++ b/usr/src/uts/sun4/io/px/px_debug.c
@@ -38,7 +38,7 @@
 /*LINTLIBRARY*/
 
 #ifdef	DEBUG
-uint64_t px_debug_flags = (1ull << DBG_ERR_INTR | 1ull << DBG_MSG_INTR);
+uint64_t px_debug_flags = 0;
 
 static char *px_debug_sym [] = {	/* same sequence as px_debug_bit */
 	/*  0 */ "attach",
@@ -111,16 +111,6 @@ static char *px_debug_sym [] = {	/* same sequence as px_debug_bit */
 	/* LAST */ "unknown"
 };
 
-/*
- * There are side effects of printing debug messages while servicing
- * interrupts at PIL 14. This tunable keeps printing debug messages
- * disabled by default.
- *
- * For debugging purposes set px_dbg_print != 0 to see printf messages
- * during interrupt.
- */
-int px_dbg_print = 0;
-
 void
 px_dbg(px_debug_bit_t bit, dev_info_t *dip, char *fmt, ...)
 {
@@ -134,58 +124,15 @@ px_dbg(px_debug_bit_t bit, dev_info_t *dip, char *fmt, ...)
 		return;
 	if (cont)
 		goto body;
-	if (dip) {
-		if (servicing_interrupt()) {
-			if (px_dbg_print) {
-				prom_printf("%s(%d): %s: ",
-				    ddi_driver_name(dip),
-				    ddi_get_instance(dip),
-				    px_debug_sym[bit]);
-			}
-		} else {
-			prom_printf("%s(%d): %s: ", ddi_driver_name(dip),
-			    ddi_get_instance(dip), px_debug_sym[bit]);
-		}
-	} else {
-		if (servicing_interrupt()) {
-			if (px_dbg_print) {
-				prom_printf("px: %s: ", px_debug_sym[bit]);
-			}
-		} else {
-			prom_printf("px: %s: ", px_debug_sym[bit]);
-		}
-	}
-body:
-	va_start(ap, fmt);
-	if (servicing_interrupt()) {
-		if (px_dbg_print) {
-			prom_vprintf(fmt, ap);
-		}
-	} else {
-		prom_vprintf(fmt, ap);
-	}
-	va_end(ap);
-}
-#else	/* DEBUG */
-
-
-/*ARGSUSED*/
-void
-px_log2ce(px_debug_bit_t bit, dev_info_t *dip, char *fmt, ...)
-{
-	va_list ap;
-
-	if (servicing_interrupt())
-		return;
 
 	if (dip)
-		cmn_err(CE_WARN, "%s(%d): ",
-			ddi_driver_name(dip), ddi_get_instance(dip));
+		prom_printf("%s(%d): %s: ", ddi_driver_name(dip),
+		    ddi_get_instance(dip), px_debug_sym[bit]);
 	else
-		cmn_err(CE_WARN, "px: ");
+		prom_printf("px: %s: ", px_debug_sym[bit]);
+body:
 	va_start(ap, fmt);
-	vcmn_err(CE_CONT, fmt, ap);
+	prom_vprintf(fmt, ap);
 	va_end(ap);
 }
-
 #endif	/* DEBUG */
diff --git a/usr/src/uts/sun4/io/px/px_debug.h b/usr/src/uts/sun4/io/px/px_debug.h
index 6fd1815f65..96c63a68e5 100644
--- a/usr/src/uts/sun4/io/px/px_debug.h
+++ b/usr/src/uts/sun4/io/px/px_debug.h
@@ -112,15 +112,12 @@ typedef enum {	/* same sequence as px_debug_sym[] */
 
 #if defined(DEBUG)
 
-#define	LOG px_dbg
 #define	DBG px_dbg
 extern void px_dbg(px_debug_bit_t bit, dev_info_t *dip, char *fmt, ...);
 
 #else	/* DEBUG */
 
-#define	LOG px_log2ce
 #define	DBG 0 &&
-extern void px_log2ce(px_debug_bit_t bit, dev_info_t *dip, char *fmt, ...);
 
 #endif	/* DEBUG */
 
diff --git a/usr/src/uts/sun4/io/px/px_space.c b/usr/src/uts/sun4/io/px/px_space.c
index 50b3ac3d3c..72849188b3 100644
--- a/usr/src/uts/sun4/io/px/px_space.c
+++ b/usr/src/uts/sun4/io/px/px_space.c
@@ -146,8 +146,6 @@ uint_t px_preserve_mmu_tsb = 1;
  */
 uintptr_t px_kmem_clid = 0;
 
-uint_t px_err_log_all = 0;
-
 uint64_t px_tlu_ue_intr_mask	= PX_ERR_EN_ALL;
 uint64_t px_tlu_ue_log_mask	= PX_ERR_EN_ALL;
 uint64_t px_tlu_ue_count_mask	= PX_ERR_EN_ALL;
diff --git a/usr/src/uts/sun4/io/px/px_space.h b/usr/src/uts/sun4/io/px/px_space.h
index a51f574220..2830a549e7 100644
--- a/usr/src/uts/sun4/io/px/px_space.h
+++ b/usr/src/uts/sun4/io/px/px_space.h
@@ -90,7 +90,6 @@ extern uint_t px_disable_fdvma;
 extern uint_t px_iommu_ctx_lock_failure;
 extern uint_t px_preserve_iommu_tsb;
 extern uintptr_t px_kmem_clid;
-extern uint_t px_err_log_all;
 
 #define	PX_ERR_EN_ALL			-1ull
 #define	PX_ERR_MASK_NONE		0ull
diff --git a/usr/src/uts/sun4u/io/px/px_err.c b/usr/src/uts/sun4u/io/px/px_err.c
index 2a24aa4fb0..68ff438e8e 100644
--- a/usr/src/uts/sun4u/io/px/px_err.c
+++ b/usr/src/uts/sun4u/io/px/px_err.c
@@ -841,9 +841,10 @@ px_err_erpt_and_clr(px_t *px_p, ddi_fm_error_t *derr, px_err_ss_t *ss)
 					    err_bit_desc->class_name);
 			}
 		}
-		/* Log register status */
-		if ((px_err_log_all) || (ss_reg & *log_mask))
-			LOG(DBG_ERR_INTR, rpdip, "<%x>=%16llx %s\n",
+
+		/* Print register status */
+		if (ss_reg & *log_mask)
+			DBG(DBG_ERR_INTR, rpdip, "<%x>=%16llx %s\n",
 			    status_addr, ss_reg, err_reg_tbl->msg);
 
 		/* Clear the register and error */