diff options
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2018-03-23 14:29:02 -0700 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2018-03-27 14:51:38 +1100 |
| commit | 80452d2cf2ce4dfc769b74c28bd0c73ec076b9be (patch) | |
| tree | 902d29f83fbce3964031117945c02d4e51a66edd /include | |
| parent | 351b05be3d403cd444db4390a5d9110631240cb6 (diff) | |
| download | blackbird-skiboot-80452d2cf2ce4dfc769b74c28bd0c73ec076b9be.tar.gz blackbird-skiboot-80452d2cf2ce4dfc769b74c28bd0c73ec076b9be.zip | |
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 <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/npu2-regs.h | 7 | ||||
| -rw-r--r-- | include/xscom.h | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/include/npu2-regs.h b/include/npu2-regs.h index be57fd92..a8f571eb 100644 --- a/include/npu2-regs.h +++ b/include/npu2-regs.h @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 IBM Corp. +/* Copyright 2013-2016 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,10 +29,6 @@ void npu2_scom_write(uint64_t gcid, uint64_t scom_base, uint64_t reg, uint64_t size, uint64_t val); -/* SCOM Registers to dump on HMI to aid in debugging */ -#define NPU2_DEBUG_REG_START 0x5011000 -#define NPU2_DEBUG_REG_END 0x50110FF - /* These aren't really NPU specific registers but we initialise them in NPU * code */ #define MCD0_BANK0_CN3 0x301100d @@ -576,7 +572,6 @@ void npu2_scom_write(uint64_t gcid, uint64_t scom_base, #define NPU2_FIR_REGISTER_0 0x0000000005013C00 #define NPU2_FIR_REGISTER_1 0x0000000005013C40 #define NPU2_FIR_REGISTER_2 0x0000000005013C80 -#define NPU2_FIR_REGISTER_END 0x0000000005013CFF #define NPU2_TOTAL_FIR_REGISTERS 3 diff --git a/include/xscom.h b/include/xscom.h index 3193abdb..98532240 100644 --- a/include/xscom.h +++ b/include/xscom.h @@ -225,7 +225,7 @@ /* Use only in select places where multiple SCOMs are time/latency sensitive */ extern void _xscom_lock(void); -extern int _xscom_read(uint32_t partid, uint64_t pcb_addr, uint64_t *val, bool take_lock, bool ignore_error); +extern int _xscom_read(uint32_t partid, uint64_t pcb_addr, uint64_t *val, bool take_lock); extern int _xscom_write(uint32_t partid, uint64_t pcb_addr, uint64_t val, bool take_lock); extern void _xscom_unlock(void); @@ -233,7 +233,7 @@ extern void _xscom_unlock(void); /* Targeted SCOM access */ static inline int xscom_read(uint32_t partid, uint64_t pcb_addr, uint64_t *val) { - return _xscom_read(partid, pcb_addr, val, true, false); + return _xscom_read(partid, pcb_addr, val, true); } static inline int xscom_write(uint32_t partid, uint64_t pcb_addr, uint64_t val) { return _xscom_write(partid, pcb_addr, val, true); |
