Skip to contentSkip to conversation

IDE updates part #4

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 3 messages Feb 2, 2008 – Feb 6, 2008

Subsystems (5)
Documentation SCSI PowerPC libata +1 more subsystems
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 IDE updates part #4

This time:

* ide-floppy/ide-tape revamps similar to previous ide-cd redux (Borislav Petkov)

* next part of IDE probing code re-organization saga (that would be me)

* misc cleanups/fixes

As a result drivers/ide/ shrinks by ~1300 LOC...

Linus, please pull from:

master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/

to receive the following updates:

 Documentation/ide/ChangeLog.ide-tape.1995-2002 |  257 +++++
 Documentation/ide/ide-tape.txt                 |  146 +++
 drivers/ide/Kconfig                            |    3 +-
 drivers/ide/arm/bast-ide.c                     |   20 +-
 drivers/ide/arm/icside.c                       |   25 +-
 drivers/ide/arm/ide_arm.c                      |    2 +-
 drivers/ide/arm/rapide.c                       |    4 +-
 drivers/ide/cris/ide-cris.c                    |   24 +-
 drivers/ide/h8300/ide-h8300.c                  |    2 +-
 drivers/ide/ide-acpi.c                         |   63 +-
 drivers/ide/ide-cd.c                           |    2 -
 drivers/ide/ide-dma.c                          |   20 +
 drivers/ide/ide-floppy.c                       | 1438 +++++++++---------------
 drivers/ide/ide-generic.c                      |    2 +-
 drivers/ide/ide-iops.c                         |  109 +--
 drivers/ide/ide-pnp.c                          |    9 +-
 drivers/ide/ide-probe.c                        |  278 ++++--
 drivers/ide/ide-proc.c                         |    7 +-
 drivers/ide/ide-tape.c                         | 1240 ++++-----------------
 drivers/ide/ide-taskfile.c                     |   11 +-
 drivers/ide/ide.c                              |   77 +-
 drivers/ide/legacy/ali14xx.c                   |   24 +-
 drivers/ide/legacy/buddha.c                    |    2 +-
 drivers/ide/legacy/dtc2278.c                   |   36 +-
 drivers/ide/legacy/falconide.c                 |    2 +-
 drivers/ide/legacy/gayle.c                     |    2 +-
 drivers/ide/legacy/ht6560b.c                   |   48 +-
 drivers/ide/legacy/ide-cs.c                    |   29 +-
 drivers/ide/legacy/ide_platform.c              |    4 +-
 drivers/ide/legacy/macide.c                    |   12 +-
 drivers/ide/legacy/q40ide.c                    |    2 +-
 drivers/ide/legacy/qd65xx.c                    |   67 +-
 drivers/ide/legacy/umc8672.c                   |   24 +-
 drivers/ide/mips/au1xxx-ide.c                  |   37 +-
 drivers/ide/mips/swarm.c                       |    2 +-
 drivers/ide/pci/aec62xx.c                      |   26 +-
 drivers/ide/pci/alim15x3.c                     |    6 +-
 drivers/ide/pci/amd74xx.c                      |   21 +-
 drivers/ide/pci/atiixp.c                       |   30 +-
 drivers/ide/pci/cmd640.c                       |   33 +-
 drivers/ide/pci/cmd64x.c                       |    6 +-
 drivers/ide/pci/cs5520.c                       |   12 +-
 drivers/ide/pci/cs5530.c                       |    8 +-
 drivers/ide/pci/cs5535.c                       |   10 +-
 drivers/ide/pci/cy82c693.c                     |    1 -
 drivers/ide/pci/delkin_cb.c                    |   41 +-
 drivers/ide/pci/generic.c                      |    7 -
 drivers/ide/pci/hpt34x.c                       |    7 -
 drivers/ide/pci/hpt366.c                       |   89 +-
 drivers/ide/pci/it8213.c                       |   24 +-
 drivers/ide/pci/it821x.c                       |    8 +-
 drivers/ide/pci/jmicron.c                      |    9 +-
 drivers/ide/pci/ns87415.c                      |    4 -
 drivers/ide/pci/opti621.c                      |   15 +-
 drivers/ide/pci/pdc202xx_new.c                 |   14 +-
 drivers/ide/pci/pdc202xx_old.c                 |   17 +-
 drivers/ide/pci/piix.c                         |    9 +-
 drivers/ide/pci/rz1000.c                       |   10 +-
 drivers/ide/pci/sc1200.c                       |    8 +-
 drivers/ide/pci/scc_pata.c                     |   10 +-
 drivers/ide/pci/serverworks.c                  |   11 +-
 drivers/ide/pci/sgiioc4.c                      |   20 +-
 drivers/ide/pci/siimage.c                      |   31 +-
 drivers/ide/pci/sis5513.c                      |   14 +-
 drivers/ide/pci/sl82c105.c                     |    6 -
 drivers/ide/pci/slc90e66.c                     |   26 +-
 drivers/ide/pci/tc86c001.c                     |   24 +-
 drivers/ide/pci/triflex.c                      |    5 -
 drivers/ide/pci/trm290.c                       |    7 +-
 drivers/ide/pci/via82cxxx.c                    |   10 +-
 drivers/ide/ppc/mpc8xx.c                       |    2 +-
 drivers/ide/ppc/pmac.c                         |   84 +-
 drivers/ide/setup-pci.c                        |   77 +-
 drivers/macintosh/mediabay.c                   |    2 +-
 drivers/scsi/ide-scsi.c                        |    9 +-
 include/linux/hdreg.h                          |    4 +-
 include/linux/ide.h                            |   51 +-
 77 files changed, 1989 insertions(+), 2849 deletions(-)
 create mode 100644 Documentation/ide/ChangeLog.ide-tape.1995-2002
 create mode 100644 Documentation/ide/ide-tape.txt

Alan Cox (1):
pdc202xx_old: remove surplus initialiser

