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

Commit 04a87524 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'stable/drivers-3.2', 'stable/drivers.bugfixes-3.2' and... 

Merge branches 'stable/drivers-3.2', 'stable/drivers.bugfixes-3.2' and 'stable/pci.fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* 'stable/drivers-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xenbus: don't rely on xen_initial_domain to detect local xenstore
  xenbus: Fix loopback event channel assuming domain 0
  xen/pv-on-hvm:kexec: Fix implicit declaration of function 'xen_hvm_domain'
  xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel
  xen/pv-on-hvm kexec: update xs_wire.h:xsd_sockmsg_type from xen-unstable
  xen/pv-on-hvm kexec+kdump: reset PV devices in kexec or crash kernel
  xen/pv-on-hvm kexec: rebind virqs to existing eventchannel ports
  xen/pv-on-hvm kexec: prevent crash in xenwatch_thread() when stale watch events arrive

* 'stable/drivers.bugfixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/pciback: Check if the device is found instead of blindly assuming so.
  xen/pciback: Do not dereference psdev during printk when it is NULL.
  xen: remove XEN_PLATFORM_PCI config option
  xen: XEN_PVHVM depends on PCI
  xen/pciback: double lock typo
  xen/pciback: use mutex rather than spinlock in vpci backend
  xen/pciback: Use mutexes when working with Xenbus state transitions.
  xen/pciback: miscellaneous adjustments
  xen/pciback: use mutex rather than spinlock in passthrough backend
  xen/pciback: use resource_size()

* 'stable/pci.fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/pci: support multi-segment systems
  xen-swiotlb: When doing coherent alloc/dealloc check before swizzling the MFNs.
  xen/pci: make bus notifier handler return sane values
  xen-swiotlb: fix printk and panic args
  xen-swiotlb: Fix wrong panic.
  xen-swiotlb: Retry up three times to allocate Xen-SWIOTLB
  xen-pcifront: Update warning comment to use 'e820_host' option.
parents 31018acd e4184aaf 4645bf30 55e901fc

arch/x86/pci/xen.c

+19 −3
Original line number Diff line number Diff line
@@ -252,6 +252,8 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 
}



#ifdef CONFIG_XEN_DOM0

static bool __read_mostly pci_seg_supported = true;



static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)

{

	int ret = 0;
@@ -269,10 +271,11 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 


		memset(&map_irq, 0, sizeof(map_irq));

		map_irq.domid = domid;

		map_irq.type = MAP_PIRQ_TYPE_MSI;

		map_irq.type = MAP_PIRQ_TYPE_MSI_SEG;

		map_irq.index = -1;

		map_irq.pirq = -1;

		map_irq.bus = dev->bus->number;

		map_irq.bus = dev->bus->number |

			      (pci_domain_nr(dev->bus) << 16);

		map_irq.devfn = dev->devfn;



		if (type == PCI_CAP_ID_MSIX) {
@@ -289,7 +292,20 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 
			map_irq.entry_nr = msidesc->msi_attrib.entry_nr;

		}



		ret = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);

		ret = -EINVAL;

		if (pci_seg_supported)

			ret = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq,

						    &map_irq);

		if (ret == -EINVAL && !pci_domain_nr(dev->bus)) {

			map_irq.type = MAP_PIRQ_TYPE_MSI;

			map_irq.index = -1;

			map_irq.pirq = -1;

			map_irq.bus = dev->bus->number;

			ret = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq,

						    &map_irq);

			if (ret != -EINVAL)

				pci_seg_supported = false;

		}

		if (ret) {

			dev_warn(&dev->dev, "xen map irq failed %d for %d domain\n",

				 ret, domid);

arch/x86/xen/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ config XEN_PRIVILEGED_GUEST 


config XEN_PVHVM

	def_bool y

	depends on XEN

	depends on X86_LOCAL_APIC

	depends on XEN && PCI && X86_LOCAL_APIC



config XEN_MAX_DOMAIN_MEMORY

       int

drivers/pci/xen-pcifront.c

+2 −3
Original line number Diff line number Diff line
@@ -400,9 +400,8 @@ static int pcifront_claim_resource(struct pci_dev *dev, void *data) 
			dev_info(&pdev->xdev->dev, "claiming resource %s/%d\n",

				pci_name(dev), i);

			if (pci_claim_resource(dev, i)) {

				dev_err(&pdev->xdev->dev, "Could not claim "

					"resource %s/%d! Device offline. Try "

					"giving less than 4GB to domain.\n",

				dev_err(&pdev->xdev->dev, "Could not claim resource %s/%d! "

					"Device offline. Try using e820_host=1 in the guest config.\n",

					pci_name(dev), i);

			}

		}

drivers/xen/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -137,16 +137,6 @@ config XEN_GRANT_DEV_ALLOC 
	  to other domains. This can be used to implement frontend drivers

	  or as part of an inter-domain shared memory channel.



config XEN_PLATFORM_PCI

	tristate "xen platform pci device driver"

	depends on XEN_PVHVM && PCI

	default m

	help

	  Driver for the Xen PCI Platform device: it is responsible for

	  initializing xenbus and grant_table when running in a Xen HVM

	  domain. As a consequence this driver is required to run any Xen PV

	  frontend on Xen HVM.



config SWIOTLB_XEN

	def_bool y

	depends on PCI

drivers/xen/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ obj-$(CONFIG_XEN_GNTDEV) += xen-gntdev.o 
obj-$(CONFIG_XEN_GRANT_DEV_ALLOC)	+= xen-gntalloc.o

obj-$(CONFIG_XENFS)			+= xenfs/

obj-$(CONFIG_XEN_SYS_HYPERVISOR)	+= sys-hypervisor.o

obj-$(CONFIG_XEN_PLATFORM_PCI)		+= xen-platform-pci.o

obj-$(CONFIG_XEN_PVHVM)			+= platform-pci.o

obj-$(CONFIG_XEN_TMEM)			+= tmem.o

obj-$(CONFIG_SWIOTLB_XEN)		+= swiotlb-xen.o

obj-$(CONFIG_XEN_DOM0)			+= pci.o
@@ -23,5 +23,3 @@ obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ 
xen-evtchn-y				:= evtchn.o

xen-gntdev-y				:= gntdev.o

xen-gntalloc-y				:= gntalloc.o
 


xen-platform-pci-y			:= platform-pci.o