lkml.org 
[lkml]   [2017]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 034/177] net: bcmgenet: reserved phy revisions must be checked first
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Doug Berger <opendmb@gmail.com>


    [ Upstream commit eca4bad73409aedc6ff22f823c18b67a4f08c851 ]

    The reserved gphy_rev value of 0x01ff must be tested before the old
    or new scheme for GPHY major versioning are tested, otherwise it will
    be treated as 0xff00 according to the old scheme.

    Fixes: b04a2f5b9ff5 ("net: bcmgenet: add support for new GENET PHY revision scheme")
    Signed-off-by: Doug Berger <opendmb@gmail.com>
    Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/broadcom/genet/bcmgenet.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
    +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
    @@ -3233,6 +3233,12 @@ static void bcmgenet_set_hw_params(struc
    */
    gphy_rev = reg & 0xffff;

    + /* This is reserved so should require special treatment */
    + if (gphy_rev == 0 || gphy_rev == 0x01ff) {
    + pr_warn("Invalid GPHY revision detected: 0x%04x\n", gphy_rev);
    + return;
    + }
    +
    /* This is the good old scheme, just GPHY major, no minor nor patch */
    if ((gphy_rev & 0xf0) != 0)
    priv->gphy_rev = gphy_rev << 8;
    @@ -3241,12 +3247,6 @@ static void bcmgenet_set_hw_params(struc
    else if ((gphy_rev & 0xff00) != 0)
    priv->gphy_rev = gphy_rev;

    - /* This is reserved so should require special treatment */
    - else if (gphy_rev == 0 || gphy_rev == 0x01ff) {
    - pr_warn("Invalid GPHY revision detected: 0x%04x\n", gphy_rev);
    - return;
    - }
    -
    #ifdef CONFIG_PHYS_ADDR_T_64BIT
    if (!(params->flags & GENET_HAS_40BITS))
    pr_warn("GENET does not support 40-bits PA\n");

    \
     
     \ /
      Last update: 2017-12-18 18:38    [W:4.073 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site