From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 1 Oct 2014 18:31:46 +0000 (-0600)
Subject: Merge branch 'pci/msi' into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=359c660e99d1431a9b08b240bfc31acc3d658efe;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'pci/msi' into next

* pci/msi:
  PCI/MSI: Remove unnecessary temporary variable
  PCI/MSI: Use __write_msi_msg() instead of write_msi_msg()
  MSI/powerpc: Use __read_msi_msg() instead of read_msi_msg()
  PCI/MSI: Use __get_cached_msi_msg() instead of get_cached_msi_msg()
  PCI/MSI: Add "msi_bus" sysfs MSI/MSI-X control for endpoints
  PCI/MSI: Remove "pos" from the struct msi_desc msi_attrib
  PCI/MSI: Remove unused kobject from struct msi_desc
  PCI/MSI: Rename pci_msi_check_device() to pci_msi_supported()
  PCI/MSI: Move D0 check into pci_msi_check_device()
  PCI/MSI: Remove arch_msi_check_device()
  irqchip: armada-370-xp: Remove arch_msi_check_device()
  PCI/MSI/PPC: Remove arch_msi_check_device()

Conflicts:
	drivers/pci/host/pcie-designware.c
---

359c660e99d1431a9b08b240bfc31acc3d658efe
diff --cc drivers/pci/host/pcie-designware.c
index 34e736601259,fa2fa459ed90..f72744599d12
--- a/drivers/pci/host/pcie-designware.c
+++ b/drivers/pci/host/pcie-designware.c
@@@ -343,9 -350,13 +343,8 @@@ static int dw_msi_setup_irq(struct msi_
  	struct msi_msg msg;
  	struct pcie_port *pp = sys_to_pcie(pdev->bus->sysdata);
  
- 	pci_read_config_word(pdev, desc->msi_attrib.pos+PCI_MSI_FLAGS,
- 				&msg_ctr);
- 	msgvec = (msg_ctr&PCI_MSI_FLAGS_QSIZE) >> 4;
 -	if (!pp) {
 -		BUG();
 -		return -EINVAL;
 -	}
 -
+ 	pci_read_config_word(pdev, pdev->msi_cap + PCI_MSI_FLAGS, &msg_ctr);
+ 	msgvec = (msg_ctr & PCI_MSI_FLAGS_QSIZE) >> 4;
  	if (msgvec == 0)
  		msgvec = (msg_ctr & PCI_MSI_FLAGS_QMASK) >> 1;
  	if (msgvec > 5)