pci: Rename PCI_REGION_MEMORY to PCI_REGION_SYS_MEMORY for clarity
PATCH 1/2 pci: Rename PCI_REGION_MEMORY to PCI_REGION_SYS_MEMORY for clarity
The PCI_REGION_MEMORY and PCI_REGION_MEM are a bit to similar and can be confusing when reading the code.
Rename PCI_REGION_MEMORY to PCI_REGION_SYS_MEMORY to clarify its used for system memory mapping purposes.
--- board/MAI/AmigaOneG3SE/articiaS_pci.c | 2 +- board/ads5121/pci.c | 2 +- board/amirix/ap1000/pci.c | 2 +- board/armltd/integratorap/integratorap.c | 2 +- board/dave/common/pci.c | 2 +- board/eltec/bab7xx/pci.c | 2 +- board/eltec/elppc/pci.c | 2 +- board/esd/common/pci.c | 2 +- board/freescale/mpc832xemds/pci.c | 2 +- board/freescale/mpc8349itx/pci.c | 4 ++-- board/freescale/mpc8360emds/pci.c | 2 +- board/pcippc2/cpc710_pci.c | 4 ++-- board/ppmc7xx/pci.c | 2 +- board/sbc8349/pci.c | 4 ++-- board/sbc8548/sbc8548.c | 2 +- board/tb0229/vr4131-pci.c | 2 +- board/tqc/tqm834x/pci.c | 2 +- common/fdt_support.c | 4 ++-- cpu/i386/sc520.c | 2 +- cpu/mcf5445x/pci.c | 2 +- cpu/mcf547x_8x/pci.c | 2 +- cpu/mpc5xxx/pci_mpc5200.c | 2 +- cpu/mpc8220/pci.c | 2 +- cpu/mpc824x/pci.c | 2 +- cpu/mpc8260/pci.c | 4 ++-- cpu/mpc83xx/pci.c | 2 +- cpu/mpc83xx/pcie.c | 4 ++-- cpu/ppc4xx/4xx_pci.c | 4 ++-- drivers/pci/fsl_pci_init.c | 10 +++++----- drivers/pci/pci_ixp.c | 2 +- drivers/pci/tsi108_pci.c | 2 +- include/pci.h | 2 +- 32 files changed, 43 insertions(+), 43 deletions(-)
board/MAI/AmigaOneG3SE/articiaS_pci.c +1 -1
@@ -313,7 +313,7 @@ void articiaS_pci_init (void)ARTICIAS_SYS_BUS ,ARTICIAS_SYS_PHYS ,ARTICIAS_SYS_MAXSIZE , - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);/* PCI memory space */ pci_set_region(articiaS_hose.regions + 1,
board/ads5121/pci.c +1 -1
@@ -153,7 +153,7 @@ pci_init_board(void)CONFIG_PCI_SYS_MEM_BUS ,CONFIG_PCI_SYS_MEM_PHYS , gd->ram_size, - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); hose->region_count =4 ;
board/amirix/ap1000/pci.c +1 -1
@@ -294,7 +294,7 @@ void pci_init_board (void)pci_set_region (hose->regions +0 ,AP1000_SYS_MEM_START ,AP1000_SYS_MEM_START ,AP1000_SYS_MEM_SIZE , -PCI_REGION_MEM |PCI_REGION_MEMORY ); +PCI_REGION_MEM |PCI_REGION_SYS_MEMORY );/* PCI Memory space */ pci_set_region (hose->regions + 1,
board/armltd/integratorap/integratorap.c +1 -1
@@ -428,7 +428,7 @@ void pci_init_board (void)/* System memory space */ pci_set_region (hose->regions +0 ,0x00000000 ,0x40000000 ,0x01000000 , -PCI_REGION_MEM |PCI_REGION_MEMORY ); +PCI_REGION_MEM |PCI_REGION_SYS_MEMORY );/* PCI Memory - config space */ pci_set_region (hose->regions + 1,
board/dave/common/pci.c +1 -1
@@ -179,7 +179,7 @@ void pci_init(void)/* System memory space */ pci_set_region (hose->regions +0 ,0x00000000 ,0x00000000 ,0x01000000 , -PCI_REGION_MEM |PCI_REGION_MEMORY ); +PCI_REGION_MEM |PCI_REGION_SYS_MEMORY );/* PCI Memory space */ pci_set_region(hose->regions + 1,
board/eltec/bab7xx/pci.c +1 -1
@@ -50,7 +50,7 @@ void pci_init_board(void)* so we need (CONFIG_SYS_PCI_MEMORY_SIZE-1) */ CONFIG_SYS_PCI_MEMORY_SIZE -1 , - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);/* PCI memory space */ pci_set_region(hose->regions + 1,
board/eltec/elppc/pci.c +1 -1
@@ -45,7 +45,7 @@ void pci_init_board(void)CONFIG_SYS_PCI_MEMORY_BUS ,CONFIG_SYS_PCI_MEMORY_PHYS ,CONFIG_SYS_PCI_MEMORY_SIZE , - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);/* PCI memory space */ pci_set_region(hose->regions + 1,
board/esd/common/pci.c +1 -1
@@ -179,7 +179,7 @@ void pci_init_board(void)/* System memory space */ pci_set_region (hose->regions +0 ,0x00000000 ,0x00000000 ,0x01000000 , -PCI_REGION_MEM |PCI_REGION_MEMORY ); +PCI_REGION_MEM |PCI_REGION_SYS_MEMORY );/* PCI Memory space */ pci_set_region(hose->regions + 1,
board/freescale/mpc832xemds/pci.c +1 -1
@@ -228,7 +228,7 @@ void pci_init_board(void)CONFIG_SYS_PCI_SLV_MEM_LOCAL ,CONFIG_SYS_PCI_SLV_MEM_BUS ,CONFIG_SYS_PCI_SLV_MEM_SIZE , - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); hose[0 ].region_count =4 ;
board/freescale/mpc8349itx/pci.c +2 -2
@@ -210,7 +210,7 @@ void pci_init_board(void)pci_set_region (hose->regions +3 ,CONFIG_PCI_SYS_MEM_BUS ,CONFIG_PCI_SYS_MEM_PHYS , - gd->ram_size,PCI_REGION_MEM |PCI_REGION_MEMORY ); + gd->ram_size,PCI_REGION_MEM |PCI_REGION_SYS_MEMORY ); hose->region_count =4 ;
@@ -301,7 +301,7 @@ void pci_init_board(void)pci_set_region (hose->regions +3 ,CONFIG_PCI_SYS_MEM_BUS ,CONFIG_PCI_SYS_MEM_PHYS , - gd->ram_size,PCI_REGION_MEM |PCI_REGION_MEMORY ); + gd->ram_size,PCI_REGION_MEM |PCI_REGION_SYS_MEMORY ); hose->region_count =4 ;
board/freescale/mpc8360emds/pci.c +1 -1
@@ -228,7 +228,7 @@ void pci_init_board(void)CONFIG_SYS_PCI_SLV_MEM_LOCAL ,CONFIG_SYS_PCI_SLV_MEM_BUS ,CONFIG_SYS_PCI_SLV_MEM_SIZE , - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); hose[0 ].region_count =4 ;
board/pcippc2/cpc710_pci.c +2 -2
@@ -215,7 +215,7 @@ void cpc710_pci_init (void)PCI_MEMORY_BUS ,PCI_MEMORY_PHYS ,PCI_MEMORY_MAXSIZE , - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);/* PCI memory space */ pci_set_region(local_hose.regions + 1,
@@ -265,7 +265,7 @@ void cpc710_pci_init (void)PCI_MEMORY_BUS ,PCI_MEMORY_PHYS ,PCI_MEMORY_MAXSIZE , - PCI_REGION_MEMORY); + PCI_REGION_SYS_MEMORY);/* PCI memory space */ pci_set_region(cpci_hose.regions + 1,
board/ppmc7xx/pci.c +1 -1
@@ -45,7 +45,7 @@ void pci_init_board(void)CONFIG_SYS_PCI_MEMORY_BUS ,CONFIG_SYS_PCI_MEMORY_PHYS ,CONFIG_SYS_PCI_MEMORY_SIZE , - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);/* PCI memory space */ pci_set_region(hose->regions + 1,
board/sbc8349/pci.c +2 -2
@@ -197,7 +197,7 @@ pci_init_board(void)CONFIG_PCI_SYS_MEM_BUS ,CONFIG_PCI_SYS_MEM_PHYS , gd->ram_size, - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); hose->region_count =4 ;
@@ -293,7 +293,7 @@ pci_init_board(void)CONFIG_PCI_SYS_MEM_BUS ,CONFIG_PCI_SYS_MEM_PHYS , gd->ram_size, - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); hose->region_count =4 ;
board/sbc8548/sbc8548.c +1 -1
@@ -470,7 +470,7 @@ pci_init_board(void)CONFIG_SYS_PCI_MEMORY_BUS ,CONFIG_SYS_PCI_MEMORY_PHYS ,CONFIG_SYS_PCI_MEMORY_SIZE , - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);/* outbound memory */ pci_set_region(r++,
board/tb0229/vr4131-pci.c +1 -1
@@ -235,7 +235,7 @@ void init_vr4131_pci (struct pci_controller *hose)pci_set_region (hose->regions +3 ,0x00000000 ,0x80000000 , -0x04000000 ,PCI_REGION_MEM |PCI_REGION_MEMORY ); +0x04000000 ,PCI_REGION_MEM |PCI_REGION_SYS_MEMORY ); hose->region_count =4 ;
board/tqc/tqm834x/pci.c +1 -1
@@ -181,7 +181,7 @@ pci_init_board(void)CONFIG_PCI_SYS_MEM_BUS ,CONFIG_PCI_SYS_MEM_PHYS ,CONFIG_PCI_SYS_MEM_SIZE , - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); hose->region_count =3 ;
common/fdt_support.c +2 -2
@@ -646,8 +646,8 @@ int fdt_pci_dma_ranges(void *blob, int phb_off, struct pci_controller *hose) {for (r =0 ; r < hose->region_count; r++) {u64 bus_start, phys_start, size; -/* skip if !PCI_REGION_MEMORY */ -if (!(hose->regions[r].flags &PCI_REGION_MEMORY )) +/* skip if !PCI_REGION_SYS_MEMORY */ +if (!(hose->regions[r].flags &PCI_REGION_SYS_MEMORY ))continue ; bus_start = (u64 )hose->regions[r].bus_start;
cpu/i386/sc520.c +1 -1
@@ -341,7 +341,7 @@ void pci_sc520_init(struct pci_controller *hose)SC520_PCI_MEMORY_BUS ,SC520_PCI_MEMORY_PHYS ,SC520_PCI_MEMORY_SIZE , - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);/* PCI memory space */ pci_set_region(hose->regions + 1,
cpu/mcf5445x/pci.c +1 -1
@@ -146,7 +146,7 @@ void pci_mcf5445x_init(struct pci_controller *hose)pci_set_region (hose->regions +2 ,CONFIG_SYS_PCI_SYS_MEM_BUS ,CONFIG_SYS_PCI_SYS_MEM_PHYS ,CONFIG_SYS_PCI_SYS_MEM_SIZE , -PCI_REGION_MEM |PCI_REGION_MEMORY ); +PCI_REGION_MEM |PCI_REGION_SYS_MEMORY ); hose->region_count =3 ;
cpu/mcf547x_8x/pci.c +1 -1
@@ -149,7 +149,7 @@ void pci_mcf547x_8x_init(struct pci_controller *hose)pci_set_region (hose->regions +2 ,CONFIG_SYS_PCI_SYS_MEM_BUS ,CONFIG_SYS_PCI_SYS_MEM_PHYS ,CONFIG_SYS_PCI_SYS_MEM_SIZE , -PCI_REGION_MEM |PCI_REGION_MEMORY ); +PCI_REGION_MEM |PCI_REGION_SYS_MEMORY ); hose->region_count =3 ;
cpu/mpc5xxx/pci_mpc5200.c +1 -1
@@ -93,7 +93,7 @@ void pci_mpc5xxx_init (struct pci_controller *hose)CONFIG_PCI_MEMORY_BUS ,CONFIG_PCI_MEMORY_PHYS ,CONFIG_PCI_MEMORY_SIZE , - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);/* PCI memory space */ pci_set_region(hose->regions + 1,
cpu/mpc8220/pci.c +1 -1
@@ -165,7 +165,7 @@ pci_mpc8220_init(struct pci_controller *hose)CONFIG_PCI_SYS_MEM_BUS ,CONFIG_PCI_SYS_MEM_PHYS ,CONFIG_PCI_SYS_MEM_SIZE , - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); hose->region_count =3 ;
cpu/mpc824x/pci.c +1 -1
@@ -34,7 +34,7 @@ void pci_mpc824x_init (struct pci_controller *hose)CHRP_PCI_MEMORY_BUS ,CHRP_PCI_MEMORY_PHYS ,CHRP_PCI_MEMORY_SIZE , - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);/* PCI memory space */ pci_set_region(hose->regions + 1,
cpu/mpc8260/pci.c +2 -2
@@ -410,12 +410,12 @@ void pci_mpc8250_init (struct pci_controller *hose)pci_set_region (hose->regions +0 ,PCI_SLV_MEM_BUS ,PCI_SLV_MEM_LOCAL , - gd->ram_size,PCI_REGION_MEM |PCI_REGION_MEMORY ); + gd->ram_size,PCI_REGION_MEM |PCI_REGION_SYS_MEMORY );#else pci_set_region (hose->regions +0 ,CONFIG_SYS_SDRAM_BASE ,CONFIG_SYS_SDRAM_BASE , -0x4000000 ,PCI_REGION_MEM |PCI_REGION_MEMORY ); +0x4000000 ,PCI_REGION_MEM |PCI_REGION_SYS_MEMORY );#endif /* PCI memory space */
cpu/mpc83xx/pci.c +1 -1
@@ -89,7 +89,7 @@ static void pci_init_bus(int bus, struct pci_region *reg) hose->regions[i].bus_start =0 ; hose->regions[i].phys_start =0 ; hose->regions[i].size = gd->ram_size; - hose->regions[i].flags =PCI_REGION_MEM |PCI_REGION_MEMORY ; + hose->regions[i].flags =PCI_REGION_MEM |PCI_REGION_SYS_MEMORY ; hose->first_busno =0 ; hose->last_busno =0xff ;
cpu/mpc83xx/pcie.c +2 -2
@@ -109,13 +109,13 @@ static void mpc83xx_pcie_register_hose(int bus, struct pci_region *reg, hose->regions[i].bus_start =0 ; hose->regions[i].phys_start =0 ; hose->regions[i].size = gd->ram_size; - hose->regions[i].flags =PCI_REGION_MEM |PCI_REGION_MEMORY ; + hose->regions[i].flags =PCI_REGION_MEM |PCI_REGION_SYS_MEMORY ; i = hose->region_count++; hose->regions[i].bus_start =CONFIG_SYS_IMMR ; hose->regions[i].phys_start =CONFIG_SYS_IMMR ; hose->regions[i].size =0x100000 ; - hose->regions[i].flags =PCI_REGION_MEM |PCI_REGION_MEMORY ; + hose->regions[i].flags =PCI_REGION_MEM |PCI_REGION_SYS_MEMORY ; hose->first_busno = max_bus; hose->last_busno =0xff ;
cpu/ppc4xx/4xx_pci.c +2 -2
@@ -179,7 +179,7 @@ void pci_405gp_init(struct pci_controller *hose) ptmpcila[i], ptmla[i], ~(ptmms[i] &0xfffff000 ) +1 ,PCI_REGION_MEM | - PCI_REGION_MEMORY); + PCI_REGION_SYS_MEMORY); }/* PCI memory spaces */
@@ -504,7 +504,7 @@ int pci_440_init (struct pci_controller *hose)CONFIG_PCI_SYS_MEM_BUS ,CONFIG_PCI_SYS_MEM_PHYS ,CONFIG_PCI_SYS_MEM_SIZE , - PCI_REGION_MEM | PCI_REGION_MEMORY ); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY );#endif hose->region_count = reg_num;
drivers/pci/fsl_pci_init.c +5 -5
@@ -72,7 +72,7 @@ int fsl_pci_setup_inbound_windows(struct pci_region *r)debug ("R0 bus_start: %llx phys_start: %llx size: %llx\n" , (u64 )bus_start, (u64 )phys_start, (u64 )pci_sz);pci_set_region (r++, bus_start, phys_start, pci_sz, -PCI_REGION_MEM |PCI_REGION_MEMORY | +PCI_REGION_MEM |PCI_REGION_SYS_MEMORY |PCI_REGION_PREFETCH ); sz -= pci_sz;
@@ -84,7 +84,7 @@ int fsl_pci_setup_inbound_windows(struct pci_region *r)debug ("R1 bus_start: %llx phys_start: %llx size: %llx\n" , (u64 )bus_start, (u64 )phys_start, (u64 )pci_sz);pci_set_region (r++, bus_start, phys_start, pci_sz, -PCI_REGION_MEM |PCI_REGION_MEMORY | +PCI_REGION_MEM |PCI_REGION_SYS_MEMORY |PCI_REGION_PREFETCH ); sz -= pci_sz; bus_start += pci_sz;
@@ -108,7 +108,7 @@ int fsl_pci_setup_inbound_windows(struct pci_region *r)CONFIG_SYS_PCI64_MEMORY_BUS ,CONFIG_SYS_PCI_MEMORY_PHYS , pci_sz, -PCI_REGION_MEM |PCI_REGION_MEMORY | +PCI_REGION_MEM |PCI_REGION_SYS_MEMORY | PCI_REGION_PREFETCH);#else pci_sz =1ull <<__ilog2_u64 (sz);
@@ -116,7 +116,7 @@ int fsl_pci_setup_inbound_windows(struct pci_region *r)debug ("R2 bus_start: %llx phys_start: %llx size: %llx\n" , (u64 )bus_start, (u64 )phys_start, (u64 )pci_sz);pci_set_region (r++, bus_start, phys_start, pci_sz, -PCI_REGION_MEM |PCI_REGION_MEMORY | +PCI_REGION_MEM |PCI_REGION_SYS_MEMORY |PCI_REGION_PREFETCH ); sz -= pci_sz; bus_start += pci_sz;
@@ -157,7 +157,7 @@ void fsl_pci_init(struct pci_controller *hose)for (r=0 ; r<hose->region_count; r++) {u32 sz = (__ilog2_u64 ((u64 )hose->regions[r].size) -1 ); -if (hose->regions[r].flags &PCI_REGION_MEMORY ) {/* inbound */ +if (hose->regions[r].flags &PCI_REGION_SYS_MEMORY ) {/* inbound */ u32 flag =PIWAR_EN |PIWAR_LOCAL |PIWAR_READ_SNOOP |PIWAR_WRITE_SNOOP ; pi->pitar = (hose->regions[r].phys_start >>12 );
drivers/pci/pci_ixp.c +1 -1
@@ -240,7 +240,7 @@ void pci_ixp_init (struct pci_controller *hose)/* System memory space */ pci_set_region (hose->regions +0 ,PCI_MEMORY_BUS , -PCI_MEMORY_PHY ,PCI_MEMORY_SIZE ,PCI_REGION_MEMORY ); +PCI_MEMORY_PHY ,PCI_MEMORY_SIZE ,PCI_REGION_SYS_MEMORY );/* PCI memory space */ pci_set_region (hose->regions + 1,
drivers/pci/tsi108_pci.c +1 -1
@@ -131,7 +131,7 @@ void pci_init_board (void)pci_set_region (hose->regions +0 ,CONFIG_SYS_PCI_MEMORY_BUS ,CONFIG_SYS_PCI_MEMORY_PHYS , -CONFIG_SYS_PCI_MEMORY_SIZE ,PCI_REGION_MEM |PCI_REGION_MEMORY ); +CONFIG_SYS_PCI_MEMORY_SIZE ,PCI_REGION_MEM |PCI_REGION_SYS_MEMORY );/* PCI memory space */ pci_set_region (hose->regions + 1,
include/pci.h +1 -1
@@ -334,7 +334,7 @@ struct pci_region {#define PCI_REGION_TYPE 0x00000001#define PCI_REGION_PREFETCH 0x00000008/* prefetchable PCI memory */ -#define PCI_REGION_MEMORY 0x00000100/* System memory */ +#define PCI_REGION_SYS_MEMORY 0x00000100/* System memory */ #define PCI_REGION_RO 0x00000200/* Read-only memory */ extern __inline__ void pci_set_region(struct pci_region *reg,
Signature · 1 line
1.5.6.6
PATCH 2/2 pci: give preference to non-PCI_REGION_SYS_MEMORY regions when matching
When we search for an address match in pci_hose_{phys_to_bus,bus_to_phys} we should give preference to memory regions that aren't system memory.
Its possible that we have over mapped system memory in the regions and we want to avoid depending on the order of the regions.
--- drivers/pci/pci.c | 102 ++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 78 insertions(+), 24 deletions(-)
drivers/pci/pci.c +78 -24
@@ -218,67 +218,121 @@ pci_dev_t pci_find_device(unsigned int vendor, unsigned int device, int index)* */ -pci_addr_t pci_hose_phys_to_bus (struct pci_controller *hose, -phys_addr_t phys_addr, -unsigned long flags) +int __pci_hose_phys_to_bus (struct pci_controller *hose, +phys_addr_t phys_addr, +unsigned long flags, +unsigned long skip_mask, +pci_addr_t *ba) {struct pci_region *res;pci_addr_t bus_addr;int i; -if (!hose) { -printf ("pci_hose_phys_to_bus: %s\n" ,"invalid hose" ); - goto Done; - } -for (i =0 ; i < hose->region_count; i++) { res = &hose->regions[i];if (((res->flags ^ flags) &PCI_REGION_TYPE ) !=0 )continue ; +if (res->flags & skip_mask) +continue ; + bus_addr = phys_addr - res->phys_start + res->bus_start;if (bus_addr >= res->bus_start && bus_addr < res->bus_start + res->size) { -return bus_addr; + *ba = bus_addr; +return 0 ; } } -printf ("pci_hose_phys_to_bus: %s\n" ,"invalid physical address" ); - -Done: -return 0 ; +return 1 ; } -phys_addr_t pci_hose_bus_to_phys (struct pci_controller * hose, -pci_addr_t bus_addr, -unsigned long flags) +pci_addr_t pci_hose_phys_to_bus (struct pci_controller *hose, +phys_addr_t phys_addr, +unsigned long flags) { -struct pci_region *res; -int i; +pci_addr_t bus_addr =0 ; +int ret;if (!hose) { -printf ("pci_hose_bus_to_phys: %s\n" ,"invalid hose" ); - goto Done; +puts ("pci_hose_phys_to_bus: invalid hose\n" ); +return bus_addr; + } + +/* if PCI_REGION_MEM is set we do a two pass search with preference +* on matches that don't have PCI_REGION_SYS_MEMORY set */ +if ((flags &PCI_REGION_MEM ) ==PCI_REGION_MEM ) { + ret =__pci_hose_phys_to_bus (hose, phys_addr, + flags,PCI_REGION_SYS_MEMORY , &bus_addr); +if (!ret) +return bus_addr; } + ret =__pci_hose_phys_to_bus (hose, phys_addr, flags,0 , &bus_addr); + +if (ret) +puts ("pci_hose_phys_to_bus: invalid physical address\n" ); + +return bus_addr; +} + +int __pci_hose_bus_to_phys (struct pci_controller *hose, +pci_addr_t bus_addr, +unsigned long flags, +unsigned long skip_mask, +phys_addr_t *pa) +{ +struct pci_region *res; +int i; +for (i =0 ; i < hose->region_count; i++) { res = &hose->regions[i];if (((res->flags ^ flags) &PCI_REGION_TYPE ) !=0 )continue ; +if (res->flags & skip_mask) +continue ; +if (bus_addr >= res->bus_start && bus_addr < res->bus_start + res->size) { -return bus_addr - res->bus_start + res->phys_start; + *pa = (bus_addr - res->bus_start + res->phys_start); +return 0 ; } } -printf ("pci_hose_bus_to_phys: %s\n" ,"invalid physical address" ); +return 1 ; +} -Done: -return 0 ; +phys_addr_t pci_hose_bus_to_phys (struct pci_controller * hose, +pci_addr_t bus_addr, +unsigned long flags) +{ +phys_addr_t phys_addr =0 ; +int ret; + +if (!hose) { +puts ("pci_hose_bus_to_phys: invalid hose\n" ); +return phys_addr; + } + +/* if PCI_REGION_MEM is set we do a two pass search with preference +* on matches that don't have PCI_REGION_SYS_MEMORY set */ +if ((flags &PCI_REGION_MEM ) ==PCI_REGION_MEM ) { + ret =__pci_hose_bus_to_phys (hose, bus_addr, + flags,PCI_REGION_SYS_MEMORY , &phys_addr); +if (!ret) +return phys_addr; + } + + ret =__pci_hose_bus_to_phys (hose, bus_addr, flags,0 , &phys_addr); + +if (ret) +puts ("pci_hose_bus_to_phys: invalid physical address\n" ); + +return phys_addr; }/*
Signature · 1 line
1.5.6.6
Wolfgang Denk
AppliedPATCH 2/2 pci: give preference to non-PCI_REGION_SYS_MEMORY regions when matching
Dear Kumar Gala,
Quoted 10 lines · In message <[email protected]> you…
When we search for an address match in pci_hose_{phys_to_bus,bus_to_phys} we should give preference to memory regions that aren't system memory.
Its possible that we have over mapped system memory in the regions and we want to avoid depending on the order of the regions.
Signed-off-by Kumar Gala <[email protected]>--- drivers/pci/pci.c | 102 ++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 78 insertions(+), 24 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
It's all Klatchian to me.
- Terry Pratchett & Stephen Briggs, _The Discworld Companion_Wolfgang Denk
AppliedPATCH 1/2 pci: Rename PCI_REGION_MEMORY to PCI_REGION_SYS_MEMORY for clarity
In reply to Kumar GalaDear Kumar Gala,
Quoted 33 lines · In message <[email protected]> you…
The
PCI_REGION_MEMORYandPCI_REGION_MEMare a bit to similar and can be confusing when reading the code.Rename
PCI_REGION_MEMORYtoPCI_REGION_SYS_MEMORYto clarify its used for system memory mapping purposes.Signed-off-by Kumar Gala <[email protected]>--- board/MAI/AmigaOneG3SE/articiaS_pci.c | 2 +- board/ads5121/pci.c | 2 +- board/amirix/ap1000/pci.c | 2 +- board/armltd/integratorap/integratorap.c | 2 +- board/dave/common/pci.c | 2 +- board/eltec/bab7xx/pci.c | 2 +- board/eltec/elppc/pci.c | 2 +- board/esd/common/pci.c | 2 +- board/freescale/mpc832xemds/pci.c | 2 +- board/freescale/mpc8349itx/pci.c | 4 ++-- board/freescale/mpc8360emds/pci.c | 2 +- board/pcippc2/cpc710_pci.c | 4 ++-- board/ppmc7xx/pci.c | 2 +- board/sbc8349/pci.c | 4 ++-- board/sbc8548/sbc8548.c | 2 +- board/tb0229/vr4131-pci.c | 2 +- board/tqc/tqm834x/pci.c | 2 +- common/fdt_support.c | 4 ++-- cpu/i386/sc520.c | 2 +- cpu/mcf5445x/pci.c | 2 +- cpu/mcf547x_8x/pci.c | 2 +- cpu/mpc5xxx/pci_mpc5200.c | 2 +- cpu/mpc8220/pci.c | 2 +- cpu/mpc824x/pci.c | 2 +- cpu/mpc8260/pci.c | 4 ++--
Quoted 8 lines
cpu/mpc83xx/pci.c | 2 +- cpu/mpc83xx/pcie.c | 4 ++-- cpu/ppc4xx/4xx_pci.c | 4 ++-- drivers/pci/fsl_pci_init.c | 10 +++++----- drivers/pci/pci_ixp.c | 2 +- drivers/pci/tsi108_pci.c | 2 +- include/pci.h | 2 +- 32 files changed, 43 insertions(+), 43 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Virtue is a relative term. -- Spock, "Friday's Child", stardate 3499.1