Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d96283d6 authored by Anji Jonnala's avatar Anji Jonnala
Browse files

qcom: idle-v8: miscellaneous bug fixes 



Make the msm_pm_boot_vector aligned for 64bit.
msm_pm_boot_vector contains the physical address of the warmboot
function and corresponds to a 64 bit address on v8 architectures.
Fix address arithmetic to account for 64 bit.

Change-Id: I30e07b275ba66d5edf24ac586d81cff9cd88560d
Signed-off-by: default avatarAnji Jonnala <anjir@codeaurora.org>
parent 01f3b4c6

drivers/soc/qcom/idle-v8.S

+6 −6
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ ENTRY(msm_pm_boot_entry) 
	mrs	x0, mpidr_el1

	and     x0, x0, #15              /* what CPU am I */



	adr	x3, 3f

	adr	x3, align

	ldr	x1, [x3]

	sub	x3, x1, x3

	ldr	x1, =msm_pc_debug_counters_phys /*phys addr for IMEM reg */
@@ -42,17 +42,17 @@ skip_pc_debug3: 
	ldr     x1, =msm_pm_boot_vector

	sub	x1, x1, x3		/* translate virt to phys */



	add     x1, x1, x0, LSL #2      /* locate boot vector for our cpu */

	add     x1, x1, x0, LSL #3      /* locate boot vector for our cpu */

	ldr x1, [x1]

	ret	x1                 /* jump                           */

ENDPROC(msm_pm_boot_entry)



3:	.quad	.



	__ALIGN

align:  .quad .

	.data



	.globl msm_pm_boot_vector

msm_pm_boot_vector:

	.space  4 * NR_CPUS

	.space  8 * NR_CPUS



	.globl msm_pc_debug_counters_phys

msm_pc_debug_counters_phys: