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

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

ide: add ->read_sff_dma_status method 



Add ->read_sff_dma_status method for reading DMA Status register
and use it instead of ->INB.

While at it:

* Use inb() directly in ns87415.c::ns87415_dma_end().

There should be no functional changes caused by this patch.

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

drivers/ide/ide-dma.c

+6 −6
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static int config_drive_for_dma (ide_drive_t *drive) 
static int dma_timer_expiry (ide_drive_t *drive)

{

	ide_hwif_t *hwif	= HWIF(drive);

	u8 dma_stat		= hwif->INB(hwif->dma_status);

	u8 dma_stat		= hwif->read_sff_dma_status(hwif);



	printk(KERN_WARNING "%s: dma_timer_expiry: dma status == 0x%02x\n",

		drive->name, dma_stat);
@@ -369,7 +369,7 @@ void ide_dma_host_set(ide_drive_t *drive, int on) 
{

	ide_hwif_t *hwif	= HWIF(drive);

	u8 unit			= (drive->select.b.unit & 0x01);

	u8 dma_stat		= hwif->INB(hwif->dma_status);

	u8 dma_stat		= hwif->read_sff_dma_status(hwif);



	if (on)

		dma_stat |= (1 << (5 + unit));
@@ -472,8 +472,8 @@ int ide_dma_setup(ide_drive_t *drive) 
	/* specify r/w */

	hwif->OUTB(reading, hwif->dma_command);



	/* read dma_status for INTR & ERROR flags */

	dma_stat = hwif->INB(hwif->dma_status);

	/* read DMA status for INTR & ERROR flags */

	dma_stat = hwif->read_sff_dma_status(hwif);



	/* clear INTR & ERROR flags */

	hwif->OUTB(dma_stat|6, hwif->dma_status);
@@ -520,7 +520,7 @@ int __ide_dma_end (ide_drive_t *drive) 
	/* stop DMA */

	hwif->OUTB(dma_cmd&~1, hwif->dma_command);

	/* get DMA status */

	dma_stat = hwif->INB(hwif->dma_status);

	dma_stat = hwif->read_sff_dma_status(hwif);

	/* clear the INTR & ERROR bits */

	hwif->OUTB(dma_stat|6, hwif->dma_status);

	/* purge DMA mappings */
@@ -537,7 +537,7 @@ EXPORT_SYMBOL(__ide_dma_end); 
int ide_dma_test_irq(ide_drive_t *drive)

{

	ide_hwif_t *hwif	= HWIF(drive);

	u8 dma_stat		= hwif->INB(hwif->dma_status);

	u8 dma_stat		= hwif->read_sff_dma_status(hwif);



	/* return 1 if INTR asserted */

	if ((dma_stat & 4) == 4)

drivers/ide/ide-iops.c

+10 −0
Original line number Diff line number Diff line
@@ -103,6 +103,14 @@ void SELECT_MASK(ide_drive_t *drive, int mask) 
		port_ops->maskproc(drive, mask);

}



static u8 ide_read_sff_dma_status(ide_hwif_t *hwif)

{

	if (hwif->host_flags & IDE_HFLAG_MMIO)

		return readb((void __iomem *)hwif->dma_status);

	else

		return inb(hwif->dma_status);

}



static void ide_tf_load(ide_drive_t *drive, ide_task_t *task)

{

	ide_hwif_t *hwif = drive->hwif;
@@ -323,6 +331,8 @@ static void ata_output_data(ide_drive_t *drive, struct request *rq, 


void default_hwif_transport(ide_hwif_t *hwif)

{

	hwif->read_sff_dma_status = ide_read_sff_dma_status;



	hwif->tf_load	  = ide_tf_load;

	hwif->tf_read	  = ide_tf_read;

drivers/ide/pci/ns87415.c

+10 −3
Original line number Diff line number Diff line
@@ -63,6 +63,11 @@ static u8 superio_ide_inb (unsigned long port) 
	return inb(port);

}



static u8 superio_read_sff_dma_status(ide_hwif_t *hwif)

{

	return superio_ide_inb(hwif->dma_status);

}



static void superio_tf_read(ide_drive_t *drive, ide_task_t *task)

{

	struct ide_io_ports *io_ports = &drive->hwif->io_ports;
@@ -122,6 +127,8 @@ static void __devinit superio_ide_init_iops (struct hwif_s *hwif) 
	tmp = superio_ide_inb(superio_ide_dma_status[port]);

	outb(tmp | 0x66, superio_ide_dma_status[port]);



	hwif->read_sff_dma_status = superio_read_sff_dma_status;



	hwif->tf_read = superio_tf_read;



	/* We need to override inb to workaround a SuperIO errata */
@@ -200,13 +207,13 @@ static int ns87415_dma_end(ide_drive_t *drive) 
	u8 dma_stat = 0, dma_cmd = 0;



	drive->waiting_for_dma = 0;

	dma_stat = hwif->INB(hwif->dma_status);

	dma_stat = hwif->read_sff_dma_status(hwif);

	/* get dma command mode */

	dma_cmd = hwif->INB(hwif->dma_command);

	dma_cmd = inb(hwif->dma_command);

	/* stop DMA */

	outb(dma_cmd & ~1, hwif->dma_command);

	/* from ERRATA: clear the INTR & ERROR bits */

	dma_cmd = hwif->INB(hwif->dma_command);

	dma_cmd = inb(hwif->dma_command);

	outb(dma_cmd | 6, hwif->dma_command);

	/* and free any DMA resources */

	ide_destroy_dmatable(drive);

drivers/ide/pci/scc_pata.c

+7 −0
Original line number Diff line number Diff line
@@ -126,6 +126,11 @@ static u8 scc_ide_inb(unsigned long port) 
	return (u8)data;

}



static u8 scc_read_sff_dma_status(ide_hwif_t *hwif)

{

	return (u8)in_be32((void *)hwif->dma_status);

}



static void scc_ide_insw(unsigned long port, void *addr, u32 count)

{

	u16 *ptr = (u16 *)addr;
@@ -773,6 +778,8 @@ static void __devinit init_mmio_iops_scc(ide_hwif_t *hwif) 


	ide_set_hwifdata(hwif, ports);



	hwif->read_sff_dma_status = scc_read_sff_dma_status;



	hwif->tf_load = scc_tf_load;

	hwif->tf_read = scc_tf_read;

include/linux/ide.h

+2 −0
Original line number Diff line number Diff line
@@ -489,6 +489,8 @@ typedef struct hwif_s { 
	const struct ide_port_ops	*port_ops;

	const struct ide_dma_ops	*dma_ops;



	u8 (*read_sff_dma_status)(struct hwif_s *);



	void (*tf_load)(ide_drive_t *, struct ide_task_s *);

	void (*tf_read)(ide_drive_t *, struct ide_task_s *);