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
net/mlx5: add ConnectX6-DX device ID
[dpdk.git]
/
drivers
/
net
/
dpaa2
/
dpaa2_ethdev.c
diff --git
a/drivers/net/dpaa2/dpaa2_ethdev.c
b/drivers/net/dpaa2/dpaa2_ethdev.c
index
848bb42
..
03131b9
100644
(file)
--- a/
drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/
drivers/net/dpaa2/dpaa2_ethdev.c
@@
-128,8
+128,8
@@
dpaa2_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
}
if (on)
}
if (on)
- ret = dpni_add_vlan_id(dpni, CMD_PRI_LOW,
-
priv->token, vlan_id
);
+ ret = dpni_add_vlan_id(dpni, CMD_PRI_LOW,
priv->token,
+
vlan_id, 0, 0, 0
);
else
ret = dpni_remove_vlan_id(dpni, CMD_PRI_LOW,
priv->token, vlan_id);
else
ret = dpni_remove_vlan_id(dpni, CMD_PRI_LOW,
priv->token, vlan_id);
@@
-1326,8
+1326,8
@@
dpaa2_dev_add_mac_addr(struct rte_eth_dev *dev,
return -1;
}
return -1;
}
- ret = dpni_add_mac_addr(dpni, CMD_PRI_LOW,
-
priv->token, addr->addr_bytes
);
+ ret = dpni_add_mac_addr(dpni, CMD_PRI_LOW,
priv->token,
+
addr->addr_bytes, 0, 0, 0
);
if (ret)
DPAA2_PMD_ERR(
"error: Adding the MAC ADDR failed: err = %d", ret);
if (ret)
DPAA2_PMD_ERR(
"error: Adding the MAC ADDR failed: err = %d", ret);
@@
-2006,7
+2006,7
@@
dpaa2_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
int dpaa2_eth_eventq_attach(const struct rte_eth_dev *dev,
int eth_rx_queue_id,
int dpaa2_eth_eventq_attach(const struct rte_eth_dev *dev,
int eth_rx_queue_id,
-
uint16_t dpcon_id
,
+
struct dpaa2_dpcon_dev *dpcon
,
const struct rte_event_eth_rx_adapter_queue_conf *queue_conf)
{
struct dpaa2_dev_priv *eth_priv = dev->data->dev_private;
const struct rte_event_eth_rx_adapter_queue_conf *queue_conf)
{
struct dpaa2_dev_priv *eth_priv = dev->data->dev_private;
@@
-2014,7
+2014,7
@@
int dpaa2_eth_eventq_attach(const struct rte_eth_dev *dev,
struct dpaa2_queue *dpaa2_ethq = eth_priv->rx_vq[eth_rx_queue_id];
uint8_t flow_id = dpaa2_ethq->flow_id;
struct dpni_queue cfg;
struct dpaa2_queue *dpaa2_ethq = eth_priv->rx_vq[eth_rx_queue_id];
uint8_t flow_id = dpaa2_ethq->flow_id;
struct dpni_queue cfg;
- uint8_t options;
+ uint8_t options
, priority
;
int ret;
if (queue_conf->ev.sched_type == RTE_SCHED_TYPE_PARALLEL)
int ret;
if (queue_conf->ev.sched_type == RTE_SCHED_TYPE_PARALLEL)
@@
-2026,11
+2026,14
@@
int dpaa2_eth_eventq_attach(const struct rte_eth_dev *dev,
else
return -EINVAL;
else
return -EINVAL;
+ priority = (RTE_EVENT_DEV_PRIORITY_LOWEST / queue_conf->ev.priority) *
+ (dpcon->num_priorities - 1);
+
memset(&cfg, 0, sizeof(struct dpni_queue));
options = DPNI_QUEUE_OPT_DEST;
cfg.destination.type = DPNI_DEST_DPCON;
memset(&cfg, 0, sizeof(struct dpni_queue));
options = DPNI_QUEUE_OPT_DEST;
cfg.destination.type = DPNI_DEST_DPCON;
- cfg.destination.id = dpcon_id;
- cfg.destination.priority =
queue_conf->ev.
priority;
+ cfg.destination.id = dpcon
->dpcon
_id;
+ cfg.destination.priority = priority;
if (queue_conf->ev.sched_type == RTE_SCHED_TYPE_ATOMIC) {
options |= DPNI_QUEUE_OPT_HOLD_ACTIVE;
if (queue_conf->ev.sched_type == RTE_SCHED_TYPE_ATOMIC) {
options |= DPNI_QUEUE_OPT_HOLD_ACTIVE;