[ 43/75] SCSI: libsas: fix sas_find_bcast_phy() in the presence of vacant phys
From: Greg KH <gregkh@linuxfoundation.org>
Date: 2012-05-04 21:11:13
Also in:
lkml
3.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thomas Jackson <redacted> commit 1699490db339e2c6b3037ea8e7dcd6b2755b688e upstream. If an expander reports 'PHY VACANT' for a phy index prior to the one that generated a BCN libsas fails rediscovery. Since a vacant phy is defined as a valid phy index that will never have an attached device just continue the search. Signed-off-by: Thomas Jackson <redacted> Signed-off-by: Dan Williams <redacted> Signed-off-by: James Bottomley <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/scsi/libsas/sas_expander.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c@@ -1643,9 +1643,17 @@ static int sas_find_bcast_phy(struct dom int phy_change_count = 0; res = sas_get_phy_change_count(dev, i, &phy_change_count); - if (res) - goto out; - else if (phy_change_count != ex->ex_phy[i].phy_change_count) { + switch (res) { + case SMP_RESP_PHY_VACANT: + case SMP_RESP_NO_PHY: + continue; + case SMP_RESP_FUNC_ACC: + break; + default: + return res; + } + + if (phy_change_count != ex->ex_phy[i].phy_change_count) { if (update) ex->ex_phy[i].phy_change_count = phy_change_count;
@@ -1653,8 +1661,7 @@ static int sas_find_bcast_phy(struct dom return 0; } } -out: - return res; + return 0; } static int sas_get_ex_change_count(struct domain_device *dev, int *ecc)