Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64fb98fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: (23 commits)
  ide: add support for SCSI ioctls to ide-floppy
  ide: remove stale changelog from setup-pci.c
  ide: remove stale changelog/comments/TODO from ide.c
  ide-cris: handle PIO auto-tuning in tune_cris_ide()
  ide: add PIO masks
  ide: remove ide_find_best_pio_mode()
  ide: drop "PIO data" argument from ide_get_best_pio_mode()
  ide: ide_find_best_pio_mode() fixes (take 2)
  ide: add ide_pio_cycle_time() helper (take 2)
  sc1200: remove stale Power Management code
  ide: ide_start_power_step() fix WRT disabling DMA
  serverworks: fix DMA
  serverworks: always tune PIO
  ide: add ide_pci_device_t.host_flags (take 2)
  ide: add ide_dev_has_iordy() helper (take 4)
  ide: make ide_get_best_pio_mode() print info if overriding PIO mode
  siimage: PIO mode setup fixes (take 2)
  atiixp: PIO mode setup fixes
  ide: Stop mapping ROMs
  IDE: Remove references to dead ETRAX-related variables.
  ...
parents 5f47c7ea 89636af2

drivers/ata/pata_pcmcia.c

+1 −0
Original line number Diff line number Diff line
@@ -382,6 +382,7 @@ static struct pcmcia_device_id pcmcia_devices[] = { 
	PCMCIA_DEVICE_PROD_ID12("HITACHI", "microdrive", 0xf4f43949, 0xa6d76178),

	PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),

	PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753),

	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),

	PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2      ", 0x547e66dc, 0x8671043b),

	PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),

	PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674),

drivers/ide/cris/ide-cris.c

+3 −6
Original line number Diff line number Diff line
@@ -414,12 +414,6 @@ cris_ide_reset(unsigned val) 
#ifdef CONFIG_ETRAX_IDE_G27_RESET

	REG_SHADOW_SET(R_PORT_G_DATA, port_g_data_shadow, 27, val);

#endif

#ifdef CONFIG_ETRAX_IDE_CSE1_16_RESET

	REG_SHADOW_SET(port_cse1_addr, port_cse1_shadow, 16, val);

#endif

#ifdef CONFIG_ETRAX_IDE_CSP0_8_RESET

	REG_SHADOW_SET(port_csp0_addr, port_csp0_shadow, 8, val);

#endif

#ifdef CONFIG_ETRAX_IDE_PB7_RESET

	port_pb_dir_shadow = port_pb_dir_shadow |

		IO_STATE(R_PORT_PB_DIR, dir7, output);
@@ -690,6 +684,8 @@ static void tune_cris_ide(ide_drive_t *drive, u8 pio) 
{

	int setup, strobe, hold;



	pio = ide_get_best_pio_mode(drive, pio, 4);



	switch(pio)

	{

		case 0:
@@ -820,6 +816,7 @@ init_e100_ide (void) 
		hwif->dma_host_on = &cris_dma_on;

		hwif->dma_off_quietly = &cris_dma_off;

		hwif->cbl = ATA_CBL_PATA40;

		hwif->pio_mask = ATA_PIO4,

		hwif->ultra_mask = cris_ultra_mask;

		hwif->mwdma_mask = 0x07; /* Multiword DMA 0-2 */

		hwif->autodma = 1;

drivers/ide/ide-floppy.c

+17 −1
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ 
#include <linux/bitops.h>

#include <linux/mutex.h>



#include <scsi/scsi_ioctl.h>



#include <asm/byteorder.h>

#include <asm/irq.h>

#include <asm/uaccess.h>
@@ -2099,7 +2101,21 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file, 
	case IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS:

		return idefloppy_get_format_progress(drive, argp);

	}

	return generic_ide_ioctl(drive, file, bdev, cmd, arg);



	/*

	 * skip SCSI_IOCTL_SEND_COMMAND (deprecated)

	 * and CDROM_SEND_PACKET (legacy) ioctls

	 */

	if (cmd != CDROM_SEND_PACKET && cmd != SCSI_IOCTL_SEND_COMMAND)

		err = scsi_cmd_ioctl(file, bdev->bd_disk->queue,

					bdev->bd_disk, cmd, argp);

	else

		err = -ENOTTY;



	if (err == -ENOTTY)

		err = generic_ide_ioctl(drive, file, bdev, cmd, arg);



	return err;

}



static int idefloppy_media_changed(struct gendisk *disk)

drivers/ide/ide-io.c