Bartlomiej Zolnierkiewicz (50):
dtc2278: fix ->io_32bit handling
au1xxx-ide: fix ->io_32bit handling
atiixp/cs5535/scc_pata: fix "idex=ata66" parameter handling
macide: remove drive->capacity64 quirk
ide: always set DMA masks in ide_pci_setup_ports()
ide: separate PCI specific init from generic init in ide_pci_setup_ports()
ide: add struct ide_port_info instances to legacy host drivers
ide: add ->cable_detect method to ide_hwif_t
ide: remove needless includes from PCI host drivers
ide: remove redundant hwif->present check from ide_register_hw()
ide: remove redundant init_hwif_default() call from ide_register_hw()
ide: add 'init_default' and 'restore' arguments to ide_unregister()
ide: add ide_deprecated_find_port() helper
ide: fix ide_unregister() usage in host drivers
ide: factor out code initializing devices from ide_init_port()
ide: add IDE_HFLAG_NO_{IO32_BIT,UNMASK_IRQS} host flags
ide: add ->port_init_devs method to ide_hwif_t
ide: remove incorrect init_gendisk() comment
ide: skip not present devices in init_gendisk()
ide: move blk_register_region() call out from init_gendisk()
ide: call init_gendisk() after ide_acpi_init()
ide: merge init_gendisk() into hwif_register_devices()
ide: move hwif->rqsize init from ide_init_queue() to init_irq()
ide: factor out adding drive to hwgroup from init_irq()
ide: factor out devices setup from init_irq()
ide: move ide_acpi_init() call to ide_device_add_all()
ide-acpi: remove needless exports
ide-acpi: remove dead code from do_drive_get_GTF()
ide: factor out devices setup from ide_acpi_init()
ide: move hwif->present check out from ide_proc_register_port()
ide: move create_proc_ide_drives() call to ide_device_add_all()
ide-tape: use ide_execute_command()
ide-scsi: use ide_execute_command()
trm290: use ide_execute_command()
ide-cris: use ide_execute_command()
ide-probe: remove needless Status register reads
ide: remove unused ->auto_poll field from ide_hwif_t
ide: convert ->straight8 field in ide_hwif_t to bit flag
ide: remove ->nice0 and ->nice2 fields from ide_drive_t
ide: remove SATA_*_REG macros
ide: use __ide_set_handler() in ide_execute_command()
ide-scsi: remove needless SELECT_DRIVE() call
ide: unexport SELECT_DRIVE()
ide: remove set_transfer()
ide: remove ide_ata66_check()
ide: move drive->crc_count check out from check_dma_crc()
ide: remove ide_auto_reduce_xfer()
ide: move check_dma_crc() to ide-dma.c
ide-cs: use ide_std_init_ports()
ide-tape: dump gcw fields on error in idetape_identify_device()

Borislav Petkov (44):
ide-floppy: convert to generic packet commands
ide-floppy: replace ntoh{s,l} and hton{s,l} calls with the generic byteorder
ide-floppy: remove unnecessary ->handler != NULL check
ide-floppy: disambiguate function names
ide-floppy: include the proper headers
ide-floppy: cleanup and unify debugging macro calls
ide-floppy: remove struct idefloppy_capabilities_page
ide-floppy: remove struct idefloppy_inquiry_result
ide-floppy: remove struct idefloppy_request_sense_result
ide-floppy: remove struct idefloppy_mode_parameter_header
ide-floppy: remove struct idefloppy_flexible_disk_page
ide-floppy: remove struct idefloppy_capacity_descriptor
ide-floppy: factor out ioctl handlers from idefloppy_ioctl()
ide-floppy: report DMA handling in idefloppy_pc_intr() properly
ide-floppy: mv idefloppy_{should_,}report_error
ide-floppy: remove IDEFLOPPY_DEBUG_BUGS macro
ide-floppy: use an xfer_func_t and io_buf_t typedefs in order to unify rw
ide-floppy: merge idefloppy_{input,output}_buffers
ide-floppy: remove unused IDEFLOPPY_USE_READ12
ide-floppy: remove IDEFLOPPY_DEBUG_INFO
ide-floppy: remove unused flag PC_ABORT
ide-floppy: remove atomic test_*bit macros
ide-floppy: fix most of the remaining checkpatch.pl issues
ide-floppy: bump driver version number
ide-tape: move historical changelog to Documentation/ide/ChangeLog.ide-tape.1995-2002
ide-tape: remove dead code
ide-tape: remove struct idetape_request_sense_result_t
ide-tape: remove struct idetape_mode_parameter_header_t
ide-tape: remove IDETAPE_DEBUG_INFO
ide-tape: remove IDETAPE_DEBUG_BUGS
ide-tape: remove struct idetape_capabilities_page_t
ide-tape: remove struct idetape_inquiry_result_t
ide-tape: remove struct idetape_data_compression_page_t
ide-tape: remove struct idetape_medium_partition_page_t
ide-tape: remove struct idetape_parameter_block_descriptor_t
ide-tape: remove structs os_partition_t, os_dat_entry_t, os_dat_t
ide-tape: remove struct idetape_block_size_page_t
ide-tape: use generic scsi commands
ide-tape: remove EXPERIMENTAL driver status
ide-tape: use generic byteorder macros
ide-tape: remove unused sense packet commands.
ide-tape: make function name more accurate
ide-tape: remove mtio.h related comments
ide-tape: remove idetape_config_t typedef

