Commit d42e5248 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Paolo Abeni
Browse files

eth: fbnic: rename fbnic_fw_clear_cmpl to fbnic_mbx_clear_cmpl 



fbnic_fw_clear_cmpl() does the inverse of fbnic_mbx_set_cmpl().
It removes the completion from the mailbox table.
It also calls fbnic_mbx_set_cmpl_slot() internally.
It should have fbnic_mbx prefix, not fbnic_fw.
I'm not very clear on what the distinction is between the two
prefixes but the matching "set" and "clear" functions should
use the same prefix.

While at it move the "clear" function closer to the "set".

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250624142834.3275164-6-kuba@kernel.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 536bc9b2

drivers/net/ethernet/meta/fbnic/fbnic_devlink.c

+2 −2
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ fbnic_flash_start(struct fbnic_dev *fbd, struct pldmfw_component *component) 
	else

		err = -ETIMEDOUT;



	fbnic_fw_clear_cmpl(fbd, cmpl);

	fbnic_mbx_clear_cmpl(fbd, cmpl);

cmpl_free:

	fbnic_fw_put_cmpl(cmpl);
@@ -300,7 +300,7 @@ fbnic_flash_component(struct pldmfw *context, 
						   component_name, 0, 0);

	}



	fbnic_fw_clear_cmpl(fbd, cmpl);

	fbnic_mbx_clear_cmpl(fbd, cmpl);

cmpl_free:

	fbnic_fw_put_cmpl(cmpl);

drivers/net/ethernet/meta/fbnic/fbnic_fw.c

+10 −10
Original line number Diff line number Diff line
@@ -338,6 +338,16 @@ static int fbnic_mbx_map_req_w_cmpl(struct fbnic_dev *fbd, 
	return err;

}



void fbnic_mbx_clear_cmpl(struct fbnic_dev *fbd,

			  struct fbnic_fw_completion *fw_cmpl)

{

	unsigned long flags;



	spin_lock_irqsave(&fbd->fw_tx_lock, flags);

	fbnic_mbx_clear_cmpl_slot(fbd, fw_cmpl);

	spin_unlock_irqrestore(&fbd->fw_tx_lock, flags);

}



static void fbnic_fw_release_cmpl_data(struct kref *kref)

{

	struct fbnic_fw_completion *cmpl_data;
@@ -1263,16 +1273,6 @@ struct fbnic_fw_completion *fbnic_fw_alloc_cmpl(u32 msg_type) 
	return cmpl;

}



void fbnic_fw_clear_cmpl(struct fbnic_dev *fbd,

			 struct fbnic_fw_completion *fw_cmpl)

{

	unsigned long flags;



	spin_lock_irqsave(&fbd->fw_tx_lock, flags);

	fbnic_mbx_clear_cmpl_slot(fbd, fw_cmpl);

	spin_unlock_irqrestore(&fbd->fw_tx_lock, flags);

}



void fbnic_fw_put_cmpl(struct fbnic_fw_completion *fw_cmpl)

{

	kref_put(&fw_cmpl->ref_count, fbnic_fw_release_cmpl_data);

drivers/net/ethernet/meta/fbnic/fbnic_fw.h

+2 −2
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ void fbnic_mbx_init(struct fbnic_dev *fbd); 
void fbnic_mbx_clean(struct fbnic_dev *fbd);

int fbnic_mbx_set_cmpl(struct fbnic_dev *fbd,

		       struct fbnic_fw_completion *cmpl_data);

void fbnic_mbx_clear_cmpl(struct fbnic_dev *fbd,

			  struct fbnic_fw_completion *cmpl_data);

void fbnic_mbx_poll(struct fbnic_dev *fbd);

int fbnic_mbx_poll_tx_ready(struct fbnic_dev *fbd);

void fbnic_mbx_flush_tx(struct fbnic_dev *fbd);
@@ -81,8 +83,6 @@ int fbnic_fw_xmit_fw_write_chunk(struct fbnic_dev *fbd, 
int fbnic_fw_xmit_tsene_read_msg(struct fbnic_dev *fbd,

				 struct fbnic_fw_completion *cmpl_data);

struct fbnic_fw_completion *fbnic_fw_alloc_cmpl(u32 msg_type);

void fbnic_fw_clear_cmpl(struct fbnic_dev *fbd,

			 struct fbnic_fw_completion *cmpl_data);

void fbnic_fw_put_cmpl(struct fbnic_fw_completion *cmpl_data);



#define fbnic_mk_full_fw_ver_str(_rev_id, _delim, _commit, _str, _str_sz) \

drivers/net/ethernet/meta/fbnic/fbnic_mac.c

+1 −1
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ static int fbnic_mac_get_sensor_asic(struct fbnic_dev *fbd, int id, 


	*val = *sensor;

exit_cleanup:

	fbnic_fw_clear_cmpl(fbd, fw_cmpl);

	fbnic_mbx_clear_cmpl(fbd, fw_cmpl);

exit_free:

	fbnic_fw_put_cmpl(fw_cmpl);