Commit 06f6c4c6 authored by Damien Le Moal's avatar Damien Le Moal

ata: libata: add missing ata_identify_page_supported() calls

ata_dev_config_ncq_prio() and ata_dev_config_devslp() both access pages
of the IDENTIFY DEVICE data log. Before calling ata_read_log_page(),
make sure to check for the existence of the IDENTIFY DEVICE data log and
of the log page accessed using ata_identify_page_supported(). This
avoids useless error messages from ata_read_log_page() and failures with
some LLDD scsi drivers using libsas.
Reported-by: default avatarNikolay <knv418@gmail.com>
Cc: stable@kernel.org # 5.15
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Tested-by: default avatarMatthew Perkowski <mgperkow@gmail.com>
parent 23ef63d5
...@@ -2178,6 +2178,9 @@ static void ata_dev_config_ncq_prio(struct ata_device *dev) ...@@ -2178,6 +2178,9 @@ static void ata_dev_config_ncq_prio(struct ata_device *dev)
struct ata_port *ap = dev->link->ap; struct ata_port *ap = dev->link->ap;
unsigned int err_mask; unsigned int err_mask;
if (!ata_identify_page_supported(dev, ATA_LOG_SATA_SETTINGS))
return;
err_mask = ata_read_log_page(dev, err_mask = ata_read_log_page(dev,
ATA_LOG_IDENTIFY_DEVICE, ATA_LOG_IDENTIFY_DEVICE,
ATA_LOG_SATA_SETTINGS, ATA_LOG_SATA_SETTINGS,
...@@ -2454,7 +2457,8 @@ static void ata_dev_config_devslp(struct ata_device *dev) ...@@ -2454,7 +2457,8 @@ static void ata_dev_config_devslp(struct ata_device *dev)
* Check device sleep capability. Get DevSlp timing variables * Check device sleep capability. Get DevSlp timing variables
* from SATA Settings page of Identify Device Data Log. * from SATA Settings page of Identify Device Data Log.
*/ */
if (!ata_id_has_devslp(dev->id)) if (!ata_id_has_devslp(dev->id) ||
!ata_identify_page_supported(dev, ATA_LOG_SATA_SETTINGS))
return; return;
err_mask = ata_read_log_page(dev, err_mask = ata_read_log_page(dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment