Skip to content

Commit 88e8acf

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: Martin K. Petersen <martin.petersen@oracle.com>
2 parents d125deb + a28205c commit 88e8acf

10 files changed

Lines changed: 274 additions & 507 deletions

File tree

drivers/scsi/lpfc/lpfc.h

Lines changed: 3 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*******************************************************************
22
* This file is part of the Emulex Linux Device Driver for *
33
* Fibre Channel Host Bus Adapters. *
4-
* Copyright (C) 2017-2024 Broadcom. All Rights Reserved. The term *
4+
* Copyright (C) 2017-2025 Broadcom. All Rights Reserved. The term *
55
* “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. *
66
* Copyright (C) 2004-2016 Emulex. All rights reserved. *
77
* EMULEX and SLI are trademarks of Emulex. *
@@ -661,15 +661,12 @@ struct lpfc_vport {
661661
uint32_t num_disc_nodes; /* in addition to hba_state */
662662
uint32_t gidft_inp; /* cnt of outstanding GID_FTs */
663663

664-
uint32_t fc_nlp_cnt; /* outstanding NODELIST requests */
665664
uint32_t fc_rscn_id_cnt; /* count of RSCNs payloads in list */
666665
uint32_t fc_rscn_flush; /* flag use of fc_rscn_id_list */
667666
struct lpfc_dmabuf *fc_rscn_id_list[FC_MAX_HOLD_RSCN];
668667
struct lpfc_name fc_nodename; /* fc nodename */
669668
struct lpfc_name fc_portname; /* fc portname */
670669

671-
struct lpfc_work_evt disc_timeout_evt;
672-
673670
struct timer_list fc_disctmo; /* Discovery rescue timer */
674671
uint8_t fc_ns_retry; /* retries for fabric nameserver */
675672
uint32_t fc_prli_sent; /* cntr for outstanding PRLIs */
@@ -744,12 +741,6 @@ struct lpfc_vport {
744741
struct lpfc_vmid_priority_info vmid_priority;
745742

746743
#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
747-
struct dentry *debug_disc_trc;
748-
struct dentry *debug_nodelist;
749-
struct dentry *debug_nvmestat;
750-
struct dentry *debug_scsistat;
751-
struct dentry *debug_ioktime;
752-
struct dentry *debug_hdwqstat;
753744
struct dentry *vport_debugfs_root;
754745
struct lpfc_debugfs_trc *disc_trc;
755746
atomic_t disc_trc_cnt;
@@ -767,7 +758,6 @@ struct lpfc_vport {
767758
/* There is a single nvme instance per vport. */
768759
struct nvme_fc_local_port *localport;
769760
uint8_t nvmei_support; /* driver supports NVME Initiator */
770-
uint32_t last_fcp_wqidx;
771761
uint32_t rcv_flogi_cnt; /* How many unsol FLOGIs ACK'd. */
772762
};
773763

@@ -1060,8 +1050,6 @@ struct lpfc_hba {
10601050

10611051
struct lpfc_dmabuf hbqslimp;
10621052

1063-
uint16_t pci_cfg_value;
1064-
10651053
uint8_t fc_linkspeed; /* Link speed after last READ_LA */
10661054

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

10891077
struct lpfc_stats fc_stat;
10901078

1091-
struct lpfc_nodelist fc_fcpnodev; /* nodelist entry for no device */
10921079
uint32_t nport_event_cnt; /* timestamp for nlplist entry */
10931080

10941081
uint8_t wwnn[8];
@@ -1229,9 +1216,6 @@ struct lpfc_hba {
12291216
uint32_t hbq_count; /* Count of configured HBQs */
12301217
struct hbq_s hbqs[LPFC_MAX_HBQS]; /* local copy of hbq indicies */
12311218

1232-
atomic_t fcp_qidx; /* next FCP WQ (RR Policy) */
1233-
atomic_t nvme_qidx; /* next NVME WQ (RR Policy) */
1234-
12351219
phys_addr_t pci_bar0_map; /* Physical address for PCI BAR0 */
12361220
phys_addr_t pci_bar1_map; /* Physical address for PCI BAR1 */
12371221
phys_addr_t pci_bar2_map; /* Physical address for PCI BAR2 */
@@ -1348,30 +1332,9 @@ struct lpfc_hba {
13481332
unsigned long last_ramp_down_time;
13491333
#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
13501334
struct dentry *hba_debugfs_root;
1351-
atomic_t debugfs_vport_count;
1352-
struct dentry *debug_multixri_pools;
1353-
struct dentry *debug_hbqinfo;
1354-
struct dentry *debug_dumpHostSlim;
1355-
struct dentry *debug_dumpHBASlim;
1356-
struct dentry *debug_InjErrLBA; /* LBA to inject errors at */
1357-
struct dentry *debug_InjErrNPortID; /* NPortID to inject errors at */
1358-
struct dentry *debug_InjErrWWPN; /* WWPN to inject errors at */
1359-
struct dentry *debug_writeGuard; /* inject write guard_tag errors */
1360-
struct dentry *debug_writeApp; /* inject write app_tag errors */
1361-
struct dentry *debug_writeRef; /* inject write ref_tag errors */
1362-
struct dentry *debug_readGuard; /* inject read guard_tag errors */
1363-
struct dentry *debug_readApp; /* inject read app_tag errors */
1364-
struct dentry *debug_readRef; /* inject read ref_tag errors */
1365-
1366-
struct dentry *debug_nvmeio_trc;
1335+
unsigned int debugfs_vport_count;
1336+
13671337
struct lpfc_debugfs_nvmeio_trc *nvmeio_trc;
1368-
struct dentry *debug_hdwqinfo;
1369-
#ifdef LPFC_HDWQ_LOCK_STAT
1370-
struct dentry *debug_lockstat;
1371-
#endif
1372-
struct dentry *debug_cgn_buffer;
1373-
struct dentry *debug_rx_monitor;
1374-
struct dentry *debug_ras_log;
13751338
atomic_t nvmeio_trc_cnt;
13761339
uint32_t nvmeio_trc_size;
13771340
uint32_t nvmeio_trc_output_idx;
@@ -1388,19 +1351,10 @@ struct lpfc_hba {
13881351
sector_t lpfc_injerr_lba;
13891352
#define LPFC_INJERR_LBA_OFF (sector_t)(-1)
13901353

1391-
struct dentry *debug_slow_ring_trc;
13921354
struct lpfc_debugfs_trc *slow_ring_trc;
13931355
atomic_t slow_ring_trc_cnt;
13941356
/* iDiag debugfs sub-directory */
13951357
struct dentry *idiag_root;
1396-
struct dentry *idiag_pci_cfg;
1397-
struct dentry *idiag_bar_acc;
1398-
struct dentry *idiag_que_info;
1399-
struct dentry *idiag_que_acc;
1400-
struct dentry *idiag_drb_acc;
1401-
struct dentry *idiag_ctl_acc;
1402-
struct dentry *idiag_mbx_acc;
1403-
struct dentry *idiag_ext_acc;
14041358
uint8_t lpfc_idiag_last_eq;
14051359
#endif
14061360
uint16_t nvmeio_trc_on;

0 commit comments

Comments
 (0)