diff options
| author |   Damjan Marion <damarion@cisco.com> | 2018-11-06 19:34:07 +0000 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2018-11-06 23:24:08 +0000 |
| commit | 8d3397425b3fe0f58b621854eb95d225fcbb415f (patch) | |
| tree | 3744396b7baaa4a0e23596344c79d2624c7a0f8b /src/plugins/marvell/pp2 | |
| parent | dd04bb9538292140a4068a34aa7dccbcf5026355 (diff) | |
marvell: bump musdk version to 18.09.3
Change-Id: Ifb841312d4a382547153b24903230b407f649e73
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/plugins/marvell/pp2')
| -rw-r--r-- | src/plugins/marvell/pp2/format.c | 2 | ||||
| -rw-r--r-- | src/plugins/marvell/pp2/output.c | 2 | ||||
| -rw-r--r-- | src/plugins/marvell/pp2/pp2.c | 14 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/plugins/marvell/pp2/format.c b/src/plugins/marvell/pp2/format.c index 96b95edccb8..838f5169b05 100644 --- a/src/plugins/marvell/pp2/format.c +++ b/src/plugins/marvell/pp2/format.c @@ -43,7 +43,7 @@ format_mrvl_pp2_interface_name (u8 * s, va_list * args) mrvl_pp2_main_t *ppm = &mrvl_pp2_main; u32 dev_instance = va_arg (*args, u32); mrvl_pp2_if_t *ppif = pool_elt_at_index (ppm->interfaces, dev_instance); - return format (s, "mv-ppio%d/%d", ppif->ppio->pp2_id, ppif->ppio->port_id); + return format (s, "mv-ppio-%d/%d", ppif->ppio->pp2_id, ppif->ppio->port_id); } #define foreach_ppio_statistics_entry \ diff --git a/src/plugins/marvell/pp2/output.c b/src/plugins/marvell/pp2/output.c index 108bbef72f2..468440c23a6 100644 --- a/src/plugins/marvell/pp2/output.c +++ b/src/plugins/marvell/pp2/output.c @@ -67,7 +67,7 @@ mrvl_pp2_interface_tx (vlib_main_t * vm, { u32 bi0 = buffers[0]; vlib_buffer_t *b0 = vlib_get_buffer (vm, bi0); - u64 paddr = vlib_buffer_get_va (vm, b0); + u64 paddr = vlib_buffer_get_pa (vm, b0); pp2_ppio_outq_desc_reset (d); pp2_ppio_outq_desc_set_phys_addr (d, paddr + b0->current_data); diff --git a/src/plugins/marvell/pp2/pp2.c b/src/plugins/marvell/pp2/pp2.c index b808f3c7bfb..016ad53cc96 100644 --- a/src/plugins/marvell/pp2/pp2.c +++ b/src/plugins/marvell/pp2/pp2.c @@ -157,9 +157,12 @@ mrvl_pp2_delete_if (mrvl_pp2_if_t * ppif) while (n_bufs--) { struct pp2_buff_inf binf; - if (pp2_bpool_get_buff - (ppm->per_thread_data[0].hif, inq->bpool, &binf) == 0) - vlib_buffer_free (vm, &binf.cookie, 1); + if (pp2_bpool_get_buff (ppm->per_thread_data[0].hif, inq->bpool, + &binf) == 0) + { + u32 bi = binf.cookie; + vlib_buffer_free (vm, &bi, 1); + } } pp2_bpool_deinit (inq->bpool); } @@ -212,8 +215,7 @@ mrvl_pp2_create_if (mrvl_pp2_create_if_args_t * args) } } - pool_get (ppm->interfaces, ppif); - clib_memset (ppif, 0, sizeof (*ppif)); + pool_get_zero (ppm->interfaces, ppif); ppif->dev_instance = ppif - ppm->interfaces; ppif->hw_if_index = ~0; vec_validate_aligned (ppif->inqs, n_inqs - 1, CLIB_CACHE_LINE_BYTES); @@ -260,7 +262,7 @@ mrvl_pp2_create_if (mrvl_pp2_create_if_args_t * args) ppio_params.inqs_params.tcs_params[0].pkt_offset = 0; ppio_params.inqs_params.tcs_params[0].num_in_qs = n_inqs; ppio_params.inqs_params.tcs_params[0].inqs_params = &inq_params; - ppio_params.inqs_params.tcs_params[0].pools[0] = ppif->inqs[0].bpool; + ppio_params.inqs_params.tcs_params[0].pools[0][0] = ppif->inqs[0].bpool; ppio_params.outqs_params.num_outqs = n_outqs; for (i = 0; i < n_outqs; i++) { |