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
version: 20.11-rc0
[dpdk.git]
/
drivers
/
event
/
octeontx2
/
otx2_worker_dual.c
diff --git
a/drivers/event/octeontx2/otx2_worker_dual.c
b/drivers/event/octeontx2/otx2_worker_dual.c
index
37c274a
..
946488e
100644
(file)
--- a/
drivers/event/octeontx2/otx2_worker_dual.c
+++ b/
drivers/event/octeontx2/otx2_worker_dual.c
@@
-79,7
+79,7
@@
otx2_ssogws_dual_forward_event(struct otx2_ssogws_dual *ws,
}
}
}
}
-uint16_t __hot
+uint16_t __
rte_
hot
otx2_ssogws_dual_enq(void *port, const struct rte_event *ev)
{
struct otx2_ssogws_dual *ws = port;
otx2_ssogws_dual_enq(void *port, const struct rte_event *ev)
{
struct otx2_ssogws_dual *ws = port;
@@
-102,7
+102,7
@@
otx2_ssogws_dual_enq(void *port, const struct rte_event *ev)
return 1;
}
return 1;
}
-uint16_t __hot
+uint16_t __
rte_
hot
otx2_ssogws_dual_enq_burst(void *port, const struct rte_event ev[],
uint16_t nb_events)
{
otx2_ssogws_dual_enq_burst(void *port, const struct rte_event ev[],
uint16_t nb_events)
{
@@
-110,7
+110,7
@@
otx2_ssogws_dual_enq_burst(void *port, const struct rte_event ev[],
return otx2_ssogws_dual_enq(port, ev);
}
return otx2_ssogws_dual_enq(port, ev);
}
-uint16_t __hot
+uint16_t __
rte_
hot
otx2_ssogws_dual_enq_new_burst(void *port, const struct rte_event ev[],
uint16_t nb_events)
{
otx2_ssogws_dual_enq_new_burst(void *port, const struct rte_event ev[],
uint16_t nb_events)
{
@@
-127,7
+127,7
@@
otx2_ssogws_dual_enq_new_burst(void *port, const struct rte_event ev[],
return nb_events;
}
return nb_events;
}
-uint16_t __hot
+uint16_t __
rte_
hot
otx2_ssogws_dual_enq_fwd_burst(void *port, const struct rte_event ev[],
uint16_t nb_events)
{
otx2_ssogws_dual_enq_fwd_burst(void *port, const struct rte_event ev[],
uint16_t nb_events)
{
@@
-140,14
+140,15
@@
otx2_ssogws_dual_enq_fwd_burst(void *port, const struct rte_event ev[],
return 1;
}
return 1;
}
-#define R(name, f
5, f4, f3, f2, f1, f0, flags)
\
-uint16_t __
hot
\
+#define R(name, f
6, f5, f4, f3, f2, f1, f0, flags)
\
+uint16_t __
rte_hot
\
otx2_ssogws_dual_deq_ ##name(void *port, struct rte_event *ev, \
uint64_t timeout_ticks) \
{ \
struct otx2_ssogws_dual *ws = port; \
uint8_t gw; \
\
otx2_ssogws_dual_deq_ ##name(void *port, struct rte_event *ev, \
uint64_t timeout_ticks) \
{ \
struct otx2_ssogws_dual *ws = port; \
uint8_t gw; \
\
+ rte_prefetch_non_temporal(ws); \
RTE_SET_USED(timeout_ticks); \
if (ws->swtag_req) { \
otx2_ssogws_swtag_wait((struct otx2_ssogws *) \
RTE_SET_USED(timeout_ticks); \
if (ws->swtag_req) { \
otx2_ssogws_swtag_wait((struct otx2_ssogws *) \
@@
-165,7
+166,7
@@
otx2_ssogws_dual_deq_ ##name(void *port, struct rte_event *ev, \
return gw; \
} \
\
return gw; \
} \
\
-uint16_t __
hot
\
+uint16_t __
rte_hot
\
otx2_ssogws_dual_deq_burst_ ##name(void *port, struct rte_event ev[], \
uint16_t nb_events, \
uint64_t timeout_ticks) \
otx2_ssogws_dual_deq_burst_ ##name(void *port, struct rte_event ev[], \
uint16_t nb_events, \
uint64_t timeout_ticks) \
@@
-175,7
+176,7
@@
otx2_ssogws_dual_deq_burst_ ##name(void *port, struct rte_event ev[], \
return otx2_ssogws_dual_deq_ ##name(port, ev, timeout_ticks); \
} \
\
return otx2_ssogws_dual_deq_ ##name(port, ev, timeout_ticks); \
} \
\
-uint16_t __
hot
\
+uint16_t __
rte_hot
\
otx2_ssogws_dual_deq_timeout_ ##name(void *port, struct rte_event *ev, \
uint64_t timeout_ticks) \
{ \
otx2_ssogws_dual_deq_timeout_ ##name(void *port, struct rte_event *ev, \
uint64_t timeout_ticks) \
{ \
@@
-207,7
+208,7
@@
otx2_ssogws_dual_deq_timeout_ ##name(void *port, struct rte_event *ev, \
return gw; \
} \
\
return gw; \
} \
\
-uint16_t __
hot
\
+uint16_t __
rte_hot
\
otx2_ssogws_dual_deq_timeout_burst_ ##name(void *port, \
struct rte_event ev[], \
uint16_t nb_events, \
otx2_ssogws_dual_deq_timeout_burst_ ##name(void *port, \
struct rte_event ev[], \
uint16_t nb_events, \
@@
-219,7
+220,7
@@
otx2_ssogws_dual_deq_timeout_burst_ ##name(void *port, \
timeout_ticks); \
} \
\
timeout_ticks); \
} \
\
-uint16_t __
hot
\
+uint16_t __
rte_hot
\
otx2_ssogws_dual_deq_seg_ ##name(void *port, struct rte_event *ev, \
uint64_t timeout_ticks) \
{ \
otx2_ssogws_dual_deq_seg_ ##name(void *port, struct rte_event *ev, \
uint64_t timeout_ticks) \
{ \
@@
-244,7
+245,7
@@
otx2_ssogws_dual_deq_seg_ ##name(void *port, struct rte_event *ev, \
return gw; \
} \
\
return gw; \
} \
\
-uint16_t __
hot
\
+uint16_t __
rte_hot
\
otx2_ssogws_dual_deq_seg_burst_ ##name(void *port, \
struct rte_event ev[], \
uint16_t nb_events, \
otx2_ssogws_dual_deq_seg_burst_ ##name(void *port, \
struct rte_event ev[], \
uint16_t nb_events, \
@@
-256,7
+257,7
@@
otx2_ssogws_dual_deq_seg_burst_ ##name(void *port, \
timeout_ticks); \
} \
\
timeout_ticks); \
} \
\
-uint16_t __
hot
\
+uint16_t __
rte_hot
\
otx2_ssogws_dual_deq_seg_timeout_ ##name(void *port, \
struct rte_event *ev, \
uint64_t timeout_ticks) \
otx2_ssogws_dual_deq_seg_timeout_ ##name(void *port, \
struct rte_event *ev, \
uint64_t timeout_ticks) \
@@
-291,7
+292,7
@@
otx2_ssogws_dual_deq_seg_timeout_ ##name(void *port, \
return gw; \
} \
\
return gw; \
} \
\
-uint16_t __
hot
\
+uint16_t __
rte_hot
\
otx2_ssogws_dual_deq_seg_timeout_burst_ ##name(void *port, \
struct rte_event ev[], \
uint16_t nb_events, \
otx2_ssogws_dual_deq_seg_timeout_burst_ ##name(void *port, \
struct rte_event ev[], \
uint16_t nb_events, \
@@
-306,8
+307,8
@@
otx2_ssogws_dual_deq_seg_timeout_burst_ ##name(void *port, \
SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
#undef R
SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
#undef R
-#define T(name, f
4, f3, f2, f1, f0, sz, flags)
\
-uint16_t __
hot
\
+#define T(name, f
6, f5, f4, f3, f2, f1, f0, sz, flags)
\
+uint16_t __
rte_hot
\
otx2_ssogws_dual_tx_adptr_enq_ ## name(void *port, \
struct rte_event ev[], \
uint16_t nb_events) \
otx2_ssogws_dual_tx_adptr_enq_ ## name(void *port, \
struct rte_event ev[], \
uint16_t nb_events) \
@@
-318,13
+319,16
@@
otx2_ssogws_dual_tx_adptr_enq_ ## name(void *port, \
uint64_t cmd[sz]; \
\
RTE_SET_USED(nb_events); \
uint64_t cmd[sz]; \
\
RTE_SET_USED(nb_events); \
- return otx2_ssogws_event_tx(vws, ev, cmd, flags); \
+ return otx2_ssogws_event_tx(vws, ev, cmd, (const uint64_t \
+ (*)[RTE_MAX_QUEUES_PER_PORT]) \
+ ws->tx_adptr_data, \
+ flags); \
}
SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
#undef T
}
SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
#undef T
-#define T(name, f
4, f3, f2, f1, f0, sz, flags)
\
-uint16_t __
hot
\
+#define T(name, f
6, f5, f4, f3, f2, f1, f0, sz, flags)
\
+uint16_t __
rte_hot
\
otx2_ssogws_dual_tx_adptr_enq_seg_ ## name(void *port, \
struct rte_event ev[], \
uint16_t nb_events) \
otx2_ssogws_dual_tx_adptr_enq_seg_ ## name(void *port, \
struct rte_event ev[], \
uint16_t nb_events) \
@@
-335,8
+339,10
@@
otx2_ssogws_dual_tx_adptr_enq_seg_ ## name(void *port, \
uint64_t cmd[(sz) + NIX_TX_MSEG_SG_DWORDS - 2]; \
\
RTE_SET_USED(nb_events); \
uint64_t cmd[(sz) + NIX_TX_MSEG_SG_DWORDS - 2]; \
\
RTE_SET_USED(nb_events); \
- return otx2_ssogws_event_tx(vws, ev, cmd, (flags) | \
- NIX_TX_MULTI_SEG_F); \
+ return otx2_ssogws_event_tx(vws, ev, cmd, (const uint64_t \
+ (*)[RTE_MAX_QUEUES_PER_PORT]) \
+ ws->tx_adptr_data, \
+ (flags) | NIX_TX_MULTI_SEG_F); \
}
SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
#undef T
}
SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
#undef T