From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0D72CCC6B2A for ; Wed, 14 Oct 2026 12:37:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=b0s0HJcrHfVogUWWjrXT8JW2mX9j/5XCow5nTw9k7K0=; b=nVH5vs38/yKAWd W1kY5SVSJRM+VMAnJrraT0qWGKgD+mWPJw90WNmRwkjCYIa/QTDjZ/QNnBMMrKqRI0ztPpWmEtAkg yZvT6LAu7EkhAJWe33WlfCCtP13ipfTAm2NlAeNKfe5uuJFotY7/15+bbRSIjKZfFKTGIusXrYsk8 SSUgFqRZ8WmgECSYpu0mls7Jo2MPmOTLVDAquy9uIzzTA5vJZFvVj0OacbZVEzonFrMIjPIPyBgAK UHupBk+PbEtMf2CKuyocFyU8yFRxYK3fEOFPrrPBv5KQuV25aN12e4+yn88foDGzMMk+UtArNpocR hazHcDRXdh+MAoR71dow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xGyEf-0000000FRzf-0RF8; Wed, 14 Oct 2026 12:37:33 +0000 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xGyEU-0000000FRoq-1Bh8 for linux-amlogic@lists.infradead.org; Wed, 14 Oct 2026 12:37:23 +0000 Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 69EAR3O4466254 for ; Wed, 14 Oct 2026 12:37:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= HUUFLBAcLxOP3+OVTyoEpsSPqEGr/1sOU62oPMkNAZQ=; b=MmkUAop9sci6+WWj wN5lcHy+iw/DsXVUsVl1mSBuoCvqhQh7otgrOJOZz9BJdNQ/cx9xZRI8j1Mg9rvz HuSi1IWFMc4/jayAjhHBo/yhRMUixl6klMgnnRBRi4HrAD+mtUTHdME/vdACf06N 9hRquTMLNrL9EAutxwLnMRgIzwWPTo6jpiLrNt5fqiWscuTwKpQ1b0Y0EfaMzcqg bIJGwLAHZTx9hPeM2p0hId8FU8PcAxI0lG+1HNQvZ15wSJ0sVZAdHytC3wuc/qLy bPyHT0/QhdO6L0d3ttef+xgFjWePTUlw6JzYZ7G+jvo8zEJeAhfLFq9m0I250fn4 KRZ+0g== Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ha80crf0w-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 14 Oct 2026 12:37:21 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-91430af782dso90666966d6.2 for ; Wed, 14 Oct 2026 05:37:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1791981441; x=1792586241; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=HUUFLBAcLxOP3+OVTyoEpsSPqEGr/1sOU62oPMkNAZQ=; b=SHECeko5M6I/iqUSqhWJewrizEPkjxNZVSDKRmntiQ8a0Bp97PHKbgQR+eN+d1Ulxl gffScr5U2NLwwahy5DJoEj/z7Phz9pR6BexCK8NhgrBwJojV1U+U/L8gNl0c6RlEb4wz eqb+u3uZdx8FBJOnWyluFSPQupE0YRkx1bMaIlBtFBts/VlAtCEcxDYjmKxOsFrlfHUt 41eBaRVGkFzfPSec6DmBn85E0eCneqZ0iA7Q9L/MCH8+Fp1/iym7T//8f5zLxdOKhEKI HAuR+x2MDWWWR9gr/FmFNPqlhMCN4hAyigxifZ2iIFmR5IAla2im6Xoq4Q+hmfRIb+0N eIug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791981441; x=1792586241; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=HUUFLBAcLxOP3+OVTyoEpsSPqEGr/1sOU62oPMkNAZQ=; b=ePsvB9nmD8oSyVgWTou3YRahukgwJTGp9RqP5RmOhOUJ0cjRzckd+CvERvmGld+6/O NtKG/opmE3MhYfTQIvqfZB/bPR5c3CIt2I+Od/2j3eshaBfzC8zom3+NAyHJP7auPFm8 ahcifSN9K3xU0UAIQXtel3OCR0a9+Fo+ky7OvOvdLbYrqHKxBwMPu07nUVpXSOq5MyFW wve/BSwGBat/QOAdW65RAwHiGVu12dyHRIPtAy/jKtRE2sPDmMSKMMSi699DBm8aIxZc /gZDUd1gcff0StVdYx005AZ9uhsW+vdM6PYjqpRwY8AGf62fgxvDPy9W7A0x2neHQQDg fWsQ== X-Forwarded-Encrypted: i=1; AKwUvBwTSLQv6MLloHQ4/ULoTLqFisYjf/rqWxS70z/kMf6fhU0aPTIp00bVf0qrdzURfjgAOAodTTqKz6QtKehu@lists.infradead.org X-Gm-Message-State: AFq9FYLQqX4/5A7sAAhvVjJUswb+v4z54JS2w5/Moi8ho0h4tEXlDhjz iJ8DBuSBs/OJiYo/dtwGv2+IlLO3bk4TR1a543SYfxxvZiVgQAb8PZ5O13Y11nky96R2jRix9hS Ya2qQfX4TfvmaR90tDKj0nrnAN0+SCRtvIU8uj/LQQCy/eSl+KrlDRwv/k+2z8ErpFiKbwSHCsg == X-Gm-Gg: AYBFou0qmzbcFZs7Vo3cSxYPlfHt5K8tVu2ibQxRYUFu2PwYdWzGlBxGmhtBXVJzmQQ RoceIZQucitmVgF5YsLITIOuaUfv7qFb5vTbX6rfdUApxlB2k9priE1t3Y1f9EEgBspFea0DKfr VBEE3GJB59QUYd2VuwGolMp8zNrc/iFHYRfT359FYsGhWh/oP7QJXWUjgagS1KM6H2T6KNot/vi hg1twtRcTGJOKvUDZ05GjGHZludbPzNfu6qannRlpMvu+f1dGURzm0InbtLxk4BaRwSVM/MJ3Yc pqy7D3/EIsY9XVB4Wg2Xa6+xtWwU3MQ2ZyxHxqWllQ/TYgEmW1Y2wF+yr5dJ5u21mAxRogIU++N 4pS7EAnRnM0XI9KnveSeHuxJF6imY X-Received: by 2002:a05:620a:4709:b0:93b:d7a0:d9e3 with SMTP id af79cd13be357-93ebd259161mr2675133485a.61.1791981439729; Wed, 14 Oct 2026 05:37:19 -0700 (PDT) X-Received: by 2002:a05:620a:4709:b0:93b:d7a0:d9e3 with SMTP id af79cd13be357-93ebd259161mr2675126185a.61.1791981439129; Wed, 14 Oct 2026 05:37:19 -0700 (PDT) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:8916:7b9b:97a2:6c96]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4a19f318c31sm206122615e9.3.2026.10.14.05.37.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2026 05:37:18 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 14 Oct 2026 14:36:43 +0200 Subject: [PATCH net-next v16 4/7] net: stmmac: qcom-ethqos: update phy_mode to the resolved interface in mac_finish() MIME-Version: 1.0 Message-Id: <20261014-qcom-sa8255p-emac-v16-4-0266c2ead980@oss.qualcomm.com> References: <20261014-qcom-sa8255p-emac-v16-0-0266c2ead980@oss.qualcomm.com> In-Reply-To: <20261014-qcom-sa8255p-emac-v16-0-0266c2ead980@oss.qualcomm.com> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Lunn , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , Vinod Koul , Giuseppe Cavallaro , Chen-Yu Tsai , Jernej Skrabec , Neil Armstrong , Kevin Hilman , Jerome Brunet , Shawn Guo , Fabio Estevam , Jan Petrous , s32@nxp.com, Mohd Ayaan Anwar , Romain Gantois , Geert Uytterhoeven , Magnus Damm , Maxime Ripard , Christophe Roullier , Bartosz Golaszewski , Eric Dumazet , Radu Rendec Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, Drew Fustini , linux-sunxi@lists.linux.dev, linux-amlogic@lists.infradead.org, linux-mips@vger.kernel.org, imx@lists.linux.dev, linux-renesas-soc@vger.kernel.org, linux-rockchip@lists.infradead.org, sophgo@lists.linux.dev, linux-riscv@lists.infradead.org, brgl@kernel.org, Bartosz Golaszewski , Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2526; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=kqw4gb8apOiVp3CcayV1NpfyLAXLAzYoPSPv7h0hX18=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBqz3dpe3YUAPOTSmHWHwKyO4Gn0NPJB7SEy59Cl is1k9W4sI+JAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCas93aQAKCRAFnS7L/zaE wywlD/9xJCp9lL+ZiMDkuKH7qK8YrUboTI36b+vI3x9ZgCGsyNs7Zu2oaYFKMGti/G1ilAPuR1L bmWs6jWD0sIinELld63odrSoCeoYY3SAWY/XZm1U3dCCKvsecfhS2xOYYpR+U0crYDrDg0YmFhw VgIZ1TZnO/ddLJ4duxjFjEHcgtJ1WniYm1mfxQKljV5xhOhvTfKVcUhvzH61qfLuhiOxhqov6C+ GQxz7sMayjtyPJxQvhjqMVvLCUAJHQvd38hOsXjngHAdSRwejgsY/3BOnJFzlsUbm0A99THLHmP 1GsX0tIYaAH3J1AD7jGg4/HLC+itt97RLPdtmJOF1Viby0GUJRtAVQRuiwMWmG89clvousBBhbj SbguvN8nnpnhY9S8RGdkQwTIt7+v37de4B4jWXrYaDaxOlAetyLSkqW2ERHMRu2Yq+JD56Xmi94 U+DiOjn1TNjN5mpKYqPJdXbXaUrrZWxHMlURaX6ElZQzpz1cd4E4hNKaqoGCvVjCQa0h8n/BfuZ +WA+GJEmWxOuugQ8WvHz2stN5YnA8k0Ib1irjQeU4kYxC6BQHhLH7XjmjIXwbPoKfnskJh57Gq5 7sL9rGWQsWoyF/vfr+MLW4JBM33XUIfxAjBfWKVJ2cMlf86Nq+au14uzK9m5YAgBZvn3lBaReAn W45KXwiaON/5o/g== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Proofpoint-Spam-Info: AW1haW4tMjYxMDE0MDA1MCBTYWx0ZWRfX3QOQ1aJHq4CZ zas87QgSD0MH40uAgEEdam47PIt1xhYcyS7ek2kG6Be3CjZaSZp3TdoYBUi258X5gFMXWWtSImM F6wiHKOuUhObLm7ZSfg3kcI2/ljFbmc= X-Proofpoint-GUID: H9PG_I37UjFLfK8rVKDg0quTW1nNX-6j X-Proofpoint-ORIG-GUID: H9PG_I37UjFLfK8rVKDg0quTW1nNX-6j X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMDE0MDA1MCBTYWx0ZWRfXx10gRU82XRGX 5d9CJYUV5McI9b6sQXiqxmn8QDHRG50da9kjWkjxeII55rI9hShMfcyGpYMiceIZjNzgHOBosqX bjczLOvrBLNJmwv9BR0XSRwWXRJJ38MnXxXO6ZC3ox2usAa8XkY/31Rv/2hRZ/PSfiI9FZkmwzU JEURbhxc0hZkMt0wOQGtdGNqL5Uw0dlkryLiEjz1iHAIJ7WoYyjqX1wnjVYWTrHqy9putbDkx8G AtZU6wP/y+37h2jDXRqgaq/8ac5xfxEs8QeHRqDc0hSJpo9SQ4d6l/j5LeVcxlZgRUUzYQBJHMZ 5KX2xKECzQzLNmOpciJRhncv/jqoYG10KDFongQZ7eb03DfIyMGfiXsHhKFdcSvNZs3Oai3qo85 WSXWxow0ShCbCt8M6EldRcW3RgmH/CerkHqNM2HPbCciYeFTIzpgGoyTCItgYaVHhS6RfifFs3f 8JR4zAJ4X5PP84rRGKQ== X-Authority-Analysis: v=2.4 cv=JegpPkKV c=1 sm=1 tr=0 ts=6acf7781 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=660iZSQnnn4A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=FCP7PvUSyU9qYmcNpmEA:9 a=QEXdDO2ut3YA:10 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-10-13_01,2026-10-09_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 clxscore=1015 phishscore=0 suspectscore=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 impostorscore=0 spamscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2610080000 definitions=main-2610140050 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261014_053722_436589_4F33005C X-CRM114-Status: GOOD ( 18.46 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org ethqos->phy_mode is read by serdes_powerup() and qcom_ethqos_set_sgmii_loopback() to configure the SerDes and its wrapper for the correct interface. It is set once at probe from the DT phy-mode property and never updated. phylink resolves the actual runtime interface and passes it to the mac_finish() callback. On platforms that only ever operate at one speed these two values are always the same, but when the interface changes at runtime - for example switching between SGMII and 2500BASE-X - the stored value becomes stale. The next serdes_powerup() call, on a subsequent link cycle, then reinitializes the SerDes to the wrong mode. Update ethqos->phy_mode from the interface argument in ethqos_mac_finish_serdes() so that it always reflects the last resolved interface. With that, we now update the phy_mode to the runtime-resolved interface, so any subsequent resume with a 1G SGMII link skips the loopback setup and the DMA reset hangs. To remedy this, extend the guard to include PHY_INTERFACE_MODE_SGMII. Signed-off-by: Bartosz Golaszewski --- drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index e2e611a4d2c06bd567e9d5e353b3a4893623de6c..f7cc46d86591a220a183529a8f89456f9153385d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -190,7 +190,8 @@ static void qcom_ethqos_set_sgmii_loopback(struct qcom_ethqos *ethqos, bool enable) { if (!ethqos->needs_sgmii_loopback || - ethqos->phy_mode != PHY_INTERFACE_MODE_2500BASEX) + (ethqos->phy_mode != PHY_INTERFACE_MODE_2500BASEX && + ethqos->phy_mode != PHY_INTERFACE_MODE_SGMII)) return; rgmii_updatel(ethqos, @@ -637,6 +638,12 @@ static int ethqos_mac_finish_serdes(struct net_device *ndev, void *priv, qcom_ethqos_set_sgmii_loopback(ethqos, false); + /* The interface mode is only known once phylink has resolved it and + * may change at runtime, so keep it in sync for later + * serdes_powerup() and qcom_ethqos_set_sgmii_loopback() calls. + */ + ethqos->phy_mode = interface; + if (interface == PHY_INTERFACE_MODE_SGMII || interface == PHY_INTERFACE_MODE_2500BASEX) ret = phy_set_mode_ext(ethqos->serdes_phy, PHY_MODE_ETHERNET, -- 2.47.3 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic