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

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

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  IDE: fix sparse signed-ness errors with host->host_busy
  ide: fix suspend regression
  tx4938ide: Fix build error due to read_sff_dma_status moving
  ide: remove unused CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
  sl82c105: remove dead code
  via82cxxx: fix cable warning message
  ide: can't use SSD/non-rotational queue flag for all CFA devices
  it821x.c: use dev->revision instead of pci_read_config_byte
  it821x: Add ultra_mask quirk for Vortex86SX
  ide: fix accidental LOCKDEP breakage caused by local_irq_set() removal
parents 9316fcac e720b9e4

Documentation/mips/AU1xxx_IDE.README

+1 −5
Original line number Diff line number Diff line
@@ -52,14 +52,12 @@ Two files are introduced: 
  b) 'drivers/ide/mips/au1xxx-ide.c'

     contains the functionality of the AU1XXX IDE driver



Four configs variables are introduced:

Following extra configs variables are introduced:



  CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA    - enable the PIO+DBDMA mode

  CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA  - enable the MWDMA mode

  CONFIG_BLK_DEV_IDE_AU1XXX_BURSTABLE_ON - set Burstable FIFO in DBDMA

                                           controller

  CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ - maximum transfer size

                                           per descriptor





SUPPORTED IDE MODES
@@ -87,7 +85,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y 
CONFIG_IDEDMA_PCI_AUTO=y

CONFIG_BLK_DEV_IDE_AU1XXX=y

CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA=y

CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ=128

CONFIG_BLK_DEV_IDEDMA=y

CONFIG_IDEDMA_AUTO=y
@@ -105,7 +102,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y 
CONFIG_IDEDMA_PCI_AUTO=y

CONFIG_BLK_DEV_IDE_AU1XXX=y

CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA=y

CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ=128

CONFIG_BLK_DEV_IDEDMA=y

CONFIG_IDEDMA_AUTO=y

drivers/ide/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -701,11 +701,6 @@ config BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA 
       depends on SOC_AU1200 && BLK_DEV_IDE_AU1XXX

endchoice



config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ

       int "Maximum transfer size (KB) per request (up to 128)"

       default "128"

       depends on BLK_DEV_IDE_AU1XXX



config BLK_DEV_IDE_TX4938

	tristate "TX4938 internal IDE support"

	depends on SOC_TX4938

drivers/ide/ide-disk.c

+1 −1
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ static void ide_disk_setup(ide_drive_t *drive) 
	printk(KERN_INFO "%s: max request size: %dKiB\n", drive->name,

		q->max_sectors / 2);



	if (ata_id_is_ssd(id) || ata_id_is_cfa(id))

	if (ata_id_is_ssd(id))

		queue_flag_set_unlocked(QUEUE_FLAG_NONROT, q);



	/* calculate drive capacity, and select LBA if possible */

drivers/ide/ide-iops.c

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad, unsigned long ti 
	stat = tp_ops->read_status(hwif);



	if (stat & ATA_BUSY) {

		local_irq_save(flags);

		local_save_flags(flags);

		local_irq_enable_in_hardirq();

		timeout += jiffies;

		while ((stat = tp_ops->read_status(hwif)) & ATA_BUSY) {

drivers/ide/ide-pm.c

+8 −4
Original line number Diff line number Diff line
@@ -186,12 +186,10 @@ void ide_complete_pm_request(ide_drive_t *drive, struct request *rq) 
	       blk_pm_suspend_request(rq) ? "suspend" : "resume");

#endif

	spin_lock_irqsave(q->queue_lock, flags);

	if (blk_pm_suspend_request(rq)) {

	if (blk_pm_suspend_request(rq))

		blk_stop_queue(q);

	} else {

	else

		drive->dev_flags &= ~IDE_DFLAG_BLOCKED;

		blk_start_queue(q);

	}

	spin_unlock_irqrestore(q->queue_lock, flags);



	drive->hwif->rq = NULL;
@@ -219,6 +217,8 @@ void ide_check_pm_state(ide_drive_t *drive, struct request *rq) 
		 * point.

		 */

		ide_hwif_t *hwif = drive->hwif;

		struct request_queue *q = drive->queue;

		unsigned long flags;

		int rc;

#ifdef DEBUG_PM

		printk("%s: Wakeup request inited, waiting for !BSY...\n", drive->name);
@@ -231,5 +231,9 @@ void ide_check_pm_state(ide_drive_t *drive, struct request *rq) 
		rc = ide_wait_not_busy(hwif, 100000);

		if (rc)

			printk(KERN_WARNING "%s: drive not ready on wakeup\n", drive->name);



		spin_lock_irqsave(q->queue_lock, flags);

		blk_start_queue(q);

		spin_unlock_irqrestore(q->queue_lock, flags);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE