libata-scsi: Fix ZBC management out command translation

The subcommand for NCQ NON-DATA must be specified in the feature
(low byte), not the high-order count byte.  Also make sure to properly
cast the all bit to a u16 before shiting it by 8 to avoid undefined
behavior.

Signed-off-by: Damien Le Moal <damien.lemoal@hgst.com>
[hch: split the original patch into two, updated changelog]
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Tejun Heo <tj@kernel.org>

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 45d8ae63cdf091706a53ce92ee14367bea5bab5e..d978153c06ef34f1adac69002c249fff8b44346f 100644 (file)
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3553,9 +3553,9 @@ static unsigned int ata_scsi_zbc_out_xlat(struct ata_queued_cmd *qc)
            ata_fpdma_zac_mgmt_out_supported(qc->dev)) {
                tf->protocol = ATA_PROT_NCQ_NODATA;
                tf->command = ATA_CMD_NCQ_NON_DATA;
-               tf->hob_nsect = ATA_SUBCMD_NCQ_NON_DATA_ZAC_MGMT_OUT;
+               tf->feature = ATA_SUBCMD_NCQ_NON_DATA_ZAC_MGMT_OUT;
                tf->nsect = qc->tag << 3;
-               tf->auxiliary = sa | (reset_all & 0x1) << 8;
+               tf->auxiliary = sa | ((u16)(reset_all & 0x1) << 8);
        } else {
                tf->protocol = ATA_PROT_NODATA;
                tf->command = ATA_CMD_ZAC_MGMT_OUT;