IDE updates part #5
Subsystems (4)
PATCH 1/1 IDE updates part #5
* new IDE host driver for Palmchip BK3710 chipset
(Anton Salnikov@MontaVista)
* second part of ide-tape redux patches
(Borislav Petkov)
* ide-generic bugfix
* minor fixups/cleanups
Linus, please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/
to receive the following updates:
Documentation/kernel-parameters.txt | 3 + drivers/ide/Kconfig | 9 + drivers/ide/arm/Makefile | 1 + drivers/ide/arm/icside.c | 2 +- drivers/ide/arm/palm_bk3710.c | 395 ++++++ drivers/ide/cris/ide-cris.c | 33 +- drivers/ide/ide-acpi.c | 2 +- drivers/ide/ide-cd.c | 9 +- drivers/ide/ide-dma.c | 3 +- drivers/ide/ide-floppy.c | 6 +- drivers/ide/ide-generic.c | 10 +- drivers/ide/ide-io.c | 14 +- drivers/ide/ide-iops.c | 45 +- drivers/ide/ide-lib.c | 2 +- drivers/ide/ide-probe.c | 47 +- drivers/ide/ide-proc.c | 1 + drivers/ide/ide-tape.c | 2400 ++++++++++++++++------------------- drivers/ide/ide-taskfile.c | 35 +- drivers/ide/ide.c | 54 - drivers/ide/legacy/buddha.c | 72 +- drivers/ide/legacy/falconide.c | 42 +- drivers/ide/legacy/gayle.c | 39 +- drivers/ide/legacy/hd.c | 9 +- drivers/ide/legacy/macide.c | 57 +- drivers/ide/legacy/q40ide.c | 9 +- drivers/ide/pci/Makefile | 3 +- drivers/ide/pci/generic.c | 13 - drivers/ide/pci/siimage.c | 3 - drivers/macintosh/mediabay.c | 46 +- drivers/scsi/ide-scsi.c | 4 +- include/asm-powerpc/mediabay.h | 8 +- include/linux/ide.h | 42 +- 32 files changed, 1825 insertions(+), 1593 deletions(-) create mode 100644 drivers/ide/arm/palm_bk3710.c
Andrew Morton (2):
drivers/ide/ide-acpi.c: fix uninitialized var warning drivers/ide/legacy/hd.c: fix uninitialized var warning
Anton Salnikov (1):
Palmchip BK3710 IDE driver
Bartlomiej Zolnierkiewicz (7):
ide-generic: probing bugfix
ppc: fix #ifdef-s in mediabay driver (take 2)
ide: remove write-only ->sata_misc[] from ide_hwif_t
ide: remove redundant BUG_ON() from [atapi_]reset_pollfunc()
ide: remove ide_setup_ports()
ide: add ide_read_[alt]status() inline helpers
ide: add ide_read_error() inline helper
Borislav Petkov (18):
ide-tape: refactor the debug logging facility
ide-tape: remove struct idetape_read_position_result_t
ide-tape: remove unreachable code chunk
ide-tape: simplify code branching in the interrupt handler
ide-tape: remove typedef idetape_chrdev_direction_t
ide-tape: struct idetape_tape_t: remove unused members
ide-tape: struct idetape_tape_t: shorten member names v2
ide-tape: remove idetape_increase_max_pipeline_stages()
ide-tape: shorten some function names
ide-tape: cleanup and fix comments
ide-tape: remove struct idetape_id_gcw
ide-tape: remove unused "length" arg from idetape_create_read_buffer_cmd()
ide-tape: include proper headers
ide-tape: collect module-related macro calls at the end
ide-tape: remove leftover OnStream support warning
ide-tape: fix syntax error in idetape_identify_device()
ide-tape: cleanup the remaining codestyle issues
ide-tape: bump minor driver version
Denis Cheng (1):
ide-pci-generic: kill the unused ifdef/endif/MODULE code
Documentation/kernel-parameters.txt +3 -0
@@ -780,6 +780,9 @@ and is between 256 and 4096 characters. It is defined in the file loop use the MONITOR/MWAIT idle loop anyways. Performance should be the same as idle=poll. + ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem + Claim all unknown PCI IDE storage controllers. + ignore_loglevel [KNL] Ignore loglevel setting - this will print /all/ kernel messages to the console. Useful for debugging.
drivers/ide/Kconfig +9 -0
@@ -1009,6 +1009,15 @@ config BLK_DEV_Q40IDE normally be on; disable it only if you are running a custom hard drive subsystem through an expansion card. +config BLK_DEV_PALMCHIP_BK3710 + tristate "Palmchip bk3710 IDE controller support" + depends on ARCH_DAVINCI + select BLK_DEV_IDEDMA_PCI + help + Say Y here if you want to support the onchip IDE controller on the + TI DaVinci SoC + + config BLK_DEV_MPC8xx_IDE tristate "MPC8xx IDE support" depends on 8xx && (LWMON || IVMS8 || IVML24 || TQM8xxL) && IDE=y && BLK_DEV_IDE=y && !PPC_MERGE
drivers/ide/arm/Makefile +1 -0
@@ -2,6 +2,7 @@ obj-$(CONFIG_BLK_DEV_IDE_ICSIDE) += icside.o obj-$(CONFIG_BLK_DEV_IDE_RAPIDE) += rapide.o obj-$(CONFIG_BLK_DEV_IDE_BAST) += bast-ide.o +obj-$(CONFIG_BLK_DEV_PALMCHIP_BK3710) += palm_bk3710.o ifeq ($(CONFIG_IDE_ARM), m) obj-m += ide_arm.o
drivers/ide/arm/icside.c +1 -1
@@ -365,7 +365,7 @@ static void icside_dma_timeout(ide_drive_t *drive)if (icside_dma_test_irq (drive))return ; -ide_dump_status (drive,"DMA timeout" ,HWIF (drive)->INB (IDE_STATUS_REG )); +ide_dump_status (drive,"DMA timeout" ,ide_read_status (drive));icside_dma_end (drive); }
drivers/ide/arm/palm_bk3710.c new file +395 -0
395 lines not on this page · raw message
drivers/ide/cris/ide-cris.c +22 -11
@@ -753,6 +753,25 @@ static void cris_set_dma_mode(ide_drive_t *drive, const u8 speed)cris_ide_set_speed (TYPE_DMA ,0 , strobe, hold); } +static void __init cris_setup_ports (hw_regs_t *hw,unsigned long base) +{ +int i; + +memset (hw,0 ,sizeof (*hw)); + +for (i =0 ; i <=7 ; i++) + hw->io_ports[i] = base +cris_ide_reg_addr (i,0 ,1 ); + +/* +* the IDE control register is at ATA address 6, +* with CS1 active instead of CS0 +*/ + hw->io_ports[IDE_CONTROL_OFFSET ] = base +cris_ide_reg_addr (6 ,1 ,0 ); + + hw->irq =ide_default_irq (0 ); + hw->ack_intr = cris_ide_ack_intr; +} +static const struct ide_port_info cris_port_info__initdata = { .chipset = ide_etrax100, .host_flags = IDE_HFLAG_NO_ATAPI_DMA |
@@ -765,24 +784,16 @@ static const struct ide_port_info cris_port_info __initdata = {static int __init init_e100_ide (void ) {hw_regs_t hw; -int ide_offsets[IDE_NR_PORTS ], h, i; +int h;u8 idx[4 ] = {0xff ,0xff ,0xff ,0xff };printk ("ide: ETRAX FS built-in ATA DMA controller\n" ); -for (i =IDE_DATA_OFFSET ; i <=IDE_STATUS_OFFSET ; i++) - ide_offsets[i] =cris_ide_reg_addr (i,0 ,1 ); - -/* the IDE control register is at ATA address 6, with CS1 active instead of CS0 */ - ide_offsets[IDE_CONTROL_OFFSET ] =cris_ide_reg_addr (6 ,1 ,0 ); -for (h =0 ; h <4 ; h++) {ide_hwif_t *hwif =NULL ; -ide_setup_ports (&hw,cris_ide_base_address (h), - ide_offsets, -0 ,0 , cris_ide_ack_intr, -ide_default_irq (0 )); +cris_setup_ports (&hw,cris_ide_base_address (h)); + hwif =ide_find_port (hw.io_ports[IDE_DATA_OFFSET ]);if (hwif ==NULL )continue ;
drivers/ide/ide-acpi.c +1 -1
@@ -171,7 +171,7 @@ err:static acpi_handle ide_acpi_hwif_get_handle (ide_hwif_t *hwif) {struct device *dev = hwif->gendev.parent; -acpi_handle dev_handle; +acpi_handle uninitialized_var (dev_handle );acpi_integer pcidevfn;acpi_handle chan_handle;int err;
drivers/ide/ide-cd.c +5 -4
@@ -295,7 +295,8 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)int stat, err, sense_key;/* Check for errors. */ - stat =HWIF (drive)->INB (IDE_STATUS_REG ); + stat =ide_read_status (drive); +if (stat_ret) *stat_ret = stat;
@@ -303,7 +304,7 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)return 0 ;/* Get the IDE error register. */ - err =HWIF (drive)->INB (IDE_ERROR_REG ); + err =ide_read_error (drive); sense_key = err >>4 ;if (rq ==NULL ) {
@@ -692,7 +693,7 @@ int ide_cd_check_ireason(ide_drive_t *drive, int len, int ireason, int rw)/* Some drives (ASUS) seem to tell us that status * info is available. just get it and ignore. */ - (void )HWIF (drive)->INB (IDE_STATUS_REG ); + (void )ide_read_status (drive);return 0 ; }else {/* Drive wants a command packet, or invalid ireason... */
@@ -1326,7 +1327,7 @@ ide_do_rw_cdrom (ide_drive_t *drive, struct request *rq, sector_t block)if (blk_fs_request (rq)) {if (info->cd_flags &IDE_CD_FLAG_SEEKING ) {unsigned long elapsed = jiffies - info->start_seek; -int stat =HWIF (drive)->INB (IDE_STATUS_REG ); +int stat =ide_read_status (drive);if ((stat &SEEK_STAT ) !=SEEK_STAT ) {if (elapsed <IDECD_SEEK_TIMEOUT ) {
drivers/ide/ide-dma.c +2 -1
@@ -147,7 +147,8 @@ ide_startstop_t ide_dma_intr (ide_drive_t *drive)u8 stat =0 , dma_stat =0 ; dma_stat =HWIF (drive)->ide_dma_end (drive); - stat =HWIF (drive)->INB (IDE_STATUS_REG );/* get drive status */ + stat =ide_read_status (drive); +if (OK_STAT (stat,DRIVE_READY ,drive->bad_wstat|DRQ_STAT )) {if (!dma_stat) {struct request *rq =HWGROUP (drive)->rq;
drivers/ide/ide-floppy.c +3 -3
@@ -465,7 +465,7 @@ static void idefloppy_retry_pc(ide_drive_t *drive)idefloppy_pc_t *pc;struct request *rq; - (void )drive->hwif->INB (IDE_ERROR_REG ); + (void )ide_read_error (drive); pc =idefloppy_next_pc_storage (drive); rq =idefloppy_next_rq_storage (drive);idefloppy_create_request_sense_cmd (pc);
@@ -501,7 +501,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) }/* Clear the interrupt */ - stat = drive->hwif->INB (IDE_STATUS_REG ); + stat =ide_read_status (drive);/* No more interrupts */ if ((stat &DRQ_STAT ) ==0 ) {
@@ -1246,7 +1246,7 @@ static int idefloppy_get_format_progress(ide_drive_t *drive, int __user *arg)u8 stat;local_irq_save (flags); - stat = drive->hwif->INB (IDE_STATUS_REG ); + stat =ide_read_status (drive);local_irq_restore (flags); progress_indication = ((stat &SEEK_STAT ) ==0 ) ?0 :0x10000 ;
drivers/ide/ide-generic.c +8 -2
@@ -20,8 +20,14 @@ static int __init ide_generic_init(void)if (ide_hwifs[0 ].io_ports[IDE_DATA_OFFSET ])ide_get_lock (NULL ,NULL );/* for atari only */ -for (i =0 ; i <MAX_HWIFS ; i++) - idx[i] = ide_hwifs[i].present ?0xff : i; +for (i =0 ; i <MAX_HWIFS ; i++) { +ide_hwif_t *hwif = &ide_hwifs[i]; + +if (hwif->io_ports[IDE_DATA_OFFSET ] && !hwif->present) + idx[i] = i; +else + idx[i] =0xff ; + }ide_device_add_all (idx,NULL );
drivers/ide/ide-io.c +7 -7
@@ -466,7 +466,7 @@ static ide_startstop_t ide_ata_error(ide_drive_t *drive, struct request *rq, u8return ide_stopped; } -if (hwif->INB (IDE_STATUS_REG ) & (BUSY_STAT |DRQ_STAT )) +if (ide_read_status (drive) & (BUSY_STAT |DRQ_STAT )) rq->errors |=ERROR_RESET ;if ((rq->errors &ERROR_RESET ) ==ERROR_RESET ) {
@@ -493,7 +493,7 @@ static ide_startstop_t ide_atapi_error(ide_drive_t *drive, struct request *rq, u/* add decoding error stuff */ } -if (hwif->INB (IDE_STATUS_REG ) & (BUSY_STAT |DRQ_STAT )) +if (ide_read_status (drive) & (BUSY_STAT |DRQ_STAT ))/* force an abort */ hwif->OUTB (WIN_IDLEIMMEDIATE ,IDE_COMMAND_REG );
@@ -821,9 +821,8 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,#ifdef DEBUG printk ("%s: DRIVE_CMD (null)\n" , drive->name);#endif -ide_end_drive_cmd (drive, - hwif->INB (IDE_STATUS_REG ), - hwif->INB (IDE_ERROR_REG )); +ide_end_drive_cmd (drive,ide_read_status (drive),ide_read_error (drive)); +return ide_stopped; }
@@ -1231,7 +1230,7 @@ static ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)printk (KERN_WARNING "%s: DMA timeout error\n" , drive->name); (void )HWIF (drive)->ide_dma_end (drive); ret =ide_error (drive,"dma timeout error" , - hwif->INB (IDE_STATUS_REG )); +ide_read_status (drive)); }else {printk (KERN_WARNING "%s: DMA timeout retry\n" , drive->name); hwif->dma_timeout (drive);
@@ -1355,7 +1354,8 @@ void ide_timer_expiry (unsigned long data) startstop =ide_dma_timeout_retry (drive, wait); }else startstop = -ide_error (drive,"irq timeout" , hwif->INB (IDE_STATUS_REG )); +ide_error (drive,"irq timeout" , +ide_read_status (drive)); } drive->service_time = jiffies - drive->service_start;spin_lock_irq (&ide_lock);
drivers/ide/ide-iops.c +28 -17
124 lines not on this page · raw message
drivers/ide/ide-lib.c +1 -1
@@ -578,7 +578,7 @@ u8 ide_dump_status(ide_drive_t *drive, const char *msg, u8 stat) }printk ("}\n" );if ((stat & (BUSY_STAT |ERR_STAT )) ==ERR_STAT ) { - err = drive->hwif->INB (IDE_ERROR_REG ); + err =ide_read_error (drive);printk ("%s: %s: error=0x%02x " , drive->name, msg, err);if (drive->media == ide_disk)ide_dump_ata_error (drive, err);
drivers/ide/ide-probe.c +25 -22
112 lines not on this page · raw message
drivers/ide/ide-proc.c +1 -0
@@ -65,6 +65,7 @@ static int proc_ide_read_imodelcase ide_4drives: name ="4drives" ;break ;case ide_pmac: name ="mac-io" ;break ;case ide_au1xxx: name ="au1xxx" ;break ; +case ide_palm3710: name ="palm3710" ;break ;case ide_etrax100: name ="etrax100" ;break ;case ide_acorn: name ="acorn" ;break ;default : name ="(unknown)" ;break ;
drivers/ide/ide-tape.c +1126 -1274
2,129 lines not on this page · raw message
drivers/ide/ide.c +0 -54
54 lines not on this page · raw message
drivers/ide/legacy/buddha.c +37 -35
72 lines not on this page · raw message
drivers/ide/legacy/falconide.c +21 -21
42 lines not on this page · raw message
drivers/ide/legacy/macide.c +31 -26
57 lines not on this page · raw message
drivers/macintosh/mediabay.c +21 -25
46 lines not on this page · raw message
include/linux/ide.h +24 -18
42 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.