Commit 88e8acff authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

Merge patch series "Update lpfc to revision 14.4.0.11" 



Justin Tee <justintee8345@gmail.com> says:

Update lpfc to revision 14.4.0.11

This patch set contains clean up of unused members in various structs,
bug fixes related to discovery and resource allocation, and updates to
handling of debugfs entries.

The patches were cut against Martin's 6.18/scsi-queue tree.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parents d125deba a28205c2

drivers/scsi/lpfc/lpfc.h

+3 −49
Original line number Diff line number Diff line 
/*******************************************************************

 * 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.                        *
@@ -661,15 +661,12 @@ struct lpfc_vport { 
	uint32_t num_disc_nodes;	/* in addition to hba_state */

	uint32_t gidft_inp;		/* cnt of outstanding GID_FTs */



	uint32_t fc_nlp_cnt;	/* outstanding NODELIST requests */

	uint32_t fc_rscn_id_cnt;	/* count of RSCNs payloads in list */

	uint32_t fc_rscn_flush;		/* flag use of fc_rscn_id_list */

	struct lpfc_dmabuf *fc_rscn_id_list[FC_MAX_HOLD_RSCN];

	struct lpfc_name fc_nodename;	/* fc nodename */

	struct lpfc_name fc_portname;	/* fc portname */



	struct lpfc_work_evt disc_timeout_evt;



	struct timer_list fc_disctmo;	/* Discovery rescue timer */

	uint8_t fc_ns_retry;	/* retries for fabric nameserver */

	uint32_t fc_prli_sent;	/* cntr for outstanding PRLIs */
