libata: cleanup ata_dev_configure()

Introduce the helper functions ata_dev_config_lba() and
ata_dev_config_chs() to configure the addressing capabilities of a
device. To control message printing in these new helpers, as well as
in ata_dev_configure() and in ata_hpa_resize(), add the helper function
ata_dev_print_info() to avoid open coding for the eh context
ATA_EHI_PRINTINFO flag in multiple functions.

Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20210816014456.2191776-6-damien.lemoal@wdc.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index f96cd2f..f600ea1 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -159,6 +159,12 @@ MODULE_DESCRIPTION("Library module for ATA devices");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 
+static inline bool ata_dev_print_info(struct ata_device *dev)
+{
+       struct ata_eh_context *ehc = &dev->link->eh_context;
+
+       return ehc->i.flags & ATA_EHI_PRINTINFO;
+}
 
 static bool ata_sstatus_online(u32 sstatus)
 {
@@ -1266,8 +1272,7 @@ static int ata_set_max_sectors(struct ata_device *dev, u64 new_sectors)
  */
 static int ata_hpa_resize(struct ata_device *dev)
 {
-       struct ata_eh_context *ehc = &dev->link->eh_context;
-       int print_info = ehc->i.flags & ATA_EHI_PRINTINFO;
+       bool print_info = ata_dev_print_info(dev);
        bool unlock_hpa = ata_ignore_hpa || dev->flags & ATA_DFLAG_UNLOCK_HPA;
        u64 sectors = ata_id_n_sectors(dev->id);
        u64 native_sectors;
@@ -2363,6 +2368,65 @@ static void ata_dev_config_trusted(struct ata_device *dev)
                dev->flags |= ATA_DFLAG_TRUSTED;
 }
 
+static int ata_dev_config_lba(struct ata_device *dev)
+{
+       struct ata_port *ap = dev->link->ap;
+       const u16 *id = dev->id;
+       const char *lba_desc;
+       char ncq_desc[24];
+       int ret;
+
+       dev->flags |= ATA_DFLAG_LBA;
+
+       if (ata_id_has_lba48(id)) {
+               lba_desc = "LBA48";
+               dev->flags |= ATA_DFLAG_LBA48;
+               if (dev->n_sectors >= (1UL << 28) &&
+                   ata_id_has_flush_ext(id))
+                       dev->flags |= ATA_DFLAG_FLUSH_EXT;
+       } else {
+               lba_desc = "LBA";
+       }
+
+       /* config NCQ */
+       ret = ata_dev_config_ncq(dev, ncq_desc, sizeof(ncq_desc));
+
+       /* print device info to dmesg */
+       if (ata_msg_drv(ap) && ata_dev_print_info(dev))
+               ata_dev_info(dev,
+                            "%llu sectors, multi %u: %s %s\n",
+                            (unsigned long long)dev->n_sectors,
+                            dev->multi_count, lba_desc, ncq_desc);
+
+       return ret;
+}
+
+static void ata_dev_config_chs(struct ata_device *dev)
+{
+       struct ata_port *ap = dev->link->ap;
+       const u16 *id = dev->id;
+
+       if (ata_id_current_chs_valid(id)) {
+               /* Current CHS translation is valid. */
+               dev->cylinders = id[54];
+               dev->heads     = id[55];
+               dev->sectors   = id[56];
+       } else {
+               /* Default translation */
+               dev->cylinders  = id[1];
+               dev->heads      = id[3];
+               dev->sectors    = id[6];
+       }
+
+       /* print device info to dmesg */
+       if (ata_msg_drv(ap) && ata_dev_print_info(dev))
+               ata_dev_info(dev,
+                            "%llu sectors, multi %u, CHS %u/%u/%u\n",
+                            (unsigned long long)dev->n_sectors,
+                            dev->multi_count, dev->cylinders,
+                            dev->heads, dev->sectors);
+}
+
 static void ata_dev_config_devslp(struct ata_device *dev)
 {
        u8 *sata_setting = dev->link->ap->sector_buf;
@@ -2410,8 +2474,7 @@ static void ata_dev_config_devslp(struct ata_device *dev)
 int ata_dev_configure(struct ata_device *dev)
 {
        struct ata_port *ap = dev->link->ap;
-       struct ata_eh_context *ehc = &dev->link->eh_context;
-       int print_info = ehc->i.flags & ATA_EHI_PRINTINFO;
+       bool print_info = ata_dev_print_info(dev);
        const u16 *id = dev->id;
        unsigned long xfer_mask;
        unsigned int err_mask;
@@ -2538,62 +2601,18 @@ int ata_dev_configure(struct ata_device *dev)
                                        dev->multi_count = cnt;
                }
 
-               if (ata_id_has_lba(id)) {
-                       const char *lba_desc;
-                       char ncq_desc[24];
-
-                       lba_desc = "LBA";
-                       dev->flags |= ATA_DFLAG_LBA;
-                       if (ata_id_has_lba48(id)) {
-                               dev->flags |= ATA_DFLAG_LBA48;
-                               lba_desc = "LBA48";
-
-                               if (dev->n_sectors >= (1UL << 28) &&
-                                   ata_id_has_flush_ext(id))
-                                       dev->flags |= ATA_DFLAG_FLUSH_EXT;
-                       }
+               /* print device info to dmesg */
+               if (ata_msg_drv(ap) && print_info)
+                       ata_dev_info(dev, "%s: %s, %s, max %s\n",
+                                    revbuf, modelbuf, fwrevbuf,
+                                    ata_mode_string(xfer_mask));
 
-                       /* config NCQ */
-                       rc = ata_dev_config_ncq(dev, ncq_desc, sizeof(ncq_desc));
+               if (ata_id_has_lba(id)) {
+                       rc = ata_dev_config_lba(dev);
                        if (rc)
                                return rc;
-
-                       /* print device info to dmesg */
-                       if (ata_msg_drv(ap) && print_info) {
-                               ata_dev_info(dev, "%s: %s, %s, max %s\n",
-                                            revbuf, modelbuf, fwrevbuf,
-                                            ata_mode_string(xfer_mask));
-                               ata_dev_info(dev,
-                                            "%llu sectors, multi %u: %s %s\n",
-                                       (unsigned long long)dev->n_sectors,
-                                       dev->multi_count, lba_desc, ncq_desc);
-                       }
                } else {
-                       /* CHS */
-
-                       /* Default translation */
-                       dev->cylinders  = id[1];
-                       dev->heads      = id[3];
-                       dev->sectors    = id[6];
-
-                       if (ata_id_current_chs_valid(id)) {
-                               /* Current CHS translation is valid. */
-                               dev->cylinders = id[54];
-                               dev->heads     = id[55];
-                               dev->sectors   = id[56];
-                       }
-
-                       /* print device info to dmesg */
-                       if (ata_msg_drv(ap) && print_info) {
-                               ata_dev_info(dev, "%s: %s, %s, max %s\n",
-                                            revbuf,    modelbuf, fwrevbuf,
-                                            ata_mode_string(xfer_mask));
-                               ata_dev_info(dev,
-                                            "%llu sectors, multi %u, CHS %u/%u/%u\n",
-                                            (unsigned long long)dev->n_sectors,
-                                            dev->multi_count, dev->cylinders,
-                                            dev->heads, dev->sectors);
-                       }
+                       ata_dev_config_chs(dev);
                }
 
                ata_dev_config_devslp(dev);