libata: implement and use ata_port_desc() to report port configuration

Currently, port configuration reporting has the following problems.

* iomapped address is reported instead of raw address
* report contains irrelevant fields or lacks necessary fields for
  non-SFF controllers.
* host->irq/irq2 are there just for reporting and hacky.

This patch implements and uses ata_port_desc() and
ata_port_pbar_desc().  ata_port_desc() is almost identical to
ata_ehi_push_desc() except that it takes @ap instead of @ehi, has no
locking requirement, can only be used during host initialization and "
" is used as separator instead of ", ".  ata_port_pbar_desc() is a
helper to ease reporting of a PCI BAR or an offsetted address into it.

LLD pushes whatever description it wants using the above two
functions.  The accumulated description is printed on host
registration after "[S/P]ATA max MAX_XFERMODE ".

SFF init helpers and ata_host_activate() automatically add
descriptions for addresses and irq respectively, so only LLDs which
isn't standard SFF need to add custom descriptions.  In many cases,
such controllers need to report different things anyway.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 18 insertions, 5 deletions

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index ccef99a0337c..026439e05afe 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -567,6 +567,9 @@ int ata_pci_init_bmdma(struct ata_host *host)
                 if ((!(ap->flags & ATA_FLAG_IGN_SIMPLEX)) &&
                     (ioread8(bmdma + 2) & 0x80))
                         host->flags |= ATA_HOST_SIMPLEX;
+
+                ata_port_desc(ap, "bmdma 0x%llx",
+                        (unsigned long long)pci_resource_start(pdev, 4) + 8 * i);
         }
 
         return 0;
@@ -634,6 +637,10 @@ int ata_pci_init_sff_host(struct ata_host *host)
                         ((unsigned long)iomap[base + 1] | ATA_PCI_CTL_OFS);
                 ata_std_ports(&ap->ioaddr);
 
+                ata_port_desc(ap, "cmd 0x%llx ctl 0x%llx",
+                        (unsigned long long)pci_resource_start(pdev, base),
+                        (unsigned long long)pci_resource_start(pdev, base + 1));
+
                 mask |= 1 << i;
         }
 
@@ -804,24 +811,30 @@ int ata_pci_init_one(struct pci_dev *pdev,
                                       IRQF_SHARED, DRV_NAME, host);
                 if (rc)
                         goto err_out;
-                host->irq = pdev->irq;
+
+                ata_port_desc(host->ports[0], "irq %d", pdev->irq);
+                ata_port_desc(host->ports[1], "irq %d", pdev->irq);
         } else {
                 if (!ata_port_is_dummy(host->ports[0])) {
-                        host->irq = ATA_PRIMARY_IRQ(pdev);
-                        rc = devm_request_irq(dev, host->irq,
+                        rc = devm_request_irq(dev, ATA_PRIMARY_IRQ(pdev),
                                               pi->port_ops->irq_handler,
                                               IRQF_SHARED, DRV_NAME, host);
                         if (rc)
                                 goto err_out;
+
+                        ata_port_desc(host->ports[0], "irq %d",
+                                      ATA_PRIMARY_IRQ(pdev));
                 }
 
                 if (!ata_port_is_dummy(host->ports[1])) {
-                        host->irq2 = ATA_SECONDARY_IRQ(pdev);
-                        rc = devm_request_irq(dev, host->irq2,
+                        rc = devm_request_irq(dev, ATA_SECONDARY_IRQ(pdev),
                                               pi->port_ops->irq_handler,
                                               IRQF_SHARED, DRV_NAME, host);
                         if (rc)
                                 goto err_out;
+
+                        ata_port_desc(host->ports[1], "irq %d",
+                                      ATA_SECONDARY_IRQ(pdev));
                 }
         }