Commit 83826dc5 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: (70 commits)
  ide: keep track of number of bytes instead of sectors in struct ide_cmd
  ide: remove ide_execute_pkt_cmd() (v2)
  ide: add ->dma_timer_expiry method and remove ->dma_exec_cmd one (v2)
  ide: set hwif->expiry prior to calling [__]ide_set_handler()
  ide: use do_rw_taskfile() for ATA_CMD_PACKET commands
  ide: pass command to ide_map_sg()
  ide: remove ide_end_request()
  ide: use ide_end_rq() in ide_complete_rq()
  ide: pass number of bytes to complete to ide_complete_rq()
  ide: remove BUG() from ide_complete_rq()
  ide: move rq->errors quirk out from ide_end_request()
  ide: pass error value to ide_complete_rq()
  ide: sanitize ide_end_rq()
  ide: add ide_end_rq() (v2)
  ide: make ide_special_rq() BUG() on unknown requests
  ide: sanitize ide_finish_cmd()
  ide: use ide_complete_cmd() for REQ_UNPARK_HEADS
  ide: use ide_complete_cmd() for head unload commands
  ide: task_error() -> task_error_cmd()
  ide: unify exit paths in task_pio_intr()
  ...
parents ffd14285 bf717c0a

arch/m68k/include/asm/ide.h

+0 −73
Original line number Diff line number Diff line
@@ -30,101 +30,28 @@ 
#define _M68K_IDE_H



#ifdef __KERNEL__





#include <asm/setup.h>

#include <asm/io.h>

#include <asm/irq.h>



#ifdef CONFIG_ATARI

#include <linux/interrupt.h>

#include <asm/atari_stdma.h>

#endif



#ifdef CONFIG_MAC

#include <asm/macints.h>

#endif



/*

 * Get rid of defs from io.h - ide has its private and conflicting versions

 * Since so far no single m68k platform uses ISA/PCI I/O space for IDE, we

 * always use the `raw' MMIO versions

 */

#undef inb

#undef inw

#undef insw

#undef inl

#undef insl

#undef outb

#undef outw

#undef outsw

#undef outl

#undef outsl

#undef readb

#undef readw

#undef readl

#undef writeb

#undef writew

#undef writel



#define inb				in_8

#define inw				in_be16

#define insw(port, addr, n)		raw_insw((u16 *)port, addr, n)

#define inl				in_be32

#define insl(port, addr, n)		raw_insl((u32 *)port, addr, n)

#define outb(val, port)			out_8(port, val)

#define outw(val, port)			out_be16(port, val)

#define outsw(port, addr, n)		raw_outsw((u16 *)port, addr, n)

#define outl(val, port)			out_be32(port, val)

#define outsl(port, addr, n)		raw_outsl((u32 *)port, addr, n)

#define readb				in_8

#define readw				in_be16

#define __ide_mm_insw(port, addr, n)	raw_insw((u16 *)port, addr, n)

#define readl				in_be32

#define __ide_mm_insl(port, addr, n)	raw_insl((u32 *)port, addr, n)

#define writeb(val, port)		out_8(port, val)

#define writew(val, port)		out_be16(port, val)

#define __ide_mm_outsw(port, addr, n)	raw_outsw((u16 *)port, addr, n)

#define writel(val, port)		out_be32(port, val)

#define __ide_mm_outsl(port, addr, n)	raw_outsl((u32 *)port, addr, n)

#if defined(CONFIG_ATARI) || defined(CONFIG_Q40)

#define insw_swapw(port, addr, n)	raw_insw_swapw((u16 *)port, addr, n)

#define outsw_swapw(port, addr, n)	raw_outsw_swapw((u16 *)port, addr, n)

#endif



#ifdef CONFIG_BLK_DEV_FALCON_IDE

#define IDE_ARCH_LOCK



extern int falconide_intr_lock;



static __inline__ void ide_release_lock (void)

{

	if (MACH_IS_ATARI) {

		if (falconide_intr_lock == 0) {

			printk("ide_release_lock: bug\n");

			return;

		}

		falconide_intr_lock = 0;

		stdma_release();

	}

}



