Skip to content

Commit

Permalink
powerpc/64s: Fix unnecessary copy to 0 when kernel is booted at addre…
Browse files Browse the repository at this point in the history
…ss 0

According to the code logic, when the kernel is loaded at address 0, no
copying operation should be performed, but it is currently being done.

This patch fixes the issue where the kernel code was incorrectly
duplicated to address 0 when booting from address 0.

Fixes: b270beb ("powerpc/64s: Run at the kernel virtual address earlier in boot")
Cc: [email protected] # v6.4+
Signed-off-by: Jinglin Wen <[email protected]>
Suggested-by: Michael Ellerman <[email protected]>
Signed-off-by: Michael Ellerman <[email protected]>
Link: https://msgid.link/[email protected]
  • Loading branch information
hx-wenjinglin authored and mpe committed Jun 23, 2024
1 parent a986fa5 commit 13fc6c1
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions arch/powerpc/kernel/head_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -647,8 +647,9 @@ __after_prom_start:
* Note: This process overwrites the OF exception vectors.
*/
LOAD_REG_IMMEDIATE(r3, PAGE_OFFSET)
mr. r4,r26 /* In some cases the loader may */
beq 9f /* have already put us at zero */
mr r4,r26 /* Load the virtual source address into r4 */
cmpld r3,r4 /* Check if source == dest */
beq 9f /* If so skip the copy */
li r6,0x100 /* Start offset, the first 0x100 */
/* bytes were copied earlier. */

Expand Down

0 comments on commit 13fc6c1

Please sign in to comment.