On 1/5/24 1:39 AM, Phillip Susi wrote:
> Disks with Power Up In Standby enabled that required the
> SET FEATURES command to start up were being issued the
> command during resume. Suppress this until the disk
> is actually accessed.
> ---
> drivers/ata/libata-core.c | 24 ++++++++++++++++++++++--
> drivers/ata/libata-eh.c | 12 +++++++++++-
> drivers/ata/libata.h | 1 +
> include/linux/libata.h | 1 +
> 4 files changed, 35 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
> index d9e889fa2881..3f6187c75b16 100644
> --- a/drivers/ata/libata-core.c
> +++ b/drivers/ata/libata-core.c
> @@ -1912,7 +1912,25 @@ int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,
> goto err_out;
> }
>
> - if (!tried_spinup && (id[2] == 0x37c8 || id[2] == 0x738c)) {
> + if (flags & ATA_READID_NOSTART && id[2] == 0x37c8)
> + {
> + /*
> + * the drive has powered up in standby, and returned incomplete IDENTIFY info
s/the/The/.
> + * so we can't revalidate it yet. We have also been asked to avoid starting the
> + * drive, so stop here and leave the drive asleep and the EH pending, to be
Double space...
> + * restarted on later IO request
I think more common form is I/O.
[...]
> diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
> index 799a1b8bc384..74e0d54a204e 100644
> --- a/drivers/ata/libata-eh.c
> +++ b/drivers/ata/libata-eh.c
[...]
> @@ -3075,9 +3078,16 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link,
> ata_eh_about_to_do(link, dev, ATA_EH_REVALIDATE);
> rc = ata_dev_revalidate(dev, ehc->classes[dev->devno],
> readid_flags);
> - if (rc)
> + if (rc == -EAGAIN) {
> + rc = 0; /* start required but suppressed, handle later */
> + ehc->i.dev_action[dev->devno] &= ~ATA_EH_SET_ACTIVE;
> + ata_dev_warn(dev, "Leaving PuiS disk asleep for now");
> + continue;
> + }
> + else if (rc)
} else if (rc) {
> goto err;
}
You need {} on all *if* branches if at least one has it, as dictated
by the kernel coding style...
[...]
MBR, Sergey
