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

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

ide: add struct ide_port_info instances to legacy host drivers 



* Remove 'struct pci_dev *dev' argument from ide_hwif_setup_dma().

* Un-static ide_hwif_setup_dma() and add CONFIG_BLK_DEV_IDEDMA_PCI=n version.

* Add 'const struct ide_port_info *d' argument to ide_device_add[_all]().

* Factor out generic ports init from ide_pci_setup_ports() to ide_init_port(),
  move it to ide-probe.c and call it in in ide_device_add_all() instead of
  ide_pci_setup_ports().

* Move ->mate setup to ide_device_add_all() from ide_port_init().

* Add IDE_HFLAG_NO_AUTOTUNE host flag for host drivers that don't enable
  ->autotune currently.

* Setup hwif->chipset in ide_init_port() but iff pi->chipset is set
  (to not override setup done by ide_hwif_configure()).

* Add ETRAX host handling to ide_device_add_all().

* cmd640.c: set IDE_HFLAG_ABUSE_* also for CONFIG_BLK_DEV_CMD640_ENHANCED=n.

* pmac.c: make pmac_ide_setup_dma() return an error value and move DMA masks
  setup to pmac_ide_setup_device().

* Add 'struct ide_port_info' instances to legacy host drivers, pass them to
  ide_device_add() calls and then remove open-coded ports initialization.

Reviewed-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 1ebf7493

drivers/ide/arm/icside.c

+13 −12
Original line number Diff line number Diff line
@@ -377,9 +377,6 @@ static void icside_dma_lost_irq(ide_drive_t *drive) 


static void icside_dma_init(ide_hwif_t *hwif)

{

	hwif->mwdma_mask	= 7; /* MW0..2 */

	hwif->swdma_mask	= 7; /* SW0..2 */



	hwif->dmatable_cpu	= NULL;

	hwif->dmatable_dma	= 0;

	hwif->set_dma_mode	= icside_set_dma_mode;
@@ -459,11 +456,19 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec) 


	idx[0] = hwif->index;



	ide_device_add(idx);

	ide_device_add(idx, NULL);



	return 0;

}



static const struct ide_port_info icside_v6_port_info __initdata = {

	.host_flags		= IDE_HFLAG_SERIALIZE |

				  IDE_HFLAG_NO_DMA | /* no SFF-style DMA */

				  IDE_HFLAG_NO_AUTOTUNE,

	.mwdma_mask		= ATA_MWDMA2,

	.swdma_mask		= ATA_SWDMA2,

};



static int __init

icside_register_v6(struct icside_state *state, struct expansion_card *ec)

{
@@ -472,6 +477,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) 
	unsigned int sel = 0;

	int ret;

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

	struct ide_port_info d = icside_v6_port_info;



	ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);

	if (!ioc_base) {
@@ -521,30 +527,25 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) 
	state->hwif[1]    = mate;



	hwif->maskproc    = icside_maskproc;

	hwif->channel     = 0;

	hwif->hwif_data   = state;

	hwif->mate        = mate;

	hwif->serialized  = 1;

	hwif->config_data = (unsigned long)ioc_base;

	hwif->select_data = sel;



	mate->maskproc    = icside_maskproc;

	mate->channel     = 1;

	mate->hwif_data   = state;

	mate->mate        = hwif;

	mate->serialized  = 1;

	mate->config_data = (unsigned long)ioc_base;

	mate->select_data = sel | 1;



	if (ec->dma != NO_DMA && !request_dma(ec->dma, hwif->name)) {

		icside_dma_init(hwif);

		icside_dma_init(mate);

	}

	} else

		d.mwdma_mask = d.swdma_mask = 0;



	idx[0] = hwif->index;

	idx[1] = mate->index;



	ide_device_add(idx);

	ide_device_add(idx, &d);



	return 0;

drivers/ide/arm/ide_arm.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static int __init ide_arm_init(void) 
		ide_init_port_hw(hwif, &hw);

		idx[0] = hwif->index;



		ide_device_add(idx);

		ide_device_add(idx, NULL);

	}



	return 0;

drivers/ide/arm/rapide.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id) 


		idx[0] = hwif->index;



		ide_device_add(idx);

		ide_device_add(idx, NULL);



		ecard_set_drvdata(ec, hwif);

		goto out;

drivers/ide/cris/ide-cris.c

+10 −8
Original line number Diff line number Diff line
@@ -753,6 +753,15 @@ static void cris_set_dma_mode(ide_drive_t *drive, const u8 speed) 
		cris_ide_set_speed(TYPE_DMA, 0, strobe, hold);

}



static const struct ide_port_info cris_port_info __initdata = {

	.chipset		= ide_etrax100,

	.host_flags		= IDE_HFLAG_NO_ATAPI_DMA |

				  IDE_HFLAG_NO_DMA, /* no SFF-style DMA */

	.pio_mask		= ATA_PIO4,

	.udma_mask		= cris_ultra_mask,

	.mwdma_mask		= ATA_MWDMA2,

};



static int __init init_e100_ide(void)

{

	hw_regs_t hw;
@@ -780,7 +789,6 @@ static int __init init_e100_ide(void) 
		ide_init_port_data(hwif, hwif->index);

		ide_init_port_hw(hwif, &hw);

		hwif->mmio = 1;

		hwif->chipset = ide_etrax100;

		hwif->set_pio_mode = &cris_set_pio_mode;

		hwif->set_dma_mode = &cris_set_dma_mode;

		hwif->ata_input_data = &cris_ide_input_data;
@@ -799,12 +807,6 @@ static int __init init_e100_ide(void) 
		hwif->INB = &cris_ide_inb;

		hwif->INW = &cris_ide_inw;

		hwif->cbl = ATA_CBL_PATA40;

		hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;

		hwif->pio_mask = ATA_PIO4,

		hwif->drives[0].autotune = 1;

		hwif->drives[1].autotune = 1;

		hwif->ultra_mask = cris_ultra_mask;

		hwif->mwdma_mask = 0x07; /* Multiword DMA 0-2 */



		idx[h] = hwif->index;

	}
@@ -820,7 +822,7 @@ static int __init init_e100_ide(void) 
	cris_ide_set_speed(TYPE_DMA, 0, ATA_DMA2_STROBE, ATA_DMA2_HOLD);

	cris_ide_set_speed(TYPE_UDMA, ATA_UDMA2_CYC, ATA_UDMA2_DVS, 0);



	ide_device_add(idx);

	ide_device_add(idx, &cris_port_info);



	return 0;

}

drivers/ide/h8300/ide-h8300.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static int __init h8300_ide_init(void) 


	idx[0] = index;



	ide_device_add(idx);

	ide_device_add(idx, NULL);



	return 0;