From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed2-f33.google.com (mail-ed2-f33.google.com [74.125.228.97]) (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 DC815502778 for ; Mon, 28 Sep 2026 22:07:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.97 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790633229; cv=none; b=qpdmRzEYy8ate9BwO8p10pdpeDuAhaSq+Cid+vEJnyvlmf0LTiq58iuf4AsdK3wtf3GiqJT8uwW8RuaCe32l+s6Gf1NHhCqXyergDb9LM3ipUSI+sPmqB0gIlz+mkhQBOoeO9x4flVDoo2ursZRSpBy8P6rZ7OsRTgiO6RF446c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790633229; c=relaxed/simple; bh=LBdGe8R4oviA310VZyXHJ88W41OaTYLb/e2Nhki1T4Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TAk6QrwSacR6wNSdSfgRwp7SggBWAFGdcR9HTd05KHsq45SMK410yA6a8j9DXAgVnhJfs8sjh4VDwhaltTaJpH0aJnJeq5yFnR9s6iu+WNlewsBjPne+Um1N7Nq8hHWCBI2a2A+DVzJFWcJRhl5ftu9doiRp0aVvgdKTMbZIlFQ= 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=C1GF3vv9; arc=none smtp.client-ip=74.125.228.97 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="C1GF3vv9" Received: by mail-ed2-f33.google.com with SMTP id 4fb4d7f45d1cf-6ab0c3c3af6so3394294a12.1 for ; Mon, 28 Sep 2026 15:07:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790633225; x=1791238025; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=U7L/fn4+DNGPLasPjiTA/4S/hqwTcpwadDXw7wo7nOs=; b=C1GF3vv9Zs5BXs9CHl5zyV7h+uldCkXp17idOSiFQB49P9YGxeJxqEgVx3iicqIZLK DiMXPeFRbNpxHPMfW7KPoandFxXfdgFTfFabopuFMFgw1nURwhJzlyRNcK7JjYm3D+vM 00/2+leYkgNg5KpuX3JpePV3SjEyvPQHe4fzETVgKOagtN86gsUx0YG20g1PXx9OgjmD Tx+Dum1gg+FHmFjhhkCk5WZX/DGTqm5C5V0HuiYfV/EhAYe+SUrmutH65Ddwn6O9KZ6M cWK2UMY4u+VHVxkUkyXKPJclpfOpYku5c9ycCbocsa3fC8UgaZ294q93/1YkE2cFn+Sw 3npg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790633225; x=1791238025; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=U7L/fn4+DNGPLasPjiTA/4S/hqwTcpwadDXw7wo7nOs=; b=yUk2pWQ3XgOvase7CJjmamaPENT2HG0a28q5aVX2IAkV49pKPDyKD1kCz2PJEs/K5H Y9ZYOIKaaivPgpYAGDfV0QhXRUtdPivY24UrISmTIeBvhgWgVxCo57LyGW8I1Q7ZZngV CaJ2hQJW9Il7zctxnXGtRxhqHPirb3wev8BP6p25u4XOnJOaY2JwDewIBmfSzTFqLN0c WVizG1SYZh0lgMWXhKSNlMri6MeZKWdnqwIzw7j7JYcpxMuCQoOWoEx+ywXCY5w7F44R 9FBKJASoRG5VDUP/plMC7u4IjtaFLbnpvWPYacaLTCqOg+MNodBD5MQitRCgweaz/WR8 JUzw== X-Gm-Message-State: AFuF++lVOpYnJpSroyqCfpT3/lVIgFIK1CEoTNnGtfjwAmVNWl6H0MxQ J2YwD+3nCT393xSrpK7VlZ34uiawFzLSgAFjY5vJR4+HTbsfBGeb2DlmFvWwJei3M4A1jQ== X-Gm-Gg: AYBFou1anLQ+KadZljbdEWA/x5dE0wUyGbP1YuY6XZ3rYvmlosPHDesF0JA1H2R7QtC Gj4gYsZsZIXREsKdJO6mWephOPV8895vIbKJqWCLEAXPt/30HPxQb7SegJ1hxOp82/nn+i82NOo Kk2bM16jQKbVkzTRrWTKcu+bzfGVu3QZMaF+YOiKiZf1PXiiZ4UeM2RuteWzff6ejOpe+u4NKgE Qi40Wxpke2PrsE8afpm5oARQsE5aeztLRnlKF0Ny8Y2QWgR6M0rTSg/tSkQwSRVuYkbyKHsWqFp VbVUQBaFLsR7+Ye4j+azsYCbq5wJ+UChCec315rrDsrYJy7LJeU820qnLB01Z3CQvnrsbtpUqkY 1oDQFc+ejEcPOJLAxLQ5f/meDEHSFgF8lSEYSzPHBTV5xJQgS2w87KUOsiiwTqU6aAhtWa9TpKT 30pt5SlHSO8brvB82+cRXf/HQhjz2WX7plL55F9Rq61Xbllji2no69P8sLDuvcGV3Yfj2KL1A+w rRzZi1JEOOFlOObackZFXus3TtqaYKfn2Lfxk/X2PHUB3KtDb+s173R X-Received: by 2002:a17:907:c50c:b0:c26:2751:3da4 with SMTP id a640c23a62f3a-c2ae97cc828mr890313966b.13.1790633224767; Mon, 28 Sep 2026 15:07:04 -0700 (PDT) Received: from localhost.localdomain ([2a00:801:793:68fd:c07a:9093:1956:b4bf]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c2ae757b50fsm520177266b.32.2026.09.28.15.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2026 15:07:04 -0700 (PDT) From: Yongzhao Chen To: netdev@vger.kernel.org Cc: Christian Marangi , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , John Crispin , linux-kernel@vger.kernel.org Subject: [PATCH net v2 3/3] net: dsa: qca8k: fail mgmt Ethernet MDIO access on busy wait errors Date: Tue, 29 Sep 2026 00:06:29 +0200 Message-ID: <20260928220629.238-4-yongzhao.derek@gmail.com> X-Mailer: git-send-email 2.45.2.windows.1 In-Reply-To: <20260928220629.238-1-yongzhao.derek@gmail.com> References: <20260928220629.238-1-yongzhao.derek@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit qca8k_phy_eth_command() polls MASTER_CTRL over management Ethernet until BUSY clears, but only bails out when the poll timed out and the last poll request also failed. If every request succeeds while BUSY stays set, the -ETIMEDOUT is dropped. A read then returns MASTER_CTRL data from a transaction that has not completed, and qca8k_internal_mdio_read() does not fall back to the MDIO bus. A failed poll request does not stop the loop either. qca8k_phy_eth_busy_wait() leaves the value unchanged on failure, so the BUSY test then uses the previous value, or an uninitialized one if the first request fails. Stop polling when a request fails and return the poll error or timeout. The early return also leaked read_skb, which is only consumed when the read request is sent; free it on this path. Fixes: 2cd548566384 ("net: dsa: qca8k: add support for phy read/write with mgmt Ethernet") Signed-off-by: Yongzhao Chen Assisted-by: LLM --- v2: new patch, addressing the Sashiko review of v1: https://lore.kernel.org/netdev/179054715863.3145.10179961093285192493@kernel.org/ drivers/net/dsa/qca/qca8k-8xxx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/qca/qca8k-8xxx.c b/drivers/net/dsa/qca/qca8k-8xxx.c index 00a70c7880e..420b375b8b0 100644 --- a/drivers/net/dsa/qca/qca8k-8xxx.c +++ b/drivers/net/dsa/qca/qca8k-8xxx.c @@ -728,12 +728,15 @@ qca8k_phy_eth_command(struct qca8k_priv *priv, bool read, int phy, } ret = read_poll_timeout(qca8k_phy_eth_busy_wait, ret1, - !(val & QCA8K_MDIO_MASTER_BUSY), 0, + ret1 < 0 || !(val & QCA8K_MDIO_MASTER_BUSY), 0, QCA8K_BUSY_WAIT_TIMEOUT * USEC_PER_MSEC, false, mgmt_eth_data, read_skb, &val); - if (ret < 0 && ret1 < 0) { + if (ret1 < 0) ret = ret1; + + if (ret < 0) { + kfree_skb(read_skb); goto exit; } -- 2.43.0