From: Auger Eric <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, christoffer.dall@linaro.org,
marc.zyngier@arm.com, robin.murphy@arm.com,
alex.williamson@redhat.com, will.deacon@arm.com, joro@8bytes.org,
tglx@linutronix.de, jason@lakedaemon.net,
linux-arm-kernel@lists.infradead.org
Cc: drjones@redhat.com, kvm@vger.kernel.org,
Jean-Philippe.Brucker@arm.com, Manish.Jaggi@caviumnetworks.com,
p.fedin@samsung.com, linux-kernel@vger.kernel.org,
Bharat.Bhushan@freescale.com, iommu@lists.linux-foundation.org,
pranav.sawargaonkar@gmail.com, dennis.chen@arm.com,
robert.richter@caviumnetworks.com, yehuday@marvell.com
Subject: Re: [PATCH v12 09/11] genirq/msi: Introduce msi_desc flags
Date: Tue, 9 Aug 2016 08:52:21 +0200 [thread overview]
Message-ID: <ae002707-4bdf-1f58-1723-600748119167@redhat.com> (raw)
In-Reply-To: <1470158617-7022-10-git-send-email-eric.auger@redhat.com>
Hi,
On 02/08/2016 19:23, Eric Auger wrote:
> This new flags member is meant to store additional information about
> the msi descriptor, starting with allocation status information.
>
> MSI_DESC_FLAG_ALLOCATED bit tells the associated base IRQ is allocated.
> This information is currently used at deallocation time. We also
> introduce MSI_DESC_FLAG_FUNCTIONAL telling the MSIs are functional.
>
> For the time being ALLOCATED and FUNCTIONAL are set at the same time
> but this is going to change in subsequent patch. Indeed in some situations
> some additional tasks need to be carried out for the MSI to be functional.
> For instance the MSI doorbell may need to be mapped in an IOMMU.
>
> FUNCTIONAL value already gets used when enumerating the usable MSIs in
> msix_capability_init.
>
> Signed-off-by: Eric Auger <eric.auger@redhat.com>
>
> ---
>
> v12: new
> ---
> drivers/pci/msi.c | 2 +-
> include/linux/msi.h | 14 ++++++++++++++
> kernel/irq/msi.c | 7 ++++++-
> 3 files changed, 21 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
> index a080f44..d7733ea 100644
> --- a/drivers/pci/msi.c
> +++ b/drivers/pci/msi.c
> @@ -793,7 +793,7 @@ out_avail:
> int avail = 0;
>
> for_each_pci_msi_entry(entry, dev) {
> - if (entry->irq != 0)
> + if (entry->flags & MSI_DESC_FLAG_FUNCTIONAL)
> avail++;
> }
> if (avail != 0)
> diff --git a/include/linux/msi.h b/include/linux/msi.h
> index 8b425c6..18f894f 100644
> --- a/include/linux/msi.h
> +++ b/include/linux/msi.h
> @@ -47,6 +47,7 @@ struct fsl_mc_msi_desc {
> * @nvec_used: The number of vectors used
> * @dev: Pointer to the device which uses this descriptor
> * @msg: The last set MSI message cached for reuse
> + * @flags: flags to describe the MSI descriptor status or features
> *
> * @masked: [PCI MSI/X] Mask bits
> * @is_msix: [PCI MSI/X] True if MSI-X
> @@ -67,6 +68,7 @@ struct msi_desc {
> unsigned int nvec_used;
> struct device *dev;
> struct msi_msg msg;
> + u32 flags;
I will fix this bad alignment on next version
>
> union {
> /* PCI MSI/X specific data */
> @@ -99,6 +101,18 @@ struct msi_desc {
> };
> };
>
> +/* Flags for msi_desc */
> +enum {
> + /* the base IRQ is allocated */
> + MSI_DESC_FLAG_ALLOCATED = (1 << 0),
> + /**
> + * the MSI is functional; in some cases the fact the base IRQ is
> + * allocated is not sufficient for the MSIs to be functional: for
> + * example the MSI doorbell(s) may need to be IOMMU mapped.
> + */
> + MSI_DESC_FLAG_FUNCTIONAL = (1 << 1),
> +};
> +
> /* Helpers to hide struct msi_desc implementation details */
> #define msi_desc_to_dev(desc) ((desc)->dev)
> #define dev_to_msi_list(dev) (&(dev)->msi_list)
> diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
> index 72bf4d6..9b93766 100644
> --- a/kernel/irq/msi.c
> +++ b/kernel/irq/msi.c
> @@ -361,6 +361,9 @@ int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev,
> return ret;
> }
>
> + desc->flags |= MSI_DESC_FLAG_ALLOCATED;
> + desc->flags |= MSI_DESC_FLAG_FUNCTIONAL;
> +
> for (i = 0; i < desc->nvec_used; i++)
> irq_set_msi_desc_off(virq, i, desc);
> }
> @@ -395,9 +398,11 @@ void msi_domain_free_irqs(struct irq_domain *domain, struct device *dev)
> * enough that there is no IRQ associated to this
> * entry. If that's the case, don't do anything.
> */
> - if (desc->irq) {
> + if (desc->flags & MSI_DESC_FLAG_ALLOCATED) {
> irq_domain_free_irqs(desc->irq, desc->nvec_used);
> desc->irq = 0;
> + desc->flags &= ~MSI_DESC_FLAG_ALLOCATED;
> + desc->flags &= ~MSI_DESC_FLAG_FUNCTIONAL;
Also I will combine those settings
Thanks
Eric
> }
> }
> }
>
next prev parent reply other threads:[~2016-08-09 6:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-02 17:23 [PATCH v12 00/11] KVM PCIe/MSI passthrough on ARM/ARM64: kernel part 2/3: msi changes Eric Auger
2016-08-02 17:23 ` [PATCH v12 01/11] genirq/msi: export msi_get_domain_info Eric Auger
2016-08-02 17:23 ` [PATCH v12 02/11] genirq/msi: msi_compose wrapper Eric Auger
2016-08-09 9:19 ` Thomas Gleixner
2016-08-10 8:48 ` Auger Eric
2016-08-02 17:23 ` [PATCH v12 03/11] genirq: Introduce irq_get_msi_doorbell_info Eric Auger
2016-08-02 17:23 ` [PATCH v12 04/11] genirq/msi: Allow MSI doorbell (un)registration Eric Auger
2016-08-02 17:23 ` [PATCH v12 05/11] genirq/msi: msi_doorbell_calc_pages Eric Auger
2016-08-02 17:23 ` [PATCH v12 06/11] genirq/msi: msi_doorbell_safe Eric Auger
2016-08-02 17:23 ` [PATCH v12 07/11] irqchip/gic-v2m: Register the MSI global doorbell Eric Auger
2016-08-02 17:23 ` [PATCH v12 08/11] irqchip/gicv3-its: " Eric Auger
2016-08-02 17:23 ` [PATCH v12 09/11] genirq/msi: Introduce msi_desc flags Eric Auger
2016-08-09 6:52 ` Auger Eric [this message]
2016-08-02 17:23 ` [PATCH v12 10/11] genirq/msi: Map/unmap the MSI doorbells on msi_domain_alloc/free_irqs Eric Auger
2016-08-02 17:23 ` [PATCH v12 11/11] genirq/msi: Use the MSI doorbell's IOVA when requested Eric Auger
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=ae002707-4bdf-1f58-1723-600748119167@redhat.com \
--to=eric.auger@redhat.com \
--cc=Bharat.Bhushan@freescale.com \
--cc=Jean-Philippe.Brucker@arm.com \
--cc=Manish.Jaggi@caviumnetworks.com \
--cc=alex.williamson@redhat.com \
--cc=christoffer.dall@linaro.org \
--cc=dennis.chen@arm.com \
--cc=drjones@redhat.com \
--cc=eric.auger.pro@gmail.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jason@lakedaemon.net \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=p.fedin@samsung.com \
--cc=pranav.sawargaonkar@gmail.com \
--cc=robert.richter@caviumnetworks.com \
--cc=robin.murphy@arm.com \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.com \
--cc=yehuday@marvell.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
all inboxes | Powered by JetHome®