Documentation/ide/ChangeLog.ide-tape.1995-2002 new file +257 -0
new file mode 100644
index 0000000..877fac8
@@ -0,0 +1,257 @@
+/*
+ * Ver 0.1   Nov  1 95   Pre-working code :-)
+ * Ver 0.2   Nov 23 95   A short backup (few megabytes) and restore procedure
+ *                        was successful ! (Using tar cvf ... on the block
+ *                        device interface).
+ *                       A longer backup resulted in major swapping, bad
+ *                        overall Linux performance and eventually failed as
+ *                        we received non serial read-ahead requests from the
+ *                        buffer cache.
+ * Ver 0.3   Nov 28 95   Long backups are now possible, thanks to the
+ *                        character device interface. Linux's responsiveness
+ *                        and performance doesn't seem to be much affected
+ *                        from the background backup procedure.
+ *                       Some general mtio.h magnetic tape operations are
+ *                        now supported by our character device. As a result,
+ *                        popular tape utilities are starting to work with
+ *                        ide tapes :-)
+ *                       The following configurations were tested:
+ *                       1. An IDE ATAPI TAPE shares the same interface
+ *                        and irq with an IDE ATAPI CDROM.
+ *                       2. An IDE ATAPI TAPE shares the same interface
+ *                        and irq with a normal IDE disk.
+ *                        Both configurations seemed to work just fine !
+ *                        However, to be on the safe side, it is meanwhile
+ *                        recommended to give the IDE TAPE its own interface
+ *                        and irq.
+ *                       The one thing which needs to be done here is to
+ *                        add a "request postpone" feature to ide.c,
+ *                        so that we won't have to wait for the tape to finish
+ *                        performing a long media access (DSC) request (such
+ *                        as a rewind) before we can access the other device
+ *                        on the same interface. This effect doesn't disturb
+ *                        normal operation most of the time because read/write
+ *                        requests are relatively fast, and once we are
+ *                        performing one tape r/w request, a lot of requests
+ *                        from the other device can be queued and ide.c will
+ *			  service all of them after this single tape request.
+ * Ver 1.0   Dec 11 95   Integrated into Linux 1.3.46 development tree.
+ *                       On each read / write request, we now ask the drive
+ *                        if we can transfer a constant number of bytes
+ *                        (a parameter of the drive) only to its buffers,
+ *                        without causing actual media access. If we can't,
+ *                        we just wait until we can by polling the DSC bit.
+ *                        This ensures that while we are not transferring
+ *                        more bytes than the constant referred to above, the
+ *                        interrupt latency will not become too high and
+ *                        we won't cause an interrupt timeout, as happened
+ *                        occasionally in the previous version.
+ *                       While polling for DSC, the current request is
+ *                        postponed and ide.c is free to handle requests from
+ *                        the other device. This is handled transparently to
+ *                        ide.c. The hwgroup locking method which was used
+ *                        in the previous version was removed.
+ *                       Use of new general features which are provided by
+ *                        ide.c for use with atapi devices.
+ *                        (Programming done by Mark Lord)
+ *                       Few potential bug fixes (Again, suggested by Mark)
+ *                       Single character device data transfers are now
+ *                        not limited in size, as they were before.
+ *                       We are asking the tape about its recommended
+ *                        transfer unit and send a larger data transfer
+ *                        as several transfers of the above size.
+ *                        For best results, use an integral number of this
+ *                        basic unit (which is shown during driver
+ *                        initialization). I will soon add an ioctl to get
+ *                        this important parameter.
+ *                       Our data transfer buffer is allocated on startup,
+ *                        rather than before each data transfer. This should
+ *                        ensure that we will indeed have a data buffer.
+ * Ver 1.1   Dec 14 95   Fixed random problems which occurred when the tape
+ *                        shared an interface with another device.
+ *                        (poll_for_dsc was a complete mess).
+ *                       Removed some old (non-active) code which had
+ *                        to do with supporting buffer cache originated
+ *                        requests.
+ *                       The block device interface can now be opened, so
+ *                        that general ide driver features like the unmask
+ *                        interrupts flag can be selected with an ioctl.
+ *                        This is the only use of the block device interface.
+ *                       New fast pipelined operation mode (currently only on
+ *                        writes). When using the pipelined mode, the
+ *                        throughput can potentially reach the maximum
+ *                        tape supported throughput, regardless of the
+ *                        user backup program. On my tape drive, it sometimes
+ *                        boosted performance by a factor of 2. Pipelined
+ *                        mode is enabled by default, but since it has a few
+ *                        downfalls as well, you may want to disable it.
+ *                        A short explanation of the pipelined operation mode
+ *                        is available below.
+ * Ver 1.2   Jan  1 96   Eliminated pipelined mode race condition.
+ *                       Added pipeline read mode. As a result, restores
+ *                        are now as fast as backups.
+ *                       Optimized shared interface behavior. The new behavior
+ *                        typically results in better IDE bus efficiency and
+ *                        higher tape throughput.
+ *                       Pre-calculation of the expected read/write request
+ *                        service time, based on the tape's parameters. In
+ *                        the pipelined operation mode, this allows us to
+ *                        adjust our polling frequency to a much lower value,
+ *                        and thus to dramatically reduce our load on Linux,
+ *                        without any decrease in performance.
+ *                       Implemented additional mtio.h operations.
+ *                       The recommended user block size is returned by
+ *                        the MTIOCGET ioctl.
+ *                       Additional minor changes.
+ * Ver 1.3   Feb  9 96   Fixed pipelined read mode bug which prevented the
+ *                        use of some block sizes during a restore procedure.
+ *                       The character device interface will now present a
+ *                        continuous view of the media - any mix of block sizes
+ *                        during a backup/restore procedure is supported. The
+ *                        driver will buffer the requests internally and
+ *                        convert them to the tape's recommended transfer
+ *                        unit, making performance almost independent of the
+ *                        chosen user block size.
+ *                       Some improvements in error recovery.
+ *                       By cooperating with ide-dma.c, bus mastering DMA can
+ *                        now sometimes be used with IDE tape drives as well.
+ *                        Bus mastering DMA has the potential to dramatically
+ *                        reduce the CPU's overhead when accessing the device,
+ *                        and can be enabled by using hdparm -d1 on the tape's
+ *                        block device interface. For more info, read the
+ *                        comments in ide-dma.c.
+ * Ver 1.4   Mar 13 96   Fixed serialize support.
+ * Ver 1.5   Apr 12 96   Fixed shared interface operation, broken in 1.3.85.
+ *                       Fixed pipelined read mode inefficiency.
+ *                       Fixed nasty null dereferencing bug.
+ * Ver 1.6   Aug 16 96   Fixed FPU usage in the driver.
+ *                       Fixed end of media bug.
+ * Ver 1.7   Sep 10 96   Minor changes for the CONNER CTT8000-A model.
+ * Ver 1.8   Sep 26 96   Attempt to find a better balance between good
+ *                        interactive response and high system throughput.
+ * Ver 1.9   Nov  5 96   Automatically cross encountered filemarks rather
+ *                        than requiring an explicit FSF command.
+ *                       Abort pending requests at end of media.
+ *                       MTTELL was sometimes returning incorrect results.
+ *                       Return the real block size in the MTIOCGET ioctl.
+ *                       Some error recovery bug fixes.
+ * Ver 1.10  Nov  5 96   Major reorganization.
+ *                       Reduced CPU overhead a bit by eliminating internal
+ *                        bounce buffers.
+ *                       Added module support.
+ *                       Added multiple tape drives support.
+ *                       Added partition support.
+ *                       Rewrote DSC handling.
+ *                       Some portability fixes.
+ *                       Removed ide-tape.h.
+ *                       Additional minor changes.
+ * Ver 1.11  Dec  2 96   Bug fix in previous DSC timeout handling.
+ *                       Use ide_stall_queue() for DSC overlap.
+ *                       Use the maximum speed rather than the current speed
+ *                        to compute the request service time.
+ * Ver 1.12  Dec  7 97   Fix random memory overwriting and/or last block data
+ *                        corruption, which could occur if the total number
+ *                        of bytes written to the tape was not an integral
+ *                        number of tape blocks.
+ *                       Add support for INTERRUPT DRQ devices.
+ * Ver 1.13  Jan  2 98   Add "speed == 0" work-around for HP COLORADO 5GB
+ * Ver 1.14  Dec 30 98   Partial fixes for the Sony/AIWA tape drives.
+ *                       Replace cli()/sti() with hwgroup spinlocks.
+ * Ver 1.15  Mar 25 99   Fix SMP race condition by replacing hwgroup
+ *                        spinlock with private per-tape spinlock.
+ * Ver 1.16  Sep  1 99   Add OnStream tape support.
+ *                       Abort read pipeline on EOD.
+ *                       Wait for the tape to become ready in case it returns
+ *                        "in the process of becoming ready" on open().
+ *                       Fix zero padding of the last written block in
+ *                        case the tape block size is larger than PAGE_SIZE.
+ *                       Decrease the default disconnection time to tn.
+ * Ver 1.16e Oct  3 99   Minor fixes.
+ * Ver 1.16e1 Oct 13 99  Patches by Arnold Niessen,
+ *                          [email protected] / [email protected]
+ *                   GO-1)  Undefined code in idetape_read_position
+ *				according to Gadi's email
+ *                   AJN-1) Minor fix asc == 11 should be asc == 0x11
+ *                               in idetape_issue_packet_command (did effect
+ *                               debugging output only)
+ *                   AJN-2) Added more debugging output, and
+ *                              added ide-tape: where missing. I would also
+ *				like to add tape->name where possible
+ *                   AJN-3) Added different debug_level's
+ *                              via /proc/ide/hdc/settings
+ *				"debug_level" determines amount of debugging output;
+ *				can be changed using /proc/ide/hdx/settings
+ *				0 : almost no debugging output
+ *				1 : 0+output errors only
+ *				2 : 1+output all sensekey/asc
+ *				3 : 2+follow all chrdev related procedures
+ *				4 : 3+follow all procedures
+ *				5 : 4+include pc_stack rq_stack info
+ *				6 : 5+USE_COUNT updates
+ *                   AJN-4) Fixed timeout for retension in idetape_queue_pc_tail
+ *				from 5 to 10 minutes
+ *                   AJN-5) Changed maximum number of blocks to skip when
+ *                              reading tapes with multiple consecutive write
+ *                              errors from 100 to 1000 in idetape_get_logical_blk
+ *                   Proposed changes to code:
+ *                   1) output "logical_blk_num" via /proc
+ *                   2) output "current_operation" via /proc
+ *                   3) Either solve or document the fact that `mt rewind' is
+ *                      required after reading from /dev/nhtx to be
+ *			able to rmmod the idetape module;
+ *			Also, sometimes an application finishes but the
+ *			device remains `busy' for some time. Same cause ?
+ *                   Proposed changes to release-notes:
+ *		     4) write a simple `quickstart' section in the
+ *                      release notes; I volunteer if you don't want to
+ *		     5) include a pointer to video4linux in the doc
+ *                      to stimulate video applications
+ *                   6) release notes lines 331 and 362: explain what happens
+ *			if the application data rate is higher than 1100 KB/s;
+ *			similar approach to lower-than-500 kB/s ?
+ *		     7) 6.6 Comparison; wouldn't it be better to allow different
+ *			strategies for read and write ?
+ *			Wouldn't it be better to control the tape buffer
+ *			contents instead of the bandwidth ?
+ *		     8) line 536: replace will by would (if I understand
+ *			this section correctly, a hypothetical and unwanted situation
+ *			 is being described)
+ * Ver 1.16f Dec 15 99   Change place of the secondary OnStream header frames.
+ * Ver 1.17  Nov 2000 / Jan 2001  Marcel Mol, [email protected]
+ *			- Add idetape_onstream_mode_sense_tape_parameter_page
+ *			  function to get tape capacity in frames: tape->capacity.
+ *			- Add support for DI-50 drives( or any DI- drive).
+ *			- 'workaround' for read error/blank block around block 3000.
+ *			- Implement Early warning for end of media for Onstream.
+ *			- Cosmetic code changes for readability.
+ *			- Idetape_position_tape should not use SKIP bit during
+ *			  Onstream read recovery.
+ *			- Add capacity, logical_blk_num and first/last_frame_position
+ *			  to /proc/ide/hd?/settings.
+ *			- Module use count was gone in the Linux 2.4 driver.
+ * Ver 1.17a Apr 2001 Willem Riede [email protected]
+ *			- Get drive's actual block size from mode sense block descriptor
+ *			- Limit size of pipeline
+ * Ver 1.17b Oct 2002   Alan Stern <[email protected]>
+ *			Changed IDETAPE_MIN_PIPELINE_STAGES to 1 and actually used
+ *			 it in the code!
+ *			Actually removed aborted stages in idetape_abort_pipeline
+ *			 instead of just changing the command code.
+ *			Made the transfer byte count for Request Sense equal to the
+ *			 actual length of the data transfer.
+ *			Changed handling of partial data transfers: they do not
+ *			 cause DMA errors.
+ *			Moved initiation of DMA transfers to the correct place.
+ *			Removed reference to unallocated memory.
+ *			Made __idetape_discard_read_pipeline return the number of
+ *			 sectors skipped, not the number of stages.
+ *			Replaced errant kfree() calls with __idetape_kfree_stage().
+ *			Fixed off-by-one error in testing the pipeline length.
+ *			Fixed handling of filemarks in the read pipeline.
+ *			Small code optimization for MTBSF and MTBSFM ioctls.
+ *			Don't try to unlock the door during device close if is
+ *			 already unlocked!
+ *			Cosmetic fixes to miscellaneous debugging output messages.
+ *			Set the minimum /proc/ide/hd?/settings values for "pipeline",
+ *			 "pipeline_min", and "pipeline_max" to 1.
+ */
Documentation/ide/ide-tape.txt new file +146 -0

