lkml.org 
[lkml]   [2018]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 094/156] net: phy: marvell10g: fix the PHY id mask
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Antoine Tenart <antoine.tenart@free-electrons.com>


    [ Upstream commit 952b6b3b07877419386e719ff20917170e1ce684 ]

    The Marvell 10G PHY driver supports different hardware revisions, which
    have their bits 3..0 differing. To get the correct revision number these
    bits should be ignored. This patch fixes this by using the already
    defined MARVELL_PHY_ID_MASK (0xfffffff0) instead of the custom
    0xffffffff mask.

    Fixes: 20b2af32ff3f ("net: phy: add Marvell Alaska X 88X3310 10Gigabit PHY support")
    Suggested-by: Yan Markman <ymarkman@marvell.com>
    Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
    Reviewed-by: Andrew Lunn <andrew@lunn.ch>
    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/phy/marvell10g.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/net/phy/marvell10g.c
    +++ b/drivers/net/phy/marvell10g.c
    @@ -16,6 +16,7 @@
    * link takes priority and the other port is completely locked out.
    */
    #include <linux/phy.h>
    +#include <linux/marvell_phy.h>

    enum {
    MV_PCS_BASE_T = 0x0000,
    @@ -338,7 +339,7 @@ static int mv3310_read_status(struct phy
    static struct phy_driver mv3310_drivers[] = {
    {
    .phy_id = 0x002b09aa,
    - .phy_id_mask = 0xffffffff,
    + .phy_id_mask = MARVELL_PHY_ID_MASK,
    .name = "mv88x3310",
    .features = SUPPORTED_10baseT_Full |
    SUPPORTED_100baseT_Full |
    @@ -360,7 +361,7 @@ static struct phy_driver mv3310_drivers[
    module_phy_driver(mv3310_drivers);

    static struct mdio_device_id __maybe_unused mv3310_tbl[] = {
    - { 0x002b09aa, 0xffffffff },
    + { 0x002b09aa, MARVELL_PHY_ID_MASK },
    { },
    };
    MODULE_DEVICE_TABLE(mdio, mv3310_tbl);

    \
     
     \ /
      Last update: 2018-02-02 18:57    [W:2.281 / U:1.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site