From 97f645b528cf954942f473971cfdb617efa2c695 Mon Sep 17 00:00:00 2001 From: Stewart Smith Date: Fri, 23 Mar 2018 14:29:02 -0700 Subject: Revert "NPU2 HMIs: dump out a *LOT* of npu2 registers for debugging" This reverts commit fbdc91e693fc3103f7e2a65054ed32bfb26a2e17. We don't need this as we need to do it a different way, with a explicit set of registers as otherwise we trip other random FIR bits and everything becomes even more terrible. I suggest alcohol. Cc: stable Signed-off-by: Stewart Smith (cherry picked from commit 80452d2cf2ce4dfc769b74c28bd0c73ec076b9be) Signed-off-by: Stewart Smith --- core/hmi.c | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) (limited to 'core') diff --git a/core/hmi.c b/core/hmi.c index 17983a3..00d0fb7 100644 --- a/core/hmi.c +++ b/core/hmi.c @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 IBM Corp. +/* Copyright 2013-2014 IBM Corp. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,6 @@ #include #include #include -#include /* * HMER register layout: @@ -545,10 +544,7 @@ static void find_npu2_checkstop_reason(int flat_chip_id, uint64_t npu2_fir_action0_addr; uint64_t npu2_fir_action1_addr; uint64_t fatal_errors; - uint64_t npu_scom_dump[2]; - bool npu2_hmi_verbose; int total_errors = 0; - uint64_t r; /* Find the NPU on the chip associated with the HMI. */ for_each_phb(phb) { @@ -600,38 +596,6 @@ static void find_npu2_checkstop_reason(int flat_chip_id, if (!total_errors) return; - npu2_hmi_verbose = nvram_query_eq("npu2-hmi-verbose", "true"); - /* Force this for now until we sort out something better */ - npu2_hmi_verbose = true; - - if (npu2_hmi_verbose) { - _xscom_lock(); - for (r = NPU2_DEBUG_REG_START; r < NPU2_DEBUG_REG_END; r++) { - npu_scom_dump[0] = npu_scom_dump[1] = 0; - _xscom_read(flat_chip_id, r++, &npu_scom_dump[0], false, true); - _xscom_read(flat_chip_id, r, &npu_scom_dump[1], false, true); - prlog(PR_ERR, "NPU: 0x%016llx=0x%016llx 0x%016llx=0x%016llx\n", - r-1, npu_scom_dump[0], - r, npu_scom_dump[1]); - } - for (r = NPU2_FIR_REGISTER_0; r < NPU2_FIR_REGISTER_END; r++) { - npu_scom_dump[0] = npu_scom_dump[1] = 0; - _xscom_read(flat_chip_id, r++, &npu_scom_dump[0], false, true); - _xscom_read(flat_chip_id, r, &npu_scom_dump[1], false, true); - prlog(PR_ERR, "NPU: 0x%016llx=0x%016llx 0x%016llx=0x%016llx\n", - r-1, npu_scom_dump[0], - r, npu_scom_dump[1]); - } - _xscom_unlock(); - prlog(PR_ERR, " _________________________ \n"); - prlog(PR_ERR, "< It's Driver Debug time! >\n"); - prlog(PR_ERR, " ------------------------- \n"); - prlog(PR_ERR, " \\ ,__, \n"); - prlog(PR_ERR, " \\ (oo)____ \n"); - prlog(PR_ERR, " (__) )\\ \n"); - prlog(PR_ERR, " ||--|| * \n"); - } - /* Set up the HMI event */ hmi_evt->severity = OpalHMI_SEV_WARNING; hmi_evt->type = OpalHMI_ERROR_MALFUNC_ALERT; -- cgit v1.1