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

Commit a9648072 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-4.12b-rc0b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen updates from Juergen Gross:
 "Xen fixes and featrues for 4.12. The main changes are:

   - enable building the kernel with Xen support but without enabling
     paravirtualized mode (Vitaly Kuznetsov)

   - add a new 9pfs xen frontend driver (Stefano Stabellini)

   - simplify Xen's cpuid handling by making use of cpu capabilities
     (Juergen Gross)

   - add/modify some headers for new Xen paravirtualized devices
     (Oleksandr Andrushchenko)

   - EFI reset_system support under Xen (Julien Grall)

   - and the usual cleanups and corrections"

* tag 'for-linus-4.12b-rc0b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: (57 commits)
  xen: Move xen_have_vector_callback definition to enlighten.c
  xen: Implement EFI reset_system callback
  arm/xen: Consolidate calls to shutdown hypercall in a single helper
  xen: Export xen_reboot
  xen/x86: Call xen_smp_intr_init_pv() on BSP
  xen: Revert commits da72ff5b and 72a9b186
  xen/pvh: Do not fill kernel's e820 map in init_pvh_bootparams()
  xen/scsifront: use offset_in_page() macro
  xen/arm,arm64: rename __generic_dma_ops to xen_get_dma_ops
  xen/arm,arm64: fix xen_dma_ops after 815dd187 "Consolidate get_dma_ops..."
  xen/9pfs: select CONFIG_XEN_XENBUS_FRONTEND
  x86/cpu: remove hypervisor specific set_cpu_features
  vmware: set cpu capabilities during platform initialization
  x86/xen: use capabilities instead of fake cpuid values for xsave
  x86/xen: use capabilities instead of fake cpuid values for x2apic
  x86/xen: use capabilities instead of fake cpuid values for mwait
  x86/xen: use capabilities instead of fake cpuid values for acpi
  x86/xen: use capabilities instead of fake cpuid values for acc
  x86/xen: use capabilities instead of fake cpuid values for mtrr
  x86/xen: use capabilities instead of fake cpuid values for aperf
  ...
parents a1be8edd 3dbd8204

arch/arm/include/asm/device.h

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ struct dev_archdata { 
#endif

#ifdef CONFIG_ARM_DMA_USE_IOMMU

	struct dma_iommu_mapping	*mapping;

#endif

#ifdef CONFIG_XEN

	const struct dma_map_ops *dev_dma_ops;

#endif

	bool dma_coherent;

};

arch/arm/include/asm/dma-mapping.h

+1 −11
Original line number Diff line number Diff line
@@ -16,19 +16,9 @@ 
extern const struct dma_map_ops arm_dma_ops;

extern const struct dma_map_ops arm_coherent_dma_ops;



static inline const struct dma_map_ops *__generic_dma_ops(struct device *dev)

{

	if (dev && dev->dma_ops)

		return dev->dma_ops;

	return &arm_dma_ops;

}



static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)

{

	if (xen_initial_domain())

		return xen_dma_ops;

	else

		return __generic_dma_ops(NULL);

	return &arm_dma_ops;

}



#define HAVE_ARCH_DMA_SUPPORTED 1

arch/arm/mm/dma-mapping.c

+7 −0
Original line number Diff line number Diff line
@@ -2414,6 +2414,13 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, 
		dma_ops = arm_get_dma_map_ops(coherent);



	set_dma_ops(dev, dma_ops);



#ifdef CONFIG_XEN

	if (xen_initial_domain()) {

		dev->archdata.dev_dma_ops = dev->dma_ops;

		dev->dma_ops = xen_dma_ops;

	}

#endif

}



void arch_teardown_dma_ops(struct device *dev)

arch/arm/xen/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,6 @@ void __init xen_efi_runtime_setup(void) 
	efi.update_capsule           = xen_efi_update_capsule;

	efi.query_capsule_caps       = xen_efi_query_capsule_caps;

	efi.get_next_high_mono_count = xen_efi_get_next_high_mono_count;

	efi.reset_system             = NULL; /* Functionality provided by Xen. */

	efi.reset_system             = xen_efi_reset_system;

}

EXPORT_SYMBOL_GPL(xen_efi_runtime_setup);

arch/arm/xen/enlighten.c

+10 −6
Original line number Diff line number Diff line
@@ -191,20 +191,24 @@ static int xen_dying_cpu(unsigned int cpu) 
	return 0;

}



static void xen_restart(enum reboot_mode reboot_mode, const char *cmd)

void xen_reboot(int reason)

{

	struct sched_shutdown r = { .reason = SHUTDOWN_reboot };

	struct sched_shutdown r = { .reason = reason };

	int rc;



	rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);

	BUG_ON(rc);

}



static void xen_restart(enum reboot_mode reboot_mode, const char *cmd)

{

	xen_reboot(SHUTDOWN_reboot);

}





static void xen_power_off(void)

{

	struct sched_shutdown r = { .reason = SHUTDOWN_poweroff };

	int rc;

	rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);

	BUG_ON(rc);

	xen_reboot(SHUTDOWN_poweroff);

}



static irqreturn_t xen_arm_callback(int irq, void *arg)