Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79fa1b67 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream'

parents 31ce6dae c2a65852

drivers/scsi/ahci.c

+6 −0
Original line number Diff line number Diff line
@@ -549,6 +549,12 @@ static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class) 


	DPRINTK("ENTER\n");



	if (!sata_dev_present(ap)) {

		DPRINTK("PHY reports no device\n");

		*class = ATA_DEV_NONE;

		return 0;

	}



	/* prepare for SRST (AHCI-1.1 10.4.1) */

	rc = ahci_stop_engine(ap);

	if (rc) {

drivers/scsi/libata-core.c

+4 −0
Original line number Diff line number Diff line
@@ -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)");

drivers/scsi/libata-scsi.c

+2 −4
Original line number Diff line number Diff line
@@ -2163,11 +2163,9 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc, const u8 *scsicmd) 
		qc->tf.protocol = ATA_PROT_ATAPI_DMA;

		qc->tf.feature |= ATAPI_PKT_DMA;



#ifdef ATAPI_ENABLE_DMADIR

		if (atapi_dmadir && (cmd->sc_data_direction != DMA_TO_DEVICE))

			/* some SATA bridges need us to indicate data xfer direction */

		if (cmd->sc_data_direction != DMA_TO_DEVICE)

			qc->tf.feature |= ATAPI_DMADIR;

#endif

	}



	qc->nbytes = cmd->bufflen;

drivers/scsi/libata.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

include/linux/libata.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */