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

Commit ab6ce925 authored by Kashyap, Desai's avatar Kashyap, Desai Committed by James Bottomley
Browse files

[SCSI] mpt2sas: Fix to use sas device list instead of enclosure list for... 


[SCSI] mpt2sas: Fix to use sas device list instead of enclosure list for _transpor_get_enclosure_identifier.

Enclosure_identifier not being returned by mpt2sas
The driver exports callback function to the sas transport layer
for obtaining the enclosure logical id.  This function is called
_transport_get_enclosure_identifier.  The driver was searching
the wrong list for the enclosure_identifier.  The driver should be
searching the sas device list instead of enclosure list.  The
sas address that is passed to the driver is for the end device, not
enclosure.

Signed-off-by: default avatarKashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 593d5720

drivers/scsi/mpt2sas/mpt2sas_transport.c

+6 −6
Original line number Diff line number Diff line
@@ -1007,18 +1007,18 @@ static int 
_transport_get_enclosure_identifier(struct sas_rphy *rphy, u64 *identifier)

{

	struct MPT2SAS_ADAPTER *ioc = rphy_to_ioc(rphy);

	struct _sas_node *sas_expander;

	struct _sas_device *sas_device;

	unsigned long flags;



	spin_lock_irqsave(&ioc->sas_node_lock, flags);

	sas_expander = mpt2sas_scsih_expander_find_by_sas_address(ioc,

	spin_lock_irqsave(&ioc->sas_device_lock, flags);

	sas_device = mpt2sas_scsih_sas_device_find_by_sas_address(ioc,

	    rphy->identify.sas_address);

	spin_unlock_irqrestore(&ioc->sas_node_lock, flags);

	spin_unlock_irqrestore(&ioc->sas_device_lock, flags);



	if (!sas_expander)

	if (!sas_device)

		return -ENXIO;



	*identifier = sas_expander->enclosure_logical_id;

	*identifier = sas_device->enclosure_logical_id;

	return 0;

}