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

Commit 6594d0b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (27 commits)
  xsysace: Fix dereferencing of cf_id after hd_driveid removal
  at91_ide: turn on PIO 6 support
  at91_ide: remove unused ide_mm_{outb,inb}
  ide-cd: reverse NOT_READY sense key logic
  ide: refactor tf_read() method
  ide: refactor tf_load() method
  ide: call write_devctl() method from tf_read() method
  ide: move common code out of tf_load() method
  ide: simplify 'struct ide_taskfile'
  ide: replace IDE_TFLAG_* flags by IDE_VALID_*
  ide-cd: fix intendation in cdrom_decode_status()
  ide-cd: unify handling of fs and pc requests in cdrom_decode_status()
  ide-cd: convert cdrom_decode_status() to use switch statements
  ide-cd: update debugging support
  ide-cd: respect REQ_QUIET for fs requests in cdrom_decode_status()
  ide: remove unused #include <linux/version.h>
  tx4939ide: Fix tx4939ide_{in,out}put_data_swap argument
  tx493[89]ide: Remove big endian version of tx493[89]ide_tf_{load,read}
  ide-cd: carve out an ide_cd_breathe()-helper for fs write requests
  ide-cd: move status checking into the IRQ handler
  ...
parents 0534c8cb f0edef8c

drivers/block/xsysace.c

+6 −6
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ static void ace_fsm_dostate(struct ace_device *ace) 
	case ACE_FSM_STATE_IDENTIFY_PREPARE:

		/* Send identify command */

		ace->fsm_task = ACE_TASK_IDENTIFY;

		ace->data_ptr = &ace->cf_id;

		ace->data_ptr = ace->cf_id;

		ace->data_count = ACE_BUF_PER_SECTOR;

		ace_out(ace, ACE_SECCNTCMD, ACE_SECCNTCMD_IDENTIFY);
@@ -608,8 +608,8 @@ static void ace_fsm_dostate(struct ace_device *ace) 
		break;



	case ACE_FSM_STATE_IDENTIFY_COMPLETE:

		ace_fix_driveid(&ace->cf_id[0]);

		ace_dump_mem(&ace->cf_id, 512);	/* Debug: Dump out disk ID */

		ace_fix_driveid(ace->cf_id);

		ace_dump_mem(ace->cf_id, 512);	/* Debug: Dump out disk ID */



		if (ace->data_result) {

			/* Error occured, disable the disk */
@@ -622,9 +622,9 @@ static void ace_fsm_dostate(struct ace_device *ace) 


			/* Record disk parameters */

			set_capacity(ace->gd,

				ata_id_u32(&ace->cf_id, ATA_ID_LBA_CAPACITY));

				ata_id_u32(ace->cf_id, ATA_ID_LBA_CAPACITY));

			dev_info(ace->dev, "capacity: %i sectors\n",

				ata_id_u32(&ace->cf_id, ATA_ID_LBA_CAPACITY));

				ata_id_u32(ace->cf_id, ATA_ID_LBA_CAPACITY));

		}



		/* We're done, drop to IDLE state and notify waiters */
@@ -923,7 +923,7 @@ static int ace_release(struct gendisk *disk, fmode_t mode) 
static int ace_getgeo(struct block_device *bdev, struct hd_geometry *geo)

{

	struct ace_device *ace = bdev->bd_disk->private_data;

	u16 *cf_id = &ace->cf_id[0];

	u16 *cf_id = ace->cf_id;



	dev_dbg(ace->dev, "ace_getgeo()\n");

drivers/ide/at91_ide.c

+3 −88
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
 *

 */



#include <linux/version.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/clk.h>
@@ -175,90 +174,6 @@ static void at91_ide_output_data(ide_drive_t *drive, struct ide_cmd *cmd, 
	leave_16bit(chipselect, mode);

}



static u8 ide_mm_inb(unsigned long port)

{

	return readb((void __iomem *) port);

}



static void ide_mm_outb(u8 value, unsigned long port)

{

	writeb(value, (void __iomem *) port);

}



static void at91_ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)

{

	ide_hwif_t *hwif = drive->hwif;

	struct ide_io_ports *io_ports = &hwif->io_ports;

	struct ide_taskfile *tf = &cmd->tf;

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



	if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)

		HIHI = 0xFF;



	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)

		ide_mm_outb(tf->hob_feature, io_ports->feature_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)

		ide_mm_outb(tf->hob_nsect, io_ports->nsect_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_LBAL)

		ide_mm_outb(tf->hob_lbal, io_ports->lbal_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_LBAM)

		ide_mm_outb(tf->hob_lbam, io_ports->lbam_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_LBAH)

		ide_mm_outb(tf->hob_lbah, io_ports->lbah_addr);



	if (cmd->tf_flags & IDE_TFLAG_OUT_FEATURE)

		ide_mm_outb(tf->feature, io_ports->feature_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_NSECT)

		ide_mm_outb(tf->nsect, io_ports->nsect_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_LBAL)

		ide_mm_outb(tf->lbal, io_ports->lbal_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_LBAM)

		ide_mm_outb(tf->lbam, io_ports->lbam_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_LBAH)

		ide_mm_outb(tf->lbah, io_ports->lbah_addr);



	if (cmd->tf_flags & IDE_TFLAG_OUT_DEVICE)

		ide_mm_outb((tf->device & HIHI) | drive->select, io_ports->device_addr);

}



