lkml.org 
[lkml]   [2017]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 021/306] net: systemport: Fix ordering in intrl2_*_mask_clear macro
    3.16.40-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Florian Fainelli <f.fainelli@gmail.com>

    commit 9a0a5c4cb1af98b625dcefd72e987ca4929db71d upstream.

    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: 80105befdb4b ("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>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/net/ethernet/broadcom/bcmsysport.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/net/ethernet/broadcom/bcmsysport.c
    +++ b/drivers/net/ethernet/broadcom/bcmsysport.c
    @@ -58,8 +58,8 @@ BCM_SYSPORT_IO_MACRO(topctrl, SYS_PORT_T
    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) \
    \
     
     \ /
      Last update: 2017-02-16 00:59    [W:4.199 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site