ide: use ide_find_port() in legacy VLB host drivers (take 2)
PATCH 1/1 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 <[email protected]>
---
replacement patch
drivers/ide/ide-probe.c | 4 +- drivers/ide/legacy/ali14xx.c | 19 +++++++--- drivers/ide/legacy/dtc2278.c | 22 ++++++------ drivers/ide/legacy/ht6560b.c | 31 +++++++++-------- drivers/ide/legacy/ide-4drives.c | 34 +++++++++++------- drivers/ide/legacy/qd65xx.c | 70 +++++++++++++++++++++------------------ drivers/ide/legacy/umc8672.c | 19 +++++++--- include/linux/ide.h | 2 + 8 files changed, 121 insertions(+), 80 deletions(-)
drivers/ide/ide-probe.c +3 -1
@@ -1464,7 +1464,9 @@ ide_hwif_t *ide_find_port_slot(const str* 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;
drivers/ide/legacy/ali14xx.c +14 -5
@@ -199,7 +199,8 @@ static const struct ide_port_info ali14xstatic 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);
drivers/ide/legacy/dtc2278.c +12 -10
@@ -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);
drivers/ide/legacy/ht6560b.c +17 -14
@@ -340,15 +340,12 @@ static const struct ide_port_info ht6560static 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);
drivers/ide/legacy/ide-4drives.c +20 -14
@@ -12,31 +12,37 @@ MODULE_PARM_DESC(probe, "probe for generstatic 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 );
drivers/ide/legacy/qd65xx.c +39 -31
120 lines not on this page · raw message
drivers/ide/legacy/umc8672.c +14 -5
@@ -128,8 +128,9 @@ static const struct ide_port_info umc867static 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);
include/linux/ide.h +2 -0
@@ -1035,6 +1035,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 */