Re: [PATCH 2.6.15-rc1] libata: fix passthru for slave devices

[Mark Lord <mlord@pobox.com>]

Mark Lord wrote:
> This patch forces a correct master/slave unit bit
> when sending libata commands via SCSI passthru.
> The bit is left as-is for ports which do not
> support slave devices.

Revised version: apply bitfix to tf->device (duh!),
and nuke extra parens.

Compiles, not tested.

Signed-off-by: Mark Lord <mlord@pobox.com>


  ------------------------------------------------------------------------

--- linux-2.6.15-rc1/drivers/scsi/libata-scsi.c.orig	2005-11-11 20:43:36.000000000 -0500
+++ linux/drivers/scsi/libata-scsi.c	2005-11-12 18:45:43.000000000 -0500
@@ -2276,6 +2276,12 @@
  		tf->device = scsicmd[8];
  		tf->command = scsicmd[9];
  	}
+	/*
+	 * If slave is possible, enforce correct master/slave bit for this port:
+	 */
+	if ((qc->ap->flags & ATA_FLAG_SLAVE_POSS))
+		tf->device = qc->dev->devno ?
+			tf->device | ATA_DEV1 : tf->command & ~ATA_DEV1;

  	/*
  	 * Filter SET_FEATURES - XFER MODE command -- otherwise,