Commit 01326493 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller

net: mscc: ocelot: warn when encoding an out-of-bounds watermark value

There is an upper bound to the value that a watermark may hold. That
upper bound is not immediately obvious during configuration, and it
might be possible to have accidental truncation.

Actually this has happened already, add a warning to prevent it from
happening again.
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 601e984f
...@@ -1171,6 +1171,8 @@ static int vsc9959_prevalidate_phy_mode(struct ocelot *ocelot, int port, ...@@ -1171,6 +1171,8 @@ static int vsc9959_prevalidate_phy_mode(struct ocelot *ocelot, int port,
*/ */
static u16 vsc9959_wm_enc(u16 value) static u16 vsc9959_wm_enc(u16 value)
{ {
WARN_ON(value >= 16 * BIT(8));
if (value >= BIT(8)) if (value >= BIT(8))
return BIT(8) | (value / 16); return BIT(8) | (value / 16);
......
...@@ -911,6 +911,8 @@ static int vsc9953_prevalidate_phy_mode(struct ocelot *ocelot, int port, ...@@ -911,6 +911,8 @@ static int vsc9953_prevalidate_phy_mode(struct ocelot *ocelot, int port,
*/ */
static u16 vsc9953_wm_enc(u16 value) static u16 vsc9953_wm_enc(u16 value)
{ {
WARN_ON(value >= 16 * BIT(9));
if (value >= BIT(9)) if (value >= BIT(9))
return BIT(9) | (value / 16); return BIT(9) | (value / 16);
......
...@@ -745,6 +745,8 @@ static int ocelot_reset(struct ocelot *ocelot) ...@@ -745,6 +745,8 @@ static int ocelot_reset(struct ocelot *ocelot)
*/ */
static u16 ocelot_wm_enc(u16 value) static u16 ocelot_wm_enc(u16 value)
{ {
WARN_ON(value >= 16 * BIT(8));
if (value >= BIT(8)) if (value >= BIT(8))
return BIT(8) | (value / 16); return BIT(8) | (value / 16);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment