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

Commit e306e3be authored Aug 07, 2014 by Linus Torvalds

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

Pull Xen updates from David Vrabel:
 - remove unused V2 grant table support
 - note that Konrad is xen-blkkback/front maintainer
 - add 'xen_nopv' option to disable PV extentions for x86 HVM guests
 - misc minor cleanups

* tag 'stable/for-linus-3.17-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen-pciback: Document the 'quirks' sysfs file
  xen/pciback: Fix error return code in xen_pcibk_attach()
  xen/events: drop negativity check of unsigned parameter
  xen/setup: Remove Identity Map Debug Message
  xen/events/fifo: remove a unecessary use of BM()
  xen/events/fifo: ensure all bitops are properly aligned even on x86
  xen/events/fifo: reset control block and local HEADs on resume
  xen/arm: use BUG_ON
  xen/grant-table: remove support for V2 tables
  x86/xen: safely map and unmap grant frames when in atomic context
  MAINTAINERS: Make me the Xen block subsystem (front and back) maintainer
  xen: Introduce 'xen_nopv' to disable PV extensions for HVM guests.

parents 7f0d32e0 8b63c998

Documentation/ABI/testing/sysfs-driver-pciback

0 → 100644

+13 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/bus/pci/drivers/pciback/quirks
			Date: Oct 2011
			KernelVersion: 3.1
			Contact: xen-devel@lists.xenproject.org
			Description:
			If the permissive attribute is set, then writing a string in
			the format of DDDD:BB:DD.F-REG:SIZE:MASK will allow the guest
			to write and read from the PCI device. That is Domain:Bus:
			Device.Function-Register:Size:Mask (Domain is optional).
			For example:
			#echo 00:19.0-E0:2:FF > /sys/bus/pci/drivers/pciback/quirks
			will allow the guest to read and write to the configuration
			register 0x0E.

Documentation/kernel-parameters.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3745,6 +3745,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
	Disables the ticketlock slowpath using Xen PV		Disables the ticketlock slowpath using Xen PV
	optimizations.		optimizations.

			xen_nopv [X86]
			Disables the PV optimizations forcing the HVM guest to
			run as generic HVM guest with no PV drivers.

	xirc2ps_cs= [NET,PCMCIA]		xirc2ps_cs= [NET,PCMCIA]
	Format:		Format:
	<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]		<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]

MAINTAINERS

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -10066,6 +10066,13 @@ S: Supported
	F: arch/x86/pci/xen		F: arch/x86/pci/xen
	F: drivers/pci/xen		F: drivers/pci/xen

			XEN BLOCK SUBSYSTEM
			M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
			L: xen-devel@lists.xenproject.org (moderated for non-subscribers)
			S: Supported
			F: drivers/block/xen-blkback/*
			F: drivers/block/xen*

	XEN SWIOTLB SUBSYSTEM		XEN SWIOTLB SUBSYSTEM
	M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>		M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
	L: xen-devel@lists.xenproject.org (moderated for non-subscribers)		L: xen-devel@lists.xenproject.org (moderated for non-subscribers)

arch/arm/xen/enlighten.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -181,8 +181,7 @@ static void xen_restart(enum reboot_mode reboot_mode, const char *cmd)
	struct sched_shutdown r = { .reason = SHUTDOWN_reboot };		struct sched_shutdown r = { .reason = SHUTDOWN_reboot };
	int rc;		int rc;
	rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);		rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
	if (rc)		BUG_ON(rc);
	BUG();
	}		}

	static void xen_power_off(void)		static void xen_power_off(void)
	@@ -190,8 +189,7 @@ static void xen_power_off(void)
	struct sched_shutdown r = { .reason = SHUTDOWN_poweroff };		struct sched_shutdown r = { .reason = SHUTDOWN_poweroff };
	int rc;		int rc;
	rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);		rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
	if (rc)		BUG_ON(rc);
	BUG();
	}		}

	static int xen_cpu_notification(struct notifier_block *self,		static int xen_cpu_notification(struct notifier_block *self,

arch/arm/xen/grant-table.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -45,11 +45,9 @@ void arch_gnttab_unmap(void *shared, unsigned long nr_gframes)
	return;		return;
	}		}

	int arch_gnttab_map_status(uint64_t *frames, unsigned long nr_gframes,		int arch_gnttab_init(unsigned long nr_shared)
	unsigned long max_nr_gframes,
	grant_status_t **__shared)
	{		{
	return -ENOSYS;		return 0;
	}		}

	int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status)		int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status)