Skip to contentSkip to conversation

qemu-ppce500: Add support for 64bit CCSR map

PATCH New Alexander Graf 3 participants 3 messages Mar 7, 2015 – Apr 20, 2015

lore
Share & tools
lore

Alexander Graf

author
#0 lore raw

PATCH 1/1 qemu-ppce500: Add support for 64bit CCSR map

QEMU 2.3 changes the address layout of the CCSR map in the PV ppce500 machine to reside in higher address space.

Unfortunately, this exposed a glitch in u-boot for ppce500: While providing a function to dynamically evaluate the CCSR region's position in physical address space, we never used it. Plus we forgot to support 64bit physical addresses.

This patch fixes that mishap, making u-boot work fine with latest QEMU again.

Signed-off-by Alexander Graf <[email protected]>
---
 include/configs/qemu-ppce500.h |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
include/configs/qemu-ppce500.h +7 -1
index 763a47a..7071849 100644
@@ -50,8 +50,14 @@
 /* Physical address should be a function call */
 #ifndef __ASSEMBLY__
 extern unsigned long long get_phys_ccsrbar_addr_early(void);
+#define CONFIG_SYS_CCSRBAR_PHYS_HIGH (get_phys_ccsrbar_addr_early() >> 32)
+#define CONFIG_SYS_CCSRBAR_PHYS_LOW get_phys_ccsrbar_addr_early()
+#else
+#define CONFIG_SYS_CCSRBAR_PHYS_HIGH 0x0
+#define CONFIG_SYS_CCSRBAR_PHYS_LOW CONFIG_SYS_CCSRBAR
 #endif
-#define CONFIG_SYS_CCSR_DO_NOT_RELOCATE
+
+#define CONFIG_PHYS_64BIT
 
 /* Virtual address range for PCI region maps */
 #define CONFIG_SYS_PCI_MAP_START	0x80000000
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 qemu-ppce500: Add support for 64bit CCSR map

Quoted 8 lines · Alexander Graf

QEMU 2.3 changes the address layout of the CCSR map in the PV ppce500 machine to reside in higher address space.

Unfortunately, this exposed a glitch in u-boot for ppce500: While providing a function to dynamically evaluate the CCSR region's position in physical address space, we never used it. Plus we forgot to support 64bit physical addresses.

Quoted 6 lines

This patch fixes that mishap, making u-boot work fine with latest QEMU again.

Signed-off-by Alexander Graf <[email protected]>
---
 include/configs/qemu-ppce500.h |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
Reviewed-by Scott Wood <[email protected]>

-Scott

Applied
#2 lore raw

PATCH 1/1 qemu-ppce500: Add support for 64bit CCSR map

In reply to Alexander Graf
Quoted 8 lines · Alexander Graf

QEMU 2.3 changes the address layout of the CCSR map in the PV ppce500 machine to reside in higher address space.

Unfortunately, this exposed a glitch in u-boot for ppce500: While providing a function to dynamically evaluate the CCSR region's position in physical address space, we never used it. Plus we forgot to support 64bit physical addresses.

Quoted 4 lines

This patch fixes that mishap, making u-boot work fine with latest QEMU again.

Signed-off-by Alexander Graf <[email protected]>

---

Applied to mpc85xx master, awaiting upstream.

York