ata: libata-scsi: Cleanup ata_scsi_start_stop_xlat()

Now that libata does its own internal device power mode management
through libata EH, the scsi disk driver will not issue START STOP UNIT
commands anymore. We can receive this command only from user passthrough
operations. So there is no need to consider the system state and ATA
port flags for suspend to translate the command.

Since setting up the taskfile for the verify and standby
immediate commands is the same as done in ata_dev_power_set_active()
and ata_dev_power_set_standby(), factor out this code into the helper
function ata_dev_power_init_tf() to simplify ata_scsi_start_stop_xlat()
as well as ata_dev_power_set_active() and ata_dev_power_set_standby().

Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Tested-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 0f63f805c78c2d75815a5096f71e2ab4eb5f460e..5afd30d76f0bb21273d345c601fa506b284e2398 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1972,6 +1972,35 @@ retry:
        return rc;
 }
 
+bool ata_dev_power_init_tf(struct ata_device *dev, struct ata_taskfile *tf,
+                          bool set_active)
+{
+       /* Only applies to ATA and ZAC devices */
+       if (dev->class != ATA_DEV_ATA && dev->class != ATA_DEV_ZAC)
+               return false;
+
+       ata_tf_init(dev, tf);
+       tf->flags |= ATA_TFLAG_DEVICE | ATA_TFLAG_ISADDR;
+       tf->protocol = ATA_PROT_NODATA;
+
+       if (set_active) {
+               /* VERIFY for 1 sector at lba=0 */
+               tf->command = ATA_CMD_VERIFY;
+               tf->nsect = 1;
+               if (dev->flags & ATA_DFLAG_LBA) {
+                       tf->flags |= ATA_TFLAG_LBA;
+                       tf->device |= ATA_LBA;
+               } else {
+                       /* CHS */
+                       tf->lbal = 0x1; /* sect */
+               }
+       } else {
+               tf->command = ATA_CMD_STANDBYNOW1;
+       }
+
+       return true;
+}
+
 /**
  *     ata_dev_power_set_standby - Set a device power mode to standby
  *     @dev: target device
@@ -1988,10 +2017,6 @@ void ata_dev_power_set_standby(struct ata_device *dev)
        struct ata_taskfile tf;
        unsigned int err_mask;
 
-       /* Issue STANDBY IMMEDIATE command only if supported by the device */
-       if (dev->class != ATA_DEV_ATA && dev->class != ATA_DEV_ZAC)
-               return;
-
        /*
         * Some odd clown BIOSes issue spindown on power off (ACPI S4 or S5)
         * causing some drives to spin up and down again. For these, do nothing
@@ -2005,10 +2030,9 @@ void ata_dev_power_set_standby(struct ata_device *dev)
            system_entering_hibernation())
                return;
 
-       ata_tf_init(dev, &tf);
-       tf.flags |= ATA_TFLAG_DEVICE | ATA_TFLAG_ISADDR;
-       tf.protocol = ATA_PROT_NODATA;
-       tf.command = ATA_CMD_STANDBYNOW1;
+       /* Issue STANDBY IMMEDIATE command only if supported by the device */
+       if (!ata_dev_power_init_tf(dev, &tf, false))
+               return;
 
        ata_dev_notice(dev, "Entering standby power mode\n");
 
@@ -2038,22 +2062,9 @@ void ata_dev_power_set_active(struct ata_device *dev)
         * Issue READ VERIFY SECTORS command for 1 sector at lba=0 only
         * if supported by the device.
         */
-       if (dev->class != ATA_DEV_ATA && dev->class != ATA_DEV_ZAC)
+       if (!ata_dev_power_init_tf(dev, &tf, true))
                return;
 
-       ata_tf_init(dev, &tf);
-       tf.flags |= ATA_TFLAG_DEVICE | ATA_TFLAG_ISADDR;
-       tf.protocol = ATA_PROT_NODATA;
-       tf.command = ATA_CMD_VERIFY;
-       tf.nsect = 1;
-       if (dev->flags & ATA_DFLAG_LBA) {
-               tf.flags |= ATA_TFLAG_LBA;
-               tf.device |= ATA_LBA;
-       } else {
-               /* CHS */
-               tf.lbal = 0x1; /* sect */
-       }
-
        ata_dev_notice(dev, "Entering active power mode\n");
 
        err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, 0);

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index a371b497035e4099f96d623d178f94c832a2f288..63b4c09e15df0b142654c9a5632cc8944d88e271 100644 (file)
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1202,7 +1202,6 @@ EXPORT_SYMBOL_GPL(ata_scsi_slave_destroy);
 static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc)
 {
        struct scsi_cmnd *scmd = qc->scsicmd;
-       struct ata_taskfile *tf = &qc->tf;
        const u8 *cdb = scmd->cmnd;
        u16 fp;
        u8 bp = 0xff;
@@ -1212,54 +1211,24 @@ static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc)
                goto invalid_fld;
        }
 
