Commit c0324f55 authored by Tanmay Patil's avatar Tanmay Patil Committed by sanglipeng
Browse files

net: ethernet: ti: cpsw_ale: Fix cpsw_ale_get_field()/cpsw_ale_set_field() 

stable inclusion
from stable-v5.10.188
commit f6d311b95394cdd0b661eeb7a2b395ef19ead9d8
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8KYFP

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f6d311b95394cdd0b661eeb7a2b395ef19ead9d8



--------------------------------

[ Upstream commit b685f1a5 ]

CPSW ALE has 75 bit ALE entries which are stored within three 32 bit words.
The cpsw_ale_get_field() and cpsw_ale_set_field() functions assume that the
field will be strictly contained within one word. However, this is not
guaranteed to be the case and it is possible for ALE field entries to span
across up to two words at the most.

Fix the methods to handle getting/setting fields spanning up to two words.

Fixes: db82173f ("netdev: driver: ethernet: add cpsw address lookup engine support")
Signed-off-by: default avatarTanmay Patil <t-patil@ti.com>
[s-vadapalli@ti.com: rephrased commit message and added Fixes tag]
Signed-off-by: default avatarSiddharth Vadapalli <s-vadapalli@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 41e6b563

drivers/net/ethernet/ti/cpsw_ale.c

+19 −5
Original line number Diff line number Diff line
@@ -104,21 +104,35 @@ struct cpsw_ale_dev_id { 


static inline int cpsw_ale_get_field(u32 *ale_entry, u32 start, u32 bits)

{

	int idx;

	int idx, idx2;

	u32 hi_val = 0;



	idx    = start / 32;

	idx2 = (start + bits - 1) / 32;

	/* Check if bits to be fetched exceed a word */

	if (idx != idx2) {

		idx2 = 2 - idx2; /* flip */

		hi_val = ale_entry[idx2] << ((idx2 * 32) - start);

	}

	start -= idx * 32;

	idx    = 2 - idx; /* flip */

	return (ale_entry[idx] >> start) & BITMASK(bits);

	return (hi_val + (ale_entry[idx] >> start)) & BITMASK(bits);

}



static inline void cpsw_ale_set_field(u32 *ale_entry, u32 start, u32 bits,

				      u32 value)

{

	int idx;

	int idx, idx2;



	value &= BITMASK(bits);

	idx = start / 32;

	idx2 = (start + bits - 1) / 32;

	/* Check if bits to be set exceed a word */

	if (idx != idx2) {

		idx2 = 2 - idx2; /* flip */

		ale_entry[idx2] &= ~(BITMASK(bits + start - (idx2 * 32)));

		ale_entry[idx2] |= (value >> ((idx2 * 32) - start));

	}

	start -= idx * 32;

	idx = 2 - idx; /* flip */

	ale_entry[idx] &= ~(BITMASK(bits) << start);