diff mbox series

[net-next,v5,6/6] net: dsa: microchip: fix tag_ksz egress mask for KSZ8795 family

Message ID 20240812153015.653044-7-vtpieter@gmail.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series net: dsa: microchip: ksz8795: add Wake on LAN support | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 29 this patch: 29
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 9 of 9 maintainers
netdev/build_clang success Errors and warnings before: 29 this patch: 29
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 29 this patch: 29
netdev/checkpatch warning WARNING: line length of 84 exceeds 80 columns
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Pieter Aug. 12, 2024, 3:29 p.m. UTC 
From: Pieter Van Trappen <pieter.van.trappen@cern.ch>

Fix the tag_ksz egress mask for DSA_TAG_PROTO_KSZ8795, the port is
encoded in the two and not three LSB. This fix is for completeness,
for example the bug doesn't manifest itself on the KSZ8794 because bit
2 seems to be always zero.

Signed-off-by: Pieter Van Trappen <pieter.van.trappen@cern.ch>
---
 net/dsa/tag_ksz.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Arun Ramadoss Aug. 13, 2024, 3:28 a.m. UTC | #1 
Hi Pieter, 

On Mon, 2024-08-12 at 17:29 +0200, vtpieter@gmail.com wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you
> know the content is safe
> 
> From: Pieter Van Trappen <pieter.van.trappen@cern.ch>
> 
> Fix the tag_ksz egress mask for DSA_TAG_PROTO_KSZ8795, the port is
> encoded in the two and not three LSB. This fix is for completeness,
> for example the bug doesn't manifest itself on the KSZ8794 because
> bit
> 2 seems to be always zero.
> 
> Signed-off-by: Pieter Van Trappen <pieter.van.trappen@cern.ch>
> ---
>  net/dsa/tag_ksz.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c
> index ee7b272ab715..15d9f8d28ffc 100644
> --- a/net/dsa/tag_ksz.c
> +++ b/net/dsa/tag_ksz.c
> @@ -141,7 +141,7 @@ static struct sk_buff *ksz8795_rcv(struct sk_buff
> *skb, struct net_device *dev)
>  {
>         u8 *tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN;
> 
> -       return ksz_common_rcv(skb, dev, tag[0] & 7,
> KSZ_EGRESS_TAG_LEN);
> +       return ksz_common_rcv(skb, dev, tag[0] & GENMASK(1, 0),
> KSZ_EGRESS_TAG_LEN);

It's not like adding GENMASK(1,0) inside statement. You can add macro
above the ksz8795_xmit( ) like

#define KSZ8795_EG_TAIL_TAG_PORT_M GENMASK(1, 0)

Also you need to update the comments above ksz8795_xmit( ) where
comments explains for egress it supports upto port 7. Kindly update it
as well.

 * tag0 : zero-based value represents port
 *	  (eg, 0x00=port1, 0x02=port3, 0x06=port7)

You can wait for 24hrs betweeen two patch set submission, to get review
comments from other reviewers as well. 

>  }
> 
>  static const struct dsa_device_ops ksz8795_netdev_ops = {
> --
> 2.43.0
>
diff mbox series

Patch

diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c
index ee7b272ab715..15d9f8d28ffc 100644
--- a/net/dsa/tag_ksz.c
+++ b/net/dsa/tag_ksz.c
@@ -141,7 +141,7 @@  static struct sk_buff *ksz8795_rcv(struct sk_buff *skb, struct net_device *dev)
 {
 	u8 *tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN;
 
-	return ksz_common_rcv(skb, dev, tag[0] & 7, KSZ_EGRESS_TAG_LEN);
+	return ksz_common_rcv(skb, dev, tag[0] & GENMASK(1, 0), KSZ_EGRESS_TAG_LEN);
 }
 
 static const struct dsa_device_ops ksz8795_netdev_ops = {