146 lines not on this page · raw message

drivers/ide/Kconfig +1 -2
index e42a465..45b26ed 100644
@@ -216,8 +216,7 @@ config BLK_DEV_IDECD_VERBOSE_ERRORS
 	  memory, though.
 
 config BLK_DEV_IDETAPE
-	tristate "Include IDE/ATAPI TAPE support (EXPERIMENTAL)"
-	depends on EXPERIMENTAL
+	tristate "Include IDE/ATAPI TAPE support"
 	help
 	  If you have an IDE tape drive using the ATAPI protocol, say Y.
 	  ATAPI is a newer protocol used by IDE tape and CD-ROM drives,
drivers/ide/arm/bast-ide.c +19 -1
index 037300f..0e7574c 100644
@@ -28,8 +28,10 @@ static int __init
 bastide_register(unsigned int base, unsigned int aux, int irq,
 		 ide_hwif_t **hwif)
 {
+	ide_hwif_t *hwif;
 	hw_regs_t hw;
 	int i;
+	u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
 	memset(&hw, 0, sizeof(hw));
 
@@ -44,8 +46,24 @@ bastide_register(unsigned int base, unsigned int aux, int irq,
 	hw.io_ports[IDE_CONTROL_OFFSET] = aux + (6 * 0x20);
 	hw.irq = irq;
 
-	ide_register_hw(&hw, NULL, hwif);
+	hwif = ide_deprecated_find_port(hw.io_ports[IDE_DATA_OFFSET]);
+	if (hwif == NULL)
+		goto out;
 
+	i = hwif->index;
+
+	if (hwif->present)
+		ide_unregister(i, 0, 0);
+	else if (!hwif->hold)
+		ide_init_port_data(hwif, i);
+
+	ide_init_port_hw(hwif, &hw);
+	hwif->quirkproc = NULL;
+
+	idx[0] = i;
+
+	ide_device_add(idx, NULL);
+out:
 	return 0;
 }
 
drivers/ide/arm/icside.c +13 -12
index 8d2cc47..fb00f38 100644
@@ -377,9 +377,6 @@ static void icside_dma_lost_irq(ide_drive_t *drive)
 
 static void icside_dma_init(ide_hwif_t *hwif)
 {
-	hwif->mwdma_mask	= 7; /* MW0..2 */
-	hwif->swdma_mask	= 7; /* SW0..2 */
-
 	hwif->dmatable_cpu	= NULL;
 	hwif->dmatable_dma	= 0;
 	hwif->set_dma_mode	= icside_set_dma_mode;
@@ -459,11 +456,19 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 
 	idx[0] = hwif->index;
 
-	ide_device_add(idx);
+	ide_device_add(idx, NULL);
 
 	return 0;
 }
 
+static const struct ide_port_info icside_v6_port_info __initdata = {
+	.host_flags		= IDE_HFLAG_SERIALIZE |
+				  IDE_HFLAG_NO_DMA | /* no SFF-style DMA */
+				  IDE_HFLAG_NO_AUTOTUNE,
+	.mwdma_mask		= ATA_MWDMA2,
+	.swdma_mask		= ATA_SWDMA2,
+};
+
 static int __init
 icside_register_v6(struct icside_state *state, struct expansion_card *ec)
 {
@@ -472,6 +477,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
 	unsigned int sel = 0;
 	int ret;
 	u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
+	struct ide_port_info d = icside_v6_port_info;
 
 	ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
 	if (!ioc_base) {
@@ -521,30 +527,25 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
 	state->hwif[1]    = mate;
 
 	hwif->maskproc    = icside_maskproc;
-	hwif->channel     = 0;
 	hwif->hwif_data   = state;
-	hwif->mate        = mate;
-	hwif->serialized  = 1;
 	hwif->config_data = (unsigned long)ioc_base;
 	hwif->select_data = sel;
 
 	mate->maskproc    = icside_maskproc;
-	mate->channel     = 1;
 	mate->hwif_data   = state;
-	mate->mate        = hwif;
-	mate->serialized  = 1;
 	mate->config_data = (unsigned long)ioc_base;
 	mate->select_data = sel | 1;
 
 	if (ec->dma != NO_DMA && !request_dma(ec->dma, hwif->name)) {
 		icside_dma_init(hwif);
 		icside_dma_init(mate);
-	}
+	} else
+		d.mwdma_mask = d.swdma_mask = 0;
 
 	idx[0] = hwif->index;
 	idx[1] = mate->index;
 
-	ide_device_add(idx);
+	ide_device_add(idx, &d);
 
 	return 0;
 
drivers/ide/arm/ide_arm.c +1 -1
index 60f2497..43a70e9 100644
@@ -39,7 +39,7 @@ static int __init ide_arm_init(void)
 		ide_init_port_hw(hwif, &hw);
 		idx[0] = hwif->index;
 
-		ide_device_add(idx);
+		ide_device_add(idx, NULL);
 	}
 
 	return 0;
drivers/ide/arm/rapide.c +2 -2
index c8b6581..efba00d 100644
@@ -58,7 +58,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
 
 		idx[0] = hwif->index;
 
-		ide_device_add(idx);
+		ide_device_add(idx, NULL);
 
 		ecard_set_drvdata(ec, hwif);
 		goto out;
@@ -76,7 +76,7 @@ static void __devexit rapide_remove(struct expansion_card *ec)
 
 	ecard_set_drvdata(ec, NULL);
 
-	ide_unregister(hwif->index);
+	ide_unregister(hwif->index, 0, 0);
 
 	ecard_release_resources(ec);
 }
