Skip to content

Commit 0132649

Browse files
vladimirolteandavem330
authored andcommitted
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: Vladimir Oltean <vladimir.oltean@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 601e984 commit 0132649

3 files changed

Lines changed: 6 additions & 0 deletions

File tree

drivers/net/dsa/ocelot/felix_vsc9959.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,6 +1171,8 @@ static int vsc9959_prevalidate_phy_mode(struct ocelot *ocelot, int port,
11711171
*/
11721172
static u16 vsc9959_wm_enc(u16 value)
11731173
{
1174+
WARN_ON(value >= 16 * BIT(8));
1175+
11741176
if (value >= BIT(8))
11751177
return BIT(8) | (value / 16);
11761178

drivers/net/dsa/ocelot/seville_vsc9953.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -911,6 +911,8 @@ static int vsc9953_prevalidate_phy_mode(struct ocelot *ocelot, int port,
911911
*/
912912
static u16 vsc9953_wm_enc(u16 value)
913913
{
914+
WARN_ON(value >= 16 * BIT(9));
915+
914916
if (value >= BIT(9))
915917
return BIT(9) | (value / 16);
916918

drivers/net/ethernet/mscc/ocelot_vsc7514.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -745,6 +745,8 @@ static int ocelot_reset(struct ocelot *ocelot)
745745
*/
746746
static u16 ocelot_wm_enc(u16 value)
747747
{
748+
WARN_ON(value >= 16 * BIT(8));
749+
748750
if (value >= BIT(8))
749751
return BIT(8) | (value / 16);
750752

0 commit comments

Comments
 (0)