diff options
| author | Matt Merhar <mattmerhar@protonmail.com> | 2021-05-17 17:32:48 +0000 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-05-26 17:26:07 -0400 |
| commit | f6c0d365d3e8ee8e4fd3ebe2ed957c2bca9d3328 (patch) | |
| tree | 1aabac39d7e365e7b95518b18a6de863585c086d | |
| parent | 26de4296cc20bb45eb40560b4a4a98fa90a16a28 (diff) | |
| download | u-boot-f6c0d365d3e8ee8e4fd3ebe2ed957c2bca9d3328.zip u-boot-f6c0d365d3e8ee8e4fd3ebe2ed957c2bca9d3328.tar.gz u-boot-f6c0d365d3e8ee8e4fd3ebe2ed957c2bca9d3328.tar.bz2 | |
powerpc: fix regression in arch_initr_trap()
The assembly output of the arch_initr_trap() function differed by a
single byte after common.h was removed from traps.c:
fff49a18 <arch_initr_trap>:
fff49a18: 94 21 ff f0 stwu r1,-16(r1)
fff49a1c: 7c 08 02 a6 mflr r0
fff49a20: 90 01 00 14 stw r0,20(r1)
-fff49a24: 80 62 00 44 lwz r3,68(r2)
+fff49a24: 80 62 00 38 lwz r3,56(r2)
fff49a28: 4b ff 76 19 bl fff41040 <trap_init>
fff49a2c: 80 01 00 14 lwz r0,20(r1)
fff49a30: 38 60 00 00 li r3,0
fff49a34: 38 21 00 10 addi r1,r1,16
fff49a38: 7c 08 03 a6 mtlr r0
This was causing a consistent hard lockup during the MMC read / loading
of the QoriQ FMan firmware on a P2041RDB board.
Re-adding the header causes identical assembly to be emitted and allows
the firmware loading and subsequent boot to succeed.
Fixes: 401d1c4f5d ("common: Drop asm/global_data.h from common header")
Signed-off-by: Matt Merhar <mattmerhar@protonmail.com>
| -rw-r--r-- | arch/powerpc/lib/traps.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/lib/traps.c b/arch/powerpc/lib/traps.c index c7bce82..ab8ca26 100644 --- a/arch/powerpc/lib/traps.c +++ b/arch/powerpc/lib/traps.c @@ -4,6 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ +#include <common.h> #include <init.h> #include <asm/global_data.h> |