mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
xen: fixes for 4.14-rc3
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAABAgAGBQJZzmQ4AAoJELDendYovxMvL1oIAIBiL7SCEX4mlCjNBYBGw8N+ 4pcYUcKPu07JeAQGC7SOEjcwjrSUw+b6NJIZLCHcPAG/JyejwBAbuztmRgqsIqN9 sVa/7GjecigsE+Jw3gT1OHDxxLMsyk2pa+poeTVdjjqFNOGRzWhG3D5dZGgOUMkF o8KaPgh2jyA2rg6SnxEDXy9aEpDFOO6Yb9cxApwdC+Y399zPEdqauEzFunxzIoa+ S155tI9rr2HcXUp/DxAk/C6PaSmKfEszuKKyvvjFE8latHCaUEJ+HLacURuJUu7C pEc2gOTOo4dkYyDLLIQeCyGbRnH4B1GF9cv0vF//1gfAJzVGtJxmwj1qlezVDCQ= =jfCe -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
9f2a5128b9
3 changed files with 16 additions and 12 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue