Skip to content

Commit 91b9130

Browse files
Justin Teemartinkpetersen
Justin Tee
authored and
martinkpetersen
committed
scsi: lpfc: Update definition of firmware configuration mbox cmds
There are unused fields in mailbox commands that query for firmware configuration information. As such, update the struct definitions by correcting the name of certain fields and removing the unused fields. Signed-off-by: Justin Tee <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 3f8f9f1 commit 91b9130

File tree

3 files changed

+28
-66
lines changed

3 files changed

+28
-66
lines changed

‎drivers/scsi/lpfc/lpfc_hw4.h

Lines changed: 26 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1907,22 +1907,22 @@ struct lpfc_mbx_query_fw_config {
19071907
uint32_t asic_revision;
19081908
uint32_t physical_port;
19091909
uint32_t function_mode;
1910-
#define LPFC_FCOE_INI_MODE 0x00000040
1911-
#define LPFC_FCOE_TGT_MODE 0x00000080
1910+
#define LPFC_FC_INI_MODE 0x00000040
1911+
#define LPFC_FC_TGT_MODE 0x00000080
19121912
#define LPFC_DUA_MODE 0x00000800
1913-
uint32_t ulp0_mode;
1914-
#define LPFC_ULP_FCOE_INIT_MODE 0x00000040
1915-
#define LPFC_ULP_FCOE_TGT_MODE 0x00000080
1916-
uint32_t ulp0_nap_words[12];
1917-
uint32_t ulp1_mode;
1918-
uint32_t ulp1_nap_words[12];
1913+
uint32_t oper_mode;
1914+
uint32_t rsvd9[2];
1915+
uint32_t wqid_base;
1916+
uint32_t wqid_tot;
1917+
uint32_t rqid_base;
1918+
uint32_t rqid_tot;
1919+
uint32_t rsvd15[19];
19191920
uint32_t function_capabilities;
19201921
uint32_t cqid_base;
19211922
uint32_t cqid_tot;
19221923
uint32_t eqid_base;
19231924
uint32_t eqid_tot;
1924-
uint32_t ulp0_nap2_words[2];
1925-
uint32_t ulp1_nap2_words[2];
1925+
uint32_t rsvd39[4];
19261926
} rsp;
19271927
};
19281928

