From 5a1ca685f8b714059f564497bc4ec5bfc4f01a18 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 14 Nov 2019 14:00:07 +0800 Subject: [PATCH] 4.9-stable patches added patches: mips-bcm63xx-fix-switch-core-reset-on-bcm6368.patch --- ...3xx-fix-switch-core-reset-on-bcm6368.patch | 38 +++++++++++++++++++ queue-4.9/series | 1 + 2 files changed, 39 insertions(+) create mode 100644 queue-4.9/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 +Date: Mon, 10 Dec 2018 12:40:38 +0100 +Subject: MIPS: BCM63XX: fix switch core reset on BCM6368 + +From: Jonas Gorski + +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 +Signed-off-by: Paul Burton +Cc: linux-mips@vger.kernel.org +Cc: Ralf Baechle +Cc: James Hogan +Cc: Florian Fainelli +Signed-off-by: Amit Pundir +Signed-off-by: Greg Kroah-Hartman + +--- + 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 -- 2.47.3