event/cnxk: add option to control timer adapters

Add devargs to control each event timer adapter i.e. TIM rings internal
parameters uniquely. The following dict format is expected
[ring-chnk_slots-disable_npa-stats_ena]. 0 represents default values.

Example:
	--dev "0002:1e:00.0,tim_ring_ctl=[2-1023-1-0]"

Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
Signed-off-by: Shijith Thotton <sthotton@marvell.com>
This commit is contained in:
Shijith Thotton 2021-05-04 05:57:25 +05:30 committed by Jerin Jacob
parent 9db9330a71
commit 8a3d58c189
3 changed files with 116 additions and 1 deletions

View File

@ -135,6 +135,17 @@ Runtime Config Options
-a 0002:0e:00.0,tim_rings_lmt=5
- ``TIM ring control internal parameters``
When using multiple TIM rings the ``tim_ring_ctl`` devargs can be used to
control each TIM rings internal parameters uniquely. The following dict
format is expected [ring-chnk_slots-disable_npa-stats_ena]. 0 represents
default values.
For Example::
-a 0002:0e:00.0,tim_ring_ctl=[2-1023-1-0]
Debugging Options
-----------------

View File

@ -121,7 +121,7 @@ cnxk_tim_ring_create(struct rte_event_timer_adapter *adptr)
struct rte_event_timer_adapter_conf *rcfg = &adptr->data->conf;
struct cnxk_tim_evdev *dev = cnxk_tim_priv_get();
struct cnxk_tim_ring *tim_ring;
int rc;
int i, rc;
if (dev == NULL)
return -ENODEV;
@ -165,6 +165,20 @@ cnxk_tim_ring_create(struct rte_event_timer_adapter *adptr)
tim_ring->disable_npa = dev->disable_npa;
tim_ring->enable_stats = dev->enable_stats;
for (i = 0; i < dev->ring_ctl_cnt; i++) {
struct cnxk_tim_ctl *ring_ctl = &dev->ring_ctl_data[i];
if (ring_ctl->ring == tim_ring->ring_id) {
tim_ring->chunk_sz =
ring_ctl->chunk_slots ?
((uint32_t)(ring_ctl->chunk_slots + 1) *
CNXK_TIM_CHUNK_ALIGNMENT) :
tim_ring->chunk_sz;
tim_ring->enable_stats = ring_ctl->enable_stats;
tim_ring->disable_npa = ring_ctl->disable_npa;
}
}
if (tim_ring->disable_npa) {
tim_ring->nb_chunks =
tim_ring->nb_timers /
@ -368,6 +382,84 @@ cnxk_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags,
return 0;
}
static void
cnxk_tim_parse_ring_param(char *value, void *opaque)
{
struct cnxk_tim_evdev *dev = opaque;
struct cnxk_tim_ctl ring_ctl = {0};
char *tok = strtok(value, "-");
struct cnxk_tim_ctl *old_ptr;
uint16_t *val;
val = (uint16_t *)&ring_ctl;
if (!strlen(value))
return;
while (tok != NULL) {
*val = atoi(tok);
tok = strtok(NULL, "-");
val++;
}
if (val != (&ring_ctl.enable_stats + 1)) {
plt_err("Invalid ring param expected [ring-chunk_sz-disable_npa-enable_stats]");
return;
}
dev->ring_ctl_cnt++;
old_ptr = dev->ring_ctl_data;
dev->ring_ctl_data =
rte_realloc(dev->ring_ctl_data,
sizeof(struct cnxk_tim_ctl) * dev->ring_ctl_cnt, 0);
if (dev->ring_ctl_data == NULL) {
dev->ring_ctl_data = old_ptr;
dev->ring_ctl_cnt--;
return;
}
dev->ring_ctl_data[dev->ring_ctl_cnt - 1] = ring_ctl;
}
static void
cnxk_tim_parse_ring_ctl_list(const char *value, void *opaque)
{
char *s = strdup(value);
char *start = NULL;
char *end = NULL;
char *f = s;
while (*s) {
if (*s == '[')
start = s;
else if (*s == ']')
end = s;
if (start && start < end) {
*end = 0;
cnxk_tim_parse_ring_param(start + 1, opaque);
start = end;
s = end;
}
s++;
}
free(f);
}
static int
cnxk_tim_parse_kvargs_dict(const char *key, const char *value, void *opaque)
{
RTE_SET_USED(key);
/* Dict format [ring-chunk_sz-disable_npa-enable_stats] use '-' as ','
* isn't allowed. 0 represents default.
*/
cnxk_tim_parse_ring_ctl_list(value, opaque);
return 0;
}
static void
cnxk_tim_parse_devargs(struct rte_devargs *devargs, struct cnxk_tim_evdev *dev)
{
@ -388,6 +480,8 @@ cnxk_tim_parse_devargs(struct rte_devargs *devargs, struct cnxk_tim_evdev *dev)
&dev->enable_stats);
rte_kvargs_process(kvlist, CNXK_TIM_RINGS_LMT, &parse_kvargs_value,
&dev->min_ring_cnt);
rte_kvargs_process(kvlist, CNXK_TIM_RING_CTL,
&cnxk_tim_parse_kvargs_dict, &dev);
rte_kvargs_free(kvlist);
}

View File

@ -38,6 +38,7 @@
#define CNXK_TIM_CHNK_SLOTS "tim_chnk_slots"
#define CNXK_TIM_STATS_ENA "tim_stats_ena"
#define CNXK_TIM_RINGS_LMT "tim_rings_lmt"
#define CNXK_TIM_RING_CTL "tim_ring_ctl"
#define CNXK_TIM_SP 0x1
#define CNXK_TIM_MP 0x2
@ -75,6 +76,13 @@
#define TIM_BUCKET_SEMA_WLOCK \
(TIM_BUCKET_CHUNK_REMAIN | (1ull << TIM_BUCKET_W1_S_LOCK))
struct cnxk_tim_ctl {
uint16_t ring;
uint16_t chunk_slots;
uint16_t disable_npa;
uint16_t enable_stats;
};
struct cnxk_tim_evdev {
struct roc_tim tim;
struct rte_eventdev *event_dev;
@ -85,6 +93,8 @@ struct cnxk_tim_evdev {
uint16_t chunk_slots;
uint16_t min_ring_cnt;
uint8_t enable_stats;
uint16_t ring_ctl_cnt;
struct cnxk_tim_ctl *ring_ctl_data;
};
enum cnxk_tim_clk_src {