ide: use ide_find_port() in legacy VLB host drivers (take 2)

* Add IDE_HFLAG_QD_2ND_PORT host flag to indicate the need of skipping
  first ide_hwifs[] slot for the second port of QD65xx controller.

* Handle this new host flag in ide_find_port_slot().

* Convert legacy VLB host drivers to use ide_find_port().

While at it:

* Fix couple of printk()-s in qd65xx host driver to not use hwif->name.

v2:
* Fix qd65xx.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index f81793f..8754297 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1468,7 +1468,9 @@ ide_hwif_t *ide_find_port_slot(const struct ide_port_info *d)
         * ports 0x1f0/0x170 (the ide0/ide1 defaults).
         */
        if (bootable) {
-               for (i = 0; i < MAX_HWIFS; i++) {
+               i = (d && (d->host_flags & IDE_HFLAG_QD_2ND_PORT)) ? 1 : 0;
+
+               for (; i < MAX_HWIFS; i++) {
                        hwif = &ide_hwifs[i];
                        if (hwif->chipset == ide_unknown)
                                return hwif;

diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c
index bc8b1f8..c9536dd 100644 (file)
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/legacy/ali14xx.c
@@ -199,7 +199,8 @@ static const struct ide_port_info ali14xx_port_info = {
 
 static int __init ali14xx_probe(void)
 {
-       static u8 idx[4] = { 0, 1, 0xff, 0xff };
+       ide_hwif_t *hwif, *mate;
+       static u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
        hw_regs_t hw[2];
 
        printk(KERN_DEBUG "ali14xx: base=0x%03x, regOn=0x%02x.\n",
@@ -219,11 +220,19 @@ static int __init ali14xx_probe(void)
        ide_std_init_ports(&hw[1], 0x170, 0x376);
        hw[1].irq = 15;
 
-       ide_init_port_hw(&ide_hwifs[0], &hw[0]);
-       ide_init_port_hw(&ide_hwifs[1], &hw[1]);
+       hwif = ide_find_port();
+       if (hwif) {
+               ide_init_port_hw(hwif, &hw[0]);
+               hwif->set_pio_mode = &ali14xx_set_pio_mode;
+               idx[0] = hwif->index;
+       }
 
-       ide_hwifs[0].set_pio_mode = &ali14xx_set_pio_mode;
-       ide_hwifs[1].set_pio_mode = &ali14xx_set_pio_mode;
+       mate = ide_find_port();
+       if (mate) {
+               ide_init_port_hw(mate, &hw[1]);
+               mate->set_pio_mode = &ali14xx_set_pio_mode;
+               idx[1] = mate->index;
+       }
 
        ide_device_add(idx, &ali14xx_port_info);
 

diff --git a/drivers/ide/legacy/dtc2278.c b/drivers/ide/legacy/dtc2278.c
index 5f69cd2..9c6b324 100644 (file)
--- a/drivers/ide/legacy/dtc2278.c
+++ b/drivers/ide/legacy/dtc2278.c
@@ -102,15 +102,9 @@ static int __init dtc2278_probe(void)
 {
        unsigned long flags;
        ide_hwif_t *hwif, *mate;
-       static u8 idx[4] = { 0, 1, 0xff, 0xff };
+       static u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
        hw_regs_t hw[2];
 
-       hwif = &ide_hwifs[0];
-       mate = &ide_hwifs[1];
-
-       if (hwif->chipset != ide_unknown || mate->chipset != ide_unknown)
-               return 1;
-
        local_irq_save(flags);
        /*
         * This enables the second interface
@@ -137,10 +131,18 @@ static int __init dtc2278_probe(void)
        ide_std_init_ports(&hw[1], 0x170, 0x376);
        hw[1].irq = 15;
 
-       ide_init_port_hw(hwif, &hw[0]);
-       ide_init_port_hw(mate, &hw[1]);
+       hwif = ide_find_port();
+       if (hwif) {
+               ide_init_port_hw(hwif, &hw[0]);
+               hwif->set_pio_mode = dtc2278_set_pio_mode;
+               idx[0] = hwif->index;
+       }
 
-       hwif->set_pio_mode = &dtc2278_set_pio_mode;
+       mate = ide_find_port();
+       if (mate) {
+               ide_init_port_hw(mate, &hw[1]);
+               idx[1] = mate->index;
+       }
 
        ide_device_add(idx, &dtc2278_port_info);
 

diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c
index fd21209..60f52f5 100644 (file)
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -340,15 +340,12 @@ static const struct ide_port_info ht6560b_port_info __initdata = {
 static int __init ht6560b_init(void)
 {
        ide_hwif_t *hwif, *mate;
-       static u8 idx[4] = { 0, 1, 0xff, 0xff };
+       static u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
        hw_regs_t hw[2];
 
        if (probe_ht6560b == 0)
                return -ENODEV;
 
-       hwif = &ide_hwifs[0];
-       mate = &ide_hwifs[1];
-
        if (!request_region(HT_CONFIG_PORT, 1, DRV_NAME)) {
                printk(KERN_NOTICE "%s: HT_CONFIG_PORT not found\n",
                        __FUNCTION__);
@@ -368,17 +365,23 @@ static int __init ht6560b_init(void)
        ide_std_init_ports(&hw[1], 0x170, 0x376);
        hw[1].irq = 15;
 
-       ide_init_port_hw(hwif, &hw[0]);
-       ide_init_port_hw(mate, &hw[1]);
-
-       hwif->selectproc = &ht6560b_selectproc;
-       hwif->set_pio_mode = &ht6560b_set_pio_mode;
-
-       mate->selectproc = &ht6560b_selectproc;
-       mate->set_pio_mode = &ht6560b_set_pio_mode;
+       hwif = ide_find_port();
+       if (hwif) {
+               ide_init_port_hw(hwif, &hw[0]);
+               hwif->selectproc     = ht6560b_selectproc;
+               hwif->set_pio_mode   = ht6560b_set_pio_mode;
+               hwif->port_init_devs = ht6560b_port_init_devs;
+               idx[0] = hwif->index;
+       }
 
-       hwif->port_init_devs = ht6560b_port_init_devs;
-       mate->port_init_devs = ht6560b_port_init_devs;
+       mate = ide_find_port();
+       if (mate) {
+               ide_init_port_hw(mate, &hw[1]);
+               mate->selectproc     = ht6560b_selectproc;
+               mate->set_pio_mode   = ht6560b_set_pio_mode;
+               mate->port_init_devs = ht6560b_port_init_devs;
+               idx[1] = mate->index;
+       }
 
        ide_device_add(idx, &ht6560b_port_info);
 

diff --git a/drivers/ide/legacy/ide-4drives.c b/drivers/ide/legacy/ide-4drives.c
index ecd7f35..d7bc94f 100644 (file)
--- a/drivers/ide/legacy/ide-4drives.c
+++ b/drivers/ide/legacy/ide-4drives.c
@@ -12,31 +12,37 @@ MODULE_PARM_DESC(probe, "probe for generic IDE chipset with 4 drives/port");
 static int __init ide_4drives_init(void)
 {
        ide_hwif_t *hwif, *mate;
-       u8 idx[4] = { 0, 1, 0xff, 0xff };
+       u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
        hw_regs_t hw;
 
        if (probe_4drives == 0)
                return -ENODEV;
 
-       hwif = &ide_hwifs[0];
-       mate = &ide_hwifs[1];
-
        memset(&hw, 0, sizeof(hw));
 
        ide_std_init_ports(&hw, 0x1f0, 0x3f6);
        hw.irq = 14;
        hw.chipset = ide_4drives;
 
-       ide_init_port_hw(hwif, &hw);
-       ide_init_port_hw(mate, &hw);
-
-       mate->drives[0].select.all ^= 0x20;
-       mate->drives[1].select.all ^= 0x20;
-
-       hwif->mate = mate;
-       mate->mate = hwif;
-
-       hwif->serialized = mate->serialized = 1;
+       hwif = ide_find_port();
+       if (hwif) {
+               ide_init_port_hw(hwif, &hw);
+               idx[0] = hwif->index;
+       }
+
+       mate = ide_find_port();
+       if (mate) {
+               ide_init_port_hw(mate, &hw);
+               mate->drives[0].select.all ^= 0x20;
+               mate->drives[1].select.all ^= 0x20;
+               idx[1] = mate->index;
+
+               if (hwif) {
+                       hwif->mate = mate;
+                       mate->mate = hwif;
+                       hwif->serialized = mate->serialized = 1;
+               }
+       }
 
        ide_device_add(idx, NULL);
 

diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c
index 5c92fb6..b693a5f 100644 (file)
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/legacy/qd65xx.c
@@ -355,6 +355,7 @@ static int __init qd_probe(int base)
        u8 config, unit;
        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
        hw_regs_t hw[2];
+       struct ide_port_info d = qd65xx_port_info;
 
        config = inb(QD_CONFIG_PORT);
 
@@ -363,6 +364,9 @@ static int __init qd_probe(int base)
 
        unit = ! (config & QD_CONFIG_IDE_BASEPORT);
 
+       if (unit)
+               d.host_flags |= IDE_HFLAG_QD_2ND_PORT;
+
        memset(&hw, 0, sizeof(hw));
 
        ide_std_init_ports(&hw[0], 0x1f0, 0x3f6);
@@ -378,16 +382,19 @@ static int __init qd_probe(int base)
 
                /* qd6500 found */
 
-               hwif = &ide_hwifs[unit];
-               printk(KERN_NOTICE "%s: qd6500 at %#x\n", hwif->name, base);
-               printk(KERN_DEBUG "qd6500: config=%#x, ID3=%u\n",
-                       config, QD_ID3);
-               
                if (config & QD_CONFIG_DISABLED) {
                        printk(KERN_WARNING "qd6500 is disabled !\n");
                        return -ENODEV;
                }
 
+               printk(KERN_NOTICE "qd6500 at %#x\n", base);
+               printk(KERN_DEBUG "qd6500: config=%#x, ID3=%u\n",
+                       config, QD_ID3);
+
+               hwif = ide_find_port_slot(&d);
+               if (hwif == NULL)
+                       return -ENOENT;
+
                ide_init_port_hw(hwif, &hw[unit]);
 
                qd_setup(hwif, base, config);
@@ -395,9 +402,9 @@ static int __init qd_probe(int base)
                hwif->port_init_devs = qd6500_port_init_devs;
                hwif->set_pio_mode = &qd6500_set_pio_mode;
 
-               idx[unit] = unit;
+               idx[unit] = hwif->index;
 
-               ide_device_add(idx, &qd65xx_port_info);
+               ide_device_add(idx, &d);
 
                return 1;
        }
@@ -423,9 +430,11 @@ static int __init qd_probe(int base)
                if (control & QD_CONTR_SEC_DISABLED) {
                        /* secondary disabled */
 
-                       hwif = &ide_hwifs[unit];
-                       printk(KERN_INFO "%s: qd6580: single IDE board\n",
-                                        hwif->name);
+                       printk(KERN_INFO "qd6580: single IDE board\n");
+
+                       hwif = ide_find_port_slot(&d);
+                       if (hwif == NULL)
+                               return -ENOENT;
 
                        ide_init_port_hw(hwif, &hw[unit]);
 
@@ -434,35 +443,34 @@ static int __init qd_probe(int base)
                        hwif->port_init_devs = qd6580_port_init_devs;
                        hwif->set_pio_mode = &qd6580_set_pio_mode;
 
-                       idx[unit] = unit;
+                       idx[unit] = hwif->index;
 
-                       ide_device_add(idx, &qd65xx_port_info);
+                       ide_device_add(idx, &d);
 
                        return 1;
                } else {
                        ide_hwif_t *mate;
 
-                       hwif = &ide_hwifs[0];
-                       mate = &ide_hwifs[1];
                        /* secondary enabled */
-                       printk(KERN_INFO "%s&%s: qd6580: dual IDE board\n",
-                                       hwif->name, mate->name);
-
-                       ide_init_port_hw(hwif, &hw[0]);
-                       ide_init_port_hw(mate, &hw[1]);
-
-                       qd_setup(hwif, base, config | (control << 8));
-
-                       hwif->port_init_devs = qd6580_port_init_devs;
-                       hwif->set_pio_mode = &qd6580_set_pio_mode;
-
-                       qd_setup(mate, base, config | (control << 8));
-
-                       mate->port_init_devs = qd6580_port_init_devs;
-                       mate->set_pio_mode = &qd6580_set_pio_mode;
-
-                       idx[0] = 0;
-                       idx[1] = 1;
+                       printk(KERN_INFO "qd6580: dual IDE board\n");
+
+                       hwif = ide_find_port();
+                       if (hwif) {
+                               ide_init_port_hw(hwif, &hw[0]);
+                               qd_setup(hwif, base, config | (control << 8));
+                               hwif->port_init_devs = qd6580_port_init_devs;
+                               hwif->set_pio_mode   = qd6580_set_pio_mode;
+                               idx[0] = hwif->index;
+                       }
+
+                       mate = ide_find_port();
+                       if (mate) {
+                               ide_init_port_hw(mate, &hw[1]);
+                               qd_setup(mate, base, config | (control << 8));
+                               mate->port_init_devs = qd6580_port_init_devs;
+                               mate->set_pio_mode   = qd6580_set_pio_mode;
+                               idx[1] = mate->index;
+                       }
 
                        ide_device_add(idx, &qd65xx_port_info);
 

diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/legacy/umc8672.c
index ef768a8..43ee632 100644 (file)
--- a/drivers/ide/legacy/umc8672.c
+++ b/drivers/ide/legacy/umc8672.c
@@ -128,8 +128,9 @@ static const struct ide_port_info umc8672_port_info __initdata = {
 
 static int __init umc8672_probe(void)
 {
+       ide_hwif_t *hwif, *mate;
        unsigned long flags;
-       static u8 idx[4] = { 0, 1, 0xff, 0xff };
+       static u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
        hw_regs_t hw[2];
 
        if (!request_region(0x108, 2, "umc8672")) {
@@ -157,11 +158,19 @@ static int __init umc8672_probe(void)
        ide_std_init_ports(&hw[1], 0x170, 0x376);
        hw[1].irq = 15;
 
-       ide_init_port_hw(&ide_hwifs[0], &hw[0]);
-       ide_init_port_hw(&ide_hwifs[1], &hw[1]);
+       hwif = ide_find_port();
+       if (hwif) {
+               ide_init_port_hw(hwif, &hw[0]);
+               hwif->set_pio_mode = umc_set_pio_mode;
+               idx[0] = hwif->index;
+       }
 
-       ide_hwifs[0].set_pio_mode = &umc_set_pio_mode;
-       ide_hwifs[1].set_pio_mode = &umc_set_pio_mode;
+       mate = ide_find_port();
+       if (mate) {
+               ide_init_port_hw(mate, &hw[1]);
+               mate->set_pio_mode = umc_set_pio_mode;
+               idx[1] = mate->index;
+       }
 
        ide_device_add(idx, &umc8672_port_info);
 

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 2c43766..4997751 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1033,6 +1033,8 @@ enum {
        IDE_HFLAG_SINGLE                = (1 << 1),
        /* don't use legacy PIO blacklist */
        IDE_HFLAG_PIO_NO_BLACKLIST      = (1 << 2),
+       /* set for the second port of QD65xx */
+       IDE_HFLAG_QD_2ND_PORT           = (1 << 3),
        /* use PIO8/9 for prefetch off/on */
        IDE_HFLAG_ABUSE_PREFETCH        = (1 << 4),
        /* use PIO6/7 for fast-devsel off/on */