Commit 55fc733c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xen updates from David Vrabel:
 "Features and fixes for 4.6:

  - Make earlyprintk=xen work for HVM guests

  - Remove module support for things never built as modules"

* tag 'for-linus-4.6-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  drivers/xen: make platform-pci.c explicitly non-modular
  drivers/xen: make sys-hypervisor.c explicitly non-modular
  drivers/xen: make xenbus_dev_[front/back]end explicitly non-modular
  drivers/xen: make [xen-]ballon explicitly non-modular
  xen: audit usages of module.h ; remove unnecessary instances
  xen/x86: Drop mode-selecting ifdefs in startup_xen()
  xen/x86: Zero out .bss for PV guests
  hvc_xen: make early_printk work with HVM guests
  hvc_xen: fix xenboot for DomUs
  hvc_xen: add earlycon support
parents b8524959 e01dc539

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

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#ifndef _ASM_ARM_XEN_HYPERCALL_H

#define _ASM_ARM_XEN_HYPERCALL_H



#include <linux/bug.h>



#include <xen/interface/xen.h>

#include <xen/interface/sched.h>

#include <xen/interface/platform.h>

arch/x86/xen/xen-head.S

+12 −7
Original line number Diff line number Diff line
@@ -38,13 +38,18 @@ 
	__INIT

ENTRY(startup_xen)

	cld

#ifdef CONFIG_X86_32

	mov %esi,xen_start_info

	mov $init_thread_union+THREAD_SIZE,%esp

#else

	mov %rsi,xen_start_info

	mov $init_thread_union+THREAD_SIZE,%rsp

#endif



	/* Clear .bss */

	xor %eax,%eax

	mov $__bss_start, %_ASM_DI

	mov $__bss_stop, %_ASM_CX

	sub %_ASM_DI, %_ASM_CX

	shr $__ASM_SEL(2, 3), %_ASM_CX

	rep __ASM_SIZE(stos)



	mov %_ASM_SI, xen_start_info

	mov $init_thread_union+THREAD_SIZE, %_ASM_SP



	jmp xen_start_kernel



	__FINIT

drivers/tty/hvc/hvc_xen.c

+58 −17
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/init.h>

#include <linux/types.h>

#include <linux/list.h>

#include <linux/serial_core.h>



#include <asm/io.h>

#include <asm/xen/hypervisor.h>
@@ -245,6 +246,18 @@ err: 
	return -ENODEV;

}



static int xencons_info_pv_init(struct xencons_info *info, int vtermno)

{

	info->evtchn = xen_start_info->console.domU.evtchn;

	/* GFN == MFN for PV guest */

	info->intf = gfn_to_virt(xen_start_info->console.domU.mfn);

	info->vtermno = vtermno;



	list_add_tail(&info->list, &xenconsoles);



	return 0;

}



static int xen_pv_console_init(void)

{

	struct xencons_info *info;
@@ -264,13 +277,8 @@ static int xen_pv_console_init(void) 
		/* already configured */

		return 0;

	}

	info->evtchn = xen_start_info->console.domU.evtchn;

	/* GFN == MFN for PV guest */

	info->intf = gfn_to_virt(xen_start_info->console.domU.mfn);

	info->vtermno = HVC_COOKIE;



	spin_lock(&xencons_lock);

	list_add_tail(&info->list, &xenconsoles);

	xencons_info_pv_init(info, HVC_COOKIE);

	spin_unlock(&xencons_lock);



	return 0;
@@ -597,15 +605,39 @@ static int xen_cons_init(void) 
}

console_initcall(xen_cons_init);



#ifdef CONFIG_X86

static void xen_hvm_early_write(uint32_t vtermno, const char *str, int len)

{

	if (xen_cpuid_base())

		outsb(0xe9, str, len);

}

#else

static void xen_hvm_early_write(uint32_t vtermno, const char *str, int len) { }

#endif



#ifdef CONFIG_EARLY_PRINTK

static int __init xenboot_setup_console(struct console *console, char *string)

{

	static struct xencons_info xenboot;



	if (xen_initial_domain())

		return 0;

	if (!xen_pv_domain())

		return -ENODEV;



	return xencons_info_pv_init(&xenboot, 0);

}



static void xenboot_write_console(struct console *console, const char *string,

				  unsigned len)

{

	unsigned int linelen, off = 0;

	const char *pos;



	if (!xen_pv_domain())

	if (!xen_pv_domain()) {

		xen_hvm_early_write(0, string, len);

		return;

	}



	dom0_write_console(0, string, len);
@@ -628,6 +660,7 @@ static void xenboot_write_console(struct console *console, const char *string, 
struct console xenboot_console = {

	.name		= "xenboot",

	.write		= xenboot_write_console,

	.setup		= xenboot_setup_console,

	.flags		= CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME,

	.index		= -1,

};
@@ -640,17 +673,10 @@ void xen_raw_console_write(const char *str) 


	if (xen_domain()) {

		rc = dom0_write_console(0, str, len);

#ifdef CONFIG_X86

		if (rc == -ENOSYS && xen_hvm_domain())

			goto outb_print;



	} else if (xen_cpuid_base()) {

		int i;

outb_print:

		for (i = 0; i < len; i++)

			outb(str[i], 0xe9);

#endif

		if (rc != -ENOSYS || !xen_hvm_domain())

			return;

	}

	xen_hvm_early_write(0, str, len);

}



void xen_raw_printk(const char *fmt, ...)
@@ -664,3 +690,18 @@ void xen_raw_printk(const char *fmt, ...) 


	xen_raw_console_write(buf);

}



static void xenboot_earlycon_write(struct console *console,

				  const char *string,

				  unsigned len)

{

	dom0_write_console(0, string, len);

}



static int __init xenboot_earlycon_setup(struct earlycon_device *device,

					    const char *opt)

{

	device->con->write = xenboot_earlycon_write;

	return 0;

}

EARLYCON_DECLARE(xenboot, xenboot_earlycon_setup);

drivers/xen/balloon.c

+0 −4
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include <linux/kernel.h>

#include <linux/sched.h>

#include <linux/errno.h>

#include <linux/module.h>

#include <linux/mm.h>

#include <linux/bootmem.h>

#include <linux/pagemap.h>
@@ -760,7 +759,4 @@ static int __init balloon_init(void) 


	return 0;

}



subsys_initcall(balloon_init);
 


MODULE_LICENSE("GPL");

drivers/xen/events/events_2l.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <linux/linkage.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/module.h>



#include <asm/sync_bitops.h>

#include <asm/xen/hypercall.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE