github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 16:12:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ice: remove unused buffer copy code in ice_sq_send_cmd_retry()

Browse Source 
The 'buf_cpy'-related code in ice_sq_send_cmd_retry() looks broken.
'buf' is nowhere copied into 'buf_cpy'.

The reason this does not cause problems is that all commands for which
'is_cmd_for_retry' is true go with a NULL buf.

Let's remove 'buf_cpy'. Add a WARN_ON in case the assumption no longer
holds in the future.

Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
Reviewed-by: Arkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Tested-by: Sunitha Mekala <sunithax.d.mekala@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
Michal Schmidt 2023-04-12 10:19:28 +02:00 committed by Tony Nguyen
parent f86d6f9c49
commit 43a630e37e
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/ethernet/intel/ice/ice_common.c
View File

@ -1619,7 +1619,6 @@ ice_sq_send_cmd_retry(struct ice_hw *hw, struct ice_ctl_q_info *cq,
{ {
struct ice_aq_desc desc_cpy; struct ice_aq_desc desc_cpy;
bool is_cmd_for_retry; bool is_cmd_for_retry;
u8 *buf_cpy = NULL;
u8 idx = 0; u8 idx = 0;
u16 opcode; u16 opcode;
int status; int status;
@ -1629,11 +1628,8 @@ ice_sq_send_cmd_retry(struct ice_hw *hw, struct ice_ctl_q_info *cq,
memset(&desc_cpy, 0, sizeof(desc_cpy)); memset(&desc_cpy, 0, sizeof(desc_cpy));
if (is_cmd_for_retry) { if (is_cmd_for_retry) {
if (buf) { /* All retryable cmds are direct, without buf. */
buf_cpy = kzalloc(buf_size, GFP_KERNEL); WARN_ON(buf);
if (!buf_cpy)
return -ENOMEM;
}
memcpy(&desc_cpy, desc, sizeof(desc_cpy)); memcpy(&desc_cpy, desc, sizeof(desc_cpy));
} }
@ -1645,17 +1641,12 @@ ice_sq_send_cmd_retry(struct ice_hw *hw, struct ice_ctl_q_info *cq,
hw->adminq.sq_last_status != ICE_AQ_RC_EBUSY) hw->adminq.sq_last_status != ICE_AQ_RC_EBUSY)
break; break;
if (buf_cpy)
memcpy(buf, buf_cpy, buf_size);
memcpy(desc, &desc_cpy, sizeof(desc_cpy)); memcpy(desc, &desc_cpy, sizeof(desc_cpy));
mdelay(ICE_SQ_SEND_DELAY_TIME_MS); mdelay(ICE_SQ_SEND_DELAY_TIME_MS);
} while (++idx < ICE_SQ_SEND_MAX_EXECUTE); } while (++idx < ICE_SQ_SEND_MAX_EXECUTE);
kfree(buf_cpy);
return status; return status;
} }