sbc8641d: Fix PCI mapping concepts
PATCH 1/1 sbc8641d: Fix PCI mapping concepts
Rename _BASE to _BUS, as it's actually a PCI bus address, separate virtual and physical addresses into _VIRT and _PHYS, and use each appopriately. This makes the code easier to read and understand, and facilitates mapping changes going forward.
Signed-off-by Becky Bruce <[email protected]>
--- board/sbc8641d/law.c | 10 +++++----- board/sbc8641d/sbc8641d.c | 8 ++++---- include/configs/sbc8641d.h | 32 ++++++++++++++++++-------------- 3 files changed, 27 insertions(+), 23 deletions(-)
board/sbc8641d/law.c +5 -5
@@ -45,14 +45,14 @@struct law_entry law_table[] = {SET_LAW (CONFIG_SYS_DDR_SDRAM_BASE ,LAW_SIZE_256M ,LAW_TRGT_IF_DDR_1 ), -SET_LAW (CONFIG_SYS_PCI1_MEM_BASE ,LAW_SIZE_512M ,LAW_TRGT_IF_PCI_1 ), -SET_LAW (CONFIG_SYS_PCI2_MEM_BASE ,LAW_SIZE_512M ,LAW_TRGT_IF_PCI_2 ), +SET_LAW (CONFIG_SYS_PCI1_MEM_PHYS ,LAW_SIZE_512M ,LAW_TRGT_IF_PCI_1 ), +SET_LAW (CONFIG_SYS_PCI2_MEM_PHYS ,LAW_SIZE_512M ,LAW_TRGT_IF_PCI_2 ),SET_LAW (0xf8000000 ,LAW_SIZE_2M ,LAW_TRGT_IF_LBC ), -SET_LAW (CONFIG_SYS_PCI1_IO_BASE ,LAW_SIZE_16M ,LAW_TRGT_IF_PCI_1 ), -SET_LAW (CONFIG_SYS_PCI2_IO_BASE ,LAW_SIZE_16M ,LAW_TRGT_IF_PCI_2 ), +SET_LAW (CONFIG_SYS_PCI1_IO_PHYS ,LAW_SIZE_16M ,LAW_TRGT_IF_PCI_1 ), +SET_LAW (CONFIG_SYS_PCI2_IO_PHYS ,LAW_SIZE_16M ,LAW_TRGT_IF_PCI_2 ),SET_LAW (0xfe000000 ,LAW_SIZE_32M ,LAW_TRGT_IF_LBC ),SET_LAW (CONFIG_SYS_DDR_SDRAM_BASE ,LAW_SIZE_256M ,LAW_TRGT_IF_DDR_2 ), -SET_LAW (CONFIG_SYS_RIO_MEM_BASE ,LAW_SIZE_512M ,LAW_TRGT_IF_RIO ) +SET_LAW (CONFIG_SYS_RIO_MEM_PHYS ,LAW_SIZE_512M ,LAW_TRGT_IF_RIO ) };int num_law_entries =ARRAY_SIZE (law_table);
board/sbc8641d/sbc8641d.c +4 -4
@@ -247,14 +247,14 @@ void 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 );/* 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 );
@@ -290,14 +290,14 @@ void pci_init_board(void)/* outbound memory */ pci_set_region (r++, -CONFIG_SYS_PCI2_MEM_BASE , +CONFIG_SYS_PCI2_MEM_BUS ,CONFIG_SYS_PCI2_MEM_PHYS ,CONFIG_SYS_PCI2_MEM_SIZE ,PCI_REGION_MEM );/* outbound io */ pci_set_region (r++, -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/sbc8641d.h +18 -14
@@ -309,18 +309,22 @@* 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_VIRT CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCI1_IO_BASE 0xe2000000 -#define CONFIG_SYS_PCI1_IO_PHYS CONFIG_SYS_PCI1_IO_BASE +#define CONFIG_SYS_PCI1_IO_BUS 0xe2000000 +#define CONFIG_SYS_PCI1_IO_PHYS CONFIG_SYS_PCI1_IO_BUS +#define CONFIG_SYS_PCI1_IO_VIRT CONFIG_SYS_PCI1_IO_BUS#define CONFIG_SYS_PCI1_IO_SIZE 0x1000000/* 16M */ -#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_VIRT CONFIG_SYS_PCI2_MEM_BUS#define CONFIG_SYS_PCI2_MEM_SIZE 0x10000000/* 256M */ -#define CONFIG_SYS_PCI2_IO_BASE 0xe3000000 -#define CONFIG_SYS_PCI2_IO_PHYS CONFIG_SYS_PCI2_IO_BASE +#define CONFIG_SYS_PCI2_IO_BUS 0xe3000000 +#define CONFIG_SYS_PCI2_IO_PHYS CONFIG_SYS_PCI2_IO_BUS +#define CONFIG_SYS_PCI2_IO_VIRT CONFIG_SYS_PCI2_IO_BUS#define CONFIG_SYS_PCI2_IO_SIZE 0x1000000/* 16M */ #if defined(CONFIG_PCI )
@@ -407,10 +411,10 @@* 0xa000_0000 512M PCI-Express 2 Memory * Changed it for operating from 0xd0000000 */ -#define CONFIG_SYS_DBAT1L ( CONFIG_SYS_PCI1_MEM_BASE | BATL_PP_RW \ +#define CONFIG_SYS_DBAT1L ( CONFIG_SYS_PCI1_MEM_PHYS | BATL_PP_RW \ | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE) -#define CONFIG_SYS_DBAT1U (CONFIG_SYS_PCI1_MEM_BASE | BATU_BL_256M | BATU_VS | BATU_VP) -#define CONFIG_SYS_IBAT1L (CONFIG_SYS_PCI1_MEM_BASE | BATL_PP_RW | BATL_CACHEINHIBIT) +#define CONFIG_SYS_DBAT1U (CONFIG_SYS_PCI1_MEM_VIRT | BATU_BL_256M | BATU_VS | BATU_VP) +#define CONFIG_SYS_IBAT1L (CONFIG_SYS_PCI1_MEM_PHYS | BATL_PP_RW | BATL_CACHEINHIBIT)#define CONFIG_SYS_IBAT1U CONFIG_SYS_DBAT1U/*
@@ -439,10 +443,10 @@* 0xe300_0000 16M PCI-Express 2 I/0 * Note that this is at 0xe0000000 */ -#define CONFIG_SYS_DBAT4L ( CONFIG_SYS_PCI1_IO_BASE | BATL_PP_RW \ +#define CONFIG_SYS_DBAT4L ( CONFIG_SYS_PCI1_IO_PHYS | BATL_PP_RW \ | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE) -#define CONFIG_SYS_DBAT4U (CONFIG_SYS_PCI1_IO_BASE | BATU_BL_32M | BATU_VS | BATU_VP) -#define CONFIG_SYS_IBAT4L (CONFIG_SYS_PCI1_IO_BASE | BATL_PP_RW | BATL_CACHEINHIBIT) +#define CONFIG_SYS_DBAT4U (CONFIG_SYS_PCI1_IO_VIRT | BATU_BL_32M | BATU_VS | BATU_VP) +#define CONFIG_SYS_IBAT4L (CONFIG_SYS_PCI1_IO_PHYS | BATL_PP_RW | BATL_CACHEINHIBIT)#define CONFIG_SYS_IBAT4U CONFIG_SYS_DBAT4U/*
Signature · 1 line
1.5.6.5