static void at91_ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)

{

	ide_hwif_t *hwif = drive->hwif;

	struct ide_io_ports *io_ports = &hwif->io_ports;

	struct ide_taskfile *tf = &cmd->tf;



	/* be sure we're looking at the low order bits */

	ide_mm_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);



	if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)

		tf->error  = ide_mm_inb(io_ports->feature_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)

		tf->nsect  = ide_mm_inb(io_ports->nsect_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)

		tf->lbal   = ide_mm_inb(io_ports->lbal_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_LBAM)

		tf->lbam   = ide_mm_inb(io_ports->lbam_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_LBAH)

		tf->lbah   = ide_mm_inb(io_ports->lbah_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_DEVICE)

		tf->device = ide_mm_inb(io_ports->device_addr);



	if (cmd->tf_flags & IDE_TFLAG_LBA48) {

		ide_mm_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);



		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)

			tf->hob_error = ide_mm_inb(io_ports->feature_addr);

		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)

			tf->hob_nsect = ide_mm_inb(io_ports->nsect_addr);

		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)

			tf->hob_lbal  = ide_mm_inb(io_ports->lbal_addr);

		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)

			tf->hob_lbam  = ide_mm_inb(io_ports->lbam_addr);

		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)

			tf->hob_lbah  = ide_mm_inb(io_ports->lbah_addr);

	}

}



static void at91_ide_set_pio_mode(ide_drive_t *drive, const u8 pio)

