mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 05:31:32 +00:00
x86: apl: Avoid accessing the PCI bus before it is probed
The PCI bus is not actually probed by the time the ofdata_to_platdata() method is called since that happens in the uclass's post_probe() method. Update the PMC and P2SB drivers to access the bus in its probe() method. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
1058eec0f4
commit
3d9acea3d9
2 changed files with 29 additions and 11 deletions
|
@ -106,11 +106,6 @@ int apl_p2sb_ofdata_to_platdata(struct udevice *dev)
|
|||
if (plat->bdf < 0)
|
||||
return log_msg_ret("Cannot get p2sb PCI address",
|
||||
plat->bdf);
|
||||
} else {
|
||||
plat->mmio_base = dev_read_addr_pci(dev);
|
||||
/* Don't set BDF since it should not be used */
|
||||
if (!plat->mmio_base || plat->mmio_base == FDT_ADDR_T_NONE)
|
||||
return -EINVAL;
|
||||
}
|
||||
#else
|
||||
plat->mmio_base = plat->dtplat.early_regs[0];
|
||||
|
@ -124,10 +119,19 @@ int apl_p2sb_ofdata_to_platdata(struct udevice *dev)
|
|||
|
||||
static int apl_p2sb_probe(struct udevice *dev)
|
||||
{
|
||||
if (spl_phase() == PHASE_TPL)
|
||||
if (spl_phase() == PHASE_TPL) {
|
||||
return apl_p2sb_early_init(dev);
|
||||
else if (spl_phase() == PHASE_SPL)
|
||||
return apl_p2sb_spl_init(dev);
|
||||
} else {
|
||||
struct p2sb_platdata *plat = dev_get_platdata(dev);
|
||||
|
||||
plat->mmio_base = dev_read_addr_pci(dev);
|
||||
/* Don't set BDF since it should not be used */
|
||||
if (!plat->mmio_base || plat->mmio_base == FDT_ADDR_T_NONE)
|
||||
return -EINVAL;
|
||||
|
||||
if (spl_phase() == PHASE_SPL)
|
||||
return apl_p2sb_spl_init(dev);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -119,8 +119,16 @@ int apl_pmc_ofdata_to_uc_platdata(struct udevice *dev)
|
|||
ret = dev_read_u32_array(dev, "early-regs", base, ARRAY_SIZE(base));
|
||||
if (ret)
|
||||
return log_msg_ret("Missing/short early-regs", ret);
|
||||
upriv->pmc_bar0 = (void *)base[0];
|
||||
upriv->pmc_bar2 = (void *)base[2];
|
||||
if (spl_phase() == PHASE_TPL) {
|
||||
upriv->pmc_bar0 = (void *)base[0];
|
||||
upriv->pmc_bar2 = (void *)base[2];
|
||||
|
||||
/* Since PCI is not enabled, we must get the BDF manually */
|
||||
plat->bdf = pci_get_devfn(dev);
|
||||
if (plat->bdf < 0)
|
||||
return log_msg_ret("Cannot get PMC PCI address",
|
||||
plat->bdf);
|
||||
}
|
||||
upriv->acpi_base = base[4];
|
||||
|
||||
/* Since PCI is not enabled, we must get the BDF manually */
|
||||
|
@ -187,8 +195,14 @@ static int enable_pmcbar(struct udevice *dev)
|
|||
|
||||
static int apl_pmc_probe(struct udevice *dev)
|
||||
{
|
||||
if (spl_phase() == PHASE_TPL)
|
||||
if (spl_phase() == PHASE_TPL) {
|
||||
return enable_pmcbar(dev);
|
||||
} else {
|
||||
struct acpi_pmc_upriv *upriv = dev_get_uclass_priv(dev);
|
||||
|
||||
upriv->pmc_bar0 = (void *)dm_pci_read_bar32(dev, 0);
|
||||
upriv->pmc_bar2 = (void *)dm_pci_read_bar32(dev, 2);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue