diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-12-12 11:25:11 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-12-12 11:25:11 -0600 |
| commit | 44b83b32e7c8d6fcd6a7e877ce3db65f6afdf87c (patch) | |
| tree | 234c09cccd1e7a475598e79316cc61e3fd78c646 /drivers/pci/setup-res.c | |
| parent | a1d9190d9682fd5cb8af811228f492b2ddd41366 (diff) | |
| parent | 0722bdd2962a4a0f6d5e8973b0d274d147adacfb (diff) | |
| download | op-kernel-dev-44b83b32e7c8d6fcd6a7e877ce3db65f6afdf87c.zip op-kernel-dev-44b83b32e7c8d6fcd6a7e877ce3db65f6afdf87c.tar.gz | |
Merge branch 'pci/host-rockchip' into next
* pci/host-rockchip:
PCI: rockchip: Move the deassert of pm/aclk/pclk after phy_init()
PCI: rockchip: Split out rockchip_cfg_atu()
PCI: rockchip: Clean up bit definitions for PCIE_RC_CONFIG_LCS
PCI: rockchip: Correct the use of FTS mask
PCI: rockchip: Remove the pointer to L1 substate cap
PCI: rockchip: Specify the link capability
PCI: rockchip: Fix negotiated lanes calculation
PCI: rockchip: Add Kconfig COMPILE_TEST
PCI: rockchip: Mark RC as common clock architecture
PCI: rockchip: Provide captured slot power limit and scale
PCI: rockchip: Add three new resets as required properties
PCI: Don't attempt to claim shadow copies of ROM
PCI: designware: Check for iATU unroll support after initializing host
PCI: qcom: Fix pp->dev usage before assignment
PCI: designware-plat: Update author email address
PCI: layerscape: Fix drvdata usage before assignment
PCI: designware-plat: Change maintainer to Jose Abreu
Diffstat (limited to 'drivers/pci/setup-res.c')
| -rw-r--r-- | drivers/pci/setup-res.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index 0454273..4bc589e 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -141,6 +141,14 @@ int pci_claim_resource(struct pci_dev *dev, int resource) return -EINVAL; } + /* + * If we have a shadow copy in RAM, the PCI device doesn't respond + * to the shadow range, so we don't need to claim it, and upstream + * bridges don't need to route the range to the device. + */ + if (res->flags & IORESOURCE_ROM_SHADOW) + return 0; + root = pci_find_parent_resource(dev, res); if (!root) { dev_info(&dev->dev, "can't claim BAR %d %pR: no compatible bridge window\n", |
