* [PATCH][next] net: dsa: felix: fix incorrect clamp calculation for burst
@ 2020-05-14 18:33 Colin King
2020-05-14 20:59 ` Vladimir Oltean
2020-05-15 1:03 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Colin King @ 2020-05-14 18:33 UTC (permalink / raw)
To: Vladimir Oltean, Claudiu Manoil, Andrew Lunn, Vivien Didelot,
Florian Fainelli, David S . Miller, Xiaoliang Yang, netdev
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Currently burst is clamping on rate and not burst, the assignment
of burst from the clamping discards the previous assignment of burst.
This looks like a cut-n-paste error from the previous clamping
calculation on ramp. Fix this by replacing ramp with burst.
Addresses-Coverity: ("Unused value")
Fixes: 0fbabf875d18 ("net: dsa: felix: add support Credit Based Shaper(CBS) for hardware offload")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/net/dsa/ocelot/felix_vsc9959.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index df4498c0e864..85e34d85cc51 100644
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -1360,7 +1360,7 @@ static int vsc9959_qos_port_cbs_set(struct dsa_switch *ds, int port,
/* Burst unit is 4kB */
burst = DIV_ROUND_UP(cbs_qopt->hicredit, 4096);
/* Avoid using zero burst size */
- burst = clamp_t(u32, rate, 1, GENMASK(5, 0));
+ burst = clamp_t(u32, burst, 1, GENMASK(5, 0));
ocelot_write_gix(ocelot,
QSYS_CIR_CFG_CIR_RATE(rate) |
QSYS_CIR_CFG_CIR_BURST(burst),
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH][next] net: dsa: felix: fix incorrect clamp calculation for burst
2020-05-14 18:33 [PATCH][next] net: dsa: felix: fix incorrect clamp calculation for burst Colin King
@ 2020-05-14 20:59 ` Vladimir Oltean
2020-05-15 1:03 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Vladimir Oltean @ 2020-05-14 20:59 UTC (permalink / raw)
To: Colin King
Cc: Vladimir Oltean, Claudiu Manoil, Andrew Lunn, Vivien Didelot,
Florian Fainelli, David S . Miller, Xiaoliang Yang, netdev,
kernel-janitors, lkml
Hi Colin,
On Thu, 14 May 2020 at 21:34, Colin King <colin.king@canonical.com> wrote:
>
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently burst is clamping on rate and not burst, the assignment
> of burst from the clamping discards the previous assignment of burst.
> This looks like a cut-n-paste error from the previous clamping
> calculation on ramp. Fix this by replacing ramp with burst.
>
> Addresses-Coverity: ("Unused value")
> Fixes: 0fbabf875d18 ("net: dsa: felix: add support Credit Based Shaper(CBS) for hardware offload")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
Acked-by: Vladimir Oltean <vladimir.oltean@nxp.com>
> drivers/net/dsa/ocelot/felix_vsc9959.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
> index df4498c0e864..85e34d85cc51 100644
> --- a/drivers/net/dsa/ocelot/felix_vsc9959.c
> +++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
> @@ -1360,7 +1360,7 @@ static int vsc9959_qos_port_cbs_set(struct dsa_switch *ds, int port,
> /* Burst unit is 4kB */
> burst = DIV_ROUND_UP(cbs_qopt->hicredit, 4096);
> /* Avoid using zero burst size */
> - burst = clamp_t(u32, rate, 1, GENMASK(5, 0));
> + burst = clamp_t(u32, burst, 1, GENMASK(5, 0));
> ocelot_write_gix(ocelot,
> QSYS_CIR_CFG_CIR_RATE(rate) |
> QSYS_CIR_CFG_CIR_BURST(burst),
> --
> 2.25.1
>
Thanks!
-Vladimir
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][next] net: dsa: felix: fix incorrect clamp calculation for burst
2020-05-14 18:33 [PATCH][next] net: dsa: felix: fix incorrect clamp calculation for burst Colin King
2020-05-14 20:59 ` Vladimir Oltean
@ 2020-05-15 1:03 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2020-05-15 1:03 UTC (permalink / raw)
To: colin.king
Cc: vladimir.oltean, claudiu.manoil, andrew, vivien.didelot,
f.fainelli, xiaoliang.yang_1, netdev, kernel-janitors,
linux-kernel
From: Colin King <colin.king@canonical.com>
Date: Thu, 14 May 2020 19:33:02 +0100
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently burst is clamping on rate and not burst, the assignment
> of burst from the clamping discards the previous assignment of burst.
> This looks like a cut-n-paste error from the previous clamping
> calculation on ramp. Fix this by replacing ramp with burst.
>
> Addresses-Coverity: ("Unused value")
> Fixes: 0fbabf875d18 ("net: dsa: felix: add support Credit Based Shaper(CBS) for hardware offload")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-15 1:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-14 18:33 [PATCH][next] net: dsa: felix: fix incorrect clamp calculation for burst Colin King
2020-05-14 20:59 ` Vladimir Oltean
2020-05-15 1:03 ` David Miller
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).