git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
event/octeontx2: add Rx adapter fastpath ops
[dpdk.git]
/
drivers
/
net
/
mvpp2
/
mrvl_ethdev.c
diff --git
a/drivers/net/mvpp2/mrvl_ethdev.c
b/drivers/net/mvpp2/mrvl_ethdev.c
index
0682c63
..
d1d0d41
100644
(file)
--- a/
drivers/net/mvpp2/mrvl_ethdev.c
+++ b/
drivers/net/mvpp2/mrvl_ethdev.c
@@
-4,6
+4,7
@@
* All rights reserved.
*/
* All rights reserved.
*/
+#include <rte_string_fns.h>
#include <rte_ethdev_driver.h>
#include <rte_kvargs.h>
#include <rte_log.h>
#include <rte_ethdev_driver.h>
#include <rte_kvargs.h>
#include <rte_log.h>
@@
-447,7
+448,7
@@
mrvl_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
mbuf_data_size, mtu, mru);
}
mbuf_data_size, mtu, mru);
}
- if (mtu < ETHER_MIN_MTU || mru > MRVL_PKT_SIZE_MAX) {
+ if (mtu <
RTE_
ETHER_MIN_MTU || mru > MRVL_PKT_SIZE_MAX) {
MRVL_LOG(ERR, "Invalid MTU [%u] or MRU [%u]", mtu, mru);
return -EINVAL;
}
MRVL_LOG(ERR, "Invalid MTU [%u] or MRU [%u]", mtu, mru);
return -EINVAL;
}
@@
-1067,7
+1068,7
@@
static void
mrvl_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
{
struct mrvl_priv *priv = dev->data->dev_private;
mrvl_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
{
struct mrvl_priv *priv = dev->data->dev_private;
- char buf[ETHER_ADDR_FMT_SIZE];
+ char buf[
RTE_
ETHER_ADDR_FMT_SIZE];
int ret;
if (!priv->ppio)
int ret;
if (!priv->ppio)
@@
-1079,7
+1080,7
@@
mrvl_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
ret = pp2_ppio_remove_mac_addr(priv->ppio,
dev->data->mac_addrs[index].addr_bytes);
if (ret) {
ret = pp2_ppio_remove_mac_addr(priv->ppio,
dev->data->mac_addrs[index].addr_bytes);
if (ret) {
- ether_format_addr(buf, sizeof(buf),
+
rte_
ether_format_addr(buf, sizeof(buf),
&dev->data->mac_addrs[index]);
MRVL_LOG(ERR, "Failed to remove mac %s", buf);
}
&dev->data->mac_addrs[index]);
MRVL_LOG(ERR, "Failed to remove mac %s", buf);
}
@@
-1101,11
+1102,11
@@
mrvl_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
* 0 on success, negative error value otherwise.
*/
static int
* 0 on success, negative error value otherwise.
*/
static int
-mrvl_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac_addr,
+mrvl_mac_addr_add(struct rte_eth_dev *dev, struct
rte_
ether_addr *mac_addr,
uint32_t index, uint32_t vmdq __rte_unused)
{
struct mrvl_priv *priv = dev->data->dev_private;
uint32_t index, uint32_t vmdq __rte_unused)
{
struct mrvl_priv *priv = dev->data->dev_private;
- char buf[ETHER_ADDR_FMT_SIZE];
+ char buf[
RTE_
ETHER_ADDR_FMT_SIZE];
int ret;
if (priv->isolated)
int ret;
if (priv->isolated)
@@
-1133,7
+1134,7
@@
mrvl_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac_addr,
*/
ret = pp2_ppio_add_mac_addr(priv->ppio, mac_addr->addr_bytes);
if (ret) {
*/
ret = pp2_ppio_add_mac_addr(priv->ppio, mac_addr->addr_bytes);
if (ret) {
- ether_format_addr(buf, sizeof(buf), mac_addr);
+
rte_
ether_format_addr(buf, sizeof(buf), mac_addr);
MRVL_LOG(ERR, "Failed to add mac %s", buf);
return -1;
}
MRVL_LOG(ERR, "Failed to add mac %s", buf);
return -1;
}
@@
-1153,7
+1154,7
@@
mrvl_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac_addr,
* 0 on success, negative error value otherwise.
*/
static int
* 0 on success, negative error value otherwise.
*/
static int
-mrvl_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
+mrvl_mac_addr_set(struct rte_eth_dev *dev, struct
rte_
ether_addr *mac_addr)
{
struct mrvl_priv *priv = dev->data->dev_private;
int ret;
{
struct mrvl_priv *priv = dev->data->dev_private;
int ret;
@@
-1166,8
+1167,8
@@
mrvl_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
ret = pp2_ppio_set_mac_addr(priv->ppio, mac_addr->addr_bytes);
if (ret) {
ret = pp2_ppio_set_mac_addr(priv->ppio, mac_addr->addr_bytes);
if (ret) {
- char buf[ETHER_ADDR_FMT_SIZE];
- ether_format_addr(buf, sizeof(buf), mac_addr);
+ char buf[
RTE_
ETHER_ADDR_FMT_SIZE];
+
rte_
ether_format_addr(buf, sizeof(buf), mac_addr);
MRVL_LOG(ERR, "Failed to set mac to %s", buf);
}
MRVL_LOG(ERR, "Failed to set mac to %s", buf);
}
@@
-1388,8
+1389,8
@@
mrvl_xstats_get_names(struct rte_eth_dev *dev __rte_unused,
return RTE_DIM(mrvl_xstats_tbl);
for (i = 0; i < size && i < RTE_DIM(mrvl_xstats_tbl); i++)
return RTE_DIM(mrvl_xstats_tbl);
for (i = 0; i < size && i < RTE_DIM(mrvl_xstats_tbl); i++)
- s
nprintf(xstats_names[i].name, RTE_ETH_XSTATS_NAME_SIZE, "%s"
,
-
mrvl_xstats_tbl[i].name
);
+ s
trlcpy(xstats_names[i].name, mrvl_xstats_tbl[i].name
,
+
RTE_ETH_XSTATS_NAME_SIZE
);
return size;
}
return size;
}
@@
-2780,29
+2781,29
@@
mrvl_eth_dev_create(struct rte_vdev_device *vdev, const char *name)
priv = mrvl_priv_create(name);
if (!priv) {
ret = -ENOMEM;
priv = mrvl_priv_create(name);
if (!priv) {
ret = -ENOMEM;
- goto out_free
_dev
;
+ goto out_free;
}
}
+ eth_dev->data->dev_private = priv;
eth_dev->data->mac_addrs =
rte_zmalloc("mac_addrs",
eth_dev->data->mac_addrs =
rte_zmalloc("mac_addrs",
- ETHER_ADDR_LEN * MRVL_MAC_ADDRS_MAX, 0);
+
RTE_
ETHER_ADDR_LEN * MRVL_MAC_ADDRS_MAX, 0);
if (!eth_dev->data->mac_addrs) {
MRVL_LOG(ERR, "Failed to allocate space for eth addrs");
ret = -ENOMEM;
if (!eth_dev->data->mac_addrs) {
MRVL_LOG(ERR, "Failed to allocate space for eth addrs");
ret = -ENOMEM;
- goto out_free
_priv
;
+ goto out_free;
}
memset(&req, 0, sizeof(req));
strcpy(req.ifr_name, name);
ret = ioctl(fd, SIOCGIFHWADDR, &req);
if (ret)
}
memset(&req, 0, sizeof(req));
strcpy(req.ifr_name, name);
ret = ioctl(fd, SIOCGIFHWADDR, &req);
if (ret)
- goto out_free
_mac
;
+ goto out_free;
memcpy(eth_dev->data->mac_addrs[0].addr_bytes,
memcpy(eth_dev->data->mac_addrs[0].addr_bytes,
- req.ifr_addr.sa_data, ETHER_ADDR_LEN);
+ req.ifr_addr.sa_data,
RTE_
ETHER_ADDR_LEN);
eth_dev->data->kdrv = RTE_KDRV_NONE;
eth_dev->data->kdrv = RTE_KDRV_NONE;
- eth_dev->data->dev_private = priv;
eth_dev->device = &vdev->device;
eth_dev->rx_pkt_burst = mrvl_rx_pkt_burst;
mrvl_set_tx_function(eth_dev);
eth_dev->device = &vdev->device;
eth_dev->rx_pkt_burst = mrvl_rx_pkt_burst;
mrvl_set_tx_function(eth_dev);
@@
-2810,12
+2811,8
@@
mrvl_eth_dev_create(struct rte_vdev_device *vdev, const char *name)
rte_eth_dev_probing_finish(eth_dev);
return 0;
rte_eth_dev_probing_finish(eth_dev);
return 0;
-out_free_mac:
- rte_free(eth_dev->data->mac_addrs);
-out_free_dev:
+out_free:
rte_eth_dev_release_port(eth_dev);
rte_eth_dev_release_port(eth_dev);
-out_free_priv:
- rte_free(priv);
return ret;
}
return ret;
}
@@
-2839,8
+2836,6
@@
mrvl_eth_dev_destroy(const char *name)
priv = eth_dev->data->dev_private;
pp2_bpool_deinit(priv->bpool);
used_bpools[priv->pp_id] &= ~(1 << priv->bpool_bit);
priv = eth_dev->data->dev_private;
pp2_bpool_deinit(priv->bpool);
used_bpools[priv->pp_id] &= ~(1 << priv->bpool_bit);
- rte_free(priv);
- rte_free(eth_dev->data->mac_addrs);
rte_eth_dev_release_port(eth_dev);
}
rte_eth_dev_release_port(eth_dev);
}