From nobody Tue Dec 16 12:37:05 2025 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 D2AF7142E92 for ; Thu, 18 Jul 2024 14:57:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721314681; cv=none; b=nHAxu27oaKbSM2jksIzB5ZrYMp3fci9u7ZrJPhqjMFnfIAkLb4nzpFJV8w3ZPg67qEOqbGLUmrO/bFMQ2TA2HfBeLVdi2/f9mxsh4wLbzSEfBh2hBQcISUIWZsyy2gUIXq7dmZaFWVHMvpoHWPqm3g9E9g3YFvcAp4UOzaDgkeg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721314681; c=relaxed/simple; bh=7I9tJroh8I1AkLj9d0MbU1dtLMjMfbxN6dEchC2ugeU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Co+I1yNs0QeyivEXBa7GKVyHFQKfn3SeuZ9D6087YGEdHF33gN2HtLTATi2GAvWsCiPXbmOJjYzD7VKwBDAh23rn6j/Vx/np6hiH8TziotQwiQHLr3z1DAb+FidftUZQ4e4vXTMr9x2ORNmg9vx/G5ugbmd9gBNwdCImcaimkAA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=JLO2FJqh; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="JLO2FJqh" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4266f3e0df8so3463595e9.2 for ; Thu, 18 Jul 2024 07:57:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1721314678; x=1721919478; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xao5cSIMl4nUJRUMK33h1hsF1hwBAVfY7Y5/Z14dkdY=; b=JLO2FJqh8pAvk5N1F/TDUyQtkLPNkr3eif6kDuVZnq0pyixFdceonKu6Zn/HPxWo00 kzw3xW9yB6qeS4fqrqkREVNmIgGadM/JmXLhTCoxzX9ODc+EHG/kNItweeKKbNItLsQr DcOSvKnU37sAoEskAEzJIMQ1UdYbT9OWt6fFArdRYS7kw4fd1IZi2bWuGYUGKtjOxWm5 E3cGDug1nPMv+ppYZx4FjXJyGQMwJlT3timx6HHI9Q5Vm95Kg/ZTZR0hrHbcXH1akC5O 63gI4V57K3Am3FhDN1TUFv+wv7ZdNRrAqpIhtTU2vbw7OTFcq3FBECt+/NpBL1tICl/+ TOSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721314678; x=1721919478; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xao5cSIMl4nUJRUMK33h1hsF1hwBAVfY7Y5/Z14dkdY=; b=n20rT7D8kgRZS2THZJ4aHi3zLY4wl0qCGZy+qHzN8NbvZRpT7EU8W8ocPksGr8K4Hr FdYH20IVzuzsFyPPmbBX1AkQSEKY+z3ynq7NivHNurUAKAxmaNKk1Q7Nr3eU0Os7tpco QJ3THNDw8pU1us4gxQSFzdUdngVrWjNP8GS+lPzDSC90+P06mQU2eoy91YNifUaZP0pG 8ycQcTNZ5nZvmkOfFU9G1UE6Zqe2Tg/GumuLxzpPi+C5a86O1x8OlGiP3ZLJ7NxqbOGR DIiBskyVUSaLzvOePcfetJx7hLTqNhRCZr8/QbRT4JBZBQsKhsBjIlCTuYl8Casct7jg 2keQ== X-Forwarded-Encrypted: i=1; AJvYcCWWyEPKvqJtlXHlTp1qyt6kSUd+ryGsr/5xmtbzeTWWicdX2uHbXeWOEljQA0bjQrN5yVpVeXl/9Jddi+j0kxtD7/5gR4jjaj6cEJg+ X-Gm-Message-State: AOJu0YzXNBKfpOmLe2PXskAktshcvsd0aMNlg88FTtLdOMf6IYRSBE/X NpjC3fzgBva32S5iLnoYWilvsz/+E9027+RdMEmmwIhWRGpDXZSoDYvM1coPmVM= X-Google-Smtp-Source: AGHT+IHSigq7kQ41NwUPTLCmMIcoPfUWubsX81+aoWc8hHI/gd3MGv8dVx16s+DFg/48Nm68yhbeUA== X-Received: by 2002:a05:600c:1ca8:b0:426:54c9:dfed with SMTP id 5b1f17b1804b1-427c371a871mr35992455e9.28.1721314678062; Thu, 18 Jul 2024 07:57:58 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:dc:7e00:58d4:2f84:5fcd:8259]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427d2b294fbsm17148855e9.34.2024.07.18.07.57.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jul 2024 07:57:57 -0700 (PDT) From: Bartosz Golaszewski To: Andrew Lunn , Heiner Kallweit , Russell King , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Jon Hunter Subject: [RFT PATCH net] net: phy: aquantia: only poll GLOBAL_CFG registers on aqr113c and aqr115c Date: Thu, 18 Jul 2024 16:57:47 +0200 Message-ID: <20240718145747.131318-1-brgl@bgdev.pl> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski Commit 708405f3e56e ("net: phy: aquantia: wait for the GLOBAL_CFG to start returning real values") introduced a workaround for an issue observed on aqr115c. However there were never any reports of it happening on other models and the workaround has been reported to cause and issue on aqr113c (and it may cause the same on any other model not supporting 10M mode). Let's limit the impact of the workaround to aqr113c and aqr115c and poll the 100M GLOBAL_CFG register instead as both models are known to support it correctly. Reported-by: Jon Hunter Closes: https://lore.kernel.org/lkml/7c0140be-4325-4005-9068-7e0fc5ff344d@n= vidia.com/ Fixes: 708405f3e56e ("net: phy: aquantia: wait for the GLOBAL_CFG to start = returning real values") Signed-off-by: Bartosz Golaszewski Tested-by: Jon Hunter --- drivers/net/phy/aquantia/aquantia_main.c | 29 +++++++++++++++++------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aqu= antia/aquantia_main.c index d12e35374231..6e3e0fc6ea27 100644 --- a/drivers/net/phy/aquantia/aquantia_main.c +++ b/drivers/net/phy/aquantia/aquantia_main.c @@ -653,13 +653,7 @@ static int aqr107_fill_interface_modes(struct phy_devi= ce *phydev) unsigned long *possible =3D phydev->possible_interfaces; unsigned int serdes_mode, rate_adapt; phy_interface_t interface; - int i, val, ret; - - ret =3D phy_read_mmd_poll_timeout(phydev, MDIO_MMD_VEND1, - VEND1_GLOBAL_CFG_10M, val, val !=3D 0, - 1000, 100000, false); - if (ret) - return ret; + int i, val; =20 /* Walk the media-speed configuration registers to determine which * host-side serdes modes may be used by the PHY depending on the @@ -708,6 +702,25 @@ static int aqr107_fill_interface_modes(struct phy_devi= ce *phydev) return 0; } =20 +static int aqr113c_fill_interface_modes(struct phy_device *phydev) +{ + int val, ret; + + /* It's been observed on some models that - when coming out of suspend + * - the FW signals that the PHY is ready but the GLOBAL_CFG registers + * continue on returning zeroes for some time. Let's poll the 10M + * register until it returns a real value as both 113c and 115c support + * this mode. + */ + ret =3D phy_read_mmd_poll_timeout(phydev, MDIO_MMD_VEND1, + VEND1_GLOBAL_CFG_100M, val, val !=3D 0, + 1000, 100000, false); + if (ret) + return ret; + + return aqr107_fill_interface_modes(phydev); +} + static int aqr113c_config_init(struct phy_device *phydev) { int ret; @@ -725,7 +738,7 @@ static int aqr113c_config_init(struct phy_device *phyde= v) if (ret) return ret; =20 - return aqr107_fill_interface_modes(phydev); + return aqr113c_fill_interface_modes(phydev); } =20 static int aqr107_probe(struct phy_device *phydev) --=20 2.43.0