Skip to content

Commit 2df3fc4

Browse files
jlintonarmPaolo Abeni
authored andcommitted
net: bcmgenet: Revert "Use stronger register read/writes to assure ordering"
It turns out after digging deeper into this bug, that it was being triggered by GCC12 failing to call the bcmgenet_enable_dma() routine. Given that a gcc12 fix has been merged [1] and the genet driver now works properly when built with gcc12, this commit should be reverted. [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105160 https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=aabb9a261ef060cf24fd626713f1d7d9df81aa57 Fixes: 8d3ea3d ("net: bcmgenet: Use stronger register read/writes to assure ordering") Signed-off-by: Jeremy Linton <jeremy.linton@arm.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Link: https://lore.kernel.org/r/20220412210420.1129430-1-jeremy.linton@arm.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent 23cfe94 commit 2df3fc4

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/net/ethernet/broadcom/genet/bcmgenet.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ static inline void bcmgenet_writel(u32 value, void __iomem *offset)
7676
if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN))
7777
__raw_writel(value, offset);
7878
else
79-
writel(value, offset);
79+
writel_relaxed(value, offset);
8080
}
8181

8282
static inline u32 bcmgenet_readl(void __iomem *offset)
8383
{
8484
if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN))
8585
return __raw_readl(offset);
8686
else
87-
return readl(offset);
87+
return readl_relaxed(offset);
8888
}
8989

9090
static inline void dmadesc_set_length_status(struct bcmgenet_priv *priv,

0 commit comments

Comments
 (0)