2019-10-05 22:06:06

by Florian Fainelli

Subject: [PATCH net] net: dsa: b53: Do not clear existing mirrored port mask

Clearing the existing bitmask of mirrored ports essentially prevents us
from capturing more than one port at any given time. This is clearly
wrong, do not clear the bitmask prior to setting up the new port.

Reported-by: Hubert Feurstein <[email protected]>
Fixes: ed3af5fd08eb ("net: dsa: b53: Add support for port mirroring")
Signed-off-by: Florian Fainelli <[email protected]>
---
drivers/net/dsa/b53/b53_common.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index 526ba2ab66f1..cc3536315eff 100644
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -1845,7 +1845,6 @@ int b53_mirror_add(struct dsa_switch *ds, int port,
loc = B53_EG_MIR_CTL;

b53_read16(dev, B53_MGMT_PAGE, loc, &reg);
- reg &= ~MIRROR_MASK;
reg |= BIT(port);
b53_write16(dev, B53_MGMT_PAGE, loc, reg);

--
2.17.1

2019-10-06 04:46:49

by Vivien Didelot

Subject: Re: [PATCH net] net: dsa: b53: Do not clear existing mirrored port mask

On Sat, 5 Oct 2019 15:05:18 -0700, Florian Fainelli <[email protected]> wrote:
> Clearing the existing bitmask of mirrored ports essentially prevents us
> from capturing more than one port at any given time. This is clearly
> wrong, do not clear the bitmask prior to setting up the new port.
>
> Reported-by: Hubert Feurstein <[email protected]>
> Fixes: ed3af5fd08eb ("net: dsa: b53: Add support for port mirroring")
> Signed-off-by: Florian Fainelli <[email protected]>

Reviewed-by: Vivien Didelot <[email protected]>

2019-10-06 13:58:18

by David Miller

Subject: Re: [PATCH net] net: dsa: b53: Do not clear existing mirrored port mask

From: Florian Fainelli <[email protected]>
Date: Sat, 5 Oct 2019 15:05:18 -0700

> Clearing the existing bitmask of mirrored ports essentially prevents us
> from capturing more than one port at any given time. This is clearly
> wrong, do not clear the bitmask prior to setting up the new port.
>
> Reported-by: Hubert Feurstein <[email protected]>
> Fixes: ed3af5fd08eb ("net: dsa: b53: Add support for port mirroring")
> Signed-off-by: Florian Fainelli <[email protected]>

Applied and queued up for -stable, thanks.