Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751363Ab3JDHkR (ORCPT ); Fri, 4 Oct 2013 03:40:17 -0400 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:50778 "EHLO e06smtp17.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751257Ab3JDHkO (ORCPT ); Fri, 4 Oct 2013 03:40:14 -0400 Date: Fri, 4 Oct 2013 09:39:56 +0200 From: Martin Schwidefsky To: Alexander Gordeev Cc: linux-kernel@vger.kernel.org, Bjorn Helgaas , Ralf Baechle , Michael Ellerman , Benjamin Herrenschmidt , Ingo Molnar , Tejun Heo , Dan Williams , Andy King , Jon Mason , Matt Porter , stable@vger.kernel.org, linux-pci@vger.kernel.org, linux-mips@linux-mips.org, linuxppc-dev@lists.ozlabs.org, linux390@de.ibm.com, linux-s390@vger.kernel.org, x86@kernel.org, linux-ide@vger.kernel.org, iss_storagedev@hp.com, linux-nvme@lists.infradead.org, linux-rdma@vger.kernel.org, netdev@vger.kernel.org, e1000-devel@lists.sourceforge.net, linux-driver@qlogic.com, Solarflare linux maintainers , "VMware, Inc." , linux-scsi@vger.kernel.org Subject: Re: [PATCH RFC 03/77] PCI/MSI/s390: Fix single MSI only check Message-ID: <20131004093956.183f6901@mschwide> In-Reply-To: <8c9811b13fd93e73641dab8e3bd1bd5b2dc37a61.1380703262.git.agordeev@redhat.com> References: <8c9811b13fd93e73641dab8e3bd1bd5b2dc37a61.1380703262.git.agordeev@redhat.com> Organization: IBM Corporation X-Mailer: Claws Mail 3.8.0 (GTK+ 2.24.10; i686-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13100407-0542-0000-0000-000006A4B2F9 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1290 Lines: 38 On Wed, 2 Oct 2013 12:48:19 +0200 Alexander Gordeev wrote: > Multiple MSIs have never been supported on s390 architecture, > but the platform code fails to report single MSI only. > > Signed-off-by: Alexander Gordeev > --- > 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); > Acked-by: Martin Schwidefsky -- blue skies, Martin. "Reality continues to ruin my life." - Calvin. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/