From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D4FCAC433F5 for ; Tue, 7 Dec 2021 21:05:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Owner; bh=0Isnnb40/qOAT8RXje/7eaWmb0d1wb2WJZJILpw7pPY=; b=ArtCzb0EQYq+jO QhZUBkl3bjAyiE2V4gOEASI94tfvcYmbYKb7uC0/ht8NKVHuAEjV8H8LHL/tH6XCkFXKbEupipZwo J/FbDjbUyHN+NxvcVRZlao2Zm+ZfNP6frXq1D8gZuKpFcfexzDmqiaesCIwHa2HlV29F44kQSaZNW WkGH//O0GeeHwFRU9TfnZ4uNFJSjx0QyF92f+suURxoPct4MUxPPnNbmWANHIaSHamIEATEpyRpg5 sDVPSwyU/do8qMRnIgsYDOohUn5C8kWocb911JSM29F155TnphA/AekM8/OMq8lAaK506xQizqUdF e7IIk1y8sPYFTPVWZjlg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1muhcv-00A72c-5L; Tue, 07 Dec 2021 21:03:53 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1muhcr-00A71R-L7 for linux-arm-kernel@lists.infradead.org; Tue, 07 Dec 2021 21:03:51 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 644DEB81E83; Tue, 7 Dec 2021 21:03:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3146C341C3; Tue, 7 Dec 2021 21:03:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638911027; bh=vdg+fdIoCSHr3OuhnQ0WRPeCcsFTBIQTTd4u0ji8WKw=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=BWMnoqb5zI+AmfRiWx3hI7UPFSjiK/sP2RxrS/8pFSfaQGXzC3HU5dj9jSSkTmxbf ycQhxHGG+Fcj7qVvDrSdgVJzP+m2Fjh741SbIXpMXFhrEEquIdcMBPdXl+aCsQmDEI 3zeK6GYY3etemeN1yu/6VsPnz0YoMH8zSdcDzIsPZqnlh4gHq48kIVDNWK7rfFTy1S gUW/xdBLJLcAxyL2Qhdnp0jAybfRKhRZLoNsDlD33Kr8AWcXVe4iBXGW98+dAzo2jz rnorth7z8Yvh3+kr56v1pmkD4iYXulFwuR50cFJdivxqVn0FvmmJNz1QRCJTf0dRQk vTu+UFqcSYVkw== Date: Tue, 7 Dec 2021 15:03:45 -0600 From: Bjorn Helgaas To: Thomas Gleixner Cc: LKML , Marc Zygnier , Alex Williamson , Kevin Tian , Jason Gunthorpe , Megha Dey , Ashok Raj , linux-pci@vger.kernel.org, Cedric Le Goater , xen-devel@lists.xenproject.org, Juergen Gross , Greg Kroah-Hartman , Will Deacon , Santosh Shilimkar , iommu@lists.linux-foundation.org, dmaengine@vger.kernel.org, Stuart Yoder , Laurentiu Tudor , Nishanth Menon , Tero Kristo , linux-arm-kernel@lists.infradead.org, Vinod Koul , Mark Rutland , Robin Murphy , Sinan Kaya Subject: Re: [patch V2 03/36] PCI/MSI: Allocate MSI device data on first use Message-ID: <20211207210345.GA77648@bhelgaas> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211206210437.821900680@linutronix.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211207_130349_992031_C7CAE5A9 X-CRM114-Status: GOOD ( 19.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Dec 06, 2021 at 11:39:00PM +0100, Thomas Gleixner wrote: > Allocate MSI device data on first use, i.e. when a PCI driver invokes one > of the PCI/MSI enablement functions. > > Signed-off-by: Thomas Gleixner > Reviewed-by: Greg Kroah-Hartman > Reviewed-by: Jason Gunthorpe Acked-by: Bjorn Helgaas > --- > drivers/pci/msi/msi.c | 20 +++++++++++++++----- > 1 file changed, 15 insertions(+), 5 deletions(-) > > --- a/drivers/pci/msi/msi.c > +++ b/drivers/pci/msi/msi.c > @@ -889,10 +889,12 @@ static int __pci_enable_msi_range(struct > /* deprecated, don't use */ > int pci_enable_msi(struct pci_dev *dev) > { > - int rc = __pci_enable_msi_range(dev, 1, 1, NULL); > - if (rc < 0) > - return rc; > - return 0; > + int rc = msi_setup_device_data(&dev->dev); > + > + if (!rc) > + rc = __pci_enable_msi_range(dev, 1, 1, NULL); > + > + return rc < 0 ? rc : 0; > } > EXPORT_SYMBOL(pci_enable_msi); > > @@ -947,7 +949,11 @@ static int __pci_enable_msix_range(struc > int pci_enable_msix_range(struct pci_dev *dev, struct msix_entry *entries, > int minvec, int maxvec) > { > - return __pci_enable_msix_range(dev, entries, minvec, maxvec, NULL, 0); > + int ret = msi_setup_device_data(&dev->dev); > + > + if (!ret) > + ret = __pci_enable_msix_range(dev, entries, minvec, maxvec, NULL, 0); > + return ret; > } > EXPORT_SYMBOL(pci_enable_msix_range); > > @@ -974,8 +980,12 @@ int pci_alloc_irq_vectors_affinity(struc > struct irq_affinity *affd) > { > struct irq_affinity msi_default_affd = {0}; > + int ret = msi_setup_device_data(&dev->dev); > int nvecs = -ENOSPC; > > + if (ret) > + return ret; > + > if (flags & PCI_IRQ_AFFINITY) { > if (!affd) > affd = &msi_default_affd; > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel