ena_com_close_llq_entry() and ena_com_sq_update_llq_tail() duplicate the same sequence for flushing the current LLQ entry to the device and moving on to the next one: write the bounce buffer, fetch the next bounce buffer and reset it.
Extract the common sequence into a new helper, ena_com_write_and_advance_llq_entry(), and call it from both sites. No functional change. Signed-off-by: Shai Brandes <[email protected]> --- drivers/net/ena/base/ena_eth_com.c | 49 ++++++++++++++++-------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/drivers/net/ena/base/ena_eth_com.c b/drivers/net/ena/base/ena_eth_com.c index e3b2a753c4..ca15306859 100644 --- a/drivers/net/ena/base/ena_eth_com.c +++ b/drivers/net/ena/base/ena_eth_com.c @@ -204,6 +204,29 @@ static void *get_sq_desc_llq(struct ena_com_io_sq *io_sq) return sq_desc; } +static int ena_com_write_and_advance_llq_entry(struct ena_com_io_sq *io_sq) +{ + struct ena_com_llq_pkt_ctrl *pkt_ctrl = &io_sq->llq_buf_ctrl; + struct ena_com_llq_info *llq_info = &io_sq->llq_info; + int rc; + + rc = ena_com_write_bounce_buffer_to_dev(io_sq, + pkt_ctrl->curr_llq_entry); + if (unlikely(rc)) { + ena_trc_err(ena_com_io_sq_to_ena_dev(io_sq), + "Failed to write bounce buffer to device\n"); + return rc; + } + + pkt_ctrl->curr_llq_entry = + ena_com_get_next_bounce_buffer(&io_sq->bounce_buf_ctrl); + + memset(io_sq->llq_buf_ctrl.curr_llq_entry, + 0x0, llq_info->desc_list_entry_size); + + return ENA_COM_OK; +} + static int ena_com_close_llq_entry(struct ena_com_io_sq *io_sq) { struct ena_com_llq_pkt_ctrl *pkt_ctrl = &io_sq->llq_buf_ctrl; @@ -215,18 +238,9 @@ static int ena_com_close_llq_entry(struct ena_com_io_sq *io_sq) /* bounce buffer was used, so write it and get a new one */ if (likely(pkt_ctrl->idx)) { - rc = ena_com_write_bounce_buffer_to_dev(io_sq, - pkt_ctrl->curr_llq_entry); - if (unlikely(rc)) { - ena_trc_err(ena_com_io_sq_to_ena_dev(io_sq), - "Failed to write bounce buffer to device\n"); + rc = ena_com_write_and_advance_llq_entry(io_sq); + if (unlikely(rc)) return rc; - } - - pkt_ctrl->curr_llq_entry = - ena_com_get_next_bounce_buffer(&io_sq->bounce_buf_ctrl); - memset(io_sq->llq_buf_ctrl.curr_llq_entry, - 0x0, llq_info->desc_list_entry_size); } pkt_ctrl->idx = 0; @@ -258,18 +272,9 @@ static int ena_com_sq_update_llq_tail(struct ena_com_io_sq *io_sq) int rc; if (!pkt_ctrl->descs_left_in_line) { - rc = ena_com_write_bounce_buffer_to_dev(io_sq, - pkt_ctrl->curr_llq_entry); - if (unlikely(rc)) { - ena_trc_err(ena_com_io_sq_to_ena_dev(io_sq), - "Failed to write bounce buffer to device\n"); + rc = ena_com_write_and_advance_llq_entry(io_sq); + if (unlikely(rc)) return rc; - } - - pkt_ctrl->curr_llq_entry = - ena_com_get_next_bounce_buffer(&io_sq->bounce_buf_ctrl); - memset(io_sq->llq_buf_ctrl.curr_llq_entry, - 0x0, llq_info->desc_list_entry_size); pkt_ctrl->idx = 0; pkt_ctrl->descs_left_in_line = llq_info->descs_per_entry; -- 2.17.1