static __inline__ void

ide_get_lock(irq_handler_t handler, void *data)

{

	if (MACH_IS_ATARI) {

		if (falconide_intr_lock == 0) {

			if (in_interrupt() > 0)

				panic( "Falcon IDE hasn't ST-DMA lock in interrupt" );

			stdma_lock(handler, data);

			falconide_intr_lock = 1;

		}

	}

}

#endif /* CONFIG_BLK_DEV_FALCON_IDE */



#define IDE_ARCH_ACK_INTR

#define ide_ack_intr(hwif)	((hwif)->ack_intr ? (hwif)->ack_intr(hwif) : 1)



#endif /* __KERNEL__ */

#endif /* _M68K_IDE_H */

drivers/ide/alim15x3.c

+5 −4
Original line number Diff line number Diff line
@@ -191,17 +191,18 @@ static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed) 
/**

 *	ali15x3_dma_setup	-	begin a DMA phase

 *	@drive:	target device

 *	@cmd: command

 *

 *	Returns 1 if the DMA cannot be performed, zero on success.

 */



static int ali15x3_dma_setup(ide_drive_t *drive)

static int ali15x3_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)

{

	if (m5229_revision < 0xC2 && drive->media != ide_disk) {

		if (rq_data_dir(drive->hwif->rq))

		if (cmd->tf_flags & IDE_TFLAG_WRITE)

			return 1;	/* try PIO instead of DMA */

	}

	return ide_dma_setup(drive);

	return ide_dma_setup(drive, cmd);

}



