Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18cb657c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable/xen-pcifront-0.8.2' of... 

Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
  and branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm

* 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm:
  xen: register xen pci notifier
  xen: initialize cpu masks for pv guests in xen_smp_init
  xen: add a missing #include to arch/x86/pci/xen.c
  xen: mask the MTRR feature from the cpuid
  xen: make hvc_xen console work for dom0.
  xen: add the direct mapping area for ISA bus access
  xen: Initialize xenbus for dom0.
  xen: use vcpu_ops to setup cpu masks
  xen: map a dummy page for local apic and ioapic in xen_set_fixmap
  xen: remap MSIs into pirqs when running as initial domain
  xen: remap GSIs as pirqs when running as initial domain
  xen: introduce XEN_DOM0 as a silent option
  xen: map MSIs into pirqs
  xen: support GSI -> pirq remapping in PV on HVM guests
  xen: add xen hvm acpi_register_gsi variant
  acpi: use indirect call to register gsi in different modes
  xen: implement xen_hvm_register_pirq
  xen: get the maximum number of pirqs from xen
  xen: support pirq != irq

* 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (27 commits)
  X86/PCI: Remove the dependency on isapnp_disable.
  xen: Update Makefile with CONFIG_BLOCK dependency for biomerge.c
  MAINTAINERS: Add myself to the Xen Hypervisor Interface and remove Chris Wright.
  x86: xen: Sanitse irq handling (part two)
  swiotlb-xen: On x86-32 builts, select SWIOTLB instead of depending on it.
  MAINTAINERS: Add myself for Xen PCI and Xen SWIOTLB maintainer.
  xen/pci: Request ACS when Xen-SWIOTLB is activated.
  xen-pcifront: Xen PCI frontend driver.
  xenbus: prevent warnings on unhandled enumeration values
  xenbus: Xen paravirtualised PCI hotplug support.
  xen/x86/PCI: Add support for the Xen PCI subsystem
  x86: Introduce x86_msi_ops
  msi: Introduce default_[teardown|setup]_msi_irqs with fallback.
  x86/PCI: Export pci_walk_bus function.
  x86/PCI: make sure _PAGE_IOMAP it set on pci mappings
  x86/PCI: Clean up pci_cache_line_size
  xen: fix shared irq device passthrough
  xen: Provide a variant of xen_poll_irq with timeout.
  xen: Find an unbound irq number in reverse order (high to low).
  xen: statically initialize cpu_evtchn_mask_p
  ...

Fix up trivial conflicts in drivers/pci/Makefile
parents 2301b65b e28c31a9

MAINTAINERS

+17 −3
Original line number Diff line number Diff line
@@ -6595,11 +6595,25 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86. 
S:	Maintained

F:	drivers/platform/x86



XEN PCI SUBSYSTEM

M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

L:	xen-devel@lists.xensource.com

S:	Supported

F:	arch/x86/pci/*xen*

F:	drivers/pci/*xen*



XEN SWIOTLB SUBSYSTEM

M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

L:	xen-devel@lists.xensource.com

S:	Supported

F:	arch/x86/xen/*swiotlb*

F:	drivers/xen/*swiotlb*



XEN HYPERVISOR INTERFACE

M:	Jeremy Fitzhardinge <jeremy@xensource.com>

M:	Chris Wright <chrisw@sous-sol.org>

M:	Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

L:	xen-devel@lists.xen.org

L:	virtualization@lists.osdl.org

L:	xen-devel@lists.xensource.com

S:	Supported

F:	arch/x86/xen/

F:	drivers/*/xen-*front.c

arch/x86/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -1893,6 +1893,11 @@ config PCI_OLPC 
	def_bool y

	depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY)



config PCI_XEN

	def_bool y

	depends on PCI && XEN

	select SWIOTLB_XEN



config PCI_DOMAINS

	def_bool y

	depends on PCI

arch/x86/include/asm/acpi.h

+3 −0
Original line number Diff line number Diff line
@@ -93,6 +93,9 @@ extern u8 acpi_sci_flags; 
extern int acpi_sci_override_gsi;

void acpi_pic_sci_set_trigger(unsigned int, u16);



extern int (*__acpi_register_gsi)(struct device *dev, u32 gsi,

				  int trigger, int polarity);



static inline void disable_acpi(void)

{

	acpi_disabled = 1;

arch/x86/include/asm/io.h

+13 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ 
#include <asm-generic/int-ll64.h>

#include <asm/page.h>



#include <xen/xen.h>



#define build_mmio_read(name, size, type, reg, barrier) \

static inline type name(const volatile void __iomem *addr) \

{ type ret; asm volatile("mov" size " %1,%0":reg (ret) \
@@ -351,6 +353,17 @@ extern void early_iounmap(void __iomem *addr, unsigned long size); 
extern void fixup_early_ioremap(void);

extern bool is_early_ioremap_ptep(pte_t *ptep);



#ifdef CONFIG_XEN

struct bio_vec;



extern bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,

				      const struct bio_vec *vec2);



#define BIOVEC_PHYS_MERGEABLE(vec1, vec2)				\

	(__BIOVEC_PHYS_MERGEABLE(vec1, vec2) &&				\

	 (!xen_domain() || xen_biovec_phys_mergeable(vec1, vec2)))

#endif	/* CONFIG_XEN */



#define IO_SPACE_LIMIT 0xffff



#endif /* _ASM_X86_IO_H */

arch/x86/include/asm/io_apic.h

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ extern void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries); 
extern int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);



extern void probe_nr_irqs_gsi(void);

extern int get_nr_irqs_gsi(void);



extern void setup_ioapic_ids_from_mpc(void);