From nobody Thu Dec 18 23:26:07 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C79AC00140 for ; Thu, 18 Aug 2022 11:18:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244386AbiHRLSo (ORCPT ); Thu, 18 Aug 2022 07:18:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244383AbiHRLSj (ORCPT ); Thu, 18 Aug 2022 07:18:39 -0400 Received: from syslogsrv (unknown [217.20.186.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 632F93FA21; Thu, 18 Aug 2022 04:18:35 -0700 (PDT) Received: from fg200.ow.s ([172.20.254.44] helo=localhost.localdomain) by syslogsrv with esmtp (Exim 4.90_1) (envelope-from ) id 1oOdXb-0009d4-RR; Thu, 18 Aug 2022 14:18:23 +0300 From: Maksym Glubokiy To: Taras Chornyi , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Yevhen Orlov , Oleksandr Mazur Cc: Maksym Glubokiy , Taras Chornyi , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next] net: prestera: cache port state for non-phylink ports too Date: Thu, 18 Aug 2022 14:18:21 +0300 Message-Id: <20220818111821.415972-1-maksym.glubokiy@plvision.eu> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Maksym Glubokiy --- .../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/driver= s/net/ethernet/marvell/prestera/prestera_main.c index ede3e53b9790..3489b80ae0d6 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_main.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_main.c @@ -797,32 +797,30 @@ static void prestera_port_handle_event(struct prester= a_switch *sw, =20 caching_dw =3D &port->cached_hw_stats.caching_dw; =20 - if (port->phy_link) { - memset(&smac, 0, sizeof(smac)); - smac.valid =3D true; - smac.oper =3D pevt->data.mac.oper; - if (smac.oper) { - smac.mode =3D pevt->data.mac.mode; - smac.speed =3D pevt->data.mac.speed; - smac.duplex =3D pevt->data.mac.duplex; - smac.fc =3D pevt->data.mac.fc; - smac.fec =3D 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 =3D true; + smac.oper =3D pevt->data.mac.oper; + if (smac.oper) { + smac.mode =3D pevt->data.mac.mode; + smac.speed =3D pevt->data.mac.speed; + smac.duplex =3D pevt->data.mac.duplex; + smac.fc =3D pevt->data.mac.fc; + smac.fec =3D pevt->data.mac.fec; } + prestera_port_mac_state_cache_write(port, &smac); =20 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); =20 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); =20 if (delayed_work_pending(caching_dw)) --=20 2.25.1