Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfd87842 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: init hwif->{io_ports,irq} explicitly in legacy VLB host drivers 



Do explicit port setup in legacy VLB host drivers instead of depending
on init_ide_data().  This way hwif->io_ports[] and hwif->irq are always
correctly set regardless of CONFIG_PCI / CONFIG_BLK_DEV_IDEPCI.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent e4079df0

drivers/ide/legacy/ali14xx.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -200,6 +200,7 @@ static const struct ide_port_info ali14xx_port_info = { 
static int __init ali14xx_probe(void)

static int __init ali14xx_probe(void)

{

{

	static u8 idx[4] = { 0, 1, 0xff, 0xff };

	static u8 idx[4] = { 0, 1, 0xff, 0xff };

	hw_regs_t hw[2];





	printk(KERN_DEBUG "ali14xx: base=0x%03x, regOn=0x%02x.\n",

	printk(KERN_DEBUG "ali14xx: base=0x%03x, regOn=0x%02x.\n",

			  basePort, regOn);

			  basePort, regOn);
@@ -210,6 +211,17 @@ static int __init ali14xx_probe(void) 
		return 1;

		return 1;

	}

	}





	memset(&hw, 0, sizeof(hw));



	ide_std_init_ports(&hw[0], 0x1f0, 0x3f6);

	hw[0].irq = 14;



	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]);



	ide_hwifs[0].set_pio_mode = &ali14xx_set_pio_mode;

	ide_hwifs[0].set_pio_mode = &ali14xx_set_pio_mode;

	ide_hwifs[1].set_pio_mode = &ali14xx_set_pio_mode;

	ide_hwifs[1].set_pio_mode = &ali14xx_set_pio_mode;

drivers/ide/legacy/dtc2278.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -103,6 +103,7 @@ static int __init dtc2278_probe(void) 
	unsigned long flags;

	unsigned long flags;

	ide_hwif_t *hwif, *mate;

	ide_hwif_t *hwif, *mate;

	static u8 idx[4] = { 0, 1, 0xff, 0xff };

	static u8 idx[4] = { 0, 1, 0xff, 0xff };

	hw_regs_t hw[2];





	hwif = &ide_hwifs[0];

	hwif = &ide_hwifs[0];

	mate = &ide_hwifs[1];

	mate = &ide_hwifs[1];
@@ -128,6 +129,17 @@ static int __init dtc2278_probe(void) 
#endif

#endif

	local_irq_restore(flags);

	local_irq_restore(flags);





	memset(&hw, 0, sizeof(hw));



	ide_std_init_ports(&hw[0], 0x1f0, 0x3f6);

	hw[0].irq = 14;



	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->set_pio_mode = &dtc2278_set_pio_mode;

	hwif->set_pio_mode = &dtc2278_set_pio_mode;





	ide_device_add(idx, &dtc2278_port_info);

	ide_device_add(idx, &dtc2278_port_info);

drivers/ide/legacy/ht6560b.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -340,6 +340,7 @@ static int __init ht6560b_init(void) 
{

{

	ide_hwif_t *hwif, *mate;

	ide_hwif_t *hwif, *mate;

	static u8 idx[4] = { 0, 1, 0xff, 0xff };

	static u8 idx[4] = { 0, 1, 0xff, 0xff };

	hw_regs_t hw[2];





	if (probe_ht6560b == 0)

	if (probe_ht6560b == 0)

		return -ENODEV;

		return -ENODEV;
@@ -358,6 +359,17 @@ static int __init ht6560b_init(void) 
		goto release_region;

		goto release_region;

	}

	}





	memset(&hw, 0, sizeof(hw));



	ide_std_init_ports(&hw[0], 0x1f0, 0x3f6);

	hw[0].irq = 14;



	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->selectproc = &ht6560b_selectproc;

	hwif->set_pio_mode = &ht6560b_set_pio_mode;

	hwif->set_pio_mode = &ht6560b_set_pio_mode;

