lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 236/862] net: prestera: cache port state for non-phylink ports too
    Date
    From: Maksym Glubokiy <maksym.glubokiy@plvision.eu>

    [ Upstream commit 704438dd4f030c1b3d28a2a9c8f182c32d9b6bc4 ]

    Port event data must stored to port-state cache regardless of whether
    the port uses phylink or not since this data is used by ethtool.

    Fixes: 52323ef75414 ("net: marvell: prestera: add phylink support")
    Signed-off-by: Oleksandr Mazur <oleksandr.mazur@plvision.eu>
    Signed-off-by: Maksym Glubokiy <maksym.glubokiy@plvision.eu>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../ethernet/marvell/prestera/prestera_main.c | 36 +++++++++----------
    1 file changed, 17 insertions(+), 19 deletions(-)

    diff --git a/drivers/net/ethernet/marvell/prestera/prestera_main.c b/drivers/net/ethernet/marvell/prestera/prestera_main.c
    index a895862b4821..a0ad0bcbf89f 100644
    --- a/drivers/net/ethernet/marvell/prestera/prestera_main.c
    +++ b/drivers/net/ethernet/marvell/prestera/prestera_main.c
    @@ -799,32 +799,30 @@ static void prestera_port_handle_event(struct prestera_switch *sw,

    caching_dw = &port->cached_hw_stats.caching_dw;

    - if (port->phy_link) {
    - memset(&smac, 0, sizeof(smac));
    - smac.valid = true;
    - smac.oper = pevt->data.mac.oper;
    - if (smac.oper) {
    - smac.mode = pevt->data.mac.mode;
    - smac.speed = pevt->data.mac.speed;
    - smac.duplex = pevt->data.mac.duplex;
    - smac.fc = pevt->data.mac.fc;
    - smac.fec = pevt->data.mac.fec;
    - phylink_mac_change(port->phy_link, true);
    - } else {
    - phylink_mac_change(port->phy_link, false);
    - }
    - prestera_port_mac_state_cache_write(port, &smac);
    + memset(&smac, 0, sizeof(smac));
    + smac.valid = true;
    + smac.oper = pevt->data.mac.oper;
    + if (smac.oper) {
    + smac.mode = pevt->data.mac.mode;
    + smac.speed = pevt->data.mac.speed;
    + smac.duplex = pevt->data.mac.duplex;
    + smac.fc = pevt->data.mac.fc;
    + smac.fec = pevt->data.mac.fec;
    }
    + prestera_port_mac_state_cache_write(port, &smac);

    if (port->state_mac.oper) {
    - if (!port->phy_link)
    + if (port->phy_link)
    + phylink_mac_change(port->phy_link, true);
    + else
    netif_carrier_on(port->dev);

    if (!delayed_work_pending(caching_dw))
    queue_delayed_work(prestera_wq, caching_dw, 0);
    - } else if (netif_running(port->dev) &&
    - netif_carrier_ok(port->dev)) {
    - if (!port->phy_link)
    + } else {
    + if (port->phy_link)
    + phylink_mac_change(port->phy_link, false);
    + else if (netif_running(port->dev) && netif_carrier_ok(port->dev))
    netif_carrier_off(port->dev);

    if (delayed_work_pending(caching_dw))
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 15:59    [W:5.083 / U:0.944 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site