PCI: Update BARs using property bits appropriate for type
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 17 Mar 2017 00:48:24 +0000 (00:48 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Mar 2017 11:43:37 +0000 (12:43 +0100)
commit74cce811a4b60d64c5c30496f326ecd18a72a6b2
treeeb413b7c332fdb67083c9fc2834d889fc5ee514b
parenta38012dc69eb2fb1a660bbc88e98c882b5cf2fcb
PCI: Update BARs using property bits appropriate for type

[ Upstream commit 45d004f4afefdd8d79916ee6d97a9ecd94bb1ffe ]

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: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/pci/setup-res.c