diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-29 12:24:28 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-29 12:24:28 -0700 |
commit | 9f2a5128b94beb6bb63d8fc03d67f47203b04b3a (patch) | |
tree | c73f4d2bffe8147084c8d861d0fd5312dcc83393 /drivers/xen | |
parent | 42057e1825cc581d46a46495e9ddc3f243f31539 (diff) | |
parent | 0d805ee70a69eabd38160dc199e183ac2f13fe4b (diff) | |
download | linux-stable-9f2a5128b94beb6bb63d8fc03d67f47203b04b3a.tar.gz linux-stable-9f2a5128b94beb6bb63d8fc03d67f47203b04b3a.tar.bz2 linux-stable-9f2a5128b94beb6bb63d8fc03d67f47203b04b3a.zip |
Merge tag 'for-linus-4.14c-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
- avoid a warning when compiling with clang
- consider read-only bits in xen-pciback when writing to a BAR
- fix a boot crash of pv-domains
* tag 'for-linus-4.14c-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/mmu: Call xen_cleanhighmap() with 4MB aligned for page tables mapping
xen-pciback: relax BAR sizing write value check
x86/xen: clean up clang build warning
Diffstat (limited to 'drivers/xen')
-rw-r--r-- | drivers/xen/xen-pciback/conf_space_header.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/xen/xen-pciback/conf_space_header.c b/drivers/xen/xen-pciback/conf_space_header.c index 5fbfd9cfb6d6..5b3d57fc82d3 100644 --- a/drivers/xen/xen-pciback/conf_space_header.c +++ b/drivers/xen/xen-pciback/conf_space_header.c @@ -169,6 +169,9 @@ static int rom_write(struct pci_dev *dev, int offset, u32 value, void *data) static int bar_write(struct pci_dev *dev, int offset, u32 value, void *data) { struct pci_bar_info *bar = data; + unsigned int pos = (offset - PCI_BASE_ADDRESS_0) / 4; + const struct resource *res = dev->resource; + u32 mask; if (unlikely(!bar)) { pr_warn(DRV_NAME ": driver data not found for %s\n", @@ -179,7 +182,13 @@ static int bar_write(struct pci_dev *dev, int offset, u32 value, void *data) /* A write to obtain the length must happen as a 32-bit write. * This does not (yet) support writing individual bytes */ - if (value == ~0) + if (res[pos].flags & IORESOURCE_IO) + mask = ~PCI_BASE_ADDRESS_IO_MASK; + else if (pos && (res[pos - 1].flags & IORESOURCE_MEM_64)) + mask = 0; + else + mask = ~PCI_BASE_ADDRESS_MEM_MASK; + if ((value | mask) == ~0U) bar->which = 1; else { u32 tmpval; |