IDE updates #1
Subsystems (4)
Inside:
* ide-generic host driver fix to not claim by default ports for which there is a better driver available. (Borislav Petkov)
* Proper PCI Power Management support.
* More work on generic ATAPI support. (Borislav Petkov & me)
* Use/add generic helpers for device identity handling.
* Re-work of IDE settings infrastructure.
* Use special driver requests for handling IDE settings. (Elias Oltmanns)
* Misc fixes/improvements.
(Mark de Wever, FUJITA Tomonori, Linus Torvalds, me)
Thanks to all contributors!
Also thanks to all people reviewing patches and testing linux-next (+ reporting bugs) since without their help it wouldn't be possible to keep the usual high-quality of IDE updates.
Linus, please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/
to receive the following updates:
drivers/ata/libata-scsi.c | 2 +- drivers/block/hd.c | 9 +- drivers/ide/Kconfig | 23 -- drivers/ide/Makefile | 7 +- drivers/ide/arm/icside.c | 5 +- drivers/ide/arm/palm_bk3710.c | 8 +- drivers/ide/ide-acpi.c | 6 +- drivers/ide/ide-atapi.c | 236 +++++++++++++-- drivers/ide/ide-cd.c | 72 ++--- drivers/ide/ide-disk.c | 340 ++++++++------------- drivers/ide/ide-dma.c | 52 ++-- drivers/ide/ide-floppy.c | 668 +++++++--------------------------------- drivers/ide/ide-floppy.h | 63 ++++ drivers/ide/ide-floppy_ioctl.c | 243 +++++++++++++++ drivers/ide/ide-generic.c | 55 +++- drivers/ide/ide-io.c | 117 +++++--- drivers/ide/ide-ioctls.c | 290 +++++++++++++++++ drivers/ide/ide-iops.c | 225 ++++---------- drivers/ide/ide-lib.c | 73 +++--- drivers/ide/ide-probe.c | 252 +++++++-------- drivers/ide/ide-proc.c | 306 ++++++------------- drivers/ide/ide-tape.c | 478 ++++++++--------------------- drivers/ide/ide-taskfile.c | 156 ++-------- drivers/ide/ide-timings.c | 22 +- drivers/ide/ide.c | 238 ++------------- drivers/ide/legacy/ali14xx.c | 1 - drivers/ide/legacy/buddha.c | 1 - drivers/ide/legacy/dtc2278.c | 1 - drivers/ide/legacy/falconide.c | 1 - drivers/ide/legacy/gayle.c | 1 - drivers/ide/legacy/ht6560b.c | 1 - drivers/ide/legacy/ide-cs.c | 1 - drivers/ide/legacy/macide.c | 1 - drivers/ide/legacy/q40ide.c | 2 - drivers/ide/legacy/qd65xx.c | 23 +- drivers/ide/legacy/umc8672.c | 1 - drivers/ide/pci/aec62xx.c | 5 +- drivers/ide/pci/alim15x3.c | 9 +- drivers/ide/pci/amd74xx.c | 8 +- drivers/ide/pci/atiixp.c | 3 +- drivers/ide/pci/cmd640.c | 43 ++-- drivers/ide/pci/cmd64x.c | 5 +- drivers/ide/pci/cs5520.c | 3 +- drivers/ide/pci/cs5530.c | 19 +- drivers/ide/pci/cs5535.c | 14 +- drivers/ide/pci/cy82c693.c | 4 +- drivers/ide/pci/delkin_cb.c | 1 - drivers/ide/pci/generic.c | 3 +- drivers/ide/pci/hpt34x.c | 5 +- drivers/ide/pci/hpt366.c | 77 +++-- drivers/ide/pci/it8213.c | 3 +- drivers/ide/pci/it821x.c | 58 ++-- drivers/ide/pci/jmicron.c | 3 +- drivers/ide/pci/ns87415.c | 9 +- drivers/ide/pci/opti621.c | 7 +- drivers/ide/pci/pdc202xx_new.c | 15 +- drivers/ide/pci/pdc202xx_old.c | 11 +- drivers/ide/pci/piix.c | 5 +- drivers/ide/pci/rz1000.c | 1 - drivers/ide/pci/sc1200.c | 15 +- drivers/ide/pci/scc_pata.c | 5 +- drivers/ide/pci/serverworks.c | 9 +- drivers/ide/pci/sgiioc4.c | 1 - drivers/ide/pci/siimage.c | 17 +- drivers/ide/pci/sis5513.c | 5 +- drivers/ide/pci/sl82c105.c | 7 +- drivers/ide/pci/slc90e66.c | 3 +- drivers/ide/pci/triflex.c | 3 +- drivers/ide/pci/trm290.c | 1 - drivers/ide/pci/via82cxxx.c | 10 +- drivers/ide/ppc/pmac.c | 6 +- drivers/ide/setup-pci.c | 33 ++ drivers/scsi/ide-scsi.c | 120 +++----- include/linux/ata.h | 112 +++++++- include/linux/ide.h | 316 ++++++++++++------- 75 files changed, 2388 insertions(+), 2566 deletions(-) create mode 100644 drivers/ide/ide-floppy.h create mode 100644 drivers/ide/ide-floppy_ioctl.c create mode 100644 drivers/ide/ide-ioctls.c
Bartlomiej Zolnierkiewicz (65):
ide: remove superfluous check from ide_disk_special()
ide: cleanup ide_disk_init_mult_count()
ide: cleanup ide_fix_driveid()
ide: make drive->id an union (take 2)
ide: remove drive->driveid
ide: use ata_id_current_chs_valid()
ide-disk: use ata_id_wcache_enabled()
ide-disk: use ata_id_hpa_enabled()
libata: WIN_* -> ATA_CMD_*
ide: WIN_* -> ATA_CMD_*
hd: WIN_* -> ATA_CMD_*
ide: use ATA_* defines instead of *_STAT and *_ERR ones
ide: remove no longer needed ide_drive_t fields
ide: fix EXABYTENEST handling in probe_for_drive()
ide: enhance ide_busy_sleep()
ide: remove no longer needed BUG_ON()-s from init_irq()
ide: remove IDE_CHIPSET_* macros
ide: remove unused _IDE_C and _IDE_DISK defines
ide: remove needless drive->present checks from device drivers
ide: check drive->present in ide_get_paired_drive()
ide: remove CONFIG_IDEDISK_MULTI_MODE
ide: include <linux/hdreg.h> only when needed
ide: call ide_proc_register_driver() later
ide: preparations for /proc/ide/hd*/settings rework
ide: /proc/ide/hd*/settings rework
ide: remove SECTOR_WORDS define
cmd640: add __set_prefetch_mode()
ide: remove read-only ->atapi_overlap field from ide_drive_t
ide: remove ->supports_dsc_overlap field from ide_driver_t
ide: factor out HDIO_*_NICE ioctl handling to ide_*_nice_ioctl()
ide: ide_dev_has_iordy() -> ata_id_has_iordy()
ide: ide_dev_is_sata() -> ata_id_is_sata()
ide: idedisk_supports_lba48() -> ata_id_lba48_enabled()
ide: check only for CACHE FLUSH command support in ide_id_has_flush_cache()
ide: ide_id_has_flush_cache() -> ata_id_flush_enabled()
ide: ide_id_has_flush_cache_ext() -> ata_id_flush_ext_enabled()
ide: use ata_id_is_cfa()
ide: ide_id_to_hd_driveid() -> ata_id_to_hd_driveid()
ide: lba_capacity_is_ok() -> ata_id_is_lba_capacity_ok()
hpt366: add hpt3xx_disable_fast_irq() helper
ide: add proper PCI PM support (v2)
ide: remove ->bus_state field from ide_hwif_t
ide: add ide_setting_ioctl() helper
ide: cleanup generic_ide_ioctl()
ide: move ioctls handling to ide-ioctls.c
ide: add ide_check_atapi_device() helper
ide-floppy: remove needless parens
ide-floppy: add ide_floppy_format_ioctl() helper
ide-tape: remove idetape_init_rq()
ide-{floppy,tape}: remove request stack
ide-{floppy,tape}: remove packet command stack
ide-floppy: remove MODE_SENSE_* defines
ide-scsi: cleanup ide_scsi_io_buffers()
ide: add ide_io_buffers() helper
ide-floppy: add ide_floppy_set_media_lock() helper
ide-tape: add ide_tape_set_media_lock() helper
ide: add ide_init_pc() helper
ide: add ide_queue_pc_head() helper
ide: add ide_queue_pc_tail() helper
ide-floppy: ->{srfp,wp} -> IDE_AFLAG_{SRFP,WP}
ide-floppy: move floppy ioctls handling to ide-floppy_ioctl.c
ide: add ide_set_media_lock() helper
ide: add ide_do_start_stop() helper
ide: add ide_do_test_unit_ready() helper
ide: move IDE{FLOPPY,TAPE}_WAIT_CMD defines to <linux/ide.h>
Borislav Petkov (2):
ide-floppy: use scatterlists for pio transfers
ide-generic: handle probing of legacy io-ports v5
Elias Oltmanns (1):
ide: Remove ide_spin_wait_hwgroup() and use special requests instead
FUJITA Tomonori (1):
ide-cd: use the new object_is_in_stack() helper
Linus Torvalds (1):
ide: re-code ide_fixstring() loop to be less evil
Mark de Wever (1):
ide-tape: Buildfix when IDETAPE_DEBUG_LOG is set to 1.
drivers/ata/libata-scsi.c +1 -1
@@ -503,7 +503,7 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) scsi_cmd[0 ] =ATA_16 ; scsi_cmd[4 ] = args[2 ]; -if (args[0 ] ==WIN_SMART ) {/* hack -- ide driver does this too... */ +if (args[0 ] ==ATA_CMD_SMART ) {/* hack -- ide driver does this too */ scsi_cmd[6 ] = args[3 ]; scsi_cmd[8 ] = args[1 ]; scsi_cmd[10 ] =0x4f ;
drivers/block/hd.c +5 -4
@@ -39,6 +39,7 @@#include <linux/ioport.h> #include <linux/init.h> #include <linux/blkpg.h> +#include <linux/ata.h> #include <linux/hdreg.h> #define REALLY_SLOW_IO
@@ -370,7 +371,7 @@ repeat:struct hd_i_struct *disk = &hd_info[i]; disk->special_op = disk->recalibrate =1 ;hd_out (disk, disk->sect, disk->sect, disk->head-1 , - disk->cyl,WIN_SPECIFY , &reset_hd); + disk->cyl,ATA_CMD_INIT_DEV_PARAMS , &reset_hd);if (reset) goto repeat; }else
@@ -558,7 +559,7 @@ static int do_special_op(struct hd_i_struct *disk, struct request *req) {if (disk->recalibrate) { disk->recalibrate =0 ; -hd_out (disk, disk->sect,0 ,0 ,0 ,WIN_RESTORE , &recal_intr); +hd_out (disk, disk->sect,0 ,0 ,0 ,ATA_CMD_RESTORE , &recal_intr);return reset; }if (disk->head >16 ) {
@@ -631,13 +632,13 @@ repeat:if (blk_fs_request (req)) {switch (rq_data_dir (req)) {case READ : -hd_out (disk, nsect, sec, head, cyl,WIN_READ , +hd_out (disk, nsect, sec, head, cyl,ATA_CMD_PIO_READ , &read_intr);if (reset) goto repeat;break ;case WRITE : -hd_out (disk, nsect, sec, head, cyl,WIN_WRITE , +hd_out (disk, nsect, sec, head, cyl,ATA_CMD_PIO_WRITE , &write_intr);if (reset) goto repeat;
drivers/ide/Kconfig +0 -23
@@ -131,29 +131,6 @@ config BLK_DEV_IDEDISK If unsure, say Y. -config IDEDISK_MULTI_MODE - bool "Use multiple sector mode for Programmed Input/Output by default" - help - This setting is irrelevant for most IDE disks, with direct memory - access, to which multiple sector mode does not apply. Multiple sector - mode is a feature of most modern IDE hard drives, permitting the - transfer of multiple sectors per Programmed Input/Output interrupt, - rather than the usual one sector per interrupt. When this feature is - enabled, it can reduce operating system overhead for disk Programmed - Input/Output. On some systems, it also can increase the data - throughput of Programmed Input/Output. Some drives, however, seemed - to run slower with multiple sector mode enabled. Some drives claimed - to support multiple sector mode, but lost data at some settings. - Under rare circumstances, such failures could result in massive - filesystem corruption. - - If you get the following error, try to say Y here: - - hda: set_multmode: status=0x51 { DriveReady SeekComplete Error } - hda: set_multmode: error=0x04 { DriveStatusError } - - If in doubt, say N. - config BLK_DEV_IDECS tristate "PCMCIA IDE support" depends on PCMCIA
drivers/ide/Makefile +4 -3
@@ -4,8 +4,8 @@ EXTRA_CFLAGS += -Idrivers/ide -ide-core-y += ide.o ide-io.o ide-iops.o ide-lib.o ide-probe.o ide-taskfile.o \ - ide-pio-blacklist.o +ide-core-y += ide.o ide-ioctls.o ide-io.o ide-iops.o ide-lib.o ide-probe.o \ + ide-taskfile.o ide-pio-blacklist.o # core IDE code ide-core-$(CONFIG_IDE_TIMINGS) += ide-timings.o
@@ -37,11 +37,12 @@ obj-$(CONFIG_IDE_GENERIC) += ide-generic.o obj-$(CONFIG_BLK_DEV_IDEPNP) += ide-pnp.o ide-cd_mod-y += ide-cd.o ide-cd_ioctl.o ide-cd_verbose.o +ide-floppy_mod-y += ide-floppy.o ide-floppy_ioctl.o obj-$(CONFIG_BLK_DEV_IDEDISK) += ide-disk.o obj-$(CONFIG_BLK_DEV_IDECD) += ide-cd_mod.o +obj-$(CONFIG_BLK_DEV_IDEFLOPPY) += ide-floppy_mod.o obj-$(CONFIG_BLK_DEV_IDETAPE) += ide-tape.o -obj-$(CONFIG_BLK_DEV_IDEFLOPPY) += ide-floppy.o ifeq ($(CONFIG_BLK_DEV_IDECS), y) ide-cs-core-y += legacy/ide-cs.o
drivers/ide/arm/icside.c +2 -3
@@ -10,7 +10,6 @@#include <linux/slab.h> #include <linux/blkdev.h> #include <linux/errno.h> -#include <linux/hdreg.h> #include <linux/ide.h> #include <linux/dma-mapping.h> #include <linux/device.h>
@@ -265,8 +264,8 @@ static void icside_set_dma_mode(ide_drive_t *drive, const u8 xfer_mode)* If we're going to be doing MW_DMA_1 or MW_DMA_2, we should * take care to note the values in the ID... */ -if (use_dma_info && drive->id->eide_dma_time > cycle_time) - cycle_time = drive->id->eide_dma_time; +if (use_dma_info && drive->id[ATA_ID_EIDE_DMA_TIME ] > cycle_time) + cycle_time = drive->id[ATA_ID_EIDE_DMA_TIME ]; drive->drive_data = cycle_time;
drivers/ide/arm/palm_bk3710.c +4 -4
@@ -27,7 +27,6 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/ioport.h> -#include <linux/hdreg.h> #include <linux/ide.h> #include <linux/delay.h> #include <linux/init.h>
@@ -180,7 +179,7 @@ static void palm_bk3710_setpiomode(void __iomem *base, ide_drive_t *mate, val32 |= (t2i << (dev ?8 :0 ));writel (val32, base +BK3710_DATRCVR ); -if (mate && mate->present) { +if (mate) {u8 mode2 =ide_get_best_pio_mode (mate,255 ,4 );if (mode2 < mode)
@@ -213,7 +212,8 @@ static void palm_bk3710_set_dma_mode(ide_drive_t *drive, u8 xferspeed)palm_bk3710_setudmamode (base, is_slave, xferspeed -XFER_UDMA_0 ); }else { -palm_bk3710_setdmamode (base, is_slave, drive->id->eide_dma_min, +palm_bk3710_setdmamode (base, is_slave, + drive->id[ATA_ID_EIDE_DMA_MIN ], xferspeed); } }
@@ -229,7 +229,7 @@ static void palm_bk3710_set_pio_mode(ide_drive_t *drive, u8 pio)* Obtain the drive PIO data for tuning the Palm Chip registers */ cycle_time =ide_pio_cycle_time (drive, pio); - mate =ide_get_paired_drive (drive); + mate =ide_get_pair_dev (drive);palm_bk3710_setpiomode (base, mate, is_slave, cycle_time, pio); }
drivers/ide/ide-acpi.c +3 -3
@@ -584,7 +584,7 @@ void ide_acpi_get_timing(ide_hwif_t *hwif)* This function executes the _STM ACPI method for the target channel. * * _STM requires Identify Drive data, which has to passed as an argument. -* Unfortunately hd_driveid is a mangled version which we can't readily +* Unfortunately drive->id is a mangled version which we can't readily * use; hence we'll get the information afresh. */ void ide_acpi_push_timing (ide_hwif_t *hwif)
@@ -614,10 +614,10 @@ void ide_acpi_push_timing(ide_hwif_t *hwif) in_params[0 ].buffer.length =sizeof (struct GTM_buffer ); in_params[0 ].buffer.pointer = (u8 *)&hwif->acpidata->gtm; in_params[1 ].type =ACPI_TYPE_BUFFER ; - in_params[1 ].buffer.length =sizeof (struct hd_driveid ); + in_params[1 ].buffer.length =sizeof (ATA_ID_WORDS *2 ); in_params[1 ].buffer.pointer = (u8 *)&master->idbuff; in_params[2 ].type =ACPI_TYPE_BUFFER ; - in_params[2 ].buffer.length =sizeof (struct hd_driveid ); + in_params[2 ].buffer.length =sizeof (ATA_ID_WORDS *2 ); in_params[2 ].buffer.pointer = (u8 *)&slave->idbuff;/* Output buffer: _STM has no output */
drivers/ide/ide-atapi.c +216 -20
321 lines not on this page · raw message
drivers/ide/ide-cd.c +33 -39
207 lines not on this page · raw message
drivers/ide/ide-disk.c +126 -214
634 lines not on this page · raw message
drivers/ide/ide-dma.c +28 -24
137 lines not on this page · raw message
drivers/ide/ide-floppy.c +109 -559
1,006 lines not on this page · raw message
drivers/ide/ide-floppy.h new file +63 -0
63 lines not on this page · raw message
drivers/ide/ide-floppy_ioctl.c new file +243 -0
243 lines not on this page · raw message
drivers/ide/ide-generic.c +51 -4
83 lines not on this page · raw message
drivers/ide/ide-io.c +73 -44
139 lines not on this page · raw message
drivers/ide/ide-ioctls.c new file +290 -0
290 lines not on this page · raw message
drivers/ide/ide-iops.c +67 -158
225 lines not on this page · raw message
drivers/ide/ide-lib.c +37 -36
73 lines not on this page · raw message
drivers/ide/ide-probe.c +119 -133
252 lines not on this page · raw message
drivers/ide/ide-proc.c +93 -213
306 lines not on this page · raw message
drivers/ide/ide-tape.c +134 -344
478 lines not on this page · raw message
drivers/ide/ide-taskfile.c +27 -129
156 lines not on this page · raw message
drivers/ide/ide.c +29 -209
238 lines not on this page · raw message
drivers/ide/pci/cmd640.c +20 -23
43 lines not on this page · raw message
drivers/ide/pci/hpt366.c +43 -34
77 lines not on this page · raw message
drivers/ide/pci/it821x.c +29 -29
58 lines not on this page · raw message
drivers/scsi/ide-scsi.c +47 -73
120 lines not on this page · raw message
include/linux/ata.h +111 -1
112 lines not on this page · raw message
include/linux/ide.h +203 -113
316 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.