From: Michael Dege <michael.dege@renesas.com>
To: "Yoshihiro Shimoda" <yoshihiro.shimoda.uh@renesas.com>,
"Andrew Lunn" <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Richard Cochran" <richardcochran@gmail.com>,
"Niklas Söderlund" <niklas.soderlund@ragnatech.se>,
"Paul Barker" <paul@pbarker.dev>, "Rob Herring" <robh@kernel.org>,
"Krzysztof Kozlowski" <krzk+dt@kernel.org>,
"Conor Dooley" <conor+dt@kernel.org>,
"Geert Uytterhoeven" <geert+renesas@glider.be>,
"Magnus Damm" <magnus.damm@gmail.com>
Cc: netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
Nikita Yushchenko <nikita.yoush@cogentembedded.com>,
Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
Michael Dege <michael.dege@renesas.com>
Subject: [PATCH net-next 07/10] net: renesas: rswitch: fix FWPCx register names
Date: Thu, 06 Nov 2025 13:55:31 +0100 [thread overview]
Message-ID: <20251106-add_l3_routing-v1-7-dcbb8368ca54@renesas.com> (raw)
In-Reply-To: <20251106-add_l3_routing-v1-0-dcbb8368ca54@renesas.com>
Some bit access macros had letters in the register name mixed up.
Signed-off-by: Michael Dege <michael.dege@renesas.com>
---
drivers/net/ethernet/renesas/rswitch.h | 6 +++---
drivers/net/ethernet/renesas/rswitch_l2.c | 2 +-
drivers/net/ethernet/renesas/rswitch_main.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/renesas/rswitch.h b/drivers/net/ethernet/renesas/rswitch.h
index ac32091b7991..ef64bd6e5a75 100644
--- a/drivers/net/ethernet/renesas/rswitch.h
+++ b/drivers/net/ethernet/renesas/rswitch.h
@@ -856,12 +856,12 @@ enum rswitch_gwca_mode {
#define FWPC0_VLANSA BIT(28)
#define FWPC1(i) (FWPC10 + (i) * 0x10)
-#define FWCP1_LTHFW GENMASK(16 + (RSWITCH_NUM_AGENTS - 1), 16)
+#define FWPC1_LTHFW GENMASK(16 + (RSWITCH_NUM_AGENTS - 1), 16)
#define FWPC1_DDE BIT(0)
#define FWPC2(i) (FWPC20 + (i) * 0x10)
-#define FWCP2_LTWFW GENMASK(16 + (RSWITCH_NUM_AGENTS - 1), 16)
-#define FWCP2_LTWFW_MASK GENMASK(16 + (RSWITCH_NUM_AGENTS - 1), 16)
+#define FWPC2_LTWFW GENMASK(16 + (RSWITCH_NUM_AGENTS - 1), 16)
+#define FWPC2_LTWFW_MASK GENMASK(16 + (RSWITCH_NUM_AGENTS - 1), 16)
#define FWPBFC(i) (FWPBFC0 + (i) * 0x10)
#define FWPBFC_PBDV GENMASK(RSWITCH_NUM_AGENTS - 1, 0)
diff --git a/drivers/net/ethernet/renesas/rswitch_l2.c b/drivers/net/ethernet/renesas/rswitch_l2.c
index 4a69ec77d69c..b69859a0a42a 100644
--- a/drivers/net/ethernet/renesas/rswitch_l2.c
+++ b/drivers/net/ethernet/renesas/rswitch_l2.c
@@ -80,7 +80,7 @@ static void rswitch_update_l2_hw_forwarding(struct rswitch_private *priv)
*
* Do not allow L2 forwarding to self for hw port.
*/
- iowrite32(FIELD_PREP(FWCP2_LTWFW_MASK, fwd_mask | BIT(rdev->port)),
+ iowrite32(FIELD_PREP(FWPC2_LTWFW_MASK, fwd_mask | BIT(rdev->port)),
priv->addr + FWPC2(rdev->port));
}
diff --git a/drivers/net/ethernet/renesas/rswitch_main.c b/drivers/net/ethernet/renesas/rswitch_main.c
index d32d4d18606d..e92b5cdffd10 100644
--- a/drivers/net/ethernet/renesas/rswitch_main.c
+++ b/drivers/net/ethernet/renesas/rswitch_main.c
@@ -124,10 +124,10 @@ static int rswitch_fwd_init(struct rswitch_private *priv)
/* Disable all port features */
iowrite32(0, priv->addr + FWPC0(i));
/* Disallow L3 forwarding and direct descriptor forwarding */
- iowrite32(FIELD_PREP(FWCP1_LTHFW, all_ports_mask),
+ iowrite32(FIELD_PREP(FWPC1_LTHFW, all_ports_mask),
priv->addr + FWPC1(i));
/* Disallow L2 forwarding */
- iowrite32(FIELD_PREP(FWCP2_LTWFW, all_ports_mask),
+ iowrite32(FIELD_PREP(FWPC2_LTWFW, all_ports_mask),
priv->addr + FWPC2(i));
/* Disallow port based forwarding */
iowrite32(0, priv->addr + FWPBFC(i));
--
2.43.0
next prev parent reply other threads:[~2025-11-06 12:56 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-06 12:55 [PATCH net-next 00/10] net: renesas: rswitch: R-Car S4 add HW offloading for layer 3 routing Michael Dege
2025-11-06 12:55 ` [PATCH net-next 01/10] net: renesas: rswitch: cleanup MII settings Michael Dege
2025-11-06 12:55 ` [PATCH net-next 02/10] net: renesas: rswitch: enable Phy link status pin Michael Dege
2025-11-07 1:16 ` Andrew Lunn
2025-11-07 13:37 ` Michael Dege
2025-11-06 12:55 ` [PATCH net-next 03/10] dt-bindings: net: renesas,r8a779f0-ether-switch.yaml: add optional property link-pin Michael Dege
2025-11-06 13:41 ` Geert Uytterhoeven
2025-11-06 14:19 ` Rob Herring (Arm)
2025-11-06 17:16 ` Conor Dooley
2025-11-06 12:55 ` [PATCH net-next 04/10] arm64: dts: renesas: r8a779f4-s4sk.dts add link-pin property Michael Dege
2025-11-06 12:55 ` [PATCH net-next 05/10] arm64: dts: renesas: r8a779f0-spider-ethernet.dtsi " Michael Dege
2025-11-06 12:55 ` [PATCH net-next 06/10] net: renesas: rswitch: add MAC address filtering Michael Dege
2025-11-07 1:18 ` Andrew Lunn
2025-11-06 12:55 ` Michael Dege [this message]
2025-11-06 12:55 ` [PATCH net-next 08/10] net: renesas: rswitch: add bit access macros for forwarding engine Michael Dege
2025-11-06 12:55 ` [PATCH net-next 09/10] net: renesas: rswitch: add simple l3 routing Michael Dege
2025-11-07 2:32 ` Andrew Lunn
2025-11-07 10:02 ` Nikita Yushchenko
2025-11-07 13:29 ` Michael Dege
2025-11-07 13:46 ` Andrew Lunn
2025-11-07 13:35 ` Michael Dege
2025-11-06 12:55 ` [PATCH net-next 10/10] net: renesas: rswitch: update error handling of probe Michael Dege
2025-11-07 2:32 ` Andrew Lunn
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=20251106-add_l3_routing-v1-7-dcbb8368ca54@renesas.com \
--to=michael.dege@renesas.com \
--cc=andrew+netdev@lunn.ch \
--cc=christophe.jaillet@wanadoo.fr \
--cc=conor+dt@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=geert+renesas@glider.be \
--cc=krzk+dt@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=nikita.yoush@cogentembedded.com \
--cc=niklas.soderlund@ragnatech.se \
--cc=pabeni@redhat.com \
--cc=paul@pbarker.dev \
--cc=richardcochran@gmail.com \
--cc=robh@kernel.org \
--cc=yoshihiro.shimoda.uh@renesas.com \
/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;
as well as URLs for NNTP newsgroup(s).