Commit 9f2a5128 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 42057e18 0d805ee7
...@@ -551,13 +551,13 @@ static inline void ...@@ -551,13 +551,13 @@ static inline void
MULTI_update_descriptor(struct multicall_entry *mcl, u64 maddr, MULTI_update_descriptor(struct multicall_entry *mcl, u64 maddr,
struct desc_struct desc) struct desc_struct desc)
{ {
u32 *p = (u32 *) &desc;
mcl->op = __HYPERVISOR_update_descriptor; mcl->op = __HYPERVISOR_update_descriptor;
if (sizeof(maddr) == sizeof(long)) { if (sizeof(maddr) == sizeof(long)) {
mcl->args[0] = maddr; mcl->args[0] = maddr;
mcl->args[1] = *(unsigned long *)&desc; mcl->args[1] = *(unsigned long *)&desc;
} else { } else {
u32 *p = (u32 *)&desc;
mcl->args[0] = maddr; mcl->args[0] = maddr;
mcl->args[1] = maddr >> 32; mcl->args[1] = maddr >> 32;
mcl->args[2] = *p++; mcl->args[2] = *p++;
......
...@@ -1238,21 +1238,16 @@ static void __init xen_pagetable_cleanhighmap(void) ...@@ -1238,21 +1238,16 @@ static void __init xen_pagetable_cleanhighmap(void)
* from _brk_limit way up to the max_pfn_mapped (which is the end of * from _brk_limit way up to the max_pfn_mapped (which is the end of
* the ramdisk). We continue on, erasing PMD entries that point to page * the ramdisk). We continue on, erasing PMD entries that point to page
* tables - do note that they are accessible at this stage via __va. * tables - do note that they are accessible at this stage via __va.
* For good measure we also round up to the PMD - which means that if * As Xen is aligning the memory end to a 4MB boundary, for good
* measure we also round up to PMD_SIZE * 2 - which means that if
* anybody is using __ka address to the initial boot-stack - and try * anybody is using __ka address to the initial boot-stack - and try
* to use it - they are going to crash. The xen_start_info has been * to use it - they are going to crash. The xen_start_info has been
* taken care of already in xen_setup_kernel_pagetable. */ * taken care of already in xen_setup_kernel_pagetable. */
addr = xen_start_info->pt_base; addr = xen_start_info->pt_base;
size = roundup(xen_start_info->nr_pt_frames * PAGE_SIZE, PMD_SIZE); size = xen_start_info->nr_pt_frames * PAGE_SIZE;
xen_cleanhighmap(addr, addr + size); xen_cleanhighmap(addr, roundup(addr + size, PMD_SIZE * 2));
xen_start_info->pt_base = (unsigned long)__va(__pa(xen_start_info->pt_base)); xen_start_info->pt_base = (unsigned long)__va(__pa(xen_start_info->pt_base));
#ifdef DEBUG
/* This is superfluous and is not necessary, but you know what
* lets do it. The MODULES_VADDR -> MODULES_END should be clear of
* anything at this stage. */
xen_cleanhighmap(MODULES_VADDR, roundup(MODULES_VADDR, PUD_SIZE) - 1);
#endif
} }
#endif #endif
......
...@@ -169,6 +169,9 @@ static int rom_write(struct pci_dev *dev, int offset, u32 value, void *data) ...@@ -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) static int bar_write(struct pci_dev *dev, int offset, u32 value, void *data)
{ {
struct pci_bar_info *bar = 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)) { if (unlikely(!bar)) {
pr_warn(DRV_NAME ": driver data not found for %s\n", 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) ...@@ -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. /* A write to obtain the length must happen as a 32-bit write.
* This does not (yet) support writing individual bytes * 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; bar->which = 1;
else { else {
u32 tmpval; u32 tmpval;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment