From: Greg Kroah-Hartman Date: Mon, 8 May 2023 06:46:00 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v5.15.111~40 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1829a6e237466c3644341db3d70d168086ae892d;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: drm-amd-display-gcc13-fix-enum-mismatch.patch --- diff --git a/queue-6.1/drm-amd-display-gcc13-fix-enum-mismatch.patch b/queue-6.1/drm-amd-display-gcc13-fix-enum-mismatch.patch new file mode 100644 index 00000000000..62c4e945d14 --- /dev/null +++ b/queue-6.1/drm-amd-display-gcc13-fix-enum-mismatch.patch @@ -0,0 +1,61 @@ +From 545094d993f4639482018becda5f2a47d126f0ab Mon Sep 17 00:00:00 2001 +From: "Jiri Slaby (SUSE)" +Date: Mon, 31 Oct 2022 12:42:47 +0100 +Subject: drm/amd/display (gcc13): fix enum mismatch +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Jiri Slaby (SUSE) + +commit 545094d993f4639482018becda5f2a47d126f0ab upstream. + +rn_vbios_smu_set_dcn_low_power_state() produces a valid warning with +gcc-13: + drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c:237:6: error: conflicting types for 'rn_vbios_smu_set_dcn_low_power_state' due to enum/integer mismatch; have 'void(struct clk_mgr_internal *, enum dcn_pwr_state)' + drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h:36:6: note: previous declaration of 'rn_vbios_smu_set_dcn_low_power_state' with type 'void(struct clk_mgr_internal *, int)' + +I.e. the type of the 2nd parameter of +rn_vbios_smu_set_dcn_low_power_state() in the declaration is int, while +the definition spells enum dcn_pwr_state. Synchronize them to the +latter (and add a forward enum declaration). + +Cc: Martin Liska +Cc: Harry Wentland +Cc: Leo Li +Cc: Rodrigo Siqueira +Cc: Alex Deucher +Cc: "Christian König" +Cc: "Pan, Xinhui" +Cc: David Airlie +Cc: Daniel Vetter +Cc: amd-gfx@lists.freedesktop.org +Cc: dri-devel@lists.freedesktop.org +Reviewed-by: Harry Wentland +Signed-off-by: Jiri Slaby (SUSE) +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h ++++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h +@@ -26,6 +26,8 @@ + #ifndef DAL_DC_RN_CLK_MGR_VBIOS_SMU_H_ + #define DAL_DC_RN_CLK_MGR_VBIOS_SMU_H_ + ++enum dcn_pwr_state; ++ + int rn_vbios_smu_get_smu_version(struct clk_mgr_internal *clk_mgr); + int rn_vbios_smu_set_dispclk(struct clk_mgr_internal *clk_mgr, int requested_dispclk_khz); + int rn_vbios_smu_set_dprefclk(struct clk_mgr_internal *clk_mgr); +@@ -33,7 +35,7 @@ int rn_vbios_smu_set_hard_min_dcfclk(str + int rn_vbios_smu_set_min_deep_sleep_dcfclk(struct clk_mgr_internal *clk_mgr, int requested_min_ds_dcfclk_khz); + void rn_vbios_smu_set_phyclk(struct clk_mgr_internal *clk_mgr, int requested_phyclk_khz); + int rn_vbios_smu_set_dppclk(struct clk_mgr_internal *clk_mgr, int requested_dpp_khz); +-void rn_vbios_smu_set_dcn_low_power_state(struct clk_mgr_internal *clk_mgr, int display_count); ++void rn_vbios_smu_set_dcn_low_power_state(struct clk_mgr_internal *clk_mgr, enum dcn_pwr_state); + void rn_vbios_smu_enable_48mhz_tmdp_refclk_pwrdwn(struct clk_mgr_internal *clk_mgr, bool enable); + void rn_vbios_smu_enable_pme_wa(struct clk_mgr_internal *clk_mgr); + int rn_vbios_smu_is_periodic_retraining_disabled(struct clk_mgr_internal *clk_mgr); diff --git a/queue-6.1/i40e-use-int-for-i40e_status.patch b/queue-6.1/i40e-use-int-for-i40e_status.patch index 70c443ef04b..abd1685e42c 100644 --- a/queue-6.1/i40e-use-int-for-i40e_status.patch +++ b/queue-6.1/i40e-use-int-for-i40e_status.patch @@ -39,9 +39,9 @@ Signed-off-by: Greg Kroah-Hartman drivers/net/ethernet/intel/i40e/i40e_main.c | 97 +- drivers/net/ethernet/intel/i40e/i40e_nvm.c | 248 ++--- drivers/net/ethernet/intel/i40e/i40e_osdep.h | 1 - drivers/net/ethernet/intel/i40e/i40e_prototype.h | 580 ++++++------- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 678 +++++++--------- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 66 - - 21 files changed, 1179 insertions(+), 1175 deletions(-) + 21 files changed, 1224 insertions(+), 1228 deletions(-) --- a/drivers/net/ethernet/intel/i40e/i40e.h +++ b/drivers/net/ethernet/intel/i40e/i40e.h @@ -4419,7 +4419,7 @@ Signed-off-by: Greg Kroah-Hartman i40e_asq_send_command_atomic_v2(struct i40e_hw *hw, struct i40e_aq_desc *desc, void *buff, /* can be NULL */ -@@ -53,48 +53,48 @@ void i40e_debug_aq(struct i40e_hw *hw, e +@@ -53,323 +53,307 @@ void i40e_debug_aq(struct i40e_hw *hw, e void i40e_idle_aq(struct i40e_hw *hw); bool i40e_check_asq_alive(struct i40e_hw *hw); @@ -4482,6 +4482,29 @@ Signed-off-by: Greg Kroah-Hartman - struct i40e_asq_cmd_details *cmd_details); -i40e_status i40e_aq_clear_default_vsi(struct i40e_hw *hw, u16 vsi_id, - struct i40e_asq_cmd_details *cmd_details); +-enum i40e_status_code i40e_aq_get_phy_capabilities(struct i40e_hw *hw, +- bool qualified_modules, bool report_init, +- struct i40e_aq_get_phy_abilities_resp *abilities, +- struct i40e_asq_cmd_details *cmd_details); +-enum i40e_status_code i40e_aq_set_phy_config(struct i40e_hw *hw, +- struct i40e_aq_set_phy_config *config, +- struct i40e_asq_cmd_details *cmd_details); +-enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures, +- bool atomic_reset); +-i40e_status i40e_aq_set_phy_int_mask(struct i40e_hw *hw, u16 mask, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_clear_pxe_mode(struct i40e_hw *hw, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_set_link_restart_an(struct i40e_hw *hw, +- bool enable_link, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_get_link_info(struct i40e_hw *hw, +- bool enable_lse, struct i40e_link_status *link, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_set_local_advt_reg(struct i40e_hw *hw, +- u64 advt_reg, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_send_driver_version(struct i40e_hw *hw, +int i40e_aq_get_firmware_version(struct i40e_hw *hw, + u16 *fw_major_version, u16 *fw_minor_version, + u32 *fw_build, @@ -4499,27 +4522,14 @@ Signed-off-by: Greg Kroah-Hartman + struct i40e_asq_cmd_details *cmd_details); +int i40e_aq_clear_default_vsi(struct i40e_hw *hw, u16 vsi_id, + struct i40e_asq_cmd_details *cmd_details); - enum i40e_status_code i40e_aq_get_phy_capabilities(struct i40e_hw *hw, - bool qualified_modules, bool report_init, - struct i40e_aq_get_phy_abilities_resp *abilities, -@@ -104,33 +104,34 @@ enum i40e_status_code i40e_aq_set_phy_co - struct i40e_asq_cmd_details *cmd_details); - enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures, - bool atomic_reset); --i40e_status i40e_aq_set_phy_int_mask(struct i40e_hw *hw, u16 mask, -- struct i40e_asq_cmd_details *cmd_details); --i40e_status i40e_aq_clear_pxe_mode(struct i40e_hw *hw, -- struct i40e_asq_cmd_details *cmd_details); --i40e_status i40e_aq_set_link_restart_an(struct i40e_hw *hw, -- bool enable_link, -- struct i40e_asq_cmd_details *cmd_details); --i40e_status i40e_aq_get_link_info(struct i40e_hw *hw, -- bool enable_lse, struct i40e_link_status *link, -- struct i40e_asq_cmd_details *cmd_details); --i40e_status i40e_aq_set_local_advt_reg(struct i40e_hw *hw, -- u64 advt_reg, -- struct i40e_asq_cmd_details *cmd_details); --i40e_status i40e_aq_send_driver_version(struct i40e_hw *hw, ++int i40e_aq_get_phy_capabilities(struct i40e_hw *hw, ++ bool qualified_modules, bool report_init, ++ struct i40e_aq_get_phy_abilities_resp *abilities, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_set_phy_config(struct i40e_hw *hw, ++ struct i40e_aq_set_phy_config *config, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures, bool atomic_reset); +int i40e_aq_set_phy_int_mask(struct i40e_hw *hw, u16 mask, + struct i40e_asq_cmd_details *cmd_details); +int i40e_aq_clear_pxe_mode(struct i40e_hw *hw, @@ -4547,25 +4557,14 @@ Signed-off-by: Greg Kroah-Hartman - bool rx_only_promisc); -i40e_status i40e_aq_set_vsi_multicast_promiscuous(struct i40e_hw *hw, - u16 vsi_id, bool set, struct i40e_asq_cmd_details *cmd_details); -+int i40e_aq_add_vsi(struct i40e_hw *hw, -+ struct i40e_vsi_context *vsi_ctx, -+ struct i40e_asq_cmd_details *cmd_details); -+int i40e_aq_set_vsi_broadcast(struct i40e_hw *hw, -+ u16 vsi_id, bool set_filter, -+ struct i40e_asq_cmd_details *cmd_details); -+int i40e_aq_set_vsi_unicast_promiscuous(struct i40e_hw *hw, -+ u16 vsi_id, bool set, -+ struct i40e_asq_cmd_details *cmd_details, -+ bool rx_only_promisc); -+int i40e_aq_set_vsi_multicast_promiscuous(struct i40e_hw *hw, -+ u16 vsi_id, bool set, struct i40e_asq_cmd_details *cmd_details); - enum i40e_status_code i40e_aq_set_vsi_mc_promisc_on_vlan(struct i40e_hw *hw, - u16 seid, bool enable, - u16 vid, -@@ -139,170 +140,167 @@ enum i40e_status_code i40e_aq_set_vsi_uc - u16 seid, bool enable, - u16 vid, - struct i40e_asq_cmd_details *cmd_details); +-enum i40e_status_code i40e_aq_set_vsi_mc_promisc_on_vlan(struct i40e_hw *hw, +- u16 seid, bool enable, +- u16 vid, +- struct i40e_asq_cmd_details *cmd_details); +-enum i40e_status_code i40e_aq_set_vsi_uc_promisc_on_vlan(struct i40e_hw *hw, +- u16 seid, bool enable, +- u16 vid, +- struct i40e_asq_cmd_details *cmd_details); -i40e_status i40e_aq_set_vsi_bc_promisc_on_vlan(struct i40e_hw *hw, - u16 seid, bool enable, u16 vid, - struct i40e_asq_cmd_details *cmd_details); @@ -4589,6 +4588,26 @@ Signed-off-by: Greg Kroah-Hartman - u16 *vebs_free, - struct i40e_asq_cmd_details *cmd_details); -i40e_status i40e_aq_add_macvlan(struct i40e_hw *hw, u16 vsi_id, ++int i40e_aq_add_vsi(struct i40e_hw *hw, ++ struct i40e_vsi_context *vsi_ctx, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_set_vsi_broadcast(struct i40e_hw *hw, ++ u16 vsi_id, bool set_filter, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_set_vsi_unicast_promiscuous(struct i40e_hw *hw, ++ u16 vsi_id, bool set, ++ struct i40e_asq_cmd_details *cmd_details, ++ bool rx_only_promisc); ++int i40e_aq_set_vsi_multicast_promiscuous(struct i40e_hw *hw, ++ u16 vsi_id, bool set, struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_set_vsi_mc_promisc_on_vlan(struct i40e_hw *hw, ++ u16 seid, bool enable, ++ u16 vid, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_set_vsi_uc_promisc_on_vlan(struct i40e_hw *hw, ++ u16 seid, bool enable, ++ u16 vid, ++ struct i40e_asq_cmd_details *cmd_details); +int i40e_aq_set_vsi_bc_promisc_on_vlan(struct i40e_hw *hw, + u16 seid, bool enable, u16 vid, + struct i40e_asq_cmd_details *cmd_details); @@ -4643,6 +4662,25 @@ Signed-off-by: Greg Kroah-Hartman - struct i40e_aqc_get_switch_config_resp *buf, - u16 buf_size, u16 *start_seid, - struct i40e_asq_cmd_details *cmd_details); +-enum i40e_status_code i40e_aq_set_switch_config(struct i40e_hw *hw, +- u16 flags, +- u16 valid_flags, u8 mode, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_request_resource(struct i40e_hw *hw, +- enum i40e_aq_resources_ids resource, +- enum i40e_aq_resource_access_type access, +- u8 sdp_number, u64 *timeout, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_release_resource(struct i40e_hw *hw, +- enum i40e_aq_resources_ids resource, +- u8 sdp_number, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_read_nvm(struct i40e_hw *hw, u8 module_pointer, +- u32 offset, u16 length, void *data, +- bool last_command, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_erase_nvm(struct i40e_hw *hw, u8 module_pointer, +- u32 offset, u16 length, bool last_command, +int i40e_aq_add_macvlan_v2(struct i40e_hw *hw, u16 seid, + struct i40e_aqc_add_macvlan_element_data *mv_list, + u16 count, struct i40e_asq_cmd_details *cmd_details, @@ -4669,27 +4707,7 @@ Signed-off-by: Greg Kroah-Hartman +int i40e_aq_get_switch_config(struct i40e_hw *hw, + struct i40e_aqc_get_switch_config_resp *buf, + u16 buf_size, u16 *start_seid, -+ struct i40e_asq_cmd_details *cmd_details); - enum i40e_status_code i40e_aq_set_switch_config(struct i40e_hw *hw, - u16 flags, - u16 valid_flags, u8 mode, - struct i40e_asq_cmd_details *cmd_details); --i40e_status i40e_aq_request_resource(struct i40e_hw *hw, -- enum i40e_aq_resources_ids resource, -- enum i40e_aq_resource_access_type access, -- u8 sdp_number, u64 *timeout, -- struct i40e_asq_cmd_details *cmd_details); --i40e_status i40e_aq_release_resource(struct i40e_hw *hw, -- enum i40e_aq_resources_ids resource, -- u8 sdp_number, -- struct i40e_asq_cmd_details *cmd_details); --i40e_status i40e_aq_read_nvm(struct i40e_hw *hw, u8 module_pointer, -- u32 offset, u16 length, void *data, -- bool last_command, -- struct i40e_asq_cmd_details *cmd_details); --i40e_status i40e_aq_erase_nvm(struct i40e_hw *hw, u8 module_pointer, -- u32 offset, u16 length, bool last_command, -- struct i40e_asq_cmd_details *cmd_details); + struct i40e_asq_cmd_details *cmd_details); -i40e_status i40e_aq_discover_capabilities(struct i40e_hw *hw, - void *buff, u16 buff_size, u16 *data_size, - enum i40e_admin_queue_opc list_type_opc, @@ -4700,6 +4718,24 @@ Signed-off-by: Greg Kroah-Hartman - struct i40e_asq_cmd_details *cmd_details); -i40e_status i40e_aq_rearrange_nvm(struct i40e_hw *hw, - u8 rearrange_nvm, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_get_lldp_mib(struct i40e_hw *hw, u8 bridge_type, +- u8 mib_type, void *buff, u16 buff_size, +- u16 *local_len, u16 *remote_len, +- struct i40e_asq_cmd_details *cmd_details); +-enum i40e_status_code +-i40e_aq_set_lldp_mib(struct i40e_hw *hw, +- u8 mib_type, void *buff, u16 buff_size, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_cfg_lldp_mib_change_event(struct i40e_hw *hw, +- bool enable_update, +- struct i40e_asq_cmd_details *cmd_details); +-enum i40e_status_code +-i40e_aq_restore_lldp(struct i40e_hw *hw, u8 *setting, bool restore, ++int i40e_aq_set_switch_config(struct i40e_hw *hw, ++ u16 flags, ++ u16 valid_flags, u8 mode, ++ struct i40e_asq_cmd_details *cmd_details); +int i40e_aq_request_resource(struct i40e_hw *hw, + enum i40e_aq_resources_ids resource, + enum i40e_aq_resource_access_type access, @@ -4712,18 +4748,22 @@ Signed-off-by: Greg Kroah-Hartman +int i40e_aq_read_nvm(struct i40e_hw *hw, u8 module_pointer, + u32 offset, u16 length, void *data, + bool last_command, -+ struct i40e_asq_cmd_details *cmd_details); + struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_stop_lldp(struct i40e_hw *hw, bool shutdown_agent, +- bool persist, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_set_dcb_parameters(struct i40e_hw *hw, +- bool dcb_enable, +- struct i40e_asq_cmd_details +- *cmd_details); +-i40e_status i40e_aq_start_lldp(struct i40e_hw *hw, bool persist, +int i40e_aq_erase_nvm(struct i40e_hw *hw, u8 module_pointer, + u32 offset, u16 length, bool last_command, + struct i40e_asq_cmd_details *cmd_details); +int i40e_aq_discover_capabilities(struct i40e_hw *hw, + void *buff, u16 buff_size, u16 *data_size, + enum i40e_admin_queue_opc list_type_opc, - struct i40e_asq_cmd_details *cmd_details); --i40e_status i40e_aq_get_lldp_mib(struct i40e_hw *hw, u8 bridge_type, -- u8 mib_type, void *buff, u16 buff_size, -- u16 *local_len, u16 *remote_len, -- struct i40e_asq_cmd_details *cmd_details); ++ struct i40e_asq_cmd_details *cmd_details); +int i40e_aq_update_nvm(struct i40e_hw *hw, u8 module_pointer, + u32 offset, u16 length, void *data, + bool last_command, u8 preservation_flags, @@ -4735,26 +4775,14 @@ Signed-off-by: Greg Kroah-Hartman + u8 mib_type, void *buff, u16 buff_size, + u16 *local_len, u16 *remote_len, + struct i40e_asq_cmd_details *cmd_details); - enum i40e_status_code - i40e_aq_set_lldp_mib(struct i40e_hw *hw, - u8 mib_type, void *buff, u16 buff_size, - struct i40e_asq_cmd_details *cmd_details); --i40e_status i40e_aq_cfg_lldp_mib_change_event(struct i40e_hw *hw, -- bool enable_update, ++int i40e_aq_set_lldp_mib(struct i40e_hw *hw, ++ u8 mib_type, void *buff, u16 buff_size, ++ struct i40e_asq_cmd_details *cmd_details); +int i40e_aq_cfg_lldp_mib_change_event(struct i40e_hw *hw, + bool enable_update, - struct i40e_asq_cmd_details *cmd_details); - enum i40e_status_code - i40e_aq_restore_lldp(struct i40e_hw *hw, u8 *setting, bool restore, - struct i40e_asq_cmd_details *cmd_details); --i40e_status i40e_aq_stop_lldp(struct i40e_hw *hw, bool shutdown_agent, -- bool persist, -- struct i40e_asq_cmd_details *cmd_details); --i40e_status i40e_aq_set_dcb_parameters(struct i40e_hw *hw, -- bool dcb_enable, -- struct i40e_asq_cmd_details -- *cmd_details); --i40e_status i40e_aq_start_lldp(struct i40e_hw *hw, bool persist, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_restore_lldp(struct i40e_hw *hw, u8 *setting, bool restore, ++ struct i40e_asq_cmd_details *cmd_details); +int i40e_aq_stop_lldp(struct i40e_hw *hw, bool shutdown_agent, + bool persist, + struct i40e_asq_cmd_details *cmd_details); @@ -4802,8 +4830,7 @@ Signed-off-by: Greg Kroah-Hartman - struct i40e_asq_cmd_details *cmd_details); -i40e_status i40e_aq_config_vsi_tc_bw(struct i40e_hw *hw, u16 seid, - struct i40e_aqc_configure_vsi_tc_bw_data *bw_data, -+int i40e_aq_dcb_updated(struct i40e_hw *hw, - struct i40e_asq_cmd_details *cmd_details); +- struct i40e_asq_cmd_details *cmd_details); -i40e_status i40e_aq_config_switch_comp_ets(struct i40e_hw *hw, - u16 seid, - struct i40e_aqc_configure_switching_comp_ets_data *ets_data, @@ -4816,7 +4843,8 @@ Signed-off-by: Greg Kroah-Hartman -i40e_status i40e_aq_query_vsi_bw_config(struct i40e_hw *hw, - u16 seid, - struct i40e_aqc_query_vsi_bw_config_resp *bw_data, -- struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_dcb_updated(struct i40e_hw *hw, + struct i40e_asq_cmd_details *cmd_details); -i40e_status i40e_aq_query_vsi_ets_sla_config(struct i40e_hw *hw, - u16 seid, - struct i40e_aqc_query_vsi_ets_sla_config_resp *bw_data, @@ -4845,6 +4873,27 @@ Signed-off-by: Greg Kroah-Hartman + struct i40e_aqc_configure_switching_comp_ets_data *ets_data, + enum i40e_admin_queue_opc opcode, struct i40e_asq_cmd_details *cmd_details); +-enum i40e_status_code +-i40e_aq_add_cloud_filters_bb(struct i40e_hw *hw, u16 seid, +- struct i40e_aqc_cloud_filters_element_bb *filters, +- u8 filter_count); +-enum i40e_status_code +-i40e_aq_add_cloud_filters(struct i40e_hw *hw, u16 vsi, +- struct i40e_aqc_cloud_filters_element_data *filters, +- u8 filter_count); +-enum i40e_status_code +-i40e_aq_rem_cloud_filters(struct i40e_hw *hw, u16 vsi, +- struct i40e_aqc_cloud_filters_element_data *filters, +- u8 filter_count); +-enum i40e_status_code +-i40e_aq_rem_cloud_filters_bb(struct i40e_hw *hw, u16 seid, +- struct i40e_aqc_cloud_filters_element_bb *filters, +- u8 filter_count); +-i40e_status i40e_read_lldp_cfg(struct i40e_hw *hw, +- struct i40e_lldp_variables *lldp_cfg); +-enum i40e_status_code +-i40e_aq_suspend_port_tx(struct i40e_hw *hw, u16 seid, +- struct i40e_asq_cmd_details *cmd_details); +int i40e_aq_config_switch_comp_bw_config(struct i40e_hw *hw, + u16 seid, + struct i40e_aqc_configure_switching_comp_bw_config_data *bw_data, @@ -4871,19 +4920,21 @@ Signed-off-by: Greg Kroah-Hartman + struct i40e_asq_cmd_details *cmd_details); +int i40e_aq_resume_port_tx(struct i40e_hw *hw, + struct i40e_asq_cmd_details *cmd_details); - enum i40e_status_code - i40e_aq_add_cloud_filters_bb(struct i40e_hw *hw, u16 seid, - struct i40e_aqc_cloud_filters_element_bb *filters, -@@ -319,57 +317,51 @@ enum i40e_status_code - i40e_aq_rem_cloud_filters_bb(struct i40e_hw *hw, u16 seid, - struct i40e_aqc_cloud_filters_element_bb *filters, - u8 filter_count); --i40e_status i40e_read_lldp_cfg(struct i40e_hw *hw, -- struct i40e_lldp_variables *lldp_cfg); ++int i40e_aq_add_cloud_filters_bb(struct i40e_hw *hw, u16 seid, ++ struct i40e_aqc_cloud_filters_element_bb *filters, ++ u8 filter_count); ++int i40e_aq_add_cloud_filters(struct i40e_hw *hw, u16 vsi, ++ struct i40e_aqc_cloud_filters_element_data *filters, ++ u8 filter_count); ++int i40e_aq_rem_cloud_filters(struct i40e_hw *hw, u16 vsi, ++ struct i40e_aqc_cloud_filters_element_data *filters, ++ u8 filter_count); ++int i40e_aq_rem_cloud_filters_bb(struct i40e_hw *hw, u16 seid, ++ struct i40e_aqc_cloud_filters_element_bb *filters, ++ u8 filter_count); +int i40e_read_lldp_cfg(struct i40e_hw *hw, struct i40e_lldp_variables *lldp_cfg); - enum i40e_status_code - i40e_aq_suspend_port_tx(struct i40e_hw *hw, u16 seid, - struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_suspend_port_tx(struct i40e_hw *hw, u16 seid, ++ struct i40e_asq_cmd_details *cmd_details); /* i40e_common */ -i40e_status i40e_init_shared_code(struct i40e_hw *hw); -i40e_status i40e_pf_reset(struct i40e_hw *hw); @@ -4926,13 +4977,12 @@ Signed-off-by: Greg Kroah-Hartman void i40e_release_nvm(struct i40e_hw *hw); -i40e_status i40e_read_nvm_word(struct i40e_hw *hw, u16 offset, - u16 *data); -+int i40e_read_nvm_word(struct i40e_hw *hw, u16 offset, u16 *data); - enum i40e_status_code i40e_read_nvm_module_data(struct i40e_hw *hw, - u8 module_ptr, - u16 module_offset, - u16 data_offset, - u16 words_data_size, - u16 *data_ptr); +-enum i40e_status_code i40e_read_nvm_module_data(struct i40e_hw *hw, +- u8 module_ptr, +- u16 module_offset, +- u16 data_offset, +- u16 words_data_size, +- u16 *data_ptr); -i40e_status i40e_read_nvm_buffer(struct i40e_hw *hw, u16 offset, - u16 *words, u16 *data); -i40e_status i40e_update_nvm_checksum(struct i40e_hw *hw); @@ -4941,6 +4991,13 @@ Signed-off-by: Greg Kroah-Hartman -i40e_status i40e_nvmupd_command(struct i40e_hw *hw, - struct i40e_nvm_access *cmd, - u8 *bytes, int *); ++int i40e_read_nvm_word(struct i40e_hw *hw, u16 offset, u16 *data); ++int i40e_read_nvm_module_data(struct i40e_hw *hw, ++ u8 module_ptr, ++ u16 module_offset, ++ u16 data_offset, ++ u16 words_data_size, ++ u16 *data_ptr); +int i40e_read_nvm_buffer(struct i40e_hw *hw, u16 offset, u16 *words, u16 *data); +int i40e_update_nvm_checksum(struct i40e_hw *hw); +int i40e_validate_nvm_checksum(struct i40e_hw *hw, u16 *checksum); @@ -4957,7 +5014,7 @@ Signed-off-by: Greg Kroah-Hartman extern struct i40e_rx_ptype_decoded i40e_ptype_lookup[]; -@@ -418,41 +410,41 @@ i40e_virtchnl_link_speed(enum i40e_aq_li +@@ -418,41 +402,41 @@ i40e_virtchnl_link_speed(enum i40e_aq_li /* i40e_common for VF drivers*/ void i40e_vf_parse_hw_config(struct i40e_hw *hw, struct virtchnl_vf_resource *msg); @@ -5025,7 +5082,7 @@ Signed-off-by: Greg Kroah-Hartman i40e_aq_get_phy_register_ext(struct i40e_hw *hw, u8 phy_select, u8 dev_addr, bool page_change, bool set_mdio, u8 mdio_num, -@@ -465,43 +457,43 @@ i40e_aq_get_phy_register_ext(struct i40e +@@ -465,43 +449,43 @@ i40e_aq_get_phy_register_ext(struct i40e #define i40e_aq_get_phy_register(hw, ps, da, pc, ra, rv, cd) \ i40e_aq_get_phy_register_ext(hw, ps, da, pc, false, 0, ra, rv, cd) diff --git a/queue-6.1/series b/queue-6.1/series index 3f3905ced1d..6b3ed2f4274 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -616,3 +616,4 @@ sfc-gcc13-synchronize-ef100_enqueue_skb-s-return-type.patch i40e-remove-unused-i40e-status-codes.patch i40e-remove-string-printing-for-i40e_status.patch i40e-use-int-for-i40e_status.patch +drm-amd-display-gcc13-fix-enum-mismatch.patch