Convert the ATAPI_ENABLE_DMADIR compile time option needed
by some SATA-PATA bridge to runtime module parameter.
Signed-off-by: Albert Lee <albertcc@xxxxxxxxxx>
---
Before we can detect the bridge chips which need the ATAPI DMADIR workaround
automatically, maybe using a module parameter is easier for the end users to
turn on this option.
Patch against upstream (af64371ada9452632c349563d688d30d94e918ba).
For your review, thanks.
--- upstream/drivers/scsi/libata-core.c 2006-04-03 13:15:20.000000000 +0800
+++ upstream_dmadir/drivers/scsi/libata-core.c 2006-04-04 10:40:39.000000000 +0800
@@ -76,6 +76,10 @@ int atapi_enabled = 1;
module_param(atapi_enabled, int, 0444);
MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)");
+int atapi_dmadir = 0;
+module_param(atapi_dmadir, int, 0444);
+MODULE_PARM_DESC(atapi_dmadir, "Enable ATAPI DMADIR bridge support (0=off, 1=on)");
+
int libata_fua = 0;
module_param_named(fua, libata_fua, int, 0444);
MODULE_PARM_DESC(fua, "FUA support (0=off, 1=on)");
--- upstream/drivers/scsi/libata-scsi.c 2006-04-03 13:15:20.000000000 +0800
+++ upstream_dmadir/drivers/scsi/libata-scsi.c 2006-04-04 10:33:52.000000000 +0800
@@ -2163,11 +2163,9 @@ static unsigned int atapi_xlat(struct at
qc->tf.protocol = ATA_PROT_ATAPI_DMA;
qc->tf.feature |= ATAPI_PKT_DMA;
-#ifdef ATAPI_ENABLE_DMADIR
- /* some SATA bridges need us to indicate data xfer direction */
- if (cmd->sc_data_direction != DMA_TO_DEVICE)
+ if (atapi_dmadir && (cmd->sc_data_direction != DMA_TO_DEVICE))
+ /* some SATA bridges need us to indicate data xfer direction */
qc->tf.feature |= ATAPI_DMADIR;
-#endif
}
qc->nbytes = cmd->bufflen;
--- upstream/drivers/scsi/libata.h 2006-04-03 13:15:20.000000000 +0800
+++ upstream_dmadir/drivers/scsi/libata.h 2006-04-04 10:39:14.000000000 +0800
@@ -41,6 +41,7 @@ struct ata_scsi_args {
/* libata-core.c */
extern int atapi_enabled;
+extern int atapi_dmadir;
extern int libata_fua;
extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
struct ata_device *dev);
--- upstream/include/linux/libata.h 2006-04-03 13:15:27.000000000 +0800
+++ upstream_dmadir/include/linux/libata.h 2006-04-04 10:41:01.000000000 +0800
@@ -44,7 +44,6 @@
#undef ATA_NDEBUG /* define to disable quick runtime checks */
#undef ATA_ENABLE_PATA /* define to enable PATA support in some
* low-level drivers */
-#undef ATAPI_ENABLE_DMADIR /* enables ATAPI DMADIR bridge support */
/* note: prints function name for you */
-
: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
