* [dpdk-dev] [PATCH] net/octeontx2: update red algo for shaper dynamic update
@ 2020-04-17 6:41 Nithin Dabilpuram
2020-05-01 14:24 ` [dpdk-dev] [PATCH v2] " Nithin Dabilpuram
0 siblings, 1 reply; 3+ messages in thread
From: Nithin Dabilpuram @ 2020-04-17 6:41 UTC (permalink / raw)
To: Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K; +Cc: dev, kkanas
From: Nithin Dabilpuram <ndabilpuram@marvell.com>
Due to an errata red algo needs to be set to discard instead of stall
for 96XX C0 silicon for two rate shaping. This workaround is being
already handled for newly created hierarchy but not for dynamic
shaper update cases. This patch hence applies the workaround
even when for shaper dynamic update.
Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
---
Depends-on:series-9313
drivers/net/octeontx2/otx2_tm.c | 39 +++++++++++++++++++++++++++------------
drivers/net/octeontx2/otx2_tm.h | 1 +
2 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/drivers/net/octeontx2/otx2_tm.c b/drivers/net/octeontx2/otx2_tm.c
index fa7d21b..e94a276 100644
--- a/drivers/net/octeontx2/otx2_tm.c
+++ b/drivers/net/octeontx2/otx2_tm.c
@@ -237,6 +237,30 @@ shaper_config_to_nix(struct otx2_nix_tm_shaper_profile *profile,
&pir->burst_mantissa);
}
+static void
+shaper_default_red_algo(struct otx2_eth_dev *dev,
+ struct otx2_nix_tm_node *tm_node,
+ struct otx2_nix_tm_shaper_profile *profile)
+{
+ struct shaper_params cir, pir;
+
+ /* C0 doesn't support STALL when both PIR & CIR are enabled */
+ if (profile && otx2_dev_is_96xx_Cx(dev)) {
+ memset(&cir, 0, sizeof(cir));
+ memset(&pir, 0, sizeof(pir));
+ shaper_config_to_nix(profile, &cir, &pir);
+
+ if (pir.rate && cir.rate) {
+ tm_node->red_algo = NIX_REDALG_DISCARD;
+ tm_node->flags |= NIX_TM_NODE_RED_DISCARD;
+ return;
+ }
+ }
+
+ tm_node->red_algo = NIX_REDALG_STD;
+ tm_node->flags &= ~NIX_TM_NODE_RED_DISCARD;
+}
+
static int
populate_tm_tl1_default(struct otx2_eth_dev *dev, uint32_t schq)
{
@@ -765,7 +789,6 @@ nix_tm_node_add_to_list(struct otx2_eth_dev *dev, uint32_t node_id,
{
struct otx2_nix_tm_shaper_profile *profile;
struct otx2_nix_tm_node *tm_node, *parent_node;
- struct shaper_params cir, pir;
uint32_t profile_id;
profile_id = params->shaper_profile_id;
@@ -808,19 +831,9 @@ nix_tm_node_add_to_list(struct otx2_eth_dev *dev, uint32_t node_id,
if (profile)
profile->reference_count++;
- memset(&cir, 0, sizeof(cir));
- memset(&pir, 0, sizeof(pir));
- shaper_config_to_nix(profile, &cir, &pir);
-
tm_node->parent = parent_node;
tm_node->parent_hw_id = UINT32_MAX;
- /* C0 doesn't support STALL when both PIR & CIR are enabled */
- if (lvl < OTX2_TM_LVL_QUEUE &&
- otx2_dev_is_96xx_Cx(dev) &&
- pir.rate && cir.rate)
- tm_node->red_algo = NIX_REDALG_DISCARD;
- else
- tm_node->red_algo = NIX_REDALG_STD;
+ shaper_default_red_algo(dev, tm_node, profile);
TAILQ_INSERT_TAIL(&dev->node_list, tm_node, node);
@@ -2594,6 +2607,8 @@ otx2_nix_tm_node_shaper_update(struct rte_eth_dev *eth_dev,
if (rc)
return rc;
+ shaper_default_red_algo(dev, tm_node, profile);
+
/* Update the PIR/CIR and clear SW XOFF */
req = otx2_mbox_alloc_msg_nix_txschq_cfg(mbox);
req->lvl = tm_node->hw_lvl;
diff --git a/drivers/net/octeontx2/otx2_tm.h b/drivers/net/octeontx2/otx2_tm.h
index cdca987..db44d48 100644
--- a/drivers/net/octeontx2/otx2_tm.h
+++ b/drivers/net/octeontx2/otx2_tm.h
@@ -46,6 +46,7 @@ struct otx2_nix_tm_node {
#define NIX_TM_NODE_HWRES BIT_ULL(0)
#define NIX_TM_NODE_ENABLED BIT_ULL(1)
#define NIX_TM_NODE_USER BIT_ULL(2)
+#define NIX_TM_NODE_RED_DISCARD BIT_ULL(3)
/* Shaper algorithm for RED state @NIX_REDALG_E */
uint32_t red_algo:2;
uint32_t pkt_mode:1;
--
2.8.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* [dpdk-dev] [PATCH v2] net/octeontx2: update red algo for shaper dynamic update
2020-04-17 6:41 [dpdk-dev] [PATCH] net/octeontx2: update red algo for shaper dynamic update Nithin Dabilpuram
@ 2020-05-01 14:24 ` Nithin Dabilpuram
2020-05-04 8:52 ` Jerin Jacob
0 siblings, 1 reply; 3+ messages in thread
From: Nithin Dabilpuram @ 2020-05-01 14:24 UTC (permalink / raw)
To: Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K; +Cc: dev, kkanas
From: Nithin Dabilpuram <ndabilpuram@marvell.com>
Due to an errata red algo needs to be set to discard instead of stall
for 96XX C0 silicon for two rate shaping. This workaround is being
already handled for newly created hierarchy but not for dynamic
shaper update cases. This patch hence applies the workaround
even when for shaper dynamic update.
Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
---
v2:
- Rebased patch to fix dependency issue
drivers/net/octeontx2/otx2_tm.c | 39 +++++++++++++++++++++++++++------------
drivers/net/octeontx2/otx2_tm.h | 1 +
2 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/drivers/net/octeontx2/otx2_tm.c b/drivers/net/octeontx2/otx2_tm.c
index f94618d..b57e10f 100644
--- a/drivers/net/octeontx2/otx2_tm.c
+++ b/drivers/net/octeontx2/otx2_tm.c
@@ -237,6 +237,30 @@ shaper_config_to_nix(struct otx2_nix_tm_shaper_profile *profile,
&pir->burst_mantissa);
}
+static void
+shaper_default_red_algo(struct otx2_eth_dev *dev,
+ struct otx2_nix_tm_node *tm_node,
+ struct otx2_nix_tm_shaper_profile *profile)
+{
+ struct shaper_params cir, pir;
+
+ /* C0 doesn't support STALL when both PIR & CIR are enabled */
+ if (profile && otx2_dev_is_96xx_Cx(dev)) {
+ memset(&cir, 0, sizeof(cir));
+ memset(&pir, 0, sizeof(pir));
+ shaper_config_to_nix(profile, &cir, &pir);
+
+ if (pir.rate && cir.rate) {
+ tm_node->red_algo = NIX_REDALG_DISCARD;
+ tm_node->flags |= NIX_TM_NODE_RED_DISCARD;
+ return;
+ }
+ }
+
+ tm_node->red_algo = NIX_REDALG_STD;
+ tm_node->flags &= ~NIX_TM_NODE_RED_DISCARD;
+}
+
static int
populate_tm_tl1_default(struct otx2_eth_dev *dev, uint32_t schq)
{
@@ -744,7 +768,6 @@ nix_tm_node_add_to_list(struct otx2_eth_dev *dev, uint32_t node_id,
{
struct otx2_nix_tm_shaper_profile *profile;
struct otx2_nix_tm_node *tm_node, *parent_node;
- struct shaper_params cir, pir;
uint32_t profile_id;
profile_id = params->shaper_profile_id;
@@ -778,19 +801,9 @@ nix_tm_node_add_to_list(struct otx2_eth_dev *dev, uint32_t node_id,
if (profile)
profile->reference_count++;
- memset(&cir, 0, sizeof(cir));
- memset(&pir, 0, sizeof(pir));
- shaper_config_to_nix(profile, &cir, &pir);
-
tm_node->parent = parent_node;
tm_node->parent_hw_id = UINT32_MAX;
- /* C0 doesn't support STALL when both PIR & CIR are enabled */
- if (lvl < OTX2_TM_LVL_QUEUE &&
- otx2_dev_is_96xx_Cx(dev) &&
- pir.rate && cir.rate)
- tm_node->red_algo = NIX_REDALG_DISCARD;
- else
- tm_node->red_algo = NIX_REDALG_STD;
+ shaper_default_red_algo(dev, tm_node, profile);
TAILQ_INSERT_TAIL(&dev->node_list, tm_node, node);
@@ -2500,6 +2513,8 @@ otx2_nix_tm_node_shaper_update(struct rte_eth_dev *eth_dev,
if (rc)
return rc;
+ shaper_default_red_algo(dev, tm_node, profile);
+
/* Update the PIR/CIR and clear SW XOFF */
req = otx2_mbox_alloc_msg_nix_txschq_cfg(mbox);
req->lvl = tm_node->hw_lvl;
diff --git a/drivers/net/octeontx2/otx2_tm.h b/drivers/net/octeontx2/otx2_tm.h
index 9675182..4a80c23 100644
--- a/drivers/net/octeontx2/otx2_tm.h
+++ b/drivers/net/octeontx2/otx2_tm.h
@@ -46,6 +46,7 @@ struct otx2_nix_tm_node {
#define NIX_TM_NODE_HWRES BIT_ULL(0)
#define NIX_TM_NODE_ENABLED BIT_ULL(1)
#define NIX_TM_NODE_USER BIT_ULL(2)
+#define NIX_TM_NODE_RED_DISCARD BIT_ULL(3)
/* Shaper algorithm for RED state @NIX_REDALG_E */
uint32_t red_algo:2;
--
2.8.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-dev] [PATCH v2] net/octeontx2: update red algo for shaper dynamic update
2020-05-01 14:24 ` [dpdk-dev] [PATCH v2] " Nithin Dabilpuram
@ 2020-05-04 8:52 ` Jerin Jacob
0 siblings, 0 replies; 3+ messages in thread
From: Jerin Jacob @ 2020-05-04 8:52 UTC (permalink / raw)
To: Nithin Dabilpuram
Cc: Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K, dpdk-dev, Krzysztof Kanas
On Fri, May 1, 2020 at 7:54 PM Nithin Dabilpuram <nithind1988@gmail.com> wrote:
>
> From: Nithin Dabilpuram <ndabilpuram@marvell.com>
>
> Due to an errata red algo needs to be set to discard instead of stall
> for 96XX C0 silicon for two rate shaping. This workaround is being
> already handled for newly created hierarchy but not for dynamic
> shaper update cases. This patch hence applies the workaround
> even when for shaper dynamic update.
>
> Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
> ---
> v2:
> - Rebased patch to fix dependency issue
Applied to dpdk-next-net-mrvl/master. Thanks
>
> drivers/net/octeontx2/otx2_tm.c | 39 +++++++++++++++++++++++++++------------
> drivers/net/octeontx2/otx2_tm.h | 1 +
> 2 files changed, 28 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/net/octeontx2/otx2_tm.c b/drivers/net/octeontx2/otx2_tm.c
> index f94618d..b57e10f 100644
> --- a/drivers/net/octeontx2/otx2_tm.c
> +++ b/drivers/net/octeontx2/otx2_tm.c
> @@ -237,6 +237,30 @@ shaper_config_to_nix(struct otx2_nix_tm_shaper_profile *profile,
> &pir->burst_mantissa);
> }
>
> +static void
> +shaper_default_red_algo(struct otx2_eth_dev *dev,
> + struct otx2_nix_tm_node *tm_node,
> + struct otx2_nix_tm_shaper_profile *profile)
> +{
> + struct shaper_params cir, pir;
> +
> + /* C0 doesn't support STALL when both PIR & CIR are enabled */
> + if (profile && otx2_dev_is_96xx_Cx(dev)) {
> + memset(&cir, 0, sizeof(cir));
> + memset(&pir, 0, sizeof(pir));
> + shaper_config_to_nix(profile, &cir, &pir);
> +
> + if (pir.rate && cir.rate) {
> + tm_node->red_algo = NIX_REDALG_DISCARD;
> + tm_node->flags |= NIX_TM_NODE_RED_DISCARD;
> + return;
> + }
> + }
> +
> + tm_node->red_algo = NIX_REDALG_STD;
> + tm_node->flags &= ~NIX_TM_NODE_RED_DISCARD;
> +}
> +
> static int
> populate_tm_tl1_default(struct otx2_eth_dev *dev, uint32_t schq)
> {
> @@ -744,7 +768,6 @@ nix_tm_node_add_to_list(struct otx2_eth_dev *dev, uint32_t node_id,
> {
> struct otx2_nix_tm_shaper_profile *profile;
> struct otx2_nix_tm_node *tm_node, *parent_node;
> - struct shaper_params cir, pir;
> uint32_t profile_id;
>
> profile_id = params->shaper_profile_id;
> @@ -778,19 +801,9 @@ nix_tm_node_add_to_list(struct otx2_eth_dev *dev, uint32_t node_id,
> if (profile)
> profile->reference_count++;
>
> - memset(&cir, 0, sizeof(cir));
> - memset(&pir, 0, sizeof(pir));
> - shaper_config_to_nix(profile, &cir, &pir);
> -
> tm_node->parent = parent_node;
> tm_node->parent_hw_id = UINT32_MAX;
> - /* C0 doesn't support STALL when both PIR & CIR are enabled */
> - if (lvl < OTX2_TM_LVL_QUEUE &&
> - otx2_dev_is_96xx_Cx(dev) &&
> - pir.rate && cir.rate)
> - tm_node->red_algo = NIX_REDALG_DISCARD;
> - else
> - tm_node->red_algo = NIX_REDALG_STD;
> + shaper_default_red_algo(dev, tm_node, profile);
>
> TAILQ_INSERT_TAIL(&dev->node_list, tm_node, node);
>
> @@ -2500,6 +2513,8 @@ otx2_nix_tm_node_shaper_update(struct rte_eth_dev *eth_dev,
> if (rc)
> return rc;
>
> + shaper_default_red_algo(dev, tm_node, profile);
> +
> /* Update the PIR/CIR and clear SW XOFF */
> req = otx2_mbox_alloc_msg_nix_txschq_cfg(mbox);
> req->lvl = tm_node->hw_lvl;
> diff --git a/drivers/net/octeontx2/otx2_tm.h b/drivers/net/octeontx2/otx2_tm.h
> index 9675182..4a80c23 100644
> --- a/drivers/net/octeontx2/otx2_tm.h
> +++ b/drivers/net/octeontx2/otx2_tm.h
> @@ -46,6 +46,7 @@ struct otx2_nix_tm_node {
> #define NIX_TM_NODE_HWRES BIT_ULL(0)
> #define NIX_TM_NODE_ENABLED BIT_ULL(1)
> #define NIX_TM_NODE_USER BIT_ULL(2)
> +#define NIX_TM_NODE_RED_DISCARD BIT_ULL(3)
> /* Shaper algorithm for RED state @NIX_REDALG_E */
> uint32_t red_algo:2;
>
> --
> 2.8.4
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-04 8:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-17 6:41 [dpdk-dev] [PATCH] net/octeontx2: update red algo for shaper dynamic update Nithin Dabilpuram
2020-05-01 14:24 ` [dpdk-dev] [PATCH v2] " Nithin Dabilpuram
2020-05-04 8:52 ` Jerin Jacob
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).