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, 17 insertions, 2 deletions

diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c
index 4a69328a4c43..be30923566c5 100644
--- a/drivers/ata/pata_icside.c
+++ b/drivers/ata/pata_icside.c
@@ -70,6 +70,8 @@ struct pata_icside_info {
         unsigned int            mwdma_mask;
         unsigned int            nr_ports;
         const struct portinfo   *port[2];
+        unsigned long           raw_base;
+        unsigned long           raw_ioc_base;
 };
 
 #define ICS_TYPE_A3IN   0
@@ -392,9 +394,10 @@ static struct ata_port_operations pata_icside_port_ops = {
 };
 
 static void __devinit
-pata_icside_setup_ioaddr(struct ata_ioports *ioaddr, void __iomem *base,
+pata_icside_setup_ioaddr(struct ata_port *ap, void __iomem *base,
                          const struct portinfo *info)
 {
+        struct ata_ioports *ioaddr = &ap->ioaddr;
         void __iomem *cmd = base + info->dataoffset;
 
         ioaddr->cmd_addr        = cmd;
@@ -411,6 +414,13 @@ pata_icside_setup_ioaddr(struct ata_ioports *ioaddr, void __iomem *base,
 
         ioaddr->ctl_addr        = base + info->ctrloffset;
         ioaddr->altstatus_addr  = ioaddr->ctl_addr;
+
+        ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx",
+                      info->raw_base + info->dataoffset,
+                      info->raw_base + info->ctrloffset);
+
+        if (info->raw_ioc_base)
+                ata_port_desc(ap, "iocbase 0x%lx", info->raw_ioc_base);
 }
 
 static int __devinit pata_icside_register_v5(struct pata_icside_info *info)
@@ -431,6 +441,8 @@ static int __devinit pata_icside_register_v5(struct pata_icside_info *info)
         info->nr_ports = 1;
         info->port[0] = &pata_icside_portinfo_v5;
 
+        info->raw_base = ecard_resource_start(ec, ECARD_RES_MEMC);
+
         return 0;
 }
 
@@ -471,6 +483,9 @@ static int __devinit pata_icside_register_v6(struct pata_icside_info *info)
         info->port[0] = &pata_icside_portinfo_v6_1;
         info->port[1] = &pata_icside_portinfo_v6_2;
 
+        info->raw_base = ecard_resource_start(ec, ECARD_RES_EASI);
+        info->raw_ioc_base = ecard_resource_start(ec, ECARD_RES_IOCFAST);
+
         return icside_dma_init(info);
 }
 
@@ -507,7 +522,7 @@ static int __devinit pata_icside_add_ports(struct pata_icside_info *info)
                 ap->flags |= ATA_FLAG_SLAVE_POSS;
                 ap->ops = &pata_icside_port_ops;
 
-                pata_icside_setup_ioaddr(&ap->ioaddr, info->base, info->port[i]);
+                pata_icside_setup_ioaddr(ap, info->base, info->port[i]);
         }
 
         return ata_host_activate(host, ec->irq, ata_interrupt, 0,