ata: libata-core: relax checks in ata_read_log_directory()

Commit 6d4405b16d37 ("ata: libata-core: Cache the general purpose log
directory") introduced caching of a device general purpose log directory
to avoid repeated access to this log page during device scan. This
change also added a check on this log page to verify that the log page
version is 0x0001 as mandated by the ACS specifications.

And it turns out that some devices do not bother reporting this version,
instead reporting a version 0, resulting in error messages such as:

ata6.00: Invalid log directory version 0x0000

and to the device being marked as not supporting the general purpose log
directory log page.

Since before commit 6d4405b16d37 the log page version check did not
exist and things were still working correctly for these devices, relax
ata_read_log_directory() version check and only warn about the invalid
log page version number without disabling access to the log directory
page.

Fixes: 6d4405b16d37 ("ata: libata-core: Cache the general purpose log directory")
Cc: stable@vger.kernel.org
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220635
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Niklas Cassel <cassel@kernel.org>

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index ff53f5f029b4049161b5ce5438b45ce6bb1b18ae..2a210719c4ce5cb529ef089c548e9a536ec89ac4 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2174,13 +2174,10 @@ static int ata_read_log_directory(struct ata_device *dev)
        }
 
        version = get_unaligned_le16(&dev->gp_log_dir[0]);
-       if (version != 0x0001) {
-               ata_dev_err(dev, "Invalid log directory version 0x%04x\n",
-                           version);
-               ata_clear_log_directory(dev);
-               dev->quirks |= ATA_QUIRK_NO_LOG_DIR;
-               return -EINVAL;
-       }
+       if (version != 0x0001)
+               ata_dev_warn_once(dev,
+                                 "Invalid log directory version 0x%04x\n",
+                                 version);
 
        return 0;
 }

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 21de0935775d8f0b9a7f3000a41f75c4c3edf83a..7a98de1cc995c25453f161f313a2eb3aea777c84 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1594,6 +1594,12 @@ do {                                                             \
 #define ata_dev_dbg(dev, fmt, ...)                             \
        ata_dev_printk(debug, dev, fmt, ##__VA_ARGS__)
 
+#define ata_dev_warn_once(dev, fmt, ...)                       \
+       pr_warn_once("ata%u.%02u: " fmt,                        \
+                    (dev)->link->ap->print_id,                 \
+                    (dev)->link->pmp + (dev)->devno,           \
+                    ##__VA_ARGS__)
+
 static inline void ata_print_version_once(const struct device *dev,
                                          const char *version)
 {