Commit 4c10c937 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6: (49 commits)
  drivers/ide: Fix continuation line formats
  ide: fixed section mismatch warning in cmd640.c
  ide: ide_timing_compute() fixup
  ide: make ide_get_best_pio_mode() static
  via82cxxx: use ->pio_mode value to determine pair device speed
  tx493xide: use ->pio_mode value to determine pair device speed
  siimage: use ->pio_mode value to determine pair device speed
  palm_bk3710: use ->pio_mode value to determine pair device speed
  it821x: use ->pio_mode value to determine pair device speed
  cs5536: use ->pio_mode value to determine pair device speed
  cs5535: use ->pio_mode value to determine pair device speed
  cmd64x: fix handling of address setup timings
  amd74xx: use ->pio_mode value to determine pair device speed
  alim15x3: fix handling of UDMA enable bit
  alim15x3: fix handling of DMA timings
  alim15x3: fix handling of command timings
  alim15x3: fix handling of address setup timings
  ide-timings: use ->pio_mode value to determine fastest PIO speed
  ide: change ->set_dma_mode method parameters
  ide: change ->set_pio_mode method parameters
  ...
parents 9bb67696 950f564b

Documentation/cdrom/ide-cd

+2 −37
Original line number Diff line number Diff line
@@ -159,42 +159,7 @@ two arguments: the CDROM device, and the slot number to which you wish 
to change.  If the slot number is -1, the drive is unloaded.





4. Compilation options

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



There are a few additional options which can be set when compiling the

driver.  Most people should not need to mess with any of these; they

are listed here simply for completeness.  A compilation option can be

