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 714D1C4332F for ; Tue, 7 Dec 2021 21:05:51 +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=5Q5NFtQR44szxhC8kIfGEcwfGxtN6VQDYktBZ8rZ6Ak=; b=oOjF0BPhidibFB jmYRQrjvUumQEsZND0bvZbIS2tciI4xhuJKBUDW3xWVXzRVbwfNl0gPnr3ShJMBTjV9B2TepIaR5A FQ2Q+b95DZj0tnqeDkk4gC4vpm7Ib4NE1YKvcKJrjS/wPaGGi7kDbQnhJJz5ZhyFmOCn4pSWWaQPI sPY3SccaaBWwa/pcaB2ktyawbCkPfOf31/MDwYafqWT/qEm6KngMqXAXPsGIooiI5sKQECHAezYjm st09py8JFrIRGrDH+S9o4rGqvQ/AyEmTuU5ULMvEM9qlhT5PSQmK3Uy07DB6HlhOL3yqdt1ZsMNLo IJePycWvpeQJGaC6ucaQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1muhdT-00A782-40; Tue, 07 Dec 2021 21:04:27 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1muhdO-00A76R-47 for linux-arm-kernel@lists.infradead.org; Tue, 07 Dec 2021 21:04:24 +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 sin.source.kernel.org (Postfix) with ESMTPS id 0B225CE1E6D; Tue, 7 Dec 2021 21:04:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D2EFCC341C3; Tue, 7 Dec 2021 21:04:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638911056; bh=Xo6O3jGlzOANOmR4B4AaNenI/3W1MbWz8sJEDkoXKaA=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=U244wwsKXfLaRSba10m6gANWp5kb5rrKjuv8gVTFk236rfqvdIer5hktfEtuaXLPq BJ3e6kiGjgdY/544N3aZs5NyCPVUyrijSIV4zfcTm8y+ZSmfE/rUj+EdTDlvhYv6lh 6LGuSbitHQ2cBwVEDjbUKzVmrdMZGhbfZZZZyAqNq8+VrLZV2Hbhb0Yx12m1M5hGK0 i7S8L5dDlelB4EdCDNKZH9QgFSFwAL3gwNRVDlp95/CQ6bo58UgFcjHZVwlu5rUY4b 8JDHSpfF/UG/BKzFhhHH1qVx91UaU9AaWRpxNjJFeZGYwBjD168V/EE2a6WPNO+j76 DtG1dxs1QDegA== Date: Tue, 7 Dec 2021 15:04:14 -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 08/36] PCI/MSI: Let the irq code handle sysfs groups Message-ID: <20211207210414.GA77702@bhelgaas> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211206210438.091930107@linutronix.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211207_130422_540857_1293A183 X-CRM114-Status: GOOD ( 22.23 ) 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:09PM +0100, Thomas Gleixner wrote: > Set the domain info flag which makes the core code handle sysfs groups and > put an explicit invocation into the legacy code. > > Signed-off-by: Thomas Gleixner > Reviewed-by: Greg Kroah-Hartman > Reviewed-by: Jason Gunthorpe Acked-by: Bjorn Helgaas > --- > drivers/pci/msi/irqdomain.c | 2 +- > drivers/pci/msi/legacy.c | 6 +++++- > drivers/pci/msi/msi.c | 23 ----------------------- > include/linux/pci.h | 1 - > 4 files changed, 6 insertions(+), 26 deletions(-) > > --- a/drivers/pci/msi/irqdomain.c > +++ b/drivers/pci/msi/irqdomain.c > @@ -159,7 +159,7 @@ struct irq_domain *pci_msi_create_irq_do > if (info->flags & MSI_FLAG_USE_DEF_CHIP_OPS) > pci_msi_domain_update_chip_ops(info); > > - info->flags |= MSI_FLAG_ACTIVATE_EARLY; > + info->flags |= MSI_FLAG_ACTIVATE_EARLY | MSI_FLAG_DEV_SYSFS; > if (IS_ENABLED(CONFIG_GENERIC_IRQ_RESERVATION_MODE)) > info->flags |= MSI_FLAG_MUST_REACTIVATE; > > --- a/drivers/pci/msi/legacy.c > +++ b/drivers/pci/msi/legacy.c > @@ -70,10 +70,14 @@ int pci_msi_legacy_setup_msi_irqs(struct > { > int ret = arch_setup_msi_irqs(dev, nvec, type); > > - return pci_msi_setup_check_result(dev, type, ret); > + ret = pci_msi_setup_check_result(dev, type, ret); > + if (!ret) > + ret = msi_device_populate_sysfs(&dev->dev); > + return ret; > } > > void pci_msi_legacy_teardown_msi_irqs(struct pci_dev *dev) > { > + msi_device_destroy_sysfs(&dev->dev); > arch_teardown_msi_irqs(dev); > } > --- a/drivers/pci/msi/msi.c > +++ b/drivers/pci/msi/msi.c > @@ -233,11 +233,6 @@ static void free_msi_irqs(struct pci_dev > for (i = 0; i < entry->nvec_used; i++) > BUG_ON(irq_has_action(entry->irq + i)); > > - if (dev->msi_irq_groups) { > - msi_destroy_sysfs(&dev->dev, dev->msi_irq_groups); > - dev->msi_irq_groups = NULL; > - } > - > pci_msi_teardown_msi_irqs(dev); > > list_for_each_entry_safe(entry, tmp, msi_list, list) { > @@ -417,7 +412,6 @@ static int msi_verify_entries(struct pci > static int msi_capability_init(struct pci_dev *dev, int nvec, > struct irq_affinity *affd) > { > - const struct attribute_group **groups; > struct msi_desc *entry; > int ret; > > @@ -441,14 +435,6 @@ static int msi_capability_init(struct pc > if (ret) > goto err; > > - groups = msi_populate_sysfs(&dev->dev); > - if (IS_ERR(groups)) { > - ret = PTR_ERR(groups); > - goto err; > - } > - > - dev->msi_irq_groups = groups; > - > /* Set MSI enabled bits */ > pci_intx_for_msi(dev, 0); > pci_msi_set_enable(dev, 1); > @@ -576,7 +562,6 @@ static void msix_mask_all(void __iomem * > static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries, > int nvec, struct irq_affinity *affd) > { > - const struct attribute_group **groups; > void __iomem *base; > int ret, tsize; > u16 control; > @@ -618,14 +603,6 @@ static int msix_capability_init(struct p > > msix_update_entries(dev, entries); > > - groups = msi_populate_sysfs(&dev->dev); > - if (IS_ERR(groups)) { > - ret = PTR_ERR(groups); > - goto out_free; > - } > - > - dev->msi_irq_groups = groups; > - > /* Set MSI-X enabled bits and unmask the function */ > pci_intx_for_msi(dev, 0); > dev->msix_enabled = 1; > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -475,7 +475,6 @@ struct pci_dev { > #ifdef CONFIG_PCI_MSI > void __iomem *msix_base; > raw_spinlock_t msi_lock; > - const struct attribute_group **msi_irq_groups; > #endif > struct pci_vpd vpd; > #ifdef CONFIG_PCIE_DPC > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel