From: Keith Busch <keith.busch@intel.com>
To: Jon Derrick <jonathan.derrick@intel.com>
Cc: helgaas@kernel.org, linux-pci@vger.kernel.org
Subject: Re: [PATCH 2/2] vmd: convert to use pci_alloc_irq_vectors api
Date: Mon, 29 Aug 2016 13:55:58 -0400 [thread overview]
Message-ID: <20160829175558.GG19986@localhost.localdomain> (raw)
In-Reply-To: <1472491142-13783-2-git-send-email-jonathan.derrick@intel.com>
On Mon, Aug 29, 2016 at 11:19:02AM -0600, Jon Derrick wrote:
> Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
Nice simplification, looks good.
Reviewed-by: Keith Busch <keith.busch@intel.com>
> diff --git a/arch/x86/pci/vmd.c b/arch/x86/pci/vmd.c
> index 514b446..4c0eac7 100644
> --- a/arch/x86/pci/vmd.c
> +++ b/arch/x86/pci/vmd.c
> @@ -78,7 +78,6 @@ struct vmd_dev {
> char __iomem *cfgbar;
>
> int msix_count;
> - struct msix_entry *msix_entries;
> struct vmd_irq_list *irqs;
>
> struct pci_sysdata sysdata;
> @@ -679,16 +678,8 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id)
> if (vmd->msix_count < 0)
> return -ENODEV;
>
> - vmd->msix_entries = devm_kcalloc(&dev->dev, vmd->msix_count,
> - sizeof(*vmd->msix_entries),
> - GFP_KERNEL);
> - if (!vmd->msix_entries)
> - return -ENOMEM;
> - for (i = 0; i < vmd->msix_count; i++)
> - vmd->msix_entries[i].entry = i;
> -
> - vmd->msix_count = pci_enable_msix_range(vmd->dev, vmd->msix_entries, 1,
> - vmd->msix_count);
> + vmd->msix_count = pci_alloc_irq_vectors(dev, 1, vmd->msix_count,
> + PCI_IRQ_MSIX | PCI_IRQ_AFFINITY);
> if (vmd->msix_count < 0)
> return vmd->msix_count;
>
> @@ -699,7 +690,7 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id)
>
> for (i = 0; i < vmd->msix_count; i++) {
> INIT_LIST_HEAD(&vmd->irqs[i].irq_list);
> - vmd->irqs[i].vmd_vector = vmd->msix_entries[i].vector;
> + vmd->irqs[i].vmd_vector = pci_irq_vector(dev, i);
> vmd->irqs[i].index = i;
>
> err = devm_request_irq(&dev->dev, vmd->irqs[i].vmd_vector,
> --
next prev parent reply other threads:[~2016-08-29 17:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-29 17:19 [PATCH 1/2] vmd: allocate irq lists with correct msix count Jon Derrick
2016-08-29 17:19 ` [PATCH 2/2] vmd: convert to use pci_alloc_irq_vectors api Jon Derrick
2016-08-29 17:55 ` Keith Busch [this message]
2016-08-29 17:52 ` [PATCH 1/2] vmd: allocate irq lists with correct msix count Keith Busch
2016-09-12 22:00 ` Bjorn Helgaas
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=20160829175558.GG19986@localhost.localdomain \
--to=keith.busch@intel.com \
--cc=helgaas@kernel.org \
--cc=jonathan.derrick@intel.com \
--cc=linux-pci@vger.kernel.org \
/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).