From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751771Ab3JSGMV (ORCPT ); Sat, 19 Oct 2013 02:12:21 -0400 Received: from 221-186-24-89.in-addr.arpa ([89.24.186.221]:11084 "EHLO dhcp-26-207.brq.redhat.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751117Ab3JSGMT (ORCPT ); Sat, 19 Oct 2013 02:12:19 -0400 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , Bjorn Helgaas , Michael Ellerman , Benjamin Herrenschmidt , Tejun Heo , Ben Hutchings , David Laight , Mark Lord , "H. Peter Anvin" , linux-pci@vger.kernel.org Subject: [PATCH RFC v2 01/29] PCI/MSI/s390: Fix single MSI only check Date: Fri, 18 Oct 2013 19:12:01 +0200 Message-Id: <8792c33c7b28f2f07bb03009e50b3cf544c4ee04.1382103786.git.agordeev@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Multiple MSIs have never been supported on s390 architecture, but the platform code fails to report single MSI only. Signed-off-by: Alexander Gordeev Acked-by: Martin Schwidefsky --- arch/s390/pci/pci.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index f17a834..c79c6e4 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -427,6 +427,8 @@ int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) pr_debug("%s: requesting %d MSI-X interrupts...", __func__, nvec); if (type != PCI_CAP_ID_MSIX && type != PCI_CAP_ID_MSI) return -EINVAL; + if (type == PCI_CAP_ID_MSI && nvec > 1) + return 1; msi_vecs = min(nvec, ZPCI_MSI_VEC_MAX); msi_vecs = min_t(unsigned int, msi_vecs, CONFIG_PCI_NR_MSI); -- 1.7.7.6