Commit 9a0a5c4c authored Aug 24, 2016 by Florian Fainelli Committed by David S. Miller Aug 25, 2016

net: systemport: Fix ordering in intrl2_*_mask_clear macro



Since we keep shadow copies of which interrupt sources are enabled
through the intrl2_*_mask_{set,clear} macros, make sure that the
ordering in which we do these two operations: update the copy, then
unmask the register is correct.

This is not currently a problem because we actually do not use them, but
we will in a subsequent patch optimizing register accesses, so better be
safe here.

Fixes: 80105bef ("net: systemport: add Broadcom SYSTEMPORT Ethernet MAC driver")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent eb60a8dd

drivers/net/ethernet/broadcom/bcmsysport.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,8 +58,8 @@ BCM_SYSPORT_IO_MACRO(topctrl, SYS_PORT_TOPCTRL_OFFSET);
		static inline void intrl2_##which##_mask_clear(struct bcm_sysport_priv *priv, \
		u32 mask) \
		{ \
		intrl2_##which##_writel(priv, mask, INTRL2_CPU_MASK_CLEAR); \
		priv->irq##which##_mask &= ~(mask); \
		intrl2_##which##_writel(priv, mask, INTRL2_CPU_MASK_CLEAR); \
		} \
		static inline void intrl2_##which##_mask_set(struct bcm_sysport_priv *priv, \
		u32 mask) \