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

Commit 9a10b33c authored by Dan Williams's avatar Dan Williams Committed by James Bottomley
Browse files

[SCSI] libsas: revert ata srst 



libata issues follow up srsts when the controller has a hard time
recording the signature-fis after a reset, or if the link supports port
multipliers.  libsas does not support port multipliers and no current
libsas lldds appear to need help retrieving the signature fis.  Revert
it for now to remove confusion.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 84023474

drivers/scsi/libsas/sas_ata.c

+0 −38
Original line number Diff line number Diff line
@@ -443,43 +443,6 @@ static int sas_ata_hard_reset(struct ata_link *link, unsigned int *class, 
	return ret;

}



static int sas_ata_soft_reset(struct ata_link *link, unsigned int *class,

			       unsigned long deadline)

{

	struct ata_port *ap = link->ap;

	struct domain_device *dev = ap->private_data;

	struct sas_internal *i = dev_to_sas_internal(dev);

	int res = TMF_RESP_FUNC_FAILED;

	int ret = 0;



	if (i->dft->lldd_ata_soft_reset)

		res = i->dft->lldd_ata_soft_reset(dev);



	if (res != TMF_RESP_FUNC_COMPLETE) {

		SAS_DPRINTK("%s: Unable to soft reset\n", __func__);

		ret = -EAGAIN;

	}



	switch (dev->sata_dev.command_set) {

	case ATA_COMMAND_SET:

		SAS_DPRINTK("%s: Found ATA device.\n", __func__);

		*class = ATA_DEV_ATA;

		break;

	case ATAPI_COMMAND_SET:

		SAS_DPRINTK("%s: Found ATAPI device.\n", __func__);

		*class = ATA_DEV_ATAPI;

		break;

	default:

		SAS_DPRINTK("%s: Unknown SATA command set: %d.\n",

			    __func__, dev->sata_dev.command_set);

		*class = ATA_DEV_UNKNOWN;

		break;

	}



	ap->cbl = ATA_CBL_SATA;

	return ret;

}



/*

 * notify the lldd to forget the sas_task for this internal ata command

 * that bypasses scsi-eh
@@ -563,7 +526,6 @@ static void sas_ata_set_dmamode(struct ata_port *ap, struct ata_device *ata_dev) 


static struct ata_port_operations sas_sata_ops = {

	.prereset		= ata_std_prereset,

	.softreset		= sas_ata_soft_reset,

	.hardreset		= sas_ata_hard_reset,

	.postreset		= ata_std_postreset,

	.error_handler		= ata_std_error_handler,

include/scsi/libsas.h

+0 −1
Original line number Diff line number Diff line
@@ -619,7 +619,6 @@ struct sas_domain_function_template { 
	int (*lldd_clear_aca)(struct domain_device *, u8 *lun);

	int (*lldd_clear_task_set)(struct domain_device *, u8 *lun);

	int (*lldd_I_T_nexus_reset)(struct domain_device *);

	int (*lldd_ata_soft_reset)(struct domain_device *);

	int (*lldd_ata_check_ready)(struct domain_device *);

	void (*lldd_ata_set_dmamode)(struct domain_device *);

	int (*lldd_lu_reset)(struct domain_device *, u8 *lun);