Update the driver version to 3.2.21.1
Subsystems (2)
cover Update the driver version to 3.2.21.1
Hi James,
Re-submitting the patch sets, Update the driver version to 3.2.21.0 and Update the driver version to 3.2.21.1.
It includes bug-fixes, changes to use firmware version 3.2.1.0, adds new features such as Forward Error Correction, FC BB credit recovery, dynamic diagnostic Port (D-port), enabled support for new hardware - chinook quad and updates the Brocade BFA driver to v3.2.21.1.
Thanks,
Vijaya Mohan Guvva
Vijaya Mohan Guvva (17):
bfa: Support for FC BB credit recovery
bfa: Forward Error Correction status query
bfa: Add dynamic diagnostic port support
bfa: Fix WARN_ON condition check
bfa: FDMI enhancements
bfa: Fix 1860 port initialize when ATC is enabled
bfa: Fix FDISC timeout handling
bfa: kdump fix on 815 and 825 adapters
bfa: driver compatibility with 32bit libs
bfa: fru vpd date update changes
bfa: firmware statistics update
bfa: Allow rsp queue process during ioc disable
bfa: Fix bug_on condition in RPSC rsp handling
bfa: fix endianess issue for firmware stats
bfa: Support for chinook-quad port card
bfa: dis-associate bfa path_tov with dev_loss_tmo
bfa: Update the driver version to 3.2.21.1
drivers/scsi/bfa/bfa_core.c | 3 +- drivers/scsi/bfa/bfa_defs.h | 103 +++++- drivers/scsi/bfa/bfa_defs_svc.h | 77 ++++- drivers/scsi/bfa/bfa_fc.h | 15 + drivers/scsi/bfa/bfa_fcpim.c | 2 +- drivers/scsi/bfa/bfa_fcs.c | 62 +--- drivers/scsi/bfa/bfa_fcs.h | 34 +- drivers/scsi/bfa/bfa_fcs_lport.c | 209 +++++++++++- drivers/scsi/bfa/bfa_fcs_rport.c | 7 +- drivers/scsi/bfa/bfa_ioc.c | 74 +++-- drivers/scsi/bfa/bfa_ioc.h | 9 +- drivers/scsi/bfa/bfa_ioc_cb.c | 86 ++++- drivers/scsi/bfa/bfa_ioc_ct.c | 46 +++ drivers/scsi/bfa/bfa_svc.c | 698 ++++++++++++++++++++++++++++++++++++--- drivers/scsi/bfa/bfa_svc.h | 34 +- drivers/scsi/bfa/bfad.c | 14 +- drivers/scsi/bfa/bfad_attr.c | 33 +- drivers/scsi/bfa/bfad_bsg.c | 137 +++++--- drivers/scsi/bfa/bfad_bsg.h | 52 ++- drivers/scsi/bfa/bfad_drv.h | 2 +- drivers/scsi/bfa/bfi.h | 78 ++++- drivers/scsi/bfa/bfi_ms.h | 5 +- 22 files changed, 1498 insertions(+), 282 deletions(-)
Signature · 1 line
1.7.12
PATCH 1/17 bfa: Support for FC BB credit recovery
This patch includes changes to 1) Enable/disable fc credit recovery on Brocade FC adapter port operating at max supported speed. 2) Get credit recovery status and stats related to credit loss and recovered credits
--- drivers/scsi/bfa/bfa_defs.h | 10 +++++ drivers/scsi/bfa/bfa_defs_svc.h | 49 +++++++++++++++++---- drivers/scsi/bfa/bfa_fcs.c | 62 +++----------------------- drivers/scsi/bfa/bfa_fcs.h | 5 --- drivers/scsi/bfa/bfa_fcs_rport.c | 2 +- drivers/scsi/bfa/bfa_svc.c | 95 +++++++++++++++++++++++++++++++++++----- drivers/scsi/bfa/bfa_svc.h | 12 ++--- drivers/scsi/bfa/bfad_bsg.c | 47 ++++++++++++++------ drivers/scsi/bfa/bfad_bsg.h | 19 +++++++- drivers/scsi/bfa/bfi_ms.h | 5 +-- 10 files changed, 202 insertions(+), 104 deletions(-)
drivers/scsi/bfa/bfa_defs.h +10 -0
@@ -185,6 +185,8 @@ enum bfa_status {BFA_STATUS_FAA_DISABLED =198 ,/* FAA is already disabled */ BFA_STATUS_FAA_ACQUIRED =199 ,/* FAA is already acquired */ BFA_STATUS_FAA_ACQ_ADDR =200 ,/* Acquiring addr */ +BFA_STATUS_BBCR_FC_ONLY =201 ,/*!< BBCredit Recovery is supported for * +* FC mode only */ BFA_STATUS_ERROR_TRUNK_ENABLED =203 ,/* Trunk enabled on adapter */ BFA_STATUS_MAX_ENTRY_REACHED =212 ,/* MAX entry reached */ BFA_STATUS_TOPOLOGY_LOOP = 230, /* Topology is set to Loop */
@@ -198,6 +200,14 @@ enum bfa_status {BFA_STATUS_CMD_NOTSUPP_MEZZ =239 ,/* Cmd not supported for MEZZ card */ BFA_STATUS_FRU_NOT_PRESENT =240 ,/* fru module not present */ BFA_STATUS_DPORT_ERR =245 ,/* D-port mode is enabled */ +BFA_STATUS_ERR_BBCR_SPEED_UNSUPPORT =258 ,/*!< BB credit recovery is +* supported at max port speed alone */ +BFA_STATUS_ERROR_BBCR_ENABLED =259 ,/*!< BB credit recovery +* is enabled */ +BFA_STATUS_INVALID_BBSCN =260 ,/*!< Invalid BBSCN value. +* Valid range is [1-15] */ +BFA_STATUS_BBCR_CFG_NO_CHANGE =265 ,/*!< BBCR is operational. +* Disable BBCR and try this operation again. */ BFA_STATUS_MAX_VAL /* Unknown error code */ };#define bfa_status_t enum bfa_status
drivers/scsi/bfa/bfa_defs_svc.h +40 -9
103 lines not on this page · raw message
drivers/scsi/bfa/bfa_fcs.c +6 -56
125 lines not on this page · raw message
drivers/scsi/bfa/bfa_fcs.h +0 -5
@@ -258,9 +258,6 @@ struct bfa_fcs_fabric_s;#define BFA_FCS_PORT_SYMBNAME_OSINFO_SZ 48#define BFA_FCS_PORT_SYMBNAME_OSPATCH_SZ 16 -/* bb_scn value in 2^bb_scn */ -#define BFA_FCS_PORT_DEF_BB_SCN 3 -/* * Get FC port ID for a logical port. */
@@ -683,8 +680,6 @@ struct bfa_fcs_s {struct bfa_trc_mod_s *trcmod;/* tracing module */ bfa_boolean_t vf_enabled;/* VF mode is enabled */ bfa_boolean_t fdmi_enabled;/* FDMI is enabled */ -bfa_boolean_t bbscn_enabled;/* Driver Config Parameter */ -bfa_boolean_t bbscn_flogi_rjt;/* FLOGI reject due to BB_SCN */ bfa_boolean_t min_cfg;/* min cfg enabled/disabled */ u16 port_vfid;/* port default VF ID */ struct bfa_fcs_driver_info_s driver_info;
drivers/scsi/bfa/bfa_fcs_rport.c +1 -1
@@ -2577,7 +2577,7 @@ bfa_fcs_rport_update(struct bfa_fcs_rport_s *rport, struct fc_logi_s *plogi) port->fabric->bb_credit =be16_to_cpu (plogi->csp.bbcred);bfa_fcport_set_tx_bbcredit (port->fcs->bfa, - port->fabric->bb_credit,0 ); + port->fabric->bb_credit); } }
drivers/scsi/bfa/bfa_svc.c +85 -10
165 lines not on this page · raw message
drivers/scsi/bfa/bfa_svc.h +7 -5
@@ -405,8 +405,6 @@ struct bfa_lps_s {bfa_status_t status;/* login status */ u16 pdusz;/* max receive PDU size */ u16 pr_bbcred;/* BB_CREDIT from peer */ -u8 pr_bbscn;/* BB_SCN from peer */ -u8 bb_scn;/* local BB_SCN */ u8 lsrjt_rsn;/* LSRJT reason */ u8 lsrjt_expl;/* LSRJT explanation */ u8 lun_mask;/* LUN mask flag */
@@ -510,11 +508,11 @@ struct bfa_fcport_s {bfa_boolean_t diag_busy;/* diag busy status */ bfa_boolean_t beacon;/* port beacon status */ bfa_boolean_t link_e2e_beacon;/* link beacon status */ -bfa_boolean_t bbsc_op_state;/* Cred recov Oper State */ struct bfa_fcport_trunk_s trunk;u16 fcoe_vlan;struct bfa_mem_dma_s fcport_dma;bfa_boolean_t stats_dma_ready; +struct bfa_bbcr_attr_s bbcr_attr; };#define BFA_FCPORT_MOD (__bfa) (&(__bfa)->modules.fcport)
@@ -556,7 +554,7 @@ bfa_status_t bfa_fcport_set_qos_bw(struct bfa_s *bfa, struct bfa_qos_bw_s *qos_bw);enum bfa_port_speed bfa_fcport_get_ratelim_speed (struct bfa_s *bfa); -void bfa_fcport_set_tx_bbcredit (struct bfa_s *bfa,u16 tx_bbcredit,u8 bb_scn); +void bfa_fcport_set_tx_bbcredit (struct bfa_s *bfa,u16 tx_bbcredit);bfa_boolean_t bfa_fcport_is_ratelim (struct bfa_s *bfa);void bfa_fcport_beacon (void *dev,bfa_boolean_t beacon,bfa_boolean_t link_e2e_beacon);
@@ -571,6 +569,10 @@ void bfa_fcport_dportenable(struct bfa_s *bfa);void bfa_fcport_dportdisable (struct bfa_s *bfa);bfa_status_t bfa_fcport_is_pbcdisabled (struct bfa_s *bfa);void bfa_fcport_cfg_faa (struct bfa_s *bfa,u8 state); +bfa_status_t bfa_fcport_cfg_bbcr (struct bfa_s *bfa, +bfa_boolean_t on_off,u8 bb_scn); +bfa_status_t bfa_fcport_get_bbcr_attr (struct bfa_s *bfa, +struct bfa_bbcr_attr_s *bbcr_attr);/* * bfa rport API functions
@@ -667,7 +669,7 @@ struct bfa_lps_s *bfa_lps_alloc(struct bfa_s *bfa);void bfa_lps_delete (struct bfa_lps_s *lps);void bfa_lps_flogi (struct bfa_lps_s *lps,void *uarg,u8 alpa,u16 pdusz,wwn_t pwwn,wwn_t nwwn, -bfa_boolean_t auth_en,u8 bb_scn); +bfa_boolean_t auth_en);void bfa_lps_fdisc (struct bfa_lps_s *lps,void *uarg,u16 pdusz,wwn_t pwwn,wwn_t nwwn);void bfa_lps_fdisclogo (struct bfa_lps_s *lps);
drivers/scsi/bfa/bfad_bsg.c +34 -13
68 lines not on this page · raw message
drivers/scsi/bfa/bfad_bsg.h +17 -2
@@ -46,8 +46,9 @@ enum {IOCMD_PORT_CFG_ALPA ,IOCMD_PORT_CFG_MAXFRSZ ,IOCMD_PORT_CLR_ALPA , -IOCMD_PORT_BBSC_ENABLE , -IOCMD_PORT_BBSC_DISABLE , +IOCMD_PORT_BBCR_ENABLE , +IOCMD_PORT_BBCR_DISABLE , +IOCMD_PORT_BBCR_GET_ATTR ,IOCMD_LPORT_GET_ATTR ,IOCMD_LPORT_GET_RPORTS , IOCMD_LPORT_GET_STATS,
@@ -495,6 +496,20 @@ struct bfa_bsg_port_cfg_mode_s {struct bfa_port_cfg_mode_s cfg; }; +struct bfa_bsg_bbcr_enable_s { +bfa_status_t status; +u16 bfad_num; +u8 bb_scn; +u8 rsvd; +}; + +struct bfa_bsg_bbcr_attr_s { +bfa_status_t status; +u16 bfad_num; +u16 rsvd; +struct bfa_bbcr_attr_s attr; +}; +struct bfa_bsg_faa_attr_s {bfa_status_t status;u16 bfad_num;
drivers/scsi/bfa/bfi_ms.h +2 -3
@@ -276,8 +276,7 @@ struct bfi_fcport_enable_req_s {struct bfi_fcport_set_svc_params_req_s {struct bfi_mhdr_s mh;/* msg header */ __be16 tx_bbcredit;/* Tx credits */ -u8 bb_scn;/* BB_SC FC credit recovery */ -u8 rsvd; +u8 rsvd[2 ]; };/*
@@ -446,8 +445,8 @@ struct bfi_lps_login_rsp_s {mac_t fcf_mac;u8 ext_status;u8 brcd_switch;/* attached peer is brcd switch */ -u8 bb_scn;/* atatched port's bb_scn */ u8 bfa_tag; +u8 rsvd; };struct bfi_lps_logout_req_s {
Signature · 1 line
1.7.12
PATCH 2/17 bfa: Forward Error Correction status query
In reply to Vijaya Mohan GuvvaThis patch includes changes to get FC HBA feature Forward Error Correction (FEC) (enabled at 16Gig speed) status from firmware and to return to brocade HBA management utility.
--- drivers/scsi/bfa/bfa_defs_svc.h | 15 +++++++++++++-- drivers/scsi/bfa/bfa_svc.c | 8 ++++++++ drivers/scsi/bfa/bfa_svc.h | 1 + 3 files changed, 22 insertions(+), 2 deletions(-)
drivers/scsi/bfa/bfa_defs_svc.h +13 -2
@@ -882,6 +882,15 @@ enum bfa_lunmask_state_s { BFA_LUNMASK_UNINITIALIZED = 0xff, }; +/** +* FEC states +*/ +enum bfa_fec_state_s { +BFA_FEC_ONLINE =1 ,/*!< FEC is online */ +BFA_FEC_OFFLINE =2 ,/*!< FEC is offline */ +BFA_FEC_OFFLINE_NOT_16G =3 ,/*!< FEC is offline (speed not 16Gig) */ +}; +#pragma pack(1)/* * LUN mask configuration
@@ -978,6 +987,7 @@ struct bfa_port_attr_s {bfa_boolean_t link_e2e_beacon;/* link beacon is on */ bfa_boolean_t bbsc_op_status;/* fc credit recovery oper * state */ +enum bfa_fec_state_s fec_state;/*!< current FEC state */ /* * Dynamic field - info from FCS
@@ -989,7 +999,7 @@ struct bfa_port_attr_s {/* FCoE specific */ u16 fcoe_vlan; -u8 rsvd1[6 ]; +u8 rsvd1[2 ]; };/*
@@ -1076,7 +1086,8 @@ struct bfa_port_link_s {u8 speed;/* Link speed (1/2/4/8 G) */ u32 linkstate_opt;/* Linkstate optional data (debug) */ u8 trunked;/* Trunked or not (1 or 0) */ -u8 resvd[7 ]; +u8 fec_state;/*!< State of FEC */ +u8 resvd[6 ];struct bfa_qos_attr_s qos_attr;/* QoS Attributes */ union {struct bfa_fcport_loop_info_s loop_info;
drivers/scsi/bfa/bfa_svc.c +8 -0
@@ -3079,6 +3079,8 @@ bfa_fcport_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg, port_cfg->qos_bw.med =BFA_QOS_BW_MED ; port_cfg->qos_bw.low =BFA_QOS_BW_LOW ; + fcport->fec_state =BFA_FEC_OFFLINE ; +INIT_LIST_HEAD (&fcport->stats_pending_q);INIT_LIST_HEAD (&fcport->statsclr_pending_q);
@@ -3157,6 +3159,9 @@ bfa_fcport_update_linkinfo(struct bfa_fcport_s *fcport)if (fcport->cfg.bb_cr_enabled) fcport->bbcr_attr = pevent->link_state.attr.bbcr_attr; + + fcport->fec_state = pevent->link_state.fec_state; +/* * update trunk state if applicable */
@@ -3176,6 +3181,7 @@ bfa_fcport_reset_linkinfo(struct bfa_fcport_s *fcport) { fcport->speed =BFA_PORT_SPEED_UNKNOWN ; fcport->topology =BFA_PORT_TOPOLOGY_NONE ; + fcport->fec_state =BFA_FEC_OFFLINE ; }/*
@@ -4027,6 +4033,8 @@ bfa_fcport_get_attr(struct bfa_s *bfa, struct bfa_port_attr_s *attr) attr->pport_cfg.q_depth =bfa_fcpim_qdepth_get (bfa); attr->port_state =bfa_sm_to_state (hal_port_sm_table, fcport->sm); + attr->fec_state = fcport->fec_state; +/* PBC Disabled State */ if (bfa_fcport_is_pbcdisabled (bfa)) attr->port_state =BFA_PORT_ST_PREBOOT_DISABLED ;
drivers/scsi/bfa/bfa_svc.h +1 -0
@@ -513,6 +513,7 @@ struct bfa_fcport_s {struct bfa_mem_dma_s fcport_dma;bfa_boolean_t stats_dma_ready;struct bfa_bbcr_attr_s bbcr_attr; +enum bfa_fec_state_s fec_state; };#define BFA_FCPORT_MOD (__bfa) (&(__bfa)->modules.fcport)
Signature · 1 line
1.7.12
PATCH 3/17 bfa: Add dynamic diagnostic port support
In reply to Vijaya Mohan GuvvaD-Port is a new port type created with the intention of running link level diagnostic tests like loopback, traffic test. In static D-port mode, user configures the port to D-port mode and starts the test, but in dynamic D-port, once the Brocade switch port is configured to D-port, it will reject the regular FLOGI from HBA with reason that it is in D-port mode. So based on the reason code HBA port will turn itself into D-port and start diagnostic test.
--- drivers/scsi/bfa/bfa_defs.h | 79 +++++- drivers/scsi/bfa/bfa_defs_svc.h | 1 + drivers/scsi/bfa/bfa_svc.c | 595 +++++++++++++++++++++++++++++++++++++--- drivers/scsi/bfa/bfa_svc.h | 21 +- drivers/scsi/bfa/bfad_bsg.c | 81 ++++-- drivers/scsi/bfa/bfad_bsg.h | 25 +- drivers/scsi/bfa/bfi.h | 68 ++++- 7 files changed, 781 insertions(+), 89 deletions(-)
drivers/scsi/bfa/bfa_defs.h +68 -11
@@ -199,15 +199,34 @@ enum bfa_status {BFA_STATUS_DPORT_DISABLED =236 ,/* D-port mode is already disabled */ BFA_STATUS_CMD_NOTSUPP_MEZZ =239 ,/* Cmd not supported for MEZZ card */ BFA_STATUS_FRU_NOT_PRESENT =240 ,/* fru module not present */ +BFA_STATUS_DPORT_NO_SFP =243 ,/* SFP is not present.\n D-port will be +* enabled but it will be operational +* only after inserting a valid SFP. */ BFA_STATUS_DPORT_ERR =245 ,/* D-port mode is enabled */ +BFA_STATUS_DPORT_ENOSYS =254 ,/* Switch has no D_Port functionality */ +BFA_STATUS_DPORT_CANT_PERF =255 ,/* Switch port is not D_Port capable +* or D_Port is disabled */ +BFA_STATUS_DPORT_LOGICALERR =256 ,/* Switch D_Port fail */ +BFA_STATUS_DPORT_SWBUSY =257 ,/* Switch port busy */ BFA_STATUS_ERR_BBCR_SPEED_UNSUPPORT =258 ,/*!< BB credit recovery is * supported at max port speed alone */ BFA_STATUS_ERROR_BBCR_ENABLED =259 ,/*!< BB credit recovery * is enabled */ BFA_STATUS_INVALID_BBSCN =260 ,/*!< Invalid BBSCN value. * Valid range is [1-15] */ +BFA_STATUS_DDPORT_ERR =261 ,/* Dynamic D_Port mode is active.\n To +* exit dynamic mode, disable D_Port on +* the remote port */ +BFA_STATUS_DPORT_SFPWRAP_ERR =262 ,/* Clear e/o_wrap fail, check or +* replace SFP */ BFA_STATUS_BBCR_CFG_NO_CHANGE =265 ,/*!< BBCR is operational. * Disable BBCR and try this operation again. */ +BFA_STATUS_DPORT_SW_NOTREADY =268 ,/* Remote port is not ready to +* start dport test. Check remote +* port status. */ +BFA_STATUS_DPORT_INV_SFP =271 ,/* Invalid SFP for D-PORT mode. */ +BFA_STATUS_DPORT_CMD_NOTSUPP =273 ,/* Dport is not supported by +* remote port */ BFA_STATUS_MAX_VAL /* Unknown error code */ };#define bfa_status_t enum bfa_status
@@ -527,17 +546,6 @@ struct bfa_ioc_aen_data_s { };/* -* D-port states -* -*/ -enum bfa_dport_state { -BFA_DPORT_ST_DISABLED =0 ,/* D-port is Disabled */ -BFA_DPORT_ST_DISABLING =1 ,/* D-port is Disabling */ -BFA_DPORT_ST_ENABLING =2 ,/* D-port is Enabling */ -BFA_DPORT_ST_ENABLED =3 ,/* D-port is Enabled */ -}; - -/* * ---------------------- mfg definitions ------------ */
@@ -1136,6 +1144,7 @@ struct bfa_flash_attr_s {#define LB_PATTERN_DEFAULT 0xB5B5B5B5#define QTEST_CNT_DEFAULT 10#define QTEST_PAT_DEFAULT LB_PATTERN_DEFAULT +#define DPORT_ENABLE_LOOPCNT_DEFAULT (1024 * 1024)struct bfa_diag_memtest_s {u8 algo;
@@ -1164,6 +1173,54 @@ struct bfa_diag_loopback_result_s {u8 rsvd[3 ]; }; +enum bfa_diag_dport_test_status { +DPORT_TEST_ST_IDLE =0 ,/* the test has not started yet. */ +DPORT_TEST_ST_FINAL =1 ,/* the test done successfully */ +DPORT_TEST_ST_SKIP =2 ,/* the test skipped */ +DPORT_TEST_ST_FAIL =3 ,/* the test failed */ +DPORT_TEST_ST_INPRG =4 ,/* the testing is in progress */ +DPORT_TEST_ST_RESPONDER =5 ,/* test triggered from remote port */ +DPORT_TEST_ST_STOPPED =6 ,/* the test stopped by user. */ +DPORT_TEST_ST_MAX +}; + +enum bfa_diag_dport_test_type { +DPORT_TEST_ELOOP =0 , +DPORT_TEST_OLOOP =1 , +DPORT_TEST_ROLOOP =2 , +DPORT_TEST_LINK =3 , +DPORT_TEST_MAX +}; + +enum bfa_diag_dport_test_opmode { +BFA_DPORT_OPMODE_AUTO =0 , +BFA_DPORT_OPMODE_MANU =1 , +}; + +struct bfa_diag_dport_subtest_result_s { +u8 status;/* bfa_diag_dport_test_status */ +u8 rsvd[7 ];/* 64bit align */ +u64 start_time;/* timestamp */ +}; + +struct bfa_diag_dport_result_s { +wwn_t rp_pwwn;/* switch port wwn */ +wwn_t rp_nwwn;/* switch node wwn */ +u64 start_time;/* user/sw start time */ +u64 end_time;/* timestamp */ +u8 status;/* bfa_diag_dport_test_status */ +u8 mode;/* bfa_diag_dport_test_opmode */ +u8 rsvd;/* 64bit align */ +u8 speed;/* link speed for buf_reqd */ +u16 buffer_required; +u16 frmsz;/* frame size for buf_reqd */ +u32 lpcnt;/* Frame count */ +u32 pat;/* Pattern */ +u32 roundtrip_latency;/* in nano sec */ +u32 est_cable_distance;/* in meter */ +struct bfa_diag_dport_subtest_result_s subtest[DPORT_TEST_MAX ]; +}; +struct bfa_diag_ledtest_s {u32 cmd;/* bfa_led_op_t */ u32 color;/* bfa_led_color_t */
drivers/scsi/bfa/bfa_defs_svc.h +1 -0
@@ -761,6 +761,7 @@ enum bfa_port_states {BFA_PORT_ST_TOGGLING_QWAIT =14 ,BFA_PORT_ST_FAA_MISCONFIG =15 ,BFA_PORT_ST_DPORT =16 , +BFA_PORT_ST_DDPORT =17 , BFA_PORT_ST_MAX_STATE, };
drivers/scsi/bfa/bfa_svc.c +555 -40
814 lines not on this page · raw message
drivers/scsi/bfa/bfa_svc.h +16 -5
@@ -551,6 +551,7 @@ void bfa_fcport_event_register(struct bfa_s *bfa, enum bfa_port_linkstate event), void *event_cbarg);bfa_boolean_t bfa_fcport_is_disabled (struct bfa_s *bfa);bfa_boolean_t bfa_fcport_is_dport (struct bfa_s *bfa); +bfa_boolean_t bfa_fcport_is_ddport (struct bfa_s *bfa);bfa_status_t bfa_fcport_set_qos_bw (struct bfa_s *bfa,struct bfa_qos_bw_s *qos_bw);enum bfa_port_speed bfa_fcport_get_ratelim_speed (struct bfa_s *bfa);
@@ -715,10 +716,18 @@ struct bfa_fcdiag_lb_s {struct bfa_dport_s {struct bfa_s *bfa;/* Back pointer to BFA */ bfa_sm_t sm;/* finite state machine */ -u32 msgtag;/* firmware msg tag for reply */ struct bfa_reqq_wait_s reqq_wait;bfa_cb_diag_t cbfn;void *cbarg; +union bfi_diag_dport_msg_u i2hmsg; +u8 test_state;/* enum dport_test_state */ +u8 dynamic;/* boolean_t */ +u8 rsvd[2 ]; +u32 lpcnt; +u32 payload;/* user defined payload pattern */ +wwn_t rp_pwwn; +wwn_t rp_nwwn; +struct bfa_diag_dport_result_s result; };struct bfa_fcdiag_s {
@@ -742,11 +751,13 @@ bfa_status_t bfa_fcdiag_queuetest(struct bfa_s *bfa, u32 ignore, u32 queue, struct bfa_diag_qtest_result_s *result, bfa_cb_diag_t cbfn, void *cbarg);bfa_status_t bfa_fcdiag_lb_is_running (struct bfa_s *bfa); -bfa_status_t bfa_dport_enable (struct bfa_s *bfa,bfa_cb_diag_t cbfn, -void *cbarg); +bfa_status_t bfa_dport_enable (struct bfa_s *bfa,u32 lpcnt,u32 pat, +bfa_cb_diag_t cbfn,void *cbarg);bfa_status_t bfa_dport_disable (struct bfa_s *bfa,bfa_cb_diag_t cbfn,void *cbarg); -bfa_status_t bfa_dport_get_state (struct bfa_s *bfa, -enum bfa_dport_state *state); +bfa_status_t bfa_dport_start (struct bfa_s *bfa,u32 lpcnt,u32 pat, +bfa_cb_diag_t cbfn,void *cbarg); +bfa_status_t bfa_dport_show (struct bfa_s *bfa, +struct bfa_diag_dport_result_s *result);#endif /* __BFA_SVC_H__ */
drivers/scsi/bfa/bfad_bsg.c +61 -20
123 lines not on this page · raw message
drivers/scsi/bfa/bfad_bsg.h +17 -8
@@ -144,7 +144,6 @@ enum {IOCMD_FCPIM_LUNMASK_DELETE ,IOCMD_DIAG_DPORT_ENABLE ,IOCMD_DIAG_DPORT_DISABLE , -IOCMD_DIAG_DPORT_GET_STATE ,IOCMD_QOS_SET_BW ,IOCMD_FCPIM_THROTTLE_QUERY , IOCMD_FCPIM_THROTTLE_SET,
@@ -153,6 +152,8 @@ enum {IOCMD_FRUVPD_READ ,IOCMD_FRUVPD_UPDATE ,IOCMD_FRUVPD_GET_MAX_SIZE , +IOCMD_DIAG_DPORT_SHOW , + IOCMD_DIAG_DPORT_START, }; struct bfa_bsg_gen_s {
@@ -593,6 +594,21 @@ struct bfa_bsg_diag_loopback_s {struct bfa_diag_loopback_result_s result; }; +struct bfa_bsg_diag_dport_show_s { +bfa_status_t status; +u16 bfad_num; +u16 rsvd; +struct bfa_diag_dport_result_s result; +}; + +struct bfa_bsg_dport_enable_s { +bfa_status_t status; +u16 bfad_num; +u16 rsvd; +u16 lpcnt; +u16 pat; +}; +struct bfa_bsg_diag_fwping_s {bfa_status_t status;u16 bfad_num;
@@ -640,13 +656,6 @@ struct bfa_bsg_diag_lb_stat_s {u16 rsvd; }; -struct bfa_bsg_diag_dport_get_state_s { -bfa_status_t status; -u16 bfad_num; -u16 rsvd; -enum bfa_dport_state state; -}; -struct bfa_bsg_phy_attr_s {bfa_status_t status;u16 bfad_num;
drivers/scsi/bfa/bfi.h +63 -5
85 lines not on this page · raw message
Signature · 1 line
1.7.12
PATCH 4/17 bfa: Fix WARN_ON condition check
In reply to Vijaya Mohan GuvvaThe WARN_ON condition check in IO completion path is wrong. IOtags returned by the firmware is compared with driver/bfa iotag after masking the retry count bits.
--- drivers/scsi/bfa/bfa_fcpim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/bfa/bfa_fcpim.c +1 -1
@@ -2882,7 +2882,7 @@ bfa_ioim_good_comp_isr(struct bfa_s *bfa, struct bfi_msg_s *m) iotag =be16_to_cpu (rsp->io_tag); ioim =BFA_IOIM_FROM_TAG (fcpim, iotag); -WARN_ON (BFA_IOIM_TAG_2_ID (ioim->iotag) != iotag); +WARN_ON (ioim->iotag != iotag);bfa_ioim_cb_profile_comp (fcpim, ioim);
Signature · 1 line
1.7.12
PATCH 5/17 bfa: FDMI enhancements
In reply to Vijaya Mohan GuvvaUpdate addl. fields in FDMI to confirm to FC-GS6 standard for RPA and RHBA commands.
--- drivers/scsi/bfa/bfa_fc.h | 15 ++++ drivers/scsi/bfa/bfa_fcs.h | 21 ++++- drivers/scsi/bfa/bfa_fcs_lport.c | 190 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 224 insertions(+), 2 deletions(-)
drivers/scsi/bfa/bfa_fc.h +15 -0
@@ -1531,6 +1531,12 @@ enum fdmi_hba_attribute_type {FDMI_HBA_ATTRIB_FW_VERSION ,/* 0x0009 */ FDMI_HBA_ATTRIB_OS_NAME ,/* 0x000A */ FDMI_HBA_ATTRIB_MAX_CT ,/* 0x000B */ +FDMI_HBA_ATTRIB_NODE_SYM_NAME ,/* 0x000C */ +FDMI_HBA_ATTRIB_VENDOR_INFO ,/* 0x000D */ +FDMI_HBA_ATTRIB_NUM_PORTS ,/* 0x000E */ +FDMI_HBA_ATTRIB_FABRIC_NAME ,/* 0x000F */ +FDMI_HBA_ATTRIB_BIOS_VER ,/* 0x0010 */ +FDMI_HBA_ATTRIB_VENDOR_ID =0x00E0 ,FDMI_HBA_ATTRIB_MAX_TYPE };
@@ -1545,6 +1551,15 @@ enum fdmi_port_attribute_type {FDMI_PORT_ATTRIB_FRAME_SIZE ,/* 0x0004 */ FDMI_PORT_ATTRIB_DEV_NAME ,/* 0x0005 */ FDMI_PORT_ATTRIB_HOST_NAME ,/* 0x0006 */ +FDMI_PORT_ATTRIB_NODE_NAME ,/* 0x0007 */ +FDMI_PORT_ATTRIB_PORT_NAME ,/* 0x0008 */ +FDMI_PORT_ATTRIB_PORT_SYM_NAME ,/* 0x0009 */ +FDMI_PORT_ATTRIB_PORT_TYPE ,/* 0x000A */ +FDMI_PORT_ATTRIB_SUPP_COS ,/* 0x000B */ +FDMI_PORT_ATTRIB_PORT_FAB_NAME ,/* 0x000C */ +FDMI_PORT_ATTRIB_PORT_FC4_TYPE ,/* 0x000D */ +FDMI_PORT_ATTRIB_PORT_STATE =0x101 ,/* 0x0101 */ +FDMI_PORT_ATTRIB_PORT_NUM_RPRT =0x102 ,/* 0x0102 */ FDMI_PORT_ATTR_MAX_TYPE };
drivers/scsi/bfa/bfa_fcs.h +19 -2
@@ -627,6 +627,9 @@ void bfa_fcs_fcpim_uf_recv(struct bfa_fcs_itnim_s *itnim,#define BFA_FCS_FDMI_SUPP_SPEEDS_10G FDMI_TRANS_SPEED_10G +#define BFA_FCS_FDMI_VENDOR_INFO_LEN 8 +#define BFA_FCS_FDMI_FC4_TYPE_LEN 32 +/* * HBA Attribute Block : BFA internal representation. Note : Some variable * sizes have been trimmed to suit BFA For Ex : Model will be "Brocade". Based
@@ -637,25 +640,39 @@ struct bfa_fcs_fdmi_hba_attr_s {u8 manufacturer[64 ];u8 serial_num[64 ];u8 model[16 ]; -u8 model_desc[256 ]; +u8 model_desc[128 ];u8 hw_version[8 ];u8 driver_version[BFA_VERSION_LEN ];u8 option_rom_ver[BFA_VERSION_LEN ];u8 fw_version[BFA_VERSION_LEN ];u8 os_name[256 ];__be32 max_ct_pyld; +struct bfa_lport_symname_s node_sym_name; +u8 vendor_info[BFA_FCS_FDMI_VENDOR_INFO_LEN ]; +__be32 num_ports; +wwn_t fabric_name; +u8 bios_ver[BFA_VERSION_LEN ]; };/* * Port Attribute Block */ struct bfa_fcs_fdmi_port_attr_s { -u8 supp_fc4_types[32 ];/* supported FC4 types */ +u8 supp_fc4_types[BFA_FCS_FDMI_FC4_TYPE_LEN ];__be32 supp_speed;/* supported speed */ __be32 curr_speed;/* current Speed */ __be32 max_frm_size;/* max frame size */ u8 os_device_name[256 ];/* OS device Name */ u8 host_name[256 ];/* host name */ +wwn_t port_name; +wwn_t node_name; +struct bfa_lport_symname_s port_sym_name; +__be32 port_type; +enum fc_cos scos; +wwn_t port_fabric_name; +u8 port_act_fc4_type[BFA_FCS_FDMI_FC4_TYPE_LEN ]; +__be32 port_state; +__be32 num_ports; };struct bfa_fcs_stats_s {
drivers/scsi/bfa/bfa_fcs_lport.c +190 -0
224 lines not on this page · raw message
Signature · 1 line
1.7.12
PATCH 6/17 bfa: Fix 1860 port initialize when ATC is enabled
In reply to Vijaya Mohan GuvvaOn Xen kernels, if ATC (address translation cache) is enabled, the first PCIe DMA read from the adapter fails with an error. This is due to a bug ASIC, which leads to a failure of 1860 ports to be initialised.
This patch includes the fix to disable Invalidated Tag Match Enable capability by setting the bit 26 of CHIP_MISC_PRG to 0, by default it is set to 1.
--- drivers/scsi/bfa/bfa_ioc_ct.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/scsi/bfa/bfa_ioc_ct.c +10 -0
@@ -918,6 +918,16 @@ bfa_ioc_ct2_pll_init(void __iomem *rb, enum bfi_asic_mode mode) } } +/* +* The very first PCIe DMA Read done by LPU fails with a fatal error, +* when Address Translation Cache (ATC) has been enabled by system BIOS. +* +* Workaround: +* Disable Invalidated Tag Match Enable capability by setting the bit 26 +* of CHIP_MISC_PRG to 0, by default it is set to 1. +*/ + r32 =readl (rb +CT2_CHIP_MISC_PRG ); +writel ((r32 &0xfbffffff ), (rb +CT2_CHIP_MISC_PRG ));/* * Mask the interrupts and clear any
Signature · 1 line
1.7.12
PATCH 7/17 bfa: Fix FDISC timeout handling
In reply to Vijaya Mohan GuvvaRetry FDISC a max of 6 times. Introduce new events to handle vport login fails due to max logins to fabric/switch.
--- drivers/scsi/bfa/bfa_fcs_lport.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
drivers/scsi/bfa/bfa_fcs_lport.c +17 -2
@@ -5988,6 +5988,7 @@ enum bfa_fcs_vport_event {BFA_FCS_VPORT_SM_RSP_DUP_WWN =12 ,/* Dup wnn error*/ BFA_FCS_VPORT_SM_RSP_FAILED =13 ,/* non-retryable failure */ BFA_FCS_VPORT_SM_STOPCOMP =14 ,/* vport delete completion */ + BFA_FCS_VPORT_SM_FABRIC_MAX = 15, /* max vports on fabric */ }; static void bfa_fcs_vport_sm_uninit(struct bfa_fcs_vport_s *vport,
@@ -6173,6 +6174,7 @@ bfa_fcs_vport_sm_fdisc(struct bfa_fcs_vport_s *vport,break ;case BFA_FCS_VPORT_SM_RSP_FAILED : +case BFA_FCS_VPORT_SM_FABRIC_MAX :bfa_sm_set_state (vport, bfa_fcs_vport_sm_offline);break ;
@@ -6243,6 +6245,7 @@ bfa_fcs_vport_sm_fdisc_rsp_wait(struct bfa_fcs_vport_s *vport,case BFA_FCS_VPORT_SM_OFFLINE :case BFA_FCS_VPORT_SM_RSP_ERROR :case BFA_FCS_VPORT_SM_RSP_FAILED : +case BFA_FCS_VPORT_SM_FABRIC_MAX :case BFA_FCS_VPORT_SM_RSP_DUP_WWN :bfa_sm_set_state (vport, bfa_fcs_vport_sm_cleanup);bfa_sm_send_event (vport->lps,BFA_LPS_SM_OFFLINE );
@@ -6528,7 +6531,7 @@ bfa_fcs_vport_fdisc_rejected(struct bfa_fcs_vport_s *vport)else {bfa_fcs_vport_aen_post (&vport->lport,BFA_LPORT_AEN_NPIV_FABRIC_MAX ); -bfa_sm_send_event (vport,BFA_FCS_VPORT_SM_RSP_FAILED ); +bfa_sm_send_event (vport,BFA_FCS_VPORT_SM_FABRIC_MAX ); }break ;
@@ -6914,7 +6917,19 @@ bfa_cb_lps_fdisc_comp(void *bfad, void *uarg, bfa_status_t status)break ; } -bfa_sm_send_event (vport,BFA_FCS_VPORT_SM_RSP_ERROR ); +if (vport->fdisc_retries <BFA_FCS_VPORT_MAX_RETRIES ) +bfa_sm_send_event (vport,BFA_FCS_VPORT_SM_RSP_ERROR ); +else +bfa_sm_send_event (vport,BFA_FCS_VPORT_SM_RSP_FAILED ); + +break ; + +case BFA_STATUS_ETIMER : + vport->vport_stats.fdisc_timeouts++; +if (vport->fdisc_retries <BFA_FCS_VPORT_MAX_RETRIES ) +bfa_sm_send_event (vport,BFA_FCS_VPORT_SM_RSP_ERROR ); +else +bfa_sm_send_event (vport,BFA_FCS_VPORT_SM_RSP_FAILED );break ;case BFA_STATUS_FABRIC_RJT :
Signature · 1 line
1.7.12
PATCH 8/17 bfa: kdump fix on 815 and 825 adapters
In reply to Vijaya Mohan GuvvaRoot cause: When kernel crashes, On brocade 815/825 adapters,
bfa IOC state machine and FW doesn't get a notification and
hence are not cleanly shutdown. So registers holding driver/IOC state information are not reset back to valid disabled/parking values. This causes subsequent driver initialization to fail during kdump kernel boot.
Fix description: during the initialization of first PCI function, reset corresponding register when unclean shutown is detect by reading chip registers. This will make sure that ioc/fw gets clean re-initialization.
--- drivers/scsi/bfa/bfa_ioc.c | 42 ++++++++++++--------- drivers/scsi/bfa/bfa_ioc.h | 6 +++ drivers/scsi/bfa/bfa_ioc_cb.c | 86 +++++++++++++++++++++++++++++++++++++++---- drivers/scsi/bfa/bfa_ioc_ct.c | 36 ++++++++++++++++++ drivers/scsi/bfa/bfi.h | 4 ++ 5 files changed, 150 insertions(+), 24 deletions(-)
drivers/scsi/bfa/bfa_ioc.c +25 -17
@@ -67,6 +67,14 @@ BFA_TRC_FILE(CNA, IOC); ((__ioc)->ioc_hwif->ioc_sync_ack(__ioc))#define bfa_ioc_sync_complete (__ioc) \ ((__ioc)->ioc_hwif->ioc_sync_complete(__ioc)) +#define bfa_ioc_set_cur_ioc_fwstate (__ioc, __fwstate) \ + ((__ioc)->ioc_hwif->ioc_set_fwstate(__ioc, __fwstate)) +#define bfa_ioc_get_cur_ioc_fwstate (__ioc) \ + ((__ioc)->ioc_hwif->ioc_get_fwstate(__ioc)) +#define bfa_ioc_set_alt_ioc_fwstate (__ioc, __fwstate) \ + ((__ioc)->ioc_hwif->ioc_set_alt_fwstate(__ioc, __fwstate)) +#define bfa_ioc_get_alt_ioc_fwstate (__ioc) \ + ((__ioc)->ioc_hwif->ioc_get_alt_fwstate(__ioc))#define bfa_ioc_mbox_cmd_pending (__ioc) \ (!list_empty(&((__ioc)->mbox_mod.cmd_q)) || \
@@ -698,7 +706,7 @@ bfa_iocpf_sm_fwcheck_entry(struct bfa_iocpf_s *iocpf) }/* h/w sem init */ - fwstate =readl (iocpf->ioc->ioc_regs.ioc_fwstate); + fwstate =bfa_ioc_get_cur_ioc_fwstate (iocpf->ioc);if (fwstate ==BFI_IOC_UNINIT ) {writel (1 , iocpf->ioc->ioc_regs.ioc_init_sem_reg); goto sem_get;
@@ -725,8 +733,8 @@ bfa_iocpf_sm_fwcheck_entry(struct bfa_iocpf_s *iocpf)bfa_trc (iocpf->ioc, fwstate);bfa_trc (iocpf->ioc,swab32 (fwhdr.exec)); -writel (BFI_IOC_UNINIT , iocpf->ioc->ioc_regs.ioc_fwstate); -writel (BFI_IOC_UNINIT , iocpf->ioc->ioc_regs.alt_ioc_fwstate); +bfa_ioc_set_cur_ioc_fwstate (iocpf->ioc,BFI_IOC_UNINIT ); +bfa_ioc_set_alt_ioc_fwstate (iocpf->ioc,BFI_IOC_UNINIT );/* * Unlock the hw semaphore. Should be here only once per boot.
@@ -1037,7 +1045,7 @@ bfa_iocpf_sm_disabling(struct bfa_iocpf_s *iocpf, enum iocpf_event event)*/ case IOCPF_E_TIMEOUT : -writel (BFI_IOC_FAIL , ioc->ioc_regs.ioc_fwstate); +bfa_ioc_set_cur_ioc_fwstate (ioc,BFI_IOC_FAIL );bfa_fsm_set_state (iocpf, bfa_iocpf_sm_disabling_sync);break ;
@@ -1138,7 +1146,7 @@ bfa_iocpf_sm_initfail_sync(struct bfa_iocpf_s *iocpf, enum iocpf_event event)case IOCPF_E_SEMLOCKED :bfa_ioc_notify_fail (ioc);bfa_ioc_sync_leave (ioc); -writel (BFI_IOC_FAIL , ioc->ioc_regs.ioc_fwstate); +bfa_ioc_set_cur_ioc_fwstate (ioc,BFI_IOC_FAIL );writel (1 , ioc->ioc_regs.ioc_sem_reg);bfa_fsm_set_state (iocpf, bfa_iocpf_sm_initfail);break ;
@@ -1227,7 +1235,7 @@ bfa_iocpf_sm_fail_sync(struct bfa_iocpf_s *iocpf, enum iocpf_event event)bfa_ioc_notify_fail (ioc);if (!iocpf->auto_recover) {bfa_ioc_sync_leave (ioc); -writel (BFI_IOC_FAIL , ioc->ioc_regs.ioc_fwstate); +bfa_ioc_set_cur_ioc_fwstate (ioc,BFI_IOC_FAIL );writel (1 , ioc->ioc_regs.ioc_sem_reg);bfa_fsm_set_state (iocpf, bfa_iocpf_sm_fail); }else {
@@ -1519,7 +1527,7 @@ bfa_ioc_hwinit(struct bfa_ioc_s *ioc, bfa_boolean_t force)u32 boot_type;u32 boot_env; - ioc_fwstate =readl (ioc->ioc_regs.ioc_fwstate); + ioc_fwstate =bfa_ioc_get_cur_ioc_fwstate (ioc);if (force) ioc_fwstate =BFI_IOC_UNINIT ;
@@ -2006,11 +2014,11 @@ bfa_ioc_boot(struct bfa_ioc_s *ioc, u32 boot_type, u32 boot_env)* Initialize IOC state of all functions on a chip reset. */ if (boot_type ==BFI_FWBOOT_TYPE_MEMTEST ) { -writel (BFI_IOC_MEMTEST , ioc->ioc_regs.ioc_fwstate); -writel (BFI_IOC_MEMTEST , ioc->ioc_regs.alt_ioc_fwstate); +bfa_ioc_set_cur_ioc_fwstate (ioc,BFI_IOC_MEMTEST ); +bfa_ioc_set_alt_ioc_fwstate (ioc,BFI_IOC_MEMTEST ); }else { -writel (BFI_IOC_INITING , ioc->ioc_regs.ioc_fwstate); -writel (BFI_IOC_INITING , ioc->ioc_regs.alt_ioc_fwstate); +bfa_ioc_set_cur_ioc_fwstate (ioc,BFI_IOC_INITING ); +bfa_ioc_set_alt_ioc_fwstate (ioc,BFI_IOC_INITING ); }bfa_ioc_msgflush (ioc);
@@ -2038,7 +2046,7 @@ bfa_ioc_is_operational(struct bfa_ioc_s *ioc)bfa_boolean_t bfa_ioc_is_initialized (struct bfa_ioc_s *ioc) { -u32 r32 =readl (ioc->ioc_regs.ioc_fwstate); +u32 r32 =bfa_ioc_get_cur_ioc_fwstate (ioc); return ((r32 != BFI_IOC_UNINIT) && (r32 != BFI_IOC_INITING) &&
@@ -2430,12 +2438,12 @@ bfa_ioc_adapter_is_disabled(struct bfa_ioc_s *ioc)if (!bfa_fsm_cmp_state (ioc, bfa_ioc_sm_disabled))return BFA_FALSE ; - ioc_state =readl (ioc->ioc_regs.ioc_fwstate); + ioc_state =bfa_ioc_get_cur_ioc_fwstate (ioc);if (!bfa_ioc_state_disabled (ioc_state))return BFA_FALSE ;if (ioc->pcidev.device_id !=BFA_PCI_DEVICE_ID_FC_8G1P ) { - ioc_state =readl (ioc->ioc_regs.alt_ioc_fwstate); + ioc_state =bfa_ioc_get_cur_ioc_fwstate (ioc);if (!bfa_ioc_state_disabled (ioc_state))return BFA_FALSE ; }
@@ -2449,8 +2457,8 @@ bfa_ioc_adapter_is_disabled(struct bfa_ioc_s *ioc)void bfa_ioc_reset_fwstate (struct bfa_ioc_s *ioc) { -writel (BFI_IOC_UNINIT , ioc->ioc_regs.ioc_fwstate); -writel (BFI_IOC_UNINIT , ioc->ioc_regs.alt_ioc_fwstate); +bfa_ioc_set_cur_ioc_fwstate (ioc,BFI_IOC_UNINIT ); +bfa_ioc_set_alt_ioc_fwstate (ioc,BFI_IOC_UNINIT ); }#define BFA_MFG_NAME "Brocade"
@@ -2917,7 +2925,7 @@ bfa_iocpf_sem_timeout(void *ioc_arg)static void bfa_ioc_poll_fwinit (struct bfa_ioc_s *ioc) { -u32 fwstate =readl (ioc->ioc_regs.ioc_fwstate); +u32 fwstate =bfa_ioc_get_cur_ioc_fwstate (ioc);bfa_trc (ioc, fwstate);
drivers/scsi/bfa/bfa_ioc.h +6 -0
@@ -346,6 +346,12 @@ struct bfa_ioc_hwif_s {void (*ioc_sync_ack) (struct bfa_ioc_s *ioc);bfa_boolean_t (*ioc_sync_complete) (struct bfa_ioc_s *ioc);bfa_boolean_t (*ioc_lpu_read_stat) (struct bfa_ioc_s *ioc); +void (*ioc_set_fwstate) (struct bfa_ioc_s *ioc, +enum bfi_ioc_state fwstate); +enum bfi_ioc_state (*ioc_get_fwstate) (struct bfa_ioc_s *ioc); +void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc, +enum bfi_ioc_state fwstate); +enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc); };/*
drivers/scsi/bfa/bfa_ioc_cb.c +79 -7
149 lines not on this page · raw message
drivers/scsi/bfa/bfa_ioc_ct.c +36 -0
@@ -43,6 +43,12 @@ static void bfa_ioc_ct_sync_join(struct bfa_ioc_s *ioc);static void bfa_ioc_ct_sync_leave (struct bfa_ioc_s *ioc);static void bfa_ioc_ct_sync_ack (struct bfa_ioc_s *ioc);static bfa_boolean_t bfa_ioc_ct_sync_complete (struct bfa_ioc_s *ioc); +static void bfa_ioc_ct_set_cur_ioc_fwstate ( +struct bfa_ioc_s *ioc,enum bfi_ioc_state fwstate); +static enum bfi_ioc_state bfa_ioc_ct_get_cur_ioc_fwstate (struct bfa_ioc_s *ioc); +static void bfa_ioc_ct_set_alt_ioc_fwstate ( +struct bfa_ioc_s *ioc,enum bfi_ioc_state fwstate); +static enum bfi_ioc_state bfa_ioc_ct_get_alt_ioc_fwstate (struct bfa_ioc_s *ioc);static struct bfa_ioc_hwif_s hwif_ct;static struct bfa_ioc_hwif_s hwif_ct2;
@@ -512,6 +518,10 @@ bfa_ioc_set_ctx_hwif(struct bfa_ioc_s *ioc, struct bfa_ioc_hwif_s *hwif) hwif->ioc_sync_leave = bfa_ioc_ct_sync_leave; hwif->ioc_sync_ack = bfa_ioc_ct_sync_ack; hwif->ioc_sync_complete = bfa_ioc_ct_sync_complete; + hwif->ioc_set_fwstate = bfa_ioc_ct_set_cur_ioc_fwstate; + hwif->ioc_get_fwstate = bfa_ioc_ct_get_cur_ioc_fwstate; + hwif->ioc_set_alt_fwstate = bfa_ioc_ct_set_alt_ioc_fwstate; + hwif->ioc_get_alt_fwstate = bfa_ioc_ct_get_alt_ioc_fwstate; }/**
@@ -959,3 +969,29 @@ bfa_ioc_ct2_pll_init(void __iomem *rb, enum bfi_asic_mode mode)return BFA_STATUS_OK ; } + +static void +bfa_ioc_ct_set_cur_ioc_fwstate (struct bfa_ioc_s *ioc, +enum bfi_ioc_state fwstate) +{ +writel (fwstate, ioc->ioc_regs.ioc_fwstate); +} + +static enum bfi_ioc_state +bfa_ioc_ct_get_cur_ioc_fwstate (struct bfa_ioc_s *ioc) +{ +return (enum bfi_ioc_state )readl (ioc->ioc_regs.ioc_fwstate); +} + +static void +bfa_ioc_ct_set_alt_ioc_fwstate (struct bfa_ioc_s *ioc, +enum bfi_ioc_state fwstate) +{ +writel (fwstate, ioc->ioc_regs.alt_ioc_fwstate); +} + +static enum bfi_ioc_state +bfa_ioc_ct_get_alt_ioc_fwstate (struct bfa_ioc_s *ioc) +{ +return (enum bfi_ioc_state )readl (ioc->ioc_regs.alt_ioc_fwstate); +}
drivers/scsi/bfa/bfi.h +4 -0
@@ -374,6 +374,10 @@ enum bfi_ioc_state { BFI_IOC_MEMTEST = 9, /* IOC is doing memtest */ }; +#define BFA_IOC_CB_JOIN_SH 16 +#define BFA_IOC_CB_FWSTATE_MASK 0x0000ffff +#define BFA_IOC_CB_JOIN_MASK 0xffff0000 +#define BFI_IOC_ENDIAN_SIG 0x12345678enum {
Signature · 1 line
1.7.12
PATCH 9/17 bfa: driver compatibility with 32bit libs
In reply to Vijaya Mohan GuvvaReplaced usage of void * with u64 in data structure shared between brocade user space libraries and the bfa driver to address pointer size changes across 32-bit vs 64-bit to have the compatibility between 32bit library and 64bit driver and vice versa.
--- drivers/scsi/bfa/bfad_bsg.c | 7 ++++--- drivers/scsi/bfa/bfad_bsg.h | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/scsi/bfa/bfad_bsg.c +4 -3
@@ -3371,7 +3371,8 @@ bfad_im_bsg_els_ct_request(struct fc_bsg_job *job) goto out; } -if (copy_from_user ((uint8_t *)bsg_fcpt, bsg_data->payload, +if (copy_from_user ((uint8_t *)bsg_fcpt, + (void *)(unsigned long )bsg_data->payload, bsg_data->payload_len)) {kfree (bsg_fcpt); rc = -EIO ;
@@ -3525,8 +3526,8 @@ out_free_mem:kfree (rsp_kbuf);/* Need a copy to user op */ -if (copy_to_user (bsg_data->payload, (void *) bsg_fcpt, - bsg_data->payload_len)) +if (copy_to_user ((void *)(unsigned long )bsg_data->payload, + (void *)bsg_fcpt, bsg_data->payload_len)) rc = -EIO ;kfree (bsg_fcpt);
drivers/scsi/bfa/bfad_bsg.h +3 -1
@@ -819,10 +819,12 @@ struct bfa_bsg_fcpt_s { };#define bfa_bsg_fcpt_t struct bfa_bsg_fcpt_s +#pragma pack(1)struct bfa_bsg_data {int payload_len; -void *payload; +u64 payload; }; +#pragma pack()#define bfad_chk_iocmd_sz (__payload_len, __hdrsz, __bufsz) \ (((__payload_len) != ((__hdrsz) + (__bufsz))) ? \
Signature · 1 line
1.7.12
PATCH 10/17 bfa: fru vpd date update changes
In reply to Vijaya Mohan Guvva1. While FRU VPD data update, inform firmware to send a completion event on I2C bus. Without this change, firmware used to send completion message on I2C bus for every chunk of FRU VPD update.
2. Support for FRU VPN update on CHINOOK2 cards.
3. Append port count to the model name to differentiate between single port and dual port model of 1860.
4. Update the size of the model name to 16bytes
--- drivers/scsi/bfa/bfa_defs.h | 9 +++++++-- drivers/scsi/bfa/bfa_fcs.h | 8 ++++---- drivers/scsi/bfa/bfa_ioc.c | 29 +++++++++++++++++++++-------- drivers/scsi/bfa/bfa_ioc.h | 3 ++- drivers/scsi/bfa/bfad_bsg.c | 2 +- drivers/scsi/bfa/bfad_bsg.h | 4 +++- drivers/scsi/bfa/bfi.h | 6 +++++- 7 files changed, 43 insertions(+), 18 deletions(-)
drivers/scsi/bfa/bfa_defs.h +7 -2
@@ -45,6 +45,7 @@ enum {BFA_MFG_TYPE_PROWLER_C =1710 ,/* Prowler CNA only cards */ BFA_MFG_TYPE_PROWLER_D =1860 ,/* Prowler Dual cards */ BFA_MFG_TYPE_CHINOOK =1867 ,/* Chinook cards */ +BFA_MFG_TYPE_CHINOOK2 =1869 ,/*!< Chinook2 cards */ BFA_MFG_TYPE_INVALID = 0, /* Invalid card type */ };
@@ -59,7 +60,8 @@ enum { (type) ==BFA_MFG_TYPE_ASTRA || \ (type) ==BFA_MFG_TYPE_LIGHTNING_P0 || \ (type) ==BFA_MFG_TYPE_LIGHTNING || \ - (type) == BFA_MFG_TYPE_CHINOOK)) + (type) ==BFA_MFG_TYPE_CHINOOK || \ + (type) == BFA_MFG_TYPE_CHINOOK2))/* * Check if the card having old wwn/mac handling
@@ -263,6 +265,7 @@ enum {BFA_ADAPTER_MFG_NAME_LEN =8 ,/* manufacturer name length */ BFA_ADAPTER_SYM_NAME_LEN =64 ,/* adapter symbolic name length */ BFA_ADAPTER_OS_TYPE_LEN =64 ,/* adapter os type length */ + BFA_ADAPTER_UUID_LEN = 16, /* adapter uuid length */ }; struct bfa_adapter_attr_s {
@@ -296,6 +299,7 @@ struct bfa_adapter_attr_s {u8 mfg_month;/* manufacturing month */ u16 mfg_year;/* manufacturing year */ u16 rsvd; +u8 uuid[BFA_ADAPTER_UUID_LEN ]; };/*
@@ -409,7 +413,8 @@ struct bfa_ioc_attr_s {u8 port_mode;/* bfa_mode_s */ u8 cap_bm;/* capability */ u8 port_mode_cfg;/* bfa_mode_s */ -u8 rsvd[4 ];/* 64bit align */ +u8 def_fn;/* 1 if default fn */ +u8 rsvd[3 ];/* 64bit align */ };/*
drivers/scsi/bfa/bfa_fcs.h +4 -4
@@ -243,19 +243,19 @@ struct bfa_fcs_fabric_s;* Symbolic Name. * * Physical Port's symbolic name Format : (Total 128 bytes) -* Adapter Model number/name : 12 bytes +* Adapter Model number/name : 16 bytes * Driver Version : 10 bytes * Host Machine Name : 30 bytes -* Host OS Info : 48 bytes +* Host OS Info : 44 bytes * Host OS PATCH Info : 16 bytes * ( remaining 12 bytes reserved to be used for separator) */ #define BFA_FCS_PORT_SYMBNAME_SEPARATOR " | " -#define BFA_FCS_PORT_SYMBNAME_MODEL_SZ 12 +#define BFA_FCS_PORT_SYMBNAME_MODEL_SZ 16#define BFA_FCS_PORT_SYMBNAME_VERSION_SZ 10#define BFA_FCS_PORT_SYMBNAME_MACHINENAME_SZ 30 -#define BFA_FCS_PORT_SYMBNAME_OSINFO_SZ 48 +#define BFA_FCS_PORT_SYMBNAME_OSINFO_SZ 44#define BFA_FCS_PORT_SYMBNAME_OSPATCH_SZ 16/*
drivers/scsi/bfa/bfa_ioc.c +21 -8
@@ -2508,6 +2508,7 @@ bfa_ioc_get_adapter_attr(struct bfa_ioc_s *ioc, ad_attr->mfg_day = ioc_attr->mfg_day; ad_attr->mfg_month = ioc_attr->mfg_month; ad_attr->mfg_year = ioc_attr->mfg_year; +memcpy (ad_attr->uuid, ioc_attr->uuid,BFA_ADAPTER_UUID_LEN ); }enum bfa_ioc_type_e
@@ -2572,13 +2573,19 @@ void bfa_ioc_get_adapter_model(struct bfa_ioc_s *ioc, char *model) { struct bfi_ioc_attr_s *ioc_attr; +u8 nports =bfa_ioc_get_nports (ioc);WARN_ON (!model);memset ((void *)model,0 ,BFA_ADAPTER_MODEL_NAME_LEN ); ioc_attr = ioc->attr; -snprintf (model,BFA_ADAPTER_MODEL_NAME_LEN ,"%s-%u" , +if (bfa_asic_id_ct2 (ioc->pcidev.device_id) && + (!bfa_mfg_is_mezz (ioc_attr->card_type))) +snprintf (model,BFA_ADAPTER_MODEL_NAME_LEN ,"%s-%u-%u%s" , +BFA_MFG_NAME , ioc_attr->card_type, nports,"p" ); +else +snprintf (model,BFA_ADAPTER_MODEL_NAME_LEN ,"%s-%u" ,BFA_MFG_NAME , ioc_attr->card_type); }
@@ -2628,7 +2635,7 @@ bfa_ioc_get_attr(struct bfa_ioc_s *ioc, struct bfa_ioc_attr_s *ioc_attr)memset ((void *)ioc_attr,0 ,sizeof (struct bfa_ioc_attr_s )); ioc_attr->state =bfa_ioc_get_state (ioc); - ioc_attr->port_id = ioc->port_id; + ioc_attr->port_id =bfa_ioc_portid (ioc); ioc_attr->port_mode = ioc->port_mode; ioc_attr->port_mode_cfg = ioc->port_mode_cfg; ioc_attr->cap_bm = ioc->ad_cap_bm;
@@ -2637,8 +2644,9 @@ bfa_ioc_get_attr(struct bfa_ioc_s *ioc, struct bfa_ioc_attr_s *ioc_attr)bfa_ioc_get_adapter_attr (ioc, &ioc_attr->adapter_attr); - ioc_attr->pci_attr.device_id = ioc->pcidev.device_id; - ioc_attr->pci_attr.pcifn = ioc->pcidev.pci_func; + ioc_attr->pci_attr.device_id =bfa_ioc_devid (ioc); + ioc_attr->pci_attr.pcifn =bfa_ioc_pcifn (ioc); + ioc_attr->def_fn = (bfa_ioc_pcifn (ioc) ==bfa_ioc_portid (ioc));bfa_ioc_get_pci_chip_rev (ioc, ioc_attr->pci_attr.chip_rev); }
@@ -6018,6 +6026,7 @@ bfa_fru_write_send(void *cbarg, enum bfi_fru_h2i_msgs msg_type)*/ msg->last = (len == fru->residue) ?1 :0 ; + msg->trfr_cmpl = (len == fru->residue) ? fru->trfr_cmpl :0 ;bfi_h2i_set (msg->mh,BFI_MC_FRU , msg_type,bfa_ioc_portid (fru->ioc));bfa_alen_set (&msg->alen, len, fru->dbuf_pa);
@@ -6132,13 +6141,14 @@ bfa_fru_memclaim(struct bfa_fru_s *fru, u8 *dm_kva, u64 dm_pa,*/ bfa_status_t bfa_fruvpd_update (struct bfa_fru_s *fru,void *buf,u32 len,u32 offset, -bfa_cb_fru_t cbfn,void *cbarg) +bfa_cb_fru_t cbfn,void *cbarg,u8 trfr_cmpl) {bfa_trc (fru,BFI_FRUVPD_H2I_WRITE_REQ );bfa_trc (fru, len);bfa_trc (fru, offset); -if (fru->ioc->asic_gen !=BFI_ASIC_GEN_CT2 ) +if (fru->ioc->asic_gen !=BFI_ASIC_GEN_CT2 && + fru->ioc->attr->card_type !=BFA_MFG_TYPE_CHINOOK2 )return BFA_STATUS_FRU_NOT_PRESENT ;if (fru->ioc->attr->card_type !=BFA_MFG_TYPE_CHINOOK )
@@ -6160,6 +6170,7 @@ bfa_fruvpd_update(struct bfa_fru_s *fru, void *buf, u32 len, u32 offset, fru->offset =0 ; fru->addr_off = offset; fru->ubuf = buf; + fru->trfr_cmpl = trfr_cmpl;bfa_fru_write_send (fru,BFI_FRUVPD_H2I_WRITE_REQ );
@@ -6189,7 +6200,8 @@ bfa_fruvpd_read(struct bfa_fru_s *fru, void *buf, u32 len, u32 offset,if (fru->ioc->asic_gen !=BFI_ASIC_GEN_CT2 )return BFA_STATUS_FRU_NOT_PRESENT ; -if (fru->ioc->attr->card_type !=BFA_MFG_TYPE_CHINOOK ) +if (fru->ioc->attr->card_type !=BFA_MFG_TYPE_CHINOOK && + fru->ioc->attr->card_type !=BFA_MFG_TYPE_CHINOOK2 )return BFA_STATUS_CMD_NOTSUPP ;if (!bfa_ioc_is_operational (fru->ioc))
@@ -6230,7 +6242,8 @@ bfa_fruvpd_get_max_size(struct bfa_fru_s *fru, u32 *max_size)if (!bfa_ioc_is_operational (fru->ioc))return BFA_STATUS_IOC_NON_OP ; -if (fru->ioc->attr->card_type ==BFA_MFG_TYPE_CHINOOK ) +if (fru->ioc->attr->card_type ==BFA_MFG_TYPE_CHINOOK || + fru->ioc->attr->card_type ==BFA_MFG_TYPE_CHINOOK2 ) *max_size =BFA_FRU_CHINOOK_MAX_SIZE ;else return BFA_STATUS_CMD_NOTSUPP ;
drivers/scsi/bfa/bfa_ioc.h +2 -1
@@ -731,6 +731,7 @@ struct bfa_fru_s {struct bfa_mbox_cmd_s mb;/* mailbox */ struct bfa_ioc_notify_s ioc_notify;/* ioc event notify */ struct bfa_mem_dma_s fru_dma; +u8 trfr_cmpl; };#define BFA_FRU (__bfa) (&(__bfa)->modules.fru)
@@ -738,7 +739,7 @@ struct bfa_fru_s {bfa_status_t bfa_fruvpd_update (struct bfa_fru_s *fru,void *buf,u32 len,u32 offset, -bfa_cb_fru_t cbfn,void *cbarg); +bfa_cb_fru_t cbfn,void *cbarg,u8 trfr_cmpl);bfa_status_t bfa_fruvpd_read (struct bfa_fru_s *fru,void *buf,u32 len,u32 offset,bfa_cb_fru_t cbfn,void *cbarg);
drivers/scsi/bfa/bfad_bsg.c +1 -1
@@ -2716,7 +2716,7 @@ bfad_iocmd_fruvpd_update(struct bfad_s *bfad, void *cmd)spin_lock_irqsave (&bfad->bfad_lock, flags); iocmd->status =bfa_fruvpd_update (BFA_FRU (&bfad->bfa), &iocmd->data, iocmd->len, iocmd->offset, - bfad_hcb_comp, &fcomp); + bfad_hcb_comp, &fcomp, iocmd->trfr_cmpl);spin_unlock_irqrestore (&bfad->bfad_lock, flags);if (iocmd->status ==BFA_STATUS_OK ) {wait_for_completion (&fcomp.comp);
drivers/scsi/bfa/bfad_bsg.h +3 -1
@@ -794,10 +794,12 @@ struct bfa_bsg_tfru_s {struct bfa_bsg_fruvpd_s {bfa_status_t status;u16 bfad_num; -u16 rsvd; +u16 rsvd1;u32 offset;u32 len;u8 data[BFA_MAX_FRUVPD_TRANSFER_SIZE ]; +u8 trfr_cmpl; +u8 rsvd2[3 ]; };struct bfa_bsg_fruvpd_max_size_s {
drivers/scsi/bfa/bfi.h +5 -1
@@ -264,6 +264,7 @@ struct bfi_ioc_getattr_req_s {union bfi_addr_u attr_addr; }; +#define BFI_IOC_ATTR_UUID_SZ 16struct bfi_ioc_attr_s {wwn_t mfg_pwwn;/* Mfg port wwn */ wwn_t mfg_nwwn;/* Mfg node wwn */
@@ -292,6 +293,7 @@ struct bfi_ioc_attr_s {u8 mfg_day;/* manufacturing day */ u8 mfg_month;/* manufacturing month */ u16 mfg_year;/* manufacturing year */ +u8 uuid[BFI_IOC_ATTR_UUID_SZ ];/*!< chinook uuid */ };/*
@@ -1253,7 +1255,9 @@ enum bfi_fru_i2h_msgs {struct bfi_fru_write_req_s {struct bfi_mhdr_s mh;/* Common msg header */ u8 last; -u8 rsv[3 ]; +u8 rsv_1[3 ]; +u8 trfr_cmpl; +u8 rsv_2[3 ];u32 offset;u32 length;struct bfi_alen_s alen;
Signature · 1 line
1.7.12
PATCH 11/17 bfa: firmware statistics update
In reply to Vijaya Mohan GuvvaGet RDS drop interrupts and REC (Read Exchange Concise) related stats from firmware.
--- drivers/scsi/bfa/bfa_defs_svc.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/scsi/bfa/bfa_defs_svc.h +12 -0
@@ -105,6 +105,9 @@ struct bfa_fw_ioim_stats_s {* an error condition*/ u32 wait_for_si;/* FW wait for SI */ u32 rec_rsp_inval;/* REC rsp invalid */ +u32 rec_rsp_xchg_comp;/* REC rsp xchg complete */ +u32 rec_rsp_rd_si_ownd;/* REC rsp read si owned */ +u32 seqr_io_abort;/* target does not know cmd so abort */ u32 seqr_io_retry;/* SEQR failed so retry IO */
@@ -483,6 +486,14 @@ struct bfa_fw_ct_mod_stats_s { };/* +* RDS mod stats +*/ +struct bfa_fw_rds_stats_s { +u32 no_fid_drop_err;/* RDS no fid drop error */ +u32 rsvd;/* 64bit align */ +}; + +/* * IOC firmware stats */ struct bfa_fw_stats_s {
@@ -497,6 +508,7 @@ struct bfa_fw_stats_s {struct bfa_fw_mac_mod_stats_s macmod_stats;struct bfa_fw_ct_mod_stats_s ctmod_stats;struct bfa_fw_eth_sndrcv_stats_s ethsndrcv_stats; +struct bfa_fw_rds_stats_s rds_stats; };#define BFA_IOCFC_PATHTOV_MAX 60
Signature · 1 line
1.7.12
PATCH 12/17 bfa: Allow rsp queue process during ioc disable
In reply to Vijaya Mohan GuvvaAllow processing completions from firmware during IOC_DISABLE request is being processed by the firmware, by setting the queue_process flag appropriately.
--- drivers/scsi/bfa/bfa_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/bfa/bfa_core.c +1 -2
@@ -1432,6 +1432,7 @@ bfa_iocfc_disable_cbfn(void *bfa_arg) {struct bfa_s *bfa = bfa_arg; + bfa->queue_process =BFA_FALSE ;bfa_fsm_send_event (&bfa->iocfc,IOCFC_E_IOC_DISABLED ); }
@@ -1567,7 +1568,6 @@ bfa_iocfc_start(struct bfa_s *bfa)void bfa_iocfc_stop (struct bfa_s *bfa) { - bfa->queue_process =BFA_FALSE ;bfa_fsm_send_event (&bfa->iocfc,IOCFC_E_STOP ); }
@@ -1674,7 +1674,6 @@ bfa_iocfc_disable(struct bfa_s *bfa)bfa_plog_str (bfa->plog,BFA_PL_MID_HAL ,BFA_PL_EID_MISC ,0 ,"IOC Disable" ); - bfa->queue_process =BFA_FALSE ;bfa_fsm_send_event (&bfa->iocfc,IOCFC_E_DISABLE ); }
Signature · 1 line
1.7.12
PATCH 13/17 bfa: Fix bug_on condition in RPSC rsp handling
In reply to Vijaya Mohan GuvvaFix bug_on condition check in RPSC (Report Port Speed Capabilities) response processing.
--- drivers/scsi/bfa/bfa_fcs_rport.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/scsi/bfa/bfa_fcs_rport.c +3 -2
@@ -3430,9 +3430,10 @@ bfa_fcs_rpf_rpsc2_response(void *fcsarg, struct bfa_fcxp_s *fcxp, void *cbarg, num_ents =be16_to_cpu (rpsc2_acc->num_pids);bfa_trc (rport->fcs, num_ents);if (num_ents >0 ) { -WARN_ON (rpsc2_acc->port_info[0 ].pid == rport->pid); +WARN_ON (be32_to_cpu (rpsc2_acc->port_info[0 ].pid) != +bfa_ntoh3b (rport->pid));bfa_trc (rport->fcs, -be16_to_cpu (rpsc2_acc->port_info[0 ].pid)); +be32_to_cpu (rpsc2_acc->port_info[0 ].pid));bfa_trc (rport->fcs,be16_to_cpu (rpsc2_acc->port_info[0 ].speed)); bfa_trc(rport->fcs,
Signature · 1 line
1.7.12
PATCH 14/17 bfa: fix endianess issue for firmware stats
In reply to Vijaya Mohan GuvvaFix endianess issue on Big-endian architecture for firmware statistics
--- drivers/scsi/bfa/bfa_ioc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/bfa/bfa_ioc.c +1 -1
@@ -1858,7 +1858,7 @@ bfa_ioc_smem_read(struct bfa_ioc_s *ioc, void *tbuf, u32 soff, u32 sz)bfa_trc (ioc, len);for (i =0 ; i < len; i++) { r32 =bfa_mem_read (ioc->ioc_regs.smem_page_start, loff); - buf[i] =be32_to_cpu (r32); + buf[i] =swab32 (r32); loff +=sizeof (u32);/*
Signature · 1 line
1.7.12
PATCH 15/17 bfa: Support for chinook-quad port card
In reply to Vijaya Mohan GuvvaThis patch enables support for chinook quad port 16G FC card (falcon)
--- drivers/scsi/bfa/bfa_defs.h | 5 ++++- drivers/scsi/bfa/bfa_ioc.c | 1 + drivers/scsi/bfa/bfad.c | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-)
drivers/scsi/bfa/bfa_defs.h +4 -1
@@ -637,6 +637,7 @@ enum {BFA_PCI_DEVICE_ID_CT =0x14 ,BFA_PCI_DEVICE_ID_CT_FC =0x21 ,BFA_PCI_DEVICE_ID_CT2 =0x22 , + BFA_PCI_DEVICE_ID_CT2_QUAD = 0x23, };#define bfa_asic_id_cb (__d) \
@@ -645,7 +646,9 @@ enum {#define bfa_asic_id_ct (__d) \ ((__d) == BFA_PCI_DEVICE_ID_CT || \ (__d) == BFA_PCI_DEVICE_ID_CT_FC) -#define bfa_asic_id_ct2 (__d) ((__d) == BFA_PCI_DEVICE_ID_CT2) +#define bfa_asic_id_ct2 (__d) \ + ((__d) == BFA_PCI_DEVICE_ID_CT2 || \ + (__d) == BFA_PCI_DEVICE_ID_CT2_QUAD)#define bfa_asic_id_ctc (__d) \ (bfa_asic_id_ct(__d) || bfa_asic_id_ct2(__d))
drivers/scsi/bfa/bfa_ioc.c +1 -0
@@ -2196,6 +2196,7 @@ bfa_ioc_pci_init(struct bfa_ioc_s *ioc, struct bfa_pcidev_s *pcidev,break ;case BFA_PCI_DEVICE_ID_CT2 : +case BFA_PCI_DEVICE_ID_CT2_QUAD : ioc->asic_gen =BFI_ASIC_GEN_CT2 ;if (clscode ==BFI_PCIFN_CLASS_FC && pcidev->ssid ==BFA_PCI_CT2_SSID_FC ) {
drivers/scsi/bfa/bfad.c +8 -0
@@ -1720,6 +1720,14 @@ struct pci_device_id bfad_id_table[] = { .class_mask = ~0, }, + { + .vendor = BFA_PCI_VENDOR_ID_BROCADE, + .device = BFA_PCI_DEVICE_ID_CT2_QUAD, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .class = (PCI_CLASS_SERIAL_FIBER << 8), + .class_mask = ~0, + }, {0, 0}, };
Signature · 1 line
1.7.12
PATCH 16/17 bfa: dis-associate bfa path_tov with dev_loss_tmo
In reply to Vijaya Mohan GuvvaDisassoicate path_tov in the driver with the dev_loss_tmo set by the application.
--- drivers/scsi/bfa/bfad_attr.c | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-)
drivers/scsi/bfa/bfad_attr.c +7 -26
@@ -335,23 +335,10 @@ bfad_im_reset_stats(struct Scsi_Host *shost) }/* -* FC transport template entry, get rport loss timeout. -*/ -static void -bfad_im_get_rport_loss_tmo (struct fc_rport *rport) -{ -struct bfad_itnim_data_s *itnim_data = rport->dd_data; -struct bfad_itnim_s *itnim = itnim_data->itnim; -struct bfad_s *bfad = itnim->im->bfad; -unsigned long flags; - -spin_lock_irqsave (&bfad->bfad_lock, flags); - rport->dev_loss_tmo =bfa_fcpim_path_tov_get (&bfad->bfa); -spin_unlock_irqrestore (&bfad->bfad_lock, flags); -} - -/* * FC transport template entry, set rport loss timeout. +* Update dev_loss_tmo based on the value pushed down by the stack +* In case it is lesser than path_tov of driver, set it to path_tov + 1 +* to ensure that the driver times out before the application */ static void bfad_im_set_rport_loss_tmo (struct fc_rport *rport,u32 timeout)
@@ -359,15 +346,11 @@ bfad_im_set_rport_loss_tmo(struct fc_rport *rport, u32 timeout)struct bfad_itnim_data_s *itnim_data = rport->dd_data;struct bfad_itnim_s *itnim = itnim_data->itnim;struct bfad_s *bfad = itnim->im->bfad; -unsigned long flags; - -if (timeout >0 ) { -spin_lock_irqsave (&bfad->bfad_lock, flags); -bfa_fcpim_path_tov_set (&bfad->bfa, timeout); - rport->dev_loss_tmo =bfa_fcpim_path_tov_get (&bfad->bfa); -spin_unlock_irqrestore (&bfad->bfad_lock, flags); - } +uint16_t path_tov =bfa_fcpim_path_tov_get (&bfad->bfa); + rport->dev_loss_tmo = timeout; +if (timeout < path_tov) + rport->dev_loss_tmo = path_tov +1 ; } static int
@@ -665,7 +648,6 @@ struct fc_function_template bfad_im_fc_function_template = { .show_rport_maxframe_size = 1, .show_rport_supported_classes = 1, .show_rport_dev_loss_tmo = 1, - .get_rport_dev_loss_tmo = bfad_im_get_rport_loss_tmo, .set_rport_dev_loss_tmo = bfad_im_set_rport_loss_tmo, .issue_fc_host_lip = bfad_im_issue_fc_host_lip, .vport_create = bfad_im_vport_create,
@@ -723,7 +705,6 @@ struct fc_function_template bfad_im_vport_fc_function_template = { .show_rport_maxframe_size = 1, .show_rport_supported_classes = 1, .show_rport_dev_loss_tmo = 1, - .get_rport_dev_loss_tmo = bfad_im_get_rport_loss_tmo, .set_rport_dev_loss_tmo = bfad_im_set_rport_loss_tmo, };
Signature · 1 line
1.7.12
PATCH 17/17 bfa: Update the driver version to 3.2.21.1
In reply to Vijaya Mohan GuvvaUpdate bfa driver version to 3.2.21.1
Update bfa to use firmware image versions 3.2.1.0
--- drivers/scsi/bfa/bfad.c | 6 +++--- drivers/scsi/bfa/bfad_drv.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/bfa/bfad.c +3 -3
@@ -63,9 +63,9 @@ int max_rport_logins = BFA_FCS_MAX_RPORT_LOGINS;u32 bfi_image_cb_size, bfi_image_ct_size, bfi_image_ct2_size;u32 *bfi_image_cb, *bfi_image_ct, *bfi_image_ct2; -#define BFAD_FW_FILE_CB "cbfw-3.1.0.0.bin" -#define BFAD_FW_FILE_CT "ctfw-3.1.0.0.bin" -#define BFAD_FW_FILE_CT2 "ct2fw-3.1.0.0.bin" +#define BFAD_FW_FILE_CB "cbfw-3.2.1.0.bin" +#define BFAD_FW_FILE_CT "ctfw-3.2.1.0.bin" +#define BFAD_FW_FILE_CT2 "ct2fw-3.2.1.0.bin"static u32 *bfad_load_fwimg (struct pci_dev *pdev);static void bfad_free_fwimg (void );
drivers/scsi/bfa/bfad_drv.h +1 -1
@@ -57,7 +57,7 @@#ifdef BFA_DRIVER_VERSION #define BFAD_DRIVER_VERSION BFA_DRIVER_VERSION#else -#define BFAD_DRIVER_VERSION "3.1.2.1" +#define BFAD_DRIVER_VERSION "3.2.21.1"#endif #define BFAD_PROTO_NAME FCPI_NAME
Signature · 1 line
1.7.12
Quoted 63 lines
-----Original Message-----
From: Vijay Mohan Guvva
Sent: Monday, May 13, 2013 3:03 PM
To: [email protected]
Cc: [email protected]; Adapter Linux Open SRC Team; Vijay Mohan Guvva
Subject: [PATCH V1 00/17] Update the driver version to 3.2.21.1Hi James,
Re-submitting the patch sets, Update the driver version to 3.2.21.0 and Update the driver version to 3.2.21.1.
It includes bug-fixes, changes to use firmware version 3.2.1.0, adds new features such as Forward Error Correction, FC BB credit recovery, dynamic diagnostic Port (D-port), enabled support for new hardware - chinook quad and updates the Brocade BFA driver to v3.2.21.1.Thanks,
Vijaya Mohan GuvvaVijaya Mohan Guvva (17):
bfa: Support for FC BB credit recovery
bfa: Forward Error Correction status query
bfa: Add dynamic diagnostic port support
bfa: FixWARN_ONcondition check
bfa: FDMI enhancements
bfa: Fix 1860 port initialize when ATC is enabled
bfa: Fix FDISC timeout handling
bfa: kdump fix on 815 and 825 adapters
bfa: driver compatibility with 32bit libs
bfa: fru vpd date update changes
bfa: firmware statistics update
bfa: Allow rsp queue process during ioc disable
bfa: Fixbug_oncondition in RPSC rsp handling
bfa: fix endianess issue for firmware stats
bfa: Support for chinook-quad port card
bfa: dis-associate bfapath_tovwithdev_loss_tmo
bfa: Update the driver version to 3.2.21.1drivers/scsi/bfa/bfa_core.c | 3 +- drivers/scsi/bfa/bfa_defs.h | 103 +++++- drivers/scsi/bfa/bfa_defs_svc.h | 77 ++++- drivers/scsi/bfa/bfa_fc.h | 15 + drivers/scsi/bfa/bfa_fcpim.c | 2 +- drivers/scsi/bfa/bfa_fcs.c | 62 +--- drivers/scsi/bfa/bfa_fcs.h | 34 +- drivers/scsi/bfa/bfa_fcs_lport.c | 209 +++++++++++- drivers/scsi/bfa/bfa_fcs_rport.c | 7 +- drivers/scsi/bfa/bfa_ioc.c | 74 +++-- drivers/scsi/bfa/bfa_ioc.h | 9 +- drivers/scsi/bfa/bfa_ioc_cb.c | 86 ++++- drivers/scsi/bfa/bfa_ioc_ct.c | 46 +++ drivers/scsi/bfa/bfa_svc.c | 698 ++++++++++++++++++++++++++++++++++++--- drivers/scsi/bfa/bfa_svc.h | 34 +- drivers/scsi/bfa/bfad.c | 14 +- drivers/scsi/bfa/bfad_attr.c | 33 +- drivers/scsi/bfa/bfad_bsg.c | 137 +++++--- drivers/scsi/bfa/bfad_bsg.h | 52 ++- drivers/scsi/bfa/bfad_drv.h | 2 +- drivers/scsi/bfa/bfi.h | 78 ++++- drivers/scsi/bfa/bfi_ms.h | 5 +- 22 files changed, 1498 insertions(+), 282 deletions(-)
Quoted 4 lines
--
1.7.12The patch you're replying to didn't make the list, which is also a necessary precursor to getting stuff into the tree.
Hi James,
I have resubmitted the patch set and verified them in MARC. Please pull the set if you don't have any comments.
Thanks,
Vijay
Quoted 5 lines
Quoted 1 line
The patch you're replying to didn't make the list, which is also a necessary precursor to getting stuff into the tree.
Hi James,
I have resubmitted the patch set and verified them in MARC. Please pull the set if you don't have any comments.
Hi James,
Do you have any comments on the patch set.
Thanks,
Vijay