drivers/ide/cris/ide-cris.c +11 -13
index 0640a38..00587a8 100644
@@ -753,6 +753,15 @@ static void cris_set_dma_mode(ide_drive_t *drive, const u8 speed)
 		cris_ide_set_speed(TYPE_DMA, 0, strobe, hold);
 }
 
+static const struct ide_port_info cris_port_info __initdata = {
+	.chipset		= ide_etrax100,
+	.host_flags		= IDE_HFLAG_NO_ATAPI_DMA |
+				  IDE_HFLAG_NO_DMA, /* no SFF-style DMA */
+	.pio_mask		= ATA_PIO4,
+	.udma_mask		= cris_ultra_mask,
+	.mwdma_mask		= ATA_MWDMA2,
+};
+
 static int __init init_e100_ide(void)
 {
 	hw_regs_t hw;
@@ -780,7 +789,6 @@ static int __init init_e100_ide(void)
 		ide_init_port_data(hwif, hwif->index);
 		ide_init_port_hw(hwif, &hw);
 		hwif->mmio = 1;
-		hwif->chipset = ide_etrax100;
 		hwif->set_pio_mode = &cris_set_pio_mode;
 		hwif->set_dma_mode = &cris_set_dma_mode;
 		hwif->ata_input_data = &cris_ide_input_data;
@@ -799,12 +807,6 @@ static int __init init_e100_ide(void)
 		hwif->INB = &cris_ide_inb;
 		hwif->INW = &cris_ide_inw;
 		hwif->cbl = ATA_CBL_PATA40;
-		hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
-		hwif->pio_mask = ATA_PIO4,
-		hwif->drives[0].autotune = 1;
-		hwif->drives[1].autotune = 1;
-		hwif->ultra_mask = cris_ultra_mask;
-		hwif->mwdma_mask = 0x07; /* Multiword DMA 0-2 */
 
 		idx[h] = hwif->index;
 	}
