Devicetree
 help / color / mirror / Atom feed
From: Clement Leger <clement.leger@linux.dev>
To: Prabhakar <prabhakar.csengg@gmail.com>,
	Andrew Lunn <andrew@lunn.ch>, Vladimir Oltean <olteanv@gmail.com>,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@kernel.org>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	Rob Herring <robh@kernel.org>,
	Krzysztof Kozlowski <krzk+dt@kernel.org>,
	Conor Dooley <conor+dt@kernel.org>,
	Heiner Kallweit <hkallweit1@gmail.com>,
	Russell King <linux@armlinux.org.uk>,
	Simon Horman <horms@kernel.org>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Geert Uytterhoeven <geert+renesas@glider.be>,
	Magnus Damm <magnus.damm@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>,
	Ralph Siemsen <ralph.siemsen@linaro.org>,
	linux-renesas-soc@vger.kernel.org, netdev@vger.kernel.org,
	devicetree@vger.kernel.org,
	Prabhakar <prabhakar.csengg+renesas@gmail.com>,
	Biju Das <biju.das.jz@bp.renesas.com>,
	Fabrizio Castro <fabrizio.castro.jz@renesas.com>,
	Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Subject: Re: [PATCH net-next v5 19/24] net: dsa: rzn1-a5psw: Get VLAN_RES field layout from OF data
Date: Fri, 20 Nov 2026 10:37:24 +0100	[thread overview]
Message-ID: <96f5430f-b197-4a51-909a-79cbe86393e3@linux.dev> (raw)
In-Reply-To: <20261120002549.1908299-20-prabhakar.mahadev-lad.rj@bp.renesas.com>



