85xx: Convert CONFIG_SYS_{PCI*, RIO*}_MEM_BASE to _MEM_BUS for FSL boards
PATCH 1/5 85xx: Convert CONFIG_SYS_{PCI*, RIO*}_MEM_BASE to _MEM_BUS for FSL boards
Use CONFIG_SYS_{PCI,RIO}_MEM_BUS for the bus relative address instead of _MEM_BASE so we are more explicit.
--- board/freescale/mpc8536ds/mpc8536ds.c | 20 ++++++++++---------- board/freescale/mpc8540ads/law.c | 2 +- board/freescale/mpc8540ads/tlb.c | 4 ++-- board/freescale/mpc8544ds/mpc8544ds.c | 26 +++++++++++++------------- board/freescale/mpc8548cds/mpc8548cds.c | 4 ++-- board/freescale/mpc8548cds/tlb.c | 4 ++-- board/freescale/mpc8560ads/law.c | 2 +- board/freescale/mpc8560ads/tlb.c | 4 ++-- board/freescale/mpc8568mds/law.c | 2 +- board/freescale/mpc8568mds/mpc8568mds.c | 4 ++-- board/freescale/mpc8572ds/mpc8572ds.c | 6 +++--- cpu/mpc85xx/pci.c | 16 ++++++++++++---- include/configs/MPC8536DS.h | 16 ++++++++-------- include/configs/MPC8540ADS.h | 8 ++++---- include/configs/MPC8541CDS.h | 8 ++++---- include/configs/MPC8544DS.h | 20 ++++++++++---------- include/configs/MPC8548CDS.h | 14 +++++++------- include/configs/MPC8555CDS.h | 8 ++++---- include/configs/MPC8560ADS.h | 8 ++++---- include/configs/MPC8568MDS.h | 10 +++++----- include/configs/MPC8572DS.h | 12 ++++++------ 21 files changed, 103 insertions(+), 95 deletions(-)
board/freescale/mpc8536ds/mpc8536ds.c +10 -10
@@ -204,7 +204,7 @@ pci_init_board(void)/* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCIE3_MEM_BASE , +CONFIG_SYS_PCIE3_MEM_BUS ,CONFIG_SYS_PCIE3_MEM_PHYS ,CONFIG_SYS_PCIE3_MEM_SIZE ,PCI_REGION_MEM );
@@ -259,7 +259,7 @@ pci_init_board(void)/* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCIE1_MEM_BASE , +CONFIG_SYS_PCIE1_MEM_BUS ,CONFIG_SYS_PCIE1_MEM_PHYS ,CONFIG_SYS_PCIE1_MEM_SIZE ,PCI_REGION_MEM );
@@ -271,10 +271,10 @@ pci_init_board(void)CONFIG_SYS_PCIE1_IO_SIZE , PCI_REGION_IO); -#ifdef CONFIG_SYS_PCIE1_MEM_BASE2 +#ifdef CONFIG_SYS_PCIE1_MEM_BUS2 /* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCIE1_MEM_BASE2 , +CONFIG_SYS_PCIE1_MEM_BUS2 ,CONFIG_SYS_PCIE1_MEM_PHYS2 ,CONFIG_SYS_PCIE1_MEM_SIZE2 ,PCI_REGION_MEM );
@@ -322,7 +322,7 @@ pci_init_board(void)/* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCIE2_MEM_BASE , +CONFIG_SYS_PCIE2_MEM_BUS ,CONFIG_SYS_PCIE2_MEM_PHYS ,CONFIG_SYS_PCIE2_MEM_SIZE ,PCI_REGION_MEM );
@@ -334,10 +334,10 @@ pci_init_board(void)CONFIG_SYS_PCIE2_IO_SIZE , PCI_REGION_IO); -#ifdef CONFIG_SYS_PCIE2_MEM_BASE2 +#ifdef CONFIG_SYS_PCIE2_MEM_BUS2 /* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCIE2_MEM_BASE2 , +CONFIG_SYS_PCIE2_MEM_BUS2 ,CONFIG_SYS_PCIE2_MEM_PHYS2 ,CONFIG_SYS_PCIE2_MEM_SIZE2 ,PCI_REGION_MEM );
@@ -390,7 +390,7 @@ pci_init_board(void)/* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCI1_MEM_BASE , +CONFIG_SYS_PCI1_MEM_BUS ,CONFIG_SYS_PCI1_MEM_PHYS ,CONFIG_SYS_PCI1_MEM_SIZE ,PCI_REGION_MEM );
@@ -402,10 +402,10 @@ pci_init_board(void)CONFIG_SYS_PCI1_IO_SIZE , PCI_REGION_IO); -#ifdef CONFIG_SYS_PCI1_MEM_BASE2 +#ifdef CONFIG_SYS_PCI1_MEM_BUS2 /* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCI1_MEM_BASE2 , +CONFIG_SYS_PCI1_MEM_BUS2 ,CONFIG_SYS_PCI1_MEM_PHYS2 ,CONFIG_SYS_PCI1_MEM_SIZE2 ,PCI_REGION_MEM );
board/freescale/mpc8540ads/law.c +1 -1
@@ -52,7 +52,7 @@ struct law_entry law_table[] = {/* This is not so much the SDRAM map as it is the whole localbus map. */ SET_LAW (CONFIG_SYS_LBC_SDRAM_BASE ,LAW_SIZE_256M ,LAW_TRGT_IF_LBC ),SET_LAW (CONFIG_SYS_PCI1_IO_PHYS ,LAW_SIZE_1M ,LAW_TRGT_IF_PCI ), - SET_LAW(CONFIG_SYS_RIO_MEM_BASE, LAWAR_SIZE_512M, LAW_TRGT_IF_RIO), + SET_LAW(CONFIG_SYS_RIO_MEM_BUS, LAWAR_SIZE_512M, LAW_TRGT_IF_RIO), };int num_law_entries =ARRAY_SIZE (law_table);
board/freescale/mpc8540ads/tlb.c +2 -2
@@ -70,7 +70,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 3: 256M Non-cacheable, guarded * 0xc0000000 256M Rapid IO MEM First half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BASE ,CONFIG_SYS_RIO_MEM_BASE , +SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS ,CONFIG_SYS_RIO_MEM_BUS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 3, BOOKE_PAGESZ_256M, 1),
@@ -78,7 +78,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 4: 256M Non-cacheable, guarded * 0xd0000000 256M Rapid IO MEM Second half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BASE +0x10000000 ,CONFIG_SYS_RIO_MEM_BASE +0x10000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS +0x10000000 ,CONFIG_SYS_RIO_MEM_BUS +0x10000000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 4, BOOKE_PAGESZ_256M, 1),
board/freescale/mpc8544ds/mpc8544ds.c +13 -13
@@ -149,7 +149,7 @@ pci_init_board(void)/* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCIE3_MEM_BASE , +CONFIG_SYS_PCIE3_MEM_BUS ,CONFIG_SYS_PCIE3_MEM_PHYS ,CONFIG_SYS_PCIE3_MEM_SIZE ,PCI_REGION_MEM );
@@ -161,10 +161,10 @@ pci_init_board(void)CONFIG_SYS_PCIE3_IO_SIZE , PCI_REGION_IO); -#ifdef CONFIG_SYS_PCIE3_MEM_BASE2 +#ifdef CONFIG_SYS_PCIE3_MEM_BUS2 /* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCIE3_MEM_BASE2 , +CONFIG_SYS_PCIE3_MEM_BUS2 ,CONFIG_SYS_PCIE3_MEM_PHYS2 ,CONFIG_SYS_PCIE3_MEM_SIZE2 ,PCI_REGION_MEM );
@@ -183,7 +183,7 @@ pci_init_board(void)* Activate ULI1575 legacy chip by performing a fake * memory access. Needed to make ULI RTC work. */ -in_be32 ((u32 *)CONFIG_SYS_PCIE3_MEM_BASE ); +in_be32 ((u32 *)CONFIG_SYS_PCIE3_MEM_BUS ); }else {printf (" PCIE3: disabled\n" ); }
@@ -216,7 +216,7 @@ pci_init_board(void)/* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCIE1_MEM_BASE , +CONFIG_SYS_PCIE1_MEM_BUS ,CONFIG_SYS_PCIE1_MEM_PHYS ,CONFIG_SYS_PCIE1_MEM_SIZE ,PCI_REGION_MEM );
@@ -228,10 +228,10 @@ pci_init_board(void)CONFIG_SYS_PCIE1_IO_SIZE , PCI_REGION_IO); -#ifdef CONFIG_SYS_PCIE1_MEM_BASE2 +#ifdef CONFIG_SYS_PCIE1_MEM_BUS2 /* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCIE1_MEM_BASE2 , +CONFIG_SYS_PCIE1_MEM_BUS2 ,CONFIG_SYS_PCIE1_MEM_PHYS2 ,CONFIG_SYS_PCIE1_MEM_SIZE2 ,PCI_REGION_MEM );
@@ -279,7 +279,7 @@ pci_init_board(void)/* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCIE2_MEM_BASE , +CONFIG_SYS_PCIE2_MEM_BUS ,CONFIG_SYS_PCIE2_MEM_PHYS ,CONFIG_SYS_PCIE2_MEM_SIZE ,PCI_REGION_MEM );
@@ -291,10 +291,10 @@ pci_init_board(void)CONFIG_SYS_PCIE2_IO_SIZE , PCI_REGION_IO); -#ifdef CONFIG_SYS_PCIE2_MEM_BASE2 +#ifdef CONFIG_SYS_PCIE2_MEM_BUS2 /* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCIE2_MEM_BASE2 , +CONFIG_SYS_PCIE2_MEM_BUS2 ,CONFIG_SYS_PCIE2_MEM_PHYS2 ,CONFIG_SYS_PCIE2_MEM_SIZE2 ,PCI_REGION_MEM );
@@ -347,7 +347,7 @@ pci_init_board(void)/* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCI1_MEM_BASE , +CONFIG_SYS_PCI1_MEM_BUS ,CONFIG_SYS_PCI1_MEM_PHYS ,CONFIG_SYS_PCI1_MEM_SIZE ,PCI_REGION_MEM );
@@ -359,10 +359,10 @@ pci_init_board(void)CONFIG_SYS_PCI1_IO_SIZE , PCI_REGION_IO); -#ifdef CONFIG_SYS_PCIE3_MEM_BASE2 +#ifdef CONFIG_SYS_PCIE3_MEM_BUS2 /* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCIE3_MEM_BASE2 , +CONFIG_SYS_PCIE3_MEM_BUS2 ,CONFIG_SYS_PCIE3_MEM_PHYS2 ,CONFIG_SYS_PCIE3_MEM_SIZE2 ,PCI_REGION_MEM );
board/freescale/mpc8548cds/mpc8548cds.c +2 -2
@@ -329,7 +329,7 @@ pci_init_board(void)/* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCI1_MEM_BASE , +CONFIG_SYS_PCI1_MEM_BUS ,CONFIG_SYS_PCI1_MEM_PHYS ,CONFIG_SYS_PCI1_MEM_SIZE ,PCI_REGION_MEM );
@@ -413,7 +413,7 @@ pci_init_board(void)/* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCIE1_MEM_BASE , +CONFIG_SYS_PCIE1_MEM_BUS ,CONFIG_SYS_PCIE1_MEM_PHYS ,CONFIG_SYS_PCIE1_MEM_SIZE ,PCI_REGION_MEM );
board/freescale/mpc8548cds/tlb.c +2 -2
@@ -62,14 +62,14 @@ struct fsl_e_tlb_entry tlb_table[] = {/* * TLB 2: 256M Non-cacheable, guarded */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BASE ,CONFIG_SYS_RIO_MEM_BASE , +SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS ,CONFIG_SYS_RIO_MEM_BUS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G ,0 ,2 ,BOOKE_PAGESZ_256M ,1 ),/* * TLB 3: 256M Non-cacheable, guarded */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BASE +0x10000000 ,CONFIG_SYS_RIO_MEM_BASE +0x10000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS +0x10000000 ,CONFIG_SYS_RIO_MEM_BUS +0x10000000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 3, BOOKE_PAGESZ_256M, 1), #endif
board/freescale/mpc8560ads/law.c +1 -1
@@ -52,7 +52,7 @@ struct law_entry law_table[] = {/* This is not so much the SDRAM map as it is the whole localbus map. */ SET_LAW (CONFIG_SYS_LBC_SDRAM_BASE ,LAW_SIZE_256M ,LAW_TRGT_IF_LBC ),SET_LAW (CONFIG_SYS_PCI1_IO_PHYS ,LAW_SIZE_1M ,LAW_TRGT_IF_PCI ), - SET_LAW(CONFIG_SYS_RIO_MEM_BASE, LAWAR_SIZE_512M, LAW_TRGT_IF_RIO), + SET_LAW(CONFIG_SYS_RIO_MEM_BUS, LAWAR_SIZE_512M, LAW_TRGT_IF_RIO), };int num_law_entries =ARRAY_SIZE (law_table);
board/freescale/mpc8560ads/tlb.c +2 -2
@@ -70,7 +70,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 3: 256M Non-cacheable, guarded * 0xc0000000 256M Rapid IO MEM First half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BASE ,CONFIG_SYS_RIO_MEM_BASE , +SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS ,CONFIG_SYS_RIO_MEM_BUS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 3, BOOKE_PAGESZ_256M, 1),
@@ -78,7 +78,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 4: 256M Non-cacheable, guarded * 0xd0000000 256M Rapid IO MEM Second half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BASE +0x10000000 ,CONFIG_SYS_RIO_MEM_BASE +0x10000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS +0x10000000 ,CONFIG_SYS_RIO_MEM_BUS +0x10000000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 4, BOOKE_PAGESZ_256M, 1),
board/freescale/mpc8568mds/law.c +1 -1
@@ -54,7 +54,7 @@ struct law_entry law_table[] = {SET_LAW (CONFIG_SYS_PCIE1_MEM_PHYS ,LAW_SIZE_512M ,LAW_TRGT_IF_PCIE_1 ),SET_LAW (CONFIG_SYS_PCI1_IO_PHYS ,LAW_SIZE_8M ,LAW_TRGT_IF_PCI ),SET_LAW (CONFIG_SYS_PCIE1_IO_PHYS ,LAW_SIZE_8M ,LAW_TRGT_IF_PCIE_1 ), -SET_LAW (CONFIG_SYS_SRIO_MEM_BASE ,LAW_SIZE_512M ,LAW_TRGT_IF_RIO ), +SET_LAW (CONFIG_SYS_SRIO_MEM_BUS ,LAW_SIZE_512M ,LAW_TRGT_IF_RIO ),/* LBC window - maps 256M. That's SDRAM, BCSR, PIBs, and Flash */ SET_LAW(CONFIG_SYS_LBC_SDRAM_BASE, LAW_SIZE_256M, LAW_TRGT_IF_LBC), };
board/freescale/mpc8568mds/mpc8568mds.c +2 -2
@@ -409,7 +409,7 @@ pci_init_board(void)/* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCI1_MEM_BASE , +CONFIG_SYS_PCI1_MEM_BUS ,CONFIG_SYS_PCI1_MEM_PHYS ,CONFIG_SYS_PCI1_MEM_SIZE ,PCI_REGION_MEM );
@@ -462,7 +462,7 @@ pci_init_board(void)/* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCIE1_MEM_BASE , +CONFIG_SYS_PCIE1_MEM_BUS ,CONFIG_SYS_PCIE1_MEM_PHYS ,CONFIG_SYS_PCIE1_MEM_SIZE ,PCI_REGION_MEM );
board/freescale/mpc8572ds/mpc8572ds.c +3 -3
@@ -197,7 +197,7 @@ void pci_init_board(void)/* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCIE3_MEM_BASE , +CONFIG_SYS_PCIE3_MEM_BUS ,CONFIG_SYS_PCIE3_MEM_PHYS ,CONFIG_SYS_PCIE3_MEM_SIZE ,PCI_REGION_MEM );
@@ -264,7 +264,7 @@ void pci_init_board(void)/* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCIE2_MEM_BASE , +CONFIG_SYS_PCIE2_MEM_BUS ,CONFIG_SYS_PCIE2_MEM_PHYS ,CONFIG_SYS_PCIE2_MEM_SIZE ,PCI_REGION_MEM );
@@ -317,7 +317,7 @@ void pci_init_board(void)/* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCIE1_MEM_BASE , +CONFIG_SYS_PCIE1_MEM_BUS ,CONFIG_SYS_PCIE1_MEM_PHYS ,CONFIG_SYS_PCIE1_MEM_SIZE ,PCI_REGION_MEM );
cpu/mpc85xx/pci.c +12 -4
@@ -31,6 +31,14 @@#if defined(CONFIG_PCI ) && !defined(CONFIG_FSL_PCI_INIT ) +#ifndef CONFIG_SYS_PCI1_MEM_BUS +#define CONFIG_SYS_PCI1_MEM_BUS CONFIG_SYS_PCI1_MEM_BASE +#endif + +#ifndef CONFIG_SYS_PCI2_MEM_BUS +#define CONFIG_SYS_PCI2_MEM_BUS CONFIG_SYS_PCI2_MEM_BASE +#endif +static struct pci_controller *pci_hose;void
@@ -80,7 +88,7 @@ pci_mpc85xx_init(struct pci_controller *board_hose)pci_hose_write_config_word (hose, dev,PCIX_COMMAND , reg16); } - pcix->potar1 = (CONFIG_SYS_PCI1_MEM_BASE >>12 ) &0x000fffff ; + pcix->potar1 = (CONFIG_SYS_PCI1_MEM_BUS >>12 ) &0x000fffff ; pcix->potear1 =0x00000000 ; pcix->powbar1 = (CONFIG_SYS_PCI1_MEM_PHYS >>12 ) &0x000fffff ; pcix->powbear1 =0x00000000 ;
@@ -105,7 +113,7 @@ pci_mpc85xx_init(struct pci_controller *board_hose) pcix->piwar3 =0 ;pci_set_region (hose->regions +0 , -CONFIG_SYS_PCI1_MEM_BASE , +CONFIG_SYS_PCI1_MEM_BUS ,CONFIG_SYS_PCI1_MEM_PHYS ,CONFIG_SYS_PCI1_MEM_SIZE ,PCI_REGION_MEM );
@@ -165,7 +173,7 @@ pci_mpc85xx_init(struct pci_controller *board_hose)*/ pci_hose_write_config_word (hose, dev,PCI_STATUS ,0xffff ); - pcix2->potar1 = (CONFIG_SYS_PCI2_MEM_BASE >>12 ) &0x000fffff ; + pcix2->potar1 = (CONFIG_SYS_PCI2_MEM_BUS >>12 ) &0x000fffff ; pcix2->potear1 =0x00000000 ; pcix2->powbar1 = (CONFIG_SYS_PCI2_MEM_PHYS >>12 ) &0x000fffff ; pcix2->powbear1 =0x00000000 ;
@@ -190,7 +198,7 @@ pci_mpc85xx_init(struct pci_controller *board_hose) pcix2->piwar3 =0 ;pci_set_region (hose->regions +0 , -CONFIG_SYS_PCI2_MEM_BASE , +CONFIG_SYS_PCI2_MEM_BUS ,CONFIG_SYS_PCI2_MEM_PHYS ,CONFIG_SYS_PCI2_MEM_SIZE ,PCI_REGION_MEM );
include/configs/MPC8536DS.h +8 -8
@@ -361,32 +361,32 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);* Memory space is mapped 1-1, but I/O space must start from 0. */ -#define CONFIG_SYS_PCI1_MEM_BASE 0x80000000 -#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BASE +#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000 +#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x10000000/* 256M */ #define CONFIG_SYS_PCI1_IO_BASE 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xffc00000#define CONFIG_SYS_PCI1_IO_SIZE 0x00010000/* 64k */ /* controller 1, Slot 1, tgtid 1, Base address a000 */ -#define CONFIG_SYS_PCIE1_MEM_BASE 0x90000000 -#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BASE +#define CONFIG_SYS_PCIE1_MEM_BUS 0x90000000 +#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS#define CONFIG_SYS_PCIE1_MEM_SIZE 0x08000000/* 128M */ #define CONFIG_SYS_PCIE1_IO_BASE 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xffc10000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000/* 64k */ /* controller 2, Slot 2, tgtid 2, Base address 9000 */ -#define CONFIG_SYS_PCIE2_MEM_BASE 0x98000000 -#define CONFIG_SYS_PCIE2_MEM_PHYS CONFIG_SYS_PCIE2_MEM_BASE +#define CONFIG_SYS_PCIE2_MEM_BUS 0x98000000 +#define CONFIG_SYS_PCIE2_MEM_PHYS CONFIG_SYS_PCIE2_MEM_BUS#define CONFIG_SYS_PCIE2_MEM_SIZE 0x08000000/* 128M */ #define CONFIG_SYS_PCIE2_IO_BASE 0x00000000#define CONFIG_SYS_PCIE2_IO_PHYS 0xffc20000#define CONFIG_SYS_PCIE2_IO_SIZE 0x00010000/* 64k */ /* controller 3, direct to uli, tgtid 3, Base address 8000 */ -#define CONFIG_SYS_PCIE3_MEM_BASE 0xa0000000 -#define CONFIG_SYS_PCIE3_MEM_PHYS CONFIG_SYS_PCIE3_MEM_BASE +#define CONFIG_SYS_PCIE3_MEM_BUS 0xa0000000 +#define CONFIG_SYS_PCIE3_MEM_PHYS CONFIG_SYS_PCIE3_MEM_BUS#define CONFIG_SYS_PCIE3_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCIE3_IO_BASE 0x00000000#define CONFIG_SYS_PCIE3_IO_PHYS 0xffc30000
include/configs/MPC8540ADS.h +4 -4
@@ -310,16 +310,16 @@#define CONFIG_SYS_I2C_OFFSET 0x3000/* RapidIO MMU */ -#define CONFIG_SYS_RIO_MEM_BASE 0xc0000000/* base address */ -#define CONFIG_SYS_RIO_MEM_PHYS CONFIG_SYS_RIO_MEM_BASE +#define CONFIG_SYS_RIO_MEM_BUS 0xc0000000/* base address */ +#define CONFIG_SYS_RIO_MEM_PHYS CONFIG_SYS_RIO_MEM_BUS#define CONFIG_SYS_RIO_MEM_SIZE 0x20000000/* 128M */ /* * General PCI * Memory space is mapped 1-1, but I/O space must start from 0. */ -#define CONFIG_SYS_PCI1_MEM_BASE 0x80000000 -#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BASE +#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000 +#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI1_IO_BASE 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000
include/configs/MPC8541CDS.h +4 -4
@@ -343,15 +343,15 @@ extern unsigned long get_clock_freq(void);* General PCI * Memory space is mapped 1-1, but I/O space must start from 0. */ -#define CONFIG_SYS_PCI1_MEM_BASE 0x80000000 -#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BASE +#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000 +#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI1_IO_BASE 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x100000/* 1M */ -#define CONFIG_SYS_PCI2_MEM_BASE 0xa0000000 -#define CONFIG_SYS_PCI2_MEM_PHYS CONFIG_SYS_PCI2_MEM_BASE +#define CONFIG_SYS_PCI2_MEM_BUS 0xa0000000 +#define CONFIG_SYS_PCI2_MEM_PHYS CONFIG_SYS_PCI2_MEM_BUS#define CONFIG_SYS_PCI2_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI2_IO_BASE 0x00000000#define CONFIG_SYS_PCI2_IO_PHYS 0xe2100000
include/configs/MPC8544DS.h +10 -10
@@ -269,38 +269,38 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_SYS_PCIE_PHYS 0x80000000/* 1G PCIE TLB */ #define CONFIG_SYS_PCI_PHYS 0xc0000000/* 512M PCI TLB */ -#define CONFIG_SYS_PCI1_MEM_BASE 0xc0000000 -#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BASE +#define CONFIG_SYS_PCI1_MEM_BUS 0xc0000000 +#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI1_IO_BASE 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe1000000#define CONFIG_SYS_PCI1_IO_SIZE 0x00010000/* 64k */ /* controller 2, Slot 1, tgtid 1, Base address 9000 */ -#define CONFIG_SYS_PCIE2_MEM_BASE 0x80000000 -#define CONFIG_SYS_PCIE2_MEM_PHYS CONFIG_SYS_PCIE2_MEM_BASE +#define CONFIG_SYS_PCIE2_MEM_BUS 0x80000000 +#define CONFIG_SYS_PCIE2_MEM_PHYS CONFIG_SYS_PCIE2_MEM_BUS#define CONFIG_SYS_PCIE2_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCIE2_IO_BASE 0x00000000#define CONFIG_SYS_PCIE2_IO_PHYS 0xe1010000#define CONFIG_SYS_PCIE2_IO_SIZE 0x00010000/* 64k */ /* controller 1, Slot 2,tgtid 2, Base address a000 */ -#define CONFIG_SYS_PCIE1_MEM_BASE 0xa0000000 -#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BASE +#define CONFIG_SYS_PCIE1_MEM_BUS 0xa0000000 +#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS#define CONFIG_SYS_PCIE1_MEM_SIZE 0x10000000/* 256M */ #define CONFIG_SYS_PCIE1_IO_BASE 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xe1020000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000/* 64k */ /* controller 3, direct to uli, tgtid 3, Base address b000 */ -#define CONFIG_SYS_PCIE3_MEM_BASE 0xb0000000 -#define CONFIG_SYS_PCIE3_MEM_PHYS CONFIG_SYS_PCIE3_MEM_BASE +#define CONFIG_SYS_PCIE3_MEM_BUS 0xb0000000 +#define CONFIG_SYS_PCIE3_MEM_PHYS CONFIG_SYS_PCIE3_MEM_BUS#define CONFIG_SYS_PCIE3_MEM_SIZE 0x00100000/* 1M */ #define CONFIG_SYS_PCIE3_IO_BASE 0x00000000#define CONFIG_SYS_PCIE3_IO_PHYS 0xb0100000/* reuse mem LAW */ #define CONFIG_SYS_PCIE3_IO_SIZE 0x00100000/* 1M */ -#define CONFIG_SYS_PCIE3_MEM_BASE2 0xb0200000 -#define CONFIG_SYS_PCIE3_MEM_PHYS2 CONFIG_SYS_PCIE3_MEM_BASE2 +#define CONFIG_SYS_PCIE3_MEM_BUS2 0xb0200000 +#define CONFIG_SYS_PCIE3_MEM_PHYS2 CONFIG_SYS_PCIE3_MEM_BUS2#define CONFIG_SYS_PCIE3_MEM_SIZE2 0x00200000/* 1M */ #if defined(CONFIG_PCI )
include/configs/MPC8548CDS.h +7 -7
@@ -369,16 +369,16 @@ extern unsigned long get_clock_freq(void);*/ #define CONFIG_SYS_PCI_PHYS 0x80000000/* 1G PCI TLB */ -#define CONFIG_SYS_PCI1_MEM_BASE 0x80000000 -#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BASE +#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000 +#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI1_IO_BASE 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x00100000/* 1M */ #ifdef CONFIG_PCI2 -#define CONFIG_SYS_PCI2_MEM_BASE 0xa0000000 -#define CONFIG_SYS_PCI2_MEM_PHYS CONFIG_SYS_PCI2_MEM_BASE +#define CONFIG_SYS_PCI2_MEM_BUS 0xa0000000 +#define CONFIG_SYS_PCI2_MEM_PHYS CONFIG_SYS_PCI2_MEM_BUS#define CONFIG_SYS_PCI2_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI2_IO_BASE 0x00000000#define CONFIG_SYS_PCI2_IO_PHYS 0xe2800000
@@ -386,8 +386,8 @@ extern unsigned long get_clock_freq(void);#endif #ifdef CONFIG_PCIE1 -#define CONFIG_SYS_PCIE1_MEM_BASE 0xa0000000 -#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BASE +#define CONFIG_SYS_PCIE1_MEM_BUS 0xa0000000 +#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS#define CONFIG_SYS_PCIE1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCIE1_IO_BASE 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xe3000000
@@ -398,7 +398,7 @@ extern unsigned long get_clock_freq(void);/* * RapidIO MMU */ -#define CONFIG_SYS_RIO_MEM_BASE 0xC0000000 +#define CONFIG_SYS_RIO_MEM_BUS 0xC0000000#define CONFIG_SYS_RIO_MEM_SIZE 0x20000000/* 512M */ #endif
include/configs/MPC8555CDS.h +4 -4
@@ -341,15 +341,15 @@ extern unsigned long get_clock_freq(void);* General PCI * Addresses are mapped 1-1. */ -#define CONFIG_SYS_PCI1_MEM_BASE 0x80000000 -#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BASE +#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000 +#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI1_IO_BASE 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x00100000/* 1M */ -#define CONFIG_SYS_PCI2_MEM_BASE 0xa0000000 -#define CONFIG_SYS_PCI2_MEM_PHYS CONFIG_SYS_PCI2_MEM_BASE +#define CONFIG_SYS_PCI2_MEM_BUS 0xa0000000 +#define CONFIG_SYS_PCI2_MEM_PHYS CONFIG_SYS_PCI2_MEM_BUS#define CONFIG_SYS_PCI2_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI2_IO_BASE 0x00000000#define CONFIG_SYS_PCI2_IO_PHYS 0xe2100000
include/configs/MPC8560ADS.h +4 -4
@@ -302,16 +302,16 @@#define CONFIG_SYS_I2C_OFFSET 0x3000/* RapidIO MMU */ -#define CONFIG_SYS_RIO_MEM_BASE 0xc0000000/* base address */ -#define CONFIG_SYS_RIO_MEM_PHYS CONFIG_SYS_RIO_MEM_BASE +#define CONFIG_SYS_RIO_MEM_BUS 0xc0000000/* base address */ +#define CONFIG_SYS_RIO_MEM_PHYS CONFIG_SYS_RIO_MEM_BUS#define CONFIG_SYS_RIO_MEM_SIZE 0x20000000/* 128M */ /* * General PCI * Memory space is mapped 1-1, but I/O space must start from 0. */ -#define CONFIG_SYS_PCI1_MEM_BASE 0x80000000 -#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BASE +#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000 +#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI1_IO_BASE 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000
include/configs/MPC8568MDS.h +5 -5
@@ -324,21 +324,21 @@ extern unsigned long get_clock_freq(void);* General PCI * Memory Addresses are mapped 1-1. I/O is mapped from 0 */ -#define CONFIG_SYS_PCI1_MEM_BASE 0x80000000 -#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BASE +#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000 +#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI1_IO_BASE 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x00800000/* 8M */ -#define CONFIG_SYS_PCIE1_MEM_BASE 0xa0000000 -#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BASE +#define CONFIG_SYS_PCIE1_MEM_BUS 0xa0000000 +#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS#define CONFIG_SYS_PCIE1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCIE1_IO_BASE 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xe2800000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00800000/* 8M */ -#define CONFIG_SYS_SRIO_MEM_BASE 0xc0000000 +#define CONFIG_SYS_SRIO_MEM_BUS 0xc0000000#ifdef CONFIG_QE /*
include/configs/MPC8572DS.h +6 -6
@@ -382,24 +382,24 @@ 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_BASE 0x80000000 -#define CONFIG_SYS_PCIE3_MEM_PHYS CONFIG_SYS_PCIE3_MEM_BASE +#define CONFIG_SYS_PCIE3_MEM_BUS 0x80000000 +#define CONFIG_SYS_PCIE3_MEM_PHYS CONFIG_SYS_PCIE3_MEM_BUS#define CONFIG_SYS_PCIE3_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCIE3_IO_BASE 0x00000000#define CONFIG_SYS_PCIE3_IO_PHYS 0xffc00000#define CONFIG_SYS_PCIE3_IO_SIZE 0x00010000/* 64k */ /* controller 2, Slot 2, tgtid 2, Base address 9000 */ -#define CONFIG_SYS_PCIE2_MEM_BASE 0xa0000000 -#define CONFIG_SYS_PCIE2_MEM_PHYS CONFIG_SYS_PCIE2_MEM_BASE +#define CONFIG_SYS_PCIE2_MEM_BUS 0xa0000000 +#define CONFIG_SYS_PCIE2_MEM_PHYS CONFIG_SYS_PCIE2_MEM_BUS#define CONFIG_SYS_PCIE2_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCIE2_IO_BASE 0x00000000#define CONFIG_SYS_PCIE2_IO_PHYS 0xffc10000#define CONFIG_SYS_PCIE2_IO_SIZE 0x00010000/* 64k */ /* controller 1, Slot 1, tgtid 1, Base address a000 */ -#define CONFIG_SYS_PCIE1_MEM_BASE 0xc0000000 -#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BASE +#define CONFIG_SYS_PCIE1_MEM_BUS 0xc0000000 +#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS#define CONFIG_SYS_PCIE1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCIE1_IO_BASE 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xffc20000
Signature · 1 line
1.5.6.5
PATCH 2/5 85xx: Convert CONFIG_SYS_PCI*_IO_BASE to _IO_BUS for FSL boards
Use CONFIG_SYS_PCI*_IO_BUS for the bus relative address instead of _IO_BASE so we are more explicit.
--- board/freescale/mpc8536ds/mpc8536ds.c | 8 ++++---- board/freescale/mpc8544ds/mpc8544ds.c | 8 ++++---- board/freescale/mpc8548cds/mpc8548cds.c | 4 ++-- board/freescale/mpc8568mds/mpc8568mds.c | 4 ++-- board/freescale/mpc8572ds/mpc8572ds.c | 6 +++--- cpu/mpc85xx/pci.c | 16 ++++++++++++---- include/configs/MPC8536DS.h | 12 ++++++------ include/configs/MPC8540ADS.h | 2 +- include/configs/MPC8541CDS.h | 4 ++-- include/configs/MPC8544DS.h | 12 ++++++------ include/configs/MPC8548CDS.h | 6 +++--- include/configs/MPC8555CDS.h | 4 ++-- include/configs/MPC8560ADS.h | 2 +- include/configs/MPC8568MDS.h | 4 ++-- include/configs/MPC8572DS.h | 10 +++++----- 15 files changed, 55 insertions(+), 47 deletions(-)
board/freescale/mpc8536ds/mpc8536ds.c +4 -4
@@ -211,7 +211,7 @@ pci_init_board(void)/* outbound io */ pci_set_region (r++, -CONFIG_SYS_PCIE3_IO_BASE , +CONFIG_SYS_PCIE3_IO_BUS ,CONFIG_SYS_PCIE3_IO_PHYS ,CONFIG_SYS_PCIE3_IO_SIZE ,PCI_REGION_IO );
@@ -266,7 +266,7 @@ pci_init_board(void)/* outbound io */ pci_set_region (r++, -CONFIG_SYS_PCIE1_IO_BASE , +CONFIG_SYS_PCIE1_IO_BUS ,CONFIG_SYS_PCIE1_IO_PHYS ,CONFIG_SYS_PCIE1_IO_SIZE ,PCI_REGION_IO );
@@ -329,7 +329,7 @@ pci_init_board(void)/* outbound io */ pci_set_region (r++, -CONFIG_SYS_PCIE2_IO_BASE , +CONFIG_SYS_PCIE2_IO_BUS ,CONFIG_SYS_PCIE2_IO_PHYS ,CONFIG_SYS_PCIE2_IO_SIZE ,PCI_REGION_IO );
@@ -397,7 +397,7 @@ pci_init_board(void)/* outbound io */ pci_set_region (r++, -CONFIG_SYS_PCI1_IO_BASE , +CONFIG_SYS_PCI1_IO_BUS ,CONFIG_SYS_PCI1_IO_PHYS ,CONFIG_SYS_PCI1_IO_SIZE ,PCI_REGION_IO );
board/freescale/mpc8544ds/mpc8544ds.c +4 -4
@@ -156,7 +156,7 @@ pci_init_board(void)/* outbound io */ pci_set_region (r++, -CONFIG_SYS_PCIE3_IO_BASE , +CONFIG_SYS_PCIE3_IO_BUS ,CONFIG_SYS_PCIE3_IO_PHYS ,CONFIG_SYS_PCIE3_IO_SIZE ,PCI_REGION_IO );
@@ -223,7 +223,7 @@ pci_init_board(void)/* outbound io */ pci_set_region (r++, -CONFIG_SYS_PCIE1_IO_BASE , +CONFIG_SYS_PCIE1_IO_BUS ,CONFIG_SYS_PCIE1_IO_PHYS ,CONFIG_SYS_PCIE1_IO_SIZE ,PCI_REGION_IO );
@@ -286,7 +286,7 @@ pci_init_board(void)/* outbound io */ pci_set_region (r++, -CONFIG_SYS_PCIE2_IO_BASE , +CONFIG_SYS_PCIE2_IO_BUS ,CONFIG_SYS_PCIE2_IO_PHYS ,CONFIG_SYS_PCIE2_IO_SIZE ,PCI_REGION_IO );
@@ -354,7 +354,7 @@ pci_init_board(void)/* outbound io */ pci_set_region (r++, -CONFIG_SYS_PCI1_IO_BASE , +CONFIG_SYS_PCI1_IO_BUS ,CONFIG_SYS_PCI1_IO_PHYS ,CONFIG_SYS_PCI1_IO_SIZE ,PCI_REGION_IO );
board/freescale/mpc8548cds/mpc8548cds.c +2 -2
@@ -336,7 +336,7 @@ pci_init_board(void)/* outbound io */ pci_set_region (r++, -CONFIG_SYS_PCI1_IO_BASE , +CONFIG_SYS_PCI1_IO_BUS ,CONFIG_SYS_PCI1_IO_PHYS ,CONFIG_SYS_PCI1_IO_SIZE ,PCI_REGION_IO );
@@ -420,7 +420,7 @@ pci_init_board(void)/* outbound io */ pci_set_region (r++, -CONFIG_SYS_PCIE1_IO_BASE , +CONFIG_SYS_PCIE1_IO_BUS ,CONFIG_SYS_PCIE1_IO_PHYS ,CONFIG_SYS_PCIE1_IO_SIZE ,PCI_REGION_IO );
board/freescale/mpc8568mds/mpc8568mds.c +2 -2
@@ -416,7 +416,7 @@ pci_init_board(void)/* outbound io */ pci_set_region (r++, -CONFIG_SYS_PCI1_IO_BASE , +CONFIG_SYS_PCI1_IO_BUS ,CONFIG_SYS_PCI1_IO_PHYS ,CONFIG_SYS_PCI1_IO_SIZE ,PCI_REGION_IO );
@@ -469,7 +469,7 @@ pci_init_board(void)/* outbound io */ pci_set_region (r++, -CONFIG_SYS_PCIE1_IO_BASE , +CONFIG_SYS_PCIE1_IO_BUS ,CONFIG_SYS_PCIE1_IO_PHYS ,CONFIG_SYS_PCIE1_IO_SIZE ,PCI_REGION_IO );
board/freescale/mpc8572ds/mpc8572ds.c +3 -3
@@ -204,7 +204,7 @@ void pci_init_board(void)/* outbound io */ pci_set_region (r++, -CONFIG_SYS_PCIE3_IO_BASE , +CONFIG_SYS_PCIE3_IO_BUS ,CONFIG_SYS_PCIE3_IO_PHYS ,CONFIG_SYS_PCIE3_IO_SIZE ,PCI_REGION_IO );
@@ -271,7 +271,7 @@ void pci_init_board(void)/* outbound io */ pci_set_region (r++, -CONFIG_SYS_PCIE2_IO_BASE , +CONFIG_SYS_PCIE2_IO_BUS ,CONFIG_SYS_PCIE2_IO_PHYS ,CONFIG_SYS_PCIE2_IO_SIZE ,PCI_REGION_IO );
@@ -324,7 +324,7 @@ void pci_init_board(void)/* outbound io */ pci_set_region (r++, -CONFIG_SYS_PCIE1_IO_BASE , +CONFIG_SYS_PCIE1_IO_BUS ,CONFIG_SYS_PCIE1_IO_PHYS ,CONFIG_SYS_PCIE1_IO_SIZE ,PCI_REGION_IO );
cpu/mpc85xx/pci.c +12 -4
@@ -35,10 +35,18 @@#define CONFIG_SYS_PCI1_MEM_BUS CONFIG_SYS_PCI1_MEM_BASE#endif +#ifndef CONFIG_SYS_PCI1_IO_BUS +#define CONFIG_SYS_PCI1_IO_BUS CONFIG_SYS_PCI1_IO_BASE +#endif +#ifndef CONFIG_SYS_PCI2_MEM_BUS #define CONFIG_SYS_PCI2_MEM_BUS CONFIG_SYS_PCI2_MEM_BASE#endif +#ifndef CONFIG_SYS_PCI2_IO_BUS +#define CONFIG_SYS_PCI2_IO_BUS CONFIG_SYS_PCI2_IO_BASE +#endif +static struct pci_controller *pci_hose;void
@@ -95,7 +103,7 @@ pci_mpc85xx_init(struct pci_controller *board_hose) pcix->powar1 = (POWAR_EN |POWAR_MEM_READ |POWAR_MEM_WRITE | (__ilog2 (CONFIG_SYS_PCI1_MEM_SIZE ) -1 )); - pcix->potar2 = (CONFIG_SYS_PCI1_IO_BASE >>12 ) &0x000fffff ; + pcix->potar2 = (CONFIG_SYS_PCI1_IO_BUS >>12 ) &0x000fffff ; pcix->potear2 =0x00000000 ; pcix->powbar2 = (CONFIG_SYS_PCI1_IO_PHYS >>12 ) &0x000fffff ; pcix->powbear2 =0x00000000 ;
@@ -119,7 +127,7 @@ pci_mpc85xx_init(struct pci_controller *board_hose) PCI_REGION_MEM);pci_set_region (hose->regions +1 , -CONFIG_SYS_PCI1_IO_BASE , +CONFIG_SYS_PCI1_IO_BUS ,CONFIG_SYS_PCI1_IO_PHYS ,CONFIG_SYS_PCI1_IO_SIZE ,PCI_REGION_IO );
@@ -180,7 +188,7 @@ pci_mpc85xx_init(struct pci_controller *board_hose) pcix2->powar1 = (POWAR_EN |POWAR_MEM_READ |POWAR_MEM_WRITE | (__ilog2 (CONFIG_SYS_PCI2_MEM_SIZE ) -1 )); - pcix2->potar2 = (CONFIG_SYS_PCI2_IO_BASE >>12 ) &0x000fffff ; + pcix2->potar2 = (CONFIG_SYS_PCI2_IO_BUS >>12 ) &0x000fffff ; pcix2->potear2 =0x00000000 ; pcix2->powbar2 = (CONFIG_SYS_PCI2_IO_PHYS >>12 ) &0x000fffff ; pcix2->powbear2 =0x00000000 ;
@@ -204,7 +212,7 @@ pci_mpc85xx_init(struct pci_controller *board_hose) PCI_REGION_MEM);pci_set_region (hose->regions +1 , -CONFIG_SYS_PCI2_IO_BASE , +CONFIG_SYS_PCI2_IO_BUS ,CONFIG_SYS_PCI2_IO_PHYS ,CONFIG_SYS_PCI2_IO_SIZE ,PCI_REGION_IO );
include/configs/MPC8536DS.h +6 -6
@@ -364,7 +364,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x10000000/* 256M */ -#define CONFIG_SYS_PCI1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xffc00000#define CONFIG_SYS_PCI1_IO_SIZE 0x00010000/* 64k */
@@ -372,7 +372,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_PCIE1_MEM_BUS 0x90000000#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS#define CONFIG_SYS_PCIE1_MEM_SIZE 0x08000000/* 128M */ -#define CONFIG_SYS_PCIE1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xffc10000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000/* 64k */
@@ -380,7 +380,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_PCIE2_MEM_BUS 0x98000000#define CONFIG_SYS_PCIE2_MEM_PHYS CONFIG_SYS_PCIE2_MEM_BUS#define CONFIG_SYS_PCIE2_MEM_SIZE 0x08000000/* 128M */ -#define CONFIG_SYS_PCIE2_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE2_IO_BUS 0x00000000#define CONFIG_SYS_PCIE2_IO_PHYS 0xffc20000#define CONFIG_SYS_PCIE2_IO_SIZE 0x00010000/* 64k */
@@ -388,7 +388,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_PCIE3_MEM_BUS 0xa0000000#define CONFIG_SYS_PCIE3_MEM_PHYS CONFIG_SYS_PCIE3_MEM_BUS#define CONFIG_SYS_PCIE3_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCIE3_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE3_IO_BUS 0x00000000#define CONFIG_SYS_PCIE3_IO_PHYS 0xffc30000#define CONFIG_SYS_PCIE3_IO_SIZE 0x00010000/* 64k */
@@ -428,8 +428,8 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#endif #ifndef CONFIG_PCI_PNP -#define PCI_ENET0_IOADDR CONFIG_SYS_PCI1_IO_BASE -#define PCI_ENET0_MEMADDR CONFIG_SYS_PCI1_IO_BASE +#define PCI_ENET0_IOADDR CONFIG_SYS_PCI1_IO_BUS +#define PCI_ENET0_MEMADDR CONFIG_SYS_PCI1_IO_BUS#define PCI_IDSEL_NUMBER 0x11/* IDSEL = AD11 */ #endif
include/configs/MPC8540ADS.h +1 -1
@@ -321,7 +321,7 @@#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCI1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x100000/* 1M */
include/configs/MPC8541CDS.h +2 -2
@@ -346,14 +346,14 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCI1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x100000/* 1M */ #define CONFIG_SYS_PCI2_MEM_BUS 0xa0000000#define CONFIG_SYS_PCI2_MEM_PHYS CONFIG_SYS_PCI2_MEM_BUS#define CONFIG_SYS_PCI2_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCI2_IO_BASE 0x00000000 +#define CONFIG_SYS_PCI2_IO_BUS 0x00000000#define CONFIG_SYS_PCI2_IO_PHYS 0xe2100000#define CONFIG_SYS_PCI2_IO_SIZE 0x100000/* 1M */
include/configs/MPC8544DS.h +6 -6
@@ -272,7 +272,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_SYS_PCI1_MEM_BUS 0xc0000000#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCI1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe1000000#define CONFIG_SYS_PCI1_IO_SIZE 0x00010000/* 64k */
@@ -280,7 +280,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_SYS_PCIE2_MEM_BUS 0x80000000#define CONFIG_SYS_PCIE2_MEM_PHYS CONFIG_SYS_PCIE2_MEM_BUS#define CONFIG_SYS_PCIE2_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCIE2_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE2_IO_BUS 0x00000000#define CONFIG_SYS_PCIE2_IO_PHYS 0xe1010000#define CONFIG_SYS_PCIE2_IO_SIZE 0x00010000/* 64k */
@@ -288,7 +288,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_SYS_PCIE1_MEM_BUS 0xa0000000#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS#define CONFIG_SYS_PCIE1_MEM_SIZE 0x10000000/* 256M */ -#define CONFIG_SYS_PCIE1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xe1020000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000/* 64k */
@@ -296,7 +296,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_SYS_PCIE3_MEM_BUS 0xb0000000#define CONFIG_SYS_PCIE3_MEM_PHYS CONFIG_SYS_PCIE3_MEM_BUS#define CONFIG_SYS_PCIE3_MEM_SIZE 0x00100000/* 1M */ -#define CONFIG_SYS_PCIE3_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE3_IO_BUS 0x00000000#define CONFIG_SYS_PCIE3_IO_PHYS 0xb0100000/* reuse mem LAW */ #define CONFIG_SYS_PCIE3_IO_SIZE 0x00100000/* 1M */ #define CONFIG_SYS_PCIE3_MEM_BUS2 0xb0200000
@@ -339,8 +339,8 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#endif #ifndef CONFIG_PCI_PNP -#define PCI_ENET0_IOADDR CONFIG_SYS_PCI1_IO_BASE -#define PCI_ENET0_MEMADDR CONFIG_SYS_PCI1_IO_BASE +#define PCI_ENET0_IOADDR CONFIG_SYS_PCI1_IO_BUS +#define PCI_ENET0_MEMADDR CONFIG_SYS_PCI1_IO_BUS#define PCI_IDSEL_NUMBER 0x11/* IDSEL = AD11 */ #endif
include/configs/MPC8548CDS.h +3 -3
@@ -372,7 +372,7 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCI1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x00100000/* 1M */
@@ -380,7 +380,7 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_PCI2_MEM_BUS 0xa0000000#define CONFIG_SYS_PCI2_MEM_PHYS CONFIG_SYS_PCI2_MEM_BUS#define CONFIG_SYS_PCI2_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCI2_IO_BASE 0x00000000 +#define CONFIG_SYS_PCI2_IO_BUS 0x00000000#define CONFIG_SYS_PCI2_IO_PHYS 0xe2800000#define CONFIG_SYS_PCI2_IO_SIZE 0x00100000/* 1M */ #endif
@@ -389,7 +389,7 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_PCIE1_MEM_BUS 0xa0000000#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS#define CONFIG_SYS_PCIE1_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCIE1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xe3000000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00100000/* 1M */ #endif
include/configs/MPC8555CDS.h +2 -2
@@ -344,14 +344,14 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCI1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x00100000/* 1M */ #define CONFIG_SYS_PCI2_MEM_BUS 0xa0000000#define CONFIG_SYS_PCI2_MEM_PHYS CONFIG_SYS_PCI2_MEM_BUS#define CONFIG_SYS_PCI2_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCI2_IO_BASE 0x00000000 +#define CONFIG_SYS_PCI2_IO_BUS 0x00000000#define CONFIG_SYS_PCI2_IO_PHYS 0xe2100000#define CONFIG_SYS_PCI2_IO_SIZE 0x00100000/* 1M */
include/configs/MPC8560ADS.h +1 -1
@@ -313,7 +313,7 @@#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCI1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x100000/* 1M */
include/configs/MPC8568MDS.h +2 -2
@@ -327,14 +327,14 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCI1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x00800000/* 8M */ #define CONFIG_SYS_PCIE1_MEM_BUS 0xa0000000#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS#define CONFIG_SYS_PCIE1_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCIE1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xe2800000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00800000/* 8M */
include/configs/MPC8572DS.h +5 -5
@@ -385,7 +385,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_PCIE3_MEM_BUS 0x80000000#define CONFIG_SYS_PCIE3_MEM_PHYS CONFIG_SYS_PCIE3_MEM_BUS#define CONFIG_SYS_PCIE3_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCIE3_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE3_IO_BUS 0x00000000#define CONFIG_SYS_PCIE3_IO_PHYS 0xffc00000#define CONFIG_SYS_PCIE3_IO_SIZE 0x00010000/* 64k */
@@ -393,7 +393,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_PCIE2_MEM_BUS 0xa0000000#define CONFIG_SYS_PCIE2_MEM_PHYS CONFIG_SYS_PCIE2_MEM_BUS#define CONFIG_SYS_PCIE2_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCIE2_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE2_IO_BUS 0x00000000#define CONFIG_SYS_PCIE2_IO_PHYS 0xffc10000#define CONFIG_SYS_PCIE2_IO_SIZE 0x00010000/* 64k */
@@ -401,7 +401,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_PCIE1_MEM_BUS 0xc0000000#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS#define CONFIG_SYS_PCIE1_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCIE1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xffc20000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000/* 64k */
@@ -438,8 +438,8 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#endif #ifndef CONFIG_PCI_PNP -#define PCI_ENET0_IOADDR CONFIG_SYS_PCIE3_IO_BASE -#define PCI_ENET0_MEMADDR CONFIG_SYS_PCIE3_IO_BASE +#define PCI_ENET0_IOADDR CONFIG_SYS_PCIE3_IO_BUS +#define PCI_ENET0_MEMADDR CONFIG_SYS_PCIE3_IO_BUS#define PCI_IDSEL_NUMBER 0x11/* IDSEL = AD11 */ #endif
Signature · 1 line
1.5.6.5
PATCH 3/5 85xx: Use CONFIG_SYS_{PCI*, RIO*}_MEM_PHYS for physical address on FSL boards
Use the _MEM_PHYS defines instead of _MEM_BUS for LAW and real address fields of TLBs. This is what we should have always been using from the start.
--- board/freescale/mpc8540ads/law.c | 2 +- board/freescale/mpc8540ads/tlb.c | 4 ++-- board/freescale/mpc8548cds/tlb.c | 4 ++-- board/freescale/mpc8560ads/law.c | 2 +- board/freescale/mpc8560ads/tlb.c | 4 ++-- board/freescale/mpc8568mds/law.c | 2 +- include/configs/MPC8568MDS.h | 1 + 7 files changed, 10 insertions(+), 9 deletions(-)
board/freescale/mpc8540ads/law.c +1 -1
@@ -52,7 +52,7 @@ struct law_entry law_table[] = {/* This is not so much the SDRAM map as it is the whole localbus map. */ SET_LAW (CONFIG_SYS_LBC_SDRAM_BASE ,LAW_SIZE_256M ,LAW_TRGT_IF_LBC ),SET_LAW (CONFIG_SYS_PCI1_IO_PHYS ,LAW_SIZE_1M ,LAW_TRGT_IF_PCI ), - SET_LAW(CONFIG_SYS_RIO_MEM_BUS, LAWAR_SIZE_512M, LAW_TRGT_IF_RIO), + SET_LAW(CONFIG_SYS_RIO_MEM_PHYS, LAWAR_SIZE_512M, LAW_TRGT_IF_RIO), };int num_law_entries =ARRAY_SIZE (law_table);
board/freescale/mpc8540ads/tlb.c +2 -2
@@ -70,7 +70,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 3: 256M Non-cacheable, guarded * 0xc0000000 256M Rapid IO MEM First half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS ,CONFIG_SYS_RIO_MEM_BUS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS ,CONFIG_SYS_RIO_MEM_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 3, BOOKE_PAGESZ_256M, 1),
@@ -78,7 +78,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 4: 256M Non-cacheable, guarded * 0xd0000000 256M Rapid IO MEM Second half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS +0x10000000 ,CONFIG_SYS_RIO_MEM_BUS +0x10000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS +0x10000000 ,CONFIG_SYS_RIO_MEM_PHYS +0x10000000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 4, BOOKE_PAGESZ_256M, 1),
board/freescale/mpc8548cds/tlb.c +2 -2
@@ -62,14 +62,14 @@ struct fsl_e_tlb_entry tlb_table[] = {/* * TLB 2: 256M Non-cacheable, guarded */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS ,CONFIG_SYS_RIO_MEM_BUS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS ,CONFIG_SYS_RIO_MEM_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G ,0 ,2 ,BOOKE_PAGESZ_256M ,1 ),/* * TLB 3: 256M Non-cacheable, guarded */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS +0x10000000 ,CONFIG_SYS_RIO_MEM_BUS +0x10000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS +0x10000000 ,CONFIG_SYS_RIO_MEM_PHYS +0x10000000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 3, BOOKE_PAGESZ_256M, 1), #endif
board/freescale/mpc8560ads/law.c +1 -1
@@ -52,7 +52,7 @@ struct law_entry law_table[] = {/* This is not so much the SDRAM map as it is the whole localbus map. */ SET_LAW (CONFIG_SYS_LBC_SDRAM_BASE ,LAW_SIZE_256M ,LAW_TRGT_IF_LBC ),SET_LAW (CONFIG_SYS_PCI1_IO_PHYS ,LAW_SIZE_1M ,LAW_TRGT_IF_PCI ), - SET_LAW(CONFIG_SYS_RIO_MEM_BUS, LAWAR_SIZE_512M, LAW_TRGT_IF_RIO), + SET_LAW(CONFIG_SYS_RIO_MEM_PHYS, LAWAR_SIZE_512M, LAW_TRGT_IF_RIO), };int num_law_entries =ARRAY_SIZE (law_table);
board/freescale/mpc8560ads/tlb.c +2 -2
@@ -70,7 +70,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 3: 256M Non-cacheable, guarded * 0xc0000000 256M Rapid IO MEM First half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS ,CONFIG_SYS_RIO_MEM_BUS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS ,CONFIG_SYS_RIO_MEM_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 3, BOOKE_PAGESZ_256M, 1),
@@ -78,7 +78,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 4: 256M Non-cacheable, guarded * 0xd0000000 256M Rapid IO MEM Second half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS +0x10000000 ,CONFIG_SYS_RIO_MEM_BUS +0x10000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS +0x10000000 ,CONFIG_SYS_RIO_MEM_PHYS +0x10000000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 4, BOOKE_PAGESZ_256M, 1),
board/freescale/mpc8568mds/law.c +1 -1
@@ -54,7 +54,7 @@ struct law_entry law_table[] = {SET_LAW (CONFIG_SYS_PCIE1_MEM_PHYS ,LAW_SIZE_512M ,LAW_TRGT_IF_PCIE_1 ),SET_LAW (CONFIG_SYS_PCI1_IO_PHYS ,LAW_SIZE_8M ,LAW_TRGT_IF_PCI ),SET_LAW (CONFIG_SYS_PCIE1_IO_PHYS ,LAW_SIZE_8M ,LAW_TRGT_IF_PCIE_1 ), -SET_LAW (CONFIG_SYS_SRIO_MEM_BUS ,LAW_SIZE_512M ,LAW_TRGT_IF_RIO ), +SET_LAW (CONFIG_SYS_SRIO_MEM_PHYS ,LAW_SIZE_512M ,LAW_TRGT_IF_RIO ),/* LBC window - maps 256M. That's SDRAM, BCSR, PIBs, and Flash */ SET_LAW(CONFIG_SYS_LBC_SDRAM_BASE, LAW_SIZE_256M, LAW_TRGT_IF_LBC), };
include/configs/MPC8568MDS.h +1 -0
@@ -339,6 +339,7 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_PCIE1_IO_SIZE 0x00800000/* 8M */ #define CONFIG_SYS_SRIO_MEM_BUS 0xc0000000 +#define CONFIG_SYS_SRIO_MEM_PHYS 0xc0000000#ifdef CONFIG_QE /*
Signature · 1 line
1.5.6.5
PATCH 4/5 85xx: Introduce CONFIG_SYS_PCI*_MEM_VIRT for FSL boards
Introduce a new define to seperate out the virtual address that PCI memory is at from the physical address. In most situations these are mapped 1:1. However any code accessing the bus should use VIRT.
--- board/freescale/mpc8536ds/tlb.c | 2 +- board/freescale/mpc8540ads/tlb.c | 8 ++++---- board/freescale/mpc8541cds/tlb.c | 8 ++++---- board/freescale/mpc8544ds/tlb.c | 6 +++--- board/freescale/mpc8548cds/tlb.c | 6 +++--- board/freescale/mpc8555cds/tlb.c | 8 ++++---- board/freescale/mpc8560ads/tlb.c | 8 ++++---- board/freescale/mpc8568mds/tlb.c | 2 +- board/freescale/mpc8572ds/mpc8572ds.c | 2 +- board/freescale/mpc8572ds/tlb.c | 6 +++--- include/configs/MPC8536DS.h | 14 +++++++++----- include/configs/MPC8540ADS.h | 6 ++++-- include/configs/MPC8541CDS.h | 6 ++++-- include/configs/MPC8544DS.h | 17 ++++++++++++----- include/configs/MPC8548CDS.h | 11 ++++++++--- include/configs/MPC8555CDS.h | 6 ++++-- include/configs/MPC8560ADS.h | 6 ++++-- include/configs/MPC8568MDS.h | 7 +++++-- include/configs/MPC8572DS.h | 9 ++++++--- 19 files changed, 84 insertions(+), 54 deletions(-)
board/freescale/mpc8536ds/tlb.c +1 -1
@@ -58,7 +58,7 @@ struct fsl_e_tlb_entry tlb_table[] = { 0, 1, BOOKE_PAGESZ_256M, 1),/* *I*G* - PCI */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_PHYS ,CONFIG_SYS_PCI1_MEM_PHYS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_VIRT ,CONFIG_SYS_PCI1_MEM_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 2, BOOKE_PAGESZ_1G, 1),
board/freescale/mpc8540ads/tlb.c +4 -4
@@ -54,7 +54,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 1: 256M Non-cacheable, guarded * 0x80000000 256M PCI1 MEM First half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_PHYS ,CONFIG_SYS_PCI1_MEM_PHYS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_VIRT ,CONFIG_SYS_PCI1_MEM_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 1, BOOKE_PAGESZ_256M, 1),
@@ -62,7 +62,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 2: 256M Non-cacheable, guarded * 0x90000000 256M PCI1 MEM Second half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_PHYS +0x10000000 ,CONFIG_SYS_PCI1_MEM_PHYS +0x10000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_VIRT +0x10000000 ,CONFIG_SYS_PCI1_MEM_PHYS +0x10000000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 2, BOOKE_PAGESZ_256M, 1),
@@ -70,7 +70,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 3: 256M Non-cacheable, guarded * 0xc0000000 256M Rapid IO MEM First half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS ,CONFIG_SYS_RIO_MEM_PHYS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_VIRT ,CONFIG_SYS_RIO_MEM_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 3, BOOKE_PAGESZ_256M, 1),
@@ -78,7 +78,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 4: 256M Non-cacheable, guarded * 0xd0000000 256M Rapid IO MEM Second half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS +0x10000000 ,CONFIG_SYS_RIO_MEM_PHYS +0x10000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_VIRT +0x10000000 ,CONFIG_SYS_RIO_MEM_PHYS +0x10000000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 4, BOOKE_PAGESZ_256M, 1),
board/freescale/mpc8541cds/tlb.c +4 -4
@@ -54,7 +54,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 1: 256M Non-cacheable, guarded * 0x80000000 256M PCI1 MEM First half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_PHYS ,CONFIG_SYS_PCI1_MEM_PHYS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_VIRT ,CONFIG_SYS_PCI1_MEM_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 1, BOOKE_PAGESZ_256M, 1),
@@ -62,7 +62,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 2: 256M Non-cacheable, guarded * 0x90000000 256M PCI1 MEM Second half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_PHYS +0x10000000 ,CONFIG_SYS_PCI1_MEM_PHYS +0x10000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_VIRT +0x10000000 ,CONFIG_SYS_PCI1_MEM_PHYS +0x10000000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 2, BOOKE_PAGESZ_256M, 1),
@@ -70,7 +70,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 3: 256M Non-cacheable, guarded * 0xa0000000 256M PCI2 MEM First half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI2_MEM_PHYS ,CONFIG_SYS_PCI2_MEM_PHYS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI2_MEM_VIRT ,CONFIG_SYS_PCI2_MEM_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 3, BOOKE_PAGESZ_256M, 1),
@@ -78,7 +78,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 4: 256M Non-cacheable, guarded * 0xb0000000 256M PCI2 MEM Second half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI2_MEM_PHYS +0x10000000 ,CONFIG_SYS_PCI2_MEM_PHYS +0x10000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI2_MEM_VIRT +0x10000000 ,CONFIG_SYS_PCI2_MEM_PHYS +0x10000000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 4, BOOKE_PAGESZ_256M, 1),
board/freescale/mpc8544ds/tlb.c +3 -3
@@ -52,21 +52,21 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 1: 1G Non-cacheable, guarded * 0x80000000 1G PCIE 8,9,a,b */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCIE_PHYS ,CONFIG_SYS_PCIE_PHYS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCIE_VIRT ,CONFIG_SYS_PCIE_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G ,0 ,1 ,BOOKE_PAGESZ_1G ,1 ),/* * TLB 2: 256M Non-cacheable, guarded */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI_PHYS ,CONFIG_SYS_PCI_PHYS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI_VIRT ,CONFIG_SYS_PCI_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G ,0 ,2 ,BOOKE_PAGESZ_256M ,1 ),/* * TLB 3: 256M Non-cacheable, guarded */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI_PHYS +0x10000000 ,CONFIG_SYS_PCI_PHYS +0x10000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI_VIRT +0x10000000 ,CONFIG_SYS_PCI_PHYS +0x10000000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 3, BOOKE_PAGESZ_256M, 1),
board/freescale/mpc8548cds/tlb.c +3 -3
@@ -54,7 +54,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 1: 1G Non-cacheable, guarded * 0x80000000 1G PCI1/PCIE 8,9,a,b */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI_PHYS ,CONFIG_SYS_PCI_PHYS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI_VIRT ,CONFIG_SYS_PCI_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 1, BOOKE_PAGESZ_1G, 1),
@@ -62,14 +62,14 @@ struct fsl_e_tlb_entry tlb_table[] = {/* * TLB 2: 256M Non-cacheable, guarded */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS ,CONFIG_SYS_RIO_MEM_PHYS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_VIRT ,CONFIG_SYS_RIO_MEM_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G ,0 ,2 ,BOOKE_PAGESZ_256M ,1 ),/* * TLB 3: 256M Non-cacheable, guarded */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS +0x10000000 ,CONFIG_SYS_RIO_MEM_PHYS +0x10000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_VIRT +0x10000000 ,CONFIG_SYS_RIO_MEM_PHYS +0x10000000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 3, BOOKE_PAGESZ_256M, 1), #endif
board/freescale/mpc8555cds/tlb.c +4 -4
@@ -54,7 +54,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 1: 256M Non-cacheable, guarded * 0x80000000 256M PCI1 MEM First half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_PHYS ,CONFIG_SYS_PCI1_MEM_PHYS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_VIRT ,CONFIG_SYS_PCI1_MEM_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 1, BOOKE_PAGESZ_256M, 1),
@@ -62,7 +62,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 2: 256M Non-cacheable, guarded * 0x90000000 256M PCI1 MEM Second half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_PHYS +0x10000000 ,CONFIG_SYS_PCI1_MEM_PHYS +0x10000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_VIRT +0x10000000 ,CONFIG_SYS_PCI1_MEM_PHYS +0x10000000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 2, BOOKE_PAGESZ_256M, 1),
@@ -70,7 +70,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 3: 256M Non-cacheable, guarded * 0xa0000000 256M PCI2 MEM First half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI2_MEM_PHYS ,CONFIG_SYS_PCI2_MEM_PHYS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI2_MEM_VIRT ,CONFIG_SYS_PCI2_MEM_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 3, BOOKE_PAGESZ_256M, 1),
@@ -78,7 +78,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 4: 256M Non-cacheable, guarded * 0xb0000000 256M PCI2 MEM Second half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI2_MEM_PHYS +0x10000000 ,CONFIG_SYS_PCI2_MEM_PHYS +0x10000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI2_MEM_VIRT +0x10000000 ,CONFIG_SYS_PCI2_MEM_PHYS +0x10000000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 4, BOOKE_PAGESZ_256M, 1),
board/freescale/mpc8560ads/tlb.c +4 -4
@@ -54,7 +54,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 1: 256M Non-cacheable, guarded * 0x80000000 256M PCI1 MEM First half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_PHYS ,CONFIG_SYS_PCI1_MEM_PHYS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_VIRT ,CONFIG_SYS_PCI1_MEM_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 1, BOOKE_PAGESZ_256M, 1),
@@ -62,7 +62,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 2: 256M Non-cacheable, guarded * 0x90000000 256M PCI1 MEM Second half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_PHYS +0x10000000 ,CONFIG_SYS_PCI1_MEM_PHYS +0x10000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_VIRT +0x10000000 ,CONFIG_SYS_PCI1_MEM_PHYS +0x10000000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 2, BOOKE_PAGESZ_256M, 1),
@@ -70,7 +70,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 3: 256M Non-cacheable, guarded * 0xc0000000 256M Rapid IO MEM First half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS ,CONFIG_SYS_RIO_MEM_PHYS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_VIRT ,CONFIG_SYS_RIO_MEM_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 3, BOOKE_PAGESZ_256M, 1),
@@ -78,7 +78,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* TLB 4: 256M Non-cacheable, guarded * 0xd0000000 256M Rapid IO MEM Second half */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_BUS +0x10000000 ,CONFIG_SYS_RIO_MEM_PHYS +0x10000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_RIO_MEM_VIRT +0x10000000 ,CONFIG_SYS_RIO_MEM_PHYS +0x10000000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 4, BOOKE_PAGESZ_256M, 1),
board/freescale/mpc8568mds/tlb.c +1 -1
@@ -64,7 +64,7 @@ struct fsl_e_tlb_entry tlb_table[] = {* 0x80000000 512M PCI1 MEM * 0xa0000000 512M PCIe MEM */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_PHYS ,CONFIG_SYS_PCI1_MEM_PHYS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_MEM_VIRT ,CONFIG_SYS_PCI1_MEM_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 2, BOOKE_PAGESZ_1G, 1),
board/freescale/mpc8572ds/mpc8572ds.c +1 -1
@@ -227,7 +227,7 @@ 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_PHYS ) { +if (temp32 >=CONFIG_SYS_PCIE3_MEM_BUS ) {debug (" uli1572 read to %x\n" , temp32);in_be32 ((unsigned *)temp32); }
board/freescale/mpc8572ds/tlb.c +3 -3
@@ -63,16 +63,16 @@ struct fsl_e_tlb_entry tlb_table[] = { 0, 2, BOOKE_PAGESZ_256M, 1),/* *I*G* - PCI */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCIE3_MEM_PHYS ,CONFIG_SYS_PCIE3_MEM_PHYS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCIE3_MEM_VIRT ,CONFIG_SYS_PCIE3_MEM_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G ,0 ,3 ,BOOKE_PAGESZ_1G ,1 ),/* *I*G* - PCI */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCIE3_MEM_PHYS +0x40000000 ,CONFIG_SYS_PCIE3_MEM_PHYS +0x40000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCIE3_MEM_VIRT +0x40000000 ,CONFIG_SYS_PCIE3_MEM_PHYS +0x40000000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G ,0 ,4 ,BOOKE_PAGESZ_256M ,1 ), -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCIE3_MEM_PHYS +0x50000000 ,CONFIG_SYS_PCIE3_MEM_PHYS +0x50000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCIE3_MEM_VIRT +0x50000000 ,CONFIG_SYS_PCIE3_MEM_PHYS +0x50000000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 5, BOOKE_PAGESZ_256M, 1),
include/configs/MPC8536DS.h +9 -5
@@ -361,32 +361,36 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);* Memory space is mapped 1-1, but I/O space must start from 0. */ -#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000 -#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS +#define CONFIG_SYS_PCI1_MEM_VIRT 0x80000000 +#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000 +#define CONFIG_SYS_PCI1_MEM_PHYS 0x80000000#define CONFIG_SYS_PCI1_MEM_SIZE 0x10000000/* 256M */ #define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xffc00000#define CONFIG_SYS_PCI1_IO_SIZE 0x00010000/* 64k */ /* controller 1, Slot 1, tgtid 1, Base address a000 */ +#define CONFIG_SYS_PCIE1_MEM_VIRT 0x90000000#define CONFIG_SYS_PCIE1_MEM_BUS 0x90000000 -#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS +#define CONFIG_SYS_PCIE1_MEM_PHYS 0x90000000#define CONFIG_SYS_PCIE1_MEM_SIZE 0x08000000/* 128M */ #define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xffc10000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000/* 64k */ /* controller 2, Slot 2, tgtid 2, Base address 9000 */ +#define CONFIG_SYS_PCIE2_MEM_VIRT 0x98000000#define CONFIG_SYS_PCIE2_MEM_BUS 0x98000000 -#define CONFIG_SYS_PCIE2_MEM_PHYS CONFIG_SYS_PCIE2_MEM_BUS +#define CONFIG_SYS_PCIE2_MEM_PHYS 0x98000000#define CONFIG_SYS_PCIE2_MEM_SIZE 0x08000000/* 128M */ #define CONFIG_SYS_PCIE2_IO_BUS 0x00000000#define CONFIG_SYS_PCIE2_IO_PHYS 0xffc20000#define CONFIG_SYS_PCIE2_IO_SIZE 0x00010000/* 64k */ /* controller 3, direct to uli, tgtid 3, Base address 8000 */ +#define CONFIG_SYS_PCIE3_MEM_VIRT 0xa0000000#define CONFIG_SYS_PCIE3_MEM_BUS 0xa0000000 -#define CONFIG_SYS_PCIE3_MEM_PHYS CONFIG_SYS_PCIE3_MEM_BUS +#define CONFIG_SYS_PCIE3_MEM_PHYS 0xa0000000#define CONFIG_SYS_PCIE3_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCIE3_IO_BUS 0x00000000#define CONFIG_SYS_PCIE3_IO_PHYS 0xffc30000
include/configs/MPC8540ADS.h +4 -2
@@ -310,16 +310,18 @@#define CONFIG_SYS_I2C_OFFSET 0x3000/* RapidIO MMU */ +#define CONFIG_SYS_RIO_MEM_VIRT 0xc0000000/* base address */ #define CONFIG_SYS_RIO_MEM_BUS 0xc0000000/* base address */ -#define CONFIG_SYS_RIO_MEM_PHYS CONFIG_SYS_RIO_MEM_BUS +#define CONFIG_SYS_RIO_MEM_PHYS 0xc0000000#define CONFIG_SYS_RIO_MEM_SIZE 0x20000000/* 128M */ /* * General PCI * Memory space is mapped 1-1, but I/O space must start from 0. */ +#define CONFIG_SYS_PCI1_MEM_VIRT 0x80000000#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000 -#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS +#define CONFIG_SYS_PCI1_MEM_PHYS 0x80000000#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000
include/configs/MPC8541CDS.h +4 -2
@@ -343,15 +343,17 @@ extern unsigned long get_clock_freq(void);* General PCI * Memory space is mapped 1-1, but I/O space must start from 0. */ +#define CONFIG_SYS_PCI1_MEM_VIRT 0x80000000#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000 -#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS +#define CONFIG_SYS_PCI1_MEM_PHYS 0x80000000#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x100000/* 1M */ +#define CONFIG_SYS_PCI2_MEM_VIRT 0xa0000000#define CONFIG_SYS_PCI2_MEM_BUS 0xa0000000 -#define CONFIG_SYS_PCI2_MEM_PHYS CONFIG_SYS_PCI2_MEM_BUS +#define CONFIG_SYS_PCI2_MEM_PHYS 0xa0000000#define CONFIG_SYS_PCI2_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI2_IO_BUS 0x00000000#define CONFIG_SYS_PCI2_IO_PHYS 0xe2100000
include/configs/MPC8544DS.h +12 -5
@@ -266,41 +266,48 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);* General PCI * Memory space is mapped 1-1, but I/O space must start from 0. */ +#define CONFIG_SYS_PCIE_VIRT 0x80000000/* 1G PCIE TLB */ #define CONFIG_SYS_PCIE_PHYS 0x80000000/* 1G PCIE TLB */ +#define CONFIG_SYS_PCI_VIRT 0xc0000000/* 512M PCI TLB */ #define CONFIG_SYS_PCI_PHYS 0xc0000000/* 512M PCI TLB */ +#define CONFIG_SYS_PCI1_MEM_VIRT 0xc0000000#define CONFIG_SYS_PCI1_MEM_BUS 0xc0000000 -#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS +#define CONFIG_SYS_PCI1_MEM_PHYS 0xc0000000#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe1000000#define CONFIG_SYS_PCI1_IO_SIZE 0x00010000/* 64k */ /* controller 2, Slot 1, tgtid 1, Base address 9000 */ +#define CONFIG_SYS_PCIE2_MEM_VIRT 0x80000000#define CONFIG_SYS_PCIE2_MEM_BUS 0x80000000 -#define CONFIG_SYS_PCIE2_MEM_PHYS CONFIG_SYS_PCIE2_MEM_BUS +#define CONFIG_SYS_PCIE2_MEM_PHYS 0x80000000#define CONFIG_SYS_PCIE2_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCIE2_IO_BUS 0x00000000#define CONFIG_SYS_PCIE2_IO_PHYS 0xe1010000#define CONFIG_SYS_PCIE2_IO_SIZE 0x00010000/* 64k */ /* controller 1, Slot 2,tgtid 2, Base address a000 */ +#define CONFIG_SYS_PCIE1_MEM_VIRT 0xa0000000#define CONFIG_SYS_PCIE1_MEM_BUS 0xa0000000 -#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS +#define CONFIG_SYS_PCIE1_MEM_PHYS 0xa0000000#define CONFIG_SYS_PCIE1_MEM_SIZE 0x10000000/* 256M */ #define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xe1020000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000/* 64k */ /* controller 3, direct to uli, tgtid 3, Base address b000 */ +#define CONFIG_SYS_PCIE3_MEM_VIRT 0xb0000000#define CONFIG_SYS_PCIE3_MEM_BUS 0xb0000000 -#define CONFIG_SYS_PCIE3_MEM_PHYS CONFIG_SYS_PCIE3_MEM_BUS +#define CONFIG_SYS_PCIE3_MEM_PHYS 0xb0000000#define CONFIG_SYS_PCIE3_MEM_SIZE 0x00100000/* 1M */ #define CONFIG_SYS_PCIE3_IO_BUS 0x00000000#define CONFIG_SYS_PCIE3_IO_PHYS 0xb0100000/* reuse mem LAW */ #define CONFIG_SYS_PCIE3_IO_SIZE 0x00100000/* 1M */ +#define CONFIG_SYS_PCIE3_MEM_VIRT2 0xb0200000#define CONFIG_SYS_PCIE3_MEM_BUS2 0xb0200000 -#define CONFIG_SYS_PCIE3_MEM_PHYS2 CONFIG_SYS_PCIE3_MEM_BUS2 +#define CONFIG_SYS_PCIE3_MEM_PHYS2 0xb0200000#define CONFIG_SYS_PCIE3_MEM_SIZE2 0x00200000/* 1M */ #if defined(CONFIG_PCI )
include/configs/MPC8548CDS.h +8 -3
@@ -367,18 +367,21 @@ extern unsigned long get_clock_freq(void);* General PCI * Memory space is mapped 1-1, but I/O space must start from 0. */ +#define CONFIG_SYS_PCI_VIRT 0x80000000/* 1G PCI TLB */ #define CONFIG_SYS_PCI_PHYS 0x80000000/* 1G PCI TLB */ +#define CONFIG_SYS_PCI1_MEM_VIRT 0x80000000#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000 -#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS +#define CONFIG_SYS_PCI1_MEM_PHYS 0x80000000#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x00100000/* 1M */ #ifdef CONFIG_PCI2 +#define CONFIG_SYS_PCI2_MEM_VIRT 0xa0000000#define CONFIG_SYS_PCI2_MEM_BUS 0xa0000000 -#define CONFIG_SYS_PCI2_MEM_PHYS CONFIG_SYS_PCI2_MEM_BUS +#define CONFIG_SYS_PCI2_MEM_PHYS 0xa0000000#define CONFIG_SYS_PCI2_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI2_IO_BUS 0x00000000#define CONFIG_SYS_PCI2_IO_PHYS 0xe2800000
@@ -386,8 +389,9 @@ extern unsigned long get_clock_freq(void);#endif #ifdef CONFIG_PCIE1 +#define CONFIG_SYS_PCIE1_MEM_VIRT 0xa0000000#define CONFIG_SYS_PCIE1_MEM_BUS 0xa0000000 -#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS +#define CONFIG_SYS_PCIE1_MEM_PHYS 0xa0000000#define CONFIG_SYS_PCIE1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xe3000000
@@ -398,6 +402,7 @@ extern unsigned long get_clock_freq(void);/* * RapidIO MMU */ +#define CONFIG_SYS_RIO_MEM_VIRT 0xC0000000#define CONFIG_SYS_RIO_MEM_BUS 0xC0000000#define CONFIG_SYS_RIO_MEM_SIZE 0x20000000/* 512M */ #endif
include/configs/MPC8555CDS.h +4 -2
@@ -341,15 +341,17 @@ extern unsigned long get_clock_freq(void);* General PCI * Addresses are mapped 1-1. */ +#define CONFIG_SYS_PCI1_MEM_VIRT 0x80000000#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000 -#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS +#define CONFIG_SYS_PCI1_MEM_PHYS 0x80000000#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x00100000/* 1M */ +#define CONFIG_SYS_PCI2_MEM_VIRT 0xa0000000#define CONFIG_SYS_PCI2_MEM_BUS 0xa0000000 -#define CONFIG_SYS_PCI2_MEM_PHYS CONFIG_SYS_PCI2_MEM_BUS +#define CONFIG_SYS_PCI2_MEM_PHYS 0xa0000000#define CONFIG_SYS_PCI2_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI2_IO_BUS 0x00000000#define CONFIG_SYS_PCI2_IO_PHYS 0xe2100000
include/configs/MPC8560ADS.h +4 -2
@@ -302,16 +302,18 @@#define CONFIG_SYS_I2C_OFFSET 0x3000/* RapidIO MMU */ +#define CONFIG_SYS_RIO_MEM_VIRT 0xc0000000/* base address */ #define CONFIG_SYS_RIO_MEM_BUS 0xc0000000/* base address */ -#define CONFIG_SYS_RIO_MEM_PHYS CONFIG_SYS_RIO_MEM_BUS +#define CONFIG_SYS_RIO_MEM_PHYS 0xc0000000#define CONFIG_SYS_RIO_MEM_SIZE 0x20000000/* 128M */ /* * General PCI * Memory space is mapped 1-1, but I/O space must start from 0. */ +#define CONFIG_SYS_PCI1_MEM_VIRT 0x80000000#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000 -#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS +#define CONFIG_SYS_PCI1_MEM_PHYS 0x80000000#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000
include/configs/MPC8568MDS.h +5 -2
@@ -324,20 +324,23 @@ extern unsigned long get_clock_freq(void);* General PCI * Memory Addresses are mapped 1-1. I/O is mapped from 0 */ +#define CONFIG_SYS_PCI1_MEM_VIRT 0x80000000#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000 -#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS +#define CONFIG_SYS_PCI1_MEM_PHYS 0x80000000#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x00800000/* 8M */ +#define CONFIG_SYS_PCIE1_MEM_VIRT 0xa0000000#define CONFIG_SYS_PCIE1_MEM_BUS 0xa0000000 -#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS +#define CONFIG_SYS_PCIE1_MEM_PHYS 0xa0000000#define CONFIG_SYS_PCIE1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xe2800000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00800000/* 8M */ +#define CONFIG_SYS_SRIO_MEM_VIRT 0xc0000000#define CONFIG_SYS_SRIO_MEM_BUS 0xc0000000#define CONFIG_SYS_SRIO_MEM_PHYS 0xc0000000
include/configs/MPC8572DS.h +6 -3
@@ -382,24 +382,27 @@ 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 -#define CONFIG_SYS_PCIE3_MEM_PHYS CONFIG_SYS_PCIE3_MEM_BUS +#define CONFIG_SYS_PCIE3_MEM_PHYS 0x80000000#define CONFIG_SYS_PCIE3_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCIE3_IO_BUS 0x00000000#define CONFIG_SYS_PCIE3_IO_PHYS 0xffc00000#define CONFIG_SYS_PCIE3_IO_SIZE 0x00010000/* 64k */ /* controller 2, Slot 2, tgtid 2, Base address 9000 */ +#define CONFIG_SYS_PCIE2_MEM_VIRT 0xa0000000#define CONFIG_SYS_PCIE2_MEM_BUS 0xa0000000 -#define CONFIG_SYS_PCIE2_MEM_PHYS CONFIG_SYS_PCIE2_MEM_BUS +#define CONFIG_SYS_PCIE2_MEM_PHYS 0xa0000000#define CONFIG_SYS_PCIE2_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCIE2_IO_BUS 0x00000000#define CONFIG_SYS_PCIE2_IO_PHYS 0xffc10000#define CONFIG_SYS_PCIE2_IO_SIZE 0x00010000/* 64k */ /* controller 1, Slot 1, tgtid 1, Base address a000 */ +#define CONFIG_SYS_PCIE1_MEM_VIRT 0xc0000000#define CONFIG_SYS_PCIE1_MEM_BUS 0xc0000000 -#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS +#define CONFIG_SYS_PCIE1_MEM_PHYS 0xc0000000#define CONFIG_SYS_PCIE1_MEM_SIZE 0x20000000/* 512M */ #define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xffc20000
Signature · 1 line
1.5.6.5
PATCH 5/5 85xx: Introduce CONFIG_SYS_PCI*_IO_VIRT for FSL boards
Introduce a new define to seperate out the virtual address that PCI IO space is at from the physical address. In most situations these are mapped 1:1. However any code accessing the bus should use VIRT.
--- board/freescale/mpc8536ds/tlb.c | 2 +- board/freescale/mpc8572ds/tlb.c | 2 +- include/configs/MPC8536DS.h | 10 +++++++--- include/configs/MPC8540ADS.h | 1 + include/configs/MPC8541CDS.h | 2 ++ include/configs/MPC8544DS.h | 8 ++++++-- include/configs/MPC8548CDS.h | 3 +++ include/configs/MPC8555CDS.h | 2 ++ include/configs/MPC8560ADS.h | 1 + include/configs/MPC8568MDS.h | 2 ++ include/configs/MPC8572DS.h | 5 ++++- 11 files changed, 30 insertions(+), 8 deletions(-)
board/freescale/mpc8536ds/tlb.c +1 -1
@@ -63,7 +63,7 @@ struct fsl_e_tlb_entry tlb_table[] = { 0, 2, BOOKE_PAGESZ_1G, 1),/* *I*G* - PCI I/O */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_IO_PHYS ,CONFIG_SYS_PCI1_IO_PHYS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCI1_IO_VIRT ,CONFIG_SYS_PCI1_IO_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 3, BOOKE_PAGESZ_256K, 1),
board/freescale/mpc8572ds/tlb.c +1 -1
@@ -77,7 +77,7 @@ struct fsl_e_tlb_entry tlb_table[] = { 0, 5, BOOKE_PAGESZ_256M, 1),/* *I*G* - PCI I/O */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_PCIE3_IO_PHYS ,CONFIG_SYS_PCIE3_IO_PHYS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_PCIE3_IO_VIRT ,CONFIG_SYS_PCIE3_IO_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 6, BOOKE_PAGESZ_256K, 1),
include/configs/MPC8536DS.h +7 -3
@@ -365,6 +365,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000#define CONFIG_SYS_PCI1_MEM_PHYS 0x80000000#define CONFIG_SYS_PCI1_MEM_SIZE 0x10000000/* 256M */ +#define CONFIG_SYS_PCI1_IO_VIRT 0xffc00000#define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xffc00000#define CONFIG_SYS_PCI1_IO_SIZE 0x00010000/* 64k */
@@ -374,6 +375,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_PCIE1_MEM_BUS 0x90000000#define CONFIG_SYS_PCIE1_MEM_PHYS 0x90000000#define CONFIG_SYS_PCIE1_MEM_SIZE 0x08000000/* 128M */ +#define CONFIG_SYS_PCIE1_IO_VIRT 0xffc10000#define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xffc10000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000/* 64k */
@@ -383,6 +385,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_PCIE2_MEM_BUS 0x98000000#define CONFIG_SYS_PCIE2_MEM_PHYS 0x98000000#define CONFIG_SYS_PCIE2_MEM_SIZE 0x08000000/* 128M */ +#define CONFIG_SYS_PCIE2_IO_VIRT 0xffc20000#define CONFIG_SYS_PCIE2_IO_BUS 0x00000000#define CONFIG_SYS_PCIE2_IO_PHYS 0xffc20000#define CONFIG_SYS_PCIE2_IO_SIZE 0x00010000/* 64k */
@@ -392,6 +395,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_PCIE3_MEM_BUS 0xa0000000#define CONFIG_SYS_PCIE3_MEM_PHYS 0xa0000000#define CONFIG_SYS_PCIE3_MEM_SIZE 0x20000000/* 512M */ +#define CONFIG_SYS_PCIE3_IO_VIRT 0xffc30000#define CONFIG_SYS_PCIE3_IO_BUS 0x00000000#define CONFIG_SYS_PCIE3_IO_PHYS 0xffc30000#define CONFIG_SYS_PCIE3_IO_SIZE 0x00010000/* 64k */
@@ -402,10 +406,10 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_PCI_PNP /* do pci plug-and-play */ /*PCIE video card used*/ -#define VIDEO_IO_OFFSET CONFIG_SYS_PCIE3_IO_PHYS +#define VIDEO_IO_OFFSET CONFIG_SYS_PCIE3_IO_VIRT/*PCI video card used*/ -/*#define VIDEO_IO_OFFSET CONFIG_SYS_PCI1_IO_PHYS*/ +/*#define VIDEO_IO_OFFSET CONFIG_SYS_PCI1_IO_VIRT*/ /* video */ #define CONFIG_VIDEO
@@ -418,7 +422,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_ATI_RADEON_FB #define CONFIG_VIDEO_LOGO /*#define CONFIG_CONSOLE_CURSOR*/ -#define CONFIG_SYS_ISA_IO_BASE_ADDRESS CONFIG_SYS_PCIE3_IO_PHYS +#define CONFIG_SYS_ISA_IO_BASE_ADDRESS CONFIG_SYS_PCIE3_IO_VIRT#endif #undef CONFIG_EEPRO100
include/configs/MPC8540ADS.h +1 -0
@@ -323,6 +323,7 @@#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000#define CONFIG_SYS_PCI1_MEM_PHYS 0x80000000#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ +#define CONFIG_SYS_PCI1_IO_VIRT 0xe2000000#define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x100000/* 1M */
include/configs/MPC8541CDS.h +2 -0
@@ -347,6 +347,7 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000#define CONFIG_SYS_PCI1_MEM_PHYS 0x80000000#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ +#define CONFIG_SYS_PCI1_IO_VIRT 0xe2000000#define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x100000/* 1M */
@@ -355,6 +356,7 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_PCI2_MEM_BUS 0xa0000000#define CONFIG_SYS_PCI2_MEM_PHYS 0xa0000000#define CONFIG_SYS_PCI2_MEM_SIZE 0x20000000/* 512M */ +#define CONFIG_SYS_PCI2_IO_VIRT 0xe2100000#define CONFIG_SYS_PCI2_IO_BUS 0x00000000#define CONFIG_SYS_PCI2_IO_PHYS 0xe2100000#define CONFIG_SYS_PCI2_IO_SIZE 0x100000/* 1M */
include/configs/MPC8544DS.h +6 -2
@@ -275,6 +275,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_SYS_PCI1_MEM_BUS 0xc0000000#define CONFIG_SYS_PCI1_MEM_PHYS 0xc0000000#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ +#define CONFIG_SYS_PCI1_IO_VIRT 0xe1000000#define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe1000000#define CONFIG_SYS_PCI1_IO_SIZE 0x00010000/* 64k */
@@ -284,6 +285,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_SYS_PCIE2_MEM_BUS 0x80000000#define CONFIG_SYS_PCIE2_MEM_PHYS 0x80000000#define CONFIG_SYS_PCIE2_MEM_SIZE 0x20000000/* 512M */ +#define CONFIG_SYS_PCIE2_IO_VIRT 0xe1010000#define CONFIG_SYS_PCIE2_IO_BUS 0x00000000#define CONFIG_SYS_PCIE2_IO_PHYS 0xe1010000#define CONFIG_SYS_PCIE2_IO_SIZE 0x00010000/* 64k */
@@ -293,6 +295,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_SYS_PCIE1_MEM_BUS 0xa0000000#define CONFIG_SYS_PCIE1_MEM_PHYS 0xa0000000#define CONFIG_SYS_PCIE1_MEM_SIZE 0x10000000/* 256M */ +#define CONFIG_SYS_PCIE1_IO_VIRT 0xe1020000#define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xe1020000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000/* 64k */
@@ -302,6 +305,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_SYS_PCIE3_MEM_BUS 0xb0000000#define CONFIG_SYS_PCIE3_MEM_PHYS 0xb0000000#define CONFIG_SYS_PCIE3_MEM_SIZE 0x00100000/* 1M */ +#define CONFIG_SYS_PCIE3_IO_VIRT 0xb0100000/* reuse mem LAW */ #define CONFIG_SYS_PCIE3_IO_BUS 0x00000000#define CONFIG_SYS_PCIE3_IO_PHYS 0xb0100000/* reuse mem LAW */ #define CONFIG_SYS_PCIE3_IO_SIZE 0x00100000/* 1M */
@@ -313,10 +317,10 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#if defined(CONFIG_PCI )/*PCIE video card used*/ -#define VIDEO_IO_OFFSET CONFIG_SYS_PCIE2_IO_PHYS +#define VIDEO_IO_OFFSET CONFIG_SYS_PCIE2_IO_VIRT/*PCI video card used*/ -/*#define VIDEO_IO_OFFSET CONFIG_SYS_PCI1_IO_PHYS*/ +/*#define VIDEO_IO_OFFSET CONFIG_SYS_PCI1_IO_VIRT*/ /* video */ #define CONFIG_VIDEO
include/configs/MPC8548CDS.h +3 -0
@@ -374,6 +374,7 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000#define CONFIG_SYS_PCI1_MEM_PHYS 0x80000000#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ +#define CONFIG_SYS_PCI1_IO_VIRT 0xe2000000#define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x00100000/* 1M */
@@ -383,6 +384,7 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_PCI2_MEM_BUS 0xa0000000#define CONFIG_SYS_PCI2_MEM_PHYS 0xa0000000#define CONFIG_SYS_PCI2_MEM_SIZE 0x20000000/* 512M */ +#define CONFIG_SYS_PCI2_IO_VIRT 0xe2800000#define CONFIG_SYS_PCI2_IO_BUS 0x00000000#define CONFIG_SYS_PCI2_IO_PHYS 0xe2800000#define CONFIG_SYS_PCI2_IO_SIZE 0x00100000/* 1M */
@@ -393,6 +395,7 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_PCIE1_MEM_BUS 0xa0000000#define CONFIG_SYS_PCIE1_MEM_PHYS 0xa0000000#define CONFIG_SYS_PCIE1_MEM_SIZE 0x20000000/* 512M */ +#define CONFIG_SYS_PCIE1_IO_VIRT 0xe3000000#define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xe3000000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00100000/* 1M */
include/configs/MPC8555CDS.h +2 -0
@@ -345,6 +345,7 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000#define CONFIG_SYS_PCI1_MEM_PHYS 0x80000000#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ +#define CONFIG_SYS_PCI1_IO_VIRT 0xe2000000#define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x00100000/* 1M */
@@ -353,6 +354,7 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_PCI2_MEM_BUS 0xa0000000#define CONFIG_SYS_PCI2_MEM_PHYS 0xa0000000#define CONFIG_SYS_PCI2_MEM_SIZE 0x20000000/* 512M */ +#define CONFIG_SYS_PCI2_IO_VIRT 0xe2100000#define CONFIG_SYS_PCI2_IO_BUS 0x00000000#define CONFIG_SYS_PCI2_IO_PHYS 0xe2100000#define CONFIG_SYS_PCI2_IO_SIZE 0x00100000/* 1M */
include/configs/MPC8560ADS.h +1 -0
@@ -315,6 +315,7 @@#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000#define CONFIG_SYS_PCI1_MEM_PHYS 0x80000000#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ +#define CONFIG_SYS_PCI1_IO_VIRT 0xe2000000#define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x100000/* 1M */
include/configs/MPC8568MDS.h +2 -0
@@ -328,6 +328,7 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000#define CONFIG_SYS_PCI1_MEM_PHYS 0x80000000#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ +#define CONFIG_SYS_PCI1_IO_VIRT 0xe2000000#define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x00800000/* 8M */
@@ -336,6 +337,7 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_PCIE1_MEM_BUS 0xa0000000#define CONFIG_SYS_PCIE1_MEM_PHYS 0xa0000000#define CONFIG_SYS_PCIE1_MEM_SIZE 0x20000000/* 512M */ +#define CONFIG_SYS_PCIE1_IO_VIRT 0xe2800000#define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xe2800000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00800000/* 8M */
include/configs/MPC8572DS.h +4 -1
@@ -386,6 +386,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_PCIE3_MEM_BUS 0x80000000#define CONFIG_SYS_PCIE3_MEM_PHYS 0x80000000#define CONFIG_SYS_PCIE3_MEM_SIZE 0x20000000/* 512M */ +#define CONFIG_SYS_PCIE3_IO_VIRT 0xffc00000#define CONFIG_SYS_PCIE3_IO_BUS 0x00000000#define CONFIG_SYS_PCIE3_IO_PHYS 0xffc00000#define CONFIG_SYS_PCIE3_IO_SIZE 0x00010000/* 64k */
@@ -395,6 +396,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_PCIE2_MEM_BUS 0xa0000000#define CONFIG_SYS_PCIE2_MEM_PHYS 0xa0000000#define CONFIG_SYS_PCIE2_MEM_SIZE 0x20000000/* 512M */ +#define CONFIG_SYS_PCIE2_IO_VIRT 0xffc10000#define CONFIG_SYS_PCIE2_IO_BUS 0x00000000#define CONFIG_SYS_PCIE2_IO_PHYS 0xffc10000#define CONFIG_SYS_PCIE2_IO_SIZE 0x00010000/* 64k */
@@ -404,6 +406,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_PCIE1_MEM_BUS 0xc0000000#define CONFIG_SYS_PCIE1_MEM_PHYS 0xc0000000#define CONFIG_SYS_PCIE1_MEM_SIZE 0x20000000/* 512M */ +#define CONFIG_SYS_PCIE1_IO_VIRT 0xffc20000#define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xffc20000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000/* 64k */
@@ -411,7 +414,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#if defined(CONFIG_PCI )/*PCIE video card used*/ -#define VIDEO_IO_OFFSET CONFIG_SYS_PCIE1_IO_PHYS +#define VIDEO_IO_OFFSET CONFIG_SYS_PCIE1_IO_VIRT/* video */ #define CONFIG_VIDEO
Signature · 1 line
1.5.6.5