@@ -820,7 +822,7 @@ static int __init init_e100_ide(void)
 	cris_ide_set_speed(TYPE_DMA, 0, ATA_DMA2_STROBE, ATA_DMA2_HOLD);
 	cris_ide_set_speed(TYPE_UDMA, ATA_UDMA2_CYC, ATA_UDMA2_DVS, 0);
 
-	ide_device_add(idx);
+	ide_device_add(idx, &cris_port_info);
 
 	return 0;
 }
@@ -1032,11 +1034,7 @@ static int cris_dma_setup(ide_drive_t *drive)
 
 static void cris_dma_exec_cmd(ide_drive_t *drive, u8 command)
 {
-	/* set the irq handler which will finish the request when DMA is done */
-	ide_set_handler(drive, &cris_dma_intr, WAIT_CMD, NULL);
-
-	/* issue cmd to drive */
-	cris_ide_outb(command, IDE_COMMAND_REG);
+	ide_execute_command(drive, command, &cris_dma_intr, WAIT_CMD, NULL);
 }
 
 static void cris_dma_start(ide_drive_t *drive)
drivers/ide/h8300/ide-h8300.c +1 -1
index 0243295..520aec0 100644
@@ -114,7 +114,7 @@ static int __init h8300_ide_init(void)
 
 	idx[0] = index;
 
-	ide_device_add(idx);
+	ide_device_add(idx, NULL);
 
 	return 0;
 
drivers/ide/ide-acpi.c +20 -43

128 lines not on this page · raw message

