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

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

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

Pull xen fix and cleanup from Juergen Gross:
 "This contains one fix for MSIX handling under Xen and a trivial
  cleanup patch"

* tag 'for-linus-4.11-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xenbus: Remove duplicate inclusion of linux/init.h
  xen: do not re-use pirq number cached in pci device msi msg data
parents ea6200e8 d825adb4

arch/x86/pci/xen.c

+7 −16
Original line number Diff line number Diff line
@@ -234,11 +234,6 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 
		return 1;



	for_each_pci_msi_entry(msidesc, dev) {

		__pci_read_msi_msg(msidesc, &msg);

		pirq = MSI_ADDR_EXT_DEST_ID(msg.address_hi) |

			((msg.address_lo >> MSI_ADDR_DEST_ID_SHIFT) & 0xff);

		if (msg.data != XEN_PIRQ_MSI_DATA ||

		    xen_irq_from_pirq(pirq) < 0) {

		pirq = xen_allocate_pirq_msi(dev, msidesc);

		if (pirq < 0) {

			irq = -ENODEV;
@@ -247,10 +242,6 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 
		xen_msi_compose_msg(dev, pirq, &msg);

		__pci_write_msi_msg(msidesc, &msg);

		dev_dbg(&dev->dev, "xen: msi bound to pirq=%d\n", pirq);

		} else {

			dev_dbg(&dev->dev,

				"xen: msi already bound to pirq=%d\n", pirq);

		}

		irq = xen_bind_pirq_msi_to_irq(dev, msidesc, pirq,

					       (type == PCI_CAP_ID_MSI) ? nvec : 1,

					       (type == PCI_CAP_ID_MSIX) ?

drivers/xen/xenbus/xenbus_dev_frontend.c

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

#include <linux/slab.h>

#include <linux/miscdevice.h>

#include <linux/init.h>



#include <xen/xenbus.h>

#include <xen/xen.h>