From: Nick Xie <nick@khadas.com>
Date: Wed, 27 May 2020 09:56:54 +0000 (+0800)
Subject: Merge tag 'v4.9.212' into khadas-vims-4.9.y
X-Git-Tag: khadas-vims-v0.9.6-release~72
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4dc2370beebe945bd6a8a4ea135b7eeec1b0a517;p=platform%2Fkernel%2Flinux-amlogic.git

Merge tag 'v4.9.212' into khadas-vims-4.9.y

This is the 4.9.212 stable release

Signed-off-by: Nick Xie <nick@khadas.com>

 Conflicts:
	drivers/net/phy/phy_device.c
---

4dc2370beebe945bd6a8a4ea135b7eeec1b0a517
diff --cc arch/arm/kernel/sleep.S
index 28e7b0d0014b,c8569390e7e7..39836df6e2cf
--- a/arch/arm/kernel/sleep.S
+++ b/arch/arm/kernel/sleep.S
@@@ -138,14 -142,10 +146,15 @@@ ARM_BE8(setend be)			@ ensure we are i
  	bl	__hyp_stub_install_secondary
  #endif
  	safe_svcmode_maskall r1
+ no_hyp:
  	mov	r1, #0
  	ALT_SMP(mrc p15, 0, r0, c0, c0, 5)
 +	ALT_SMP(and r2, r0, #1<<24)
 +	ALT_SMP(cmp r2, #0)
 +	ALT_SMP(beq 2f)
 +	ALT_SMP(lsr r0, r0, #8)
  	ALT_UP_B(1f)
 +2:
  	adr	r2, mpidr_hash_ptr
  	ldr	r3, [r2]
  	add	r2, r2, r3		@ r2 = struct mpidr_hash phys address