-       tf->flags |= ATA_TFLAG_DEVICE | ATA_TFLAG_ISADDR;
-       tf->protocol = ATA_PROT_NODATA;
-       if (cdb[1] & 0x1) {
-               ;       /* ignore IMMED bit, violates sat-r05 */
-       }
+       /* LOEJ bit set not supported */
        if (cdb[4] & 0x2) {
                fp = 4;
                bp = 1;
-               goto invalid_fld;       /* LOEJ bit set not supported */
+               goto invalid_fld;
        }
+
+       /* Power conditions not supported */
        if (((cdb[4] >> 4) & 0xf) != 0) {
                fp = 4;
                bp = 3;
-               goto invalid_fld;       /* power conditions not supported */
+               goto invalid_fld;
        }
 
-       if (cdb[4] & 0x1) {
-               tf->nsect = 1;  /* 1 sector, lba=0 */
-
-               if (qc->dev->flags & ATA_DFLAG_LBA) {
-                       tf->flags |= ATA_TFLAG_LBA;
-
-                       tf->lbah = 0x0;
-                       tf->lbam = 0x0;
-                       tf->lbal = 0x0;
-                       tf->device |= ATA_LBA;
-               } else {
-                       /* CHS */
-                       tf->lbal = 0x1; /* sect */
-                       tf->lbam = 0x0; /* cyl low */
-                       tf->lbah = 0x0; /* cyl high */
-               }
-
-               tf->command = ATA_CMD_VERIFY;   /* READ VERIFY */
-       } else {
-               /* Some odd clown BIOSen issue spindown on power off (ACPI S4
-                * or S5) causing some drives to spin up and down again.
-                */
-               if ((qc->ap->flags & ATA_FLAG_NO_POWEROFF_SPINDOWN) &&
-                   system_state == SYSTEM_POWER_OFF)
-                       goto skip;
-
-               if ((qc->ap->flags & ATA_FLAG_NO_HIBERNATE_SPINDOWN) &&
-                   system_entering_hibernation())
-                       goto skip;
-
-               /* Issue ATA STANDBY IMMEDIATE command */
-               tf->command = ATA_CMD_STANDBYNOW1;
+       /* Ignore IMMED bit (cdb[1] & 0x1), violates sat-r05 */
+       if (!ata_dev_power_init_tf(qc->dev, &qc->tf, cdb[4] & 0x1)) {
+               ata_scsi_set_sense(qc->dev, scmd, ABORTED_COMMAND, 0, 0);
+               return 1;
        }
 
        /*
@@ -1274,12 +1243,8 @@ static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc)
  invalid_fld:
        ata_scsi_set_invalid_field(qc->dev, scmd, fp, bp);
        return 1;
- skip:
-       scmd->result = SAM_STAT_GOOD;
-       return 1;
 }
 
-
 /**
  *     ata_scsi_flush_xlat - Translate SCSI SYNCHRONIZE CACHE command
  *     @qc: Storage for translated ATA taskfile

diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index 05ac80da8ebc7d11153310ac892c25258c03993a..5c685bb1939e68c32d3768de508249b812af033b 100644 (file)
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -62,6 +62,8 @@ extern int ata_dev_reread_id(struct ata_device *dev, unsigned int readid_flags);
 extern int ata_dev_revalidate(struct ata_device *dev, unsigned int new_class,
                              unsigned int readid_flags);
 extern int ata_dev_configure(struct ata_device *dev);
+extern bool ata_dev_power_init_tf(struct ata_device *dev,
+                                 struct ata_taskfile *tf, bool set_active);
 extern void ata_dev_power_set_standby(struct ata_device *dev);
 extern void ata_dev_power_set_active(struct ata_device *dev);
 extern int sata_down_spd_limit(struct ata_link *link, u32 spd_limit);