Skip to content

Commit

Permalink
libata: fix reading concurrent positioning ranges log
Browse files Browse the repository at this point in the history
The concurrent positioning ranges log is not a fixed size and may depend
on how many ranges are supported by the device. This patch uses the size
reported in the GPL directory to determine the number of pages supported
by the device before attempting to read this log page.

This resolves this error from the dmesg output:
    ata6.00: Read log 0x47 page 0x00 failed, Emask 0x1

Cc: [email protected]
Fixes: fe22e1c ("libata: support concurrent positioning ranges log")
Signed-off-by: Tyler Erickson <[email protected]>
Reviewed-by: Muhammad Ahmad <[email protected]>
Tested-by: Michael English <[email protected]>
Signed-off-by: Damien Le Moal <[email protected]>
  • Loading branch information
vonericsen authored and Damien Le Moal committed Jun 8, 2022
1 parent 10d6bdf commit c745dfc
Showing 1 changed file with 13 additions and 8 deletions.
21 changes: 13 additions & 8 deletions drivers/ata/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2010,16 +2010,16 @@ unsigned int ata_read_log_page(struct ata_device *dev, u8 log,
return err_mask;
}

static bool ata_log_supported(struct ata_device *dev, u8 log)
static int ata_log_supported(struct ata_device *dev, u8 log)
{
struct ata_port *ap = dev->link->ap;

if (dev->horkage & ATA_HORKAGE_NO_LOG_DIR)
return false;
return 0;

if (ata_read_log_page(dev, ATA_LOG_DIRECTORY, 0, ap->sector_buf, 1))
return false;
return get_unaligned_le16(&ap->sector_buf[log * 2]) ? true : false;
return 0;
return get_unaligned_le16(&ap->sector_buf[log * 2]);
}

static bool ata_identify_page_supported(struct ata_device *dev, u8 page)
Expand Down Expand Up @@ -2455,15 +2455,20 @@ static void ata_dev_config_cpr(struct ata_device *dev)
struct ata_cpr_log *cpr_log = NULL;
u8 *desc, *buf = NULL;

if (ata_id_major_version(dev->id) < 11 ||
!ata_log_supported(dev, ATA_LOG_CONCURRENT_POSITIONING_RANGES))
if (ata_id_major_version(dev->id) < 11)
goto out;

buf_len = ata_log_supported(dev, ATA_LOG_CONCURRENT_POSITIONING_RANGES);
if (buf_len == 0)
goto out;

/*
* Read the concurrent positioning ranges log (0x47). We can have at
* most 255 32B range descriptors plus a 64B header.
* most 255 32B range descriptors plus a 64B header. This log varies in
* size, so use the size reported in the GPL directory. Reading beyond
* the supported length will result in an error.
*/
buf_len = (64 + 255 * 32 + 511) & ~511;
buf_len <<= 9;
buf = kzalloc(buf_len, GFP_KERNEL);
if (!buf)
goto out;
Expand Down

0 comments on commit c745dfc

Please sign in to comment.