Commit 28c1969f authored Nov 25, 2009 by Hemant Pedanekar Committed by David S. Miller Nov 25, 2009

ide: fix ioctl to pass requested transfer mode to ide_find_dma_mode instead of UDMA6



Currently, ide_cmd_ioctl when invoked for setting DMA transfer mode calls
ide_find_dma_mode with requested mode as XFER_UDMA_6. This prevents setting DMA
mode to any other value than the default (maximum) supported by the device (or
UDMA6, if supported) irrespective of the actual requested transfer mode and
returns error.

For example, setting mode to UDMA2 using hdparm, where UDMA4 is the default
transfer mode gives following error:
	# ./hdparm -d1 -Xudma2  /dev/hda
	 /dev/hda:hda: UDMA/66 mode selected
	 setting using_dma to 1 (on)
	 hda: UDMA/66 mode selected
	 setting xfermode to 66 (UltraDMA mode2)
	 HDIO_DRIVE_CMD(setxfermode) failed: Invalid argument
	 using_dma     =  1 (on)

This patch fixes the issue.

Signed-off-by: Hemant Pedanekar <hemantp@ti.com>
Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 0fb18c47

drivers/ide/ide-ioctls.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -162,7 +162,7 @@ static int ide_cmd_ioctl(ide_drive_t *drive, unsigned long arg)
	if (tf->command == ATA_CMD_SET_FEATURES &&		if (tf->command == ATA_CMD_SET_FEATURES &&
	tf->feature == SETFEATURES_XFER &&		tf->feature == SETFEATURES_XFER &&
	tf->nsect >= XFER_SW_DMA_0) {		tf->nsect >= XFER_SW_DMA_0) {
	xfer_rate = ide_find_dma_mode(drive, XFER_UDMA_6);		xfer_rate = ide_find_dma_mode(drive, tf->nsect);
	if (xfer_rate != tf->nsect) {		if (xfer_rate != tf->nsect) {
	err = -EINVAL;		err = -EINVAL;
	goto abort;		goto abort;

Admin message