@@ -744,12 +741,6 @@ struct lpfc_vport { 
	struct lpfc_vmid_priority_info vmid_priority;



#ifdef CONFIG_SCSI_LPFC_DEBUG_FS

	struct dentry *debug_disc_trc;

	struct dentry *debug_nodelist;

	struct dentry *debug_nvmestat;

	struct dentry *debug_scsistat;

	struct dentry *debug_ioktime;

	struct dentry *debug_hdwqstat;

	struct dentry *vport_debugfs_root;

	struct lpfc_debugfs_trc *disc_trc;

	atomic_t disc_trc_cnt;
@@ -767,7 +758,6 @@ struct lpfc_vport { 
	/* There is a single nvme instance per vport. */

	struct nvme_fc_local_port *localport;

	uint8_t  nvmei_support; /* driver supports NVME Initiator */

	uint32_t last_fcp_wqidx;

	uint32_t rcv_flogi_cnt; /* How many unsol FLOGIs ACK'd. */

};
@@ -1060,8 +1050,6 @@ struct lpfc_hba { 


	struct lpfc_dmabuf hbqslimp;



	uint16_t pci_cfg_value;



	uint8_t fc_linkspeed;	/* Link speed after last READ_LA */



	uint32_t fc_eventTag;	/* event tag for link attention */
@@ -1088,7 +1076,6 @@ struct lpfc_hba { 


	struct lpfc_stats fc_stat;



	struct lpfc_nodelist fc_fcpnodev; /* nodelist entry for no device */

	uint32_t nport_event_cnt;	/* timestamp for nlplist entry */



	uint8_t  wwnn[8];
@@ -1229,9 +1216,6 @@ struct lpfc_hba { 
	uint32_t hbq_count;	        /* Count of configured HBQs */

	struct hbq_s hbqs[LPFC_MAX_HBQS]; /* local copy of hbq indicies  */



	atomic_t fcp_qidx;         /* next FCP WQ (RR Policy) */

	atomic_t nvme_qidx;        /* next NVME WQ (RR Policy) */



	phys_addr_t pci_bar0_map;     /* Physical address for PCI BAR0 */

	phys_addr_t pci_bar1_map;     /* Physical address for PCI BAR1 */

	phys_addr_t pci_bar2_map;     /* Physical address for PCI BAR2 */
@@ -1348,30 +1332,9 @@ struct lpfc_hba { 
	unsigned long last_ramp_down_time;

#ifdef CONFIG_SCSI_LPFC_DEBUG_FS

	struct dentry *hba_debugfs_root;

	atomic_t debugfs_vport_count;

	struct dentry *debug_multixri_pools;

	struct dentry *debug_hbqinfo;

	struct dentry *debug_dumpHostSlim;

	struct dentry *debug_dumpHBASlim;

	struct dentry *debug_InjErrLBA;  /* LBA to inject errors at */

	struct dentry *debug_InjErrNPortID;  /* NPortID to inject errors at */

	struct dentry *debug_InjErrWWPN;  /* WWPN to inject errors at */

	struct dentry *debug_writeGuard; /* inject write guard_tag errors */

	struct dentry *debug_writeApp;   /* inject write app_tag errors */

	struct dentry *debug_writeRef;   /* inject write ref_tag errors */

	struct dentry *debug_readGuard;  /* inject read guard_tag errors */

	struct dentry *debug_readApp;    /* inject read app_tag errors */

	struct dentry *debug_readRef;    /* inject read ref_tag errors */



	struct dentry *debug_nvmeio_trc;

	unsigned int debugfs_vport_count;



	struct lpfc_debugfs_nvmeio_trc *nvmeio_trc;

	struct dentry *debug_hdwqinfo;

#ifdef LPFC_HDWQ_LOCK_STAT

	struct dentry *debug_lockstat;

#endif

	struct dentry *debug_cgn_buffer;

	struct dentry *debug_rx_monitor;

	struct dentry *debug_ras_log;

	atomic_t nvmeio_trc_cnt;

	uint32_t nvmeio_trc_size;

	uint32_t nvmeio_trc_output_idx;
@@ -1388,19 +1351,10 @@ struct lpfc_hba { 
	sector_t lpfc_injerr_lba;

#define LPFC_INJERR_LBA_OFF	(sector_t)(-1)



	struct dentry *debug_slow_ring_trc;

	struct lpfc_debugfs_trc *slow_ring_trc;

	atomic_t slow_ring_trc_cnt;

	/* iDiag debugfs sub-directory */

	struct dentry *idiag_root;

	struct dentry *idiag_pci_cfg;

	struct dentry *idiag_bar_acc;

	struct dentry *idiag_que_info;

	struct dentry *idiag_que_acc;

	struct dentry *idiag_drb_acc;

	struct dentry *idiag_ctl_acc;

	struct dentry *idiag_mbx_acc;

	struct dentry *idiag_ext_acc;

	uint8_t lpfc_idiag_last_eq;

#endif

	uint16_t nvmeio_trc_on;

drivers/scsi/lpfc/lpfc_debugfs.c

+213 −420

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/lpfc/lpfc_debugfs.h

+4 −1
Original line number Diff line number Diff line 
/*******************************************************************

 * This file is part of the Emulex Linux Device Driver for         *

 * Fibre Channel Host Bus Adapters.                                *

 * Copyright (C) 2017-2022 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-2011 Emulex.  All rights reserved.           *

 * EMULEX and SLI are trademarks of Emulex.                        *
@@ -44,6 +44,9 @@ 
/* hbqinfo output buffer size */

#define LPFC_HBQINFO_SIZE 8192



/* hdwqinfo output buffer size */

#define LPFC_HDWQINFO_SIZE 8192



/* nvmestat output buffer size */

#define LPFC_NVMESTAT_SIZE 8192

#define LPFC_IOKTIME_SIZE 8192

drivers/scsi/lpfc/lpfc_els.c

+17 −4
Original line number Diff line number Diff line
@@ -5339,12 +5339,12 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
		ulp_status, ulp_word4, did);

	/* ELS response tag <ulpIoTag> completes */

	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,

			 "0110 ELS response tag x%x completes "

			 "0110 ELS response tag x%x completes fc_flag x%lx"

			 "Data: x%x x%x x%x x%x x%lx x%x x%x x%x %p %p\n",

			 iotag, ulp_status, ulp_word4, tmo,

			 iotag, vport->fc_flag, ulp_status, ulp_word4, tmo,

			 ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_state,

			 ndlp->nlp_rpi, kref_read(&ndlp->kref), mbox, ndlp);

	if (mbox) {

	if (mbox && !test_bit(FC_PT2PT, &vport->fc_flag)) {

		if (ulp_status == 0 &&

		    test_bit(NLP_ACC_REGLOGIN, &ndlp->nlp_flag)) {

			if (!lpfc_unreg_rpi(vport, ndlp) &&
@@ -5403,6 +5403,10 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
		}

out_free_mbox:

		lpfc_mbox_rsrc_cleanup(phba, mbox, MBOX_THD_UNLOCKED);

	} else if (mbox && test_bit(FC_PT2PT, &vport->fc_flag) &&

		   test_bit(NLP_ACC_REGLOGIN, &ndlp->nlp_flag)) {

		lpfc_mbx_cmpl_reg_login(phba, mbox);

		clear_bit(NLP_ACC_REGLOGIN, &ndlp->nlp_flag);

	}

out:

	if (ndlp && shost) {
@@ -11259,6 +11263,11 @@ lpfc_cmpl_els_fdisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
		lpfc_vlog_msg(vport, KERN_WARNING, LOG_ELS,

			      "0126 FDISC cmpl status: x%x/x%x)\n",

			      ulp_status, ulp_word4);



		/* drop initial reference */

		if (!test_and_set_bit(NLP_DROPPED, &ndlp->nlp_flag))

			lpfc_nlp_put(ndlp);



		goto fdisc_failed;

	}
@@ -12008,7 +12017,11 @@ lpfc_sli4_els_xri_aborted(struct lpfc_hba *phba, 
			sglq_entry->state = SGL_FREED;

			spin_unlock_irqrestore(&phba->sli4_hba.sgl_list_lock,

					       iflag);



			lpfc_printf_log(phba, KERN_INFO, LOG_ELS | LOG_SLI |

					LOG_DISCOVERY | LOG_NODE,

					"0732 ELS XRI ABORT on Node: ndlp=x%px "

					"xri=x%x\n",

					ndlp, xri);

			if (ndlp) {

				lpfc_set_rrq_active(phba, ndlp,

					sglq_entry->sli4_lxritag,

drivers/scsi/lpfc/lpfc_hw.h

+2 −1
Original line number Diff line number Diff line 
/*******************************************************************

 * 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.                        *
@@ -366,6 +366,7 @@ struct lpfc_name { 
		} s;

		uint8_t wwn[8];

		uint64_t name __packed __aligned(4);

		__be64 wwn_be __packed __aligned(4);

	} u;

};