drivers/ide/legacy/ide-4drives.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -13,6 +13,7 @@ static int __init ide_4drives_init(void) 
{

{

	ide_hwif_t *hwif, *mate;

	ide_hwif_t *hwif, *mate;

	u8 idx[4] = { 0, 1, 0xff, 0xff };

	u8 idx[4] = { 0, 1, 0xff, 0xff };

	hw_regs_t hw;





	if (probe_4drives == 0)

	if (probe_4drives == 0)

		return -ENODEV;

		return -ENODEV;
@@ -20,11 +21,14 @@ static int __init ide_4drives_init(void) 
	hwif = &ide_hwifs[0];

	hwif = &ide_hwifs[0];

	mate = &ide_hwifs[1];

	mate = &ide_hwifs[1];





	memcpy(mate->io_ports, hwif->io_ports, sizeof(hwif->io_ports));

	memset(&hw, 0, sizeof(hw));





	mate->irq = hwif->irq;

	ide_std_init_ports(&hw, 0x1f0, 0x3f6);

	hw.irq = 14;

	hw.chipset = ide_4drives;





	mate->chipset = hwif->chipset = ide_4drives;

	ide_init_port_hw(hwif, &hw);

	ide_init_port_hw(mate, &hw);





	mate->drives[0].select.all ^= 0x20;

	mate->drives[0].select.all ^= 0x20;

	mate->drives[1].select.all ^= 0x20;

	mate->drives[1].select.all ^= 0x20;

drivers/ide/legacy/qd65xx.c

+17 −2
Original line number Original line Diff line number Diff line
@@ -352,9 +352,9 @@ static const struct ide_port_info qd65xx_port_info __initdata = { 
static int __init qd_probe(int base)

static int __init qd_probe(int base)

{

{

	ide_hwif_t *hwif;

	ide_hwif_t *hwif;

	u8 config, unit;

	u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };

	u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };

	u8 config;

	hw_regs_t hw[2];

	u8 unit;





	config = inb(QD_CONFIG_PORT);

	config = inb(QD_CONFIG_PORT);
@@ -363,6 +363,14 @@ static int __init qd_probe(int base) 




	unit = ! (config & QD_CONFIG_IDE_BASEPORT);

	unit = ! (config & QD_CONFIG_IDE_BASEPORT);





	memset(&hw, 0, sizeof(hw));



	ide_std_init_ports(&hw[0], 0x1f0, 0x3f6);

	hw[0].irq = 14;



	ide_std_init_ports(&hw[1], 0x170, 0x376);

	hw[1].irq = 15;



	if ((config & 0xf0) == QD_CONFIG_QD6500) {

	if ((config & 0xf0) == QD_CONFIG_QD6500) {





		if (qd_testreg(base)) return 1;		/* bad register */

		if (qd_testreg(base)) return 1;		/* bad register */
@@ -379,6 +387,8 @@ static int __init qd_probe(int base) 
			return 1;

			return 1;

		}

		}





		ide_init_port_hw(hwif, &hw[unit]);



		qd_setup(hwif, base, config);

		qd_setup(hwif, base, config);





		hwif->port_init_devs = qd6500_port_init_devs;

		hwif->port_init_devs = qd6500_port_init_devs;
@@ -416,6 +426,8 @@ static int __init qd_probe(int base) 
			printk(KERN_INFO "%s: qd6580: single IDE board\n",

			printk(KERN_INFO "%s: qd6580: single IDE board\n",

					 hwif->name);

					 hwif->name);





			ide_init_port_hw(hwif, &hw[unit]);



			qd_setup(hwif, base, config | (control << 8));

			qd_setup(hwif, base, config | (control << 8));





			hwif->port_init_devs = qd6580_port_init_devs;

			hwif->port_init_devs = qd6580_port_init_devs;
@@ -435,6 +447,9 @@ static int __init qd_probe(int base) 
			printk(KERN_INFO "%s&%s: qd6580: dual IDE board\n",

			printk(KERN_INFO "%s&%s: qd6580: dual IDE board\n",

					hwif->name, mate->name);

					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));

			qd_setup(hwif, base, config | (control << 8));





			hwif->port_init_devs = qd6580_port_init_devs;

			hwif->port_init_devs = qd6580_port_init_devs;