Commit 19710d25 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add "flagged" taskfile flags to struct ide_taskfile (v2) 



* Add ->ftf_flags field to struct ide_taskfile
  and convert flags for TASKFILE ioctl to use it.

* Rename "flagged" taskfile flags:
  - IDE_TFLAG_FLAGGED -> IDE_FTFLAG_FLAGGED
  - IDE_TFLAG_FLAGGED_SET_IN_FLAGS -> IDE_FTFLAG_SET_IN_FLAGS
  - IDE_TFLAG_{OUT,IN}_DATA -> IDE_FTFLAG_{OUT,IN}_DATA

v2:
* Remember to fully update ide-h8300.c, scc_pata.c and tx493{8,9}ide.c
  (thanks to Stephen Rothwell for noticing).

There should be no functional changes caused by this patch.

Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent c094ea07

drivers/ide/at91_ide.c

+3 −3
Original line number Diff line number Diff line
@@ -192,10 +192,10 @@ static void at91_ide_tf_load(ide_drive_t *drive, ide_task_t *task) 
	struct ide_taskfile *tf = &task->tf;

	u8 HIHI = (task->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF;



	if (task->tf_flags & IDE_TFLAG_FLAGGED)

	if (task->tf_flags & IDE_FTFLAG_FLAGGED)

		HIHI = 0xFF;



	if (task->tf_flags & IDE_TFLAG_OUT_DATA) {

	if (task->tf_flags & IDE_FTFLAG_OUT_DATA) {

		u16 data = (tf->hob_data << 8) | tf->data;



		at91_ide_output_data(drive, NULL, &data, 2);
@@ -233,7 +233,7 @@ static void at91_ide_tf_read(ide_drive_t *drive, ide_task_t *task) 
	struct ide_io_ports *io_ports = &hwif->io_ports;

	struct ide_taskfile *tf = &task->tf;



	if (task->tf_flags & IDE_TFLAG_IN_DATA) {

	if (task->tf_flags & IDE_FTFLAG_IN_DATA) {

		u16 data;



		at91_ide_input_data(drive, NULL, &data, 2);

drivers/ide/ide-h8300.c

+3 −3
Original line number Diff line number Diff line
@@ -51,10 +51,10 @@ static void h8300_tf_load(ide_drive_t *drive, ide_task_t *task) 
	struct ide_taskfile *tf = &task->tf;

	u8 HIHI = (task->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF;



	if (task->tf_flags & IDE_TFLAG_FLAGGED)

	if (task->ftf_flags & IDE_FTFLAG_FLAGGED)

		HIHI = 0xFF;



	if (task->tf_flags & IDE_TFLAG_OUT_DATA)

	if (task->ftf_flags & IDE_FTFLAG_OUT_DATA)

		mm_outw((tf->hob_data << 8) | tf->data, io_ports->data_addr);



	if (task->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
@@ -90,7 +90,7 @@ static void h8300_tf_read(ide_drive_t *drive, ide_task_t *task) 
	struct ide_io_ports *io_ports = &hwif->io_ports;

	struct ide_taskfile *tf = &task->tf;



	if (task->tf_flags & IDE_TFLAG_IN_DATA) {

	if (task->ftf_flags & IDE_FTFLAG_IN_DATA) {

		u16 data = mm_inw(io_ports->data_addr);



		tf->data = data & 0xff;

drivers/ide/ide-io-std.c

+3 −3
Original line number Diff line number Diff line
@@ -96,10 +96,10 @@ void ide_tf_load(ide_drive_t *drive, ide_task_t *task) 
	else

		tf_outb = ide_outb;



	if (task->tf_flags & IDE_TFLAG_FLAGGED)

	if (task->ftf_flags & IDE_FTFLAG_FLAGGED)

		HIHI = 0xFF;



	if (task->tf_flags & IDE_TFLAG_OUT_DATA) {

	if (task->ftf_flags & IDE_FTFLAG_OUT_DATA) {

		u16 data = (tf->hob_data << 8) | tf->data;



		if (mmio)
@@ -153,7 +153,7 @@ void ide_tf_read(ide_drive_t *drive, ide_task_t *task) 
		tf_inb  = ide_inb;

	}



	if (task->tf_flags & IDE_TFLAG_IN_DATA) {

	if (task->ftf_flags & IDE_FTFLAG_IN_DATA) {

		u16 data;



		if (mmio)

drivers/ide/ide-taskfile.c

+6 −6
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task) 
		}

	}



	if (task->tf_flags & IDE_TFLAG_FLAGGED)

		task->tf_flags |= IDE_TFLAG_FLAGGED_SET_IN_FLAGS;

	if (task->ftf_flags & IDE_FTFLAG_FLAGGED)

		task->ftf_flags |= IDE_FTFLAG_SET_IN_FLAGS;



	memcpy(&hwif->task, task, sizeof(*task));
@@ -551,10 +551,10 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg) 
		args.tf_flags |= (IDE_TFLAG_LBA48 | IDE_TFLAG_IN_HOB);



	if (req_task->out_flags.all) {

		args.tf_flags |= IDE_TFLAG_FLAGGED;

		args.ftf_flags |= IDE_FTFLAG_FLAGGED;



		if (req_task->out_flags.b.data)

			args.tf_flags |= IDE_TFLAG_OUT_DATA;

			args.ftf_flags |= IDE_FTFLAG_OUT_DATA;



		if (req_task->out_flags.b.nsector_hob)

			args.tf_flags |= IDE_TFLAG_OUT_HOB_NSECT;
@@ -582,7 +582,7 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg) 
	}



	if (req_task->in_flags.b.data)

		args.tf_flags |= IDE_TFLAG_IN_DATA;

		args.ftf_flags |= IDE_FTFLAG_IN_DATA;



	switch(req_task->data_phase) {

		case TASKFILE_MULTI_OUT:
@@ -647,7 +647,7 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg) 
	memcpy(req_task->hob_ports, &args.tf_array[0], HDIO_DRIVE_HOB_HDR_SIZE - 2);

	memcpy(req_task->io_ports, &args.tf_array[6], HDIO_DRIVE_TASK_HDR_SIZE);



	if ((args.tf_flags & IDE_TFLAG_FLAGGED_SET_IN_FLAGS) &&

	if ((args.ftf_flags & IDE_FTFLAG_SET_IN_FLAGS) &&

	    req_task->in_flags.all == 0) {

		req_task->in_flags.all = IDE_TASKFILE_STD_IN_FLAGS;

		if (drive->dev_flags & IDE_DFLAG_LBA48)

drivers/ide/ns87415.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static void superio_tf_read(ide_drive_t *drive, ide_task_t *task) 
	struct ide_io_ports *io_ports = &drive->hwif->io_ports;

	struct ide_taskfile *tf = &task->tf;



	if (task->tf_flags & IDE_TFLAG_IN_DATA) {

	if (task->ftf_flags & IDE_FTFLAG_IN_DATA) {

		u16 data = inw(io_ports->data_addr);



		tf->data = data & 0xff;

CRA Git | Maintained and supported by SUSTech CRA and CCSE