Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 386DE46EF91; Tue, 21 Jul 2026 19:14:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784661252; cv=none; b=Sll7ihCpmjR6+brAt2vs/al94zyTpUWvhARsD+axYkqc+nd97Sp/5xqvFlHayUTyIvt3qb3ZGOF2dcKlRALPc5lpCa/mmcHik/9NwHYgyHT6fMISKierjWjLGYkEh4a4UQ0rPp41anGdXpNDSJmF8HAIb4AM5LtSuHabbW8Izhg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784661252; c=relaxed/simple; bh=FnyVh2ZYMqd8jE23UOPiMuCMnrG75yIKjRSyay/b924=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EB+04WnZ3AmcVuPzNQpxcVoj478aqJxeZbc27ApyG78sckMtNkCgho4vZqOAAiluJULpevUeAWF8lo1YvHUjC3GG393IN3SvYRFcvBjNZisoPoicjhZs+zuP425+gjdVJnNBxryj3UA+9MjeFiCej8HC+ZzuKyZjmyNKWuhVnW8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=nqKOM0fX; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="nqKOM0fX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 665C91F00A3A; Tue, 21 Jul 2026 19:14:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784661250; bh=71umN7XAQR70DILSoclQfdBB6/o3kADNiUWtR2qz1wc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nqKOM0fX3Y8qJtab+hVBZDPbVM8RI7xX1Yt5+KRnSB70uaw3S1MuoAvrPGc5Ie5A4 E7UNDwyvPar6cWe5ZT9KOa6SGy7zadlM+hvh2IiLvkfkhrBItmo8qaxIqipMbsUh7T gEcCK2L2Kma39cULrFF0THmW4yrdWkWnT2cFXjE0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Inochi Amaoto , Maxime Chevallier , Jakub Kicinski , Sasha Levin Subject: [PATCH 7.1 1286/2077] net: stmmac: dwmac-spacemit: Fix wrong phy interface definition Date: Tue, 21 Jul 2026 17:15:59 +0200 Message-ID: <20260721152623.151796342@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152552.646164743@linuxfoundation.org> References: <20260721152552.646164743@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Inochi Amaoto [ Upstream commit d1e3a4c3b24d4430d9987a3f349c6c2a959a389a ] The current MII interface register definition from the vendor is wrong, use the right number for the macro. Also, correct the interface mask in spacemit_set_phy_intf_sel() so it can update the register with the right number Fixes: 30f0ba420ed3 ("net: stmmac: Add glue layer for Spacemit K3 SoC") Signed-off-by: Inochi Amaoto Reviewed-by: Maxime Chevallier Link: https://patch.msgid.link/20260623074637.503864-2-inochiama@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c index 223754cc5c79b7..3bfb6d49be6c0c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c @@ -18,8 +18,10 @@ #include "stmmac_platform.h" /* ctrl register bits */ -#define CTRL_PHY_INTF_RGMII BIT(3) -#define CTRL_PHY_INTF_MII BIT(4) +#define CTRL_PHY_INTF_MODE GENMASK(4, 3) +#define CTRL_PHY_INTF_RMII FIELD_PREP(CTRL_PHY_INTF_MODE, 0) +#define CTRL_PHY_INTF_RGMII FIELD_PREP(CTRL_PHY_INTF_MODE, 1) +#define CTRL_PHY_INTF_MII FIELD_PREP(CTRL_PHY_INTF_MODE, 3) #define CTRL_WAKE_IRQ_EN BIT(9) #define CTRL_PHY_IRQ_EN BIT(12) @@ -118,7 +120,7 @@ static void spacemit_get_interfaces(struct stmmac_priv *priv, void *bsp_priv, static int spacemit_set_phy_intf_sel(void *bsp_priv, u8 phy_intf_sel) { - unsigned int mask = CTRL_PHY_INTF_MII | CTRL_PHY_INTF_RGMII; + unsigned int mask = CTRL_PHY_INTF_MODE; struct spacmit_dwmac *dwmac = bsp_priv; unsigned int val = 0; @@ -128,6 +130,7 @@ static int spacemit_set_phy_intf_sel(void *bsp_priv, u8 phy_intf_sel) break; case PHY_INTF_SEL_RMII: + val = CTRL_PHY_INTF_RMII; break; case PHY_INTF_SEL_RGMII: -- 2.53.0