Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-02-15 10:23:48 +0100
committerJiri Slaby <jslaby@suse.cz>2019-02-15 10:24:03 +0100
commit199280b2dcb2997bba983727addb3e80b0e50cb7 (patch)
treeb7f80b3db6d0f8208144a2dba9cd99801d172f9c
parentfa4016be73ce7455115eb8f7c166c294f05e5354 (diff)
mips: cm: reprime error cause (bnc#1012628).
-rw-r--r--patches.kernel.org/4.20.9-023-mips-cm-reprime-error-cause.patch47
-rw-r--r--series.conf1
2 files changed, 48 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.9-023-mips-cm-reprime-error-cause.patch b/patches.kernel.org/4.20.9-023-mips-cm-reprime-error-cause.patch
new file mode 100644
index 0000000000..a7f9363b05
--- /dev/null
+++ b/patches.kernel.org/4.20.9-023-mips-cm-reprime-error-cause.patch
@@ -0,0 +1,47 @@
+From: Vladimir Kondratiev <vladimir.kondratiev@linux.intel.com>
+Date: Wed, 6 Feb 2019 13:46:17 +0200
+Subject: [PATCH] mips: cm: reprime error cause
+References: bnc#1012628
+Patch-mainline: 4.20.9
+Git-commit: 05dc6001af0630e200ad5ea08707187fe5537e6d
+
+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>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ arch/mips/kernel/mips-cm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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);
+ }
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 7fa4dbf0b4..2a45145798 100644
--- a/series.conf
+++ b/series.conf
@@ -1105,6 +1105,7 @@
patches.kernel.org/4.20.9-020-pinctrl-cherryview-fix-Strago-DMI-workaround.patch
patches.kernel.org/4.20.9-021-tracing-uprobes-Fix-output-for-multiple-string.patch
patches.kernel.org/4.20.9-022-tracing-uprobes-Fix-typo-in-pr_fmt-string.patch
+ patches.kernel.org/4.20.9-023-mips-cm-reprime-error-cause.patch
########################################################
# Build fixes that apply to the vanilla kernel too.