Update lpfc to revision 14.4.0.10
Subsystems (2)
cover Update lpfc to revision 14.4.0.10
Update lpfc to revision 14.4.0.10
This patch set contains bug fixes related to diagnostic log messaging, driver initialization and removal, updates to mailbox command handling, and string modifications for obsolete adapter model descriptions.
The patches were cut against Martin's 6.17/scsi-queue tree.
Justin Tee (13):
lpfc: Revise logging format for failed CT MIB requests
lpfc: Update debugfs trace ring initialization messages
lpfc: Check for hdwq null ptr when cleaning up lpfc_vport structure
lpfc: Skip RSCN processing when FC_UNLOADING flag is set
lpfc: Early return out of FDMI cmpl for locally rejected statuses
lpfc: Simplify error handling for failed lpfc_get_sli4_parameters cmd
lpfc: Relocate clearing initial phba flags from link up to link down
hdlr
lpfc: Ensure HBA_SETUP flag is used only for SLI4 in
dev_loss_tmo_callbk
lpfc: Move clearing of HBA_SETUP flag to before lpfc_sli4_queue_unset
lpfc: Revise CQ_CREATE_SET mailbox bitfield definitions
lpfc: Modify end-of-life adapters' model descriptions
lpfc: Update lpfc version to 14.4.0.10
lpfc: Copyright updates for 14.4.0.10 patches
drivers/scsi/lpfc/lpfc_ct.c | 28 +++-------- drivers/scsi/lpfc/lpfc_debugfs.c | 20 ++++---- drivers/scsi/lpfc/lpfc_els.c | 11 ++++- drivers/scsi/lpfc/lpfc_hbadisc.c | 11 +++-- drivers/scsi/lpfc/lpfc_hw4.h | 20 +++++--- drivers/scsi/lpfc/lpfc_init.c | 84 ++++++++++++++++---------------- drivers/scsi/lpfc/lpfc_scsi.c | 9 +++- drivers/scsi/lpfc/lpfc_sli.c | 14 +++--- drivers/scsi/lpfc/lpfc_sli4.h | 4 +- drivers/scsi/lpfc/lpfc_version.h | 2 +- 10 files changed, 105 insertions(+), 98 deletions(-)
Signature · 1 line
2.38.0
PATCH 1/13 lpfc: Revise logging format for failed CT MIB requests
Unsupported and rejected CT MIB request log messages are changed to KERN_WARNING level. Also, remove extra space in log message.
--- drivers/scsi/lpfc/lpfc_ct.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/lpfc/lpfc_ct.c +4 -4
@@ -264,9 +264,9 @@ lpfc_ct_reject_event(struct lpfc_nodelist *ndlp, ct_free_mp:kfree (mp); ct_exit: -lpfc_printf_vlog (vport,KERN_ERR ,LOG_ELS , -"6440 Unsol CT: Rsp err %d Data: x%lx\n" , - rc, vport->fc_flag); +lpfc_vlog_msg (vport,KERN_WARNING ,LOG_ELS , +"6440 Unsol CT: Rsp err %d Data: x%lx\n" , + rc, vport->fc_flag); }/**
@@ -313,7 +313,7 @@ lpfc_ct_handle_mibreq(struct lpfc_hba *phba, struct lpfc_iocbq *ctiocbq) mi_cmd =be16_to_cpu (ct_req->CommandResponse.bits.CmdRsp);lpfc_vlog_msg (vport,KERN_WARNING ,LOG_ELS , -"6442 MI Cmd : x%x Not Supported\n" , mi_cmd); +"6442 MI Cmd: x%x Not Supported\n" , mi_cmd); lpfc_ct_reject_event(ndlp, ct_req, bf_get(wqe_ctxt_tag, &ctiocbq->wqe.xmit_els_rsp.wqe_com),
Signature · 1 line
2.38.0
PATCH 2/13 lpfc: Update debugfs trace ring initialization messages
In reply to Justin TeeInitialization parameters for trace rings used in debugfs are sometimes automatically adjusted. This patch corrects and updates the corresponding log messages.
--- drivers/scsi/lpfc/lpfc_debugfs.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/scsi/lpfc/lpfc_debugfs.c +9 -9
@@ -6227,8 +6227,9 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport) i++; } lpfc_debugfs_max_slow_ring_trc = (1 << i); -pr_err ("lpfc_debugfs_max_disc_trc changed to " -"%d\n" , lpfc_debugfs_max_disc_trc); +pr_info ("lpfc_debugfs_max_slow_ring_trc " +"changed to %d\n" , + lpfc_debugfs_max_slow_ring_trc); } }
@@ -6260,7 +6261,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)atomic_set (&phba->nvmeio_trc_cnt,0 );if (lpfc_debugfs_max_nvmeio_trc) { num = lpfc_debugfs_max_nvmeio_trc -1 ; -if (num & lpfc_debugfs_max_disc_trc) { +if (num & lpfc_debugfs_max_nvmeio_trc) {/* Change to be a power of 2 */ num = lpfc_debugfs_max_nvmeio_trc; i =0 ;
@@ -6269,10 +6270,9 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport) i++; } lpfc_debugfs_max_nvmeio_trc = (1 << i); -lpfc_printf_log (phba,KERN_ERR ,LOG_INIT , -"0575 lpfc_debugfs_max_nvmeio_trc " -"changed to %d\n" , - lpfc_debugfs_max_nvmeio_trc); +pr_info ("lpfc_debugfs_max_nvmeio_trc changed " +"to %d\n" , + lpfc_debugfs_max_nvmeio_trc); } phba->nvmeio_trc_size = lpfc_debugfs_max_nvmeio_trc;
@@ -6317,8 +6317,8 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport) i++; } lpfc_debugfs_max_disc_trc = (1 << i); -pr_err ("lpfc_debugfs_max_disc_trc changed to %d\n" , - lpfc_debugfs_max_disc_trc); +pr_info ("lpfc_debugfs_max_disc_trc changed to %d\n" , + lpfc_debugfs_max_disc_trc); } }
Signature · 1 line
2.38.0
PATCH 3/13 lpfc: Check for hdwq null ptr when cleaning up lpfc_vport structure
In reply to Justin TeeIf a call to lpfc_sli4_read_rev() from lpfc_sli4_hba_setup() fails, the resultant cleanup routine lpfc_sli4_vport_delete_fcp_xri_aborted() may occur before sli4_hba.hdwqs are allocated. This may result in a null pointer dereference when attempting to take the abts_io_buf_list_lock for the first hardware queue. Fix by adding a null ptr check on phba->sli4_hba.hdwq and early return because this situation means there must have been an error during port initialization.
--- drivers/scsi/lpfc/lpfc_scsi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/scsi/lpfc/lpfc_scsi.c +4 -0
@@ -390,6 +390,10 @@ lpfc_sli4_vport_delete_fcp_xri_aborted(struct lpfc_vport *vport)if (!(vport->cfg_enable_fc4_type &LPFC_ENABLE_FCP ))return ; +/* may be called before queues established if hba_setup fails */ +if (!phba->sli4_hba.hdwq) +return ; +spin_lock_irqsave (&phba->hbalock, iflag);for (idx =0 ; idx < phba->cfg_hdw_queue; idx++) { qp = &phba->sli4_hba.hdwq[idx];
Signature · 1 line
2.38.0
PATCH 4/13 lpfc: Skip RSCN processing when FC_UNLOADING flag is set
In reply to Justin TeeDuring rmmod, all ndlp objects are cleaned up and marked with the NLP_DROPPED flag indicating that an ndlp object is currently being released. Thus, if an RSCN is received during driver unload, then walking the fc_nodes list to process the RSCN is unnecessary because the ndlp objects are very shortly going to be released.
In the lpfc_rscn_recovery_check routine, early return if the driver is in the middle of unloading by checking for the FC_UNLOADING flag.
--- drivers/scsi/lpfc/lpfc_els.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/scsi/lpfc/lpfc_els.c +7 -0
@@ -7861,6 +7861,13 @@ lpfc_rscn_recovery_check(struct lpfc_vport *vport)/* Move all affected nodes by pending RSCNs to NPR state. */ list_for_each_entry_safe (ndlp, n, &vport->fc_nodes, nlp_listp) { +if (test_bit (FC_UNLOADING , &vport->load_flag)) { +lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS , +"1000 %s Unloading set\n" , + __func__); +return 0 ; + } +if ((ndlp->nlp_state ==NLP_STE_UNUSED_NODE ) || !lpfc_rscn_payload_check (vport, ndlp->nlp_DID))continue ;
Signature · 1 line
2.38.0
PATCH 5/13 lpfc: Early return out of FDMI cmpl for locally rejected statuses
In reply to Justin TeeIf an FDMI request completes with local reject status and the request is not retryable, there's no need to parse an FDMI response payload. Insert an early return statement for such cases.
--- drivers/scsi/lpfc/lpfc_ct.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-)
drivers/scsi/lpfc/lpfc_ct.c +3 -15
@@ -2229,21 +2229,6 @@ lpfc_cmpl_ct_disc_fdmi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,/* Look for a retryable error */ if (ulp_status ==IOSTAT_LOCAL_REJECT ) {switch ((ulp_word4 &IOERR_PARAM_MASK )) { -case IOERR_SLI_ABORTED : -case IOERR_SLI_DOWN : -/* Driver aborted this IO. No retry as error -* is likely Offline->Online or some adapter -* error. Recovery will try again, but if port -* is not active there's no point to continue -* issuing follow up FDMI commands. -*/ -if (!(phba->sli.sli_flag &LPFC_SLI_ACTIVE )) { - free_ndlp = cmdiocb->ndlp; -lpfc_ct_free_iocb (phba, cmdiocb); -lpfc_nlp_put (free_ndlp); -return ; - } -break ;case IOERR_ABORT_IN_PROGRESS :case IOERR_SEQUENCE_TIMEOUT :case IOERR_ILLEGAL_FRAME :
@@ -2269,6 +2254,9 @@ lpfc_cmpl_ct_disc_fdmi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,lpfc_ct_free_iocb (phba, cmdiocb);lpfc_nlp_put (free_ndlp); +if (ulp_status !=IOSTAT_SUCCESS ) +return ; + ndlp =lpfc_findnode_did (vport,FDMI_DID );if (!ndlp)return ;
Signature · 1 line
2.38.0
PATCH 6/13 lpfc: Simplify error handling for failed lpfc_get_sli4_parameters cmd
In reply to Justin TeeThere are unnecessary checks on an HBA's interface type and family before erroring out a failed lpfc_get_sli4_parameters mailbox command. Simplify the error handling by logging a message and proceeding to memory free labels.
--- drivers/scsi/lpfc/lpfc_init.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-)
drivers/scsi/lpfc/lpfc_init.c +5 -24
@@ -7919,8 +7919,6 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)int longs;int extra;uint64_t wwn; -u32 if_type; -u32 if_fam; phba->sli4_hba.num_present_cpu = lpfc_present_cpu; phba->sli4_hba.num_possible_cpu =cpumask_last (cpu_possible_mask) +1 ;
@@ -8180,28 +8178,11 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)*/ rc =lpfc_get_sli4_parameters (phba, mboxq);if (rc) { - if_type =bf_get (lpfc_sli_intf_if_type, - &phba->sli4_hba.sli_intf); - if_fam =bf_get (lpfc_sli_intf_sli_family, - &phba->sli4_hba.sli_intf); -if (phba->sli4_hba.extents_in_use && - phba->sli4_hba.rpi_hdrs_in_use) { -lpfc_printf_log (phba,KERN_ERR ,LOG_TRACE_EVENT , -"2999 Unsupported SLI4 Parameters " -"Extents and RPI headers enabled.\n" ); -if (if_type ==LPFC_SLI_INTF_IF_TYPE_0 && - if_fam ==LPFC_SLI_INTF_FAMILY_BE2 ) { -mempool_free (mboxq, phba->mbox_mem_pool); - rc = -EIO ; - goto out_free_bsmbx; - } - } -if (!(if_type ==LPFC_SLI_INTF_IF_TYPE_0 && - if_fam ==LPFC_SLI_INTF_FAMILY_BE2 )) { -mempool_free (mboxq, phba->mbox_mem_pool); - rc = -EIO ; - goto out_free_bsmbx; - } +lpfc_log_msg (phba,KERN_WARNING ,LOG_INIT , +"2999 Could not get SLI4 parameters\n" ); + rc = -EIO ; +mempool_free (mboxq, phba->mbox_mem_pool); + goto out_free_bsmbx; }/*
Signature · 1 line
2.38.0
PATCH 7/13 lpfc: Relocate clearing initial phba flags from link up to link down hdlr
In reply to Justin TeePort wide initialization flags FLOGI_ISSUED and RHBA_CMPL make more sense to be cleared upon a link down event rather than waiting for a link up event. By moving clearing of these initializatin flags to a link down handler, future confusion on the state of initialization is avoided.
--- drivers/scsi/lpfc/lpfc_els.c | 4 ++-- drivers/scsi/lpfc/lpfc_hbadisc.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +2 -2
@@ -8376,9 +8376,9 @@ lpfc_els_rcv_flogi(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,clear_bit (FC_PUBLIC_LOOP , &vport->fc_flag);lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS ,"3311 Rcv Flogi PS x%x new PS x%x " -"fc_flag x%lx new fc_flag x%lx\n" , +"fc_flag x%lx new fc_flag x%lx, hba_flag x%lx\n" , port_state, vport->port_state, - fc_flag, vport->fc_flag); + fc_flag, vport->fc_flag, phba->hba_flag);/* * We temporarily set fc_myDID to make it look like we are
drivers/scsi/lpfc/lpfc_hbadisc.c +4 -4
@@ -1266,6 +1266,10 @@ lpfc_linkdown(struct lpfc_hba *phba) } phba->defer_flogi_acc.flag = false; +/* reinitialize initial HBA flag */ +clear_bit (HBA_FLOGI_ISSUED , &phba->hba_flag); +clear_bit (HBA_RHBA_CMPL , &phba->hba_flag); +/* Clear external loopback plug detected flag */ phba->link_flag &= ~LS_EXTERNAL_LOOPBACK ;
@@ -1436,10 +1440,6 @@ lpfc_linkup(struct lpfc_hba *phba) phba->pport->rcv_flogi_cnt =0 ;spin_unlock_irq (shost->host_lock); -/* reinitialize initial HBA flag */ -clear_bit (HBA_FLOGI_ISSUED , &phba->hba_flag); -clear_bit (HBA_RHBA_CMPL , &phba->hba_flag); -return 0 ; }
Signature · 1 line
2.38.0
PATCH 8/13 lpfc: Ensure HBA_SETUP flag is used only for SLI4 in dev_loss_tmo_callbk
In reply to Justin TeeFor SLI3, the HBA_SETUP flag is never set so the lpfc_dev_loss_tmo_callbk always early returns. Add a phba->sli_rev check for SLI4 mode so that the SLI3 path can flow through the original dev_loss_tmo worker thread design to lpfc_dev_loss_tmo_handler instead of early return.
--- drivers/scsi/lpfc/lpfc_hbadisc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_hbadisc.c +2 -1
@@ -183,7 +183,8 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport)/* Don't schedule a worker thread event if the vport is going down. */ if (test_bit (FC_UNLOADING , &vport->load_flag) || - !test_bit (HBA_SETUP , &phba->hba_flag)) { + (phba->sli_rev ==LPFC_SLI_REV4 && + !test_bit (HBA_SETUP , &phba->hba_flag))) {spin_lock_irqsave (&ndlp->lock, iflags); ndlp->rport =NULL ;
Signature · 1 line
2.38.0
PATCH 9/13 lpfc: Move clearing of HBA_SETUP flag to before lpfc_sli4_queue_unset
In reply to Justin TeeMove clearing of HBA_SETUP flag out of lpfc_sli_brdrestart_s4 and before lpfc_sli4_queue_unset. lpfc_sli4_queue_unset kfrees phba queues, so clear the HBA_SETUP atomic flag to signal that the phba struct is no longer initialized.
Also, add a check for the HBA_SETUP flag in the lpfc_sli4_io_xri_aborted routine before dereferencing the ELS WQ.
--- drivers/scsi/lpfc/lpfc_scsi.c | 3 ++- drivers/scsi/lpfc/lpfc_sli.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_scsi.c +2 -1
@@ -536,7 +536,8 @@ lpfc_sli4_io_xri_aborted(struct lpfc_hba *phba, psb = container_of(iocbq, struct lpfc_io_buf, cur_iocbq); psb->flags &= ~LPFC_SBUF_XBUSY ;spin_unlock_irqrestore (&phba->hbalock, iflag); -if (!list_empty (&pring->txq)) +if (test_bit (HBA_SETUP , &phba->hba_flag) && + !list_empty (&pring->txq))lpfc_worker_wake_up (phba);return ; }
drivers/scsi/lpfc/lpfc_sli.c +1 -1
@@ -5167,7 +5167,6 @@ lpfc_sli4_brdreset(struct lpfc_hba *phba) phba->link_events =0 ; phba->pport->fc_myDID =0 ; phba->pport->fc_prevDID =0 ; -clear_bit (HBA_SETUP , &phba->hba_flag);spin_lock_irq (&phba->hbalock); psli->sli_flag &= ~(LPFC_PROCESS_LA );
@@ -5284,6 +5283,7 @@ lpfc_sli_brdrestart_s4(struct lpfc_hba *phba)"0296 Restart HBA Data: x%x x%x\n" , phba->pport->port_state, psli->sli_flag); +clear_bit (HBA_SETUP , &phba->hba_flag);lpfc_sli4_queue_unset (phba); rc =lpfc_sli4_brdreset (phba);
Signature · 1 line
2.38.0
PATCH 10/13 lpfc: Revise CQ_CREATE_SET mailbox bitfield definitions
In reply to Justin TeeThe CQ_CREATE_SET mailbox command's bitfields are updated. Rename the cqe_cnt and separate high/low bitfield names to help resolve confusion between two similar bitfield definitions. Corresponding usages of the newly defined bitfields are updated as well.
--- drivers/scsi/lpfc/lpfc_hw4.h | 18 ++++++++++++------ drivers/scsi/lpfc/lpfc_sli.c | 12 ++++++------ drivers/scsi/lpfc/lpfc_sli4.h | 2 ++ 3 files changed, 20 insertions(+), 12 deletions(-)
drivers/scsi/lpfc/lpfc_hw4.h +12 -6
@@ -1328,6 +1328,9 @@ struct cq_context {#define LPFC_CQ_CNT_512 0x1#define LPFC_CQ_CNT_1024 0x2#define LPFC_CQ_CNT_WORD7 0x3 +#define lpfc_cq_context_cqe_sz_SHIFT 25 +#define lpfc_cq_context_cqe_sz_MASK 0x00000003 +#define lpfc_cq_context_cqe_sz_WORD word0#define lpfc_cq_context_autovalid_SHIFT 15#define lpfc_cq_context_autovalid_MASK 0x00000001#define lpfc_cq_context_autovalid_WORD word0
@@ -1383,9 +1386,9 @@ struct lpfc_mbx_cq_create_set {#define lpfc_mbx_cq_create_set_valid_SHIFT 29#define lpfc_mbx_cq_create_set_valid_MASK 0x00000001#define lpfc_mbx_cq_create_set_valid_WORD word1 -#define lpfc_mbx_cq_create_set_cqe_cnt_SHIFT 27 -#define lpfc_mbx_cq_create_set_cqe_cnt_MASK 0x00000003 -#define lpfc_mbx_cq_create_set_cqe_cnt_WORD word1 +#define lpfc_mbx_cq_create_set_cqecnt_SHIFT 27 +#define lpfc_mbx_cq_create_set_cqecnt_MASK 0x00000003 +#define lpfc_mbx_cq_create_set_cqecnt_WORD word1#define lpfc_mbx_cq_create_set_cqe_size_SHIFT 25#define lpfc_mbx_cq_create_set_cqe_size_MASK 0x00000003#define lpfc_mbx_cq_create_set_cqe_size_WORD word1
@@ -1398,13 +1401,16 @@ struct lpfc_mbx_cq_create_set {#define lpfc_mbx_cq_create_set_clswm_SHIFT 12#define lpfc_mbx_cq_create_set_clswm_MASK 0x00000003#define lpfc_mbx_cq_create_set_clswm_WORD word1 +#define lpfc_mbx_cq_create_set_cqe_cnt_hi_SHIFT 0 +#define lpfc_mbx_cq_create_set_cqe_cnt_hi_MASK 0x0000001F +#define lpfc_mbx_cq_create_set_cqe_cnt_hi_WORD word1uint32_t word2;#define lpfc_mbx_cq_create_set_arm_SHIFT 31#define lpfc_mbx_cq_create_set_arm_MASK 0x00000001#define lpfc_mbx_cq_create_set_arm_WORD word2 -#define lpfc_mbx_cq_create_set_cq_cnt_SHIFT 16 -#define lpfc_mbx_cq_create_set_cq_cnt_MASK 0x00007FFF -#define lpfc_mbx_cq_create_set_cq_cnt_WORD word2 +#define lpfc_mbx_cq_create_set_cqe_cnt_lo_SHIFT 16 +#define lpfc_mbx_cq_create_set_cqe_cnt_lo_MASK 0x00007FFF +#define lpfc_mbx_cq_create_set_cqe_cnt_lo_WORD word2#define lpfc_mbx_cq_create_set_num_cq_SHIFT 0#define lpfc_mbx_cq_create_set_num_cq_MASK 0x0000FFFF#define lpfc_mbx_cq_create_set_num_cq_WORD word2
drivers/scsi/lpfc/lpfc_sli.c +6 -6
@@ -16477,10 +16477,10 @@ lpfc_cq_create_set(struct lpfc_hba *phba, struct lpfc_queue **cqp,case 4096 :if (phba->sli4_hba.pc_sli4_params.cqv ==LPFC_Q_CREATE_VERSION_2 ) { -bf_set (lpfc_mbx_cq_create_set_cqe_cnt, +bf_set (lpfc_mbx_cq_create_set_cqe_cnt_lo, &cq_set->u.request, - cq->entry_count); -bf_set (lpfc_mbx_cq_create_set_cqe_cnt, + cq->entry_count); +bf_set (lpfc_mbx_cq_create_set_cqecnt, &cq_set->u.request,LPFC_CQ_CNT_WORD7 );break ;
@@ -16496,15 +16496,15 @@ lpfc_cq_create_set(struct lpfc_hba *phba, struct lpfc_queue **cqp, } fallthrough;/* otherwise default to smallest */ case 256 : -bf_set (lpfc_mbx_cq_create_set_cqe_cnt, +bf_set (lpfc_mbx_cq_create_set_cqecnt, &cq_set->u.request,LPFC_CQ_CNT_256 );break ;case 512 : -bf_set (lpfc_mbx_cq_create_set_cqe_cnt, +bf_set (lpfc_mbx_cq_create_set_cqecnt, &cq_set->u.request,LPFC_CQ_CNT_512 );break ;case 1024 : -bf_set (lpfc_mbx_cq_create_set_cqe_cnt, +bf_set (lpfc_mbx_cq_create_set_cqecnt, &cq_set->u.request,LPFC_CQ_CNT_1024 );break ; }
drivers/scsi/lpfc/lpfc_sli4.h +2 -0
@@ -575,8 +575,10 @@ struct lpfc_pc_sli4_params {#define LPFC_CQ_4K_PAGE_SZ 0x1#define LPFC_CQ_16K_PAGE_SZ 0x4 +#define LPFC_CQ_32K_PAGE_SZ 0x8#define LPFC_WQ_4K_PAGE_SZ 0x1#define LPFC_WQ_16K_PAGE_SZ 0x4 +#define LPFC_WQ_32K_PAGE_SZ 0x8struct lpfc_iov {uint32_t pf_number;
Signature · 1 line
2.38.0
PATCH 11/13 lpfc: Modify end-of-life adapters' model descriptions
In reply to Justin TeeObsolete adapters' model description strings are updated to indicate that they are no longer supported. End-of-life adapters will still remain probed by the lpfc driver based on PCI id.
--- drivers/scsi/lpfc/lpfc_init.c | 55 +++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 19 deletions(-)
drivers/scsi/lpfc/lpfc_init.c +36 -19
@@ -2627,27 +2627,33 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp) "Obsolete, Unsupported Fibre Channel Adapter"};break ;case PCI_DEVICE_ID_BMID : - m = (typeof (m )){"LP1150" ,"PCI-X2" ,"Fibre Channel Adapter" }; + m = (typeof (m )){"LP1150" ,"PCI-X2" , +"Obsolete, Unsupported Fibre Channel Adapter" };break ;case PCI_DEVICE_ID_BSMB : m = (typeof (m )){"LP111" ,"PCI-X2" ,"Obsolete, Unsupported Fibre Channel Adapter" };break ;case PCI_DEVICE_ID_ZEPHYR : - m = (typeof (m )){"LPe11000" ,"PCIe" ,"Fibre Channel Adapter" }; + m = (typeof (m )){"LPe11000" ,"PCIe" , +"Obsolete, Unsupported Fibre Channel Adapter" };break ;case PCI_DEVICE_ID_ZEPHYR_SCSP : - m = (typeof (m )){"LPe11000" ,"PCIe" ,"Fibre Channel Adapter" }; + m = (typeof (m )){"LPe11000" ,"PCIe" , +"Obsolete, Unsupported Fibre Channel Adapter" };break ;case PCI_DEVICE_ID_ZEPHYR_DCSP : - m = (typeof (m )){"LP2105" ,"PCIe" ,"FCoE Adapter" }; + m = (typeof (m )){"LP2105" ,"PCIe" , +"Obsolete, Unsupported FCoE Adapter" };GE =1 ;break ;case PCI_DEVICE_ID_ZMID : - m = (typeof (m )){"LPe1150" ,"PCIe" ,"Fibre Channel Adapter" }; + m = (typeof (m )){"LPe1150" ,"PCIe" , +"Obsolete, Unsupported Fibre Channel Adapter" };break ;case PCI_DEVICE_ID_ZSMB : - m = (typeof (m )){"LPe111" ,"PCIe" ,"Fibre Channel Adapter" }; + m = (typeof (m )){"LPe111" ,"PCIe" , +"Obsolete, Unsupported Fibre Channel Adapter" };break ;case PCI_DEVICE_ID_LP101 : m = (typeof (m )){"LP101" ,"PCI-X" ,
@@ -2666,22 +2672,28 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp) "Obsolete, Unsupported Fibre Channel Adapter"};break ;case PCI_DEVICE_ID_SAT : - m = (typeof (m )){"LPe12000" ,"PCIe" ,"Fibre Channel Adapter" }; + m = (typeof (m )){"LPe12000" ,"PCIe" , +"Obsolete, Unsupported Fibre Channel Adapter" };break ;case PCI_DEVICE_ID_SAT_MID : - m = (typeof (m )){"LPe1250" ,"PCIe" ,"Fibre Channel Adapter" }; + m = (typeof (m )){"LPe1250" ,"PCIe" , +"Obsolete, Unsupported Fibre Channel Adapter" };break ;case PCI_DEVICE_ID_SAT_SMB : - m = (typeof (m )){"LPe121" ,"PCIe" ,"Fibre Channel Adapter" }; + m = (typeof (m )){"LPe121" ,"PCIe" , +"Obsolete, Unsupported Fibre Channel Adapter" };break ;case PCI_DEVICE_ID_SAT_DCSP : - m = (typeof (m )){"LPe12002-SP" ,"PCIe" ,"Fibre Channel Adapter" }; + m = (typeof (m )){"LPe12002-SP" ,"PCIe" , +"Obsolete, Unsupported Fibre Channel Adapter" };break ;case PCI_DEVICE_ID_SAT_SCSP : - m = (typeof (m )){"LPe12000-SP" ,"PCIe" ,"Fibre Channel Adapter" }; + m = (typeof (m )){"LPe12000-SP" ,"PCIe" , +"Obsolete, Unsupported Fibre Channel Adapter" };break ;case PCI_DEVICE_ID_SAT_S : - m = (typeof (m )){"LPe12000-S" ,"PCIe" ,"Fibre Channel Adapter" }; + m = (typeof (m )){"LPe12000-S" ,"PCIe" , +"Obsolete, Unsupported Fibre Channel Adapter" };break ;case PCI_DEVICE_ID_PROTEUS_VF : m = (typeof (m )){"LPev12000" ,"PCIe IOV" ,
@@ -2697,22 +2709,25 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)break ;case PCI_DEVICE_ID_TIGERSHARK : oneConnect =1 ; - m = (typeof (m )){"OCe10100" ,"PCIe" ,"FCoE" }; + m = (typeof (m )){"OCe10100" ,"PCIe" , +"Obsolete, Unsupported FCoE Adapter" };break ;case PCI_DEVICE_ID_TOMCAT : oneConnect =1 ; - m = (typeof (m )){"OCe11100" ,"PCIe" ,"FCoE" }; + m = (typeof (m )){"OCe11100" ,"PCIe" , +"Obsolete, Unsupported FCoE Adapter" };break ;case PCI_DEVICE_ID_FALCON : m = (typeof (m )){"LPSe12002-ML1-E" ,"PCIe" , -"EmulexSecure Fibre" }; +"Obsolete, Unsupported Fibre Channel Adapter" };break ;case PCI_DEVICE_ID_BALIUS : m = (typeof (m )){"LPVe12002" ,"PCIe Shared I/O" ,"Obsolete, Unsupported Fibre Channel Adapter" };break ;case PCI_DEVICE_ID_LANCER_FC : - m = (typeof (m )){"LPe16000" ,"PCIe" ,"Fibre Channel Adapter" }; + m = (typeof (m )){"LPe16000" ,"PCIe" , +"Obsolete, Unsupported Fibre Channel Adapter" };break ;case PCI_DEVICE_ID_LANCER_FC_VF : m = (typeof (m )){"LPe16000" ,"PCIe" ,
@@ -2720,12 +2735,13 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)break ;case PCI_DEVICE_ID_LANCER_FCOE : oneConnect =1 ; - m = (typeof (m )){"OCe15100" ,"PCIe" ,"FCoE" }; + m = (typeof (m )){"OCe15100" ,"PCIe" , +"Obsolete, Unsupported FCoE Adapter" };break ;case PCI_DEVICE_ID_LANCER_FCOE_VF : oneConnect =1 ; m = (typeof (m )){"OCe15100" ,"PCIe" , -"Obsolete, Unsupported FCoE" }; +"Obsolete, Unsupported FCoE Adapter" };break ;case PCI_DEVICE_ID_LANCER_G6_FC : m = (typeof (m )){"LPe32000" ,"PCIe" ,"Fibre Channel Adapter" };
@@ -2739,7 +2755,8 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)case PCI_DEVICE_ID_SKYHAWK :case PCI_DEVICE_ID_SKYHAWK_VF : oneConnect =1 ; - m = (typeof (m )){"OCe14000" ,"PCIe" ,"FCoE" }; + m = (typeof (m )){"OCe14000" ,"PCIe" , +"Obsolete, Unsupported FCoE Adapter" };break ;default : m = (typeof (m )){"Unknown" ,"" ,"" };
Signature · 1 line
2.38.0
PATCH 12/13 lpfc: Update lpfc version to 14.4.0.10
In reply to Justin TeeUpdate lpfc version to 14.4.0.10
--- drivers/scsi/lpfc/lpfc_version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_version.h +1 -1
@@ -20,7 +20,7 @@* included with this package. * *******************************************************************/ -#define LPFC_DRIVER_VERSION "14.4.0.9" +#define LPFC_DRIVER_VERSION "14.4.0.10"#define LPFC_DRIVER_NAME "lpfc"/* Used for SLI 2/3 */
Signature · 1 line
2.38.0
PATCH 13/13 lpfc: Copyright updates for 14.4.0.10 patches
In reply to Justin TeeUpdate copyrights to 2025 for files modified in the 14.4.0.10 patch set.
--- drivers/scsi/lpfc/lpfc_ct.c | 2 +- drivers/scsi/lpfc/lpfc_debugfs.c | 2 +- drivers/scsi/lpfc/lpfc_hw4.h | 2 +- drivers/scsi/lpfc/lpfc_scsi.c | 2 +- drivers/scsi/lpfc/lpfc_sli4.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
drivers/scsi/lpfc/lpfc_ct.c +1 -1
@@ -1,7 +1,7 @@/******************************************************************* * This file is part of the Emulex Linux Device Driver for * * Fibre Channel Host Bus Adapters. * -* Copyright (C) 2017-2024 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2025 Broadcom. All Rights Reserved. The term * * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. * * Copyright (C) 2004-2016 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_debugfs.c +1 -1
@@ -1,7 +1,7 @@/******************************************************************* * This file is part of the Emulex Linux Device Driver for * * Fibre Channel Host Bus Adapters. * -* Copyright (C) 2017-2024 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2025 Broadcom. All Rights Reserved. The term * * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. * * Copyright (C) 2007-2015 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_hw4.h +1 -1
@@ -1,7 +1,7 @@/******************************************************************* * This file is part of the Emulex Linux Device Driver for * * Fibre Channel Host Bus Adapters. * -* Copyright (C) 2017-2024 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2025 Broadcom. All Rights Reserved. The term * * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. * * Copyright (C) 2009-2016 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_scsi.c +1 -1
@@ -1,7 +1,7 @@/******************************************************************* * This file is part of the Emulex Linux Device Driver for * * Fibre Channel Host Bus Adapters. * -* Copyright (C) 2017-2024 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2025 Broadcom. All Rights Reserved. The term * * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. * * Copyright (C) 2004-2016 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_sli4.h +1 -1
@@ -1,7 +1,7 @@/******************************************************************* * This file is part of the Emulex Linux Device Driver for * * Fibre Channel Host Bus Adapters. * -* Copyright (C) 2017-2024 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2025 Broadcom. All Rights Reserved. The term * * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. * * Copyright (C) 2009-2016 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
Signature · 1 line
2.38.0
Martin K. Petersen
AppliedJustin,
Quoted 6 lines
Update lpfc to revision 14.4.0.10
This patch set contains bug fixes related to diagnostic log messaging, driver initialization and removal, updates to mailbox command handling, and string modifications for obsolete adapter model descriptions.
Applied to 6.17/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen
Martin K. Petersen
AppliedQuoted 9 lines · Justin Tee
Update lpfc to revision 14.4.0.10
This patch set contains bug fixes related to diagnostic log messaging, driver initialization and removal, updates to mailbox command handling, and string modifications for obsolete adapter model descriptions.
The patches were cut against Martin's 6.17/scsi-queue tree.
[...]
Applied to 6.17/scsi-queue, thanks!
[01/13] lpfc: Revise logging format for failed CT MIB requests
https://git.kernel.org/mkp/scsi/c/e6d4486edd4a [02/13] lpfc: Update debugfs trace ring initialization messages https://git.kernel.org/mkp/scsi/c/5459bd49f05f [03/13] lpfc: Check for hdwq null ptr when cleaning up lpfc_vport structure https://git.kernel.org/mkp/scsi/c/6698796282e8 [04/13] lpfc: Skip RSCN processing when FC_UNLOADING flag is set https://git.kernel.org/mkp/scsi/c/37c893e36b1b [05/13] lpfc: Early return out of FDMI cmpl for locally rejected statuses https://git.kernel.org/mkp/scsi/c/6b61ec3dd472 [06/13] lpfc: Simplify error handling for failed lpfc_get_sli4_parameters cmd https://git.kernel.org/mkp/scsi/c/5a00dfc58bfe [07/13] lpfc: Relocate clearing initial phba flags from link up to link down hdlr https://git.kernel.org/mkp/scsi/c/320c3a12b40c [08/13] lpfc: Ensure HBA_SETUP flag is used only for SLI4 in dev_loss_tmo_callbk https://git.kernel.org/mkp/scsi/c/1cced5779e7a [09/13] lpfc: Move clearing of HBA_SETUP flag to before lpfc_sli4_queue_unset https://git.kernel.org/mkp/scsi/c/a28d10a15600 [10/13] lpfc: Revise CQ_CREATE_SET mailbox bitfield definitions https://git.kernel.org/mkp/scsi/c/5d655969100d [11/13] lpfc: Modify end-of-life adapters' model descriptions https://git.kernel.org/mkp/scsi/c/e03bc287623f [12/13] lpfc: Update lpfc version to 14.4.0.10 https://git.kernel.org/mkp/scsi/c/81f2d701670f [13/13] lpfc: Copyright updates for 14.4.0.10 patches https://git.kernel.org/mkp/scsi/c/f14371aceef9
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering