| From bb4c01aed1a74fbc83d3d3cd2e8284bbbab653f5 Mon Sep 17 00:00:00 2001 |
| From: Bjorn Helgaas <bhelgaas@google.com> |
| Date: Mon, 28 Nov 2016 11:19:27 -0600 |
| Subject: [PATCH] PCI: Ignore BAR updates on virtual functions |
| |
| commit 63880b230a4af502c56dde3d4588634c70c66006 upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c |
| index d7d558f8b2ec..132fcd4a7f6f 100644 |
| --- a/drivers/pci/pci.c |
| +++ b/drivers/pci/pci.c |
| @@ -540,10 +540,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 8a7322c4775d..4bc589ee78d0 100644 |
| --- a/drivers/pci/setup-res.c |
| +++ b/drivers/pci/setup-res.c |
| @@ -34,10 +34,9 @@ static void pci_std_update_resource(struct pci_dev *dev, int resno) |
| int reg; |
| 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 |
| -- |
| 2.12.0 |
| |
