diff options
| author | Damien Le Moal <damien.lemoal@wdc.com> | 2018-06-26 13:56:55 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2018-07-02 17:59:26 +0200 |
| commit | 6edf1d4cb0acde3a0a5dac849f33031bd7abb7b1 (patch) | |
| tree | e3cb21349a195b29fe9e907ceeca3938b89b3b8a /drivers/ata/libata-scsi.c | |
| parent | ata: Fix ZBC_OUT command block check (diff) | |
| download | linux-6edf1d4cb0acde3a0a5dac849f33031bd7abb7b1.tar.xz linux-6edf1d4cb0acde3a0a5dac849f33031bd7abb7b1.zip | |
ata: Fix ZBC_OUT all bit handling
If the ALL bit is set in the ZBC_OUT command, the command zone ID field
(block) should be ignored.
Reported-by: David Butterfield <david.butterfield@wdc.com>
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Cc: stable@vger.kernel.org
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/libata-scsi.c')
| -rw-r--r-- | drivers/ata/libata-scsi.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index a5543751f446..aad1b01447de 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -3805,7 +3805,14 @@ static unsigned int ata_scsi_zbc_out_xlat(struct ata_queued_cmd *qc) */ goto invalid_param_len; } - if (block >= dev->n_sectors) { + + all = cdb[14] & 0x1; + if (all) { + /* + * Ignore the block address (zone ID) as defined by ZBC. + */ + block = 0; + } else if (block >= dev->n_sectors) { /* * Block must be a valid zone ID (a zone start LBA). */ @@ -3813,8 +3820,6 @@ static unsigned int ata_scsi_zbc_out_xlat(struct ata_queued_cmd *qc) goto invalid_fld; } - all = cdb[14] & 0x1; - if (ata_ncq_enabled(qc->dev) && ata_fpdma_zac_mgmt_out_supported(qc->dev)) { tf->protocol = ATA_PROT_NCQ_NODATA; |