lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 005/131] net: bcmgenet: remove HFB_CTRL access
    Date
    From: Doug Berger <opendmb@gmail.com>

    [ Upstream commit 24d476db6dfb0f85130e348ca1bbd14afb73a8be ]

    Commit c5a54bbcecec ("net: bcmgenet: abort suspend on error")
    mistakenly introduced register accesses that should not occur
    in bcmgenet_wol_power_up_cfg().

    Fixes: c5a54bbcecec ("net: bcmgenet: abort suspend on error")
    Signed-off-by: Doug Berger <opendmb@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 4 ----
    1 file changed, 4 deletions(-)

    diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c b/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c
    index b3596e0ee47ba..57582efa362df 100644
    --- a/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c
    +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c
    @@ -191,10 +191,6 @@ void bcmgenet_wol_power_up_cfg(struct bcmgenet_priv *priv,
    reg &= ~MPD_EN;
    bcmgenet_umac_writel(priv, reg, UMAC_MPD_CTRL);

    - reg = bcmgenet_hfb_reg_readl(priv, HFB_CTRL);
    - reg &= ~(RBUF_HFB_EN | RBUF_ACPI_EN);
    - bcmgenet_hfb_reg_writel(priv, reg, HFB_CTRL);
    -
    /* Disable CRC Forward */
    reg = bcmgenet_umac_readl(priv, UMAC_CMD);
    reg &= ~CMD_CRC_FWD;
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-29 22:17    [W:4.047 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site