| Message ID | 20230911040217.253905-9-dlemoal@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Fix libata suspend/resume handling and code cleanup | expand |
On 9/11/23 06:02, Damien Le Moal wrote: > The scsi device flag no_start_on_resume is not set by any scsi low > level driver. Remove it. > > Signed-off-by: Damien Le Moal <dlemoal@kernel.org> > --- > drivers/scsi/sd.c | 7 ++----- > include/scsi/scsi_device.h | 1 - > 2 files changed, 2 insertions(+), 6 deletions(-) > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
On Mon, Sep 11, 2023 at 01:02:06PM +0900, Damien Le Moal wrote: > The scsi device flag no_start_on_resume is not set by any scsi low > level driver. Remove it. > > Signed-off-by: Damien Le Moal <dlemoal@kernel.org> Tested-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
On 9/10/23 21:02, Damien Le Moal wrote: > The scsi device flag no_start_on_resume is not set by any scsi low > level driver. Remove it. Please consider mentioning that this patch reverts commit 0a8589055936 ("ata,scsi: do not issue START STOP UNIT on resume"). Thanks, Bart.
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index a415abb721d3..b9504bb3cf4d 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -3846,11 +3846,8 @@ static int sd_resume(struct device *dev) if (!sdkp->device->manage_start_stop) return 0; - if (!sdkp->device->no_start_on_resume) { - sd_printk(KERN_NOTICE, sdkp, "Starting disk\n"); - ret = sd_start_stop_device(sdkp, 1); - } - + sd_printk(KERN_NOTICE, sdkp, "Starting disk\n"); + ret = sd_start_stop_device(sdkp, 1); if (!ret) opal_unlock_from_suspend(sdkp->opal_dev); return ret; diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index b9230b6add04..75b2235b99e2 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -194,7 +194,6 @@ struct scsi_device { unsigned no_start_on_add:1; /* do not issue start on add */ unsigned allow_restart:1; /* issue START_UNIT in error handler */ unsigned manage_start_stop:1; /* Let HLD (sd) manage start/stop */ - unsigned no_start_on_resume:1; /* Do not issue START_STOP_UNIT on resume */ unsigned start_stop_pwr_cond:1; /* Set power cond. in START_STOP_UNIT */ unsigned no_uld_attach:1; /* disable connecting to upper level drivers */ unsigned select_no_atn:1;
The scsi device flag no_start_on_resume is not set by any scsi low level driver. Remove it. Signed-off-by: Damien Le Moal <dlemoal@kernel.org> --- drivers/scsi/sd.c | 7 ++----- include/scsi/scsi_device.h | 1 - 2 files changed, 2 insertions(+), 6 deletions(-)