+3 −2
Original line number Diff line number Diff line
@@ -224,11 +224,12 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request * 
		 * we could be smarter and check for current xfer_speed

		 * in struct drive etc...

		 */

		if ((drive->id->capability & 1) == 0)

			break;

		if (drive->hwif->ide_dma_check == NULL)

			break;

		drive->hwif->dma_off_quietly(drive);

		/*

		 * TODO: respect ->using_dma setting

		 */

		ide_set_dma(drive);

		break;

	}

drivers/ide/ide-lib.c

+42 −30
Original line number Diff line number Diff line
@@ -249,12 +249,34 @@ static int ide_scan_pio_blacklist (char *model) 
	return -1;

}



unsigned int ide_pio_cycle_time(ide_drive_t *drive, u8 pio)

{

	struct hd_driveid *id = drive->id;

	int cycle_time = 0;



	if (id->field_valid & 2) {

		if (id->capability & 8)

			cycle_time = id->eide_pio_iordy;

		else

			cycle_time = id->eide_pio;

	}



	/* conservative "downgrade" for all pre-ATA2 drives */

	if (pio < 3) {

		if (cycle_time && cycle_time < ide_pio_timings[pio].cycle_time)

			cycle_time = 0; /* use standard timing */

	}



	return cycle_time ? cycle_time : ide_pio_timings[pio].cycle_time;

}



EXPORT_SYMBOL_GPL(ide_pio_cycle_time);



/**

 *	ide_get_best_pio_mode	-	get PIO mode from drive

 *	@drive: drive to consider

 *	@mode_wanted: preferred mode

 *	@max_mode: highest allowed mode

 *	@d: PIO data

 *

 *	This routine returns the recommended PIO settings for a given drive,

 *	based on the drive->id information and the ide_pio_blacklist[].
@@ -263,22 +285,18 @@ static int ide_scan_pio_blacklist (char *model) 
 *	This is used by most chipset support modules when "auto-tuning".

 */



u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode, ide_pio_data_t *d)

u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode)

{

	int pio_mode;

	int cycle_time = 0;

	int use_iordy = 0;

	struct hd_driveid* id = drive->id;

	int overridden  = 0;



	if (mode_wanted != 255) {

		pio_mode = mode_wanted;

		use_iordy = (pio_mode > 2);

	} else if (!drive->id) {

		pio_mode = 0;

	} else if ((pio_mode = ide_scan_pio_blacklist(id->model)) != -1) {

		overridden = 1;

		use_iordy = (pio_mode > 2);

	if (mode_wanted != 255)

		return min_t(u8, mode_wanted, max_mode);



	if ((drive->hwif->host_flags & IDE_HFLAG_PIO_NO_BLACKLIST) == 0 &&

	    (pio_mode = ide_scan_pio_blacklist(id->model)) != -1) {

		printk(KERN_INFO "%s: is on PIO blacklist\n", drive->name);

	} else {

		pio_mode = id->tPIO;

		if (pio_mode > 2) {	/* 2 is maximum allowed tPIO value */
@@ -286,9 +304,7 @@ u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode, ide_p 
			overridden = 1;

		}

		if (id->field_valid & 2) {	  /* drive implements ATA2? */

			if (id->capability & 8) { /* drive supports use_iordy? */

				use_iordy = 1;

				cycle_time = id->eide_pio_iordy;

			if (id->capability & 8) { /* IORDY supported? */

				if (id->eide_pio_modes & 7) {

					overridden = 0;

					if (id->eide_pio_modes & 4)
@@ -298,31 +314,27 @@ u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode, ide_p 
					else

						pio_mode = 3;

				}

			} else {

				cycle_time = id->eide_pio;

			}

		}



		if (overridden)

			printk(KERN_INFO "%s: tPIO > 2, assuming tPIO = 2\n",

					 drive->name);



		/*

		 * Conservative "downgrade" for all pre-ATA2 drives

		 */

		if (pio_mode && pio_mode < 4) {

		if ((drive->hwif->host_flags & IDE_HFLAG_PIO_NO_DOWNGRADE) == 0 &&

		    pio_mode && pio_mode < 4) {

			pio_mode--;

			overridden = 1;

			if (cycle_time && cycle_time < ide_pio_timings[pio_mode].cycle_time)

				cycle_time = 0; /* use standard timing */

			printk(KERN_INFO "%s: applying conservative "

					 "PIO \"downgrade\"\n", drive->name);

		}

	}

	if (pio_mode > max_mode) {



	if (pio_mode > max_mode)

		pio_mode = max_mode;

		cycle_time = 0;

	}

	if (d) {

		d->pio_mode = pio_mode;

		d->cycle_time = cycle_time ? cycle_time : ide_pio_timings[pio_mode].cycle_time;

		d->use_iordy = use_iordy;

		d->overridden = overridden;

	}



	return pio_mode;

}