summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel
diff options
context:
space:
mode:
authorVladimir Kondratiev <vladimir.kondratiev@linux.intel.com>2019-02-06 13:46:17 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-02-15 08:10:11 +0100
commit384cc5fd6727317e3c2f3cef697c4fb60f30e2b5 (patch)
tree7f94cd8622e825f5f6ed748c066ef2ec7667c3bc /arch/mips/kernel
parent7e44aab927835b03bc8555ab0dc50b2526644164 (diff)
downloadlinux-stable-384cc5fd6727317e3c2f3cef697c4fb60f30e2b5.tar.gz
linux-stable-384cc5fd6727317e3c2f3cef697c4fb60f30e2b5.tar.bz2
linux-stable-384cc5fd6727317e3c2f3cef697c4fb60f30e2b5.zip
mips: cm: reprime error cause
commit 05dc6001af0630e200ad5ea08707187fe5537e6d upstream. Accordingly to the documentation ---cut--- The GCR_ERROR_CAUSE.ERR_TYPE field and the GCR_ERROR_MULT.ERR_TYPE fields can be cleared by either a reset or by writing the current value of GCR_ERROR_CAUSE.ERR_TYPE to the GCR_ERROR_CAUSE.ERR_TYPE register. ---cut--- Do exactly this. Original value of cm_error may be safely written back; it clears error cause and keeps other bits untouched. Fixes: 3885c2b463f6 ("MIPS: CM: Add support for reporting CM cache errors") Signed-off-by: Vladimir Kondratiev <vladimir.kondratiev@linux.intel.com> Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: James Hogan <jhogan@kernel.org> Cc: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org # v4.3+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r--arch/mips/kernel/mips-cm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/mips-cm.c b/arch/mips/kernel/mips-cm.c
index 8f5bd04f320a..7f3f136572de 100644
--- a/arch/mips/kernel/mips-cm.c
+++ b/arch/mips/kernel/mips-cm.c
@@ -457,5 +457,5 @@ void mips_cm_error_report(void)
}
/* reprime cause register */
- write_gcr_error_cause(0);
+ write_gcr_error_cause(cm_error);
}