| Message ID | 20230911040217.253905-19-dlemoal@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | Fix libata suspend/resume handling and code cleanup | expand |
On 9/11/23 06:02, Damien Le Moal wrote: > There is no point in warning about a device being diabled when we expect disabled > it to be, that is, on suspend, shutdown or when detaching a device. > Suppress this message for these cases by introducing the EH static > function ata_eh_dev_disable() and by using it in ata_eh_unload() and > ata_eh_detach_dev(). ata_dev_disable() code is modified to call this new > function after printing the "disable device" message. > > Signed-off-by: Damien Le Moal <dlemoal@kernel.org> > --- > drivers/ata/libata-eh.c | 32 +++++++++++++++++++------------- > 1 file changed, 19 insertions(+), 13 deletions(-) > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
Hello! On 9/11/23 7:02 AM, Damien Le Moal wrote: > There is no point in warning about a device being diabled when we expect Disabled. :-) > it to be, that is, on suspend, shutdown or when detaching a device. > Suppress this message for these cases by introducing the EH static > function ata_eh_dev_disable() and by using it in ata_eh_unload() and > ata_eh_detach_dev(). ata_dev_disable() code is modified to call this new > function after printing the "disable device" message. > > Signed-off-by: Damien Le Moal <dlemoal@kernel.org> [...] MBR, Sergey
On Mon, Sep 11, 2023 at 01:02:16PM +0900, Damien Le Moal wrote: > There is no point in warning about a device being diabled when we expect > it to be, that is, on suspend, shutdown or when detaching a device. > Suppress this message for these cases by introducing the EH static > function ata_eh_dev_disable() and by using it in ata_eh_unload() and > ata_eh_detach_dev(). ata_dev_disable() code is modified to call this new > function after printing the "disable device" message. > > Signed-off-by: Damien Le Moal <dlemoal@kernel.org> Tested-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index bbc522d16f44..5bad5dabffe0 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -494,6 +494,18 @@ void ata_eh_release(struct ata_port *ap) mutex_unlock(&ap->host->eh_mutex); } +static void ata_eh_dev_disable(struct ata_device *dev) +{ + ata_acpi_on_disable(dev); + ata_down_xfermask_limit(dev, ATA_DNXFER_FORCE_PIO0 | ATA_DNXFER_QUIET); + dev->class++; + + /* From now till the next successful probe, ering is used to + * track probe failures. Clear accumulated device error info. + */ + ata_ering_clear(&dev->ering); +} + static void ata_eh_unload(struct ata_port *ap) { struct ata_link *link; @@ -517,8 +529,8 @@ static void ata_eh_unload(struct ata_port *ap) */ ata_for_each_link(link, ap, PMP_FIRST) { sata_scr_write(link, SCR_CONTROL, link->saved_scontrol & 0xff0); - ata_for_each_dev(dev, link, ALL) - ata_dev_disable(dev); + ata_for_each_dev(dev, link, ENABLED) + ata_eh_dev_disable(dev); } /* freeze and set UNLOADED */ @@ -1211,14 +1223,8 @@ void ata_dev_disable(struct ata_device *dev) return; ata_dev_warn(dev, "disable device\n"); - ata_acpi_on_disable(dev); - ata_down_xfermask_limit(dev, ATA_DNXFER_FORCE_PIO0 | ATA_DNXFER_QUIET); - dev->class++; - /* From now till the next successful probe, ering is used to - * track probe failures. Clear accumulated device error info. - */ - ata_ering_clear(&dev->ering); + ata_eh_dev_disable(dev); } EXPORT_SYMBOL_GPL(ata_dev_disable); @@ -1240,12 +1246,12 @@ void ata_eh_detach_dev(struct ata_device *dev) /* * If the device is still enabled, transition it to standby power mode - * (i.e. spin down HDDs). + * (i.e. spin down HDDs) and disable it. */ - if (ata_dev_enabled(dev)) + if (ata_dev_enabled(dev)) { ata_dev_power_set_standby(dev); - - ata_dev_disable(dev); + ata_eh_dev_disable(dev); + } spin_lock_irqsave(ap->lock, flags);
There is no point in warning about a device being diabled when we expect it to be, that is, on suspend, shutdown or when detaching a device. Suppress this message for these cases by introducing the EH static function ata_eh_dev_disable() and by using it in ata_eh_unload() and ata_eh_detach_dev(). ata_dev_disable() code is modified to call this new function after printing the "disable device" message. Signed-off-by: Damien Le Moal <dlemoal@kernel.org> --- drivers/ata/libata-eh.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-)