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

Commit 4f404caf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] libata: Fixup ata_sas_queuecmd to handle __ata_scsi_queuecmd failure
  [PATCH] ahci: AHCI mode SATA patch for Intel ICH9
  [PATCH] libata: don't schedule EH on wcache on/off if old EH
parents 691ce26e 08475a19

drivers/ata/ahci.c

+11 −0
Original line number Diff line number Diff line
@@ -314,6 +314,17 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x2824), board_ahci }, /* ICH8 */

	{ PCI_VDEVICE(INTEL, 0x2829), board_ahci }, /* ICH8M */

	{ PCI_VDEVICE(INTEL, 0x282a), board_ahci }, /* ICH8M */

	{ PCI_VDEVICE(INTEL, 0x2922), board_ahci }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x2923), board_ahci }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x2924), board_ahci }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x2925), board_ahci }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x2927), board_ahci }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x2929), board_ahci }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x292a), board_ahci }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x292b), board_ahci }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x292f), board_ahci }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x294d), board_ahci }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x294e), board_ahci }, /* ICH9M */



	/* JMicron */

	{ PCI_VDEVICE(JMICRON, 0x2360), board_ahci }, /* JMicron JMB360 */

drivers/ata/libata-scsi.c

+13 −8
Original line number Diff line number Diff line
@@ -1451,6 +1451,7 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicm 


static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)

{

	struct ata_port *ap = qc->ap;

	struct scsi_cmnd *cmd = qc->scsicmd;

	u8 *cdb = cmd->cmnd;

 	int need_sense = (qc->err_mask != 0);
@@ -1459,11 +1460,12 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc) 
	 * schedule EH_REVALIDATE operation to update the IDENTIFY DEVICE

	 * cache

	 */

	if (!need_sense && (qc->tf.command == ATA_CMD_SET_FEATURES) &&

	if (ap->ops->error_handler &&

	    !need_sense && (qc->tf.command == ATA_CMD_SET_FEATURES) &&

	    ((qc->tf.feature == SETFEATURES_WC_ON) ||

	     (qc->tf.feature == SETFEATURES_WC_OFF))) {

		qc->ap->eh_info.action |= ATA_EH_REVALIDATE;

		ata_port_schedule_eh(qc->ap);

		ap->eh_info.action |= ATA_EH_REVALIDATE;

		ata_port_schedule_eh(ap);

	}



	/* For ATA pass thru (SAT) commands, generate a sense block if
@@ -1490,8 +1492,8 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc) 
		}

	}



	if (need_sense && !qc->ap->ops->error_handler)

		ata_dump_status(qc->ap->id, &qc->result_tf);

	if (need_sense && !ap->ops->error_handler)

		ata_dump_status(ap->id, &qc->result_tf);



	qc->scsidone(cmd);
@@ -3345,20 +3347,23 @@ EXPORT_SYMBOL_GPL(ata_sas_slave_configure); 
 *	@ap:	ATA port to which the command is being sent

 *

 *	RETURNS:

 *	Zero.

 *	Return value from __ata_scsi_queuecmd() if @cmd can be queued,

 *	0 otherwise.

 */



int ata_sas_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *),

		     struct ata_port *ap)

{

	int rc = 0;



	ata_scsi_dump_cdb(ap, cmd);



	if (likely(ata_scsi_dev_enabled(ap->device)))

		__ata_scsi_queuecmd(cmd, done, ap->device);

		rc = __ata_scsi_queuecmd(cmd, done, ap->device);

	else {

		cmd->result = (DID_BAD_TARGET << 16);

		done(cmd);

	}

	return 0;

	return rc;

}

EXPORT_SYMBOL_GPL(ata_sas_queuecmd);