From patchwork Sat Nov 27 01:25:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 12642091 X-Patchwork-Delegate: bhelgaas@google.com 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6C7BC433FE for ; Sat, 27 Nov 2021 01:34:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351794AbhK0Bh2 (ORCPT ); Fri, 26 Nov 2021 20:37:28 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:40756 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347449AbhK0Bf0 (ORCPT ); Fri, 26 Nov 2021 20:35:26 -0500 Message-ID: <20211127000918.892733246@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1637976308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=1qj+ON8bFgIPks8keDU/08NOHxNWcizsMPwkJuRGMrI=; b=Eb7F85yxU2/GXtXpV1Sbb34yCwETsFbXL6M7KB9gCsOrYAe6tvU0vngeF/GvrxkU48lja3 F2zgIqZSQKLmhH4uMq3X7em//nMRXmU/jZfkb/wa14gNatb0Eli/rAD5NP2uW4bG1SCAGT daORTovBU6EUrncvhpHjbL86mNf4uuVU8GDe9SLJ6YHFAwpj/WqqO6Qc8e4Yag5TmqcKSn DGX39oD0FUT7ul4zvXZzOUfffaSI9QoWqGTO4a4QAba7gVl6kbxBmdQVUxhvoGu1hwhhfi DXhZ97otf5O1h336e4rygoy6F8az9re0LGekPc8fp0UpHFu3ANwAV7cnDpEkNw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1637976308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=1qj+ON8bFgIPks8keDU/08NOHxNWcizsMPwkJuRGMrI=; b=EDFk1OiAUgj/RtChZZpnV6C9dpDJ9EJQvgRHe6OJnzHUx7c1LOTjhWgYmcXwQPmh8R+ML8 cAasvyhML01ZIfDQ== From: Thomas Gleixner To: LKML Cc: Bjorn Helgaas , Marc Zygnier , Alex Williamson , Kevin Tian , Jason Gunthorpe , Megha Dey , Ashok Raj , Michael Ellerman , Andrew Cooper , Juergen Gross , linux-pci@vger.kernel.org, xen-devel@lists.xenproject.org Subject: [patch 07/10] PCI/MSI: Make free related functions range based References: <20211126233124.618283684@linutronix.de> MIME-Version: 1.0 Date: Sat, 27 Nov 2021 02:25:08 +0100 (CET) Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org In preparation of runtime expandable PCI/MSI-X vectors convert the related free functions to take ranges instead of assuming a zero based vector space. Signed-off-by: Thomas Gleixner --- drivers/pci/msi/irqdomain.c | 5 ++--- drivers/pci/msi/msi.c | 24 ++++++++++++++++-------- drivers/pci/msi/msi.h | 2 +- 3 files changed, 19 insertions(+), 12 deletions(-) --- a/drivers/pci/msi/irqdomain.c +++ b/drivers/pci/msi/irqdomain.c @@ -19,14 +19,13 @@ int pci_msi_setup_msi_irqs(struct pci_de return pci_msi_legacy_setup_msi_irqs(dev, range->ndesc, type); } -void pci_msi_teardown_msi_irqs(struct pci_dev *dev) +void pci_msi_teardown_msi_irqs(struct pci_dev *dev, struct msi_range *range) { - struct msi_range range = { .first = 0, .last = UINT_MAX, }; struct irq_domain *domain; domain = dev_get_msi_domain(&dev->dev); if (domain && irq_domain_is_hierarchy(domain)) - msi_domain_free_irqs_descs_locked(domain, &dev->dev, &range); + msi_domain_free_irqs_descs_locked(domain, &dev->dev, range); else pci_msi_legacy_teardown_msi_irqs(dev); } --- a/drivers/pci/msi/msi.c +++ b/drivers/pci/msi/msi.c @@ -222,9 +222,12 @@ void pci_write_msi_msg(unsigned int irq, } EXPORT_SYMBOL_GPL(pci_write_msi_msg); -static void free_msi_irqs(struct pci_dev *dev) +static void free_msi_irqs(struct pci_dev *dev, struct msi_range *range, bool shutdown) { - pci_msi_teardown_msi_irqs(dev); + pci_msi_teardown_msi_irqs(dev, range); + + if (!shutdown) + return; if (dev->msix_base) { iounmap(dev->msix_base); @@ -443,7 +446,7 @@ static int msi_capability_init(struct pc err: pci_msi_unmask(entry, msi_multi_mask(entry)); - free_msi_irqs(dev); + free_msi_irqs(dev, &range, true); unlock: msi_unlock_descs(&dev->dev); kfree(masks); @@ -538,7 +541,7 @@ static void msix_mask_all(void __iomem * static int msix_setup_interrupts(struct pci_dev *dev, void __iomem *base, struct msi_range *range, struct msix_entry *entries, - struct irq_affinity *affd) + struct irq_affinity *affd, bool expand) { struct irq_affinity_desc *masks = NULL; int ret; @@ -566,7 +569,8 @@ static int msix_setup_interrupts(struct goto out_unlock; out_free: - free_msi_irqs(dev); + free_msi_irqs(dev, range, !expand); + out_unlock: msi_unlock_descs(&dev->dev); kfree(masks); @@ -614,7 +618,7 @@ static int msix_capability_init(struct p /* Ensure that all table entries are masked. */ msix_mask_all(base, tsize); - ret = msix_setup_interrupts(dev, base, &range, entries, affd); + ret = msix_setup_interrupts(dev, base, &range, entries, affd, false); if (ret) goto out_disable; @@ -728,12 +732,14 @@ static void pci_msi_shutdown(struct pci_ void pci_disable_msi(struct pci_dev *dev) { + struct msi_range range = { .first = 0, .last = 0, }; + if (!pci_msi_enable || !dev || !dev->msi_enabled) return; msi_lock_descs(&dev->dev); pci_msi_shutdown(dev); - free_msi_irqs(dev); + free_msi_irqs(dev, &range, true); msi_unlock_descs(&dev->dev); } EXPORT_SYMBOL(pci_disable_msi); @@ -817,12 +823,14 @@ static void pci_msix_shutdown(struct pci void pci_disable_msix(struct pci_dev *dev) { + struct msi_range range = { .first = 0, .last = UINT_MAX, }; + if (!pci_msi_enable || !dev || !dev->msix_enabled) return; msi_lock_descs(&dev->dev); pci_msix_shutdown(dev); - free_msi_irqs(dev); + free_msi_irqs(dev, &range, true); msi_unlock_descs(&dev->dev); } EXPORT_SYMBOL(pci_disable_msix); --- a/drivers/pci/msi/msi.h +++ b/drivers/pci/msi/msi.h @@ -6,7 +6,7 @@ #define msix_table_size(flags) ((flags & PCI_MSIX_FLAGS_QSIZE) + 1) extern int pci_msi_setup_msi_irqs(struct pci_dev *dev, struct msi_range *range, int type); -extern void pci_msi_teardown_msi_irqs(struct pci_dev *dev); +extern void pci_msi_teardown_msi_irqs(struct pci_dev *dev, struct msi_range *range); #ifdef CONFIG_PCI_MSI_ARCH_FALLBACKS extern int pci_msi_legacy_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);