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

pci: pci-uclass: Dynamically allocate the PCI regions 

Instead of using a fixed length pre-allocated array of regions, this
patch moves to dynamically allocating the regions based on the number
of available regions plus the necessary regions for DRAM banks.

Since MAX_PCI_REGIONS is not needed any more, its removed completely
with this patch.

Signed-off-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Thierry Reding <treding@nvidia.com>
Cc: Marek Vasut <marek.vasut+renesas@gmail.com>
This commit is contained in:
Stefan Roese 2020-07-23 16:34:10 +02:00
parent 65f8c7edd8
commit e002474158
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -874,6 +874,7 @@ static void decode_regions(struct pci_controller *hose, ofnode parent_node,
struct bd_info *bd = gd->bd; struct bd_info *bd = gd->bd;
int cells_per_record; int cells_per_record;
const u32 *prop; const u32 *prop;
int max_regions;
int len; int len;
int i; int i;
@ -893,7 +894,13 @@ static void decode_regions(struct pci_controller *hose, ofnode parent_node,
hose->region_count = 0; hose->region_count = 0;
debug("%s: len=%d, cells_per_record=%d\n", __func__, len, debug("%s: len=%d, cells_per_record=%d\n", __func__, len,
cells_per_record); cells_per_record);
for (i = 0; i < MAX_PCI_REGIONS; i++, len -= cells_per_record) {
/* Dynamically allocate the regions array */
max_regions = len / cells_per_record + CONFIG_NR_DRAM_BANKS;
hose->regions = (struct pci_region *)
calloc(1, max_regions * sizeof(struct pci_region));
for (i = 0; i < max_regions; i++, len -= cells_per_record) {
u64 pci_addr, addr, size; u64 pci_addr, addr, size;
int space_code; int space_code;
u32 flags; u32 flags;
@ -943,11 +950,6 @@ static void decode_regions(struct pci_controller *hose, ofnode parent_node,
return; return;
for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) { for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) {
if (hose->region_count == MAX_PCI_REGIONS) {
pr_err("maximum number of regions parsed, aborting\n");
break;
}
if (bd->bi_dram[i].size) { if (bd->bi_dram[i].size) {
pci_set_region(hose->regions + hose->region_count++, pci_set_region(hose->regions + hose->region_count++,
bd->bi_dram[i].start, bd->bi_dram[i].start,

4
include/pci.h
View File

@ -590,8 +590,6 @@ extern void pci_cfgfunc_do_nothing(struct pci_controller* hose, pci_dev_t dev,
extern void pci_cfgfunc_config_device(struct pci_controller* hose, pci_dev_t dev, extern void pci_cfgfunc_config_device(struct pci_controller* hose, pci_dev_t dev,
struct pci_config_table *); struct pci_config_table *);
#define MAX_PCI_REGIONS 7
#define INDIRECT_TYPE_NO_PCIE_LINK 1 #define INDIRECT_TYPE_NO_PCIE_LINK 1
/** /**
@ -632,7 +630,7 @@ struct pci_controller {
* for PCI controllers and a separate UCLASS (or perhaps * for PCI controllers and a separate UCLASS (or perhaps
* UCLASS_PCI_GENERIC) is used for bridges. * UCLASS_PCI_GENERIC) is used for bridges.
*/ */
struct pci_region regions[MAX_PCI_REGIONS]; struct pci_region *regions;
int region_count; int region_count;
struct pci_config_table *config_table; struct pci_config_table *config_table;