IDE updates part 2
Subsystems (4)
Hi,
More "uninteresting" IDE changes:
- make all host drivers use struct ide_port_info
- sanitize command/request completion API
- replace ide_task_t by struct ide_cmd
- improve debugging scheme (from Borislav Petkov)
- misc fixes/cleanups
Linus, please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/
to receive the following updates:
arch/m68k/include/asm/ide.h | 73 ------- drivers/ide/alim15x3.c | 9 +- drivers/ide/at91_ide.c | 70 ++++---- drivers/ide/au1xxx-ide.c | 39 +--- drivers/ide/buddha.c | 11 +- drivers/ide/cmd64x.c | 6 +- drivers/ide/cs5536.c | 2 +- drivers/ide/delkin_cb.c | 1 + drivers/ide/dtc2278.c | 3 +- drivers/ide/falconide.c | 45 ++++- drivers/ide/gayle.c | 7 +- drivers/ide/hpt366.c | 6 +- drivers/ide/icside.c | 24 +-- drivers/ide/ide-4drives.c | 3 +- drivers/ide/ide-acpi.c | 10 +- drivers/ide/ide-atapi.c | 123 +++++++----- drivers/ide/ide-cd.c | 155 ++++++++------- drivers/ide/ide-cd.h | 4 +- drivers/ide/ide-cs.c | 1 + drivers/ide/ide-devsets.c | 4 +- drivers/ide/ide-disk.c | 171 ++++++++--------- drivers/ide/ide-disk_proc.c | 28 ++-- drivers/ide/ide-dma-sff.c | 37 ++--- drivers/ide/ide-dma.c | 39 ++-- drivers/ide/ide-eh.c | 30 ++- drivers/ide/ide-floppy.c | 156 ++++++--------- drivers/ide/ide-gd.c | 10 +- drivers/ide/ide-gd.h | 4 +- drivers/ide/ide-generic.c | 8 +- drivers/ide/ide-h8300.c | 66 ++++---- drivers/ide/ide-io-std.c | 73 ++++---- drivers/ide/ide-io.c | 285 ++++++++++----------------- drivers/ide/ide-ioctls.c | 44 ++-- drivers/ide/ide-iops.c | 66 +++---- drivers/ide/ide-lib.c | 20 +- drivers/ide/ide-park.c | 19 +- drivers/ide/ide-pm.c | 42 +++-- drivers/ide/ide-pnp.c | 6 +- drivers/ide/ide-probe.c | 95 ++++------ drivers/ide/ide-proc.c | 16 +- drivers/ide/ide-tape.c | 123 +++++-------- drivers/ide/ide-taskfile.c | 448 ++++++++++++++++++++----------------------- drivers/ide/ide_arm.c | 6 +- drivers/ide/it821x.c | 2 +- drivers/ide/macide.c | 7 +- drivers/ide/ns87415.c | 36 ++-- drivers/ide/palm_bk3710.c | 13 +- drivers/ide/pdc202xx_old.c | 4 +- drivers/ide/pmac.c | 32 +--- drivers/ide/q40ide.c | 15 +- drivers/ide/sc1200.c | 2 +- drivers/ide/scc_pata.c | 115 +++++------ drivers/ide/setup-pci.c | 4 + drivers/ide/sgiioc4.c | 30 +-- drivers/ide/siimage.c | 2 +- drivers/ide/sl82c105.c | 2 +- drivers/ide/tc86c001.c | 2 +- drivers/ide/trm290.c | 15 +- drivers/ide/tx4938ide.c | 68 ++++---- drivers/ide/tx4939ide.c | 109 +++++------ include/linux/ide.h | 239 ++++++++++++----------- 61 files changed, 1418 insertions(+), 1667 deletions(-)
Bartlomiej Zolnierkiewicz (67):
icside: use struct ide_port_info also for PCB version 5 (v2)
ide_arm: use struct ide_port_info
ide-generic: use struct ide_port_info
ide-pnp: use struct ide_port_info
buddha: use struct ide_port_info
macide: use struct ide_port_info
ide: move ->rqsize init from init_irq() to ide_init_port()
ide: remove IDE_ARCH_INTR (v2)
ide: remove IDE_ARCH_LOCK (v2)
ide: make m68k host drivers use IDE_HFLAG_MMIO
ide: cleanup <asm-m68k/ide.h>
at91_ide: use readsw()/writesw() directly
ide: include <asm/ide.h> only when needed
scc_pata: remove DECLARE_SCC_DEV() macro (v2)
ide: fix memleak on failure in probe_for_drive()
ide: fix error message in pre_task_out_intr()
ide: allow host drivers to specify IRQ flags
ide: remove now superfluous check from ide_host_register()
ide: add IDE_HFLAG_DTC2278 host flag
ide: add IDE_HFLAG_4DRIVES host flag
ide: add "flagged" taskfile flags to struct ide_taskfile (v2)
ide: complete power step in ide_complete_pm_request()
ide: factor out completion of taskfile from ide_end_drive_cmd()
ide: move request type specific code from ide_end_drive_cmd() to callers (v3)
ide: no need to read Status and Error registers for "empty" taskfile requests
ide: remove ->data_phase field from ide_hwif_t
ide: move smart_enable() call out from get_smart_data()
icside: icside_dma_setup() fixes
trm290: trm290_dma_setup() fix
au1xxx-ide: auide_dma_end() cleanup
ide: remove no longer needed PC_FLAG_TIMEDOUT packet command flag
ide-floppy: remove superfluous check from ide_floppy_end_request()
ide-tape: remove superfluous tape->lock
ide: move ->failed_pc to ide_drive_t
ide: use ->end_request only for private device driver requests ide-{floppy,tape}: cleanup ide*_end_request()
ide: remove ->end_request method
ide: return request status from ->pc_callback method
ide: use blk_fs_request() check in ide-taskfile.c
ide: call ide_build_sglist() prior to ->dma_setup (v2)
ide: remove ide_task_t typedef
ide: pass command instead of request to ide_pio_datablock()
ide: move command related fields from ide_hwif_t to struct ide_cmd
ide: set IDE_TFLAG_WRITE basing on data phase used in ide_taskfile_ioctl()
ide: use ata_tf_protocols enums
ide: merge task_{in,out}_intr()
ide: inline task_in_unexpected() into task_pio_intr()
ide: unify exit paths in task_pio_intr()
ide: task_error() -> task_error_cmd()
ide: use ide_complete_cmd() for head unload commands
ide: use ide_complete_cmd() for REQ_UNPARK_HEADS
ide: sanitize ide_finish_cmd()
ide: make ide_special_rq() BUG() on unknown requests
ide: add ide_end_rq() (v2)
ide: sanitize ide_end_rq()
ide: pass error value to ide_complete_rq()
ide: move rq->errors quirk out from ide_end_request()
ide: remove BUG() from ide_complete_rq()
ide: pass number of bytes to complete to ide_complete_rq()
ide: use ide_end_rq() in ide_complete_rq()
ide: remove ide_end_request()
ide: pass command to ide_map_sg()
ide: use do_rw_taskfile() for ATA_CMD_PACKET commands
ide: set hwif->expiry prior to calling [__]ide_set_handler()
ide: add ->dma_timer_expiry method and remove ->dma_exec_cmd one (v2)
ide: remove ide_execute_pkt_cmd() (v2)
ide: keep track of number of bytes instead of sectors in struct ide_cmd
Borislav Petkov (2):
ide: improve debugging scheme
ide-cd: use ide_drive_t's rq in cdrom_queue_request_sense
Kevin Hilman (1):
IDE: palm_bk3710: use ioremap instead of arch-specific IO_ADDRESS()
arch/m68k/include/asm/ide.h +0 -73
@@ -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
@@ -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
146 lines not on this page · raw message
drivers/ide/au1xxx-ide.c +9 -30
@@ -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 ; - } +ide_destroy_dmatable (drive);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 destatic 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
@@ -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 ;
drivers/ide/cmd64x.c +3 -3
@@ -379,11 +379,11 @@ static const struct ide_port_ops cmd64x_port_ops = {static const struct ide_dma_ops cmd64x_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = ide_dma_start, .dma_end = cmd64x_dma_end, .dma_test_irq = cmd64x_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, };
@@ -391,11 +391,11 @@ static const struct ide_dma_ops cmd64x_dma_ops = {static const struct ide_dma_ops cmd646_rev1_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = ide_dma_start, .dma_end = cmd646_1_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, };
@@ -403,11 +403,11 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = {static const struct ide_dma_ops cmd648_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = ide_dma_start, .dma_end = cmd648_dma_end, .dma_test_irq = cmd648_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/cs5536.c +1 -1
@@ -231,11 +231,11 @@ static const struct ide_port_ops cs5536_port_ops = {static const struct ide_dma_ops cs5536_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = cs5536_dma_start, .dma_end = cs5536_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, };
drivers/ide/delkin_cb.c +1 -0
@@ -66,6 +66,7 @@ static const struct ide_port_info delkin_cb_port_info = { .port_ops = &delkin_cb_port_ops, .host_flags = IDE_HFLAG_IO_32BIT | IDE_HFLAG_UNMASK_IRQS | IDE_HFLAG_NO_DMA, + .irq_flags = IRQF_SHARED, .init_chipset = delkin_cb_init_chipset, };
drivers/ide/dtc2278.c +2 -1
@@ -100,7 +100,8 @@ static const struct ide_port_info dtc2278_port_info __initdata = {IDE_HFLAG_IO_32BIT |/* disallow ->io_32bit changes */ IDE_HFLAG_NO_IO_32BIT | - IDE_HFLAG_NO_DMA, +IDE_HFLAG_NO_DMA | + IDE_HFLAG_DTC2278, .pio_mask = ATA_PIO4, };
drivers/ide/falconide.c +34 -11
80 lines not on this page · raw message
drivers/ide/gayle.c +3 -4
@@ -118,7 +118,9 @@ static void __init gayle_setup_ports(hw_regs_t *hw, unsigned long base, }static const struct ide_port_info gayle_port_info = { - .host_flags =IDE_HFLAG_SERIALIZE |IDE_HFLAG_NO_DMA , + .host_flags =IDE_HFLAG_MMIO |IDE_HFLAG_SERIALIZE | +IDE_HFLAG_NO_DMA , + .irq_flags =IRQF_SHARED , };/*
@@ -163,9 +165,6 @@ found: irqport = (unsigned long )ZTWO_VADDR (GAYLE_IRQ_1200 ); ack_intr = gayle_ack_intr_a1200; } -/* -* FIXME: we now have selectable modes between mmio v/s iomio -*/ res_start = ((unsigned long )phys_base) & ~(GAYLE_NEXT_PORT -1 ); res_n =GAYLE_IDEREG_SIZE ;
drivers/ide/hpt366.c +3 -3
@@ -1418,11 +1418,11 @@ static const struct ide_port_ops hpt3xx_port_ops = {static const struct ide_dma_ops hpt37x_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = ide_dma_start, .dma_end = hpt374_dma_end, .dma_test_irq = hpt374_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, };
@@ -1430,11 +1430,11 @@ static const struct ide_dma_ops hpt37x_dma_ops = {static const struct ide_dma_ops hpt370_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = hpt370_dma_start, .dma_end = hpt370_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 = hpt370_dma_timeout, .dma_sff_read_status = ide_dma_sff_read_status, };
@@ -1442,11 +1442,11 @@ static const struct ide_dma_ops hpt370_dma_ops = {static const struct ide_dma_ops hpt36x_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_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 = hpt366_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/icside.c +9 -15
@@ -307,15 +307,14 @@ static void icside_dma_start(ide_drive_t *drive)enable_dma (ec->dma); } -static int icside_dma_setup (ide_drive_t *drive) +static int icside_dma_setup (ide_drive_t *drive,struct ide_cmd *cmd) {ide_hwif_t *hwif = drive->hwif;struct expansion_card *ec =ECARD_DEV (hwif->dev);struct icside_state *state =ecard_get_drvdata (ec); -struct request *rq = hwif->rq;unsigned int dma_mode; -if (rq_data_dir (rq)) +if (cmd->tf_flags &IDE_TFLAG_WRITE ) dma_mode =DMA_MODE_WRITE ;else dma_mode =DMA_MODE_READ ;
@@ -325,8 +324,6 @@ static int icside_dma_setup(ide_drive_t *drive)*/ BUG_ON (dma_channel_active (ec->dma)); - hwif->sg_nents =ide_build_sglist (drive, rq); -/* * Ensure that we have the right interrupt routed. */
@@ -346,7 +343,7 @@ static int icside_dma_setup(ide_drive_t *drive)* Tell the DMA engine about the SG table and * data direction. */ -set_dma_sg (ec->dma, hwif->sg_table, hwif->sg_nents); +set_dma_sg (ec->dma, hwif->sg_table, cmd->sg_nents);set_dma_mode (ec->dma, dma_mode); drive->waiting_for_dma =1 ;
@@ -354,12 +351,6 @@ static int icside_dma_setup(ide_drive_t *drive)return 0 ; } -static void icside_dma_exec_cmd (ide_drive_t *drive,u8 cmd) -{ -/* issue cmd to drive */ -ide_execute_command (drive, cmd, ide_dma_intr,2 *WAIT_CMD ,NULL ); -} -static int icside_dma_test_irq (ide_drive_t *drive) {ide_hwif_t *hwif = drive->hwif;
@@ -383,7 +374,6 @@ static int icside_dma_init(ide_hwif_t *hwif, const struct ide_port_info *d)static const struct ide_dma_ops icside_v6_dma_ops = { .dma_host_set = icside_dma_host_set, .dma_setup = icside_dma_setup, - .dma_exec_cmd = icside_dma_exec_cmd, .dma_start = icside_dma_start, .dma_end = icside_dma_end, .dma_test_irq = icside_dma_test_irq,
@@ -419,6 +409,10 @@ static void icside_setup_ports(hw_regs_t *hw, void __iomem *base, hw->chipset = ide_acorn; } +static const struct ide_port_info icside_v5_port_info = { + .host_flags =IDE_HFLAG_NO_DMA , +}; +static int __devinit icside_register_v5 (struct icside_state *state,struct expansion_card *ec) {
@@ -445,7 +439,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)icside_setup_ports (&hw, base, &icside_cardinfo_v5, ec); - host =ide_host_alloc (NULL , hws); + host =ide_host_alloc (&icside_v5_port_info, hws);if (host ==NULL )return -ENODEV ;
@@ -453,7 +447,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)ecard_set_drvdata (ec, state); - ret =ide_host_register (host,NULL , hws); + ret =ide_host_register (host, &icside_v5_port_info, hws);if (ret) goto err_free;
drivers/ide/ide-4drives.c +2 -1
@@ -23,7 +23,8 @@ static const struct ide_port_ops ide_4drives_port_ops = {static const struct ide_port_info ide_4drives_port_info = { .port_ops = &ide_4drives_port_ops, - .host_flags =IDE_HFLAG_SERIALIZE |IDE_HFLAG_NO_DMA , + .host_flags =IDE_HFLAG_SERIALIZE |IDE_HFLAG_NO_DMA | +IDE_HFLAG_4DRIVES , };static int __init ide_4drives_init (void )
drivers/ide/ide-acpi.c +5 -5
@@ -304,7 +304,7 @@ static int do_drive_set_taskfiles(ide_drive_t *drive,/* send all taskfile registers (0x1f1-0x1f7) *in*that*order* */ for (ix =0 ; ix < gtf_count; ix++) {u8 *gtf = (u8 *)(gtf_address + ix *REGS_PER_GTF ); -ide_task_t task; +struct ide_cmd cmd; DEBPRINT("(0x1f1-1f7): " "hex: %02x %02x %02x %02x %02x %02x %02x\n",
@@ -317,11 +317,11 @@ static int do_drive_set_taskfiles(ide_drive_t *drive, }/* convert GTF to taskfile */ -memset (&task,0 ,sizeof (ide_task_t)); -memcpy (&task.tf_array[7 ], gtf,REGS_PER_GTF ); - task.tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; +memset (&cmd,0 ,sizeof (cmd)); +memcpy (&cmd.tf_array[7 ], gtf,REGS_PER_GTF ); + cmd.tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; - err =ide_no_data_taskfile (drive, &task); + err =ide_no_data_taskfile (drive, &cmd);if (err) {printk (KERN_ERR "%s: ide_no_data_taskfile failed: %u\n" , __func__, err);
drivers/ide/ide-atapi.c +71 -52
217 lines not on this page · raw message
drivers/ide/ide-cd.c +81 -74
389 lines not on this page · raw message
drivers/ide/ide-cd.h +1 -3
@@ -11,7 +11,7 @@#define IDECD_DEBUG_LOG 0#if IDECD_DEBUG_LOG -#define ide_debug_log(lvl, fmt, args...) __ide_debug_log(lvl, fmt, args) +#define ide_debug_log(lvl, fmt, args...) __ide_debug_log(lvl, fmt, ## args)#else #define ide_debug_log(lvl, fmt, args...) do {} while (0)#endif
@@ -91,8 +91,6 @@ struct cdrom_info {on this device. */ struct request_sense sense_data; -struct request request_sense_request; -u8 max_speed;/* Max speed of the drive. */ u8 current_speed;/* Current speed of the drive. */
drivers/ide/ide-cs.c +1 -0
@@ -154,6 +154,7 @@ static const struct ide_port_ops idecs_port_ops = {static const struct ide_port_info idecs_port_info = { .port_ops = &idecs_port_ops, .host_flags =IDE_HFLAG_NO_DMA , + .irq_flags =IRQF_SHARED , }; static struct ide_host *idecs_register(unsigned long io, unsigned long ctl,
drivers/ide/ide-devsets.c +1 -3
@@ -183,8 +183,6 @@ ide_startstop_t ide_do_devset(ide_drive_t *drive, struct request *rq) err =setfunc (drive, *(int *)&rq->cmd[1 ]);if (err) rq->errors = err; -else - err =1 ; -ide_end_request (drive, err,0 ); +ide_complete_rq (drive, err,ide_rq_bytes (rq));return ide_stopped; }
drivers/ide/ide-disk.c +83 -88
304 lines not on this page · raw message
drivers/ide/ide-disk_proc.c +15 -13
@@ -1,38 +1,38 @@#include <linux/kernel.h> #include <linux/ide.h> -#include <linux/hdreg.h> #include "ide-disk.h" static int smart_enable (ide_drive_t *drive) { -ide_task_t args; -struct ide_taskfile *tf = &args.tf; +struct ide_cmd cmd; +struct ide_taskfile *tf = &cmd.tf; -memset (&args,0 ,sizeof (ide_task_t)); +memset (&cmd,0 ,sizeof (cmd)); tf->feature =ATA_SMART_ENABLE ; tf->lbam =ATA_SMART_LBAM_PASS ; tf->lbah =ATA_SMART_LBAH_PASS ; tf->command =ATA_CMD_SMART ; - args.tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; -return ide_no_data_taskfile (drive, &args); + cmd.tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; + +return ide_no_data_taskfile (drive, &cmd); }static int get_smart_data (ide_drive_t *drive,u8 *buf,u8 sub_cmd) { -ide_task_t args; -struct ide_taskfile *tf = &args.tf; +struct ide_cmd cmd; +struct ide_taskfile *tf = &cmd.tf; -memset (&args,0 ,sizeof (ide_task_t)); +memset (&cmd,0 ,sizeof (cmd)); tf->feature = sub_cmd; tf->nsect =0x01 ; tf->lbam =ATA_SMART_LBAM_PASS ; tf->lbah =ATA_SMART_LBAH_PASS ; tf->command =ATA_CMD_SMART ; - args.tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; - args.data_phase =TASKFILE_IN ; - (void )smart_enable (drive); -return ide_raw_taskfile (drive, &args, buf,1 ); + cmd.tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; + cmd.protocol =ATA_PROT_PIO ; + +return ide_raw_taskfile (drive, &cmd, buf,1 ); }static int proc_idedisk_read_cache
@@ -67,6 +67,8 @@ static int proc_idedisk_read_smart(char *page, char **start, off_t off,ide_drive_t *drive = (ide_drive_t *)data;int len =0 , i =0 ; + (void )smart_enable (drive); +if (get_smart_data (drive, page, sub_cmd) ==0 ) {unsigned short *val = (unsigned short *) page;char *out = (char *)val +SECTOR_SIZE ;
drivers/ide/ide-dma-sff.c +13 -24
@@ -111,7 +111,7 @@ EXPORT_SYMBOL_GPL(ide_dma_host_set);* May also be invoked from trm290.c */ -int ide_build_dmatable (ide_drive_t *drive,struct request *rq) +int ide_build_dmatable (ide_drive_t *drive,struct ide_cmd *cmd) {ide_hwif_t *hwif = drive->hwif;__le32 *table = (__le32 *)hwif->dmatable_cpu;
@@ -120,11 +120,7 @@ int ide_build_dmatable(ide_drive_t *drive, struct request *rq)struct scatterlist *sg;u8 is_trm290 = !!(hwif->host_flags &IDE_HFLAG_TRM290 ); - hwif->sg_nents =ide_build_sglist (drive, rq); -if (hwif->sg_nents ==0 ) -return 0 ; - -for_each_sg (hwif->sg_table, sg, hwif->sg_nents, i) { +for_each_sg (hwif->sg_table, sg, cmd->sg_nents, i) {u32 cur_addr, cur_len, xcount, bcount; cur_addr =sg_dma_address (sg);
@@ -179,6 +175,7 @@ EXPORT_SYMBOL_GPL(ide_build_dmatable);/** * ide_dma_setup - begin a DMA phase * @drive: target device +* @cmd: command * * Build an IDE DMA PRD (IDE speak for scatter gather table) * and then set up the DMA transfer registers for a device
@@ -189,17 +186,16 @@ EXPORT_SYMBOL_GPL(ide_build_dmatable);* is returned. */ -int ide_dma_setup (ide_drive_t *drive) +int ide_dma_setup (ide_drive_t *drive,struct ide_cmd *cmd) {ide_hwif_t *hwif = drive->hwif; -struct request *rq = hwif->rq; -unsigned int reading =rq_data_dir (rq) ?0 :ATA_DMA_WR ;u8 mmio = (hwif->host_flags &IDE_HFLAG_MMIO ) ?1 :0 ; +u8 rw = (cmd->tf_flags &IDE_TFLAG_WRITE ) ?0 :ATA_DMA_WR ;u8 dma_stat;/* fall back to pio! */ -if (!ide_build_dmatable (drive, rq)) { -ide_map_sg (drive, rq); +if (ide_build_dmatable (drive, cmd) ==0 ) { +ide_map_sg (drive, cmd);return 1 ; }
@@ -212,9 +208,9 @@ int ide_dma_setup(ide_drive_t *drive)/* specify r/w */ if (mmio) -writeb (reading, (void __iomem *)(hwif->dma_base +ATA_DMA_CMD )); +writeb (rw, (void __iomem *)(hwif->dma_base +ATA_DMA_CMD ));else -outb (reading, hwif->dma_base +ATA_DMA_CMD ); +outb (rw, hwif->dma_base +ATA_DMA_CMD );/* read DMA status for INTR & ERROR flags */ dma_stat = hwif->dma_ops->dma_sff_read_status (hwif);
@@ -228,7 +224,7 @@ int ide_dma_setup(ide_drive_t *drive)EXPORT_SYMBOL_GPL (ide_dma_setup);/** -* dma_timer_expiry - handle a DMA timeout +* ide_dma_sff_timer_expiry - handle a DMA timeout * @drive: Drive that timed out * * An IDE DMA transfer timed out. In the event of an error we ask
@@ -241,7 +237,7 @@ EXPORT_SYMBOL_GPL(ide_dma_setup);* This can occur if an interrupt is lost or due to hang or bugs. */ -static int dma_timer_expiry (ide_drive_t *drive) +int ide_dma_sff_timer_expiry (ide_drive_t *drive) {ide_hwif_t *hwif = drive->hwif;u8 dma_stat = hwif->dma_ops->dma_sff_read_status (hwif);
@@ -265,14 +261,7 @@ static int dma_timer_expiry(ide_drive_t *drive)return 0 ;/* Status is unknown -- reset the bus */ } - -void ide_dma_exec_cmd (ide_drive_t *drive,u8 command) -{ -/* issue cmd to drive */ -ide_execute_command (drive, command, &ide_dma_intr,2 *WAIT_CMD , - dma_timer_expiry); -} -EXPORT_SYMBOL_GPL (ide_dma_exec_cmd); +EXPORT_SYMBOL_GPL (ide_dma_sff_timer_expiry);void ide_dma_start (ide_drive_t *drive) {
@@ -346,10 +335,10 @@ EXPORT_SYMBOL_GPL(ide_dma_test_irq);const struct ide_dma_ops sff_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_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_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = ide_dma_timeout, .dma_lost_irq = ide_dma_lost_irq, .dma_sff_read_status = ide_dma_sff_read_status,
drivers/ide/ide-dma.c +22 -17
@@ -96,9 +96,13 @@ ide_startstop_t ide_dma_intr(ide_drive_t *drive)if (OK_STAT (stat,DRIVE_READY , drive->bad_wstat |ATA_DRQ )) {if (!dma_stat) { -struct request *rq = hwif->rq; +struct ide_cmd *cmd = &hwif->cmd; -task_end_request (drive, rq, stat); +if ((cmd->tf_flags &IDE_TFLAG_FS ) ==0 ) +ide_finish_cmd (drive, cmd, stat); +else +ide_complete_rq (drive,0 , + cmd->rq->nr_sectors <<9 );return ide_stopped; } printk(KERN_ERR "%s: %s: bad DMA status (0x%02x)\n",
@@ -106,7 +110,6 @@ ide_startstop_t ide_dma_intr(ide_drive_t *drive) }return ide_error (drive,"dma_intr" , stat); } -EXPORT_SYMBOL_GPL (ide_dma_intr);int ide_dma_good_drive (ide_drive_t *drive) {
@@ -116,7 +119,7 @@ int ide_dma_good_drive(ide_drive_t *drive)/** * ide_build_sglist - map IDE scatter gather for DMA I/O * @drive: the drive to build the DMA table for -* @rq: the request holding the sg list +* @cmd: command * * Perform the DMA mapping magic necessary to access the source or * target buffers of a request via DMA. The lower layers of the
@@ -124,28 +127,29 @@ int ide_dma_good_drive(ide_drive_t *drive)* operate in a portable fashion. */ -int ide_build_sglist (ide_drive_t *drive,struct request *rq) +int ide_build_sglist (ide_drive_t *drive,struct ide_cmd *cmd) {ide_hwif_t *hwif = drive->hwif;struct scatterlist *sg = hwif->sg_table;int i; -ide_map_sg (drive, rq); +ide_map_sg (drive, cmd); -if (rq_data_dir (rq) ==READ ) - hwif->sg_dma_direction =DMA_FROM_DEVICE ; +if (cmd->tf_flags &IDE_TFLAG_WRITE ) + cmd->sg_dma_direction =DMA_TO_DEVICE ;else - hwif->sg_dma_direction =DMA_TO_DEVICE ; - - i =dma_map_sg (hwif->dev, sg, hwif->sg_nents, hwif->sg_dma_direction); -if (i) { - hwif->orig_sg_nents = hwif->sg_nents; - hwif->sg_nents = i; + cmd->sg_dma_direction =DMA_FROM_DEVICE ; + + i =dma_map_sg (hwif->dev, sg, cmd->sg_nents, cmd->sg_dma_direction); +if (i ==0 ) +ide_map_sg (drive, cmd); +else { + cmd->orig_sg_nents = cmd->sg_nents; + cmd->sg_nents = i; }return i; } -EXPORT_SYMBOL_GPL (ide_build_sglist);/** * ide_destroy_dmatable - clean up DMA mapping
@@ -161,9 +165,10 @@ EXPORT_SYMBOL_GPL(ide_build_sglist);void ide_destroy_dmatable (ide_drive_t *drive) {ide_hwif_t *hwif = drive->hwif; +struct ide_cmd *cmd = &hwif->cmd; -dma_unmap_sg (hwif->dev, hwif->sg_table, hwif->orig_sg_nents, - hwif->sg_dma_direction); +dma_unmap_sg (hwif->dev, hwif->sg_table, cmd->orig_sg_nents, + cmd->sg_dma_direction); }EXPORT_SYMBOL_GPL (ide_destroy_dmatable);
drivers/ide/ide-eh.c +21 -9
@@ -123,8 +123,18 @@ ide_startstop_t ide_error(ide_drive_t *drive, const char *msg, u8 stat)/* retry only "normal" I/O: */ if (!blk_fs_request (rq)) { - rq->errors =1 ; -ide_end_drive_cmd (drive, stat, err); +if (rq->cmd_type ==REQ_TYPE_ATA_TASKFILE ) { +struct ide_cmd *cmd = rq->special; + +if (cmd) +ide_complete_cmd (drive, cmd, stat, err); + }else if (blk_pm_request (rq)) { + rq->errors =1 ; +ide_complete_pm_rq (drive, rq); +return ide_stopped; + } + rq->errors = err; +ide_complete_rq (drive, err ? -EIO :0 ,blk_rq_bytes (rq));return ide_stopped; }
@@ -136,8 +146,11 @@ static inline void ide_complete_drive_reset(ide_drive_t *drive, int err) {struct request *rq = drive->hwif->rq; -if (rq &&blk_special_request (rq) && rq->cmd[0 ] ==REQ_DRIVE_RESET ) -ide_end_request (drive, err ? err :1 ,0 ); +if (rq &&blk_special_request (rq) && rq->cmd[0 ] ==REQ_DRIVE_RESET ) { +if (err <=0 && rq->errors ==0 ) + rq->errors = -EIO ; +ide_complete_rq (drive, err ? err :0 ,ide_rq_bytes (rq)); + } }/* needed below */
@@ -162,8 +175,7 @@ static ide_startstop_t atapi_reset_pollfunc(ide_drive_t *drive)printk (KERN_INFO "%s: ATAPI reset complete\n" , drive->name); else {if (time_before (jiffies, hwif->poll_timeout)) { -ide_set_handler (drive, &atapi_reset_pollfunc,HZ /20 , -NULL ); +ide_set_handler (drive, &atapi_reset_pollfunc,HZ /20 );/* continue polling */ return ide_started; }
@@ -225,7 +237,7 @@ static ide_startstop_t reset_pollfunc(ide_drive_t *drive)if (!OK_STAT (tmp,0 ,ATA_BUSY )) {if (time_before (jiffies, hwif->poll_timeout)) { -ide_set_handler (drive, &reset_pollfunc,HZ /20 ,NULL ); +ide_set_handler (drive, &reset_pollfunc,HZ /20 );/* continue polling */ return ide_started; }
@@ -342,7 +354,7 @@ static ide_startstop_t do_reset1(ide_drive_t *drive, int do_not_try_atapi)ndelay (400 ); hwif->poll_timeout = jiffies +WAIT_WORSTCASE ; hwif->polling =1 ; -__ide_set_handler (drive, &atapi_reset_pollfunc,HZ /20 ,NULL ); +__ide_set_handler (drive, &atapi_reset_pollfunc,HZ /20 );spin_unlock_irqrestore (&hwif->lock, flags);return ide_started; }
@@ -402,7 +414,7 @@ static ide_startstop_t do_reset1(ide_drive_t *drive, int do_not_try_atapi)udelay (10 ); hwif->poll_timeout = jiffies +WAIT_WORSTCASE ; hwif->polling =1 ; -__ide_set_handler (drive, &reset_pollfunc,HZ /20 ,NULL ); +__ide_set_handler (drive, &reset_pollfunc,HZ /20 );/* * Some weird controller like resetting themselves to a strange
drivers/ide/ide-floppy.c +64 -92
272 lines not on this page · raw message
drivers/ide/ide-gd.c +2 -8
@@ -145,11 +145,6 @@ static ide_startstop_t ide_gd_do_request(ide_drive_t *drive,return drive->disk_ops->do_request (drive, rq, sector); } -static int ide_gd_end_request (ide_drive_t *drive,int uptodate,int nrsecs) -{ -return drive->disk_ops->end_request (drive, uptodate, nrsecs); -} -static struct ide_driver ide_gd_driver = { .gen_driver = { .owner =THIS_MODULE ,
@@ -162,7 +157,6 @@ static struct ide_driver ide_gd_driver = { .shutdown = ide_gd_shutdown, .version = IDE_GD_VERSION, .do_request = ide_gd_do_request, - .end_request = ide_gd_end_request, #ifdef CONFIG_IDE_PROC_FS .proc_entries = ide_disk_proc_entries, .proc_devsets = ide_disk_proc_devsets,
@@ -182,7 +176,7 @@ static int ide_gd_open(struct block_device *bdev, fmode_t mode) drive = idkp->drive; -ide_debug_log (IDE_DBG_FUNC ,"Call %s\n" , __func__); +ide_debug_log (IDE_DBG_FUNC ,"enter" ); idkp->openers++;
@@ -232,7 +226,7 @@ static int ide_gd_release(struct gendisk *disk, fmode_t mode)struct ide_disk_obj *idkp =ide_drv_g (disk, ide_disk_obj);ide_drive_t *drive = idkp->drive; -ide_debug_log (IDE_DBG_FUNC ,"Call %s\n" , __func__); +ide_debug_log (IDE_DBG_FUNC ,"enter" );if (idkp->openers ==1 ) drive->disk_ops->flush (drive);
drivers/ide/ide-gd.h +1 -3
@@ -8,7 +8,7 @@#define IDE_GD_DEBUG_LOG 0#if IDE_GD_DEBUG_LOG -#define ide_debug_log(lvl, fmt, args...) __ide_debug_log(lvl, fmt, args) +#define ide_debug_log(lvl, fmt, args...) __ide_debug_log(lvl, fmt, ## args)#else #define ide_debug_log(lvl, fmt, args...) do {} while (0)#endif
@@ -20,8 +20,6 @@ struct ide_disk_obj {struct device dev;unsigned int openers;/* protected by BKL for now */ -/* Last failed packet command */ -struct ide_atapi_pc *failed_pc;/* used for blk_{fs,pc}_request() requests */ struct ide_atapi_pc queued_pc;
drivers/ide/ide-generic.c +6 -2
@@ -32,6 +32,10 @@ static int probe_mask;module_param (probe_mask, int,0 );MODULE_PARM_DESC (probe_mask,"probe mask for legacy ISA IDE ports" ); +static const struct ide_port_info ide_generic_port_info = { + .host_flags =IDE_HFLAG_NO_DMA , +}; +static ssize_t store_add (struct class *cls,const char *buf,size_t n) {unsigned int base, ctl;
@@ -46,7 +50,7 @@ static ssize_t store_add(struct class *cls, const char *buf, size_t n) hw.irq = irq; hw.chipset = ide_generic; - rc =ide_host_add (NULL , hws,NULL ); + rc =ide_host_add (&ide_generic_port_info, hws,NULL );if (rc)return rc;
@@ -184,7 +188,7 @@ static int __init ide_generic_init(void)#endif hw.chipset = ide_generic; - rc =ide_host_add (NULL , hws,NULL ); + rc =ide_host_add (&ide_generic_port_info, hws,NULL );if (rc) {release_region (io_addr +0x206 ,1 );release_region (io_addr,8 );
drivers/ide/ide-h8300.c +33 -33
130 lines not on this page · raw message
drivers/ide/ide-io-std.c +40 -33
161 lines not on this page · raw message
drivers/ide/ide-io.c +104 -181
410 lines not on this page · raw message
drivers/ide/ide-ioctls.c +22 -22
44 lines not on this page · raw message
drivers/ide/ide-iops.c +27 -39
66 lines not on this page · raw message
drivers/ide/ide-pm.c +24 -18
42 lines not on this page · raw message
drivers/ide/ide-probe.c +40 -55
95 lines not on this page · raw message
drivers/ide/ide-tape.c +46 -77
123 lines not on this page · raw message
drivers/ide/ide-taskfile.c +205 -243
448 lines not on this page · raw message
drivers/ide/scc_pata.c +53 -62
115 lines not on this page · raw message
drivers/ide/tx4938ide.c +35 -33
68 lines not on this page · raw message
drivers/ide/tx4939ide.c +51 -58
109 lines not on this page · raw message
include/linux/ide.h +126 -113
239 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Quoted 10 lines · Bartlomiej Zolnierkiewicz
Hi,
More "uninteresting" IDE changes:
- make all host drivers use struct
ide_port_info
- sanitize command/request completion API
- replaceide_task_tby structide_cmd
- improve debugging scheme (from Borislav Petkov)
- misc fixes/cleanups
ping?
These changes are not _that_ uninteresting to not apply them. ;)
More importantly they are holding back "part 3"...
Quoted 145 lines
Linus, please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/
to receive the following updates:
arch/m68k/include/asm/ide.h | 73 ------- drivers/ide/alim15x3.c | 9 +- drivers/ide/at91_ide.c | 70 ++++---- drivers/ide/au1xxx-ide.c | 39 +--- drivers/ide/buddha.c | 11 +- drivers/ide/cmd64x.c | 6 +- drivers/ide/cs5536.c | 2 +- drivers/ide/delkin_cb.c | 1 + drivers/ide/dtc2278.c | 3 +- drivers/ide/falconide.c | 45 ++++- drivers/ide/gayle.c | 7 +- drivers/ide/hpt366.c | 6 +- drivers/ide/icside.c | 24 +-- drivers/ide/ide-4drives.c | 3 +- drivers/ide/ide-acpi.c | 10 +- drivers/ide/ide-atapi.c | 123 +++++++----- drivers/ide/ide-cd.c | 155 ++++++++------- drivers/ide/ide-cd.h | 4 +- drivers/ide/ide-cs.c | 1 + drivers/ide/ide-devsets.c | 4 +- drivers/ide/ide-disk.c | 171 ++++++++--------- drivers/ide/ide-disk_proc.c | 28 ++-- drivers/ide/ide-dma-sff.c | 37 ++--- drivers/ide/ide-dma.c | 39 ++-- drivers/ide/ide-eh.c | 30 ++- drivers/ide/ide-floppy.c | 156 ++++++--------- drivers/ide/ide-gd.c | 10 +- drivers/ide/ide-gd.h | 4 +- drivers/ide/ide-generic.c | 8 +- drivers/ide/ide-h8300.c | 66 ++++---- drivers/ide/ide-io-std.c | 73 ++++---- drivers/ide/ide-io.c | 285 ++++++++++----------------- drivers/ide/ide-ioctls.c | 44 ++-- drivers/ide/ide-iops.c | 66 +++---- drivers/ide/ide-lib.c | 20 +- drivers/ide/ide-park.c | 19 +- drivers/ide/ide-pm.c | 42 +++-- drivers/ide/ide-pnp.c | 6 +- drivers/ide/ide-probe.c | 95 ++++------ drivers/ide/ide-proc.c | 16 +- drivers/ide/ide-tape.c | 123 +++++-------- drivers/ide/ide-taskfile.c | 448 ++++++++++++++++++++----------------------- drivers/ide/ide_arm.c | 6 +- drivers/ide/it821x.c | 2 +- drivers/ide/macide.c | 7 +- drivers/ide/ns87415.c | 36 ++-- drivers/ide/palm_bk3710.c | 13 +- drivers/ide/pdc202xx_old.c | 4 +- drivers/ide/pmac.c | 32 +--- drivers/ide/q40ide.c | 15 +- drivers/ide/sc1200.c | 2 +- drivers/ide/scc_pata.c | 115 +++++------ drivers/ide/setup-pci.c | 4 + drivers/ide/sgiioc4.c | 30 +-- drivers/ide/siimage.c | 2 +- drivers/ide/sl82c105.c | 2 +- drivers/ide/tc86c001.c | 2 +- drivers/ide/trm290.c | 15 +- drivers/ide/tx4938ide.c | 68 ++++---- drivers/ide/tx4939ide.c | 109 +++++------ include/linux/ide.h | 239 ++++++++++++----------- 61 files changed, 1418 insertions(+), 1667 deletions(-)Bartlomiej Zolnierkiewicz (67):
icside: use structide_port_infoalso for PCB version 5 (v2)
ide_arm: use structide_port_info
ide-generic: use structide_port_info
ide-pnp: use structide_port_info
buddha: use structide_port_info
macide: use structide_port_info
ide: move ->rqsize init frominit_irq()toide_init_port()
ide: removeIDE_ARCH_INTR(v2)
ide: removeIDE_ARCH_LOCK(v2)
ide: make m68k host drivers useIDE_HFLAG_MMIO
ide: cleanup <asm-m68k/ide.h>
at91_ide: use readsw()/writesw() directly
ide: include <asm/ide.h> only when needed
scc_pata: removeDECLARE_SCC_DEV()macro (v2)
ide: fix memleak on failure inprobe_for_drive()
ide: fix error message inpre_task_out_intr()
ide: allow host drivers to specify IRQ flags
ide: remove now superfluous check fromide_host_register()
ide: addIDE_HFLAG_DTC2278host flag
ide: addIDE_HFLAG_4DRIVEShost flag
ide: add "flagged" taskfile flags to structide_taskfile(v2)
ide: complete power step inide_complete_pm_request()
ide: factor out completion of taskfile fromide_end_drive_cmd()
ide: move request type specific code fromide_end_drive_cmd()to callers (v3)
ide: no need to read Status and Error registers for "empty" taskfile requests
ide: remove ->data_phase field fromide_hwif_t
ide: movesmart_enable()call out fromget_smart_data()
icside:icside_dma_setup()fixes
trm290:trm290_dma_setup()fix
au1xxx-ide:auide_dma_end()cleanup
ide: remove no longer neededPC_FLAG_TIMEDOUTpacket command flag
ide-floppy: remove superfluous check fromide_floppy_end_request()
ide-tape: remove superfluoustape->lock
ide: move ->failed_pc toide_drive_t
ide: use ->end_request only for private device driver requests ide-{floppy,tape}: cleanup ide*_end_request()
ide: remove ->end_request method
ide: return request status from ->pc_callback method
ide: useblk_fs_request()check inide-taskfile.c
ide: callide_build_sglist()prior to ->dma_setup (v2)
ide: removeide_task_ttypedef
ide: pass command instead of request toide_pio_datablock()
ide: move command related fields fromide_hwif_tto structide_cmd
ide: setIDE_TFLAG_WRITEbasing on data phase used inide_taskfile_ioctl()
ide: useata_tf_protocolsenums
ide: merge task_{in,out}_intr()
ide: inlinetask_in_unexpected()intotask_pio_intr()
ide: unify exit paths intask_pio_intr()
ide:task_error()->task_error_cmd()
ide: useide_complete_cmd()for head unload commands
ide: useide_complete_cmd()forREQ_UNPARK_HEADS
ide: sanitizeide_finish_cmd()
ide: makeide_special_rq()BUG()on unknown requests
ide: addide_end_rq()(v2)
ide: sanitizeide_end_rq()
ide: pass error value toide_complete_rq()
ide: moverq->errorsquirk out fromide_end_request()
ide: removeBUG()fromide_complete_rq()
ide: pass number of bytes to complete toide_complete_rq()
ide: useide_end_rq()inide_complete_rq()
ide: removeide_end_request()
ide: pass command toide_map_sg()
ide: usedo_rw_taskfile()forATA_CMD_PACKETcommands
ide: sethwif->expiryprior to calling [__]ide_set_handler()
ide: add ->dma_timer_expiry method and remove ->dma_exec_cmd one (v2)
ide: removeide_execute_pkt_cmd()(v2)
ide: keep track of number of bytes instead of sectors in structide_cmdBorislav Petkov (2):
ide: improve debugging scheme
ide-cd: use ide_drive_t's rq incdrom_queue_request_senseKevin Hilman (1):
IDE:palm_bk3710: use ioremap instead of arch-specificIO_ADDRESS()
[...]