On 6/15/24 04:18, Igor Pylypiv wrote:
> Do not generate sense data from ATA status/error registers
> if valid sense data is already present.
This kind of contradicts what you said in patch 2... So I am really confused now.
Though this patch actually looks good to me, modulo the comment below.
But shouldn't this be squashed with patch 2 ?
>
> Signed-off-by: Igor Pylypiv <ipylypiv@xxxxxxxxxx>
> ---
> drivers/ata/libata-scsi.c | 17 +++++++++++------
> 1 file changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
> index 79e8103ef3a9..4bfe47e7d266 100644
> --- a/drivers/ata/libata-scsi.c
> +++ b/drivers/ata/libata-scsi.c
> @@ -858,12 +858,17 @@ static void ata_gen_passthru_sense(struct ata_queued_cmd *qc)
> unsigned char *desc = sb + 8;
> u8 sense_key, asc, ascq;
>
> - /*
> - * Use ata_to_sense_error() to map status register bits
> - * onto sense key, asc & ascq.
> - */
> - if (qc->err_mask ||
> - tf->status & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {
> + if (qc->flags & ATA_QCFLAG_SENSE_VALID) {
> + /*
> + * Do not generate sense data from ATA status/error
> + * registers if valid sense data is already present.
> + */
The empty "if" here is really horrible. Please revert the condition and add it
as a "&&" in the below if.
> + } else if (qc->err_mask ||
> + tf->status & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {
> + /*
> + * Use ata_to_sense_error() to map status register bits
> + * onto sense key, asc & ascq.
> + */
> ata_to_sense_error(qc->ap->print_id, tf->status, tf->error,
> &sense_key, &asc, &ascq);
> ata_scsi_set_sense(qc->dev, cmd, sense_key, asc, ascq);
--
Damien Le Moal
Western Digital Research
