tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[SCSI] bfa: Fix FDISC timeout handling

Retry FDISC a max of 6 times. Introduce new events to handle vport
login fails due to max logins to fabric/switch.

Signed-off-by: Anil Gurumurthy <agurumur@brocade.com>
Signed-off-by: Vijaya Mohan Guvva <vmohan@brocade.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

authored by

Vijaya Mohan Guvva and committed by
James Bottomley f2a0cc3f e1aaab89

+17 -2
+17 -2
drivers/scsi/bfa/bfa_fcs_lport.c
··· 5988 5988 BFA_FCS_VPORT_SM_RSP_DUP_WWN = 12, /* Dup wnn error*/ 5989 5989 BFA_FCS_VPORT_SM_RSP_FAILED = 13, /* non-retryable failure */ 5990 5990 BFA_FCS_VPORT_SM_STOPCOMP = 14, /* vport delete completion */ 5991 + BFA_FCS_VPORT_SM_FABRIC_MAX = 15, /* max vports on fabric */ 5991 5992 }; 5992 5993 5993 5994 static void bfa_fcs_vport_sm_uninit(struct bfa_fcs_vport_s *vport, ··· 6174 6173 break; 6175 6174 6176 6175 case BFA_FCS_VPORT_SM_RSP_FAILED: 6176 + case BFA_FCS_VPORT_SM_FABRIC_MAX: 6177 6177 bfa_sm_set_state(vport, bfa_fcs_vport_sm_offline); 6178 6178 break; 6179 6179 ··· 6245 6243 case BFA_FCS_VPORT_SM_OFFLINE: 6246 6244 case BFA_FCS_VPORT_SM_RSP_ERROR: 6247 6245 case BFA_FCS_VPORT_SM_RSP_FAILED: 6246 + case BFA_FCS_VPORT_SM_FABRIC_MAX: 6248 6247 case BFA_FCS_VPORT_SM_RSP_DUP_WWN: 6249 6248 bfa_sm_set_state(vport, bfa_fcs_vport_sm_cleanup); 6250 6249 bfa_sm_send_event(vport->lps, BFA_LPS_SM_OFFLINE); ··· 6531 6528 else { 6532 6529 bfa_fcs_vport_aen_post(&vport->lport, 6533 6530 BFA_LPORT_AEN_NPIV_FABRIC_MAX); 6534 - bfa_sm_send_event(vport, BFA_FCS_VPORT_SM_RSP_FAILED); 6531 + bfa_sm_send_event(vport, BFA_FCS_VPORT_SM_FABRIC_MAX); 6535 6532 } 6536 6533 break; 6537 6534 ··· 6917 6914 break; 6918 6915 } 6919 6916 6920 - bfa_sm_send_event(vport, BFA_FCS_VPORT_SM_RSP_ERROR); 6917 + if (vport->fdisc_retries < BFA_FCS_VPORT_MAX_RETRIES) 6918 + bfa_sm_send_event(vport, BFA_FCS_VPORT_SM_RSP_ERROR); 6919 + else 6920 + bfa_sm_send_event(vport, BFA_FCS_VPORT_SM_RSP_FAILED); 6921 + 6922 + break; 6923 + 6924 + case BFA_STATUS_ETIMER: 6925 + vport->vport_stats.fdisc_timeouts++; 6926 + if (vport->fdisc_retries < BFA_FCS_VPORT_MAX_RETRIES) 6927 + bfa_sm_send_event(vport, BFA_FCS_VPORT_SM_RSP_ERROR); 6928 + else 6929 + bfa_sm_send_event(vport, BFA_FCS_VPORT_SM_RSP_FAILED); 6921 6930 break; 6922 6931 6923 6932 case BFA_STATUS_FABRIC_RJT: