85xx: Fix bug in device tree setup in 36-bit physical confg
PATCH 1/1 85xx: Fix bug in device tree setup in 36-bit physical confg
In the 36-bit physical config for MPC8572DS when need the start address of memory and it size to be kept in phys_*_t instead of a ulong since we support >4G of memory in the config and ulong cant represent that. Otherwise we end up seeing the memory node in the device tree reporting back we have memory starting @ 0 and of size 0.
--- board/freescale/mpc8572ds/mpc8572ds.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
board/freescale/mpc8572ds/mpc8572ds.c +2 -1
@@ -554,7 +554,8 @@ extern void ft_fsl_pci_setup(void *blob, const char *pci_alias,void ft_board_setup (void *blob,bd_t *bd) { -ulong base, size; +phys_addr_t base; +phys_size_t size;ft_cpu_setup (blob, bd);
Signature · 1 line
1.5.6.6
PATCH 1/1 85xx: Fix address map for 36-bit config of MPC8572DS
When we introduced the 36-bit config of the MPC8572DS board we had the wrong PCI MEM bus address map. Additionally, the change to the address map exposes a small issue in our dummy read on the ULI bus. We need to use the new mapping functions to handle that read properly in the 36-bit config.
--- board/freescale/mpc8572ds/mpc8572ds.c | 6 ++++-- include/configs/MPC8572DS.h | 9 ++++++--- 2 files changed, 10 insertions(+), 5 deletions(-)
board/freescale/mpc8572ds/mpc8572ds.c +4 -2
@@ -216,8 +216,10 @@ void pci_init_board(void)pci_hose_read_config_dword (hose,PCI_BDF (2 ,0x1d ,0 ),PCI_BASE_ADDRESS_1 , &temp32);if (temp32 >=CONFIG_SYS_PCIE3_MEM_BUS ) { -debug (" uli1572 read to %x\n" , temp32); -in_be32 ((unsigned *)temp32); +void *p =pci_mem_to_virt (PCI_BDF (2 ,0x1d ,0 ), + temp32,4 ,0 ); +debug (" uli1572 read to %p\n" , p); +in_be32 (p); } }else {printf (" PCIE3: disabled\n" );
include/configs/MPC8572DS.h +6 -3
@@ -404,10 +404,11 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);/* controller 3, direct to uli, tgtid 3, Base address 8000 */ #define CONFIG_SYS_PCIE3_MEM_VIRT 0x80000000 -#define CONFIG_SYS_PCIE3_MEM_BUS 0x80000000#ifdef CONFIG_PHYS_64BIT +#define CONFIG_SYS_PCIE3_MEM_BUS 0xc0000000#define CONFIG_SYS_PCIE3_MEM_PHYS 0xc00000000ull#else +#define CONFIG_SYS_PCIE3_MEM_BUS 0x80000000#define CONFIG_SYS_PCIE3_MEM_PHYS 0x80000000#endif #define CONFIG_SYS_PCIE3_MEM_SIZE 0x20000000/* 512M */
@@ -422,10 +423,11 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);/* controller 2, Slot 2, tgtid 2, Base address 9000 */ #define CONFIG_SYS_PCIE2_MEM_VIRT 0xa0000000 -#define CONFIG_SYS_PCIE2_MEM_BUS 0xa0000000#ifdef CONFIG_PHYS_64BIT +#define CONFIG_SYS_PCIE2_MEM_BUS 0xc0000000#define CONFIG_SYS_PCIE2_MEM_PHYS 0xc20000000ull#else +#define CONFIG_SYS_PCIE2_MEM_BUS 0xa0000000#define CONFIG_SYS_PCIE2_MEM_PHYS 0xa0000000#endif #define CONFIG_SYS_PCIE2_MEM_SIZE 0x20000000/* 512M */
@@ -440,10 +442,11 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);/* controller 1, Slot 1, tgtid 1, Base address a000 */ #define CONFIG_SYS_PCIE1_MEM_VIRT 0xc0000000 -#define CONFIG_SYS_PCIE1_MEM_BUS 0xc0000000#ifdef CONFIG_PHYS_64BIT +#define CONFIG_SYS_PCIE1_MEM_BUS 0xc0000000#define CONFIG_SYS_PCIE1_MEM_PHYS 0xc40000000ull#else +#define CONFIG_SYS_PCIE1_MEM_BUS 0xc0000000#define CONFIG_SYS_PCIE1_MEM_PHYS 0xc0000000#endif #define CONFIG_SYS_PCIE1_MEM_SIZE 0x20000000/* 512M */
Signature · 1 line
1.5.6.6