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

Commit a37f6b84 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
  ide cs5520: Initialize second port's interrupt number.
  ide: improve handling of Power Management requests
  ide: add QUANTUM FIREBALLct20 30 with firmware APL.090 to ivb_list[]
  ide: relax DMA info validity checking
  ide-cd: Improve "weird block size" error message
  ide-cd: Don't warn on bogus block size unless it actually matters.
  ide: fix handling of unexpected IRQs vs request_irq()
parents 9d73777e d7e2f36d

drivers/ide/cs5520.c

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_devic 


	ide_pci_setup_ports(dev, d, &hw[0], &hws[0]);

	hw[0].irq = 14;

	hw[1].irq = 15;



	return ide_host_add(d, hws, 2, NULL);

}

drivers/ide/ide-cd.c

+6 −4
Original line number Diff line number Diff line
@@ -876,9 +876,12 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity, 
		return stat;



	/*

	 * Sanity check the given block size

	 * Sanity check the given block size, in so far as making

	 * sure the sectors_per_frame we give to the caller won't

	 * end up being bogus.

	 */

	blocklen = be32_to_cpu(capbuf.blocklen);

	blocklen = (blocklen >> SECTOR_BITS) << SECTOR_BITS;

	switch (blocklen) {

	case 512:

	case 1024:
@@ -886,10 +889,9 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity, 
	case 4096:

		break;

	default:

		printk(KERN_ERR PFX "%s: weird block size %u\n",

		printk_once(KERN_ERR PFX "%s: weird block size %u; "

				"setting default block size to 2048\n",

				drive->name, blocklen);

		printk(KERN_ERR PFX "%s: default to 2kb block size\n",

				drive->name);

		blocklen = 2048;

		break;

	}

drivers/ide/ide-dma.c

+0 −21
Original line number Diff line number Diff line
@@ -361,9 +361,6 @@ static int ide_tune_dma(ide_drive_t *drive) 
	if (__ide_dma_bad_drive(drive))

		return 0;



	if (ide_id_dma_bug(drive))

		return 0;



	if (hwif->host_flags & IDE_HFLAG_TRUST_BIOS_FOR_DMA)

		return config_drive_for_dma(drive);
@@ -394,24 +391,6 @@ static int ide_dma_check(ide_drive_t *drive) 
	return -1;

}



int ide_id_dma_bug(ide_drive_t *drive)

{

	u16 *id = drive->id;



	if (id[ATA_ID_FIELD_VALID] & 4) {

		if ((id[ATA_ID_UDMA_MODES] >> 8) &&

		    (id[ATA_ID_MWDMA_MODES] >> 8))

			goto err_out;

	} else if ((id[ATA_ID_MWDMA_MODES] >> 8) &&

		   (id[ATA_ID_SWDMA_MODES] >> 8))

		goto err_out;



	return 0;

err_out:

	printk(KERN_ERR "%s: bad DMA info in identify block\n", drive->name);

	return 1;

}



int ide_set_dma(ide_drive_t *drive)

{

	int rc;

drivers/ide/ide-io.c

+22 −32
Original line number Diff line number Diff line
@@ -476,10 +476,14 @@ void do_ide_request(struct request_queue *q) 


	if (!ide_lock_port(hwif)) {

		ide_hwif_t *prev_port;



		WARN_ON_ONCE(hwif->rq);

repeat:

		prev_port = hwif->host->cur_port;



		if (drive->dev_flags & IDE_DFLAG_BLOCKED)

			rq = hwif->rq;

		else

			WARN_ON_ONCE(hwif->rq);



		if (drive->dev_flags & IDE_DFLAG_SLEEPING &&

		    time_after(drive->sleep, jiffies)) {

			ide_unlock_port(hwif);
@@ -506,43 +510,29 @@ void do_ide_request(struct request_queue *q) 
		hwif->cur_dev = drive;

		drive->dev_flags &= ~(IDE_DFLAG_SLEEPING | IDE_DFLAG_PARKED);



		if (rq == NULL) {

			spin_unlock_irq(&hwif->lock);

			spin_lock_irq(q->queue_lock);

			/*

		 * we know that the queue isn't empty, but this can happen

		 * if the q->prep_rq_fn() decides to kill a request

			 * we know that the queue isn't empty, but this can

			 * happen if ->prep_rq_fn() decides to kill a request

			 */

		if (!rq)

			rq = blk_fetch_request(drive->queue);



			spin_unlock_irq(q->queue_lock);

			spin_lock_irq(&hwif->lock);



		if (!rq) {

			if (rq == NULL) {

				ide_unlock_port(hwif);

				goto out;

			}

		}



		/*

		 * Sanity: don't accept a request that isn't a PM request

		 * if we are currently power managed. This is very important as

		 * blk_stop_queue() doesn't prevent the blk_fetch_request()

		 * above to return us whatever is in the queue. Since we call

		 * ide_do_request() ourselves, we end up taking requests while

		 * the queue is blocked...

		 * 

		 * We let requests forced at head of queue with ide-preempt

		 * though. I hope that doesn't happen too much, hopefully not

		 * unless the subdriver triggers such a thing in its own PM

		 * state machine.

		 * if we are currently power managed.

		 */

		if ((drive->dev_flags & IDE_DFLAG_BLOCKED) &&

		    blk_pm_request(rq) == 0 &&

		    (rq->cmd_flags & REQ_PREEMPT) == 0) {

			/* there should be no pending command at this point */

			ide_unlock_port(hwif);

			goto plug_device;

		}

		BUG_ON((drive->dev_flags & IDE_DFLAG_BLOCKED) &&

		       blk_pm_request(rq) == 0);



		hwif->rq = rq;

drivers/ide/ide-iops.c

+1 −3
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ EXPORT_SYMBOL_GPL(ide_in_drive_list); 
 */

static const struct drive_list_entry ivb_list[] = {

	{ "QUANTUM FIREBALLlct10 05"	, "A03.0900"	},

	{ "QUANTUM FIREBALLlct20 30"	, "APL.0900"	},

	{ "TSSTcorp CDDVDW SH-S202J"	, "SB00"	},

	{ "TSSTcorp CDDVDW SH-S202J"	, "SB01"	},

	{ "TSSTcorp CDDVDW SH-S202N"	, "SB00"	},
@@ -329,9 +330,6 @@ int ide_driveid_update(ide_drive_t *drive) 


	kfree(id);



	if ((drive->dev_flags & IDE_DFLAG_USING_DMA) && ide_id_dma_bug(drive))

		ide_dma_off(drive);



	return 1;

out_err:

	if (rc == 2)