linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Gavin Shan <shangw@linux.vnet.ibm.com>
To: linux-pci@vger.kernel.org
Cc: bhelgaas@google.com, Gavin Shan <shangw@linux.vnet.ibm.com>
Subject: [PATCH 4/5] PCI: Use cached MSI cap in pci_enable_msi_block_auto()
Date: Thu,  4 Apr 2013 19:39:31 +0800	[thread overview]
Message-ID: <1365075572-20763-5-git-send-email-shangw@linux.vnet.ibm.com> (raw)
In-Reply-To: <1365075572-20763-1-git-send-email-shangw@linux.vnet.ibm.com>

The patch intends to use cached MSI capability offset instead of
polling that from config space in pci_enable_msi_block_auto().

Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
---
 drivers/pci/msi.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 182474d..0b6b254 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -848,14 +848,13 @@ EXPORT_SYMBOL(pci_enable_msi_block);
 
 int pci_enable_msi_block_auto(struct pci_dev *dev, unsigned int *maxvec)
 {
-	int ret, pos, nvec;
+	int ret, nvec;
 	u16 msgctl;
 
-	pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
-	if (!pos)
+	if (!dev->msi_cap)
 		return -EINVAL;
 
-	pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &msgctl);
+	pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &msgctl);
 	ret = 1 << ((msgctl & PCI_MSI_FLAGS_QMASK) >> 1);
 
 	if (maxvec)
-- 
1.7.5.4


  parent reply	other threads:[~2013-04-04 11:39 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-04 11:39 [PATCH v2 0/5] Retrieve MSI/MSIX cap struct for once on setup Gavin Shan
2013-04-04 11:39 ` [PATCH 1/5] PCI: Cache MSI/MSI-X cap in PCI device Gavin Shan
2013-04-04 16:02   ` Bjorn Helgaas
2013-04-04 11:39 ` [PATCH 2/5] PCI: Use MSI/MSI-X cap cache in pci_msi_check_device() Gavin Shan
2013-04-04 16:33   ` Bjorn Helgaas
2013-04-04 11:39 ` [PATCH 3/5] PCI: Use cached MSI cap while enabling MSI interrupts Gavin Shan
2013-04-04 17:16   ` Bjorn Helgaas
2013-04-04 11:39 ` Gavin Shan [this message]
2013-04-04 17:19   ` [PATCH 4/5] PCI: Use cached MSI cap in pci_enable_msi_block_auto() Bjorn Helgaas
2013-04-04 11:39 ` [PATCH 5/5] PCI: Use cached MSI-X cap while enabling MSI-X interrupts Gavin Shan

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=1365075572-20763-5-git-send-email-shangw@linux.vnet.ibm.com \
    --to=shangw@linux.vnet.ibm.com \
    --cc=bhelgaas@google.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).