/**
@@ -503,11 +504,11 @@ static const struct ide_port_ops ali_port_ops = { 
static const struct ide_dma_ops ali_dma_ops = {

	.dma_host_set		= ide_dma_host_set,

	.dma_setup		= ali15x3_dma_setup,

	.dma_exec_cmd		= ide_dma_exec_cmd,

	.dma_start		= ide_dma_start,

	.dma_end		= ide_dma_end,

	.dma_test_irq		= ide_dma_test_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timer_expiry	= ide_dma_sff_timer_expiry,

	.dma_timeout		= ide_dma_timeout,

	.dma_sff_read_status	= ide_dma_sff_read_status,

};

drivers/ide/at91_ide.c

+35 −35
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static void apply_timings(const u8 chipselect, const u8 pio, 
	set_smc_timings(chipselect, cycle, setup, pulse, data_float, use_iordy);

}



static void at91_ide_input_data(ide_drive_t *drive, struct request *rq,

static void at91_ide_input_data(ide_drive_t *drive, struct ide_cmd *cmd,

				void *buf, unsigned int len)

{

	ide_hwif_t *hwif = drive->hwif;
@@ -156,11 +156,11 @@ static void at91_ide_input_data(ide_drive_t *drive, struct request *rq, 
	len++;



	enter_16bit(chipselect, mode);

	__ide_mm_insw((void __iomem *) io_ports->data_addr, buf, len / 2);

	readsw((void __iomem *)io_ports->data_addr, buf, len / 2);

	leave_16bit(chipselect, mode);

}



static void at91_ide_output_data(ide_drive_t *drive, struct request *rq,

static void at91_ide_output_data(ide_drive_t *drive, struct ide_cmd *cmd,

				 void *buf, unsigned int len)

{

	ide_hwif_t *hwif = drive->hwif;
@@ -171,7 +171,7 @@ static void at91_ide_output_data(ide_drive_t *drive, struct request *rq, 
	pdbg("cs %u buf %p len %d\n", chipselect,  buf, len);



	enter_16bit(chipselect, mode);

	__ide_mm_outsw((void __iomem *) io_ports->data_addr, buf, len / 2);

	writesw((void __iomem *)io_ports->data_addr, buf, len / 2);

	leave_16bit(chipselect, mode);

}
@@ -185,55 +185,55 @@ 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, ide_task_t *task)

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 = &task->tf;

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

	struct ide_taskfile *tf = &cmd->tf;

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



	if (task->tf_flags & IDE_TFLAG_FLAGGED)

	if (cmd->tf_flags & IDE_FTFLAG_FLAGGED)

		HIHI = 0xFF;



	if (task->tf_flags & IDE_TFLAG_OUT_DATA) {

	if (cmd->tf_flags & IDE_FTFLAG_OUT_DATA) {

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



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

	}



	if (task->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)

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

	if (task->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)

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

	if (task->tf_flags & IDE_TFLAG_OUT_HOB_LBAL)

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_LBAL)

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

	if (task->tf_flags & IDE_TFLAG_OUT_HOB_LBAM)

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_LBAM)

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

	if (task->tf_flags & IDE_TFLAG_OUT_HOB_LBAH)

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_LBAH)

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



	if (task->tf_flags & IDE_TFLAG_OUT_FEATURE)

	if (cmd->tf_flags & IDE_TFLAG_OUT_FEATURE)

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

	if (task->tf_flags & IDE_TFLAG_OUT_NSECT)

	if (cmd->tf_flags & IDE_TFLAG_OUT_NSECT)

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

	if (task->tf_flags & IDE_TFLAG_OUT_LBAL)

	if (cmd->tf_flags & IDE_TFLAG_OUT_LBAL)

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

	if (task->tf_flags & IDE_TFLAG_OUT_LBAM)

	if (cmd->tf_flags & IDE_TFLAG_OUT_LBAM)

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

	if (task->tf_flags & IDE_TFLAG_OUT_LBAH)

	if (cmd->tf_flags & IDE_TFLAG_OUT_LBAH)

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



	if (task->tf_flags & IDE_TFLAG_OUT_DEVICE)

	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, ide_task_t *task)

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 = &task->tf;

	struct ide_taskfile *tf = &cmd->tf;



	if (task->tf_flags & IDE_TFLAG_IN_DATA) {

	if (cmd->tf_flags & IDE_FTFLAG_IN_DATA) {

		u16 data;



		at91_ide_input_data(drive, NULL, &data, 2);
@@ -244,31 +244,31 @@ static void at91_ide_tf_read(ide_drive_t *drive, ide_task_t *task) 
	/* be sure we're looking at the low order bits */

	ide_mm_outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);



	if (task->tf_flags & IDE_TFLAG_IN_FEATURE)

	if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)

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

	if (task->tf_flags & IDE_TFLAG_IN_NSECT)

	if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)

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

	if (task->tf_flags & IDE_TFLAG_IN_LBAL)

	if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)

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

	if (task->tf_flags & IDE_TFLAG_IN_LBAM)

	if (cmd->tf_flags & IDE_TFLAG_IN_LBAM)

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

	if (task->tf_flags & IDE_TFLAG_IN_LBAH)

	if (cmd->tf_flags & IDE_TFLAG_IN_LBAH)

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

	if (task->tf_flags & IDE_TFLAG_IN_DEVICE)

	if (cmd->tf_flags & IDE_TFLAG_IN_DEVICE)

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



	if (task->tf_flags & IDE_TFLAG_LBA48) {

	if (cmd->tf_flags & IDE_TFLAG_LBA48) {

		ide_mm_outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr);



		if (task->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)

		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)

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

		if (task->tf_flags & IDE_TFLAG_IN_HOB_NSECT)

		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)

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

		if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAL)

		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)

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

		if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAM)

		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)

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

		if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAH)

		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)

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

	}

}

drivers/ide/au1xxx-ide.c

+9 −30
Original line number Diff line number Diff line
@@ -86,13 +86,13 @@ void auide_outsw(unsigned long port, void *addr, u32 count) 
	ctp->cur_ptr = au1xxx_ddma_get_nextptr_virt(dp);

}