enabled by adding a line of the form `#define <option> 1' to the top

of ide-cd.c.  All these options are disabled by default.



VERBOSE_IDE_CD_ERRORS

  If this is set, ATAPI error codes will be translated into textual

  descriptions.  In addition, a dump is made of the command which

  provoked the error.  This is off by default to save the memory used

  by the (somewhat long) table of error descriptions.  



STANDARD_ATAPI

  If this is set, the code needed to deal with certain drives which do

  not properly implement the ATAPI spec will be disabled.  If you know

  your drive implements ATAPI properly, you can turn this on to get a

  slightly smaller kernel.



NO_DOOR_LOCKING

  If this is set, the driver will never attempt to lock the door of

  the drive.



CDROM_NBLOCKS_BUFFER

  This sets the size of the buffer to be used for a CDROMREADAUDIO

  ioctl.  The default is 8.



TEST

  This currently enables an additional ioctl which enables a user-mode

  program to execute an arbitrary packet command.  See the source for

  details.  This should be left off unless you know what you're doing.





5. Common problems

4. Common problems

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



This section discusses some common problems encountered when trying to
@@ -371,7 +336,7 @@ f. Data corruption. 
    expense of low system performance.





6. cdchange.c

5. cdchange.c

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



/*

drivers/ide/aec62xx.c

+7 −6
Original line number Diff line number Diff line
@@ -81,15 +81,15 @@ static u8 pci_bus_clock_list_ultra (u8 speed, struct chipset_bus_clock_list_entr 
	return chipset_table->ultra_settings;

}



static void aec6210_set_mode(ide_drive_t *drive, const u8 speed)

static void aec6210_set_mode(ide_hwif_t *hwif, ide_drive_t *drive)

{

	ide_hwif_t *hwif	= drive->hwif;

	struct pci_dev *dev	= to_pci_dev(hwif->dev);

	struct ide_host *host	= pci_get_drvdata(dev);

	struct chipset_bus_clock_list_entry *bus_clock = host->host_priv;

	u16 d_conf		= 0;

	u8 ultra = 0, ultra_conf = 0;

	u8 tmp0 = 0, tmp1 = 0, tmp2 = 0;

	const u8 speed = drive->dma_mode;

	unsigned long flags;



	local_irq_save(flags);
@@ -109,15 +109,15 @@ static void aec6210_set_mode(ide_drive_t *drive, const u8 speed) 
	local_irq_restore(flags);

}



static void aec6260_set_mode(ide_drive_t *drive, const u8 speed)

static void aec6260_set_mode(ide_hwif_t *hwif, ide_drive_t *drive)

{

	ide_hwif_t *hwif	= drive->hwif;

	struct pci_dev *dev	= to_pci_dev(hwif->dev);

	struct ide_host *host	= pci_get_drvdata(dev);

	struct chipset_bus_clock_list_entry *bus_clock = host->host_priv;

	u8 unit			= drive->dn & 1;

	u8 tmp1 = 0, tmp2 = 0;

	u8 ultra = 0, drive_conf = 0, ultra_conf = 0;

	const u8 speed = drive->dma_mode;

	unsigned long flags;



	local_irq_save(flags);
@@ -134,9 +134,10 @@ static void aec6260_set_mode(ide_drive_t *drive, const u8 speed) 
	local_irq_restore(flags);

}



static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio)

static void aec_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)

{

	drive->hwif->port_ops->set_dma_mode(drive, pio + XFER_PIO_0);

	drive->dma_mode = drive->pio_mode;

	hwif->port_ops->set_dma_mode(hwif, drive);

}



static int init_chipset_aec62xx(struct pci_dev *dev)

drivers/ide/ali14xx.c

+2 −1
Original line number Diff line number Diff line
@@ -109,13 +109,14 @@ static DEFINE_SPINLOCK(ali14xx_lock); 
 * This function computes timing parameters

 * and sets controller registers accordingly.

 */

static void ali14xx_set_pio_mode(ide_drive_t *drive, const u8 pio)

static void ali14xx_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)

{

	int driveNum;

	int time1, time2;

	u8 param1, param2, param3, param4;

	unsigned long flags;

	int bus_speed = ide_vlb_clk ? ide_vlb_clk : 50;

	const u8 pio = drive->pio_mode - XFER_PIO_0;

	struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio);



	/* calculate timing, according to PIO mode */

drivers/ide/alim15x3.c

+92 −79
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 *  Copyright (C) 2002 Alan Cox

 *  ALi (now ULi M5228) support by Clear Zhang <Clear.Zhang@ali.com.tw>

 *  Copyright (C) 2007 MontaVista Software, Inc. <source@mvista.com>

 *  Copyright (C) 2007 Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

 *  Copyright (C) 2007-2010 Bartlomiej Zolnierkiewicz

 *

 *  (U)DMA capable version of ali 1533/1543(C), 1535(D)

 *
@@ -48,61 +48,84 @@ static u8 m5229_revision; 
static u8 chip_is_1543c_e;

static struct pci_dev *isa_dev;



static void ali_fifo_control(ide_hwif_t *hwif, ide_drive_t *drive, int on)

{

	struct pci_dev *pdev = to_pci_dev(hwif->dev);

	int pio_fifo = 0x54 + hwif->channel;

	u8 fifo;

	int shift = 4 * (drive->dn & 1);



	pci_read_config_byte(pdev, pio_fifo, &fifo);

	fifo &= ~(0x0F << shift);

	fifo |= (on << shift);

	pci_write_config_byte(pdev, pio_fifo, fifo);

}



static void ali_program_timings(ide_hwif_t *hwif, ide_drive_t *drive,

				struct ide_timing *t, u8 ultra)

{

	struct pci_dev *dev = to_pci_dev(hwif->dev);

	int port = hwif->channel ? 0x5c : 0x58;

	int udmat = 0x56 + hwif->channel;

	u8 unit = drive->dn & 1, udma;

	int shift = 4 * unit;



	/* Set up the UDMA */

	pci_read_config_byte(dev, udmat, &udma);

	udma &= ~(0x0F << shift);

	udma |= ultra << shift;

	pci_write_config_byte(dev, udmat, udma);



	if (t == NULL)

		return;



	t->setup = clamp_val(t->setup, 1, 8) & 7;

	t->act8b = clamp_val(t->act8b, 1, 8) & 7;

	t->rec8b = clamp_val(t->rec8b, 1, 16) & 15;

	t->active = clamp_val(t->active, 1, 8) & 7;

	t->recover = clamp_val(t->recover, 1, 16) & 15;



	pci_write_config_byte(dev, port, t->setup);

	pci_write_config_byte(dev, port + 1, (t->act8b << 4) | t->rec8b);

	pci_write_config_byte(dev, port + unit + 2,

			      (t->active << 4) | t->recover);

}



/**

 *	ali_set_pio_mode	-	set host controller for PIO mode

 *	@hwif: port

 *	@drive: drive

 *	@pio: PIO mode number

 *

 *	Program the controller for the given PIO mode.

 */



static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)

static void ali_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)

{

	ide_hwif_t *hwif = drive->hwif;

	struct pci_dev *dev = to_pci_dev(hwif->dev);

	struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio);

	int s_time = t->setup, a_time = t->active, c_time = t->cycle;

	u8 s_clc, a_clc, r_clc;

	unsigned long flags;

	ide_drive_t *pair = ide_get_pair_dev(drive);

	int bus_speed = ide_pci_clk ? ide_pci_clk : 33;

	int port = hwif->channel ? 0x5c : 0x58;

	int portFIFO = hwif->channel ? 0x55 : 0x54;

	u8 cd_dma_fifo = 0, unit = drive->dn & 1;



	if ((s_clc = (s_time * bus_speed + 999) / 1000) >= 8)

		s_clc = 0;

	if ((a_clc = (a_time * bus_speed + 999) / 1000) >= 8)

		a_clc = 0;



	if (!(r_clc = (c_time * bus_speed + 999) / 1000 - a_clc - s_clc)) {

		r_clc = 1;

	} else {

		if (r_clc >= 16)

			r_clc = 0;

	unsigned long T =  1000000 / bus_speed; /* PCI clock based */

	struct ide_timing t;



	ide_timing_compute(drive, drive->pio_mode, &t, T, 1);

	if (pair) {

		struct ide_timing p;



		ide_timing_compute(pair, pair->pio_mode, &p, T, 1);

		ide_timing_merge(&p, &t, &t,

			IDE_TIMING_SETUP | IDE_TIMING_8BIT);

		if (pair->dma_mode) {

			ide_timing_compute(pair, pair->dma_mode, &p, T, 1);

			ide_timing_merge(&p, &t, &t,

				IDE_TIMING_SETUP | IDE_TIMING_8BIT);

		}

	}

	local_irq_save(flags);



	/* 

	 * PIO mode => ATA FIFO on, ATAPI FIFO off

	 */

	pci_read_config_byte(dev, portFIFO, &cd_dma_fifo);

	if (drive->media==ide_disk) {

		if (unit) {

			pci_write_config_byte(dev, portFIFO, (cd_dma_fifo & 0x0F) | 0x50);

		} else {

			pci_write_config_byte(dev, portFIFO, (cd_dma_fifo & 0xF0) | 0x05);

		}

	} else {

		if (unit) {

			pci_write_config_byte(dev, portFIFO, cd_dma_fifo & 0x0F);

		} else {

			pci_write_config_byte(dev, portFIFO, cd_dma_fifo & 0xF0);

		}

	}

	ali_fifo_control(hwif, drive, (drive->media == ide_disk) ? 0x05 : 0x00);



	pci_write_config_byte(dev, port, s_clc);

	pci_write_config_byte(dev, port + unit + 2, (a_clc << 4) | r_clc);

	local_irq_restore(flags);

	ali_program_timings(hwif, drive, &t, 0);

}



/**
@@ -132,44 +155,42 @@ static u8 ali_udma_filter(ide_drive_t *drive) 


/**

 *	ali_set_dma_mode	-	set host controller for DMA mode

 *	@hwif: port

 *	@drive: drive

 *	@speed: DMA mode

 *

 *	Configure the hardware for the desired IDE transfer mode.

 */



static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed)

static void ali_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)

{

	ide_hwif_t *hwif	= drive->hwif;

	static u8 udma_timing[7] = { 0xC, 0xB, 0xA, 0x9, 0x8, 0xF, 0xD };

	struct pci_dev *dev	= to_pci_dev(hwif->dev);

	u8 speed1		= speed;

	u8 unit			= drive->dn & 1;

	ide_drive_t *pair	= ide_get_pair_dev(drive);

	int bus_speed		= ide_pci_clk ? ide_pci_clk : 33;

	unsigned long T		=  1000000 / bus_speed; /* PCI clock based */

	const u8 speed		= drive->dma_mode;

	u8 tmpbyte		= 0x00;

	int m5229_udma		= (hwif->channel) ? 0x57 : 0x56;



	if (speed == XFER_UDMA_6)

		speed1 = 0x47;

	struct ide_timing t;



	if (speed < XFER_UDMA_0) {

		u8 ultra_enable	= (unit) ? 0x7f : 0xf7;

		/*

		 * clear "ultra enable" bit

		 */

		pci_read_config_byte(dev, m5229_udma, &tmpbyte);

		tmpbyte &= ultra_enable;

		pci_write_config_byte(dev, m5229_udma, tmpbyte);



		/*

		 * FIXME: Oh, my... DMA timings are never set.

		 */

		ide_timing_compute(drive, drive->dma_mode, &t, T, 1);

		if (pair) {

			struct ide_timing p;



			ide_timing_compute(pair, pair->pio_mode, &p, T, 1);

			ide_timing_merge(&p, &t, &t,

				IDE_TIMING_SETUP | IDE_TIMING_8BIT);

			if (pair->dma_mode) {

				ide_timing_compute(pair, pair->dma_mode,

						&p, T, 1);

				ide_timing_merge(&p, &t, &t,

					IDE_TIMING_SETUP | IDE_TIMING_8BIT);

			}

		}

		ali_program_timings(hwif, drive, &t, 0);

	} else {

		pci_read_config_byte(dev, m5229_udma, &tmpbyte);

		tmpbyte &= (0x0f << ((1-unit) << 2));

		/*

		 * enable ultra dma and set timing

		 */

		tmpbyte |= ((0x08 | ((4-speed1)&0x07)) << (unit << 2));

		pci_write_config_byte(dev, m5229_udma, tmpbyte);

		ali_program_timings(hwif, drive, NULL,

				udma_timing[speed - XFER_UDMA_0]);

		if (speed >= XFER_UDMA_3) {

			pci_read_config_byte(dev, 0x4b, &tmpbyte);

			tmpbyte |= 1;
@@ -355,19 +376,13 @@ static int ali_cable_override(struct pci_dev *pdev) 
 *

 *	This checks if the controller and the cable are capable

 *	of UDMA66 transfers. It doesn't check the drives.

 *	But see note 2 below!

 *

 *	FIXME: frobs bits that are not defined on newer ALi devicea

 */



static u8 ali_cable_detect(ide_hwif_t *hwif)

{

	struct pci_dev *dev = to_pci_dev(hwif->dev);

	unsigned long flags;

	u8 cbl = ATA_CBL_PATA40, tmpbyte;



	local_irq_save(flags);



	if (m5229_revision >= 0xC2) {

		/*

		 * m5229 80-pin cable detection (from Host View)
@@ -387,8 +402,6 @@ static u8 ali_cable_detect(ide_hwif_t *hwif) 
		}

	}



	local_irq_restore(flags);



	return cbl;

}
@@ -584,6 +597,6 @@ static void __exit ali15x3_ide_exit(void) 
module_init(ali15x3_ide_init);

module_exit(ali15x3_ide_exit);



MODULE_AUTHOR("Michael Aubry, Andrzej Krzysztofowicz, CJ, Andre Hedrick, Alan Cox");

MODULE_AUTHOR("Michael Aubry, Andrzej Krzysztofowicz, CJ, Andre Hedrick, Alan Cox, Bartlomiej Zolnierkiewicz");

MODULE_DESCRIPTION("PCI driver module for ALi 15x3 IDE");

MODULE_LICENSE("GPL");

drivers/ide/amd74xx.c

+10 −8
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * IDE driver for Linux.

 *

 * Copyright (c) 2000-2002 Vojtech Pavlik

 * Copyright (c) 2007-2008 Bartlomiej Zolnierkiewicz

 * Copyright (c) 2007-2010 Bartlomiej Zolnierkiewicz

 *

 * Based on the work of:

 *      Andre Hedrick
@@ -70,7 +70,8 @@ static void amd_set_speed(struct pci_dev *dev, u8 dn, u8 udma_mask, 
	default: return;

	}



	pci_write_config_byte(dev, AMD_UDMA_TIMING + offset + (3 - dn), t);

	if (timing->udma)

		pci_write_config_byte(dev, AMD_UDMA_TIMING + offset + 3 - dn, t);

}



/*
@@ -78,14 +79,14 @@ static void amd_set_speed(struct pci_dev *dev, u8 dn, u8 udma_mask, 
 * to a desired transfer mode.  It also can be called by upper layers.

 */



static void amd_set_drive(ide_drive_t *drive, const u8 speed)

static void amd_set_drive(ide_hwif_t *hwif, ide_drive_t *drive)

{

	ide_hwif_t *hwif = drive->hwif;

	struct pci_dev *dev = to_pci_dev(hwif->dev);

	ide_drive_t *peer = ide_get_pair_dev(drive);

	struct ide_timing t, p;

	int T, UT;

	u8 udma_mask = hwif->ultra_mask;

	const u8 speed = drive->dma_mode;



	T = 1000000000 / amd_clock;

	UT = (udma_mask == ATA_UDMA2) ? T : (T / 2);
@@ -93,7 +94,7 @@ static void amd_set_drive(ide_drive_t *drive, const u8 speed) 
	ide_timing_compute(drive, speed, &t, T, UT);



	if (peer) {

		ide_timing_compute(peer, peer->current_speed, &p, T, UT);

		ide_timing_compute(peer, peer->pio_mode, &p, T, UT);

		ide_timing_merge(&p, &t, &t, IDE_TIMING_8BIT);

	}
@@ -107,9 +108,10 @@ static void amd_set_drive(ide_drive_t *drive, const u8 speed) 
 * amd_set_pio_mode() is a callback from upper layers for PIO-only tuning.

 */



static void amd_set_pio_mode(ide_drive_t *drive, const u8 pio)

static void amd_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)

{

	amd_set_drive(drive, XFER_PIO_0 + pio);

	drive->dma_mode = drive->pio_mode;

	amd_set_drive(hwif, drive);

}



static void amd7409_cable_detect(struct pci_dev *dev)
@@ -340,6 +342,6 @@ static void __exit amd74xx_ide_exit(void) 
module_init(amd74xx_ide_init);

module_exit(amd74xx_ide_exit);



MODULE_AUTHOR("Vojtech Pavlik");

MODULE_AUTHOR("Vojtech Pavlik, Bartlomiej Zolnierkiewicz");

MODULE_DESCRIPTION("AMD PCI IDE driver");

MODULE_LICENSE("GPL");

CRA Git | Maintained and supported by SUSTech CRA and CCSE