Commit 7adf12b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-4.2-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen updates from David Vrabel:
 "Xen features and cleanups for 4.2-rc0:

   - add "make xenconfig" to assist in generating configs for Xen guests

   - preparatory cleanups necessary for supporting 64 KiB pages in ARM
     guests

   - automatically use hvc0 as the default console in ARM guests"

* tag 'for-linus-4.2-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  block/xen-blkback: s/nr_pages/nr_segs/
  block/xen-blkfront: Remove invalid comment
  block/xen-blkfront: Remove unused macro MAXIMUM_OUTSTANDING_BLOCK_REQS
  arm/xen: Drop duplicate define mfn_to_virt
  xen/grant-table: Remove unused macro SPP
  xen/xenbus: client: Fix call of virt_to_mfn in xenbus_grant_ring
  xen: Include xen/page.h rather than asm/xen/page.h
  kconfig: add xenconfig defconfig helper
  kconfig: clarify kvmconfig is for kvm
  xen/pcifront: Remove usage of struct timeval
  xen/tmem: use BUILD_BUG_ON() in favor of BUG_ON()
  hvc_xen: avoid uninitialized variable warning
  xenbus: avoid uninitialized variable warning
  xen/arm: allow console=hvc0 to be omitted for guests
  arm,arm64/xen: move Xen initialization earlier
  arm/xen: Correctly check if the event channel interrupt is present
parents 02201e3f 6684fa1c

arch/arm/include/asm/xen/hypervisor.h

+8 −0
Original line number Diff line number Diff line 
#ifndef _ASM_ARM_XEN_HYPERVISOR_H

#define _ASM_ARM_XEN_HYPERVISOR_H



#include <linux/init.h>



extern struct shared_info *HYPERVISOR_shared_info;

extern struct start_info *xen_start_info;
@@ -18,4 +20,10 @@ static inline enum paravirt_lazy_mode paravirt_get_lazy_mode(void) 


extern struct dma_map_ops *xen_dma_ops;



#ifdef CONFIG_XEN

void __init xen_early_init(void);

#else

static inline void xen_early_init(void) { return; }

#endif



#endif /* _ASM_ARM_XEN_HYPERVISOR_H */

arch/arm/include/asm/xen/page.h

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <xen/interface/grant_table.h>



#define phys_to_machine_mapping_valid(pfn) (1)

#define mfn_to_virt(m)			(__va(mfn_to_pfn(m) << PAGE_SHIFT))



#define pte_mfn	    pte_pfn

#define mfn_pte	    pfn_pte

arch/arm/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <asm/cacheflush.h>

#include <asm/cachetype.h>

#include <asm/tlbflush.h>

#include <asm/xen/hypervisor.h>



#include <asm/prom.h>

#include <asm/mach/arch.h>
@@ -972,6 +973,7 @@ void __init setup_arch(char **cmdline_p) 


	arm_dt_init_cpu_maps();

	psci_init();

	xen_early_init();

#ifdef CONFIG_SMP

	if (is_smp()) {

		if (!mdesc->smp_init || !mdesc->smp_init()) {

arch/arm/xen/enlighten.c

+39 −23
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/cpuidle.h>

#include <linux/cpufreq.h>

#include <linux/cpu.h>

#include <linux/console.h>



#include <linux/mm.h>
@@ -51,7 +52,9 @@ EXPORT_SYMBOL_GPL(xen_have_vector_callback); 
int xen_platform_pci_unplug = XEN_UNPLUG_ALL;

EXPORT_SYMBOL_GPL(xen_platform_pci_unplug);



static __read_mostly int xen_events_irq = -1;

static __read_mostly unsigned int xen_events_irq;



static __initdata struct device_node *xen_node;



int xen_remap_domain_mfn_array(struct vm_area_struct *vma,

			       unsigned long addr,
@@ -150,40 +153,28 @@ static irqreturn_t xen_arm_callback(int irq, void *arg) 
 * documentation of the Xen Device Tree format.

 */

#define GRANT_TABLE_PHYSADDR 0

static int __init xen_guest_init(void)

void __init xen_early_init(void)

{

	struct xen_add_to_physmap xatp;

	static struct shared_info *shared_info_page = 0;

	struct device_node *node;

	int len;

	const char *s = NULL;

	const char *version = NULL;

	const char *xen_prefix = "xen,xen-";

	struct resource res;

	phys_addr_t grant_frames;



	node = of_find_compatible_node(NULL, NULL, "xen,xen");

	if (!node) {

	xen_node = of_find_compatible_node(NULL, NULL, "xen,xen");

	if (!xen_node) {

		pr_debug("No Xen support\n");

		return 0;

		return;

	}

	s = of_get_property(node, "compatible", &len);

	s = of_get_property(xen_node, "compatible", &len);

	if (strlen(xen_prefix) + 3  < len &&

			!strncmp(xen_prefix, s, strlen(xen_prefix)))

		version = s + strlen(xen_prefix);

	if (version == NULL) {

		pr_debug("Xen version not found\n");

		return 0;

		return;

	}

	if (of_address_to_resource(node, GRANT_TABLE_PHYSADDR, &res))

		return 0;

	grant_frames = res.start;

	xen_events_irq = irq_of_parse_and_map(node, 0);

	pr_info("Xen %s support found, events_irq=%d gnttab_frame=%pa\n",

			version, xen_events_irq, &grant_frames);



	if (xen_events_irq < 0)

		return -ENODEV;

	pr_info("Xen %s support found\n", version);



	xen_domain_type = XEN_HVM_DOMAIN;
@@ -194,9 +185,34 @@ static int __init xen_guest_init(void) 
	else

		xen_start_info->flags &= ~(SIF_INITDOMAIN|SIF_PRIVILEGED);



	if (!shared_info_page)

		shared_info_page = (struct shared_info *)

			get_zeroed_page(GFP_KERNEL);

	if (!console_set_on_cmdline && !xen_initial_domain())

		add_preferred_console("hvc", 0, NULL);

}



static int __init xen_guest_init(void)

{

	struct xen_add_to_physmap xatp;

	struct shared_info *shared_info_page = NULL;

	struct resource res;

	phys_addr_t grant_frames;



	if (!xen_domain())

		return 0;



	if (of_address_to_resource(xen_node, GRANT_TABLE_PHYSADDR, &res)) {

		pr_err("Xen grant table base address not found\n");

		return -ENODEV;

	}

	grant_frames = res.start;



	xen_events_irq = irq_of_parse_and_map(xen_node, 0);

	if (!xen_events_irq) {

		pr_err("Xen event channel interrupt not found\n");

		return -ENODEV;

	}



	shared_info_page = (struct shared_info *)get_zeroed_page(GFP_KERNEL);



	if (!shared_info_page) {

		pr_err("not enough memory\n");

		return -ENOMEM;

arch/arm/xen/mm.c

+1 −1
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
#include <xen/xen.h>

#include <xen/interface/grant_table.h>

#include <xen/interface/memory.h>

#include <xen/page.h>

#include <xen/swiotlb-xen.h>



#include <asm/cacheflush.h>

#include <asm/xen/page.h>

#include <asm/xen/hypercall.h>

#include <asm/xen/interface.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE