minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 20:18:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

pci/fsl_pci_init: Enable larger address and setting inbound windows properly

Browse Source 
* PCI Inbound window was setup incorrectly.  The PCI address and system
  address were swapped.  The PCI address should be setting piwar/piwbear
  and the system address should be setting pitar.

* Removed masking of addresses to allow for system address to support
  system address & PCI address >32-bits

* Set PIWBEAR & POTEAR to allow for full 64-bit PCI addresses

* Respect the PCI_REGION_PREFETCH for inbound windows

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Andrew Fleming-AFLEMING <afleming@freescale.com>
This commit is contained in:
Kumar Gala 2008-10-21 10:13:14 -05:00 committed by Andrew Fleming-AFLEMING
parent 8ab451c46b
commit 612ea01018
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/pci/fsl_pci_init.c
View File

@ -39,10 +39,9 @@ void pciauto_prescan_setup_bridge(struct pci_controller *hose,
pci_dev_t dev, int sub_bus); pci_dev_t dev, int sub_bus);
void pciauto_postscan_setup_bridge(struct pci_controller *hose, void pciauto_postscan_setup_bridge(struct pci_controller *hose,
pci_dev_t dev, int sub_bus); pci_dev_t dev, int sub_bus);
void pciauto_config_init(struct pci_controller *hose); void pciauto_config_init(struct pci_controller *hose);
void
fsl_pci_init(struct pci_controller *hose) void fsl_pci_init(struct pci_controller *hose)
{ {
u16 temp16; u16 temp16;
u32 temp32; u32 temp32;
@ -65,25 +64,36 @@ fsl_pci_init(struct pci_controller *hose)
#endif #endif
for (r=0; r<hose->region_count; r++) { 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_MEMORY) { /* inbound */
pi->pitar = (hose->regions[r].bus_start >> 12) & 0x000fffff; u32 flag = PIWAR_EN | PIWAR_LOCAL | \
pi->piwbar = (hose->regions[r].phys_start >> 12) & 0x000fffff; PIWAR_READ_SNOOP | PIWAR_WRITE_SNOOP;
pi->pitar = (hose->regions[r].phys_start >> 12);
pi->piwbar = (hose->regions[r].bus_start >> 12);
#ifdef CONFIG_SYS_PCI_64BIT
pi->piwbear = (hose->regions[r].bus_start >> 44);
#else
pi->piwbear = 0; pi->piwbear = 0;
pi->piwar = PIWAR_EN | PIWAR_PF | PIWAR_LOCAL | #endif
PIWAR_READ_SNOOP | PIWAR_WRITE_SNOOP | if (hose->regions[r].flags & PCI_REGION_PREFETCH)
(__ilog2(hose->regions[r].size) - 1); flag |= PIWAR_PF;
pi->piwar = flag | sz;
pi++; pi++;
inbound = hose->regions[r].size > 0; inbound = hose->regions[r].size > 0;
} else { /* Outbound */ } else { /* Outbound */
po->powbar = (hose->regions[r].phys_start >> 12) & 0x000fffff; po->powbar = (hose->regions[r].phys_start >> 12);
po->potar = (hose->regions[r].bus_start >> 12) & 0x000fffff; po->potar = (hose->regions[r].bus_start >> 12);
#ifdef CONFIG_SYS_PCI_64BIT
po->potear = (hose->regions[r].bus_start >> 44);
#else
po->potear = 0; po->potear = 0;
#endif
if (hose->regions[r].flags & PCI_REGION_IO) if (hose->regions[r].flags & PCI_REGION_IO)
po->powar = POWAR_EN | POWAR_IO_READ | POWAR_IO_WRITE | po->powar = POWAR_EN | sz | \
(__ilog2(hose->regions[r].size) - 1); POWAR_IO_READ | POWAR_IO_WRITE;
else else
po->powar = POWAR_EN | POWAR_MEM_READ | POWAR_MEM_WRITE | po->powar = POWAR_EN | sz | \
(__ilog2(hose->regions[r].size) - 1); POWAR_MEM_READ | POWAR_MEM_WRITE;
po++; po++;
} }
} }