Skip to contentSkip to conversation

ide-iops: only clear DMA words on setting DMA mode

PATCH Applied Sergei Shtylyov 2 participants 2 messages Mar 10, 2009 – Mar 11, 2009 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ide-iops: only clear DMA words on setting DMA mode

The bytes indicating current DMA mode in the identify data words 62, 63, and 88 should only change on setting a DMA mode, so stop clearing them on setting PIO mode in ide_config_drive_speed(). While at it, correct SW/MW DMA mode masks...

---
This patch is against the recent Linus' tree...

 drivers/ide/ide-iops.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/ide/ide-iops.c +5 -3
Index: linux-2.6/drivers/ide/ide-iops.c
===================================================================
@@ -774,9 +774,11 @@ int ide_config_drive_speed(ide_drive_t *
 		return error;
 	}
 
-	id[ATA_ID_UDMA_MODES]  &= ~0xFF00;
-	id[ATA_ID_MWDMA_MODES] &= ~0x0F00;
-	id[ATA_ID_SWDMA_MODES] &= ~0x0F00;
+	if (speed >= XFER_SW_DMA_0) {
+		id[ATA_ID_UDMA_MODES]  &= ~0xFF00;
+		id[ATA_ID_MWDMA_MODES] &= ~0x0700;
+		id[ATA_ID_SWDMA_MODES] &= ~0x0700;
+	}
 
  skip:
 #ifdef CONFIG_BLK_DEV_IDEDMA
#1 lore raw
Quoted 5 lines · Sergei Shtylyov

The bytes indicating current DMA mode in the identify data words 62, 63, and 88 should only change on setting a DMA mode, so stop clearing them on setting PIO mode in ide_config_drive_speed(). While at it, correct SW/MW DMA mode masks...

applied