summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcognet <cognet@FreeBSD.org>2009-03-31 23:06:20 +0000
committercognet <cognet@FreeBSD.org>2009-03-31 23:06:20 +0000
commita51108502aed4b85359bc7085bb2d4755bc15dab (patch)
treeae56bfb48ef350d7177115d7c114099be2931e62
parentb31803623ee1c71fbc50bfdb9d7f640f38673052 (diff)
downloadFreeBSD-src-a51108502aed4b85359bc7085bb2d4755bc15dab.zip
FreeBSD-src-a51108502aed4b85359bc7085bb2d4755bc15dab.tar.gz
Use Oxf0000000 instead of 0xff000000 to guess the physical address, relative
to the virtual one. I may had a reason at some point to use the later, but can't remember which, and it can leads to issues. Reported by: Guillaume Ballet <gballet gmail com>
-rw-r--r--sys/arm/arm/locore.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arm/arm/locore.S b/sys/arm/arm/locore.S
index b465edc..e56a91c 100644
--- a/sys/arm/arm/locore.S
+++ b/sys/arm/arm/locore.S
@@ -110,7 +110,7 @@ from_ram:
nop
#endif
adr r7, Lunmapped
- bic r7, r7, #0xff000000
+ bic r7, r7, #0xf0000000
orr r7, r7, #PHYSADDR
@@ -144,7 +144,7 @@ Lunmapped:
ldmia r4!, {r1,r2,r3} /* # of sections, VA, PA|attr */
cmp r1, #0
adrne r5, 2b
- bicne r5, r5, #0xff000000
+ bicne r5, r5, #0xf0000000
orrne r5, r5, #PHYSADDR
movne pc, r5
OpenPOWER on IntegriCloud