[U-Boot] [PATCH] Revert "dm: pci: Allow scan bridge child devices before relocation"
This reverts commit df189d9ba3f8fd1bc67e3c0c3c4ace16cd065ee1.
Unfortunately this commit breaks chromebook_link because it adds lots of PCI devices before relocation and there is not enough pre-reloc malloc() memory.
Rathar then increase this memory, revert for now until we figure this out.
Signed-off-by: Simon Glass sjg@chromium.org ---
drivers/pci/pci-uclass.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index 6262f35..c7d93f9 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -641,6 +641,10 @@ static int pci_uclass_post_probe(struct udevice *bus) { int ret;
+ /* Don't scan buses before relocation */ + if (!(gd->flags & GD_FLG_RELOC)) + return 0; + debug("%s: probing bus %d\n", __func__, bus->seq); ret = pci_bind_bus_devices(bus); if (ret)
On Tue, Aug 11, 2015 at 10:54 AM, Simon Glass sjg@chromium.org wrote:
This reverts commit df189d9ba3f8fd1bc67e3c0c3c4ace16cd065ee1.
Unfortunately this commit breaks chromebook_link because it adds lots of PCI devices before relocation and there is not enough pre-reloc malloc() memory.
Rathar then increase this memory, revert for now until we figure this out.
Signed-off-by: Simon Glass sjg@chromium.org
drivers/pci/pci-uclass.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index 6262f35..c7d93f9 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -641,6 +641,10 @@ static int pci_uclass_post_probe(struct udevice *bus) { int ret;
/* Don't scan buses before relocation */if (!(gd->flags & GD_FLG_RELOC))return 0;debug("%s: probing bus %d\n", __func__, bus->seq); ret = pci_bind_bus_devices(bus); if (ret)--
Reviewed-by: Bin Meng bmeng.cn@gmail.com
On 10 August 2015 at 21:12, Bin Meng bmeng.cn@gmail.com wrote:
On Tue, Aug 11, 2015 at 10:54 AM, Simon Glass sjg@chromium.org wrote:
This reverts commit df189d9ba3f8fd1bc67e3c0c3c4ace16cd065ee1.
Unfortunately this commit breaks chromebook_link because it adds lots of PCI devices before relocation and there is not enough pre-reloc malloc() memory.
Rathar then increase this memory, revert for now until we figure this out.
Signed-off-by: Simon Glass sjg@chromium.org
drivers/pci/pci-uclass.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index 6262f35..c7d93f9 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -641,6 +641,10 @@ static int pci_uclass_post_probe(struct udevice *bus) { int ret;
/* Don't scan buses before relocation */if (!(gd->flags & GD_FLG_RELOC))return 0;debug("%s: probing bus %d\n", __func__, bus->seq); ret = pci_bind_bus_devices(bus); if (ret)--
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Applied to u-boot-x86.
participants (2)
-
Bin Meng -
Simon Glass