lpfc: Update lpfc to revision 12.6.0.1
Subsystems (2)
cover lpfc: Update lpfc to revision 12.6.0.1
Update lpfc to revision 12.6.0.1
This patch contains a set fixes and 3 patches of new functionality. One of the fixes corrects a typo in one of the patches in the last set (dynamic fw log).
The patches were cut against Martin's 5.5/scsi-queue tree
James Smart (11):
lpfc: Fix duplicate unreg_rpi error in port offline flow
lpfc: Fix configuration of BB credit recovery in service parameters
lpfc: Fix kernel crash at lpfc_nvme_info_show during remote port
bounce
lpfc: Fix unexpected error messages during RSCN handling
lpfc: Fix dynamic fw log enablement check
lpfc: Sync with FC-NVMe-2 SLER change to require Conf with SLER
lpfc: Clarify FAWNN error message
lpfc: Add registration for CPU Offline/Online events
lpfc: Change default IRQ model on AMD architectures
lpfc: Add enablement of multiple adapter dumps
lpfc: Update lpfc version to 12.6.0.1
drivers/scsi/lpfc/lpfc.h | 28 ++ drivers/scsi/lpfc/lpfc_attr.c | 174 +++++++--- drivers/scsi/lpfc/lpfc_crtn.h | 6 + drivers/scsi/lpfc/lpfc_els.c | 21 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 17 +- drivers/scsi/lpfc/lpfc_hw4.h | 10 + drivers/scsi/lpfc/lpfc_init.c | 630 ++++++++++++++++++++++++++++++------- drivers/scsi/lpfc/lpfc_nportdisc.c | 4 +- drivers/scsi/lpfc/lpfc_sli.c | 198 +++++++++++- drivers/scsi/lpfc/lpfc_sli4.h | 40 ++- drivers/scsi/lpfc/lpfc_version.h | 2 +- 11 files changed, 953 insertions(+), 177 deletions(-)
Signature · 1 line
2.13.7
PATCH 1/11 lpfc: Fix duplicate unreg_rpi error in port offline flow
If the driver receives a login that is later then LOGO'd by the remote port (aka ndlp), the driver, upon the completion of the LOGO ACC transmission, the will logout the node and unregister the rpi that is being used for the node. As part of the unreg, the node's rpi value is replaced by the LPFC_RPI_ALLOC_ERROR value. If the port is subsequently offlined, the offline walks the nodes and ensures they are logged out, which possibly entails unreg'ing their rpi values. This path does not validate the nodes rpi value, thus doesn't detect that it has been unreg'd already. The replaced rpi value is then used when accessing the rpi bitmask array which tracks active rpi values. As the LPFC_RPI_ALLOC_ERROR value is not a valid index for the bitmask, it may fault the system.
Revise the rpi release code to detect when the rpi value is the replaced RPI_ALLOC_ERROR value and ignore further release steps.
--- drivers/scsi/lpfc/lpfc_sli.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/scsi/lpfc/lpfc_sli.c +7 -0
@@ -18247,6 +18247,13 @@ lpfc_sli4_alloc_rpi(struct lpfc_hba *phba)static void __lpfc_sli4_free_rpi (struct lpfc_hba *phba,int rpi) { +/* +* if the rpi value indicates a prior unreg has already +* been done, skip the unreg. +*/ +if (rpi ==LPFC_RPI_ALLOC_ERROR ) +return ; +if (test_and_clear_bit (rpi, phba->sli4_hba.rpi_bmask)) { phba->sli4_hba.rpi_count--; phba->sli4_hba.max_cfg_param.rpi_used--;
Signature · 1 line
2.13.7
PATCH 2/11 lpfc: Fix configuration of BB credit recovery in service parameters
In reply to James SmartThe driver today is reading service parameters from the firmware and then overwriting the firmware-provided values with values of its own. There are some switch features that require preliminary FLOGI's that are switch-specific and done prior to the actual fabric FLOGI for traffic. The fw will perform those FLOGIs and will revise the service parameters for the features configured. As the driver later overwrites those values with its own values, it misconfigures things like BBSCN use by doing so.
Correct by eliminating the driver-overwrite of firmware values. The driver correctly re-reads the service parameters after each link up to obtain the latest values from firmware.
--- drivers/scsi/lpfc/lpfc_hbadisc.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
drivers/scsi/lpfc/lpfc_hbadisc.c +3 -10
@@ -1138,7 +1138,6 @@ void lpfc_mbx_cmpl_local_config_link(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) { struct lpfc_vport *vport = pmb->vport; -uint8_t bbscn =0 ;if (pmb->u.mb.mbxStatus) goto out;
@@ -1165,17 +1164,11 @@ lpfc_mbx_cmpl_local_config_link(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)/* Start discovery by sending a FLOGI. port_state is identically * LPFC_FLOGI while waiting for FLOGI cmpl */ -if (vport->port_state !=LPFC_FLOGI ) { -if (phba->bbcredit_support && phba->cfg_enable_bbcr) { - bbscn =bf_get (lpfc_bbscn_def, - &phba->sli4_hba.bbscn_params); - vport->fc_sparam.cmn.bbRcvSizeMsb &=0xf ; - vport->fc_sparam.cmn.bbRcvSizeMsb |= (bbscn <<4 ); - } +if (vport->port_state !=LPFC_FLOGI )lpfc_initial_flogi (vport); - }else if (vport->fc_flag &FC_PT2PT ) { +else if (vport->fc_flag &FC_PT2PT )lpfc_disc_start (vport); - } +return ; out:
Signature · 1 line
2.13.7
PATCH 3/11 lpfc: Fix kernel crash at lpfc_nvme_info_show during remote port bounce
In reply to James SmartWhen reading sysfs nvme_info file while a remote port leaves and comes back, a NULL pointer is encountered. The issue is due to ndlp list corruption as the the nvme_info_show does not use the same lock as the rest of the code.
Correct by removing the rcu_xxx_lock calls and replace by the host_lock and phba->hbaLock spinlocks that are used by the rest of the driver. Given we're called from sysfs, we are safe to use _irq rather than _irqsave.
--- drivers/scsi/lpfc/lpfc_attr.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-)
drivers/scsi/lpfc/lpfc_attr.c +20 -20
@@ -176,7 +176,6 @@ lpfc_nvme_info_show(struct device *dev, struct device_attribute *attr,int i;int len =0 ;char tmp[LPFC_MAX_NVME_INFO_TMP_LEN ] = {0 }; -unsigned long iflags =0 ;if (!(vport->cfg_enable_fc4_type &LPFC_ENABLE_NVME )) { len =scnprintf (buf,PAGE_SIZE ,"NVME Disabled\n" );
@@ -347,7 +346,6 @@ lpfc_nvme_info_show(struct device *dev, struct device_attribute *attr,if (strlcat (buf,"\nNVME Initiator Enabled\n" ,PAGE_SIZE ) >=PAGE_SIZE ) goto buffer_done; -rcu_read_lock (); scnprintf(tmp, sizeof(tmp), "XRI Dist lpfc%d Total %d IO %d ELS %d\n", phba->brd_no,
@@ -355,7 +353,7 @@ lpfc_nvme_info_show(struct device *dev, struct device_attribute *attr, phba->sli4_hba.io_xri_max, lpfc_sli4_get_els_iocb_cnt(phba));if (strlcat (buf, tmp,PAGE_SIZE ) >=PAGE_SIZE ) - goto rcu_unlock_buf_done; + goto buffer_done;/* Port state is only one of two values for now. */ if (localport->port_id)
@@ -371,15 +369,17 @@ lpfc_nvme_info_show(struct device *dev, struct device_attribute *attr,wwn_to_u64 (vport->fc_nodename.u.wwn), localport->port_id, statep);if (strlcat (buf, tmp,PAGE_SIZE ) >=PAGE_SIZE ) - goto rcu_unlock_buf_done; + goto buffer_done; + +spin_lock_irq (shost->host_lock);list_for_each_entry (ndlp, &vport->fc_nodes, nlp_listp) { nrport =NULL ; -spin_lock_irqsave (&vport->phba->hbalock, iflags); +spin_lock (&vport->phba->hbalock); rport =lpfc_ndlp_get_nrport (ndlp);if (rport) nrport = rport->remoteport; -spin_unlock_irqrestore (&vport->phba->hbalock, iflags); +spin_unlock (&vport->phba->hbalock);if (!nrport)continue ;
@@ -398,39 +398,39 @@ lpfc_nvme_info_show(struct device *dev, struct device_attribute *attr,/* Tab in to show lport ownership. */ if (strlcat (buf,"NVME RPORT " ,PAGE_SIZE ) >=PAGE_SIZE ) - goto rcu_unlock_buf_done; + goto unlock_buf_done;if (phba->brd_no >=10 ) {if (strlcat (buf," " ,PAGE_SIZE ) >=PAGE_SIZE ) - goto rcu_unlock_buf_done; + goto unlock_buf_done; }scnprintf (tmp,sizeof (tmp),"WWPN x%llx " , nrport->port_name);if (strlcat (buf, tmp,PAGE_SIZE ) >=PAGE_SIZE ) - goto rcu_unlock_buf_done; + goto unlock_buf_done;scnprintf (tmp,sizeof (tmp),"WWNN x%llx " , nrport->node_name);if (strlcat (buf, tmp,PAGE_SIZE ) >=PAGE_SIZE ) - goto rcu_unlock_buf_done; + goto unlock_buf_done;scnprintf (tmp,sizeof (tmp),"DID x%06x " , nrport->port_id);if (strlcat (buf, tmp,PAGE_SIZE ) >=PAGE_SIZE ) - goto rcu_unlock_buf_done; + goto unlock_buf_done;/* An NVME rport can have multiple roles. */ if (nrport->port_role &FC_PORT_ROLE_NVME_INITIATOR ) {if (strlcat (buf,"INITIATOR " ,PAGE_SIZE ) >=PAGE_SIZE ) - goto rcu_unlock_buf_done; + goto unlock_buf_done; }if (nrport->port_role &FC_PORT_ROLE_NVME_TARGET ) {if (strlcat (buf,"TARGET " ,PAGE_SIZE ) >=PAGE_SIZE ) - goto rcu_unlock_buf_done; + goto unlock_buf_done; }if (nrport->port_role &FC_PORT_ROLE_NVME_DISCOVERY ) {if (strlcat (buf,"DISCSRVC " ,PAGE_SIZE ) >=PAGE_SIZE ) - goto rcu_unlock_buf_done; + goto unlock_buf_done; } if (nrport->port_role & ~(FC_PORT_ROLE_NVME_INITIATOR | FC_PORT_ROLE_NVME_TARGET |
@@ -438,14 +438,14 @@ lpfc_nvme_info_show(struct device *dev, struct device_attribute *attr,scnprintf (tmp,sizeof (tmp),"UNKNOWN ROLE x%x" , nrport->port_role);if (strlcat (buf, tmp,PAGE_SIZE ) >=PAGE_SIZE ) - goto rcu_unlock_buf_done; + goto unlock_buf_done; }scnprintf (tmp,sizeof (tmp),"%s\n" , statep);if (strlcat (buf, tmp,PAGE_SIZE ) >=PAGE_SIZE ) - goto rcu_unlock_buf_done; + goto unlock_buf_done; } -rcu_read_unlock (); +spin_unlock_irq (shost->host_lock);if (!lport) goto buffer_done;
@@ -505,11 +505,11 @@ lpfc_nvme_info_show(struct device *dev, struct device_attribute *attr, atomic_read(&lport->cmpl_fcp_err));strlcat (buf, tmp,PAGE_SIZE ); -/* RCU is already unlocked. */ +/* host_lock is already unlocked. */ goto buffer_done; - rcu_unlock_buf_done: -rcu_read_unlock (); + unlock_buf_done: +spin_unlock_irq (shost->host_lock); buffer_done: len =strnlen (buf,PAGE_SIZE );
Signature · 1 line
2.13.7
PATCH 4/11 lpfc: Fix unexpected error messages during RSCN handling
In reply to James SmartDuring heavy RCN activity and log_verbose = 0 we see these messages:
2754 PRLI failure DID:521245 Status:x9/xb2c00, data: x0 0231 RSCN timeout Data: x0 x3
0230 Unexpected timeout, hba link state x5
This is due to delayed RSCN activity.
Correct by avoiding the timeout thus the messages by resetarting the discovery timeout whenever an rscn is received.
Filter PRLI responses such that severity depends on whether expected for the configuration or not. For example, PRLI errors on a fabric will be informational (they are expected), but Point-to-Point errors are not necessarily expected so they are raised to an error level.
--- drivers/scsi/lpfc/lpfc_els.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +19 -2
@@ -2236,6 +2236,7 @@ lpfc_cmpl_els_prli(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,struct Scsi_Host *shost =lpfc_shost_from_vport (vport);IOCB_t *irsp;struct lpfc_nodelist *ndlp; +char *mode;/* we pass cmdiocb to state machine which needs rspiocb as well */ cmdiocb->context_un.rsp_iocb = rspiocb;
@@ -2273,8 +2274,17 @@ lpfc_cmpl_els_prli(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, goto out; } +/* If we don't send GFT_ID to Fabric, a PRLI error +* could be expected. +*/ +if ((vport->fc_flag &FC_FABRIC ) || + (vport->cfg_enable_fc4_type !=LPFC_ENABLE_BOTH )) + mode =KERN_ERR ; +else + mode =KERN_INFO ; +/* PRLI failed */ - lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS, + lpfc_printf_vlog(vport, mode, LOG_ELS, "2754 PRLI failure DID:%06X Status:x%x/x%x, " "data: x%x\n", ndlp->nlp_DID, irsp->ulpStatus,
@@ -6465,7 +6475,7 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,uint32_t payload_len, length, nportid, *cmd;int rscn_cnt;int rscn_id =0 , hba_id =0 ; -int i; +int i, tmo; pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; lp = (uint32_t *) pcmd->virt;
@@ -6571,6 +6581,13 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,spin_lock_irq (shost->host_lock); vport->fc_flag |=FC_RSCN_DEFERRED ; + +/* Restart disctmo if its already running */ +if (vport->fc_flag &FC_DISC_TMO ) { + tmo = ((phba->fc_ratov *3 ) +3 ); +mod_timer (&vport->fc_disctmo, + jiffies +msecs_to_jiffies (1000 * tmo)); + }if ((rscn_cnt <FC_MAX_HOLD_RSCN ) && !(vport->fc_flag &FC_RSCN_DISCOVERY )) { vport->fc_flag |=FC_RSCN_MODE ;
Signature · 1 line
2.13.7
PATCH 5/11 lpfc: Fix dynamic fw log enablement check
In reply to James SmartThe recently posted patch had a typo that incorrectly tested the receiving function.
Fix the typo (change == to !=)
---
Prior patch is in the 12.6.0.0 patch set and is only in 5.5/scsi-queue git branch
--- drivers/scsi/lpfc/lpfc_attr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_attr.c +1 -1
@@ -5981,7 +5981,7 @@ lpfc_ras_fwlog_buffsize_set(struct lpfc_hba *phba, uint val)if (phba->cfg_ras_fwlog_buffsize == val)return 0 ; -if (phba->cfg_ras_fwlog_func ==PCI_FUNC (phba->pcidev->devfn)) +if (phba->cfg_ras_fwlog_func !=PCI_FUNC (phba->pcidev->devfn))return -EINVAL ;spin_lock_irq (&phba->hbalock);
Signature · 1 line
2.13.7
PATCH 6/11 lpfc: Sync with FC-NVMe-2 SLER change to require Conf with SLER
In reply to James SmartPrior to the last FC-NVME-2 draft, SLER and CONF were independent. SLER now requires CONF to be set.
Revise the NVME PRLI checking to look for both inorder to enable SLER.
--- drivers/scsi/lpfc/lpfc_nportdisc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_nportdisc.c +3 -1
@@ -2121,7 +2121,9 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,if (bf_get_be32 (prli_init, nvpr)) ndlp->nlp_type |=NLP_NVME_INITIATOR ; -if (phba->nsler &&bf_get_be32 (prli_nsler, nvpr)) +if (phba->nsler &&bf_get_be32 (prli_nsler, nvpr) && +bf_get_be32 (prli_conf, nvpr)) + ndlp->nlp_nvme_info |=NLP_NVME_NSLER ;else ndlp->nlp_nvme_info &= ~NLP_NVME_NSLER ;
Signature · 1 line
2.13.7
PATCH 7/11 lpfc: Clarify FAWNN error message
In reply to James SmartCurrent message on FAWWN events is rather cryptic.
Expand the message to clarify its meaning.
--- drivers/scsi/lpfc/lpfc_hbadisc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_hbadisc.c +2 -2
@@ -3452,8 +3452,8 @@ lpfc_mbx_cmpl_read_topology(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) phba->pport->port_state, vport->fc_flag); else if (attn_type == LPFC_ATT_UNEXP_WWPN) lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT, -"1313 Link Down UNEXP WWPN Event x%x received " -"Data: x%x x%x x%x x%x x%x\n" , +"1313 Link Down Unexpected FA WWPN Event x%x " +"received Data: x%x x%x x%x x%x x%x\n" , la->eventTag, phba->fc_eventTag, phba->pport->port_state, vport->fc_flag, bf_get(lpfc_mbx_read_top_mm, la),
Signature · 1 line
2.13.7
PATCH 8/11 lpfc: Add registration for CPU Offline/Online events
In reply to James SmartThe recent affinitization didn't address cpu offlining/onlining. If an interrupt vector is shared and the low order cpu owning the vector is offlined, as interrupts are managed, the vector is taken offline. This causes the other cpu's sharing the vector will hang as they can't get io completions.
Correct by registering callbacks with the system for Offline/Online events. When a cpu is taken offline, its eq, which is tied to an interrupt vector is found. If the cpu is the "owner" of the vector and if the eq/vector is shared by other cpu's, the eq is placed into a polled mode. Additionally, code paths that perform io submission on the "sharing cpus" will check the eq state and poll for completion after submission of new io to a wq that uses the eq.
Similarly, when a cpu comes back online and owns an offline'd vector, the eq is taken out of polled mode and rearmed to start driving interrupts for eq.
--- drivers/scsi/lpfc/lpfc.h | 7 ++ drivers/scsi/lpfc/lpfc_crtn.h | 6 ++ drivers/scsi/lpfc/lpfc_init.c | 202 +++++++++++++++++++++++++++++++++++++++++- drivers/scsi/lpfc/lpfc_sli.c | 164 ++++++++++++++++++++++++++++++++-- drivers/scsi/lpfc/lpfc_sli4.h | 21 ++++- 5 files changed, 388 insertions(+), 12 deletions(-)
drivers/scsi/lpfc/lpfc.h +7 -0
@@ -1215,6 +1215,13 @@ struct lpfc_hba {uint64_t ktime_seg10_min;uint64_t ktime_seg10_max;#endif + +struct hlist_node cpuhp;/* used for cpuhp per hba callback */ +struct timer_list cpuhp_poll_timer; +struct list_head poll_list;/* slowpath eq polling list */ +#define LPFC_POLL_HB 1/* slowpath heartbeat */ +#define LPFC_POLL_FASTPATH 0/* called from fastpath */ +#define LPFC_POLL_SLOWPATH 1/* called from slowpath */ }; static inline struct Scsi_Host *
drivers/scsi/lpfc/lpfc_crtn.h +6 -0
@@ -215,6 +215,12 @@ irqreturn_t lpfc_sli_fp_intr_handler(int, void *);irqreturn_t lpfc_sli4_intr_handler (int ,void *);irqreturn_t lpfc_sli4_hba_intr_handler (int ,void *); +inline void lpfc_sli4_cleanup_poll_list (struct lpfc_hba *phba); +int lpfc_sli4_poll_eq (struct lpfc_queue *q,uint8_t path); +void lpfc_sli4_poll_hbtimer (struct timer_list *t); +void lpfc_sli4_start_polling (struct lpfc_queue *q); +void lpfc_sli4_stop_polling (struct lpfc_queue *q); +void lpfc_read_rev (struct lpfc_hba *,LPFC_MBOXQ_t *);void lpfc_sli4_swap_str (struct lpfc_hba *,LPFC_MBOXQ_t *);void lpfc_config_ring (struct lpfc_hba *,int ,LPFC_MBOXQ_t *);
drivers/scsi/lpfc/lpfc_init.c +198 -4
266 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli.c +159 -5
234 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli4.h +18 -3
@@ -133,6 +133,23 @@ struct lpfc_rqb {struct lpfc_queue {struct list_head list;struct list_head wq_list; + +/* +* If interrupts are in effect on _all_ the eq's the footprint +* of polling code is zero (except mode). This memory is chec- +* ked for every io to see if the io needs to be polled and +* while completion to check if the eq's needs to be rearmed. +* Keep in same cacheline as the queue ptr to avoid cpu fetch +* stalls. Using 1B memory will leave us with 7B hole. Fill +* it with other frequently used members. +*/ +uint16_t last_cpu;/* most recent cpu */ +uint16_t hdwq; +uint8_t qe_valid; +uint8_t mode;/* interrupt or polling */ +#define LPFC_EQ_INTERRUPT 0 +#define LPFC_EQ_POLL 1 +struct list_head wqfull_list;enum lpfc_sli4_queue_type type;enum lpfc_sli4_queue_subtype subtype;
@@ -240,10 +257,8 @@ struct lpfc_queue {struct delayed_work sched_spwork;uint64_t isr_timestamp; -uint16_t hdwq; -uint16_t last_cpu;/* most recent cpu */ -uint8_t qe_valid;struct lpfc_queue *assoc_qp; +struct list_head _poll_list;void **q_pgs;/* array to index entries per page */ };
Signature · 1 line
2.13.7
PATCH 9/11 lpfc: Change default IRQ model on AMD architectures
In reply to James SmartThe current driver attempts to allocate an interrupt vector per cpu using the systems managed IRQ allocator (flag PCI_IRQ_AFFINITY). The system IRQ allocator will either provide the per-cpu vector, or return fewer vectors. When fewer vectors, they are evenly spread between the numa nodes on the system. When run on an AMD architecture, if interrupts occur to a cpu that is not in the same numa node as the adapter generating the interrupt, there are extreme costs and overheads in performance. Thus, if 1:1 vector allocation is used, or the "balanced" vectors in the other numa nodes, performance can be hit significantly.
A much more performance model is to allocate interrupts only on the cpus that are in the numa node where the adapter resides. I/O completion is still performed by the cpu that where the I/O was generated. Unfortunately, there is no flag to request the managed IRQ subsystem allocate vectors only for the cpu's in the numa node as the adapter.
On AMD architecture, revert the irq allocation to the normal style (non-managed) and then use irq_set_affinity_hint() to set the cpu affinity and disable user-space rebalancing.
Tie the support into CPU offline/online. If the cpu being offlined owns a vector, the vector is re-affinitized to one of the other cpu's on the same numa node. If there are no more cpus on the numa node, the vector has all affinity removed and lets the system determine where it's serviced. Similarly, when the cpu that owned a vector comes online, the vector is reaffinitized to the cpu.
--- drivers/scsi/lpfc/lpfc.h | 21 ++ drivers/scsi/lpfc/lpfc_attr.c | 132 +++++++++++-- drivers/scsi/lpfc/lpfc_init.c | 450 +++++++++++++++++++++++++++++++----------- drivers/scsi/lpfc/lpfc_sli4.h | 19 +- 4 files changed, 484 insertions(+), 138 deletions(-)
drivers/scsi/lpfc/lpfc.h +21 -0
@@ -837,6 +837,7 @@ struct lpfc_hba {uint32_t cfg_fcp_mq_threshold;uint32_t cfg_hdw_queue;uint32_t cfg_irq_chann; +uint32_t cfg_irq_numa;uint32_t cfg_suppress_rsp;uint32_t cfg_nvme_oas;uint32_t cfg_nvme_embed_cmd;
@@ -1312,6 +1313,26 @@ lpfc_phba_elsring(struct lpfc_hba *phba) }/** +* lpfc_next_online_numa_cpu - Finds next online CPU on NUMA node +* @numa_mask: Pointer to phba's numa_mask member. +* @start: starting cpu index +* +* Note: If no valid cpu found, then nr_cpu_ids is returned. +* +**/ +static inline unsigned int +lpfc_next_online_numa_cpu (const struct cpumask *numa_mask,unsigned int start) +{ +unsigned int cpu_it; + +for_each_cpu_wrap (cpu_it, numa_mask, start) { +if (cpu_online (cpu_it)) +break ; + } + +return cpu_it; +} +/** * lpfc_sli4_mod_hba_eq_delay - update EQ delay * @phba: Pointer to HBA context object. * @q: The Event Queue to update.
drivers/scsi/lpfc/lpfc_attr.c +116 -16
197 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_init.c +332 -118
677 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli4.h +15 -4
@@ -41,8 +41,13 @@/* Multi-queue arrangement for FCP EQ/CQ/WQ tuples */ #define LPFC_HBA_HDWQ_MIN 0 -#define LPFC_HBA_HDWQ_MAX 128 -#define LPFC_HBA_HDWQ_DEF 0 +#define LPFC_HBA_HDWQ_MAX 256 +#define LPFC_HBA_HDWQ_DEF LPFC_HBA_HDWQ_MIN + +/* irq_chann range, values */ +#define LPFC_IRQ_CHANN_MIN 0 +#define LPFC_IRQ_CHANN_MAX 256 +#define LPFC_IRQ_CHANN_DEF LPFC_IRQ_CHANN_MIN/* FCP MQ queue count limiting */ #define LPFC_FCP_MQ_THRESHOLD_MIN 0
@@ -467,11 +472,17 @@ struct lpfc_hba;#define LPFC_SLI4_HANDLER_NAME_SZ 16struct lpfc_hba_eq_hdl {uint32_t idx; +uint16_t irq;char handler_name[LPFC_SLI4_HANDLER_NAME_SZ ];struct lpfc_hba *phba;struct lpfc_queue *eq; +struct cpumask aff_mask; }; +#define lpfc_get_eq_hdl (eqidx) (&phba->sli4_hba.hba_eq_hdl[eqidx]) +#define lpfc_get_aff_mask (eqidx) (&phba->sli4_hba.hba_eq_hdl[eqidx].aff_mask) +#define lpfc_get_irq (eqidx) (phba->sli4_hba.hba_eq_hdl[eqidx].irq) +/*BB Credit recovery value*/ struct lpfc_bbscn_params {uint32_t word0;
@@ -561,11 +572,10 @@ struct lpfc_sli4_lnk_info {#define LPFC_SLI4_HANDLER_CNT (LPFC_HBA_IO_CHAN_MAX+ \ LPFC_FOF_IO_CHAN_NUM) -/* Used for IRQ vector to CPU mapping */ +/* Used for tracking CPU mapping attributes */ struct lpfc_vector_map_info {uint16_t phys_id;uint16_t core_id; -uint16_t irq;uint16_t eq;uint16_t hdwq;uint16_t flag;
@@ -908,6 +918,7 @@ struct lpfc_sli4_hba {struct lpfc_vector_map_info *cpu_map;uint16_t num_possible_cpu;uint16_t num_present_cpu; +struct cpumask numa_mask;uint16_t curr_disp_cpu;struct lpfc_eq_intr_info __percpu *eq_info;uint32_t conf_trunk;
Signature · 1 line
2.13.7
PATCH 10/11 lpfc: Add enablement of multiple adapter dumps
In reply to James SmartSome adapters support the ability to hold multiple adapter dumps on the adapter flash. Some adapters default to enabling this feature while others default to single-dump.
Make support uniform by enabling dual dump by default.
--- drivers/scsi/lpfc/lpfc_hw4.h | 10 ++++++++++ drivers/scsi/lpfc/lpfc_sli.c | 27 ++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_hw4.h +10 -0
@@ -3530,6 +3530,7 @@ struct lpfc_sli4_parameters {#define LPFC_SET_UE_RECOVERY 0x10#define LPFC_SET_MDS_DIAGS 0x11 +#define LPFC_SET_DUAL_DUMP 0x1estruct lpfc_mbx_set_feature {struct mbox_header header;uint32_t feature;
@@ -3544,6 +3545,15 @@ struct lpfc_mbx_set_feature {#define lpfc_mbx_set_feature_mds_deep_loopbk_SHIFT 1#define lpfc_mbx_set_feature_mds_deep_loopbk_MASK 0x00000001#define lpfc_mbx_set_feature_mds_deep_loopbk_WORD word6 +#define lpfc_mbx_set_feature_dd_SHIFT 0 +#define lpfc_mbx_set_feature_dd_MASK 0x00000001 +#define lpfc_mbx_set_feature_dd_WORD word6 +#define lpfc_mbx_set_feature_ddquery_SHIFT 1 +#define lpfc_mbx_set_feature_ddquery_MASK 0x00000001 +#define lpfc_mbx_set_feature_ddquery_WORD word6 +#define LPFC_DISABLE_DUAL_DUMP 0 +#define LPFC_ENABLE_DUAL_DUMP 1 +#define LPFC_QUERY_OP_DUAL_DUMP 2uint32_t word7;#define lpfc_mbx_set_feature_UERP_SHIFT 0#define lpfc_mbx_set_feature_UERP_MASK 0x0000ffff
drivers/scsi/lpfc/lpfc_sli.c +26 -1
@@ -6203,6 +6203,14 @@ lpfc_set_features(struct lpfc_hba *phba, LPFC_MBOXQ_t *mbox, mbox->u.mqe.un.set_feature.feature =LPFC_SET_MDS_DIAGS ; mbox->u.mqe.un.set_feature.param_len =8 ;break ; +case LPFC_SET_DUAL_DUMP : +bf_set (lpfc_mbx_set_feature_dd, + &mbox->u.mqe.un.set_feature,LPFC_ENABLE_DUAL_DUMP ); +bf_set (lpfc_mbx_set_feature_ddquery, + &mbox->u.mqe.un.set_feature,0 ); + mbox->u.mqe.un.set_feature.feature =LPFC_SET_DUAL_DUMP ; + mbox->u.mqe.un.set_feature.param_len =4 ; +break ; }return ;
@@ -7200,7 +7208,7 @@ lpfc_post_rq_buffer(struct lpfc_hba *phba, struct lpfc_queue *hrq,int lpfc_sli4_hba_setup (struct lpfc_hba *phba) { -int rc, i, cnt, len; +int rc, i, cnt, len, dd;LPFC_MBOXQ_t *mboxq;struct lpfc_mqe *mqe;uint8_t *vpd;
@@ -7451,6 +7459,23 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba) phba->sli3_options |= (LPFC_SLI3_NPIV_ENABLED |LPFC_SLI3_HBQ_ENABLED );spin_unlock_irq (&phba->hbalock); +/* Always try to enable dual dump feature if we can */ +lpfc_set_features (phba, mboxq,LPFC_SET_DUAL_DUMP ); + rc =lpfc_sli_issue_mbox (phba, mboxq,MBX_POLL ); + dd =bf_get (lpfc_mbx_set_feature_dd, &mboxq->u.mqe.un.set_feature); +if ((rc ==MBX_SUCCESS ) && (dd ==LPFC_ENABLE_DUAL_DUMP )) +lpfc_printf_log (phba,KERN_ERR ,LOG_SLI |LOG_INIT , +"6448 Dual Dump is enabled\n" ); +else +lpfc_printf_log (phba,KERN_INFO ,LOG_SLI |LOG_INIT , +"6447 Dual Dump Mailbox x%x (x%x/x%x) failed, " +"rc:x%x dd:x%x\n" , +bf_get (lpfc_mqe_command, &mboxq->u.mqe), +lpfc_sli_config_mbox_subsys_get ( + phba, mboxq), +lpfc_sli_config_mbox_opcode_get ( + phba, mboxq), + rc, dd);/* * Allocate all resources (xri,rpi,vpi,vfi) now. Subsequent * calls depends on these resources to complete port setup.
Signature · 1 line
2.13.7
PATCH 11/11 lpfc: Update lpfc version to 12.6.0.1
In reply to James SmartUpdate lpfc version to 12.6.0.1
--- 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 "12.6.0.0" +#define LPFC_DRIVER_VERSION "12.6.0.1"#define LPFC_DRIVER_NAME "lpfc"/* Used for SLI 2/3 */
Signature · 1 line
2.13.7
Martin K. Petersen
AppliedJames,
Quoted 1 line
Update lpfc to revision 12.6.0.1
Applied to 5.5/scsi-queue.
Sad to see yet another driver with AMD workarounds. It really seems like this should be addressed in the core managed IRQ code.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering