summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-11-28 18:19:27 +0100
committerBjorn Helgaas <bhelgaas@google.com>2016-11-28 18:37:56 +0100
commit63880b230a4af502c56dde3d4588634c70c66006 (patch)
tree47cd7eb55cd6d8c8366ef316bc1795bf9233a127
parentPCI: Do any VF BAR updates before enabling the BARs (diff)
downloadlinux-63880b230a4af502c56dde3d4588634c70c66006.tar.xz
linux-63880b230a4af502c56dde3d4588634c70c66006.zip
PCI: Ignore BAR updates on virtual functions
VF BARs are read-only zero, so updating VF BARs will not have any effect. See the SR-IOV spec r1.1, sec 3.4.1.11. We already ignore these updates because of 70675e0b6a1a ("PCI: Don't try to restore VF BARs"); this merely restructures it slightly to make it easier to split updates for standard and SR-IOV BARs. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
-rw-r--r--drivers/pci/pci.c4
-rw-r--r--drivers/pci/setup-res.c5
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index ba34907538f6..631eac2bed78 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -564,10 +564,6 @@ static void pci_restore_bars(struct pci_dev *dev)
{
int i;
- /* Per SR-IOV spec 3.4.1.11, VF BARs are RO zero */
- if (dev->is_virtfn)
- return;
-
for (i = 0; i < PCI_BRIDGE_RESOURCES; i++)
pci_update_resource(dev, i);
}
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 66c4d8f42233..d2a32d88d2ae 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -36,10 +36,9 @@ void pci_update_resource(struct pci_dev *dev, int resno)
enum pci_bar_type type;
struct resource *res = dev->resource + resno;
- if (dev->is_virtfn) {
- dev_warn(&dev->dev, "can't update VF BAR%d\n", resno);
+ /* Per SR-IOV spec 3.4.1.11, VF BARs are RO zero */
+ if (dev->is_virtfn)
return;
- }
/*
* Ignore resources for unimplemented BARs and unused resource slots