[PATCH v2 30/68] net/cnxk: replace use of rte_memcpy
Stephen Hemminger <[email protected]>
| Newsgroups | org.dpdk.dev |
|---|---|
| Message-ID | <[email protected]> |
Don't need rte_memcpy for fixed size value. Signed-off-by: Stephen Hemminger <[email protected]> --- drivers/net/cnxk/cnxk_eswitch_devargs.c | 3 ++- drivers/net/cnxk/cnxk_ethdev_ops.c | 2 +- drivers/net/cnxk/cnxk_rep.c | 3 ++- drivers/net/cnxk/cnxk_rep_flow.c | 6 ++++-- drivers/net/cnxk/cnxk_rep_msg.c | 8 ++++---- drivers/net/cnxk/cnxk_rep_ops.c | 2 +- drivers/net/cnxk/cnxk_tm.c | 5 ++--- 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/drivers/net/cnxk/cnxk_eswitch_devargs.c b/drivers/net/cnxk/cnxk_eswitch_devargs.c index 655813c71a..556503ade1 100644 --- a/drivers/net/cnxk/cnxk_eswitch_devargs.c +++ b/drivers/net/cnxk/cnxk_eswitch_devargs.c @@ -112,7 +112,8 @@ cnxk_eswitch_repr_devargs(struct rte_pci_device *pci_dev, struct cnxk_eswitch_de goto fail; } - rte_memcpy(&eswitch_dev->esw_da[j].da, ð_da[i], sizeof(struct rte_eth_devargs)); + memcpy(&eswitch_dev->esw_da[j].da, ð_da[i], + sizeof(struct rte_eth_devargs)); /* No of representor ports to be created */ eswitch_dev->repr_cnt.nb_repr_created += eswitch_dev->esw_da[j].nb_repr_ports; j++; diff --git a/drivers/net/cnxk/cnxk_ethdev_ops.c b/drivers/net/cnxk/cnxk_ethdev_ops.c index b1ccc6598c..69c4375db1 100644 --- a/drivers/net/cnxk/cnxk_ethdev_ops.c +++ b/drivers/net/cnxk/cnxk_ethdev_ops.c @@ -463,7 +463,7 @@ cnxk_nix_mac_addr_set(struct rte_eth_dev *eth_dev, struct rte_ether_addr *addr) } /* Update mac address to cnxk ethernet device */ - rte_memcpy(dev->mac_addr, addr->addr_bytes, RTE_ETHER_ADDR_LEN); + memcpy(dev->mac_addr, addr->addr_bytes, RTE_ETHER_ADDR_LEN); exit: return rc; diff --git a/drivers/net/cnxk/cnxk_rep.c b/drivers/net/cnxk/cnxk_rep.c index e536898d3a..1e72d5dbaa 100644 --- a/drivers/net/cnxk/cnxk_rep.c +++ b/drivers/net/cnxk/cnxk_rep.c @@ -409,7 +409,8 @@ cnxk_representee_notification(void *roc_nix, struct roc_eswitch_repte_notify_msg goto done; } - rte_memcpy(msg->notify_msg, notify_msg, sizeof(struct roc_eswitch_repte_notify_msg)); + memcpy(msg->notify_msg, notify_msg, + sizeof(struct roc_eswitch_repte_notify_msg)); plt_rep_dbg("Pushing new notification : msg type %d", msg->notify_msg->type); pthread_mutex_lock(&eswitch_dev->repte_msg_proc.mutex); TAILQ_INSERT_TAIL(&repte_msg_proc->msg_list, msg, next); diff --git a/drivers/net/cnxk/cnxk_rep_flow.c b/drivers/net/cnxk/cnxk_rep_flow.c index 68ee334e01..23d9376c24 100644 --- a/drivers/net/cnxk/cnxk_rep_flow.c +++ b/drivers/net/cnxk/cnxk_rep_flow.c @@ -82,7 +82,8 @@ prepare_pattern_data(const struct rte_flow_item *pattern, uint16_t nb_pattern, hdr.mask_sz = term[pattern->type].item_size; } - rte_memcpy(RTE_PTR_ADD(pattern_data, len), &hdr, sizeof(cnxk_pattern_hdr_t)); + memcpy(RTE_PTR_ADD(pattern_data, len), &hdr, + sizeof(cnxk_pattern_hdr_t)); len += sizeof(cnxk_pattern_hdr_t); /* Copy pattern spec data */ @@ -232,7 +233,8 @@ prepare_action_data(const struct rte_flow_action *action, uint16_t nb_action, ui hdr.type = action->type; hdr.conf_sz = sz; - rte_memcpy(RTE_PTR_ADD(action_data, len), &hdr, sizeof(cnxk_action_hdr_t)); + memcpy(RTE_PTR_ADD(action_data, len), &hdr, + sizeof(cnxk_action_hdr_t)); len += sizeof(cnxk_action_hdr_t); /* Copy action conf data */ diff --git a/drivers/net/cnxk/cnxk_rep_msg.c b/drivers/net/cnxk/cnxk_rep_msg.c index 48179dab36..837471c0dc 100644 --- a/drivers/net/cnxk/cnxk_rep_msg.c +++ b/drivers/net/cnxk/cnxk_rep_msg.c @@ -59,7 +59,7 @@ receive_control_message(int socketfd, void *data, uint32_t len) if (cmsg->cmsg_type == SCM_CREDENTIALS) { cr = (struct ucred *)CMSG_DATA(cmsg); } else if (cmsg->cmsg_type == SCM_RIGHTS) { - rte_memcpy(&afd, CMSG_DATA(cmsg), sizeof(int)); + memcpy(&afd, CMSG_DATA(cmsg), sizeof(int)); plt_rep_dbg("afd %d", afd); } } @@ -91,7 +91,7 @@ send_message_on_socket(int socketfd, void *data, uint32_t len, int afd) cmsg->cmsg_len = CMSG_LEN(sizeof(int)); cmsg->cmsg_level = SOL_SOCKET; cmsg->cmsg_type = SCM_RIGHTS; - rte_memcpy(CMSG_DATA(cmsg), &afd, sizeof(int)); + memcpy(CMSG_DATA(cmsg), &afd, sizeof(int)); } size = sendmsg(socketfd, &mh, MSG_DONTWAIT); @@ -199,7 +199,7 @@ cnxk_rep_msg_populate_type(void *buffer, uint32_t *length, cnxk_type_t type, uin data.length = sz; /* Populate the type data */ - rte_memcpy(RTE_PTR_ADD(buffer, len), &data, sizeof(cnxk_type_data_t)); + memcpy(RTE_PTR_ADD(buffer, len), &data, sizeof(cnxk_type_data_t)); len += sizeof(cnxk_type_data_t); *length = len; @@ -219,7 +219,7 @@ cnxk_rep_msg_populate_header(void *buffer, uint32_t *length) hdr.signature = CTRL_MSG_SIGNATURE; /* Populate header data */ - rte_memcpy(RTE_PTR_ADD(buffer, len), &hdr, sizeof(cnxk_header_t)); + memcpy(RTE_PTR_ADD(buffer, len), &hdr, sizeof(cnxk_header_t)); len += sizeof(cnxk_header_t); *length = len; diff --git a/drivers/net/cnxk/cnxk_rep_ops.c b/drivers/net/cnxk/cnxk_rep_ops.c index 6dab022732..2409e8790f 100644 --- a/drivers/net/cnxk/cnxk_rep_ops.c +++ b/drivers/net/cnxk/cnxk_rep_ops.c @@ -693,7 +693,7 @@ cnxk_rep_mac_addr_set(struct rte_eth_dev *eth_dev, struct rte_ether_addr *addr) cnxk_rep_msg_populate_header(buffer, &len); msg_sm_meta.portid = rep_dev->rep_id; - rte_memcpy(&msg_sm_meta.addr_bytes, addr->addr_bytes, RTE_ETHER_ADDR_LEN); + memcpy(&msg_sm_meta.addr_bytes, addr->addr_bytes, RTE_ETHER_ADDR_LEN); cnxk_rep_msg_populate_command_meta(buffer, &len, &msg_sm_meta, sizeof(cnxk_rep_msg_eth_set_mac_meta_t), CNXK_REP_MSG_ETH_SET_MAC); diff --git a/drivers/net/cnxk/cnxk_tm.c b/drivers/net/cnxk/cnxk_tm.c index 0ed6732dda..48354d902b 100644 --- a/drivers/net/cnxk/cnxk_tm.c +++ b/drivers/net/cnxk/cnxk_tm.c @@ -300,8 +300,7 @@ cnxk_nix_tm_shaper_profile_add(struct rte_eth_dev *eth_dev, uint32_t id, profile->profile.pkt_len_adj = params->pkt_length_adjust; profile->profile.pkt_mode = params->packet_mode; profile->profile.free_fn = rte_free; - rte_memcpy(&profile->params, params, - sizeof(struct rte_tm_shaper_params)); + memcpy(&profile->params, params, sizeof(struct rte_tm_shaper_params)); rc = roc_nix_tm_shaper_profile_add(nix, &profile->profile); @@ -373,7 +372,7 @@ cnxk_nix_tm_node_add(struct rte_eth_dev *eth_dev, uint32_t node_id, if (!node) return -ENOMEM; - rte_memcpy(&node->params, params, sizeof(struct rte_tm_node_params)); + memcpy(&node->params, params, sizeof(struct rte_tm_node_params)); node->nix_node.id = node_id; node->nix_node.parent_id = parent_node_id; -- 2.53.0