Commit 7eb5c96a authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: mscc: ocelot: use plain int when interacting with TCAM tables 



sparse is rightfully complaining about the fact that:

warning: comparison of unsigned expression < 0 is always false [-Wtype-limits]
   26 |   __builtin_constant_p((l) > (h)), (l) > (h), 0)))
      |                            ^
note: in expansion of macro ‘GENMASK_INPUT_CHECK’
   39 |  (GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))
      |   ^~~~~~~~~~~~~~~~~~~
note: in expansion of macro ‘GENMASK’
  127 |   mask = GENMASK(width, 0);
      |          ^~~~~~~

So replace the variables that go into GENMASK with plain, signed integer
types.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ab4ceb6

drivers/net/ethernet/mscc/ocelot_ace.c

+6 −4
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ static void vcap_cache2entry(struct ocelot *ocelot, struct vcap_data *data) 
static void vcap_action2cache(struct ocelot *ocelot, struct vcap_data *data)

{

	const struct vcap_props *vcap_is2 = &ocelot->vcap[VCAP_IS2];

	u32 action_words, i, width, mask;

	u32 action_words, mask;

	int i, width;



	/* Encode action type */

	width = vcap_is2->action_type_width;
@@ -141,7 +142,8 @@ static void vcap_action2cache(struct ocelot *ocelot, struct vcap_data *data) 
static void vcap_cache2action(struct ocelot *ocelot, struct vcap_data *data)

{

	const struct vcap_props *vcap_is2 = &ocelot->vcap[VCAP_IS2];

	u32 action_words, i, width;

	u32 action_words;

	int i, width;



	action_words = DIV_ROUND_UP(vcap_is2->action_width, ENTRY_WIDTH);
@@ -161,8 +163,8 @@ static void vcap_cache2action(struct ocelot *ocelot, struct vcap_data *data) 
static void is2_data_get(struct ocelot *ocelot, struct vcap_data *data, int ix)

{

	const struct vcap_props *vcap_is2 = &ocelot->vcap[VCAP_IS2];

	u32 i, col, offset, count, cnt, base;

	u32 width = vcap_is2->tg_width;

	int i, col, offset, count, cnt, base;

	int width = vcap_is2->tg_width;



	count = (data->tg_sw == VCAP_TG_HALF ? 2 : 4);

	col = (ix % 2);

CRA Git | Maintained and supported by SUSTech CRA and CCSE