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

drivers/ide/alim15x3.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -591,7 +591,7 @@ static int __init ali15x3_ide_init(void)

		static void __exit ali15x3_ide_exit(void)
		{
		return pci_unregister_driver(&alim15x3_pci_driver);
		pci_unregister_driver(&alim15x3_pci_driver);
		}

		module_init(ali15x3_ide_init);

drivers/ide/amd74xx.c

+10 −1

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 Bartlomiej Zolnierkiewicz
		* Copyright (c) 2007-2008 Bartlomiej Zolnierkiewicz
		*
		* Based on the work of:
		* Andre Hedrick
		@@ -263,6 +263,15 @@ static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_
		d.udma_mask = ATA_UDMA5;
		}

		/*
		* It seems that on some nVidia controllers using AltStatus
		* register can be unreliable so default to Status register
		* if the device is in Compatibility Mode.
		*/
		if (dev->vendor == PCI_VENDOR_ID_NVIDIA &&
		ide_pci_is_in_compatibility_mode(dev))
		d.host_flags \|= IDE_HFLAG_BROKEN_ALTSTATUS;

		printk(KERN_INFO "%s %s: UDMA%s controller\n",
		d.name, pci_name(dev), amd_dma[fls(d.udma_mask) - 1]);

drivers/ide/ide-io.c

+14 −16

Original line number	Diff line number	Diff line
		@@ -132,10 +132,14 @@ int ide_end_request (ide_drive_t *drive, int uptodate, int nr_sectors)
		}
		EXPORT_SYMBOL(ide_end_request);

		static void ide_complete_power_step(ide_drive_t drive, struct request rq, u8 stat, u8 error)
		static void ide_complete_power_step(ide_drive_t drive, struct request rq)
		{
		struct request_pm_state *pm = rq->data;

		#ifdef DEBUG_PM
		printk(KERN_INFO "%s: complete_power_step(step: %d)\n",
		drive->name, pm->pm_step);
		#endif
		if (drive->media != ide_disk)
		return;

		@@ -172,7 +176,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t drive, struct request
		/* Not supported? Switch to next step now. */
		if (ata_id_flush_enabled(drive->id) == 0 \|\|
		(drive->dev_flags & IDE_DFLAG_WCACHE) == 0) {
		ide_complete_power_step(drive, rq, 0, 0);
		ide_complete_power_step(drive, rq);
		return ide_stopped;
		}
		if (ata_id_flush_ext_enabled(drive->id))
		@@ -191,7 +195,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t drive, struct request
		if (drive->media != ide_disk)
		pm->pm_step = IDE_PM_RESTORE_DMA;
		else
		ide_complete_power_step(drive, rq, 0, 0);
		ide_complete_power_step(drive, rq);
		return ide_stopped;
		case IDE_PM_IDLE: /* Resume step 2 (idle) */
		args->tf.command = ATA_CMD_IDLEIMMEDIATE;
		@@ -204,9 +208,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t drive, struct request
		*/
		if (drive->hwif->dma_ops == NULL)
		break;
		/*
		* TODO: respect IDE_DFLAG_USING_DMA
		*/
		if (drive->dev_flags & IDE_DFLAG_USING_DMA)
		ide_set_dma(drive);
		break;
		}
		@@ -322,11 +324,8 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err)
		}
		} else if (blk_pm_request(rq)) {
		struct request_pm_state *pm = rq->data;
		#ifdef DEBUG_PM
		printk("%s: complete_power_step(step: %d, stat: %x, err: %x)\n",
		drive->name, rq->pm->pm_step, stat, err);
		#endif
		ide_complete_power_step(drive, rq, stat, err);

		ide_complete_power_step(drive, rq);
		if (pm->pm_step == IDE_PM_COMPLETED)
		ide_complete_pm_request(drive, rq);
		return;
		@@ -804,7 +803,7 @@ static ide_startstop_t start_request (ide_drive_t drive, struct request rq)
		struct request_pm_state *pm = rq->data;
		#ifdef DEBUG_PM
		printk("%s: start_power_step(step: %d)\n",
		drive->name, rq->pm->pm_step);
		drive->name, pm->pm_step);
		#endif
		startstop = ide_start_power_step(drive, rq);
		if (startstop == ide_stopped &&
		@@ -967,14 +966,13 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)
		ide_startstop_t startstop;
		int loops = 0;

		/* for atari only: POSSIBLY BROKEN HERE(?) */
		ide_get_lock(ide_intr, hwgroup);

		/* caller must own ide_lock */
		BUG_ON(!irqs_disabled());

		while (!hwgroup->busy) {
		hwgroup->busy = 1;
		/* for atari only */
		ide_get_lock(ide_intr, hwgroup);
		drive = choose_drive(hwgroup);
		if (drive == NULL) {
		int sleeping = 0;

drivers/ide/ide-iops.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -457,18 +457,14 @@ int drive_is_ready (ide_drive_t *drive)
		if (drive->waiting_for_dma)
		return hwif->dma_ops->dma_test_irq(drive);

		#if 0
		/* need to guarantee 400ns since last command was issued */
		udelay(1);
		#endif

		/*
		* We do a passive status test under shared PCI interrupts on
		* cards that truly share the ATA side interrupt, but may also share
		* an interrupt with another pci card/device. We make no assumptions
		* about possible isa-pnp and pci-pnp issues yet.
		*/
		if (hwif->io_ports.ctl_addr)
		if (hwif->io_ports.ctl_addr &&
		(hwif->host_flags & IDE_HFLAG_BROKEN_ALTSTATUS) == 0)
		stat = hwif->tp_ops->read_altstatus(hwif);
		else
		/* Note: this may clear a pending IRQ!! */
		@@ -610,6 +606,7 @@ static const struct drive_list_entry ivb_list[] = {
		{ "TSSTcorp CDDVDW SH-S202N" , "SB01" },
		{ "TSSTcorp CDDVDW SH-S202H" , "SB00" },
		{ "TSSTcorp CDDVDW SH-S202H" , "SB01" },
		{ "SAMSUNG SP0822N" , "WA100-10" },
		{ NULL , NULL }
		};

drivers/ide/ide-probe.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -266,7 +266,8 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)
		/* take a deep breath */
		msleep(50);

		if (io_ports->ctl_addr) {
		if (io_ports->ctl_addr &&
		(hwif->host_flags & IDE_HFLAG_BROKEN_ALTSTATUS) == 0) {
		a = tp_ops->read_altstatus(hwif);
		s = tp_ops->read_status(hwif);
		if ((a ^ s) & ~ATA_IDX)

Admin message