static void au1xxx_input_data(ide_drive_t *drive, struct request *rq,

static void au1xxx_input_data(ide_drive_t *drive, struct ide_cmd *cmd,

			      void *buf, unsigned int len)

{

	auide_insw(drive->hwif->io_ports.data_addr, buf, (len + 1) / 2);

}



static void au1xxx_output_data(ide_drive_t *drive, struct request *rq,

static void au1xxx_output_data(ide_drive_t *drive, struct ide_cmd *cmd,

			       void *buf, unsigned int len)

{

	auide_outsw(drive->hwif->io_ports.data_addr, buf, (len + 1) / 2);
@@ -209,23 +209,17 @@ static void auide_set_dma_mode(ide_drive_t *drive, const u8 speed) 
 */



#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA

static int auide_build_dmatable(ide_drive_t *drive)

static int auide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)

{

	int i, iswrite, count = 0;

	ide_hwif_t *hwif = drive->hwif;

	struct request *rq = hwif->rq;

	_auide_hwif *ahwif = &auide_hwif;

	struct scatterlist *sg;

	int i = cmd->sg_nents, count = 0;

	int iswrite = !!(cmd->tf_flags & IDE_TFLAG_WRITE);



	iswrite = (rq_data_dir(rq) == WRITE);

	/* Save for interrupt context */

	ahwif->drive = drive;



	hwif->sg_nents = i = ide_build_sglist(drive, rq);



	if (!i)

		return 0;



	/* fill the descriptors */

	sg = hwif->sg_table;

	while (i && sg_dma_len(sg)) {
@@ -286,12 +280,7 @@ static int auide_build_dmatable(ide_drive_t *drive) 


static int auide_dma_end(ide_drive_t *drive)

{

	ide_hwif_t *hwif = drive->hwif;



	if (hwif->sg_nents) {

	ide_destroy_dmatable(drive);

		hwif->sg_nents = 0;

	}



	return 0;

}
@@ -301,19 +290,10 @@ static void auide_dma_start(ide_drive_t *drive ) 
}





static void auide_dma_exec_cmd(ide_drive_t *drive, u8 command)

static int auide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)

{

	/* issue cmd to drive */

	ide_execute_command(drive, command, &ide_dma_intr,

			    (2*WAIT_CMD), NULL);

}



static int auide_dma_setup(ide_drive_t *drive)

{

	struct request *rq = drive->hwif->rq;



	if (!auide_build_dmatable(drive)) {

		ide_map_sg(drive, rq);

	if (auide_build_dmatable(drive, cmd) == 0) {

		ide_map_sg(drive, cmd);

		return 1;

	}
@@ -369,7 +349,6 @@ static void auide_init_dbdma_dev(dbdev_tab_t *dev, u32 dev_id, u32 tsize, u32 de 
static const struct ide_dma_ops au1xxx_dma_ops = {

	.dma_host_set		= auide_dma_host_set,

	.dma_setup		= auide_dma_setup,

	.dma_exec_cmd		= auide_dma_exec_cmd,

	.dma_start		= auide_dma_start,

	.dma_end		= auide_dma_end,

	.dma_test_irq		= auide_dma_test_irq,

drivers/ide/buddha.c

+6 −5
Original line number Diff line number Diff line
@@ -143,6 +143,11 @@ static void __init buddha_setup_ports(hw_regs_t *hw, unsigned long base, 
	hw->chipset = ide_generic;

}



static const struct ide_port_info buddha_port_info = {

	.host_flags		= IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA,

	.irq_flags		= IRQF_SHARED,

};



    /*

     *  Probe for a Buddha or Catweasel IDE interface

     */
@@ -172,10 +177,6 @@ static int __init buddha_init(void) 
		

		board = z->resource.start;



/*

 * FIXME: we now have selectable mmio v/s iomio transports.

 */



		if(type != BOARD_XSURF) {

			if (!request_mem_region(board+BUDDHA_BASE1, 0x800, "IDE"))

				continue;
@@ -224,7 +225,7 @@ fail_base2: 
			hws[i] = &hw[i];

		}



		ide_host_add(NULL, hws, NULL);

		ide_host_add(&buddha_port_info, hws, NULL);

	}



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE