From: Vidya Sagar <vidyas@nvidia.com>
To: <bhelgaas@google.com>, <lorenzo.pieralisi@arm.com>,
<thierry.reding@gmail.com>, <jonathanh@nvidia.com>
Cc: <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<kthota@nvidia.com>, <mmaddireddy@nvidia.com>,
<vidyas@nvidia.com>, <sagar.tv@gmail.com>
Subject: [PATCH V2] PCI/MSI: Set device flag indicating only 32-bit MSI support
Date: Tue, 24 Nov 2020 16:20:35 +0530 [thread overview]
Message-ID: <20201124105035.24573-1-vidyas@nvidia.com> (raw)
In-Reply-To: <20201117145728.4516-1-vidyas@nvidia.com>
There are devices (Ex:- Marvell SATA controller) that don't support
64-bit MSIs and the same is advertised through their MSI capability
register. Set no_64bit_msi flag explicitly for such devices in the
MSI setup code so that the msi_verify_entries() API would catch
if the MSI arch code tries to use 64-bit MSI.
Signed-off-by: Vidya Sagar <vidyas@nvidia.com>
---
V2:
* Addressed Bjorn's comment and changed the error message
drivers/pci/msi.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index d52d118979a6..8de5ba6b4a59 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -581,10 +581,12 @@ msi_setup_entry(struct pci_dev *dev, int nvec, struct irq_affinity *affd)
entry->msi_attrib.multi_cap = (control & PCI_MSI_FLAGS_QMASK) >> 1;
entry->msi_attrib.multiple = ilog2(__roundup_pow_of_two(nvec));
- if (control & PCI_MSI_FLAGS_64BIT)
+ if (control & PCI_MSI_FLAGS_64BIT) {
entry->mask_pos = dev->msi_cap + PCI_MSI_MASK_64;
- else
+ } else {
entry->mask_pos = dev->msi_cap + PCI_MSI_MASK_32;
+ dev->no_64bit_msi = 1;
+ }
/* Save the initial mask status */
if (entry->msi_attrib.maskbit)
@@ -602,8 +604,9 @@ static int msi_verify_entries(struct pci_dev *dev)
for_each_pci_msi_entry(entry, dev) {
if (!dev->no_64bit_msi || !entry->msg.address_hi)
continue;
- pci_err(dev, "Device has broken 64-bit MSI but arch"
- " tried to assign one above 4G\n");
+ pci_err(dev, "Device has either broken 64-bit MSI or "
+ "only 32-bit MSI support but "
+ "arch tried to assign one above 4G\n");
return -EIO;
}
return 0;
--
2.17.1
next prev parent reply other threads:[~2020-11-24 10:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-17 14:57 [PATCH] PCI/MSI: Set device flag indicating only 32-bit MSI support Vidya Sagar
2020-11-20 21:30 ` Bjorn Helgaas
2020-11-24 3:57 ` Vidya Sagar
2020-11-24 10:50 ` Vidya Sagar [this message]
2020-12-03 5:00 ` [PATCH V2] " Vidya Sagar
2020-12-03 18:24 ` Bjorn Helgaas
2020-12-03 19:03 ` Vidya Sagar
2020-12-03 19:54 ` Bjorn Helgaas
2020-12-04 2:28 ` Vidya Sagar
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=20201124105035.24573-1-vidyas@nvidia.com \
--to=vidyas@nvidia.com \
--cc=bhelgaas@google.com \
--cc=jonathanh@nvidia.com \
--cc=kthota@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=mmaddireddy@nvidia.com \
--cc=sagar.tv@gmail.com \
--cc=thierry.reding@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).