Skip to contentSkip to conversation

ide: fix pre-EIDE SWDMA support

PATCH New Bartlomiej Zolnierkiewicz 1 participant 1 message Jun 9, 2007 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 1/1 ide: fix pre-EIDE SWDMA support

If the word 62 is not defined use the word 52 to get SWDMA mask in ide_get_mode_mask().

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

---

 drivers/ide/ide-dma.c |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/ide/ide-dma.c +15 -1
Index: b/drivers/ide/ide-dma.c
===================================================================
@@ -700,8 +700,22 @@ static unsigned int ide_get_mode_mask(id
 			mask = id->dma_mword & hwif->mwdma_mask;
 		break;
 	case XFER_SW_DMA_0:
-		if (id->field_valid & 2)
+		if (id->field_valid & 2) {
 			mask = id->dma_1word & hwif->swdma_mask;
+		} else if (id->tDMA) {
+			/*
+			 * ide_fix_driveid() doesn't convert ->tDMA to the
+			 * CPU endianness so we need to do it here
+			 */
+			u8 mode = le16_to_cpu(id->tDMA);
+
+			/*
+			 * if the mode is valid convert it to the mask
+			 * (the maximum allowed mode is XFER_SW_DMA_2)
+			 */
+			if (mode <= 2)
+				mask = ((2 << mode) - 1) & hwif->swdma_mask;
+		}
 		break;
 	default:
 		BUG();