From nobody Sat Jul 5 02:12:01 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1618347537; cv=none; d=zohomail.com; s=zohoarc; b=bGp/NSZ2tBWLiSsnJ2h5USM1KUv6VarpbsamF5uCQVoXK6gRykgbRV7IlyzuBjNv916FnOy8W+Y8qjqB4+9JobsYu+9oFYgW/5RprErskH/0xzZiZ9CzqjXuenG6YKHDYE2/8iG6tTZ/ZNQ0Lu4hcRuk15P3ENi3rgZzR5UGPUk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618347537; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Subject:To; bh=S/eXJcSq2HhKHNsX2aUDUvlU5NkuztFtEo4HnMwhfnk=; b=PM8sGrBG31Lz7ZxAbPzDAcbFbMJPr0iCQPzGXUjZBkI7ggc+2Gq5+0BxE9oruADAqqmxZa/JBiazK4U5iQ+TQGSt7lAJdwsS4eg+DHAnUxIRbbHcBWIGoYL6KxMbkNejgnTi1//cqYMfIK1SACqRrnLPQMH9xBLB2qre1Mb5seU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1618347537047950.9730884681226; Tue, 13 Apr 2021 13:58:57 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236780AbhDMU7O (ORCPT ); Tue, 13 Apr 2021 16:59:14 -0400 Received: from mail.pr-group.ru ([178.18.215.3]:59153 "EHLO mail.pr-group.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232412AbhDMU7M (ORCPT ); Tue, 13 Apr 2021 16:59:12 -0400 Received: from localhost.localdomain ([178.70.223.189]) (authenticated user i.bornyakov@metrotek.ru) by mail.pr-group.ru with ESMTPSA (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)); Tue, 13 Apr 2021 23:58:35 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=metrotek.ru; s=mail; h=from:subject:date:message-id:to:cc:mime-version:content-transfer-encoding: in-reply-to:references; bh=IceLHSRciLCsiWE8JEpawrwuHE84WPulPSs3kLGn14I=; b=SkxpCzNt+/Gd3mldY5KIo1a+1q76w1YOmBLPn8Z5CXmF6bL4wUjHyymTH4mQLKBf9BU2n/TcUF0Bo Pndc4unRhdOlGd3AYZBYWXdR/s7yzPkt9l9CHHLD4qaz5WI/xUwordu/RDnh67wi1J7tIQqnx5ziqS dssaszmbE16kCCdsTkYBVT3LexjFE+rNo902GnifEy64Ty8mUeP4q9CbABr1561fGupw4X9F3Iy74J UA/CkB93+N/xxXiYXxGlQXVlWBDDaOj1tekTCWuc9tT4+wfJLVnJtVdwpGts/bafL6b13y2YeSl46l QFtvLuztB4r4+CbzvUdn57mBk6ndtqw== X-Spam-Status: No, hits=0.0 required=3.4 tests=AWL: 0.000, BAYES_00: -1.665, CUSTOM_RULE_FROM: ALLOW, TOTAL_SCORE: -1.665,autolearn=ham X-Spam-Level: X-Footer: bWV0cm90ZWsucnU= From: Ivan Bornyakov Cc: Ivan Bornyakov , system@metrotek.ru, andrew@lunn.ch, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 2/3] net: phy: marvell-88x2222: move read_status after config_aneg Date: Tue, 13 Apr 2021 23:54:51 +0300 Message-Id: <088186566508e52bf3c4e8fea568eebea023fd3a.1618347034.git.i.bornyakov@metrotek.ru> X-Mailer: git-send-email 2.26.3 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" No functional changes, just move read link status routines below autonegotiation configuration to make future functional changes more distinct. Signed-off-by: Ivan Bornyakov --- drivers/net/phy/marvell-88x2222.c | 196 +++++++++++++++--------------- 1 file changed, 98 insertions(+), 98 deletions(-) diff --git a/drivers/net/phy/marvell-88x2222.c b/drivers/net/phy/marvell-88= x2222.c index 28fe520228a4..640b133f1371 100644 --- a/drivers/net/phy/marvell-88x2222.c +++ b/drivers/net/phy/marvell-88x2222.c @@ -86,104 +86,6 @@ static int mv2222_soft_reset(struct phy_device *phydev) 5000, 1000000, true); } =20 -/* Returns negative on error, 0 if link is down, 1 if link is up */ -static int mv2222_read_status_10g(struct phy_device *phydev) -{ - int val, link =3D 0; - - val =3D phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_STAT1); - if (val < 0) - return val; - - if (val & MDIO_STAT1_LSTATUS) { - link =3D 1; - - /* 10GBASE-R do not support auto-negotiation */ - phydev->autoneg =3D AUTONEG_DISABLE; - phydev->speed =3D SPEED_10000; - phydev->duplex =3D DUPLEX_FULL; - } - - return link; -} - -/* Returns negative on error, 0 if link is down, 1 if link is up */ -static int mv2222_read_status_1g(struct phy_device *phydev) -{ - int val, link =3D 0; - - val =3D phy_read_mmd(phydev, MDIO_MMD_PCS, MV_1GBX_STAT); - if (val < 0) - return val; - - if (!(val & BMSR_LSTATUS) || - (phydev->autoneg =3D=3D AUTONEG_ENABLE && - !(val & BMSR_ANEGCOMPLETE))) - return 0; - - link =3D 1; - - val =3D phy_read_mmd(phydev, MDIO_MMD_PCS, MV_1GBX_PHY_STAT); - if (val < 0) - return val; - - if (val & MV_1GBX_PHY_STAT_AN_RESOLVED) { - if (val & MV_1GBX_PHY_STAT_DUPLEX) - phydev->duplex =3D DUPLEX_FULL; - else - phydev->duplex =3D DUPLEX_HALF; - - if (val & MV_1GBX_PHY_STAT_SPEED1000) - phydev->speed =3D SPEED_1000; - else if (val & MV_1GBX_PHY_STAT_SPEED100) - phydev->speed =3D SPEED_100; - else - phydev->speed =3D SPEED_10; - } - - return link; -} - -static bool mv2222_link_is_operational(struct phy_device *phydev) -{ - struct mv2222_data *priv =3D phydev->priv; - int val; - - val =3D phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MV_RX_SIGNAL_DETECT); - if (val < 0 || !(val & MV_RX_SIGNAL_DETECT_GLOBAL)) - return false; - - if (phydev->sfp_bus && !priv->sfp_link) - return false; - - return true; -} - -static int mv2222_read_status(struct phy_device *phydev) -{ - struct mv2222_data *priv =3D phydev->priv; - int link; - - phydev->link =3D 0; - phydev->speed =3D SPEED_UNKNOWN; - phydev->duplex =3D DUPLEX_UNKNOWN; - - if (!mv2222_link_is_operational(phydev)) - return 0; - - if (priv->line_interface =3D=3D PHY_INTERFACE_MODE_10GBASER) - link =3D mv2222_read_status_10g(phydev); - else - link =3D mv2222_read_status_1g(phydev); - - if (link < 0) - return link; - - phydev->link =3D link; - - return 0; -} - static int mv2222_disable_aneg(struct phy_device *phydev) { int ret =3D phy_clear_bits_mmd(phydev, MDIO_MMD_PCS, MV_1GBX_CTRL, @@ -386,6 +288,104 @@ static int mv2222_aneg_done(struct phy_device *phydev) return (ret & BMSR_ANEGCOMPLETE); } =20 +/* Returns negative on error, 0 if link is down, 1 if link is up */ +static int mv2222_read_status_10g(struct phy_device *phydev) +{ + int val, link =3D 0; + + val =3D phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_STAT1); + if (val < 0) + return val; + + if (val & MDIO_STAT1_LSTATUS) { + link =3D 1; + + /* 10GBASE-R do not support auto-negotiation */ + phydev->autoneg =3D AUTONEG_DISABLE; + phydev->speed =3D SPEED_10000; + phydev->duplex =3D DUPLEX_FULL; + } + + return link; +} + +/* Returns negative on error, 0 if link is down, 1 if link is up */ +static int mv2222_read_status_1g(struct phy_device *phydev) +{ + int val, link =3D 0; + + val =3D phy_read_mmd(phydev, MDIO_MMD_PCS, MV_1GBX_STAT); + if (val < 0) + return val; + + if (!(val & BMSR_LSTATUS) || + (phydev->autoneg =3D=3D AUTONEG_ENABLE && + !(val & BMSR_ANEGCOMPLETE))) + return 0; + + link =3D 1; + + val =3D phy_read_mmd(phydev, MDIO_MMD_PCS, MV_1GBX_PHY_STAT); + if (val < 0) + return val; + + if (val & MV_1GBX_PHY_STAT_AN_RESOLVED) { + if (val & MV_1GBX_PHY_STAT_DUPLEX) + phydev->duplex =3D DUPLEX_FULL; + else + phydev->duplex =3D DUPLEX_HALF; + + if (val & MV_1GBX_PHY_STAT_SPEED1000) + phydev->speed =3D SPEED_1000; + else if (val & MV_1GBX_PHY_STAT_SPEED100) + phydev->speed =3D SPEED_100; + else + phydev->speed =3D SPEED_10; + } + + return link; +} + +static bool mv2222_link_is_operational(struct phy_device *phydev) +{ + struct mv2222_data *priv =3D phydev->priv; + int val; + + val =3D phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MV_RX_SIGNAL_DETECT); + if (val < 0 || !(val & MV_RX_SIGNAL_DETECT_GLOBAL)) + return false; + + if (phydev->sfp_bus && !priv->sfp_link) + return false; + + return true; +} + +static int mv2222_read_status(struct phy_device *phydev) +{ + struct mv2222_data *priv =3D phydev->priv; + int link; + + phydev->link =3D 0; + phydev->speed =3D SPEED_UNKNOWN; + phydev->duplex =3D DUPLEX_UNKNOWN; + + if (!mv2222_link_is_operational(phydev)) + return 0; + + if (priv->line_interface =3D=3D PHY_INTERFACE_MODE_10GBASER) + link =3D mv2222_read_status_10g(phydev); + else + link =3D mv2222_read_status_1g(phydev); + + if (link < 0) + return link; + + phydev->link =3D link; + + return 0; +} + static int mv2222_resume(struct phy_device *phydev) { return mv2222_tx_enable(phydev); --=20 2.26.3