Merge tag 'for-5.4/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...

[linux.git] / drivers / scsi / sd_zbc.c

diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c
index 5d6ff3931632fdbd5aa0f5735d9a53a9a5fa1c91..de4019dc0f0b65c17a78de643c21f0e69015519e 100644 (file)
--- a/drivers/scsi/sd_zbc.c
+++ b/drivers/scsi/sd_zbc.c
@@ -209,10 +209,11 @@ static inline sector_t sd_zbc_zone_sectors(struct scsi_disk *sdkp)
 /**
  * sd_zbc_setup_reset_cmnd - Prepare a RESET WRITE POINTER scsi command.
  * @cmd: the command to setup
+ * @all: Reset all zones control.
  *
  * Called from sd_init_command() for a REQ_OP_ZONE_RESET request.
  */
-blk_status_t sd_zbc_setup_reset_cmnd(struct scsi_cmnd *cmd)
+blk_status_t sd_zbc_setup_reset_cmnd(struct scsi_cmnd *cmd, bool all)
 {
        struct request *rq = cmd->request;
        struct scsi_disk *sdkp = scsi_disk(rq->rq_disk);
@@ -234,7 +235,10 @@ blk_status_t sd_zbc_setup_reset_cmnd(struct scsi_cmnd *cmd)
        memset(cmd->cmnd, 0, cmd->cmd_len);
        cmd->cmnd[0] = ZBC_OUT;
        cmd->cmnd[1] = ZO_RESET_WRITE_POINTER;
-       put_unaligned_be64(block, &cmd->cmnd[2]);
+       if (all)
+               cmd->cmnd[14] = 0x1;
+       else
+               put_unaligned_be64(block, &cmd->cmnd[2]);
 
        rq->timeout = SD_TIMEOUT;
        cmd->sc_data_direction = DMA_NONE;
@@ -261,6 +265,7 @@ void sd_zbc_complete(struct scsi_cmnd *cmd, unsigned int good_bytes,
 
        switch (req_op(rq)) {
        case REQ_OP_ZONE_RESET:
+       case REQ_OP_ZONE_RESET_ALL:
 
                if (result &&
                    sshdr->sense_key == ILLEGAL_REQUEST &&
@@ -487,6 +492,9 @@ int sd_zbc_read_zones(struct scsi_disk *sdkp, unsigned char *buf)
        /* The drive satisfies the kernel restrictions: set it up */
        blk_queue_chunk_sectors(sdkp->disk->queue,
                        logical_to_sectors(sdkp->device, zone_blocks));
+       blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, sdkp->disk->queue);
+       blk_queue_required_elevator_features(sdkp->disk->queue,
+                                            ELEVATOR_F_ZBD_SEQ_WRITE);
        nr_zones = round_up(sdkp->capacity, zone_blocks) >> ilog2(zone_blocks);
 
        /* READ16/WRITE16 is mandatory for ZBC disks */