lkml.org 
[lkml]   [2016]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 119/126] net: mvneta: add configuration for MBUS windows access protection
    Date
    3.16.7-ckt22 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Marcin Wojtas <mw@semihalf.com>

    commit db6ba9a5371f173489df126739d0a1c2a50f347b upstream.

    This commit adds missing configuration of MBUS windows access protection
    in mvneta_conf_mbus_windows function - a dedicated variable for that
    purpose remained there unused since v3.8 initial mvneta support. Because
    of that the register contents were inherited from the bootloader.

    Signed-off-by: Marcin Wojtas <mw@semihalf.com>
    Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

    Fixes: c5aff18204da ("net: mvneta: driver for Marvell Armada 370/XP network
    unit")
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/net/ethernet/marvell/mvneta.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
    index b6de763afef0..572e203d28be 100644
    --- a/drivers/net/ethernet/marvell/mvneta.c
    +++ b/drivers/net/ethernet/marvell/mvneta.c
    @@ -60,6 +60,7 @@
    #define MVNETA_WIN_SIZE(w) (0x2204 + ((w) << 3))
    #define MVNETA_WIN_REMAP(w) (0x2280 + ((w) << 2))
    #define MVNETA_BASE_ADDR_ENABLE 0x2290
    +#define MVNETA_ACCESS_PROTECT_ENABLE 0x2294
    #define MVNETA_PORT_CONFIG 0x2400
    #define MVNETA_UNI_PROMISC_MODE BIT(0)
    #define MVNETA_DEF_RXQ(q) ((q) << 1)
    @@ -2898,6 +2899,7 @@ static void mvneta_conf_mbus_windows(struct mvneta_port *pp,
    }

    mvreg_write(pp, MVNETA_BASE_ADDR_ENABLE, win_enable);
    + mvreg_write(pp, MVNETA_ACCESS_PROTECT_ENABLE, win_protect);
    }

    /* Power up the port */

    \
     
     \ /
      Last update: 2016-01-06 12:21    [W:3.281 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site