summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2020-05-08 07:28:19 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-11-05 11:43:12 +0100
commit87d9ac94c7e77fb44d275912f467376cc115c840 (patch)
treeb1e5678153e74e4a57c141106fa42ca1edc384eb /drivers/ata
parentda8e2fbe458c4b3baaf1da5957347b9bcf858af3 (diff)
downloadlinux-stable-87d9ac94c7e77fb44d275912f467376cc115c840.tar.gz
linux-stable-87d9ac94c7e77fb44d275912f467376cc115c840.tar.bz2
linux-stable-87d9ac94c7e77fb44d275912f467376cc115c840.zip
ata: sata_nv: Fix retrieving of active qcs
[ Upstream commit 8e4c309f9f33b76c09daa02b796ef87918eee494 ] ata_qc_complete_multiple() has to be called with the tags physically active, that is the hw tag is at bit 0. ap->qc_active has the same tag at bit ATA_TAG_INTERNAL instead, so call ata_qc_get_active() to fix that up. This is done in the vein of 8385d756e114 ("libata: Fix retrieving of active qcs"). Fixes: 28361c403683 ("libata: add extra internal command") Tested-by: Pali Rohár <pali@kernel.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/sata_nv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 18b147c182b9..0514aa7e80e3 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -2100,7 +2100,7 @@ static int nv_swncq_sdbfis(struct ata_port *ap)
pp->dhfis_bits &= ~done_mask;
pp->dmafis_bits &= ~done_mask;
pp->sdbfis_bits |= done_mask;
- ata_qc_complete_multiple(ap, ap->qc_active ^ done_mask);
+ ata_qc_complete_multiple(ap, ata_qc_get_active(ap) ^ done_mask);
if (!ap->qc_active) {
DPRINTK("over\n");