On 11/20/26 01:25, Prabhakar wrote:
> From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> 
> The VLAN_RES field layout differs between RZ/N1 and RZ/T2H/RZ/N2H.
> RZ/N1 uses PORTMASK[4:0] and VLANID[16:5], whereas RZ/T2H and
> RZ/N2H use PORTMASK[3:0] and VLANID[15:4] to accommodate their
> four-port configuration.
> 
> Move the VLANID and PORTMASK field masks into struct a5psw_of_data
> and use field_get() and field_prep() to access the respective fields.
> 
> Populate the OF data with the existing RZ/N1 field layout, allowing
> SoC-specific layouts to be provided when adding support for RZ/T2H
> and RZ/N2H.
> 
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> ---
> v4->v5:
> - New patch
> ---
>   drivers/net/dsa/rzn1_a5psw.c | 9 ++++++---
>   drivers/net/dsa/rzn1_a5psw.h | 6 ++++--
>   2 files changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/dsa/rzn1_a5psw.c b/drivers/net/dsa/rzn1_a5psw.c
> index 6f3f902f9f4c..7e9bc252d92a 100644
> --- a/drivers/net/dsa/rzn1_a5psw.c
> +++ b/drivers/net/dsa/rzn1_a5psw.c
> @@ -691,7 +691,7 @@ static int a5psw_find_vlan_entry(struct a5psw *a5psw, u16 vid)
>   	/* Find vlan for this port */
>   	for (i = 0; i < A5PSW_VLAN_COUNT; i++) {
>   		vlan_res = a5psw_reg_readl(a5psw, A5PSW_VLAN_RES(i));
> -		if (FIELD_GET(A5PSW_VLAN_RES_VLANID, vlan_res) == vid)
> +		if (field_get(a5psw->of_data->vlan_res_vlanid, vlan_res) == vid)
>   			return i;
>   	}
>   
> @@ -706,8 +706,9 @@ static int a5psw_new_vlan_res_entry(struct a5psw *a5psw, u16 newvid)
>   	/* Find a free VLAN entry */
>   	for (i = 0; i < A5PSW_VLAN_COUNT; i++) {
>   		vlan_res = a5psw_reg_readl(a5psw, A5PSW_VLAN_RES(i));
> -		if (!(FIELD_GET(A5PSW_VLAN_RES_PORTMASK, vlan_res))) {
> -			vlan_res = FIELD_PREP(A5PSW_VLAN_RES_VLANID, newvid);
> +		if (!field_get(a5psw->of_data->vlan_res_portmask, vlan_res)) {
> +			vlan_res = field_prep(a5psw->of_data->vlan_res_vlanid,
> +					      newvid);
>   			a5psw_reg_writel(a5psw, A5PSW_VLAN_RES(i), vlan_res);
>   			return i;
>   		}
> @@ -1354,6 +1355,8 @@ static const struct a5psw_of_data rzn1_of_data = {
>   	.tag_proto = DSA_TAG_PROTO_RZN1_A5PSW,
>   	.rxmatch_config_base = 0x3e80,
>   	.pattern_ctrl_base = 0x3eb0,
> +	.vlan_res_vlanid = GENMASK(16, 5),
> +	.vlan_res_portmask = GENMASK(4, 0),
>   };
>   
>   static const struct of_device_id a5psw_of_mtable[] = {
> diff --git a/drivers/net/dsa/rzn1_a5psw.h b/drivers/net/dsa/rzn1_a5psw.h
> index 5c5f5ec25774..29d205e2331d 100644
> --- a/drivers/net/dsa/rzn1_a5psw.h
> +++ b/drivers/net/dsa/rzn1_a5psw.h
> @@ -71,8 +71,6 @@
>   #define A5PSW_VLAN_RES_WR_PORTMASK	BIT(30)
>   #define A5PSW_VLAN_RES_WR_TAGMASK	BIT(29)
>   #define A5PSW_VLAN_RES_RD_TAGMASK	BIT(28)
> -#define A5PSW_VLAN_RES_VLANID		GENMASK(16, 5)
> -#define A5PSW_VLAN_RES_PORTMASK		GENMASK(4, 0)
>   
>   #define A5PSW_RXMATCH_CONFIG(base, port)	((base) + 4 * (port))
>   #define A5PSW_RXMATCH_CONFIG_PATTERN(p)	BIT(p)
> @@ -241,6 +239,8 @@ union lk_data {
>    *   port to account for the HW issue.
>    * @rxmatch_config_base: Offset of the RXMATCH_CONFIG register of port 0
>    * @pattern_ctrl_base: Offset of the PATTERN_CTRL register of pattern 0
> + * @vlan_res_vlanid: VLANID field mask of the VLAN_RES registers
> + * @vlan_res_portmask: PORTMASK field mask of the VLAN_RES registers
>    */
>   struct a5psw_of_data {
>   	unsigned int nports;
> @@ -250,6 +250,8 @@ struct a5psw_of_data {
>   	unsigned int management_port_fixed_frame_len;
>   	u16 rxmatch_config_base;
>   	u16 pattern_ctrl_base;
> +	u32 vlan_res_vlanid;
> +	u32 vlan_res_portmask;
>   };
>   
>   /**

Reviewed-by: Clément Léger <clement.leger@linux.dev>

Thanks,

Clément

  reply	other threads:[~2026-11-20  9:37 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-20  0:25 [PATCH net-next v5 00/24] Add ETHSW support for Renesas RZ/T2H and RZ/N2H SoCs Prabhakar
2026-11-20  0:25 ` [PATCH net-next v5 01/24] net: dsa: tag_rzn1_a5psw: Drop redundant ETH_P_DSA_A5PSW definition Prabhakar
2026-11-20  0:25 ` [PATCH net-next v5 02/24] net: dsa: tag_rzn1_a5psw: Add RZ/T2H ETHSW tag protocol support Prabhakar
2026-11-20  0:25 ` [PATCH net-next v5 03/24] net: dsa: Kconfig: Expand config description to cover RZ/T2H and RZ/N2H ETHSW Prabhakar
2026-11-20  9:32   ` Clement Leger
2026-11-20  0:25 ` [PATCH net-next v5 04/24] net: pcs: rzn1-miic: Select ETHSW port speed through SWCTRL Prabhakar
2026-11-20  0:25 ` [PATCH net-next v5 05/24] dt-bindings: net: dsa: renesas,rzn1-a5psw: Reject the "ports" node Prabhakar
2026-11-20  0:25 ` [PATCH net-next v5 06/24] dt-bindings: net: dsa: renesas,rzn1-a5psw: Limit port reg values Prabhakar
2026-11-20  0:25 ` [PATCH net-next v5 07/24] dt-bindings: net: dsa: renesas,rzn1-a5psw: Add RZ/T2H and RZ/N2H ETHSW support Prabhakar
2026-11-20  0:25 ` [PATCH net-next v5 08/24] net: dsa: rzn1-a5psw: Fix LK_LEARNCOUNT write mode encoding Prabhakar
2026-11-20  3:27   ` Andrew Lunn
2026-11-20  6:01   ` Clement Leger
2026-11-20  0:25 ` [PATCH net-next v5 09/24] net: dsa: rzn1-a5psw: Fix VLANTransmitted counter offset Prabhakar
2026-11-20  3:29   ` Andrew Lunn
2026-11-20  0:25 ` [PATCH net-next v5 10/24] net: dsa: rzn1-a5psw: Fix MDIO clock divider calculation Prabhakar
2026-11-20  6:51   ` Clement Leger
2026-11-20  0:25 ` [PATCH net-next v5 11/24] net: dsa: rzn1-a5psw: Set driver data in probe Prabhakar
2026-11-20  6:53   ` Clement Leger
2026-11-20  0:25 ` [PATCH net-next v5 12/24] net: dsa: rzn1-a5psw: Add support for optional reset control Prabhakar
2026-11-20  3:32   ` Andrew Lunn
2026-11-20  0:25 ` [PATCH net-next v5 13/24] net: dsa: rzn1-a5psw: Add support for optional timestamp clock Prabhakar
2026-11-20  0:25 ` [PATCH net-next v5 14/24] net: dsa: rzn1-a5psw: Make use dev_err_probe() Prabhakar
2026-11-20  6:58   ` Clement Leger
2026-11-20  0:25 ` [PATCH net-next v5 15/24] net: dsa: rzn1-a5psw: Get switch info via OF data Prabhakar
2026-11-20  7:02   ` Clement Leger
2026-11-20  0:25 ` [PATCH net-next v5 16/24] net: dsa: rzn1-a5psw: Choose tagging protocol based on compatible string Prabhakar
2026-11-20  7:03   ` Clement Leger
2026-11-20  0:25 ` [PATCH net-next v5 17/24] net: dsa: rzn1-a5psw: Add fixed frame length workaround for management port Prabhakar
2026-11-20  0:25 ` [PATCH net-next v5 18/24] net: dsa: rzn1-a5psw: Get pattern matcher register offsets from OF data Prabhakar
2026-11-20  9:35   ` Clement Leger
2026-11-20  0:25 ` [PATCH net-next v5 19/24] net: dsa: rzn1-a5psw: Get VLAN_RES field layout " Prabhakar
2026-11-20  9:37   ` Clement Leger [this message]
2026-11-20  0:25 ` [PATCH net-next v5 20/24] net: dsa: rzn1-a5psw: Get lookup table size " Prabhakar
2026-11-20  9:44   ` Clement Leger
2026-11-20  0:25 ` [PATCH net-next v5 21/24] net: dsa: rzn1-a5psw: Update CPU port comment for RZ/T2H Prabhakar
2026-11-20  9:45   ` Clement Leger
2026-11-20  0:25 ` [PATCH net-next v5 22/24] net: dsa: rzn1-a5psw: Keep MAC TX enabled on RZ/T2H Prabhakar
2026-11-20  0:25 ` [PATCH net-next v5 23/24] net: dsa: rzn1-a5psw: Add support for RZ/T2H Ethernet switch Prabhakar
2026-11-20  0:25 ` [PATCH net-next v5 24/24] net: dsa: Kconfig: Enable support for RZ/T2H and RZ/N2H SoCs Prabhakar
2026-11-20  0:28 ` [PATCH net-next v5 00/24] Add ETHSW support for Renesas " netdev-bot+sinfo
2026-11-20  3:14 ` Jakub Kicinski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=96f5430f-b197-4a51-909a-79cbe86393e3@linux.dev \
    --to=clement.leger@linux.dev \
    --cc=andrew@lunn.ch \
    --cc=biju.das.jz@bp.renesas.com \
    --cc=conor+dt@kernel.org \
    --cc=davem@davemloft.net \
    --cc=devicetree@vger.kernel.org \
    --cc=edumazet@kernel.org \
    --cc=f.fainelli@gmail.com \
    --cc=fabrizio.castro.jz@renesas.com \
    --cc=geert+renesas@glider.be \
    --cc=hkallweit1@gmail.com \
    --cc=horms@kernel.org \
    --cc=krzk+dt@kernel.org \
    --cc=kuba@kernel.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=magnus.damm@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=olteanv@gmail.com \
    --cc=p.zabel@pengutronix.de \
    --cc=pabeni@redhat.com \
    --cc=prabhakar.csengg+renesas@gmail.com \
    --cc=prabhakar.csengg@gmail.com \
    --cc=prabhakar.mahadev-lad.rj@bp.renesas.com \
    --cc=ralph.siemsen@linaro.org \
    --cc=robh@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox