From nobody Sat Oct 4 00:28:04 2025 Received: from pidgin.makrotopia.org (pidgin.makrotopia.org [185.142.180.65]) (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 C1E0B286D53; Fri, 22 Aug 2025 16:12:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.142.180.65 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755879127; cv=none; b=TAeZWq2WKzpziRqCULiN5mk3G13tzymK1i2LlBlV+9aLb7eo4hPqaCqx7useETUwzdPTzLQBlTVA2ZGhxb7REcMu3EmQ/+LYT2r9clrFSFgVSBleFBZoE/kGqjdbEmXmWm3qKtTuhofy8xCHWjbt8Xv7Pvfbs/lWhE2v88rSiNk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755879127; c=relaxed/simple; bh=xXiKD0VrPC7ZiS3o5VbC7gFbGWEB7qIrO+VYO2W8wFw=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=nXrbWQO9WTrN0vtS9Nj7vy9q9Vjz5ZNKsjjcn1H2+UqXczHPsCBBz7NIgZokm+KJaFvGHbyZ0tDhk4cMMryYDbemCK0cb+O2yX99ryeEYOu3TUIs7JHgmOhwkVCjIkeOWEetlGLtc6qacYY3f7a2EXVy2xCddz7xpBBwkDcJVxM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=makrotopia.org; spf=pass smtp.mailfrom=makrotopia.org; arc=none smtp.client-ip=185.142.180.65 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=makrotopia.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=makrotopia.org Received: from local by pidgin.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.98.2) (envelope-from ) id 1upUMy-000000006oP-3eOj; Fri, 22 Aug 2025 16:12:00 +0000 Date: Fri, 22 Aug 2025 17:11:57 +0100 From: Daniel Golle To: Hauke Mehrtens , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Philipp Zabel , Russell King , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Andreas Schirm , Lukas Stockmann , Alexander Sverdlin , Peter Christen , Avinash Jayaraman , Bing tao Xu , Liang Xu , Juraj Povazanec , "Fanni (Fang-Yi) Chan" , "Benny (Ying-Tsan) Weng" , "Livia M. Rosu" , John Crispin Subject: [PATCH net-next v4 4/7] net: dsa: lantiq_gswip: introduce bitmap for MII ports Message-ID: <019fc8ed06f2317976eac143320d1dc046e8f392.1755878232.git.daniel@makrotopia.org> References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Instead of relying on hard-coded numbers for MII ports, introduce a bitmap for MII ports. This is done in order to prepare for supporting MaxLinear GSW1xx ICs which got a different layout of ports. Signed-off-by: Daniel Golle Reviewed-by: Vladimir Oltean --- v4: no changes v3: no changes v2: - move comment before 'if' statement - don't add unused sgmii_ports and phy_ports - correct bitmask for XRX200 and XRX300 (they were swapped in v1/RFC) drivers/net/dsa/lantiq_gswip.c | 14 +++++++++++--- drivers/net/dsa/lantiq_gswip.h | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c index b1b250fc4f61..d988839dce2f 100644 --- a/drivers/net/dsa/lantiq_gswip.c +++ b/drivers/net/dsa/lantiq_gswip.c @@ -183,14 +183,20 @@ static void gswip_mii_mask(struct gswip_priv *priv, u= 32 clear, u32 set, static void gswip_mii_mask_cfg(struct gswip_priv *priv, u32 clear, u32 set, int port) { - /* There's no MII_CFG register for the CPU port */ - if (!dsa_is_cpu_port(priv->ds, port)) - gswip_mii_mask(priv, clear, set, GSWIP_MII_CFGp(port)); + /* MII_CFG register only exists for MII ports */ + if (!(priv->hw_info->mii_ports & BIT(port))) + return; + + gswip_mii_mask(priv, clear, set, GSWIP_MII_CFGp(port)); } =20 static void gswip_mii_mask_pcdu(struct gswip_priv *priv, u32 clear, u32 se= t, int port) { + /* MII_PCDU register only exists for MII ports */ + if (!(priv->hw_info->mii_ports & BIT(port))) + return; + switch (port) { case 0: gswip_mii_mask(priv, clear, set, GSWIP_MII_PCDU0); @@ -1993,12 +1999,14 @@ static void gswip_shutdown(struct platform_device *= pdev) static const struct gswip_hw_info gswip_xrx200 =3D { .max_ports =3D 7, .allowed_cpu_ports =3D BIT(6), + .mii_ports =3D BIT(0) | BIT(1) | BIT(5), .phylink_get_caps =3D gswip_xrx200_phylink_get_caps, }; =20 static const struct gswip_hw_info gswip_xrx300 =3D { .max_ports =3D 7, .allowed_cpu_ports =3D BIT(6), + .mii_ports =3D BIT(0) | BIT(5), .phylink_get_caps =3D gswip_xrx300_phylink_get_caps, }; =20 diff --git a/drivers/net/dsa/lantiq_gswip.h b/drivers/net/dsa/lantiq_gswip.h index 8703c947028a..1bd05348f1e1 100644 --- a/drivers/net/dsa/lantiq_gswip.h +++ b/drivers/net/dsa/lantiq_gswip.h @@ -216,6 +216,7 @@ struct gswip_hw_info { int max_ports; unsigned int allowed_cpu_ports; + unsigned int mii_ports; void (*phylink_get_caps)(struct dsa_switch *ds, int port, struct phylink_config *config); }; --=20 2.50.1