summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.ibm.com>2019-09-10 15:45:04 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-06 13:08:51 +0100
commitce16a0019ce156d0ec96afbdbf26583f46ce2a08 (patch)
tree2243f1edfcabeff51ec641867922e4b757d6c606 /arch
parentedc82440df33c26e5116ba76675cb6edeec349ee (diff)
downloadlinux-stable-ce16a0019ce156d0ec96afbdbf26583f46ce2a08.tar.gz
linux-stable-ce16a0019ce156d0ec96afbdbf26583f46ce2a08.tar.bz2
linux-stable-ce16a0019ce156d0ec96afbdbf26583f46ce2a08.zip
s390/pci: fix MSI message data
[ Upstream commit cf2c4a3f35b75d38cebb4afbd578f1594f068d1e ] After recent changes the MSI message data needs to specify the function-relative IRQ number. Reported-and-tested-by: Alexander Schmidt <alexs@linux.ibm.com> Signed-off-by: Sebastian Ott <sebott@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/pci/pci_irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/pci/pci_irq.c b/arch/s390/pci/pci_irq.c
index d80616ae8dd8..fbe97ab2e228 100644
--- a/arch/s390/pci/pci_irq.c
+++ b/arch/s390/pci/pci_irq.c
@@ -284,7 +284,7 @@ int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
return rc;
irq_set_chip_and_handler(irq, &zpci_irq_chip,
handle_percpu_irq);
- msg.data = hwirq;
+ msg.data = hwirq - bit;
if (irq_delivery == DIRECTED) {
msg.address_lo = zdev->msi_addr & 0xff0000ff;
msg.address_lo |= msi->affinity ?