From: Greg Kroah-Hartman Date: Thu, 14 Nov 2019 05:59:43 +0000 (+0800) Subject: 4.4-stable patches X-Git-Tag: v4.4.202~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4cb6c1cb3ecbe5634e6b5398290c85c2fdc7d93;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: mips-bcm63xx-fix-switch-core-reset-on-bcm6368.patch --- diff --git a/queue-4.4/kvm-mmu-don-t-read-pdptes-when-paging-is-not-enabled.patch b/queue-4.4/kvm-mmu-don-t-read-pdptes-when-paging-is-not-enabled.patch index 54ae55f3ea4..f77939d6a61 100644 --- a/queue-4.4/kvm-mmu-don-t-read-pdptes-when-paging-is-not-enabled.patch +++ b/queue-4.4/kvm-mmu-don-t-read-pdptes-when-paging-is-not-enabled.patch @@ -15,14 +15,12 @@ Signed-off-by: Paolo Bonzini Signed-off-by: Sean Christopherson Signed-off-by: Sasha Levin --- - arch/x86/kvm/x86.c | 4 ++-- + arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index 2b47fd3d4b8c5..ad8e19fee71ea 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c -@@ -575,7 +575,7 @@ static bool pdptrs_changed(struct kvm_vcpu *vcpu) +@@ -575,7 +575,7 @@ static bool pdptrs_changed(struct kvm_vc gfn_t gfn; int r; @@ -31,7 +29,7 @@ index 2b47fd3d4b8c5..ad8e19fee71ea 100644 return false; if (!test_bit(VCPU_EXREG_PDPTR, -@@ -7168,7 +7168,7 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, +@@ -7168,7 +7168,7 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_update_cpuid(vcpu); idx = srcu_read_lock(&vcpu->kvm->srcu); @@ -40,6 +38,3 @@ index 2b47fd3d4b8c5..ad8e19fee71ea 100644 load_pdptrs(vcpu, vcpu->arch.walk_mmu, kvm_read_cr3(vcpu)); mmu_reset_needed = 1; } --- -2.20.1 - diff --git a/queue-4.4/mips-bcm63xx-fix-switch-core-reset-on-bcm6368.patch b/queue-4.4/mips-bcm63xx-fix-switch-core-reset-on-bcm6368.patch new file mode 100644 index 00000000000..e68fdca4486 --- /dev/null +++ b/queue-4.4/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.4/series b/queue-4.4/series index 684d9cc5ec5..7e96c9b3b2e 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -1 +1,2 @@ kvm-mmu-don-t-read-pdptes-when-paging-is-not-enabled.patch +mips-bcm63xx-fix-switch-core-reset-on-bcm6368.patch