drivers/ide/ide-cd.c +0 -2
index 23074e8..ee4d458 100644
@@ -604,8 +604,6 @@ static ide_startstop_t cdrom_transfer_packet_command (ide_drive_t *drive,
  * Block read functions.
  */
 
-typedef void (xfer_func_t)(ide_drive_t *, void *, u32);
-
 static void ide_cd_pad_transfer(ide_drive_t *drive, xfer_func_t *xf, int len)
 {
 	while (len > 0) {
drivers/ide/ide-dma.c +20 -0
index 7beaf1e..3cf59f2 100644
@@ -819,6 +819,26 @@ int ide_set_dma(ide_drive_t *drive)
 	return 0;
 }
 
+void ide_check_dma_crc(ide_drive_t *drive)
+{
+	u8 mode;
+
+	ide_dma_off_quietly(drive);
+	drive->crc_count = 0;
+	mode = drive->current_speed;
+	/*
+	 * Don't try non Ultra-DMA modes without iCRC's.  Force the
+	 * device to PIO and make the user enable SWDMA/MWDMA modes.
+	 */
+	if (mode > XFER_UDMA_0 && mode <= XFER_UDMA_7)
+		mode--;
+	else
+		mode = XFER_PIO_4;
+	ide_set_xfer_rate(drive, mode);
+	if (drive->current_speed >= XFER_SW_DMA_0)
+		ide_dma_on(drive);
+}
+
 #ifdef CONFIG_BLK_DEV_IDEDMA_PCI
 void ide_dma_lost_irq (ide_drive_t *drive)
 {
drivers/ide/ide-floppy.c +561 -877

2,232 lines not on this page · raw message

drivers/ide/ide-generic.c +1 -1
index bb30c29..be469db 100644
@@ -23,7 +23,7 @@ static int __init ide_generic_init(void)
 	for (i = 0; i < MAX_HWIFS; i++)
 		idx[i] = ide_hwifs[i].present ? 0xff : i;
 
-	ide_device_add_all(idx);
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

drivers/ide/ide-iops.c +16 -93

109 lines not on this page · raw message

drivers/ide/ide-pnp.c +5 -4
index 4bda5cf..b163b2e 100644

Lines of this file are not shown. View the raw message.

drivers/ide/ide-probe.c +193 -85

278 lines not on this page · raw message

drivers/ide/ide-proc.c +1 -6
index 00c249c..975c0ff 100644

Lines of this file are not shown. View the raw message.

drivers/ide/ide-tape.c +192 -1048

1,240 lines not on this page · raw message

drivers/ide/ide-taskfile.c +9 -2
index 16a9a58..4e1da1c 100644

Lines of this file are not shown. View the raw message.

drivers/ide/ide.c +44 -33

77 lines not on this page · raw message

drivers/ide/legacy/ali14xx.c +9 -15
index e3ea209..d4d1a6b 100644

Lines of this file are not shown. View the raw message.

drivers/ide/legacy/buddha.c +1 -1
index dd3d198..8bdb79d 100644

Lines of this file are not shown. View the raw message.

drivers/ide/legacy/dtc2278.c +14 -22
index 611c970..73396f7 100644

Lines of this file are not shown. View the raw message.

drivers/ide/legacy/falconide.c +1 -1
index c9bd6bf..85b69a8 100644

Lines of this file are not shown. View the raw message.

drivers/ide/legacy/gayle.c +1 -1
index f67c51a..fc29ce7 100644

Lines of this file are not shown. View the raw message.

drivers/ide/legacy/ht6560b.c +24 -24

48 lines not on this page · raw message

drivers/ide/legacy/ide-cs.c +26 -3
index 3bd2967..15ccf69 100644

Lines of this file are not shown. View the raw message.

drivers/ide/legacy/ide_platform.c +2 -2
index 7c3231a..26c82ce 100644

Lines of this file are not shown. View the raw message.

drivers/ide/legacy/macide.c +1 -11
index c54d07f..06df8df 100644

Lines of this file are not shown. View the raw message.

drivers/ide/legacy/q40ide.c +1 -1
index a9c6b06..2f0b34d 100644

Lines of this file are not shown. View the raw message.

drivers/ide/legacy/qd65xx.c +46 -21

67 lines not on this page · raw message

drivers/ide/legacy/umc8672.c +9 -15
index 26f38ce..5696ba0 100644

Lines of this file are not shown. View the raw message.

drivers/ide/mips/au1xxx-ide.c +13 -24
index cd42b30..0f4bf5d 100644

Lines of this file are not shown. View the raw message.

drivers/ide/mips/swarm.c +1 -1
index 8b3959d..956259f 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/aec62xx.c +12 -14
index 824df78..cfb3265 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/alim15x3.c +2 -4
index 130cc6e..b3b6f51 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/amd74xx.c +9 -12
index 8c52bc9..2ef890c 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/atiixp.c +14 -16
index b56274a..7e037c8 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/cmd640.c +14 -19
index 7240c20..bd24dad 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/cmd64x.c +2 -4
index 04aa9e5..edabe62 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/cs5520.c +1 -11
index eb68a9a..0be1a82 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/cs5530.c +1 -7
index 765aac3..941a134 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/cs5535.c +3 -7
index 66433aa..d7b5ea9 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/cy82c693.c +0 -1
index 50100ac..724cbac 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/delkin_cb.c +31 -10

41 lines not on this page · raw message

drivers/ide/pci/generic.c +0 -7
index 59ebe84..9262a91 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/hpt34x.c +0 -7
index 25dbb81..9f01da4 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/hpt366.c +46 -43

89 lines not on this page · raw message

drivers/ide/pci/it8213.c +11 -13
index df74e58..e3427ea 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/it821x.c +2 -6
index 938d35f..1597f0c 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/jmicron.c +1 -8
index 8b40f64..a56bcb4 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/ns87415.c +0 -4
index fc9eee9..bf0d3b2 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/opti621.c +7 -8
index 0ce92d3..46e8748 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/pdc202xx_new.c +2 -12
index bb29db0..1c8cb77 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/pdc202xx_old.c +6 -11
index 31a1308..da43297 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/piix.c +2 -7
index c1a6b68..decef0f 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/rz1000.c +1 -9
index 7ed6625..5167661 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/sc1200.c +1 -7
index af499a6..561aa47 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/scc_pata.c +7 -3
index 7694969..238e3e1 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/serverworks.c +2 -9
index f495253..c11880b 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/sgiioc4.c +12 -8
index 8590207..0546264 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/siimage.c +18 -13
index 4877bc8..ef5b39f 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/sis5513.c +2 -12
index 2a461de..512bb4c 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/sl82c105.c +0 -6
index da13a12..ee261ae 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/slc90e66.c +11 -15
index a6cf810..65f4c2f 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/tc86c001.c +15 -9
index 9fbbb4f..2ef2ed2 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/triflex.c +0 -5
index 852b726..a67d02a 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/trm290.c +1 -6
index d9ebb69..de750f7 100644

Lines of this file are not shown. View the raw message.

drivers/ide/pci/via82cxxx.c +1 -9
index 24cb904..f3f79f8 100644

Lines of this file are not shown. View the raw message.

drivers/ide/ppc/mpc8xx.c +1 -1
index 45c1d55..06190b1 100644

Lines of this file are not shown. View the raw message.

drivers/ide/ppc/pmac.c +35 -49

84 lines not on this page · raw message

drivers/ide/setup-pci.c +15 -62

77 lines not on this page · raw message

drivers/macintosh/mediabay.c +1 -1
index 18dde2a..de9ebbf 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/ide-scsi.c +2 -7
index 5ed0006..6c4f0f0 100644

Lines of this file are not shown. View the raw message.

include/linux/hdreg.h +3 -1
index ff43f8d..3882013 100644

Lines of this file are not shown. View the raw message.

include/linux/ide.h +33 -18

51 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.

#1 lore raw
Quoted 3 lines · Bartlomiej Zolnierkiewicz

* next part of IDE probing code re-organization saga (that would be me)

This seems to cause very irritating and bogus messages for me:

Probing IDE interface ide0... Probing IDE interface ide1...
ide2: I/O resource 0x0-0x7 not free.
ide2: ports already in use, skipping probe
ide3: I/O resource 0x0-0x7 not free.
ide3: ports already in use, skipping probe
ide4: I/O resource 0x0-0x7 not free.
ide4: ports already in use, skipping probe
ide5: I/O resource 0x0-0x7 not free.
ide5: ports already in use, skipping probe
ide6: I/O resource 0x0-0x7 not free.
ide6: ports already in use, skipping probe
ide7: I/O resource 0x0-0x7 not free.
ide7: ports already in use, skipping probe
ide8: I/O resource 0x0-0x7 not free.
ide8: ports already in use, skipping probe
ide9: I/O resource 0x0-0x7 not free.
ide9: ports already in use, skipping probe

and that's just totally bogus. It shouldn't even request that region, since it's not been allocated!

So that "ide_device_add_all()" is missing some checks. Should it check the probe[] array like ideprobe_init() used to, or what?

Linus

#2 lore raw

Hi Linus,

Quoted 27 lines · Linus Torvalds
Quoted 3 lines · Bartlomiej Zolnierkiewicz

* next part of IDE probing code re-organization saga (that would be me)

This seems to cause very irritating and bogus messages for me:

Probing IDE interface ide0... Probing IDE interface ide1...
ide2: I/O resource 0x0-0x7 not free.
ide2: ports already in use, skipping probe
ide3: I/O resource 0x0-0x7 not free.
ide3: ports already in use, skipping probe
ide4: I/O resource 0x0-0x7 not free.
ide4: ports already in use, skipping probe
ide5: I/O resource 0x0-0x7 not free.
ide5: ports already in use, skipping probe
ide6: I/O resource 0x0-0x7 not free.
ide6: ports already in use, skipping probe
ide7: I/O resource 0x0-0x7 not free.
ide7: ports already in use, skipping probe
ide8: I/O resource 0x0-0x7 not free.
ide8: ports already in use, skipping probe
ide9: I/O resource 0x0-0x7 not free.
ide9: ports already in use, skipping probe

Quoted 5 lines

and that's just totally bogus. It shouldn't even request that region, since it's not been allocated!

So that "ide_device_add_all()" is missing some checks. Should it check the probe[] array like ideprobe_init() used to, or what?

This is ide-generic problem exhibited by recent ide_device_add_all() changes. Fix below (it works for me) - you may merge the patch as it is or wait an hour or so for the next IDE tree pull request.

Also sorry for the issue in the first place (it turned out that it slipped my testing because I has been running with IDE_MAX_HWIFS=2 for some time :).

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide-generic: probing bugfix

Quoted 27 lines · Linus Torvalds
Quoted 3 lines · Bartlomiej Zolnierkiewicz

* next part of IDE probing code re-organization saga (that would be me)

This seems to cause very irritating and bogus messages for me:

      Probing IDE interface ide0...
      Probing IDE interface ide1...
      ide2: I/O resource 0x0-0x7 not free.
      ide2: ports already in use, skipping probe
      ide3: I/O resource 0x0-0x7 not free.
      ide3: ports already in use, skipping probe
      ide4: I/O resource 0x0-0x7 not free.
      ide4: ports already in use, skipping probe
      ide5: I/O resource 0x0-0x7 not free.
      ide5: ports already in use, skipping probe
      ide6: I/O resource 0x0-0x7 not free.
      ide6: ports already in use, skipping probe
      ide7: I/O resource 0x0-0x7 not free.
      ide7: ports already in use, skipping probe
      ide8: I/O resource 0x0-0x7 not free.
      ide8: ports already in use, skipping probe
      ide9: I/O resource 0x0-0x7 not free.
      ide9: ports already in use, skipping probe

Quoted 2 lines

and that's just totally bogus. It shouldn't even request that region, since it's not been allocated!

The commit 139ddfcab50e5eabcc88341c8743a990ac1be6a2 ("ide: move handling of I/O resources out of ide_probe_port()") changed the ordering of hwif->noprobe check vs ide_hwif_request_regions() call (so that we now reserve I/O regions before checking for hwif->noprobe). However ide-generic host driver depended on hwif->noprobe to be set for skipping probing of empty ide_hwifs[] slots.

Fix it by passing only indexes of non-empty slots to ide_device_add_all() from ide_generic_init().

---
 drivers/ide/ide-generic.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/ide/ide-generic.c +8 -2
Index: b/drivers/ide/ide-generic.c
===================================================================
@@ -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);