From: Kai-Heng Feng <kai.heng.feng@canonical.com>
To: nirmal.patel@linux.intel.com, jonathan.derrick@linux.dev
Cc: acelan.kao@canonical.com, lpieralisi@kernel.org, kw@linux.com,
manivannan.sadhasivam@linaro.org, robh@kernel.org,
bhelgaas@google.com, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org,
Kai-Heng Feng <kai.heng.feng@canonical.com>
Subject: [PATCH] PCI: vmd: Delay interrupt handling on MTL VMD controller
Date: Tue, 3 Sep 2024 10:55:44 +0800 [thread overview]
Message-ID: <20240903025544.286223-1-kai.heng.feng@canonical.com> (raw)
Meteor Lake VMD has a bug that the IRQ raises before the DMA region is
ready, so the requested IO is considered never completed:
[ 97.343423] nvme nvme0: I/O 259 QID 2 timeout, completion polled
[ 97.343446] nvme nvme0: I/O 384 QID 3 timeout, completion polled
[ 97.343459] nvme nvme0: I/O 320 QID 4 timeout, completion polled
[ 97.343470] nvme nvme0: I/O 707 QID 5 timeout, completion polled
The is documented as erratum MTL016 [0]. The suggested workaround is to
"The VMD MSI interrupt-handler should initially perform a dummy register
read to the MSI initiator device prior to any writes to ensure proper
PCIe ordering." which essentially is adding a delay before the interrupt
handling.
Hence add a delay before handle interrupt to workaround the erratum.
[0] https://edc.intel.com/content/www/us/en/design/products/platforms/details/meteor-lake-u-p/core-ultra-processor-specification-update/errata-details/#MTL016
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217871
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
drivers/pci/controller/vmd.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c
index a726de0af011..3433b3730f9c 100644
--- a/drivers/pci/controller/vmd.c
+++ b/drivers/pci/controller/vmd.c
@@ -16,6 +16,7 @@
#include <linux/srcu.h>
#include <linux/rculist.h>
#include <linux/rcupdate.h>
+#include <linux/delay.h>
#include <asm/irqdomain.h>
@@ -74,6 +75,9 @@ enum vmd_features {
* proper power management of the SoC.
*/
VMD_FEAT_BIOS_PM_QUIRK = (1 << 5),
+
+ /* Erratum MTL016 */
+ VMD_FEAT_INTERRUPT_QUIRK = (1 << 6),
};
#define VMD_BIOS_PM_QUIRK_LTR 0x1003 /* 3145728 ns */
@@ -90,6 +94,8 @@ static DEFINE_IDA(vmd_instance_ida);
*/
static DEFINE_RAW_SPINLOCK(list_lock);
+static bool interrupt_delay;
+
/**
* struct vmd_irq - private data to map driver IRQ to the VMD shared vector
* @node: list item for parent traversal.
@@ -105,6 +111,7 @@ struct vmd_irq {
struct vmd_irq_list *irq;
bool enabled;
unsigned int virq;
+ bool delay_irq;
};
/**
@@ -680,8 +687,11 @@ static irqreturn_t vmd_irq(int irq, void *data)
int idx;
idx = srcu_read_lock(&irqs->srcu);
- list_for_each_entry_rcu(vmdirq, &irqs->irq_list, node)
+ list_for_each_entry_rcu(vmdirq, &irqs->irq_list, node) {
+ if (interrupt_delay)
+ udelay(4);
generic_handle_irq(vmdirq->virq);
+ }
srcu_read_unlock(&irqs->srcu, idx);
return IRQ_HANDLED;
@@ -1015,6 +1025,9 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id)
if (features & VMD_FEAT_OFFSET_FIRST_VECTOR)
vmd->first_vec = 1;
+ if (features & VMD_FEAT_INTERRUPT_QUIRK)
+ interrupt_delay = true;
+
spin_lock_init(&vmd->cfg_lock);
pci_set_drvdata(dev, vmd);
err = vmd_enable_domain(vmd, features);
@@ -1106,7 +1119,8 @@ static const struct pci_device_id vmd_ids[] = {
{PCI_VDEVICE(INTEL, 0xa77f),
.driver_data = VMD_FEATS_CLIENT,},
{PCI_VDEVICE(INTEL, 0x7d0b),
- .driver_data = VMD_FEATS_CLIENT,},
+ .driver_data = VMD_FEATS_CLIENT |
+ VMD_FEAT_INTERRUPT_QUIRK,},
{PCI_VDEVICE(INTEL, 0xad0b),
.driver_data = VMD_FEATS_CLIENT,},
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_VMD_9A0B),
--
2.43.0
next reply other threads:[~2024-09-03 3:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-03 2:55 Kai-Heng Feng [this message]
2024-09-03 4:28 ` [PATCH] PCI: vmd: Delay interrupt handling on MTL VMD controller Manivannan Sadhasivam
2024-09-03 7:07 ` Kai-Heng Feng
2024-09-03 8:00 ` Manivannan Sadhasivam
2024-09-03 14:51 ` Keith Busch
2024-09-04 1:57 ` Kai-Heng Feng
2024-09-04 6:22 ` Manivannan Sadhasivam
2024-09-06 1:56 ` Kai-Heng Feng
2024-09-12 17:45 ` Nirmal Patel
2024-09-13 5:55 ` Kai-Heng Feng
2024-09-13 11:11 ` Manivannan Sadhasivam
2024-09-13 15:24 ` Keith Busch
2024-09-13 16:14 ` Manivannan Sadhasivam
2024-09-13 16:34 ` Keith Busch
2024-09-03 15:29 ` Nirmal Patel
2024-09-03 16:17 ` kernel test robot
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=20240903025544.286223-1-kai.heng.feng@canonical.com \
--to=kai.heng.feng@canonical.com \
--cc=acelan.kao@canonical.com \
--cc=bhelgaas@google.com \
--cc=jonathan.derrick@linux.dev \
--cc=kw@linux.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=manivannan.sadhasivam@linaro.org \
--cc=nirmal.patel@linux.intel.com \
--cc=robh@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