From: Bjorn Helgaas <helgaas@kernel.org>
To: Dejin Zheng <zhengdejin5@gmail.com>
Cc: corbet@lwn.net, jarkko.nikula@linux.intel.com,
andriy.shevchenko@linux.intel.com,
mika.westerberg@linux.intel.com, rric@kernel.org,
bhelgaas@google.com, wsa@kernel.org, linux-doc@vger.kernel.org,
linux-i2c@vger.kernel.org, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
Thomas Gleixner <tglx@linutronix.de>,
Alexander Gordeev <agordeev@redhat.com>,
Jonathan Derrick <jonathan.derrick@intel.com>,
Kurt Schwemmer <kurt.schwemmer@microsemi.com>,
Logan Gunthorpe <logang@deltatee.com>
Subject: Re: [PATCH v5 1/4] PCI: Introduce pcim_alloc_irq_vectors()
Date: Tue, 23 Mar 2021 17:47:10 -0500 [thread overview]
Message-ID: <20210323224710.GA610170@bjorn-Precision-5520> (raw)
In-Reply-To: <20210226155056.1068534-2-zhengdejin5@gmail.com>
[+cc Christoph, Thomas, Alexander, in case you're interested]
[+cc Jonathan, Kurt, Logan: vmd.c and switchtec.c use managed resources
and pci_alloc_irq_vectors()]
On Fri, Feb 26, 2021 at 11:50:53PM +0800, Dejin Zheng wrote:
> Introduce pcim_alloc_irq_vectors(), a device-managed version of
> pci_alloc_irq_vectors(). Introducing this function can simplify
> the error handling path in many drivers.
>
> And use pci_free_irq_vectors() to replace some code in pcim_release(),
> they are equivalent, and no functional change. It is more explicit
> that pcim_alloc_irq_vectors() is a device-managed function.
>
> Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Let me know if you'd like me to take the series.
> ---
> v4 -> v5:
> - Remove the check of enable device in pcim_alloc_irq_vectors()
> and make it as a static line function.
> v3 -> v4:
> - No change
> v2 -> v3:
> - Add some commit comments for replace some codes in
> pcim_release() by pci_free_irq_vectors().
> v1 -> v2:
> - Use pci_free_irq_vectors() to replace some code in
> pcim_release().
> - Modify some commit messages.
>
> drivers/pci/pci.c | 5 +----
> include/linux/pci.h | 24 ++++++++++++++++++++++++
> 2 files changed, 25 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index 16a17215f633..fecfdc0add2f 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -1969,10 +1969,7 @@ static void pcim_release(struct device *gendev, void *res)
> struct pci_devres *this = res;
> int i;
>
> - if (dev->msi_enabled)
> - pci_disable_msi(dev);
> - if (dev->msix_enabled)
> - pci_disable_msix(dev);
> + pci_free_irq_vectors(dev);
>
> for (i = 0; i < DEVICE_COUNT_RESOURCE; i++)
> if (this->region_mask & (1 << i))
> diff --git a/include/linux/pci.h b/include/linux/pci.h
> index 86c799c97b77..5cafd7d65fd7 100644
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -1818,6 +1818,30 @@ pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs,
> NULL);
> }
>
> +/**
> + * pcim_alloc_irq_vectors - a device-managed pci_alloc_irq_vectors()
> + * @dev: PCI device to operate on
> + * @min_vecs: minimum number of vectors required (must be >= 1)
> + * @max_vecs: maximum (desired) number of vectors
> + * @flags: flags or quirks for the allocation
> + *
> + * Return the number of vectors allocated, (which might be smaller than
> + * @max_vecs) if successful, or a negative error code on error. If less
> + * than @min_vecs interrupt vectors are available for @dev the function
> + * will fail with -ENOSPC.
> + *
> + * It depends on calling pcim_enable_device() to make IRQ resources
> + * manageable.
> + */
> +static inline int
> +pcim_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs,
> + unsigned int max_vecs, unsigned int flags)
> +{
> + if (!pci_is_managed(dev))
> + return -EINVAL;
> + return pci_alloc_irq_vectors(dev, min_vecs, max_vecs, flags);
> +}
> +
> /* Include architecture-dependent settings and functions */
>
> #include <asm/pci.h>
> --
> 2.25.0
>
next prev parent reply other threads:[~2021-03-23 22:48 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-26 15:50 [PATCH v5 0/4] Introduce pcim_alloc_irq_vectors() Dejin Zheng
2021-02-26 15:50 ` [PATCH v5 1/4] PCI: " Dejin Zheng
2021-02-26 16:23 ` Andy Shevchenko
2021-02-28 11:16 ` Dejin Zheng
2021-03-23 22:47 ` Bjorn Helgaas [this message]
2021-05-05 16:27 ` Dejin Zheng
2021-06-02 8:51 ` Andy Shevchenko
2021-06-06 6:51 ` Dejin Zheng
2021-06-07 16:15 ` Bjorn Helgaas
2021-02-26 15:50 ` [PATCH v5 2/4] Documentation: devres: Add pcim_alloc_irq_vectors() Dejin Zheng
2021-02-26 15:50 ` [PATCH v5 3/4] i2c: designware: Use pcim_alloc_irq_vectors() to allocate IRQ vectors Dejin Zheng
2021-03-03 9:27 ` Jarkko Nikula
2021-02-26 15:50 ` [PATCH v5 4/4] i2c: thunderx: " Dejin Zheng
2021-02-26 19:19 ` Robert Richter
2021-02-26 19:20 ` [PATCH v5 0/4] Introduce pcim_alloc_irq_vectors() Robert Richter
2021-02-28 11:17 ` Dejin Zheng
2021-04-21 15:23 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210323224710.GA610170@bjorn-Precision-5520 \
--to=helgaas@kernel.org \
--cc=agordeev@redhat.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=corbet@lwn.net \
--cc=hch@lst.de \
--cc=jarkko.nikula@linux.intel.com \
--cc=jonathan.derrick@intel.com \
--cc=kurt.schwemmer@microsemi.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=logang@deltatee.com \
--cc=mika.westerberg@linux.intel.com \
--cc=rric@kernel.org \
--cc=tglx@linutronix.de \
--cc=wsa@kernel.org \
--cc=zhengdejin5@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).