[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] xen/arm64: head.S: Fix wrong enable_boot_cpu_mm() code movement
commit 405cff8491001179eeef2444358d15759912644d Author: Henry Wang <Henry.Wang@xxxxxxx> AuthorDate: Sat Sep 16 12:06:49 2023 +0800 Commit: Julien Grall <jgrall@xxxxxxxxxx> CommitDate: Fri Sep 22 08:58:35 2023 +0100 xen/arm64: head.S: Fix wrong enable_boot_cpu_mm() code movement Some addressed comments on enable_boot_cpu_mm() were reintroduced back during the code movement from arm64/head.S to arm64/mmu/head.S. We should drop the unreachable code, move the 'mov lr, x5' closer to 'b remove_identity_mapping' so it is clearer that it will return, and update the in-code comment accordingly. Fixes: 6734327d76be ("xen/arm64: Split and move MMU-specific head.S to mmu/head.S") Reported-by: Julien Grall <jgrall@xxxxxxxxxx> Signed-off-by: Henry Wang <Henry.Wang@xxxxxxx> Reviewed-by: Julien Grall <jgrall@xxxxxxxxxx> Reviewed-by: Ayan Kumar Halder <ayan.kumar.halder@xxxxxxx> --- xen/arch/arm/arm64/mmu/head.S | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/arm64/mmu/head.S b/xen/arch/arm/arm64/mmu/head.S index a5271e3880..88075ef083 100644 --- a/xen/arch/arm/arm64/mmu/head.S +++ b/xen/arch/arm/arm64/mmu/head.S @@ -329,7 +329,6 @@ ENTRY(enable_boot_cpu_mm) load_paddr x0, boot_pgtable bl enable_mmu - mov lr, x5 /* * The MMU is turned on and we are in the 1:1 mapping. Switch @@ -338,19 +337,15 @@ ENTRY(enable_boot_cpu_mm) ldr x0, =1f br x0 1: + mov lr, x5 /* * The 1:1 map may clash with other parts of the Xen virtual memory * layout. As it is not used anymore, remove it completely to * avoid having to worry about replacing existing mapping - * afterwards. Function will return to primary_switched. + * afterwards. Function will return to the virtual address requested + * by the caller. */ b remove_identity_mapping - - /* - * Below is supposed to be unreachable code, as "ret" in - * remove_identity_mapping will use the return address in LR in advance. - */ - b fail ENDPROC(enable_boot_cpu_mm) /* -- generated by git-patchbot for /home/xen/git/xen.git#master
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |