Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (f511d7ed) · Commits · 戴 / test

Documentation/feature-removal-schedule.txt

+10 −0

Original line number	Diff line number	Diff line
		@@ -172,6 +172,16 @@ Who: Len Brown <len.brown@intel.com>

		---------------------------

		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 <bzolnier@gmail.com>, Borislav Petkov
		<petkovbb@googlemail.com>

		---------------------------

		What: libata spindown skipping and warning
		When: Dec 2008
		Why: Some halt(8) implementations synchronize caches for and spin

Documentation/ide.txt

+0 −49

Original line number	Diff line number	Diff line
		@@ -258,8 +258,6 @@ Summary of ide driver parameters for kernel command line
		As for VLB, it is safest to not specify it.
		Bigger values are safer than smaller ones.

		"idex=noprobe" : do not attempt to access/use this interface

		"idex=base" : probe for an interface at the addr specified,
		where "base" is usually 0x1f0 or 0x170
		and "ctl" is assumed to be "base"+0x206
		@@ -307,53 +305,6 @@ Also for legacy CMD640 host driver (cmd640) you need to use "probe_vlb"
		kernel paremeter to enable probing for VLB version of the chipset (PCI ones
		are detected automatically).

		================================================================================

		IDE ATAPI streaming tape driver
		-------------------------------

		This driver is a part of the Linux ide driver and works in co-operation
		with linux/drivers/block/ide.c.

		The driver, in co-operation with ide.c, basically traverses the
		request-list for the block device interface. The character device
		interface, on the other hand, creates new requests, adds them
		to the request-list of the block device, and waits for their completion.

		Pipelined operation mode is now supported on both reads and writes.

		The block device major and minor numbers are determined from the
		tape's relative position in the ide interfaces, as explained in ide.c.

		The character device interface consists of the following devices:

		ht0 major 37, minor 0 first IDE tape, rewind on close.
		ht1 major 37, minor 1 second IDE tape, rewind on close.
		...
		nht0 major 37, minor 128 first IDE tape, no rewind on close.
		nht1 major 37, minor 129 second IDE tape, no rewind on close.
		...

		Run /dev/MAKEDEV to create the above entries.

		The general magnetic tape commands compatible interface, as defined by
		include/linux/mtio.h, is accessible through the character device.

		General ide driver configuration options, such as the interrupt-unmask
		flag, can be configured by issuing an ioctl to the block device interface,
		as any other ide device.

		Our own ide-tape ioctl's can be issued to either the block device or
		the character device interface.

		Maximal throughput with minimal bus load will usually be achieved in the
		following scenario:

		1. ide-tape is operating in the pipelined operation mode.
		2. No buffering is performed by the user backup program.



		================================================================================

		Some Terminology

drivers/ide/ide-cd.c

+13 −17

Original line number	Diff line number	Diff line
		@@ -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))
		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

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		/*
		* IDE DMA support (including IDE PCI BM-DMA).
		*
		* Copyright (C) 1995-1998 Mark Lord
		* Copyright (C) 1999-2000 Andre Hedrick <andre@linux-ide.org>
		* Copyright (C) 2004, 2007 Bartlomiej Zolnierkiewicz
		*
		* May be copied or modified under the terms of the GNU General Public License
		*
		* DMA is supported for all IDE devices (disk drives, cdroms, tapes, floppies).
		*/

		/*
		@@ -11,49 +15,6 @@
		*/

		/*
		* This module provides support for the bus-master IDE DMA functions
		* of various PCI chipsets, including the Intel PIIX (i82371FB for
		* the 430 FX chipset), the PIIX3 (i82371SB for the 430 HX/VX and
		* 440 chipsets), and the PIIX4 (i82371AB for the 430 TX chipset)
		* ("PIIX" stands for "PCI ISA IDE Xcellerator").
		*
		* Pretty much the same code works for other IDE PCI bus-mastering chipsets.
		*
		* DMA is supported for all IDE devices (disk drives, cdroms, tapes, floppies).
		*
		* By default, DMA support is prepared for use, but is currently enabled only
		* for drives which already have DMA enabled (UltraDMA or mode 2 multi/single),
		* or which are recognized as "good" (see table below). Drives with only mode0
		* or mode1 (multi/single) DMA should also work with this chipset/driver
		* (eg. MC2112A) but are not enabled by default.
		*
		* Use "hdparm -i" to view modes supported by a given drive.
		*
		* The hdparm-3.5 (or later) utility can be used for manually enabling/disabling
		* DMA support, but must be (re-)compiled against this kernel version or later.
		*
		* To enable DMA, use "hdparm -d1 /dev/hd?" on a per-drive basis after booting.
		* If problems arise, ide.c will disable DMA operation after a few retries.
		* This error recovery mechanism works and has been extremely well exercised.
		*
		* IDE drives, depending on their vintage, may support several different modes
		* of DMA operation. The boot-time modes are indicated with a "*" in
		* the "hdparm -i" listing, and can be changed with knowledgeable use of
		* the "hdparm -X" feature. There is seldom a need to do this, as drives
		* normally power-up with their "best" PIO/DMA modes enabled.
		*
		* Testing has been done with a rather extensive number of drives,
		* with Quantum & Western Digital models generally outperforming the pack,
		* and Fujitsu & Conner (and some Seagate which are really Conner) drives
		* showing more lackluster throughput.
		*
		* Keep an eye on /var/adm/messages for "DMA disabled" messages.
		*
		* Some people have reported trouble with Intel Zappa motherboards.
		* This can be fixed by upgrading the AMI BIOS to version 1.00.04.BS0,
		* available from ftp://ftp.intel.com/pub/bios/10004bs0.exe
		* (thanks to Glen Morrell <glen@spin.Stanford.edu> for researching this).
		*
		* Thanks to "Christopher J. Reimer" <reimer@doe.carleton.ca> for
		* fixing the problem with the BIOS on some Acer motherboards.
		*
		@@ -65,11 +26,6 @@
		*
		* Most importantly, thanks to Robert Bringman <rob@mars.trion.com>
		* for supplying a Promise UDMA board & WD UDMA drive for this work!
		*
		* And, yes, Intel Zappa boards really do use both PIIX IDE ports.
		*
		* ATA-66/100 and recovery functions, I forgot the rest......
		*
		*/

		#include <linux/module.h>

Admin message