From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 14 Nov 2019 06:00:07 +0000 (+0800)
Subject: 4.9-stable patches
X-Git-Tag: v4.4.202~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a1ca685f8b714059f564497bc4ec5bfc4f01a18;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	mips-bcm63xx-fix-switch-core-reset-on-bcm6368.patch
---

diff --git a/queue-4.9/mips-bcm63xx-fix-switch-core-reset-on-bcm6368.patch b/queue-4.9/mips-bcm63xx-fix-switch-core-reset-on-bcm6368.patch
new file mode 100644
index 00000000000..e68fdca4486
--- /dev/null
+++ b/queue-4.9/mips-bcm63xx-fix-switch-core-reset-on-bcm6368.patch
@@ -0,0 +1,38 @@
+From 8a38dacf87180738d42b058334c951eba15d2d47 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Mon, 10 Dec 2018 12:40:38 +0100
+Subject: MIPS: BCM63XX: fix switch core reset on BCM6368
+
+From: Jonas Gorski <jonas.gorski@gmail.com>
+
+commit 8a38dacf87180738d42b058334c951eba15d2d47 upstream.
+
+The Ethernet Switch core mask was set to 0, causing the switch core to
+be not reset on BCM6368 on boot. Provide the proper mask so the switch
+core gets reset to a known good state.
+
+Fixes: 799faa626c71 ("MIPS: BCM63XX: add core reset helper")
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Paul Burton <paul.burton@mips.com>
+Cc: linux-mips@vger.kernel.org
+Cc: Ralf Baechle <ralf@linux-mips.org>
+Cc: James Hogan <jhogan@kernel.org>
+Cc: Florian Fainelli <f.fainelli@gmail.com>
+Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/mips/bcm63xx/reset.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/mips/bcm63xx/reset.c
++++ b/arch/mips/bcm63xx/reset.c
+@@ -119,7 +119,7 @@
+ #define BCM6368_RESET_DSL	0
+ #define BCM6368_RESET_SAR	SOFTRESET_6368_SAR_MASK
+ #define BCM6368_RESET_EPHY	SOFTRESET_6368_EPHY_MASK
+-#define BCM6368_RESET_ENETSW	0
++#define BCM6368_RESET_ENETSW	SOFTRESET_6368_ENETSW_MASK
+ #define BCM6368_RESET_PCM	SOFTRESET_6368_PCM_MASK
+ #define BCM6368_RESET_MPI	SOFTRESET_6368_MPI_MASK
+ #define BCM6368_RESET_PCIE	0
diff --git a/queue-4.9/series b/queue-4.9/series
index 1efe59d4615..11221f1ad31 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -1,2 +1,3 @@
 kvm-mmu-don-t-read-pdptes-when-paging-is-not-enabled.patch
 bluetooth-hci_ldisc-postpone-hci_uart_proto_ready-bit-set-in-hci_uart_set_proto.patch
+mips-bcm63xx-fix-switch-core-reset-on-bcm6368.patch