IDE fixes
Subsystems (2)
PATCH 1/1 IDE fixes
Linus, please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/
to receive the following updates:
Documentation/feature-removal-schedule.txt | 10 +++++ Documentation/ide.txt | 49 -------------------------- drivers/ide/ide-cd.c | 30 +++++++--------- drivers/ide/ide-disk.c | 5 ++- drivers/ide/ide-dma.c | 52 ++------------------------- drivers/ide/ide-probe.c | 3 +- drivers/ide/ide-tape.c | 5 +++ drivers/ide/ide.c | 20 +++------- drivers/ide/legacy/qd65xx.c | 43 +---------------------- drivers/ide/pci/cmd640.c | 3 +- drivers/ide/pci/hpt366.c | 12 ++++--- 11 files changed, 54 insertions(+), 178 deletions(-)
Andreas Schwab (1):
ide-cd: fix CD/DVD burning
Bartlomiej Zolnierkiewicz (9):
ide: remove redundant comment from ide_unregister()
ide: skip probing port if "hdx=noprobe" was used for both devices on it
qd65xx: fix setup of QD6580 Control register
ide-cd: fix 'ireason' handling for REQ_TYPE_ATA_PC requests
ide: fix sparse warning about shadowing 'flags' symbol
ide-disk: add missing printk() KERN_* levels
qd65xx: remove commented out code
ide: remove ide-tape documentation from Documentation/ide.txt
ide: remove stale comments from ide-dma.c (take 2)
Borislav Petkov (2):
ide-cd: Enable audio play quirk for Optiarc DVD RW AD-5200A drive
ide-tape: schedule driver for removal after 6 months
Sam Ravnborg (1):
hpt366: fix section mismatch warnings
Documentation/feature-removal-schedule.txt +10 -0
@@ -172,6 +172,16 @@ Who: Len Brown <[email protected]> --------------------------- +What: ide-tape driver +When: July 2008 +Files: drivers/ide/ide-tape.c +Why: This driver might not have any users anymore and maintaining it for no + reason is an effort no one wants to make. +Who: Bartlomiej Zolnierkiewicz <[email protected]>, Borislav Petkov + <[email protected]> + +--------------------------- + What: libata spindown skipping and warning When: Dec 2008 Why: Some halt(8) implementations synchronize caches for and spin
Documentation/ide.txt +0 -49
61 lines not on this page · raw message
drivers/ide/ide-cd.c +13 -17
@@ -670,8 +670,8 @@ static void cdrom_buffer_sectors (ide_drive_t *drive, unsigned long sector,* and attempt to recover if there are problems. Returns 0 if everything's * ok; nonzero if the request has been terminated. */ -static -int ide_cd_check_ireason (ide_drive_t *drive,int len,int ireason,int rw) +static int ide_cd_check_ireason (ide_drive_t *drive,struct request *rq, +int len,int ireason,int rw) {/* * ireason == 0: the drive wants to receive data from us
@@ -701,6 +701,9 @@ int ide_cd_check_ireason(ide_drive_t *drive, int len, int ireason, int rw) drive->name, __FUNCTION__, ireason); } +if (rq->cmd_type ==REQ_TYPE_ATA_PC ) + rq->cmd_flags |=REQ_FAILED ; +cdrom_end_request (drive,0 );return -1 ; }
@@ -1071,11 +1074,11 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)/* * check which way to transfer data */ -if (blk_fs_request (rq) ||blk_pc_request (rq)) { -if (ide_cd_check_ireason (drive, len, ireason, write)) -return ide_stopped; +if (ide_cd_check_ireason (drive, rq, len, ireason, write)) +return ide_stopped; -if (blk_fs_request (rq) && write ==0 ) { +if (blk_fs_request (rq)) { +if (write ==0 ) {int nskip;if (ide_cd_check_transfer_size (drive, len)) {
@@ -1101,16 +1104,9 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)if (ireason ==0 ) { write =1 ; xferfunc =HWIF (drive)->atapi_output_bytes; - }else if (ireason ==2 || (ireason ==1 && - (blk_fs_request (rq) ||blk_pc_request (rq)))) { + }else { write =0 ; xferfunc =HWIF (drive)->atapi_input_bytes; - }else { -printk (KERN_ERR "%s: %s: The drive " -"appears confused (ireason = 0x%02x). " -"Trying to recover by ending request.\n" , - drive->name, __FUNCTION__, ireason); - goto end_request; }/*
@@ -1182,11 +1178,10 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)else rq->data += blen; } +if (!write &&blk_sense_request (rq)) + rq->sense_len += blen; } -if (write &&blk_sense_request (rq)) - rq->sense_len += thislen; -/* * pad, if necessary */
@@ -1931,6 +1926,7 @@ static const struct cd_list_entry ide_cd_quirks_list[] = { { "MATSHITADVD-ROM SR-8186", NULL, IDE_CD_FLAG_PLAY_AUDIO_OK }, { "MATSHITADVD-ROM SR-8176", NULL, IDE_CD_FLAG_PLAY_AUDIO_OK }, { "MATSHITADVD-ROM SR-8174", NULL, IDE_CD_FLAG_PLAY_AUDIO_OK }, + { "Optiarc DVD RW AD-5200A", NULL, IDE_CD_FLAG_PLAY_AUDIO_OK }, { NULL, NULL, 0 } };
drivers/ide/ide-disk.c +3 -2
@@ -867,7 +867,7 @@ static void idedisk_setup (ide_drive_t *drive)/* Only print cache size when it was specified */ if (id->buf_size) -printk (" w/%dKiB Cache" , id->buf_size/2 ); +printk (KERN_CONT " w/%dKiB Cache" , id->buf_size /2 );printk (KERN_CONT ", CHS=%d/%d/%d\n" , drive->bios_cyl, drive->bios_head, drive->bios_sect);
@@ -949,7 +949,8 @@ static void ide_device_shutdown(ide_drive_t *drive)return ; } -printk ("Shutdown: %s\n" , drive->name); +printk (KERN_INFO "Shutdown: %s\n" , drive->name); + drive->gendev.bus->suspend (&drive->gendev,PMSG_SUSPEND ); }
drivers/ide/ide-dma.c +4 -48
73 lines not on this page · raw message
drivers/ide/ide-probe.c +2 -1
@@ -756,7 +756,8 @@ static int ide_probe_port(ide_hwif_t *hwif)BUG_ON (hwif->present); -if (hwif->noprobe) +if (hwif->noprobe || + (hwif->drives[0 ].noprobe && hwif->drives[1 ].noprobe))return -EACCES ;/*
drivers/ide/ide-tape.c +5 -0
@@ -3765,6 +3765,11 @@ static int ide_tape_probe(ide_drive_t *drive) g->fops = &idetape_block_ops;ide_register_region (g); +printk (KERN_WARNING "It is possible that this driver does not have any" +" users anymore and, as a result, it will be REMOVED soon." +" Please notify Bart <[email protected]> or Boris" +" <[email protected]> in case you still need it.\n" ); +return 0 ; out_free_tape:
drivers/ide/ide.c +6 -14
@@ -590,11 +590,6 @@ void ide_unregister(unsigned int index, int init_default, int restore) hwif->extra_ports =0 ; } -/* -* Note that we only release the standard ports, -* and do not even try to handle any extra ports -* allocated for weird IDE interface chipsets. -*/ ide_hwif_release_regions (hwif);/* copy original settings */
@@ -1036,10 +1031,9 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device drive->nice1 = (arg >>IDE_NICE_1 ) &1 ;return 0 ;case HDIO_DRIVE_RESET : - { -unsigned long flags; -if (!capable (CAP_SYS_ADMIN ))return -EACCES ; - +if (!capable (CAP_SYS_ADMIN )) +return -EACCES ; +/* * Abort the current command on the * group if there is one, taking
@@ -1058,17 +1052,15 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_deviceide_abort (drive,"drive reset" );BUG_ON (HWGROUP (drive)->handler); - +/* Ensure nothing gets queued after we drop the lock. Reset will clear the busy */ - +HWGROUP (drive)->busy =1 ;spin_unlock_irqrestore (&ide_lock, flags); (void )ide_do_reset (drive);return 0 ; - } -case HDIO_GET_BUSSTATE :if (!capable (CAP_SYS_ADMIN ))return -EACCES ;
@@ -1449,7 +1441,7 @@ static int __init ide_setup(char *s)case -1 :/* "noprobe" */ hwif->noprobe =1 ; - goto done; + goto obsolete_option;case 1 :/* base */ vals[1 ] = vals[0 ] +0x206 ;/* default ctl */
drivers/ide/legacy/qd65xx.c +2 -41
67 lines not on this page · raw message
drivers/ide/pci/cmd640.c +2 -1
@@ -787,7 +787,8 @@ static int __init cmd640x_init(void)/* * Try to enable the secondary interface, if not already enabled */ -if (cmd_hwif1->noprobe) { +if (cmd_hwif1->noprobe || + (cmd_hwif1->drives[0 ].noprobe && cmd_hwif1->drives[1 ].noprobe)) { port2 ="not probed" ; }else { b =get_cmd640_reg (CNTRL );
drivers/ide/pci/hpt366.c +7 -5
@@ -1570,10 +1570,12 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devicif (rev <3 ) info = &hpt36x;else { -static const struct hpt_info *hpt37x_info[] = - { &hpt370, &hpt370a, &hpt372, &hpt372n }; - - info = hpt37x_info[min_t (u8, rev,6 ) -3 ]; +switch (min_t (u8, rev,6 )) { +case 3 : info = &hpt370;break ; +case 4 : info = &hpt370a;break ; +case 5 : info = &hpt372;break ; +case 6 : info = &hpt372n;break ; + } idx++; }break ;
@@ -1626,7 +1628,7 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devicreturn ide_setup_pci_device (dev, &d); } -static const struct pci_device_id hpt366_pci_tbl[] = { +static const struct pci_device_id hpt366_pci_tbl[]__devinitconst = { {PCI_VDEVICE (TTI ,PCI_DEVICE_ID_TTI_HPT366 ),0 }, {PCI_VDEVICE (TTI ,PCI_DEVICE_ID_TTI_HPT372 ),1 }, {PCI_VDEVICE (TTI ,PCI_DEVICE_ID_TTI_HPT302 ),2 },