85xx: Use BR_ADDR macro for NAND chipselects
PATCH 1/3 85xx: Use BR_ADDR macro for NAND chipselects
Use the new BR_ADDR macro to properly setup the address field of the localbus chipselects used by NAND.
This allows us to deal with 36-bit phys on these boards in the future.
--- include/configs/MPC8536DS.h | 8 ++++---- include/configs/MPC8572DS.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
include/configs/MPC8536DS.h +4 -4
@@ -257,7 +257,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024)/* NAND flash config */ -#define CONFIG_NAND_BR_PRELIM (CONFIG_SYS_NAND_BASE_PHYS \ +#define CONFIG_NAND_BR_PRELIM (BR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \ | (2<<BR_DECC_SHIFT) /* Use HW ECC */ \ | BR_PS_8 /* Port Size = 8 bit */ \ | BR_MS_FCM/* MSEL = FCM */ \
@@ -274,20 +274,20 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_BR2_PRELIM CONFIG_NAND_BR_PRELIM/* NAND Base Address */ #define CONFIG_SYS_OR2_PRELIM CONFIG_NAND_OR_PRELIM/* NAND Options */ -#define CONFIG_SYS_BR4_PRELIM ((CONFIG_SYS_NAND_BASE_PHYS + 0x40000)\ +#define CONFIG_SYS_BR4_PRELIM (BR_PHYS_ADDR((CONFIG_SYS_NAND_BASE_PHYS + 0x40000))\ | (2<<BR_DECC_SHIFT) /* Use HW ECC */ \ | BR_PS_8 /* Port Size = 8 bit */ \ | BR_MS_FCM /* MSEL = FCM */ \ | BR_V) /* valid */#define CONFIG_SYS_OR4_PRELIM CONFIG_NAND_OR_PRELIM/* NAND Options */ -#define CONFIG_SYS_BR5_PRELIM ((CONFIG_SYS_NAND_BASE_PHYS + 0x80000)\ +#define CONFIG_SYS_BR5_PRELIM (BR_PHYS_ADDR((CONFIG_SYS_NAND_BASE_PHYS + 0x80000))\ | (2<<BR_DECC_SHIFT) /* Use HW ECC */ \ | BR_PS_8 /* Port Size = 8 bit */ \ | BR_MS_FCM /* MSEL = FCM */ \ | BR_V) /* valid */#define CONFIG_SYS_OR5_PRELIM CONFIG_NAND_OR_PRELIM/* NAND Options */ -#define CONFIG_SYS_BR6_PRELIM ((CONFIG_SYS_NAND_BASE_PHYS + 0xC0000)\ +#define CONFIG_SYS_BR6_PRELIM (BR_PHYS_ADDR((CONFIG_SYS_NAND_BASE_PHYS + 0xc0000))\ | (2<<BR_DECC_SHIFT) /* Use HW ECC */ \ | BR_PS_8 /* Port Size = 8 bit */ \ | BR_MS_FCM/* MSEL = FCM */ \
include/configs/MPC8572DS.h +4 -4
@@ -276,7 +276,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024)/* NAND flash config */ -#define CONFIG_NAND_BR_PRELIM (CONFIG_SYS_NAND_BASE_PHYS \ +#define CONFIG_NAND_BR_PRELIM (BR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \ | (2<<BR_DECC_SHIFT) /* Use HW ECC */ \ | BR_PS_8 /* Port Size = 8 bit */ \ | BR_MS_FCM/* MSEL = FCM */ \
@@ -293,20 +293,20 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_BR2_PRELIM CONFIG_NAND_BR_PRELIM/* NAND Base Address */ #define CONFIG_SYS_OR2_PRELIM CONFIG_NAND_OR_PRELIM/* NAND Options */ -#define CONFIG_SYS_BR4_PRELIM ((CONFIG_SYS_NAND_BASE_PHYS + 0x40000)\ +#define CONFIG_SYS_BR4_PRELIM (BR_PHYS_ADDR((CONFIG_SYS_NAND_BASE_PHYS + 0x40000))\ | (2<<BR_DECC_SHIFT) /* Use HW ECC */ \ | BR_PS_8 /* Port Size = 8 bit */ \ | BR_MS_FCM /* MSEL = FCM */ \ | BR_V) /* valid */#define CONFIG_SYS_OR4_PRELIM CONFIG_NAND_OR_PRELIM/* NAND Options */ -#define CONFIG_SYS_BR5_PRELIM ((CONFIG_SYS_NAND_BASE_PHYS + 0x80000)\ +#define CONFIG_SYS_BR5_PRELIM (BR_PHYS_ADDR((CONFIG_SYS_NAND_BASE_PHYS + 0x80000))\ | (2<<BR_DECC_SHIFT) /* Use HW ECC */ \ | BR_PS_8 /* Port Size = 8 bit */ \ | BR_MS_FCM /* MSEL = FCM */ \ | BR_V) /* valid */#define CONFIG_SYS_OR5_PRELIM CONFIG_NAND_OR_PRELIM/* NAND Options */ -#define CONFIG_SYS_BR6_PRELIM ((CONFIG_SYS_NAND_BASE_PHYS + 0xC0000)\ +#define CONFIG_SYS_BR6_PRELIM (BR_PHYS_ADDR((CONFIG_SYS_NAND_BASE_PHYS + 0xc0000))\ | (2<<BR_DECC_SHIFT) /* Use HW ECC */ \ | BR_PS_8 /* Port Size = 8 bit */ \ | BR_MS_FCM /* MSEL = FCM */ \
Signature · 1 line
1.5.6.6
PATCH 2/3 85xx: Handle eLBC difference w/36-bit physical
The eLBC only handles 32-bit physical address in systems with 36-bit physical. The previos generation of LBC handled 34-bit physical address in 36-bit systems. Added a new CONFIG option to convey the difference between the LBC and eLBC.
Also added defines for XAM bits used in LBC for the extended 34-bit support.
--- include/asm-ppc/fsl_lbc.h | 8 +++++++- include/configs/MPC8536DS.h | 1 + include/configs/MPC8572DS.h | 1 + 3 files changed, 9 insertions(+), 1 deletions(-)
include/asm-ppc/fsl_lbc.h +7 -1
@@ -28,6 +28,8 @@#define BR_BA 0xFFFF8000#define BR_BA_SHIFT 15 +#define BR_XBA 0x00006000 +#define BR_XBA_SHIFT 13#define BR_PS 0x00001800#define BR_PS_SHIFT 11#define BR_PS_8 0x00000800/* Port Size 8 bit */
@@ -70,7 +72,7 @@#endif /* Convert an address into the right format for the BR registers */ -#ifdef CONFIG_PHYS_64BIT +#if defined(CONFIG_PHYS_64BIT ) && !defined(CONFIG_FSL_ELBC )#define BR_PHYS_ADDR (x) ((unsigned long)((x & 0x0ffff8000ULL) | \ ((x & 0x300000000ULL) >> 19)))#else
@@ -90,6 +92,8 @@#define OR_GPCM_AM 0xFFFF8000#define OR_GPCM_AM_SHIFT 15 +#define OR_GPCM_XAM 0x00006000 +#define OR_GPCM_XAM_SHIFT 13#define OR_GPCM_BCTLD 0x00001000#define OR_GPCM_BCTLD_SHIFT 12#define OR_GPCM_CSNT 0x00000800
@@ -132,6 +136,8 @@#define OR_FCM_AM 0xFFFF8000#define OR_FCM_AM_SHIFT 15 +#define OR_FCM_XAM 0x00006000 +#define OR_FCM_XAM_SHIFT 13#define OR_FCM_BCTLD 0x00001000#define OR_FCM_BCTLD_SHIFT 12#define OR_FCM_PGS 0x00000400
include/configs/MPC8536DS.h +1 -0
@@ -34,6 +34,7 @@#define CONFIG_MPC8536 1#define CONFIG_MPC8536DS 1 +#define CONFIG_FSL_ELBC 1/* Has Enhanced localbus controller */ #define CONFIG_PCI 1/* Enable PCI/PCIE */ #define CONFIG_PCI1 1/* Enable PCI controller 1 */ #define CONFIG_PCIE1 1/* PCIE controler 1 (slot 1) */
include/configs/MPC8572DS.h +1 -0
@@ -36,6 +36,7 @@#define CONFIG_MP 1/* support multiple processors */ #define CONFIG_NUM_CPUS 2/* Number of CPUs in the system */ +#define CONFIG_FSL_ELBC 1/* Has Enhanced localbus controller */ #define CONFIG_PCI 1/* Enable PCI/PCIE */ #define CONFIG_PCIE1 1/* PCIE controler 1 (slot 1) */ #define CONFIG_PCIE2 1/* PCIE controler 2 (slot 2) */
Signature · 1 line
1.5.6.6
PATCH 3/3 85xx: Add a 36-bit physical configuration for MPC8572DS
We move all IO addressed (CCSR, localbus, PCI) above the 4G boundary to allow for larger memory sizes.
--- MAKEALL | 1 + Makefile | 8 ++++++- include/configs/MPC8572DS.h | 47 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 54 insertions(+), 2 deletions(-)
MAKEALL +1 -0
@@ -372,6 +372,7 @@ LIST_85xx=" \ MPC8560ADS \ MPC8568MDS \ MPC8572DS \ + MPC8572DS_36BIT \ PM854 \ PM856 \ sbc8540 \
Makefile +7 -1
@@ -2398,8 +2398,14 @@ MPC8555CDS_config: unconfig MPC8568MDS_config: unconfig @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8568mds freescale +MPC8572DS_36BIT_config \ MPC8572DS_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8572ds freescale + @mkdir -p $(obj)include + @if [ "$(findstring _36BIT_,$@)" ] ; then \ + echo "#define CONFIG_PHYS_64BIT" >>$(obj)include/config.h ; \ + $(XECHO) "... enabling 36-bit physical addressing." ; \ + fi + @$(MKCONFIG) -a MPC8572DS ppc mpc85xx mpc8572ds freescale PM854_config: unconfig @$(MKCONFIG) $(@:_config=) ppc mpc85xx pm854
include/configs/MPC8572DS.h +46 -1
118 lines not on this page · raw message
Signature · 1 line
1.5.6.6
PATCH 3/3 85xx: Add a 36-bit physical configuration for MPC8572DS
Quoted 10 lines · Kumar Gala
We move all IO addressed (CCSR, localbus, PCI) above the 4G boundary to allow for larger memory sizes.
Signed-off-by Kumar Gala <[email protected]>---
MAKEALL | 1 + Makefile | 8 ++++++- include/configs/MPC8572DS.h | 47 ++++++++++++++++++++++++++++++++++ ++++++++- 3 files changed, 54 insertions(+), 2 deletions(-)
This requires Becky CFI and PCI patches related to address size to function properly. However there is no harm beyond that in applying this right now.
- k
Andy Fleming
AppliedPATCH 3/3 85xx: Add a 36-bit physical configuration for MPC8572DS
Quoted 7 lines · Kumar Gala
Quoted 4 lines · Kumar Gala
We move all IO addressed (CCSR, localbus, PCI) above the 4G boundary to allow for larger memory sizes.
Signed-off-by Kumar Gala <[email protected]>
Applied, thanks
Andy
PATCH 3/3 85xx: Add a 36-bit physical configuration for MPC8572DS
Quoted 8 lines · Andy Fleming
Quoted 6 lines · Kumar Gala
Quoted 3 lines · Kumar Gala
We move all IO addressed (CCSR, localbus, PCI) above the 4G boundary to allow for larger memory sizes.
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Signed-off-by Kumar Gala <[email protected]>Applied, thanks
Andy
all of these are already in the tree.
- k
Andy Fleming
AppliedPATCH 2/3 85xx: Handle eLBC difference w/36-bit physical
In reply to Kumar GalaQuoted 9 lines · Kumar Gala
The eLBC only handles 32-bit physical address in systems with 36-bit physical. The previos generation of LBC handled 34-bit physical address in 36-bit systems. Added a new CONFIG option to convey the difference between the LBC and eLBC.
Also added defines for XAM bits used in LBC for the extended 34-bit support.
Signed-off-by Kumar Gala <[email protected]>
Applied, thanks
Andy Fleming
AppliedPATCH 1/3 85xx: Use BR_ADDR macro for NAND chipselects
In reply to Kumar GalaQuoted 6 lines · Kumar Gala
Use the new
BR_ADDRmacro to properly setup the address field of the localbus chipselects used by NAND.This allows us to deal with 36-bit phys on these boards in the future.
Signed-off-by Kumar Gala <[email protected]>
Applied, thanks