@@ -3778,79 +3778,54 @@ struct lpfc_mbx_get_prof_cfg {
37783778
struct lpfc_controller_attribute {
37793779
uint32_t version_string[8];
37803780
uint32_t manufacturer_name[8];
3781-
uint32_t supported_modes;
3781+
uint32_t rsvd16;
37823782
uint32_t word17;
3783-
#define lpfc_cntl_attr_eprom_ver_lo_SHIFT 0
3784-
#define lpfc_cntl_attr_eprom_ver_lo_MASK 0x000000ff
3785-
#define lpfc_cntl_attr_eprom_ver_lo_WORD word17
3786-
#define lpfc_cntl_attr_eprom_ver_hi_SHIFT 8
3787-
#define lpfc_cntl_attr_eprom_ver_hi_MASK 0x000000ff
3788-
#define lpfc_cntl_attr_eprom_ver_hi_WORD word17
37893783
#define lpfc_cntl_attr_flash_id_SHIFT 16
37903784
#define lpfc_cntl_attr_flash_id_MASK 0x000000ff
37913785
#define lpfc_cntl_attr_flash_id_WORD word17
3792-
uint32_t mbx_da_struct_ver;
3793-
uint32_t ep_fw_da_struct_ver;
3786+
#define lpfc_cntl_attr_boot_enable_SHIFT 24
3787+
#define lpfc_cntl_attr_boot_enable_MASK 0x00000001
3788+
#define lpfc_cntl_attr_boot_enable_WORD word17
3789+
uint32_t rsvd18[2];
37943790
uint32_t ncsi_ver_str[3];
3795-
uint32_t dflt_ext_timeout;
3791+
uint32_t rsvd23;
37963792
uint32_t model_number[8];
37973793
uint32_t description[16];
37983794
uint32_t serial_number[8];
3799-
uint32_t ip_ver_str[8];
3795+
uint32_t ipl_name[5];
3796+
uint32_t rsvd61[3];
38003797
uint32_t fw_ver_str[8];
38013798
uint32_t bios_ver_str[8];
38023799
uint32_t redboot_ver_str[8];
38033800
uint32_t driver_ver_str[8];
38043801
uint32_t flash_fw_ver_str[8];
38053802
uint32_t functionality;
38063803
uint32_t word105;
3807-
#define lpfc_cntl_attr_max_cbd_len_SHIFT 0
3808-
#define lpfc_cntl_attr_max_cbd_len_MASK 0x0000ffff
3809-
#define lpfc_cntl_attr_max_cbd_len_WORD word105
38103804
#define lpfc_cntl_attr_asic_rev_SHIFT 16
38113805
#define lpfc_cntl_attr_asic_rev_MASK 0x000000ff
38123806
#define lpfc_cntl_attr_asic_rev_WORD word105
3813-
#define lpfc_cntl_attr_gen_guid0_SHIFT 24
3814-
#define lpfc_cntl_attr_gen_guid0_MASK 0x000000ff
3815-
#define lpfc_cntl_attr_gen_guid0_WORD word105
3816-
uint32_t gen_guid1_12[3];
3807+
uint32_t rsvd106[3];
38173808
uint32_t word109;
3818-
#define lpfc_cntl_attr_gen_guid13_14_SHIFT 0
3819-
#define lpfc_cntl_attr_gen_guid13_14_MASK 0x0000ffff
3820-
#define lpfc_cntl_attr_gen_guid13_14_WORD word109
3821-
#define lpfc_cntl_attr_gen_guid15_SHIFT 16
3822-
#define lpfc_cntl_attr_gen_guid15_MASK 0x000000ff
3823-
#define lpfc_cntl_attr_gen_guid15_WORD word109
38243809
#define lpfc_cntl_attr_hba_port_cnt_SHIFT 24
38253810
#define lpfc_cntl_attr_hba_port_cnt_MASK 0x000000ff
38263811
#define lpfc_cntl_attr_hba_port_cnt_WORD word109
3827-
uint32_t word110;
3828-
#define lpfc_cntl_attr_dflt_lnk_tmo_SHIFT 0
3829-
#define lpfc_cntl_attr_dflt_lnk_tmo_MASK 0x0000ffff
3830-
#define lpfc_cntl_attr_dflt_lnk_tmo_WORD word110
3831-
#define lpfc_cntl_attr_multi_func_dev_SHIFT 24
3832-
#define lpfc_cntl_attr_multi_func_dev_MASK 0x000000ff
3833-
#define lpfc_cntl_attr_multi_func_dev_WORD word110
3812+
uint32_t rsvd110;
38343813
uint32_t word111;
3835-
#define lpfc_cntl_attr_cache_valid_SHIFT 0
3836-
#define lpfc_cntl_attr_cache_valid_MASK 0x000000ff
3837-
#define lpfc_cntl_attr_cache_valid_WORD word111
38383814
#define lpfc_cntl_attr_hba_status_SHIFT 8
38393815
#define lpfc_cntl_attr_hba_status_MASK 0x000000ff
38403816
#define lpfc_cntl_attr_hba_status_WORD word111
3841-
#define lpfc_cntl_attr_max_domain_SHIFT 16
3842-
#define lpfc_cntl_attr_max_domain_MASK 0x000000ff
3843-
#define lpfc_cntl_attr_max_domain_WORD word111
38443817
#define lpfc_cntl_attr_lnk_numb_SHIFT 24
38453818
#define lpfc_cntl_attr_lnk_numb_MASK 0x0000003f
38463819
#define lpfc_cntl_attr_lnk_numb_WORD word111
38473820
#define lpfc_cntl_attr_lnk_type_SHIFT 30
38483821
#define lpfc_cntl_attr_lnk_type_MASK 0x00000003
38493822
#define lpfc_cntl_attr_lnk_type_WORD word111
3850-
uint32_t fw_post_status;
3851-
uint32_t hba_mtu[8];
3823+
uint32_t rsvd112[9];
38523824
uint32_t word121;
3853-
uint32_t reserved1[3];
3825+
#define lpfc_cntl_attr_asic_gen_SHIFT 8
3826+
#define lpfc_cntl_attr_asic_gen_MASK 0x000000ff
3827+
#define lpfc_cntl_attr_asic_gen_WORD word121
3828+
uint32_t rsvd122[3];
38543829
uint32_t word125;
38553830
#define lpfc_cntl_attr_pci_vendor_id_SHIFT 0
38563831
#define lpfc_cntl_attr_pci_vendor_id_MASK 0x0000ffff
@@ -3875,15 +3850,7 @@ struct lpfc_controller_attribute {
38753850
#define lpfc_cntl_attr_pci_fnc_num_SHIFT 16
38763851
#define lpfc_cntl_attr_pci_fnc_num_MASK 0x000000ff
38773852
#define lpfc_cntl_attr_pci_fnc_num_WORD word127
3878-
#define lpfc_cntl_attr_inf_type_SHIFT 24
3879-
#define lpfc_cntl_attr_inf_type_MASK 0x000000ff
3880-
#define lpfc_cntl_attr_inf_type_WORD word127
3881-
uint32_t unique_id[2];
3882-
uint32_t word130;
3883-
#define lpfc_cntl_attr_num_netfil_SHIFT 0
3884-
#define lpfc_cntl_attr_num_netfil_MASK 0x000000ff
3885-
#define lpfc_cntl_attr_num_netfil_WORD word130
3886-
uint32_t reserved2[4];
3853+
uint32_t rsvd128[7];
38873854
};
38883855

38893856
struct lpfc_mbx_get_cntl_attributes {

‎drivers/scsi/lpfc/lpfc_init.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11109,14 +11109,11 @@ lpfc_sli4_queue_setup(struct lpfc_hba *phba)
1110911109

1111011110
phba->sli4_hba.fw_func_mode =
1111111111
mboxq->u.mqe.un.query_fw_cfg.rsp.function_mode;
11112-
phba->sli4_hba.ulp0_mode = mboxq->u.mqe.un.query_fw_cfg.rsp.ulp0_mode;
11113-
phba->sli4_hba.ulp1_mode = mboxq->u.mqe.un.query_fw_cfg.rsp.ulp1_mode;
1111411112
phba->sli4_hba.physical_port =
1111511113
mboxq->u.mqe.un.query_fw_cfg.rsp.physical_port;
1111611114
lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
11117-
"3251 QUERY_FW_CFG: func_mode:x%x, ulp0_mode:x%x, "
11118-
"ulp1_mode:x%x\n", phba->sli4_hba.fw_func_mode,
11119-
phba->sli4_hba.ulp0_mode, phba->sli4_hba.ulp1_mode);
11115+
"3251 QUERY_FW_CFG: func_mode:x%x\n",
11116+
phba->sli4_hba.fw_func_mode);
1112011117

1112111118
mempool_free(mboxq, phba->mbox_mem_pool);
1112211119

‎drivers/scsi/lpfc/lpfc_sli4.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -865,8 +865,6 @@ struct lpfc_sli4_hba {
865865
struct lpfc_name wwpn;
866866

867867
uint32_t fw_func_mode; /* FW function protocol mode */
868-
uint32_t ulp0_mode; /* ULP0 protocol mode */
869-
uint32_t ulp1_mode; /* ULP1 protocol mode */
870868

871869
/* Optimized Access Storage specific queues/structures */
872870
uint64_t oas_next_lun;

0 commit comments

Comments
 (0)