From: Christoph Hellwig <hch@lst.de>
Date: Thu, 11 Aug 2016 14:26:02 +0000 (-0700)
Subject: ahci: also use a per-port lock for the multi-MSIX case
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cd27396e6103a43c3df76f70db1feafa16206471;p=deliverable%2Flinux.git

ahci: also use a per-port lock for the multi-MSIX case

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Tejun Heo <tj@kernel.org>
---

diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 7461a587b39b..7c01192d3c48 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -2378,7 +2378,7 @@ static int ahci_port_start(struct ata_port *ap)
 	/*
 	 * Switch to per-port locking in case each port has its own MSI vector.
 	 */
-	if (hpriv->flags & AHCI_HFLAG_MULTI_MSI) {
+	if (hpriv->flags & (AHCI_HFLAG_MULTI_MSI | AHCI_HFLAG_MULTI_MSIX)) {
 		spin_lock_init(&pp->lock);
 		ap->lock = &pp->lock;
 	}