{

	struct ide_timing *timing;
@@ -284,8 +199,8 @@ static const struct ide_tp_ops at91_ide_tp_ops = { 
	.write_devctl	= ide_write_devctl,



	.dev_select	= ide_dev_select,

	.tf_load	= at91_ide_tf_load,

	.tf_read	= at91_ide_tf_read,

	.tf_load	= ide_tf_load,

	.tf_read	= ide_tf_read,



	.input_data	= at91_ide_input_data,

	.output_data	= at91_ide_output_data,
@@ -300,7 +215,7 @@ static const struct ide_port_info at91_ide_port_info __initdata = { 
	.tp_ops		= &at91_ide_tp_ops,

	.host_flags 	= IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA | IDE_HFLAG_SINGLE |

			  IDE_HFLAG_NO_IO_32BIT | IDE_HFLAG_UNMASK_IRQS,

	.pio_mask 	= ATA_PIO5,

	.pio_mask 	= ATA_PIO6,

};



/*

drivers/ide/falconide.c

+9 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <asm/atarihw.h>

#include <asm/atariints.h>

#include <asm/atari_stdma.h>

#include <asm/ide.h>



#define DRV_NAME "falconide"
@@ -67,8 +68,10 @@ static void falconide_input_data(ide_drive_t *drive, struct ide_cmd *cmd, 
{

	unsigned long data_addr = drive->hwif->io_ports.data_addr;



	if (drive->media == ide_disk && cmd && (cmd->tf_flags & IDE_TFLAG_FS))

		return insw(data_addr, buf, (len + 1) / 2);

	if (drive->media == ide_disk && cmd && (cmd->tf_flags & IDE_TFLAG_FS)) {

		__ide_mm_insw(data_addr, buf, (len + 1) / 2);

		return;

	}



	raw_insw_swapw((u16 *)data_addr, buf, (len + 1) / 2);

}
@@ -78,8 +81,10 @@ static void falconide_output_data(ide_drive_t *drive, struct ide_cmd *cmd, 
{

	unsigned long data_addr = drive->hwif->io_ports.data_addr;



	if (drive->media == ide_disk && cmd && (cmd->tf_flags & IDE_TFLAG_FS))

		return outsw(data_addr, buf, (len + 1) / 2);

	if (drive->media == ide_disk && cmd && (cmd->tf_flags & IDE_TFLAG_FS)) {

		__ide_mm_outsw(data_addr, buf, (len + 1) / 2);

		return;

	}



	raw_outsw_swapw((u16 *)data_addr, buf, (len + 1) / 2);

}

drivers/ide/ide-acpi.c

+3 −2
Original line number Diff line number Diff line
@@ -318,8 +318,9 @@ static int do_drive_set_taskfiles(ide_drive_t *drive, 


		/* convert GTF to taskfile */

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

		memcpy(&cmd.tf_array[7], gtf, REGS_PER_GTF);

		cmd.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;

		memcpy(&cmd.tf.feature, gtf, REGS_PER_GTF);

		cmd.valid.out.tf = IDE_VALID_OUT_TF | IDE_VALID_DEVICE;

		cmd.valid.in.tf  = IDE_VALID_IN_TF  | IDE_VALID_DEVICE;



		err = ide_no_data_taskfile(drive, &cmd);

		if (err) {

drivers/ide/ide-atapi.c

+16 −22
Original line number Diff line number Diff line
@@ -254,16 +254,13 @@ EXPORT_SYMBOL_GPL(ide_cd_get_xferlen); 


void ide_read_bcount_and_ireason(ide_drive_t *drive, u16 *bcount, u8 *ireason)

{

	struct ide_cmd cmd;

	struct ide_taskfile tf;



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

	cmd.tf_flags = IDE_TFLAG_IN_LBAH | IDE_TFLAG_IN_LBAM |

		       IDE_TFLAG_IN_NSECT;

	drive->hwif->tp_ops->tf_read(drive, &tf, IDE_VALID_NSECT |

				     IDE_VALID_LBAM | IDE_VALID_LBAH);



	drive->hwif->tp_ops->tf_read(drive, &cmd);



	*bcount = (cmd.tf.lbah << 8) | cmd.tf.lbam;

	*ireason = cmd.tf.nsect & 3;

	*bcount = (tf.lbah << 8) | tf.lbam;

	*ireason = tf.nsect & 3;

}

EXPORT_SYMBOL_GPL(ide_read_bcount_and_ireason);
@@ -439,12 +436,12 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive) 
	return ide_started;

}



static void ide_init_packet_cmd(struct ide_cmd *cmd, u32 tf_flags,

static void ide_init_packet_cmd(struct ide_cmd *cmd, u8 valid_tf,

				u16 bcount, u8 dma)

{

	cmd->protocol = dma ? ATAPI_PROT_DMA : ATAPI_PROT_PIO;

	cmd->tf_flags |= IDE_TFLAG_OUT_LBAH | IDE_TFLAG_OUT_LBAM |

			 IDE_TFLAG_OUT_FEATURE | tf_flags;

	cmd->valid.out.tf = IDE_VALID_LBAH | IDE_VALID_LBAM |

			    IDE_VALID_FEATURE | valid_tf;

	cmd->tf.command = ATA_CMD_PACKET;

	cmd->tf.feature = dma;		/* Use PIO/DMA */

	cmd->tf.lbam    = bcount & 0xff;
@@ -453,14 +450,11 @@ static void ide_init_packet_cmd(struct ide_cmd *cmd, u32 tf_flags, 


static u8 ide_read_ireason(ide_drive_t *drive)

{

	struct ide_cmd cmd;



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

	cmd.tf_flags = IDE_TFLAG_IN_NSECT;

	struct ide_taskfile tf;



	drive->hwif->tp_ops->tf_read(drive, &cmd);

	drive->hwif->tp_ops->tf_read(drive, &tf, IDE_VALID_NSECT);



	return cmd.tf.nsect & 3;

	return tf.nsect & 3;

}



static u8 ide_wait_ireason(ide_drive_t *drive, u8 ireason)
@@ -588,12 +582,12 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_cmd *cmd) 
	ide_expiry_t *expiry = NULL;

	struct request *rq = hwif->rq;

	unsigned int timeout;

	u32 tf_flags;

	u16 bcount;

	u8 valid_tf;

	u8 drq_int = !!(drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT);



	if (dev_is_idecd(drive)) {

		tf_flags = IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL;

		valid_tf = IDE_VALID_NSECT | IDE_VALID_LBAL;

		bcount = ide_cd_get_xferlen(rq);

		expiry = ide_cd_expiry;

		timeout = ATAPI_WAIT_PC;
@@ -607,7 +601,7 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_cmd *cmd) 
		pc->xferred = 0;

		pc->cur_pos = pc->buf;



		tf_flags = IDE_TFLAG_OUT_DEVICE;

		valid_tf = IDE_VALID_DEVICE;

		bcount = ((drive->media == ide_tape) ?

				pc->req_xfer :

				min(pc->req_xfer, 63 * 1024));
@@ -627,7 +621,7 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_cmd *cmd) 
						       : WAIT_TAPE_CMD;

	}



	ide_init_packet_cmd(cmd, tf_flags, bcount, drive->dma);

	ide_init_packet_cmd(cmd, valid_tf, bcount, drive->dma);



	(void)do_rw_taskfile(drive, cmd);