| From 1b13cc4e45b11c2271ef08a779b58b0bad63636d Mon Sep 17 00:00:00 2001 |
| From: Bjorn Helgaas <bhelgaas@google.com> |
| Date: Tue, 29 Nov 2016 08:14:47 -0600 |
| Subject: [PATCH] PCI: Update BARs using property bits appropriate for type |
| |
| commit 45d004f4afefdd8d79916ee6d97a9ecd94bb1ffe upstream. |
| |
| The BAR property bits (0-3 for memory BARs, 0-1 for I/O BARs) are supposed |
| to be read-only, but we do save them in res->flags and include them when |
| updating the BAR. |
| |
| Mask the I/O property bits with ~PCI_BASE_ADDRESS_IO_MASK (0x3) instead of |
| PCI_REGION_FLAG_MASK (0xf) to make it obvious that we can't corrupt bits |
| 2-3 of I/O addresses. |
| |
| Use PCI_ROM_ADDRESS_MASK for ROM BARs. This means we'll only check the top |
| 21 bits (instead of the 28 bits we used to check) of a ROM BAR to see if |
| the update was successful. |
| |
| Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c |
| index bd6fca91c736..8a7322c4775d 100644 |
| --- a/drivers/pci/setup-res.c |
| +++ b/drivers/pci/setup-res.c |
| @@ -58,12 +58,17 @@ static void pci_std_update_resource(struct pci_dev *dev, int resno) |
| return; |
| |
| pcibios_resource_to_bus(dev->bus, ®ion, res); |
| + new = region.start; |
| |
| - new = region.start | (res->flags & PCI_REGION_FLAG_MASK); |
| - if (res->flags & IORESOURCE_IO) |
| + if (res->flags & IORESOURCE_IO) { |
| mask = (u32)PCI_BASE_ADDRESS_IO_MASK; |
| - else |
| + new |= res->flags & ~PCI_BASE_ADDRESS_IO_MASK; |
| + } else if (resno == PCI_ROM_RESOURCE) { |
| + mask = (u32)PCI_ROM_ADDRESS_MASK; |
| + } else { |
| mask = (u32)PCI_BASE_ADDRESS_MEM_MASK; |
| + new |= res->flags & ~PCI_BASE_ADDRESS_MEM_MASK; |
| + } |
| |
| if (resno < PCI_ROM_RESOURCE) { |
| reg = PCI_BASE_ADDRESS_0 + 4 * resno; |
| -- |
| 2.12.0 |
| |