Skip to contentSkip to conversation

Patch "ahci: don't use MSI for devices with the silly Intel NVMe remapping scheme" has been added to the 4.13-stable tree

PATCH [email protected] 1 participant 1 message Sep 7, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ahci: don't use MSI for devices with the silly Intel NVMe remapping scheme

to the 4.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
ahci-don-t-use-msi-for-devices-with-the-silly-intel-nvme-remapping-scheme.patch
and it can be found in the queue-4.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From f723fa4e69920f6a5dd5fa0d10ce90e2f14d189c Mon Sep 17 00:00:00 2001

From: Christoph Hellwig <[email protected]>
Date: Tue, 5 Sep 2017 18:46:47 +0200
Subject: ahci: don't use MSI for devices with the silly Intel NVMe remapping scheme

From: Christoph Hellwig <[email protected]>

commit f723fa4e69920f6a5dd5fa0d10ce90e2f14d189c upstream.

Intel AHCI controllers that also hide NVMe devices in their bar can't use MSI interrupts, so disable them.

Fixes d684a90d38e2 ("ahci: per-port msix support")
---
 drivers/ata/ahci.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/ata/ahci.c +8 -1
@@ -1469,7 +1469,14 @@ static void ahci_remap_check(struct pci_
 		return;
 
 	dev_warn(&pdev->dev, "Found %d remapped NVMe devices.\n", count);
-	dev_warn(&pdev->dev, "Switch your BIOS from RAID to AHCI mode to use them.\n");
+	dev_warn(&pdev->dev,
+		 "Switch your BIOS from RAID to AHCI mode to use them.\n");
+
+	/*
+	 * Don't rely on the msi-x capability in the remap case,
+	 * share the legacy interrupt across ahci and remapped devices.
+	 */
+	hpriv->flags |= AHCI_HFLAG_NO_MSI;
 }
 
 static int ahci_get_irq_vector(struct ata_host *host, int port)

Patches currently in stable-queue which might be from [email protected] are

queue-4.13/ahci-don-t-use-msi-for-devices-with-the-silly-intel-nvme-remapping-scheme.patch