From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 328E6332629 for ; Thu, 28 May 2026 19:35:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779996959; cv=none; b=CbcqmSjMwf1iiN+2f62KleLfYADiavUfNDarziJ4Gz14uFhibtdP7fd8nRPWTxs0ouP+T5i4D41TOeccXbISxoPWWSZXPgphMipTyx/pAuD7KbzFjBhx2l11cvP3wma9qYZ+d0W4grJEiI30zJ4Rmm3w4dMa+SfK7ifWJ6NOwCs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779996959; c=relaxed/simple; bh=YamYR0gB5YpvzrPrfHuKhWssK/k1gQlhxfDHYVzOSrw=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kKa6otZ4fQL8eRPADSBp/algDwKT8tm/GKgAWtI4uMUXFovxKU8TnwqfD9MKAtPLecms+uhR0g/RF10VBYC+jg5Fq5Wv5zP9KOQjyNmuwZV0slb2h8yHuPr/S9gfp9j6hN6H0NdTG2Rrc8qnFxaipUuwmkBL7aG1ROiFTCdhz3o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lxWYrcWw; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lxWYrcWw" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-45eea4c0649so814198f8f.0 for ; Thu, 28 May 2026 12:35:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779996956; x=1780601756; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=a/VphDQS+fwFrSctDzTxKBEr+9CTd6YQLukQQPgTJa4=; b=lxWYrcWwJrZuQW1jcttfRyr+fOH/VhFAZyhZe+oQlsKKQ9Z0Fti5PYFapsKlqcwB/R 49yfk+F6xAMR/afjGhT/1RURuRjE9AfWh2jP8Txc/of8FORLCLH427LFHAdf4pm/tMJN P/ruu/K4jgzfJcwjYHX6FsyD1GQ8s8MdSmJ0jUerfxXGtyRNY7Qc+ITL5SPWMSsfPf9S j/gpr7SIHcCOyEM+KZ69WfXApmFW62kejDK71UImDiFBbmayzEDtspn5u6wOg8MSKkWJ 333h6a4CoglQ/GQWibZkc/9fFhAc/rUl5azokpnOIwFhUtp4iCeSHIskJHUxXqGz7bDI euGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779996956; x=1780601756; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=a/VphDQS+fwFrSctDzTxKBEr+9CTd6YQLukQQPgTJa4=; b=HMnQDbrgXHYsczRL8txwp5m+6yr/idjaOKVmDgxMHWxD7MeHBZaKVvIyoV33+pe6UW ++3imr7PhR8xtiIhdm6QLkTVzgj6DRbOu5EU6qHN/shw9EebFbGMmLlbNJbIvDdLURPo 0+JyUOk4xM21FxGgU7/IrQc4wv2rHcc+oTEGqe7/kT5nohb9jcYWYJIoDcUoIbZDXptZ kwXL0TvxYSkmZETcCO0h1PEghJFMj2qlLBpePZgGuT1g5A8knqWQC0XsY4Y7iz5uGWdZ XddghFefPjVUj2ISDJVlzVx/9FXBobjiowNA5jSzzNEA8c4oCSrc/uK2zJATagP7asLU JKAQ== X-Forwarded-Encrypted: i=1; AFNElJ82a0FsmdIcvAOj+4J6dgJR0JISH1Ofn9NKhf4S+dcDeezkE+mQe0BaUQ/1eVY82Dxl/pokOoDZJvOYXMI=@vger.kernel.org X-Gm-Message-State: AOJu0YzC1h2X9eN5zpv42DbRul0trBx0osvKn2iXoVKwvUJrSksiGodc y7KYyb19ujmMqmaHB8CQbwQqi6UWW3pry42dXpnKaevClx3Y9k7Y6ev+ X-Gm-Gg: Acq92OGDD+k3Q+yoDmFXjjU6UkjIvit5Pz1w45A1K6T3GBO696wt7/mso+miFCtzWMl N0FzbyAnYnw5z5hWgK6N62ermQuOfpc8EPnVhgpp7e6Dbez53uJ4gQgwnpFez/PzJq0lHUriAHP /2w3YdpJ8lEgfFf04XhYcvjDfHzqlUT/SRVu+HhqoztBxPyn4aF8VijqpohHzN/eN/G4vM3TjSf 9pwjSwGcNqMV6h5j4t20Hfq2PVhVfTTXnlVHFhK5ndIm121ngO3RiIKDu5OfxAyexJl5ssMHrVe ZYoFwqsVjYm4bAEGrM8yAk5Y4NAc+qK2i6LCbSdgjM45qEiT6bG6ZIdlLdpklhQ6chWxBsEfXas 9oYdKX6qp4GzFC8Xwq9vEkZrlcyG1iyf4rNS2hBirZGmH0IKxJysas08M/jfxhhZmdlIdwQxMiQ OZcVXMUojQxlJiQsyB9NGROMPcmbZgSgqesXEWDNNrGbCQWoImBmn7Vb0mauo8fD3LoAfwVg08D fwUJKgvWxIhNVHN5A== X-Received: by 2002:a5d:588b:0:b0:45e:73a1:8cb5 with SMTP id ffacd0b85a97d-45ef05e7003mr820751f8f.34.1779996956276; Thu, 28 May 2026 12:35:56 -0700 (PDT) Received: from Ansuel-XPS24 (host-79-42-252-49.retail.telecomitalia.it. [79.42.252.49]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-45eec5eba06sm4220471f8f.22.2026.05.28.12.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 May 2026 12:35:55 -0700 (PDT) From: Christian Marangi To: Christian Marangi , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/4] net: phy: as21xxx: fix read_status speed handling Date: Thu, 28 May 2026 21:35:42 +0200 Message-ID: <20260528193545.11160-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260528193545.11160-1-ansuelsmth@gmail.com> References: <20260528193545.11160-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit With further test with 2.5G NIC it was discovered that phy_resolve_aneg_linkmode is not enough to detect speed higher that 1G when autoneg is enabled. Also in the switch case there is a typo where the speed mask is AND with VEND1_SPEED_STATUS instead of the correct mask VEND1_SPEED_MASK. Rework the read_status code to always read the speed from the vendor register and parse the generic bit only for the pause frame. Fixes: 830877d89edc ("net: phy: Add support for Aeonsemi AS21xxx PHYs") Signed-off-by: Christian Marangi --- drivers/net/phy/as21xxx.c | 96 +++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 43 deletions(-) diff --git a/drivers/net/phy/as21xxx.c b/drivers/net/phy/as21xxx.c index 0db82da8dbdf..97ca37c6929f 100644 --- a/drivers/net/phy/as21xxx.c +++ b/drivers/net/phy/as21xxx.c @@ -671,7 +671,7 @@ static int as21xxx_read_link(struct phy_device *phydev, int *bmcr) static int as21xxx_read_c22_lpa(struct phy_device *phydev) { - int lpagb; + int lpagb, lpa; /* MII_STAT1000 are only filled in the mapped C22 * in C45, use that to fill lpagb values and check. @@ -698,12 +698,20 @@ static int as21xxx_read_c22_lpa(struct phy_device *phydev) mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, lpagb); + lpa = phy_read_mmd(phydev, MDIO_MMD_AN, + AS21XXX_MDIO_AN_C22 + MII_LPA); + if (lpa < 0) + return lpa; + + mii_lpa_mod_linkmode_lpa_t(phydev->lp_advertising, lpa); + return 0; } static int as21xxx_read_status(struct phy_device *phydev) { int bmcr, old_link = phydev->link; + int speed; int ret; ret = as21xxx_read_link(phydev, &bmcr); @@ -720,58 +728,60 @@ static int as21xxx_read_status(struct phy_device *phydev) phydev->asym_pause = 0; if (phydev->autoneg == AUTONEG_ENABLE) { - ret = genphy_c45_read_lpa(phydev); - if (ret) - return ret; + if (!phydev->autoneg_complete) { + mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, + 0); + mii_lpa_mod_linkmode_lpa_t(phydev->lp_advertising, 0); + return 0; + } ret = as21xxx_read_c22_lpa(phydev); if (ret) return ret; - - phy_resolve_aneg_linkmode(phydev); } else { - int speed; - linkmode_zero(phydev->lp_advertising); + } - speed = phy_read_mmd(phydev, MDIO_MMD_VEND1, - VEND1_SPEED_STATUS); - if (speed < 0) - return speed; - - switch (speed & VEND1_SPEED_STATUS) { - case VEND1_SPEED_10000: - phydev->speed = SPEED_10000; - phydev->duplex = DUPLEX_FULL; - break; - case VEND1_SPEED_5000: - phydev->speed = SPEED_5000; - phydev->duplex = DUPLEX_FULL; - break; - case VEND1_SPEED_2500: - phydev->speed = SPEED_2500; - phydev->duplex = DUPLEX_FULL; - break; - case VEND1_SPEED_1000: - phydev->speed = SPEED_1000; - if (bmcr & BMCR_FULLDPLX) - phydev->duplex = DUPLEX_FULL; - else - phydev->duplex = DUPLEX_HALF; - break; - case VEND1_SPEED_100: - phydev->speed = SPEED_100; + speed = phy_read_mmd(phydev, MDIO_MMD_VEND1, + VEND1_SPEED_STATUS); + if (speed < 0) + return speed; + + switch (speed & VEND1_SPEED_MASK) { + case VEND1_SPEED_10000: + phydev->speed = SPEED_10000; + phydev->duplex = DUPLEX_FULL; + break; + case VEND1_SPEED_5000: + phydev->speed = SPEED_5000; + phydev->duplex = DUPLEX_FULL; + break; + case VEND1_SPEED_2500: + phydev->speed = SPEED_2500; + phydev->duplex = DUPLEX_FULL; + break; + case VEND1_SPEED_1000: + phydev->speed = SPEED_1000; + if (bmcr & BMCR_FULLDPLX) phydev->duplex = DUPLEX_FULL; - break; - case VEND1_SPEED_10: - phydev->speed = SPEED_10; - phydev->duplex = DUPLEX_FULL; - break; - default: - return -EINVAL; - } + else + phydev->duplex = DUPLEX_HALF; + break; + case VEND1_SPEED_100: + phydev->speed = SPEED_100; + phydev->duplex = DUPLEX_FULL; + break; + case VEND1_SPEED_10: + phydev->speed = SPEED_10; + phydev->duplex = DUPLEX_FULL; + break; + default: + return -EINVAL; } + if (phydev->autoneg == AUTONEG_ENABLE) + phy_resolve_aneg_pause(phydev); + return 0; } -- 2.53.0