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

Commit 32b3fe4f authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: always use ->OUTBSYNC method for executing commands 



Always use ->OUTBSYNC method for executing commands so the posting is done
if needed (this affects only pmac and scc_pata host drivers at the moment).

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

drivers/ide/ide-floppy.c

+2 −1
Original line number Diff line number Diff line
@@ -696,7 +696,8 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive, 
		return ide_started;

	} else {

		/* Issue the packet command */

		hwif->OUTB(WIN_PACKETCMD, hwif->io_ports.command_addr);

		hwif->OUTBSYNC(drive, WIN_PACKETCMD,

			       hwif->io_ports.command_addr);

		return (*pkt_xfer_routine) (drive);

	}

}

drivers/ide/ide-io.c

+2 −1
Original line number Diff line number Diff line
@@ -502,7 +502,8 @@ static ide_startstop_t ide_atapi_error(ide_drive_t *drive, struct request *rq, u 


	if (ide_read_status(drive) & (BUSY_STAT | DRQ_STAT))

		/* force an abort */

		hwif->OUTB(WIN_IDLEIMMEDIATE, hwif->io_ports.command_addr);

		hwif->OUTBSYNC(drive, WIN_IDLEIMMEDIATE,

			       hwif->io_ports.command_addr);



	if (rq->errors >= ERROR_MAX) {

		ide_kill_rq(drive, rq);

drivers/ide/ide-iops.c

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ int ide_driveid_update(ide_drive_t *drive) 
	SELECT_MASK(drive, 1);

	ide_set_irq(drive, 1);

	msleep(50);

	hwif->OUTB(WIN_IDENTIFY, hwif->io_ports.command_addr);

	hwif->OUTBSYNC(drive, WIN_IDENTIFY, hwif->io_ports.command_addr);

	timeout = jiffies + WAIT_WORSTCASE;

	do {

		if (time_after(jiffies, timeout)) {

drivers/ide/ide-probe.c

+3 −3
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd) 
		hwif->OUTB(0, io_ports->feature_addr);



	/* ask drive for ID */

	hwif->OUTB(cmd, io_ports->command_addr);

	hwif->OUTBSYNC(drive, cmd, io_ports->command_addr);



	timeout = ((cmd == WIN_IDENTIFY) ? WAIT_WORSTCASE : WAIT_PIDENTIFY) / 2;

	timeout += jiffies;
@@ -480,7 +480,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd) 
			msleep(50);

			hwif->OUTB(drive->select.all, io_ports->device_addr);

			msleep(50);

			hwif->OUTB(WIN_SRST, io_ports->command_addr);

			hwif->OUTBSYNC(drive, WIN_SRST, io_ports->command_addr);

			(void)ide_busy_sleep(hwif);

			rc = try_to_identify(drive, cmd);

		}
@@ -516,7 +516,7 @@ static void enable_nest (ide_drive_t *drive) 
	printk("%s: enabling %s -- ", hwif->name, drive->id->model);

	SELECT_DRIVE(drive);

	msleep(50);

	hwif->OUTB(EXABYTE_ENABLE_NEST, hwif->io_ports.command_addr);

	hwif->OUTBSYNC(drive, EXABYTE_ENABLE_NEST, hwif->io_ports.command_addr);



	if (ide_busy_sleep(hwif)) {

		printk(KERN_CONT "failed (timeout)\n");

drivers/ide/ide-tape.c

+2 −1
Original line number Diff line number Diff line
@@ -1056,7 +1056,8 @@ static ide_startstop_t idetape_issue_pc(ide_drive_t *drive, 
				    IDETAPE_WAIT_CMD, NULL);

		return ide_started;

	} else {

		hwif->OUTB(WIN_PACKETCMD, hwif->io_ports.command_addr);

		hwif->OUTBSYNC(drive, WIN_PACKETCMD,

			       hwif->io_ports.command_addr);

		return idetape_transfer_pc(drive);

	}

}