linux-ide.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: tj@kernel.org
Cc: hare@suse.com, damien.lemoal@hgst.com, linux-ide@vger.kernel.org
Subject: [PATCH 08/10] libata-scsi: Fix translation of REPORT ZONES command
Date: Thu, 14 Jul 2016 09:05:49 +0900	[thread overview]
Message-ID: <1468454751-12466-9-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1468454751-12466-1-git-send-email-hch@lst.de>

From: Damien Le Moal <damien.lemoal@hgst.com>

Include reporting options when translating REPORT ZONES commmand to
ATA NCQ, and make sure we only look at the actually specified bits
in the CDB for the options.

Signed-off-by: Damien Le Moal <damien.lemoal@hgst.com>
[hch: update patch description]
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/ata/libata-scsi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 901b46a..45d8ae63 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3468,7 +3468,7 @@ static unsigned int ata_scsi_zbc_in_xlat(struct ata_queued_cmd *qc)
 		goto invalid_param_len;
 	}
 	sect = n_block / 512;
-	options = cdb[14];
+	options = cdb[14] & 0xbf;
 
 	if (ata_ncq_enabled(qc->dev) &&
 	    ata_fpdma_zac_mgmt_in_supported(qc->dev)) {
@@ -3478,7 +3478,7 @@ static unsigned int ata_scsi_zbc_in_xlat(struct ata_queued_cmd *qc)
 		tf->nsect = qc->tag << 3;
 		tf->feature = sect & 0xff;
 		tf->hob_feature = (sect >> 8) & 0xff;
-		tf->auxiliary = ATA_SUBCMD_ZAC_MGMT_IN_REPORT_ZONES;
+		tf->auxiliary = ATA_SUBCMD_ZAC_MGMT_IN_REPORT_ZONES | (options << 8);
 	} else {
 		tf->command = ATA_CMD_ZAC_MGMT_IN;
 		tf->feature = ATA_SUBCMD_ZAC_MGMT_IN_REPORT_ZONES;
-- 
2.1.4


  parent reply	other threads:[~2016-07-14  0:06 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-14  0:05 ZAC fixes Christoph Hellwig
2016-07-14  0:05 ` [PATCH 01/10] libata: return boolean values from ata_is_* Christoph Hellwig
2016-07-14  0:05 ` [PATCH 02/10] libata: use ata_is_ncq() accessors Christoph Hellwig
2016-07-14  0:05 ` [PATCH 03/10] libsas: use ata_is_ncq() and ata_has_dma() accessors Christoph Hellwig
2016-07-14 14:45   ` Tejun Heo
2016-07-14  0:05 ` [PATCH 04/10] ata: add ata_is_fpdma() accessor Christoph Hellwig
2016-07-14 14:37   ` Tejun Heo
2016-07-14 15:15     ` Hannes Reinecke
2016-07-14 15:19       ` Tejun Heo
2016-07-14 16:01         ` Hannes Reinecke
2016-07-15  6:13     ` Christoph Hellwig
2016-07-15  7:07       ` Hannes Reinecke
2016-07-15  7:26         ` Christoph Hellwig
2016-07-14  0:05 ` [PATCH 05/10] ata: fixup ATA_PROT_NODATA Christoph Hellwig
2016-07-14  0:05 ` [PATCH 06/10] libata-eh: decode all taskfile protocols Christoph Hellwig
2016-07-14 11:51   ` Sergei Shtylyov
2016-07-14 14:48   ` Tejun Heo
2016-07-14 23:08     ` Christoph Hellwig
2016-07-14  0:05 ` [PATCH 07/10] ata: Handle ATA NCQ NO-DATA commands correctly Christoph Hellwig
2016-07-14  0:05 ` Christoph Hellwig [this message]
2016-07-14  0:05 ` [PATCH 09/10] libata-scsi: Fix ZBC management out command translation Christoph Hellwig
2016-07-14 11:54   ` Sergei Shtylyov
2016-07-14  0:05 ` [PATCH 10/10] libata-scsi: minor cleanup for ata_scsi_zbc_out_xlat Christoph Hellwig
2016-07-15 12:09   ` Tejun Heo

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=1468454751-12466-9-git-send-email-hch@lst.de \
    --to=hch@lst.de \
    --cc=damien.lemoal@hgst.com \
    --cc=hare@suse.com \
    --cc=linux-ide@vger.kernel.org \
    --cc=tj@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;
as well as URLs for NNTP newsgroup(s).