Commit b0dacc0b authored by Xingui Yang's avatar Xingui Yang Committed by Yihang Li
Browse files

scsi: libsas: Add a helper sas_get_sas_addr_and_dev_type() 

mainline inclusion
from mainline-v6.9-rc2
commit a57345279fd311ba679b8083feb0eec5272c7729
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I96KNQ
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a57345279fd311ba679b8083feb0eec5272c7729



----------------------------------------------------------------------

Add a helper to get attached_sas_addr and device type from disc_resp.

Suggested-by: default avatarJohn Garry <john.g.garry@oracle.com>
Signed-off-by: default avatarXingui Yang <yangxingui@huawei.com>
Link: https://lore.kernel.org/r/20240307141413.48049-2-yangxingui@huawei.com


Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarBing Xia <xiabing12@h-partners.com>
parent d89a9435

drivers/scsi/libsas/sas_expander.c

+12 −7
Original line number Diff line number Diff line
@@ -1621,6 +1621,16 @@ int sas_discover_root_expander(struct domain_device *dev) 


/* ---------- Domain revalidation ---------- */



static void sas_get_sas_addr_and_dev_type(struct smp_disc_resp *disc_resp,

					  u8 *sas_addr,

					  enum sas_device_type *type)

{

	memcpy(sas_addr, disc_resp->disc.attached_sas_addr, SAS_ADDR_SIZE);

	*type = to_dev_type(&disc_resp->disc);

	if (*type == SAS_PHY_UNUSED)

		memset(sas_addr, 0, SAS_ADDR_SIZE);

}



static int sas_get_phy_discover(struct domain_device *dev,

				int phy_id, struct smp_disc_resp *disc_resp)

{
@@ -1674,13 +1684,8 @@ int sas_get_phy_attached_dev(struct domain_device *dev, int phy_id, 
		return -ENOMEM;



	res = sas_get_phy_discover(dev, phy_id, disc_resp);

	if (res == 0) {

		memcpy(sas_addr, disc_resp->disc.attached_sas_addr,

		       SAS_ADDR_SIZE);

		*type = to_dev_type(&disc_resp->disc);

		if (*type == 0)

			memset(sas_addr, 0, SAS_ADDR_SIZE);

	}

	if (res == 0)

		sas_get_sas_addr_and_dev_type(disc_resp, sas_addr, type);

	kfree(disc_resp);

	return res;

}