leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: x86: baytrail: Correct PCI region 3 when driver model is used

Browse Source 
Commit afbbd413a fixed this for non-driver-model. Make sure that the driver
model code handles this also.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2015-07-03 18:28:27 -06:00
parent b71f9dca89
commit b9da5086b8
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/cpu/cpu.c
View File

@ -353,6 +353,8 @@ int x86_cpu_init_f(void)
gd->arch.has_mtrr = has_mtrr(); gd->arch.has_mtrr = has_mtrr();
} }
/* Don't allow PCI region 3 to use memory in the 2-4GB memory hole */
gd->pci_ram_top = 0x80000000U;
/* Configure fixed range MTRRs for some legacy regions */ /* Configure fixed range MTRRs for some legacy regions */
if (gd->arch.has_mtrr) { if (gd->arch.has_mtrr) {

8
drivers/pci/pci-uclass.c
View File

@ -444,6 +444,7 @@ static int decode_regions(struct pci_controller *hose, const void *blob,
{ {
int pci_addr_cells, addr_cells, size_cells; int pci_addr_cells, addr_cells, size_cells;
int cells_per_record; int cells_per_record;
phys_addr_t addr;
const u32 *prop; const u32 *prop;
int len; int len;
int i; int i;
@ -494,8 +495,11 @@ static int decode_regions(struct pci_controller *hose, const void *blob,
} }
/* Add a region for our local memory */ /* Add a region for our local memory */
pci_set_region(hose->regions + hose->region_count++, 0, 0, addr = gd->ram_size;
gd->ram_size, PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); if (gd->pci_ram_top && gd->pci_ram_top < addr)
addr = gd->pci_ram_top;
pci_set_region(hose->regions + hose->region_count++, 0, 0, addr,
PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);
return 0; return 0;
} }

1
include/asm-generic/global_data.h
View File

@ -93,6 +93,7 @@ typedef struct global_data {
#endif #endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
struct pci_controller *hose; /* PCI hose for early use */ struct pci_controller *hose; /* PCI hose for early use */
phys_addr_t pci_ram_top; /* top of region accessible to PCI */
#endif #endif
#ifdef CONFIG_PCI_BOOTDELAY #ifdef CONFIG_PCI_BOOTDELAY
int pcidelay_done; int pcidelay_done;