IDE updates part 3
Subsystems (3)
Hi,
Part 3, some interesting stuff this time:
- ide-atapi: build fix for non-x86 archs (Geert Uytterhoeven)
- ide-cd: regression fix, start DMA after issuing a packet command (Borislav Petkov)
- ide-park: regressing fix, correct handling of sleeping devices (Elias Oltmanns)
- ide-pmac: cable detection fix for Apple PowerBook (TOMARI Hisanobu) and fix allowing modular IDE build (Gilles Espinasse)
- ide-{floppy,tape}: bug fix for padding of PIO transfers
- support for CompactFlash specific transfer modes (Sergei Shtylyov)
- struct ide_tp_ops sanitizations (Sergei Shtylyov)
- ide-cd: conversion to use scatterlists also for PIO transfers
- many other fixes/cleanups, detailed changelog below
Linus, please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/
to receive the following updates:
CREDITS | 9 + MAINTAINERS | 15 +- drivers/ide/Kconfig | 33 +-- drivers/ide/Makefile | 2 - drivers/ide/alim15x3.c | 10 +- drivers/ide/at91_ide.c | 39 +-- drivers/ide/au1xxx-ide.c | 26 +-- drivers/ide/cmd64x.c | 6 - drivers/ide/cs5530.c | 3 +- drivers/ide/cs5536.c | 1 - drivers/ide/falconide.c | 4 +- drivers/ide/gayle.c | 12 +- drivers/ide/hpt366.c | 10 +- drivers/ide/ht6560b.c | 20 ++- drivers/ide/icside.c | 8 - drivers/ide/ide-atapi.c | 168 +++++--------- drivers/ide/ide-cd.c | 525 +++++++++++++--------------------------- drivers/ide/ide-disk.c | 4 +- drivers/ide/ide-dma-sff.c | 17 +- drivers/ide/ide-dma.c | 118 ++++++---- drivers/ide/ide-eh.c | 14 +- drivers/ide/ide-floppy.c | 29 +-- drivers/ide/ide-floppy_ioctl.c | 5 +- drivers/ide/ide-generic.c | 86 +------ drivers/ide/ide-h8300.c | 34 +-- drivers/ide/ide-io-std.c | 130 ++++------ drivers/ide/ide-io.c | 27 ++- drivers/ide/ide-iops.c | 41 ++-- drivers/ide/ide-pm.c | 5 +- drivers/ide/ide-probe.c | 31 +-- drivers/ide/ide-tape.c | 36 ++-- drivers/ide/ide-taskfile.c | 96 ++++---- drivers/ide/ide-timings.c | 12 +- drivers/ide/ide-xfer-mode.c | 15 +- drivers/ide/ide_arm.c | 53 ---- drivers/ide/it821x.c | 3 +- drivers/ide/ns87415.c | 85 ++++---- drivers/ide/pdc202xx_old.c | 10 +- drivers/ide/pmac.c | 101 ++++---- drivers/ide/q40ide.c | 4 +- drivers/ide/qd65xx.c | 21 ++- drivers/ide/sc1200.c | 7 +- drivers/ide/scc_pata.c | 56 ++--- drivers/ide/sgiioc4.c | 24 +-- drivers/ide/siimage.c | 1 - drivers/ide/sl82c105.c | 10 +- drivers/ide/tc86c001.c | 1 - drivers/ide/trm290.c | 57 +++-- drivers/ide/tx4938ide.c | 41 +--- drivers/ide/tx4939ide.c | 62 ++---- include/linux/ide.h | 56 ++--- 51 files changed, 847 insertions(+), 1336 deletions(-) delete mode 100644 drivers/ide/ide_arm.c
Bartlomiej Zolnierkiewicz (40):
at91_ide: fix ->ftf_flags handling
ide: add support for arbitrary transfer lengths to ide_pio_bytes()
ide: use PageHighMem() instead of ifdefs in ide_pio_bytes()
ide-cd: remove dead URLs
ide-cd: use ide_end_rq() also for failed non-fs requests
ide-cd: remove dead code from cdrom_decode_status()
ide-cd: remove needless ide_dump_status_no_sense() wrapper
ide-cd: remove no longer needed 'ignore' module parameter
ide-cd: factor out failed request completion from cdrom_end_request()
ide-cd: unify ide_cd_do_request() exit paths
ide-cd: move setting REQ_FAILED flag out from 'end_request' exit path
ide-cd: unify cdrom_newpc_intr() exit paths
ide-cd: remove cdrom_end_request()
ide-cd: kill whole failed request in ide_cd_do_request()
ide-cd: cleanup ide_cd_do_request()
ide-cd: use scatterlists for PIO transfers (fs requests)
ide-cd: fix non-SECTOR_SIZE-multiples PIO transfers for fs requests
ide-cd: merge ide_cd_prepare_rw_request() into cdrom_start_rw()
ide-cd: use scatterlists for PIO transfers (non-fs requests) (v2)
ide-cd: use common completion path for DMA requests in cdrom_newpc_intr()
ide-cd: unify transfer padding in cdrom_newpc_intr()
ide-cd: minor ide_cdrom_setup() cleanup
ide: add ->dma_clear method and remove ->dma_timeout one
ide: inline ide_dma_timeout() into ide_dma_timeout_retry()
ide: destroy DMA mappings after ending DMA (v2)
ide: add ide_dma_prepare() helper
ns87415: use custom ->dma_{start,end} to handle ns87415_prepare_drive()
trm290: use custom ->dma_{start,end} to handle trm290_prepare_drive()
ide: add ->dma_check method
ide: move ide_map_sg() call out of ->dma_setup method (take 2)
ide: set/clear drive->waiting_for_dma flag in the core code
ide: sanitize ide_build_sglist() and ide_destroy_dmatable()
ide-generic: remove no longer needed sysfs interface
ide: merge ide_arm and ide_generic host drivers
ide: fix locking in drive_release_dev()
ide: decrease size of ->pc_buf field in struct ide_atapi_pc
ide: remove CONFIG_BLK_DEV_IDEDOUBLER config option ide-{floppy,tape}: fix padding for PIO transfers
ide-floppy: use ide_pio_bytes()
MAINTAINERS: move old ide-{floppy,tape} entries to CREDITS (take 2)
Borislav Petkov (2):
ide-atapi: start DMA after issuing a packet command
ide-floppy: do not complete rq's prematurely
Elias Oltmanns (1):
ide: Fix code dealing with sleeping devices in do_ide_request()
Geert Uytterhoeven (1):
ide: drivers/ide/ide-atapi.c needs <linux/scatterlist.h>
Gilles Espinasse (1):
ide: be able to build pmac driver without IDE built-in
Sergei Shtylyov (13):
au1xxx-ide: auide_{in|out}sw() should be static
ide: identify data word 53 bit 1 doesn't cover words 62 and 63 (take 3)
ide-iops: only clear DMA words on setting DMA mode
ide: add support for CFA specified transfer modes (take 3)
ide-disk: use ATA_ERR
ide: use ATA_HOB
ide: turn set_irq() method into write_devctl() method
ide: rename IDE_TFLAG_IN_[HOB_]FEATURE
ide-io-std: shorten ide_{in|out}put_data()
ide: call {in|out}put_data() methods from tf_{read|load}() methods (take 2)
ide: move data register access out of tf_{read|load}() methods (take 2)
ide: turn selectproc() method into dev_select() method (take 5)
ide: inline SELECT_DRIVE()
TOMARI Hisanobu (1):
ide-pmac: IDE cable detection on Apple PowerBook
CREDITS +9 -0
@@ -495,6 +495,11 @@ S: Kopmansg 2 S: 411 13 Goteborg S: Sweden +N: Paul Bristow +E: [email protected] +W: http://paulbristow.net/linux/idefloppy.html +D: Maintainer of IDE/ATAPI floppy driver + N: Dominik Brodowski E: [email protected] W: http://www.brodo.de/
@@ -2642,6 +2647,10 @@ S: C/ Mieses 20, 9-B S: Valladolid 47009 S: Spain +N: Gadi Oxman +E: [email protected] +D: Original author and maintainer of IDE/ATAPI floppy/tape drivers + N: Greg Page E: [email protected] D: IPX development and support
MAINTAINERS +1 -14
@@ -2201,25 +2201,12 @@ L: [email protected] T: quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/ S: Maintained -IDE/ATAPI CDROM DRIVER +IDE/ATAPI DRIVERS P: Borislav Petkov M: [email protected] L: [email protected] S: Maintained -IDE/ATAPI FLOPPY DRIVERS -P: Paul Bristow -M: Paul Bristow <[email protected]> -W: http://paulbristow.net/linux/idefloppy.html -L: [email protected] -S: Maintained - -IDE/ATAPI TAPE DRIVERS -P: Gadi Oxman -M: Gadi Oxman <[email protected]> -L: [email protected] -S: Maintained - IDLE-I7300 P: Andy Henroid M: [email protected]
drivers/ide/Kconfig +11 -22
@@ -222,7 +222,8 @@ comment "IDE chipset support/bugfixes" config IDE_GENERIC tristate "generic/default IDE chipset support" - depends on ALPHA || X86 || IA64 || M32R || MIPS + depends on ALPHA || X86 || IA64 || M32R || MIPS || ARCH_RPC || ARCH_SHARK + default ARM && (ARCH_RPC || ARCH_SHARK) help This is the generic IDE driver. This driver attaches to the fixed legacy ports (e.g. on PCs 0x1f0/0x170, 0x1e8/0x168 and
@@ -680,7 +681,7 @@ endif # TODO: BLK_DEV_IDEDMA_PCI -> BLK_DEV_IDEDMA_SFF config BLK_DEV_IDE_PMAC tristate "PowerMac on-board IDE support" - depends on PPC_PMAC && IDE=y + depends on PPC_PMAC select IDE_TIMINGS select BLK_DEV_IDEDMA_PCI help
@@ -731,11 +732,6 @@ config BLK_DEV_IDE_AT91 depends on ARM && ARCH_AT91 && !ARCH_AT91RM9200 && !ARCH_AT91X40 select IDE_TIMINGS -config IDE_ARM - tristate "ARM IDE support" - depends on ARM && (ARCH_RPC || ARCH_SHARK) - default y - config BLK_DEV_IDE_ICSIDE tristate "ICS IDE interface support" depends on ARM && ARCH_ACORN
@@ -774,27 +770,20 @@ config BLK_DEV_GAYLE This includes on-board IDE interfaces on some Amiga models (A600, A1200, A4000, and A4000T), and IDE interfaces on the Zorro expansion bus (M-Tech E-Matrix 530 expansion card). - Say Y if you have an Amiga with a Gayle IDE interface and want to use - IDE devices (hard disks, CD-ROM drives, etc.) that are connected to - it. - Note that you also have to enable Zorro bus support if you want to - use Gayle IDE interfaces on the Zorro expansion bus. -config BLK_DEV_IDEDOUBLER - bool "Amiga IDE Doubler support (EXPERIMENTAL)" - depends on BLK_DEV_GAYLE && EXPERIMENTAL - ---help--- - This feature provides support for the so-called `IDE doublers' (made + It also provides support for the so-called `IDE doublers' (made by various manufacturers, e.g. Eyetech) that can be connected to the on-board IDE interface of some Amiga models. Using such an IDE doubler, you can connect up to four instead of two IDE devices to - the Amiga's on-board IDE interface. + the Amiga's on-board IDE interface. The feature is enabled at kernel + runtime using the "gayle.doubler" kernel boot parameter. - Note that the normal Amiga Gayle IDE driver may not work correctly - if you have an IDE doubler and don't enable this feature! + Say Y if you have an Amiga with a Gayle IDE interface and want to use + IDE devices (hard disks, CD-ROM drives, etc.) that are connected to + it. - Say Y if you have an IDE doubler. The feature is enabled at kernel - runtime using the "gayle.doubler" kernel boot parameter. + Note that you also have to enable Zorro bus support if you want to + use Gayle IDE interfaces on the Zorro expansion bus. config BLK_DEV_BUDDHA tristate "Buddha/Catweasel/X-Surf IDE interface support (EXPERIMENTAL)"
drivers/ide/Makefile +0 -2
@@ -21,8 +21,6 @@ ide-core-$(CONFIG_IDE_LEGACY) += ide-legacy.o obj-$(CONFIG_IDE) += ide-core.o -obj-$(CONFIG_IDE_ARM) += ide_arm.o - obj-$(CONFIG_BLK_DEV_ALI14XX) += ali14xx.o obj-$(CONFIG_BLK_DEV_UMC8672) += umc8672.o obj-$(CONFIG_BLK_DEV_DTC2278) += dtc2278.o
drivers/ide/alim15x3.c +5 -5
@@ -189,20 +189,20 @@ static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed) }/** -* ali15x3_dma_setup - begin a DMA phase +* ali_dma_check - DMA check * @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,struct ide_cmd *cmd) +static int ali_dma_check (ide_drive_t *drive,struct ide_cmd *cmd) {if (m5229_revision <0xC2 && drive->media != ide_disk) {if (cmd->tf_flags &IDE_TFLAG_WRITE )return 1 ;/* try PIO instead of DMA */ } -return ide_dma_setup (drive, cmd); +return 0 ; }/**
@@ -503,13 +503,13 @@ 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_setup = ide_dma_setup, .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_check = ali_dma_check, .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 +13 -26
@@ -192,15 +192,9 @@ static void at91_ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)struct ide_taskfile *tf = &cmd->tf;u8 HIHI = (cmd->tf_flags &IDE_TFLAG_LBA48 ) ?0xE0 :0xEF ; -if (cmd->tf_flags &IDE_FTFLAG_FLAGGED ) +if (cmd->ftf_flags &IDE_FTFLAG_FLAGGED )HIHI =0xFF ; -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 (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 )
@@ -233,19 +227,11 @@ static void at91_ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)struct ide_io_ports *io_ports = &hwif->io_ports;struct ide_taskfile *tf = &cmd->tf; -if (cmd->tf_flags &IDE_FTFLAG_IN_DATA ) { -u16 data; - -at91_ide_input_data (drive,NULL , &data,2 ); - tf->data = data &0xff ; - tf->hob_data = (data >>8 ) &0xff ; - } -/* be sure we're looking at the low order bits */ -ide_mm_outb (ATA_DEVCTL_OBS & ~0x80 , io_ports->ctl_addr); +ide_mm_outb (ATA_DEVCTL_OBS , io_ports->ctl_addr); -if (cmd->tf_flags &IDE_TFLAG_IN_FEATURE ) - tf->feature =ide_mm_inb (io_ports->feature_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 )
@@ -258,18 +244,18 @@ static void at91_ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) tf->device =ide_mm_inb (io_ports->device_addr);if (cmd->tf_flags &IDE_TFLAG_LBA48 ) { -ide_mm_outb (ATA_DEVCTL_OBS |0x80 , io_ports->ctl_addr); +ide_mm_outb (ATA_HOB |ATA_DEVCTL_OBS , io_ports->ctl_addr); -if (cmd->tf_flags &IDE_TFLAG_IN_HOB_FEATURE ) - tf->hob_feature =ide_mm_inb (io_ports->feature_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); + 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); + 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); + 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); + tf->hob_lbah =ide_mm_inb (io_ports->lbah_addr); } }
@@ -295,8 +281,9 @@ static const struct ide_tp_ops at91_ide_tp_ops = { .exec_command = ide_exec_command, .read_status = ide_read_status, .read_altstatus = ide_read_altstatus, - .set_irq = ide_set_irq, + .write_devctl = ide_write_devctl, + .dev_select = ide_dev_select, .tf_load = at91_ide_tf_load, .tf_read = at91_ide_tf_read,
drivers/ide/au1xxx-ide.c +6 -20
@@ -50,7 +50,7 @@ static _auide_hwif auide_hwif;#if defined(CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA ) -void auide_insw (unsigned long port,void *addr,u32 count) +static inline void auide_insw (unsigned long port,void *addr,u32 count) {_auide_hwif *ahwif = &auide_hwif;chan_tab_t *ctp;
@@ -68,7 +68,7 @@ void auide_insw(unsigned long port, void *addr, u32 count) ctp->cur_ptr =au1xxx_ddma_get_nextptr_virt (dp); } -void auide_outsw (unsigned long port,void *addr,u32 count) +static inline void auide_outsw (unsigned long port,void *addr,u32 count) {_auide_hwif *ahwif = &auide_hwif;chan_tab_t *ctp;
@@ -236,7 +236,7 @@ static int auide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)if (++count >=PRD_ENTRIES ) {printk (KERN_WARNING "%s: DMA table too small\n" , drive->name); - goto use_pio_instead; +return 0 ; }/* Lets enable intr for the last descriptor only */
@@ -272,16 +272,11 @@ static int auide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)if (count)return 1 ; - use_pio_instead: -ide_destroy_dmatable (drive); -return 0 ;/* revert to PIO for this request */ }static int auide_dma_end (ide_drive_t *drive) { -ide_destroy_dmatable (drive); -return 0 ; }
@@ -292,12 +287,9 @@ static void auide_dma_start(ide_drive_t *drive )static int auide_dma_setup (ide_drive_t *drive,struct ide_cmd *cmd) { -if (auide_build_dmatable (drive, cmd) ==0 ) { -ide_map_sg (drive, cmd); +if (auide_build_dmatable (drive, cmd) ==0 )return 1 ; - } - drive->waiting_for_dma =1 ;return 0 ; }
@@ -322,16 +314,11 @@ static void auide_dma_host_set(ide_drive_t *drive, int on)static void auide_ddma_tx_callback (int irq,void *param) { -_auide_hwif *ahwif = (_auide_hwif *)param; - ahwif->drive->waiting_for_dma =0 ; }static void auide_ddma_rx_callback (int irq,void *param) { -_auide_hwif *ahwif = (_auide_hwif *)param; - ahwif->drive->waiting_for_dma =0 ; } -#endif /* end CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */ static void auide_init_dbdma_dev (dbdev_tab_t *dev,u32 dev_id,u32 tsize,u32 devwidth,u32 flags)
@@ -353,7 +340,6 @@ static const struct ide_dma_ops au1xxx_dma_ops = { .dma_end = auide_dma_end, .dma_test_irq = auide_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, - .dma_timeout = ide_dma_timeout, };static int auide_ddma_init (ide_hwif_t *hwif,const struct ide_port_info *d)
@@ -481,9 +467,9 @@ static const struct ide_tp_ops au1xxx_tp_ops = { .exec_command = ide_exec_command, .read_status = ide_read_status, .read_altstatus = ide_read_altstatus, + .write_devctl = ide_write_devctl, - .set_irq = ide_set_irq, - + .dev_select = ide_dev_select, .tf_load = ide_tf_load, .tf_read = ide_tf_read,
drivers/ide/cmd64x.c +0 -6
@@ -318,7 +318,6 @@ static int cmd646_1_dma_end(ide_drive_t *drive)ide_hwif_t *hwif = drive->hwif;u8 dma_stat =0 , dma_cmd =0 ; - drive->waiting_for_dma =0 ;/* get DMA status */ dma_stat =inb (hwif->dma_base +ATA_DMA_STATUS );/* read DMA command state */
@@ -327,8 +326,6 @@ static int cmd646_1_dma_end(ide_drive_t *drive)outb (dma_cmd & ~1 , hwif->dma_base +ATA_DMA_CMD );/* clear the INTR & ERROR bits */ outb (dma_stat |6 , hwif->dma_base +ATA_DMA_STATUS ); -/* and free any DMA resources */ -ide_destroy_dmatable (drive);/* verify good DMA status */ return (dma_stat &7 ) !=4 ; }
@@ -384,7 +381,6 @@ static const struct ide_dma_ops cmd64x_dma_ops = { .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, };
@@ -396,7 +392,6 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = { .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, };
@@ -408,7 +403,6 @@ static const struct ide_dma_ops cmd648_dma_ops = { .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/cs5530.c +1 -2
@@ -92,8 +92,7 @@ static u8 cs5530_udma_filter(ide_drive_t *drive)if ((mateid[ATA_ID_FIELD_VALID ] &4 ) && (mateid[ATA_ID_UDMA_MODES ] &7 )) goto out; -if ((mateid[ATA_ID_FIELD_VALID ] &2 ) && - (mateid[ATA_ID_MWDMA_MODES ] &7 )) +if (mateid[ATA_ID_MWDMA_MODES ] &7 ) mask =0 ; } out:
drivers/ide/cs5536.c +0 -1
@@ -236,7 +236,6 @@ static const struct ide_dma_ops cs5536_dma_ops = { .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, };static const struct ide_port_info cs5536_info = {
drivers/ide/falconide.c +2 -2
@@ -89,9 +89,9 @@ static const struct ide_tp_ops falconide_tp_ops = { .exec_command = ide_exec_command, .read_status = ide_read_status, .read_altstatus = ide_read_altstatus, + .write_devctl = ide_write_devctl, - .set_irq = ide_set_irq, - + .dev_select = ide_dev_select, .tf_load = ide_tf_load, .tf_read = ide_tf_read,
drivers/ide/gayle.c +1 -11
@@ -53,11 +53,6 @@#define GAYLE_NEXT_PORT 0x1000 -#ifndef CONFIG_BLK_DEV_IDEDOUBLER -#define GAYLE_NUM_HWIFS 1 -#define GAYLE_NUM_PROBE_HWIFS GAYLE_NUM_HWIFS -#define GAYLE_HAS_CONTROL_REG 1 -#else /* CONFIG_BLK_DEV_IDEDOUBLER */ #define GAYLE_NUM_HWIFS 2#define GAYLE_NUM_PROBE_HWIFS (ide_doubler ? GAYLE_NUM_HWIFS : \ GAYLE_NUM_HWIFS-1)
@@ -66,8 +61,6 @@static int ide_doubler;module_param_named (doubler, ide_doubler, bool,0 );MODULE_PARM_DESC (doubler,"enable support for IDE doublers" ); -#endif /* CONFIG_BLK_DEV_IDEDOUBLER */ -/* * Check and acknowledge the interrupt status
@@ -151,10 +144,7 @@ static int __init gayle_init(void) found:printk (KERN_INFO "ide: Gayle IDE controller (A%d style%s)\n" , a4000 ?4000 :1200 , -#ifdef CONFIG_BLK_DEV_IDEDOUBLER - ide_doubler ?", IDE doubler" : -#endif -"" ); + ide_doubler ?", IDE doubler" :"" );if (a4000) { phys_base =GAYLE_BASE_4000 ;
drivers/ide/hpt366.c +1 -9
@@ -835,12 +835,6 @@ static int hpt370_dma_end(ide_drive_t *drive)return ide_dma_end (drive); } -static void hpt370_dma_timeout (ide_drive_t *drive) -{ -hpt370_irq_timeout (drive); -ide_dma_timeout (drive); -} -/* returns 1 if DMA IRQ issued, 0 otherwise */ static int hpt374_dma_test_irq (ide_drive_t *drive) {
@@ -1423,7 +1417,6 @@ static const struct ide_dma_ops hpt37x_dma_ops = { .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, };
@@ -1435,7 +1428,7 @@ static const struct ide_dma_ops hpt370_dma_ops = { .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_clear = hpt370_irq_timeout, .dma_sff_read_status = ide_dma_sff_read_status, };
@@ -1447,7 +1440,6 @@ static const struct ide_dma_ops hpt36x_dma_ops = { .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/ht6560b.c +18 -2
@@ -103,7 +103,7 @@/* * This routine is invoked from ide.c to prepare for access to a given drive. */ -static void ht6560b_selectproc (ide_drive_t *drive) +static void ht6560b_dev_select (ide_drive_t *drive) {ide_hwif_t *hwif = drive->hwif;unsigned long flags;
@@ -143,6 +143,8 @@ static void ht6560b_selectproc (ide_drive_t *drive)#endif }local_irq_restore (flags); + +outb (drive->select |ATA_DEVICE_OBS , hwif->io_ports.device_addr); }/*
@@ -305,15 +307,29 @@ static int probe_ht6560b;module_param_named (probe, probe_ht6560b, bool,0 );MODULE_PARM_DESC (probe,"probe for HT6560B chipset" ); +static const struct ide_tp_ops ht6560b_tp_ops = { + .exec_command = ide_exec_command, + .read_status = ide_read_status, + .read_altstatus = ide_read_altstatus, + .write_devctl = ide_write_devctl, + + .dev_select = ht6560b_dev_select, + .tf_load = ide_tf_load, + .tf_read = ide_tf_read, + + .input_data = ide_input_data, + .output_data = ide_output_data, +}; +static const struct ide_port_ops ht6560b_port_ops = { .init_dev = ht6560b_init_dev, .set_pio_mode = ht6560b_set_pio_mode, - .selectproc = ht6560b_selectproc, };static const struct ide_port_info ht6560b_port_info__initdata = { .name =DRV_NAME , .chipset = ide_ht6560b, + .tp_ops = &ht6560b_tp_ops, .port_ops = &ht6560b_port_ops, .host_flags =IDE_HFLAG_SERIALIZE |/* is this needed? */ IDE_HFLAG_NO_DMA |
drivers/ide/icside.c +0 -8
@@ -287,13 +287,8 @@ static int icside_dma_end(ide_drive_t *drive)ide_hwif_t *hwif = drive->hwif;struct expansion_card *ec =ECARD_DEV (hwif->dev); - drive->waiting_for_dma =0 ; -disable_dma (ec->dma); -/* Teardown mappings after DMA has completed. */ -ide_destroy_dmatable (drive); -return get_dma_residue (ec->dma) !=0 ; }
@@ -346,8 +341,6 @@ static int icside_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)set_dma_sg (ec->dma, hwif->sg_table, cmd->sg_nents);set_dma_mode (ec->dma, dma_mode); - drive->waiting_for_dma =1 ; -return 0 ; }
@@ -377,7 +370,6 @@ static const struct ide_dma_ops icside_v6_dma_ops = { .dma_start = icside_dma_start, .dma_end = icside_dma_end, .dma_test_irq = icside_dma_test_irq, - .dma_timeout = ide_dma_timeout, .dma_lost_irq = ide_dma_lost_irq, };#else
drivers/ide/ide-atapi.c +55 -113
261 lines not on this page · raw message
drivers/ide/ide-cd.c +168 -357
789 lines not on this page · raw message
drivers/ide/ide-disk.c +2 -2
@@ -227,7 +227,7 @@ static u64 idedisk_read_native_max_address(ide_drive_t *drive, int lba48)ide_no_data_taskfile (drive, &cmd);/* if OK, compute maximum address value */ -if ((tf->status &0x01 ) ==0 ) +if (!(tf->status &ATA_ERR )) addr =ide_get_lba_addr (tf, lba48) +1 ;return addr;
@@ -267,7 +267,7 @@ static u64 idedisk_set_max_address(ide_drive_t *drive, u64 addr_req, int lba48)ide_no_data_taskfile (drive, &cmd);/* if OK, compute maximum address value */ -if ((tf->status &0x01 ) ==0 ) +if (!(tf->status &ATA_ERR )) addr_set =ide_get_lba_addr (tf, lba48) +1 ;return addr_set;
drivers/ide/ide-dma-sff.c +4 -13
@@ -38,10 +38,9 @@ int config_drive_for_dma(ide_drive_t *drive)* Enable DMA on any drive that has mode2 DMA * (multi or single) enabled */ -if (id[ATA_ID_FIELD_VALID ] &2 )/* regular DMA */ -if ((id[ATA_ID_MWDMA_MODES ] &0x404 ) ==0x404 || - (id[ATA_ID_SWDMA_MODES ] &0x404 ) ==0x404 ) -return 1 ; +if ((id[ATA_ID_MWDMA_MODES ] &0x404 ) ==0x404 || + (id[ATA_ID_SWDMA_MODES ] &0x404 ) ==0x404 ) +return 1 ;/* Consult the list of known "good" drives */ if (ide_dma_good_drive (drive))
@@ -166,8 +165,6 @@ use_pio_instead:printk (KERN_ERR "%s: %s\n" , drive->name, count ?"DMA table too small" :"empty DMA table?" ); -ide_destroy_dmatable (drive); -return 0 ;/* revert to PIO for this request */ }EXPORT_SYMBOL_GPL (ide_build_dmatable);
@@ -218,7 +215,6 @@ int ide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)/* clear INTR & ERROR flags */ ide_dma_sff_write_status (hwif, dma_stat |ATA_DMA_ERR |ATA_DMA_INTR ); - drive->waiting_for_dma =1 ;return 0 ; }EXPORT_SYMBOL_GPL (ide_dma_setup);
@@ -292,8 +288,6 @@ int ide_dma_end(ide_drive_t *drive)ide_hwif_t *hwif = drive->hwif;u8 dma_stat =0 , dma_cmd =0 , mask; - drive->waiting_for_dma =0 ; -/* stop DMA */ if (hwif->host_flags &IDE_HFLAG_MMIO ) { dma_cmd =readb ((void __iomem *)(hwif->dma_base +ATA_DMA_CMD ));
@@ -310,8 +304,6 @@ int ide_dma_end(ide_drive_t *drive)/* clear INTR & ERROR bits */ ide_dma_sff_write_status (hwif, dma_stat |ATA_DMA_ERR |ATA_DMA_INTR ); -/* purge DMA mappings */ -ide_destroy_dmatable (drive);wmb ();/* verify good DMA status */
@@ -338,9 +330,8 @@ const struct ide_dma_ops sff_dma_ops = { .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_timer_expiry = ide_dma_sff_timer_expiry, .dma_sff_read_status = ide_dma_sff_read_status, };EXPORT_SYMBOL_GPL (sff_dma_ops);
drivers/ide/ide-dma.c +69 -49
228 lines not on this page · raw message
drivers/ide/ide-eh.c +7 -7
@@ -165,11 +165,12 @@ static ide_startstop_t do_reset1(ide_drive_t *, int);static ide_startstop_t atapi_reset_pollfunc (ide_drive_t *drive) {ide_hwif_t *hwif = drive->hwif; +const struct ide_tp_ops *tp_ops = hwif->tp_ops;u8 stat; -SELECT_DRIVE (drive); + tp_ops->dev_select (drive);udelay (10 ); - stat = hwif->tp_ops->read_status (hwif); + stat = tp_ops->read_status (hwif);if (OK_STAT (stat,0 ,ATA_BUSY ))printk (KERN_INFO "%s: ATAPI reset complete\n" , drive->name);
@@ -348,7 +349,7 @@ static ide_startstop_t do_reset1(ide_drive_t *drive, int do_not_try_atapi)/* For an ATAPI device, first try an ATAPI SRST. */ if (drive->media != ide_disk && !do_not_try_atapi) {pre_reset (drive); -SELECT_DRIVE (drive); + tp_ops->dev_select (drive);udelay (20 ); tp_ops->exec_command (hwif,ATA_CMD_DEV_RESET );ndelay (400 );
@@ -401,15 +402,14 @@ static ide_startstop_t do_reset1(ide_drive_t *drive, int do_not_try_atapi)* immediate interrupt due to the edge transition it produces. * This single interrupt gives us a "fast poll" for drives that * recover from reset very quickly, saving us the first 50ms wait time. -* -* TODO: add ->softreset method and stop abusing ->set_irq */ /* set SRST and nIEN */ - tp_ops->set_irq (hwif,4 ); + tp_ops->write_devctl (hwif,ATA_SRST |ATA_NIEN |ATA_DEVCTL_OBS );/* more than enough time */ udelay (10 );/* clear SRST, leave nIEN (unless device is on the quirk list) */ - tp_ops->set_irq (hwif, drive->quirk_list ==2 ); + tp_ops->write_devctl (hwif, (drive->quirk_list ==2 ?0 :ATA_NIEN ) | +ATA_DEVCTL_OBS );/* more than enough time */ udelay (10 ); hwif->poll_timeout = jiffies +WAIT_WORSTCASE ;
drivers/ide/ide-floppy.c +9 -20
@@ -61,16 +61,6 @@*/ #define IDEFLOPPY_PC_DELAY (HZ/20)/* default delay for ZIP 100 (50ms) */ -static void idefloppy_update_buffers (ide_drive_t *drive, -struct ide_atapi_pc *pc) -{ -struct request *rq = pc->rq; -struct bio *bio = rq->bio; - -while ((bio = rq->bio) !=NULL ) -ide_complete_rq (drive,0 ,ide_rq_bytes (rq)); -} -static int ide_floppy_callback (ide_drive_t *drive,int dsc) {struct ide_disk_obj *floppy = drive->driver_data;
@@ -213,7 +203,6 @@ static void idefloppy_create_rw_cmd(ide_drive_t *drive,memcpy (rq->cmd, pc->c,12 ); pc->rq = rq; - pc->b_count =0 ;if (rq->cmd_flags &REQ_RW ) pc->flags |=PC_FLAG_WRITING ; pc->buf =NULL ;
@@ -227,7 +216,6 @@ static void idefloppy_blockpc_cmd(struct ide_disk_obj *floppy,ide_init_pc (pc);memcpy (pc->c, rq->cmd,sizeof (pc->c)); pc->rq = rq; - pc->b_count =0 ;if (rq->data_len &&rq_data_dir (rq) ==WRITE ) pc->flags |=PC_FLAG_WRITING ; pc->buf = rq->data;
@@ -244,10 +232,11 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive, struct request *rq, sector_t block) {struct ide_disk_obj *floppy = drive->driver_data; -ide_hwif_t *hwif = drive->hwif;struct ide_cmd cmd;struct ide_atapi_pc *pc; +ide_debug_log (IDE_DBG_FUNC ,"enter, cmd: 0x%x\n" , rq->cmd[0 ]); +if (drive->debug_mask &IDE_DBG_RQ ) blk_dump_rq_flags(rq, (rq->rq_disk ? rq->rq_disk->disk_name
@@ -294,13 +283,10 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive, cmd.rq = rq;if (blk_fs_request (rq) || pc->req_xfer) { -ide_init_sg_cmd (&cmd, rq->nr_sectors <<9 ); +ide_init_sg_cmd (&cmd, pc->req_xfer);ide_map_sg (drive, &cmd); } - pc->sg = hwif->sg_table; - pc->sg_cnt = cmd.sg_nents; - pc->rq = rq;return ide_floppy_issue_pc (drive, &cmd, pc);
@@ -385,9 +371,11 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)struct gendisk *disk = floppy->disk;struct ide_atapi_pc pc;u8 *cap_desc; -u8 header_len, desc_cnt; +u8 pc_buf[256 ], header_len, desc_cnt;int i, rc =1 , blocks, length; +ide_debug_log (IDE_DBG_FUNC ,"enter" ); + drive->bios_cyl =0 ; drive->bios_head = drive->bios_sect =0 ; floppy->blocks =0 ;
@@ -395,6 +383,9 @@ static int ide_floppy_get_capacity(ide_drive_t *drive) drive->capacity64 =0 ;ide_floppy_create_read_capacity_cmd (&pc); + pc.buf = &pc_buf[0 ]; + pc.buf_size =sizeof (pc_buf); +if (ide_queue_pc_tail (drive, disk, &pc)) { printk(KERN_ERR PFX "Can't get floppy parameters\n");return 1 ;
@@ -485,8 +476,6 @@ static void ide_floppy_setup(ide_drive_t *drive)u16 *id = drive->id; drive->pc_callback = ide_floppy_callback; - drive->pc_update_buffers = idefloppy_update_buffers; - drive->pc_io_buffers = ide_io_buffers;/* * We used to check revisions here. At this point however I'm giving up.
drivers/ide/ide-floppy_ioctl.c +4 -1
@@ -36,9 +36,9 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive, int __user *arg) {struct ide_disk_obj *floppy = drive->driver_data; -u8 header_len, desc_cnt;int i, blocks, length, u_array_size, u_index;int __user *argp; +u8 pc_buf[256 ], header_len, desc_cnt;if (get_user (u_array_size, arg))return -EFAULT ;
@@ -47,6 +47,9 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive,return -EINVAL ;ide_floppy_create_read_capacity_cmd (pc); + pc->buf = &pc_buf[0 ]; + pc->buf_size =sizeof (pc_buf); +if (ide_queue_pc_tail (drive, floppy->disk, pc)) {printk (KERN_ERR "ide-floppy: Can't get floppy parameters\n" );return -EIO ;
drivers/ide/ide-generic.c +14 -72
149 lines not on this page · raw message
drivers/ide/ide-h8300.c +12 -22
@@ -54,9 +54,6 @@ static void h8300_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)if (cmd->ftf_flags &IDE_FTFLAG_FLAGGED )HIHI =0xFF ; -if (cmd->ftf_flags &IDE_FTFLAG_OUT_DATA ) -mm_outw ((tf->hob_data <<8 ) | tf->data, io_ports->data_addr); -if (cmd->tf_flags &IDE_TFLAG_OUT_HOB_FEATURE )outb (tf->hob_feature, io_ports->feature_addr);if (cmd->tf_flags &IDE_TFLAG_OUT_HOB_NSECT )
@@ -90,18 +87,11 @@ static void h8300_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)struct ide_io_ports *io_ports = &hwif->io_ports;struct ide_taskfile *tf = &cmd->tf; -if (cmd->ftf_flags &IDE_FTFLAG_IN_DATA ) { -u16 data =mm_inw (io_ports->data_addr); - - tf->data = data &0xff ; - tf->hob_data = (data >>8 ) &0xff ; - } -/* be sure we're looking at the low order bits */ -outb (ATA_DEVCTL_OBS & ~0x80 , io_ports->ctl_addr); +outb (ATA_DEVCTL_OBS , io_ports->ctl_addr); -if (cmd->tf_flags &IDE_TFLAG_IN_FEATURE ) - tf->feature =inb (io_ports->feature_addr); +if (cmd->tf_flags &IDE_TFLAG_IN_ERROR ) + tf->error =inb (io_ports->feature_addr);if (cmd->tf_flags &IDE_TFLAG_IN_NSECT ) tf->nsect =inb (io_ports->nsect_addr);if (cmd->tf_flags &IDE_TFLAG_IN_LBAL )
@@ -114,18 +104,18 @@ static void h8300_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) tf->device =inb (io_ports->device_addr);if (cmd->tf_flags &IDE_TFLAG_LBA48 ) { -outb (ATA_DEVCTL_OBS |0x80 , io_ports->ctl_addr); +outb (ATA_HOB |ATA_DEVCTL_OBS , io_ports->ctl_addr); -if (cmd->tf_flags &IDE_TFLAG_IN_HOB_FEATURE ) - tf->hob_feature =inb (io_ports->feature_addr); +if (cmd->tf_flags &IDE_TFLAG_IN_HOB_ERROR ) + tf->hob_error =inb (io_ports->feature_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_NSECT ) - tf->hob_nsect =inb (io_ports->nsect_addr); + tf->hob_nsect =inb (io_ports->nsect_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAL ) - tf->hob_lbal =inb (io_ports->lbal_addr); + tf->hob_lbal =inb (io_ports->lbal_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAM ) - tf->hob_lbam =inb (io_ports->lbam_addr); + tf->hob_lbam =inb (io_ports->lbam_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAH ) - tf->hob_lbah =inb (io_ports->lbah_addr); + tf->hob_lbah =inb (io_ports->lbah_addr); } }
@@ -159,9 +149,9 @@ static const struct ide_tp_ops h8300_tp_ops = { .exec_command = ide_exec_command, .read_status = ide_read_status, .read_altstatus = ide_read_altstatus, + .write_devctl = ide_write_devctl, - .set_irq = ide_set_irq, - + .dev_select = ide_dev_select, .tf_load = h8300_tf_load, .tf_read = h8300_tf_read,
drivers/ide/ide-io-std.c +54 -76
218 lines not on this page · raw message
drivers/ide/ide-io.c +19 -8
@@ -73,6 +73,7 @@ EXPORT_SYMBOL_GPL(ide_end_rq);void ide_complete_cmd (ide_drive_t *drive,struct ide_cmd *cmd,u8 stat,u8 err) { +const struct ide_tp_ops *tp_ops = drive->hwif->tp_ops;struct ide_taskfile *tf = &cmd->tf;struct request *rq = cmd->rq;u8 tf_cmd = tf->command;
@@ -80,7 +81,16 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err) tf->error = err; tf->status = stat; - drive->hwif->tp_ops->tf_read (drive, cmd); +if (cmd->ftf_flags &IDE_FTFLAG_IN_DATA ) { +u8 data[2 ]; + + tp_ops->input_data (drive, cmd, data,2 ); + + tf->data = data[0 ]; + tf->hob_data = data[1 ]; + } + + tp_ops->tf_read (drive, cmd);if ((cmd->tf_flags &IDE_TFLAG_CUSTOM_HANDLER ) && tf_cmd ==ATA_CMD_IDLEIMMEDIATE ) {
@@ -338,7 +348,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)if (blk_pm_request (rq))ide_check_pm_state (drive, rq); -SELECT_DRIVE (drive); + drive->hwif->tp_ops->dev_select (drive);if (ide_wait_stat (&startstop, drive, drive->ready_stat,ATA_BUSY |ATA_DRQ ,WAIT_READY )) {printk (KERN_ERR "%s: drive not ready for command\n" , drive->name);
@@ -481,11 +491,10 @@ repeat: prev_port = hwif->host->cur_port; hwif->rq =NULL ; -if (drive->dev_flags &IDE_DFLAG_SLEEPING ) { -if (time_before (drive->sleep, jiffies)) { -ide_unlock_port (hwif); - goto plug_device; - } +if (drive->dev_flags &IDE_DFLAG_SLEEPING && +time_after (drive->sleep, jiffies)) { +ide_unlock_port (hwif); + goto plug_device; } if ((hwif->host->host_flags & IDE_HFLAG_SERIALIZE) &&
@@ -495,7 +504,9 @@ repeat:* quirk_list may not like intr setups/cleanups */ if (prev_port && prev_port->cur_dev->quirk_list ==0 ) - prev_port->tp_ops->set_irq (prev_port,0 ); + prev_port->tp_ops->write_devctl (prev_port, +ATA_NIEN | +ATA_DEVCTL_OBS ); hwif->host->cur_port = hwif; }
drivers/ide/ide-iops.c +19 -22
91 lines not on this page · raw message
drivers/ide/ide-pm.c +3 -2
@@ -223,6 +223,7 @@ void ide_check_pm_state(ide_drive_t *drive, struct request *rq)* point. */ ide_hwif_t *hwif = drive->hwif; +const struct ide_tp_ops *tp_ops = hwif->tp_ops;struct request_queue *q = drive->queue;unsigned long flags;int rc;
@@ -232,8 +233,8 @@ void ide_check_pm_state(ide_drive_t *drive, struct request *rq) rc =ide_wait_not_busy (hwif,35000 );if (rc)printk (KERN_WARNING "%s: bus not ready on wakeup\n" , drive->name); -SELECT_DRIVE (drive); - hwif->tp_ops->set_irq (hwif,1 ); + tp_ops->dev_select (drive); + tp_ops->write_devctl (hwif,ATA_DEVCTL_OBS ); rc =ide_wait_not_busy (hwif,100000 );if (rc)printk (KERN_WARNING "%s: drive not ready on wakeup\n" , drive->name);
drivers/ide/ide-probe.c +14 -17
@@ -260,7 +260,7 @@ int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id)* during the identify phase that the IRQ handler isn't expecting. */ if (io_ports->ctl_addr) - tp_ops->set_irq (hwif,0 ); + tp_ops->write_devctl (hwif,ATA_NIEN |ATA_DEVCTL_OBS );/* take a deep breath */ msleep (50 );
@@ -390,13 +390,13 @@ static int do_probe (ide_drive_t *drive, u8 cmd)* (e.g. crw9624 as drive0 with disk as slave) */ msleep (50 ); -SELECT_DRIVE (drive); + tp_ops->dev_select (drive);msleep (50 );if (ide_read_device (drive) != drive->select && present ==0 ) {if (drive->dn &1 ) {/* exit with drive0 selected */ -SELECT_DRIVE (hwif->devices[0 ]); + tp_ops->dev_select (hwif->devices[0 ]);/* allow ATA_BUSY to assert & clear */ msleep (50 ); }
@@ -422,7 +422,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd)printk (KERN_ERR "%s: no response (status = 0x%02x), " "resetting drive\n" , drive->name, stat);msleep (50 ); -SELECT_DRIVE (drive); + tp_ops->dev_select (drive);msleep (50 ); tp_ops->exec_command (hwif,ATA_CMD_DEV_RESET ); (void )ide_busy_sleep (hwif,WAIT_WORSTCASE ,0 );
@@ -441,7 +441,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd) }if (drive->dn &1 ) {/* exit with drive0 selected */ -SELECT_DRIVE (hwif->devices[0 ]); + tp_ops->dev_select (hwif->devices[0 ]);msleep (50 );/* ensure drive irq is clear */ (void )tp_ops->read_status (hwif);
@@ -605,6 +605,7 @@ out:static int ide_port_wait_ready (ide_hwif_t *hwif) { +const struct ide_tp_ops *tp_ops = hwif->tp_ops;ide_drive_t *drive;int i, rc;
@@ -627,8 +628,8 @@ static int ide_port_wait_ready(ide_hwif_t *hwif)/* Ignore disks that we will not probe for later. */ if ((drive->dev_flags &IDE_DFLAG_NOPROBE ) ==0 || (drive->dev_flags &IDE_DFLAG_PRESENT )) { -SELECT_DRIVE (drive); - hwif->tp_ops->set_irq (hwif,1 ); + tp_ops->dev_select (drive); + tp_ops->write_devctl (hwif,ATA_DEVCTL_OBS );mdelay (2 ); rc =ide_wait_not_busy (hwif,35000 );if (rc)
@@ -640,7 +641,7 @@ static int ide_port_wait_ready(ide_hwif_t *hwif) out:/* Exit function with master reselected (let's be sane) */ if (i) -SELECT_DRIVE (hwif->devices[0 ]); + tp_ops->dev_select (hwif->devices[0 ]);return rc; }
@@ -845,7 +846,7 @@ static int init_irq (ide_hwif_t *hwif) irq_handler = ide_intr;if (io_ports->ctl_addr) - hwif->tp_ops->set_irq (hwif,1 ); + hwif->tp_ops->write_devctl (hwif,ATA_DEVCTL_OBS );if (request_irq (hwif->irq, irq_handler, sa, hwif->name, hwif)) goto out_up;
@@ -942,20 +943,16 @@ EXPORT_SYMBOL_GPL(ide_init_disk);static void drive_release_dev (struct device *dev) {ide_drive_t *drive =container_of (dev, ide_drive_t, gendev); -ide_hwif_t *hwif = drive->hwif;ide_proc_unregister_device (drive); -spin_lock_irq (&hwif->lock); +blk_cleanup_queue (drive->queue); + drive->queue =NULL ; +kfree (drive->id); drive->id =NULL ; + drive->dev_flags &= ~IDE_DFLAG_PRESENT ; -/* Messed up locking ... */ -spin_unlock_irq (&hwif->lock); -blk_cleanup_queue (drive->queue); -spin_lock_irq (&hwif->lock); - drive->queue =NULL ; -spin_unlock_irq (&hwif->lock);complete (&drive->gendev_rel_comp); }
drivers/ide/ide-tape.c +20 -16
@@ -297,19 +297,15 @@ static struct ide_tape_obj *ide_tape_chrdev_get(unsigned int i)return tape; } -static void idetape_input_buffers (ide_drive_t *drive,struct ide_atapi_pc *pc, +static int idetape_input_buffers (ide_drive_t *drive,struct ide_atapi_pc *pc,unsigned int bcount) {struct idetape_bh *bh = pc->bh;int count;while (bcount) { -if (bh ==NULL ) { -printk (KERN_ERR "ide-tape: bh == NULL in " -"idetape_input_buffers\n" ); -ide_pad_transfer (drive,0 , bcount); -return ; - } +if (bh ==NULL ) +break ; count =min ( (unsigned int )(bh->b_size -atomic_read (&bh->b_count)), bcount);
@@ -323,21 +319,21 @@ static void idetape_input_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,atomic_set (&bh->b_count,0 ); } } + pc->bh = bh; + +return bcount; } -static void idetape_output_buffers (ide_drive_t *drive,struct ide_atapi_pc *pc, +static int idetape_output_buffers (ide_drive_t *drive,struct ide_atapi_pc *pc,unsigned int bcount) {struct idetape_bh *bh = pc->bh;int count;while (bcount) { -if (bh ==NULL ) { -printk (KERN_ERR "ide-tape: bh == NULL in %s\n" , - __func__); -return ; - } +if (bh ==NULL ) +break ; count =min ((unsigned int )pc->b_count, (unsigned int )bcount); drive->hwif->tp_ops->output_data (drive,NULL , pc->b_data, count); bcount -= count;
@@ -352,6 +348,8 @@ static void idetape_output_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc, } } } + +return bcount; }static void idetape_update_buffers (ide_drive_t *drive,struct ide_atapi_pc *pc)
@@ -563,12 +561,14 @@ static void ide_tape_handle_dsc(ide_drive_t *drive)static int ide_tape_io_buffers (ide_drive_t *drive,struct ide_atapi_pc *pc,unsigned int bcount,int write) { +unsigned int bleft; +if (write) -idetape_output_buffers (drive, pc, bcount); + bleft =idetape_output_buffers (drive, pc, bcount);else -idetape_input_buffers (drive, pc, bcount); + bleft =idetape_input_buffers (drive, pc, bcount); -return bcount; +return bcount - bleft; }/*
@@ -2014,9 +2014,13 @@ static void idetape_get_inquiry_results(ide_drive_t *drive) {idetape_tape_t *tape = drive->driver_data;struct ide_atapi_pc pc; +u8 pc_buf[256 ];char fw_rev[4 ], vendor_id[8 ], product_id[16 ];idetape_create_inquiry_cmd (&pc); + pc.buf = &pc_buf[0 ]; + pc.buf_size =sizeof (pc_buf); +if (ide_queue_pc_tail (drive, tape->disk, &pc)) {printk (KERN_ERR "ide-tape: %s: can't get INQUIRY results\n" , tape->name);
drivers/ide/ide-taskfile.c +50 -46
146 lines not on this page · raw message
drivers/ide/ide-timings.c +10 -2
@@ -43,6 +43,8 @@ static struct ide_timing ide_timing[] = { { XFER_UDMA_1, 0, 0, 0, 0, 0, 0, 0, 80 }, { XFER_UDMA_0, 0, 0, 0, 0, 0, 0, 0, 120 }, + { XFER_MW_DMA_4, 25, 0, 0, 0, 55, 20, 80, 0 }, + { XFER_MW_DMA_3, 25, 0, 0, 0, 65, 25, 100, 0 }, { XFER_MW_DMA_2, 25, 0, 0, 0, 70, 25, 120, 0 }, { XFER_MW_DMA_1, 45, 0, 0, 0, 80, 50, 150, 0 }, { XFER_MW_DMA_0, 60, 0, 0, 0, 215, 215, 480, 0 },
@@ -51,7 +53,8 @@ static struct ide_timing ide_timing[] = { { XFER_SW_DMA_1, 90, 0, 0, 0, 240, 240, 480, 0 }, { XFER_SW_DMA_0, 120, 0, 0, 0, 480, 480, 960, 0 }, - { XFER_PIO_5, 20, 50, 30, 100, 50, 30, 100, 0 }, + { XFER_PIO_6, 10, 55, 20, 80, 55, 20, 80, 0 }, + { XFER_PIO_5, 15, 65, 25, 100, 65, 25, 100, 0 }, { XFER_PIO_4, 25, 70, 25, 120, 70, 25, 120, 0 }, { XFER_PIO_3, 30, 80, 70, 180, 80, 70, 180, 0 },
@@ -90,6 +93,10 @@ u16 ide_pio_cycle_time(ide_drive_t *drive, u8 pio)/* conservative "downgrade" for all pre-ATA2 drives */ if (pio <3 && cycle < t->cycle) cycle =0 ;/* use standard timing */ + +/* Use the standard timing for the CF specific modes too */ +if (pio >4 &&ata_id_is_cfa (id)) + cycle =0 ; }return cycle ? cycle : t->cycle;
@@ -161,7 +168,8 @@ int ide_timing_compute(ide_drive_t *drive, u8 speed,if (speed <=XFER_PIO_2 ) p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO ]; -else if (speed <=XFER_PIO_5 ) +else if ((speed <=XFER_PIO_4 ) || + (speed ==XFER_PIO_5 && !ata_id_is_cfa (id))) p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO_IORDY ];else if (speed >=XFER_MW_DMA_0 && speed <=XFER_MW_DMA_2 ) p.cycle = id[ATA_ID_EIDE_DMA_MIN ];
drivers/ide/ide-xfer-mode.c +9 -6
@@ -9,11 +9,11 @@ static const char *udma_str[] = {"UDMA/16" ,"UDMA/25" ,"UDMA/33" ,"UDMA/44" , "UDMA/66", "UDMA/100", "UDMA/133", "UDMA7" };static const char *mwdma_str[] = - {"MWDMA0" ,"MWDMA1" ,"MWDMA2" }; + {"MWDMA0" ,"MWDMA1" ,"MWDMA2" ,"MWDMA3" ,"MWDMA4" };static const char *swdma_str[] = {"SWDMA0" ,"SWDMA1" ,"SWDMA2" };static const char *pio_str[] = - {"PIO0" ,"PIO1" ,"PIO2" ,"PIO3" ,"PIO4" ,"PIO5" }; + {"PIO0" ,"PIO1" ,"PIO2" ,"PIO3" ,"PIO4" ,"PIO5" ,"PIO6" };/** * ide_xfer_verbose - return IDE mode names
@@ -30,11 +30,11 @@ const char *ide_xfer_verbose(u8 mode)if (mode >=XFER_UDMA_0 && mode <=XFER_UDMA_7 ) s = udma_str[i]; -else if (mode >=XFER_MW_DMA_0 && mode <=XFER_MW_DMA_2 ) +else if (mode >=XFER_MW_DMA_0 && mode <=XFER_MW_DMA_4 ) s = mwdma_str[i];else if (mode >=XFER_SW_DMA_0 && mode <=XFER_SW_DMA_2 ) s = swdma_str[i]; -else if (mode >=XFER_PIO_0 && mode <=XFER_PIO_5 ) +else if (mode >=XFER_PIO_0 && mode <=XFER_PIO_6 ) s = pio_str[i &0x7 ];else if (mode ==XFER_PIO_SLOW ) s ="PIO SLOW" ;
@@ -79,7 +79,10 @@ u8 ide_get_best_pio_mode(ide_drive_t *drive, u8 mode_wanted, u8 max_mode) }
Lines of this file are not shown. View the raw message.
drivers/ide/ide_arm.c deleted +0 -53
53 lines not on this page · raw message
drivers/ide/ns87415.c +43 -42
85 lines not on this page · raw message
drivers/ide/pmac.c +54 -47
101 lines not on this page · raw message
drivers/ide/scc_pata.c +15 -41
56 lines not on this page · raw message
drivers/ide/trm290.c +32 -25
57 lines not on this page · raw message
drivers/ide/tx4938ide.c +12 -29
41 lines not on this page · raw message
drivers/ide/tx4939ide.c +17 -45
62 lines not on this page · raw message
include/linux/ide.h +27 -29
56 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.