Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86d05ee5 authored by Stefan Chulski's avatar Stefan Chulski Committed by Greg Kroah-Hartman
Browse files

net: mvpp2: TCAM entry enable should be written after SRAM data 



[ Upstream commit 43f4a20a1266d393840ce010f547486d14cc0071 ]

Last TCAM data contains TCAM enable bit.
It should be written after SRAM data before entry enabled.

Fixes: 3f518509 ("ethernet: Add new driver for Marvell Armada 375 network unit")
Signed-off-by: default avatarStefan Chulski <stefanc@marvell.com>
Link: https://lore.kernel.org/r/1612172139-28343-1-git-send-email-stefanc@marvell.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8b8e0d0b

drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c

+5 −5
Original line number Diff line number Diff line
@@ -29,16 +29,16 @@ static int mvpp2_prs_hw_write(struct mvpp2 *priv, struct mvpp2_prs_entry *pe) 
	/* Clear entry invalidation bit */

	pe->tcam[MVPP2_PRS_TCAM_INV_WORD] &= ~MVPP2_PRS_TCAM_INV_MASK;



	/* Write tcam index - indirect access */

	mvpp2_write(priv, MVPP2_PRS_TCAM_IDX_REG, pe->index);

	for (i = 0; i < MVPP2_PRS_TCAM_WORDS; i++)

		mvpp2_write(priv, MVPP2_PRS_TCAM_DATA_REG(i), pe->tcam[i]);



	/* Write sram index - indirect access */

	mvpp2_write(priv, MVPP2_PRS_SRAM_IDX_REG, pe->index);

	for (i = 0; i < MVPP2_PRS_SRAM_WORDS; i++)

		mvpp2_write(priv, MVPP2_PRS_SRAM_DATA_REG(i), pe->sram[i]);



	/* Write tcam index - indirect access */

	mvpp2_write(priv, MVPP2_PRS_TCAM_IDX_REG, pe->index);

	for (i = 0; i < MVPP2_PRS_TCAM_WORDS; i++)

		mvpp2_write(priv, MVPP2_PRS_TCAM_DATA_REG(i), pe->tcam[i]);



	return 0;

}