Skip to contentSkip to conversation

net: dsa: microchip: update tag_ksz masks for KSZ9477 family

PATCH Applied [email protected] 3 participants 3 messages Sep 9, 2024 – Sep 11, 2024

Subsystems (4)
Networking Network drivers Networking DSA Microchip ksz series Ethernet switch driver
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/1 net: dsa: microchip: update tag_ksz masks for KSZ9477 family

From: Pieter Van Trappen <[email protected]>

Remove magic number 7 by introducing a GENMASK macro instead. Remove magic number 0x80 by using the BIT macro instead.

Signed-off-by Pieter Van Trappen <[email protected]>
---
 net/dsa/tag_ksz.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
net/dsa/tag_ksz.c +3 -2
index 1f46de394f2e..281bbac5539d 100644
@@ -178,8 +178,9 @@ MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_KSZ8795, KSZ8795_NAME);
 
 #define KSZ9477_INGRESS_TAG_LEN		2
 #define KSZ9477_PTP_TAG_LEN		4
-#define KSZ9477_PTP_TAG_INDICATION	0x80
+#define KSZ9477_PTP_TAG_INDICATION	BIT(7)
 
+#define KSZ9477_TAIL_TAG_EG_PORT_M	GENMASK(2, 0)
 #define KSZ9477_TAIL_TAG_PRIO		GENMASK(8, 7)
 #define KSZ9477_TAIL_TAG_OVERRIDE	BIT(9)
 #define KSZ9477_TAIL_TAG_LOOKUP		BIT(10)

@@ -312,7 +313,7 @@ static struct sk_buff *ksz9477_rcv(struct sk_buff *skb, struct net_device *dev)
 {
 	/* Tag decoding */
 	u8 *tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN;
-	unsigned int port = tag[0] & 7;
+	unsigned int port = tag[0] & KSZ9477_TAIL_TAG_EG_PORT_M;
 	unsigned int len = KSZ_EGRESS_TAG_LEN;
 
 	/* Extra 4-bytes PTP timestamp */

base-commit: 52fc70a32573707f70d6b1b5c5fe85cc91457393

Signature · 1 line
2.43.0
CI Applied
#2 lore raw
In reply to [email protected]
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 8 lines · On Mon, 9 Sep 2024 15:42:59 +0200 you wrote:

From: Pieter Van Trappen <[email protected]>

Remove magic number 7 by introducing a GENMASK macro instead. Remove magic number 0x80 by using the BIT macro instead.

Signed-off-by Pieter Van Trappen <[email protected]>

[...]

Here is the summary with links:
- [net-next,1/1] net: dsa: microchip: update tag_ksz masks for KSZ9477 family

    https://git.kernel.org/netdev/net-next/c/3f464b193d40

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html