From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.217.97 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794506645; b=p5fWEjpVTOV/6udIGmejEdRkyCAtPMfhalTAidDw+aON1EKGtwntBXRh1/i9rE498mIz mufCXNjR8x+ImWxG8rT3UfGL5SpbwmcQCuHGzOVly/lNFw+0sm9WfE1pRNwpnf/vE4PHO hEk5qwWn8AnYw1rlenDuO0vbehBURjk/l/il58wZZ80YIbI9jvgC7xDCvGNfdb1AWSiNv 6v7fTenjuxyZ17n+rhIkUIbPpBrUSloA0FyyDiAkGXGN39ARe+LrBkdwSTU/f4nDZ19ed YGPL3hQ+oWaq0oNTDUt6v/9PjeW4hjiNdnF0gDJwHIpWGRY9k+pLobmhfgUH35nhoiA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794506645; h=DMARC-Filter:Received:X-Google-DKIM-Signature:X-Forwarded-Encrypted: X-Gm-Message-State:X-Gm-Gg:X-Received:Received:X-Relaying-Domain: X-CFilter-Loop:Received:DKIM-Signature:X-Forwarded-Encrypted: X-Received:X-Received:Received:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-DetectorID-Processed; bh=LzeYtQeHYIVthg2hHB9w5Dkr2DnAfEy/jz5r4BF+vDg=; b=41i3Ul/kCGJAhGCrFpxYER0OBX+zUN70NPVe2v+3lAqVLgXiRNNnGgFfgeKftrSWFLYv HQOGSZWGfpxZh/tjQFEvSj284lBnBw3nWn7cQfunQb/ajiAOa9Sk0vkW7u7MXRdDNYDlf kEL4ziKmqOQpMEiuaKlyru7k8DcdHfendh6XJBpsIj4u/zHIuF/tLBiuCj9hhajNiV2Ls euNqGF8P07kdWtzSkhMEkE3Odq/vyXa9dsqlNmH1sudR7+QHthfCb2DVQsvda4QTD2GZi 9/PZT2J8rjlZj2PCH7rY99CzmBAPkKkYvQQ+mur/wc9/a8a4ft9dZZB+vvVSaYatWjQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass header.d=broadcom.com header.i=@broadcom.com header.a=rsa-sha256 header.s=google header.b=hcDIt0Ch; arc=none smtp.remote-ip=209.85.217.97 Received: from mail-vs1-f97.google.com (mail-vs1-f97.google.com [209.85.217.97]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE35760A383A for ; Thu, 12 Nov 2026 18:04:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org AE35760A383A Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.a=rsa-sha256 header.s=google header.b=hcDIt0Ch Received: by mail-vs1-f97.google.com with SMTP id ada2fe7eead31-7cc2bb73cd9so20137.3 for ; Thu, 12 Nov 2026 10:04:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794506644; x=1795111444; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=LzeYtQeHYIVthg2hHB9w5Dkr2DnAfEy/jz5r4BF+vDg=; b=pYNoXKWGr4rbXFvmuR+BNU801JGx6SIQVVkWYiuITD90Vh6/ieevHAW/I79ZzRuEXB deXd4rM3Hr+XD8TxIYGBhoG5V4WNdjFSBavgtRmCO6nnNAJwiEKoTYXJZRa5iO2y9Q+0 Mla74SG+vT23o7EWEWRA9Bo0YC7fKXR+dKlFw+gDbWT5bS+lsEfDA3qCGAJFBPiMQeHf MfavzXGbIVekoo20Lz1VPfbap01B9wWm+DZvvtpl/ehCgDzbeHhPNzxPbK2VqQt9XNod QivfbvLhG1Q3DWQskwa4lZ/XsWJqozpH6B40a0o4I7++HHvRL8CyllYXkYRM1BSy69n3 WjRA== X-Forwarded-Encrypted: i=1; AL+hErG+TqDFb2AiwQhGej21wafGJBPww26hE1sMd4mpe4mmbQbjqstEXNnx0VyOjq5bXbknvP0T/3AGCI8+oyc=@vger.kernel.org X-Gm-Message-State: APuU4Z+ngPWmK8BO/COxDYvmNH7Wfw+R6aa6zrjMVh+ibcp9qoRlrY1/ mudILtyLbOM2MT2ZcExl0i8v7TUbDB8Aty1QHnPP6MPTlcPJWhHoqSaCrjvRhGQjTJFMEiJOGtW ZuODWQk6CEbB6v/gxM5OQaUzGOmU2fJ0qcYK3R0ZulImNTaYUTrXpdWWoFiOo3kWfwx8v4lJpxZ 8E5V8OM41mX/XuMi2K5qCTTZ9CXubnKGvO93J17H0JF/j0ltZjAFlsFlwgNyEf5cKLU8f4EU/Qs w5GLErbS7SstMRZUZJtdC35 X-Gm-Gg: AYBFou0wP20/RTNSQaLomzOwwsVftmEmdOty9ZEjmhIoCZ1KjW8RP9Na2G3uhLwzICU aZ7DuRsY4qXgXnxk16K4pf3lpWchAQfn/IucGF4l3iU9T6TkLgTSI/a4tLV3H0vqBqFPDApzKKr RWRrmugJ4qPkOHX1LCIwbXEeTLW/RWSZ1GrwtjlWdteD+C3EK5CO8SmYT5dVAzhgj7vcr81cV3l vI+epZuI1Uv+bV6WizWSv9JDepNWEemw1tBAuOYSfCC6KLAbZWM2Ot9LAdDpS5pqo+Cb/NPk0VR 2hdhknUUUAntImjwXt2o/zrcxRpZ9B1ncRtVheq//8YV8boJLLy8pBrI0ZQ/LJKfFW/9kLfioJ1 aM5+Ks0/7xo4Zhrji3iR5DMmWOI2qlk/cWpeIQWErqSQzpdeMZfwPlGLFK9DEm/YOKopkTR1laE mqU1lXC0xQSCY9JrTzEaaFfxLqVLJ+qYXsf6lUAD5P X-Received: by 2002:a05:6102:4457:b0:7d0:9587:1b90 with SMTP id ada2fe7eead31-7d4fb2bf05bmr2106598137.13.1794506643572; Thu, 12 Nov 2026 10:04:03 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-22.dlp.protect.broadcom.com. [144.49.247.22]) by smtp-relay.gmail.com with ESMTPS id ada2fe7eead31-7d64c1ec511sm5504137.2.2026.11.12.10.04.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Nov 2026 10:04:03 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-3b18165dc53so48870a91.3 for ; Thu, 12 Nov 2026 10:04:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1794506642; x=1795111442; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=LzeYtQeHYIVthg2hHB9w5Dkr2DnAfEy/jz5r4BF+vDg=; b=hcDIt0Chs29LshaTx1MBFuNTfKinj20fv/i1REig4dkLgxjp+LiflBoA6lLqL8wK4A 6DVvK/UBlqHOCjY53/apO7ZBnRk5AgeCDYwBZWWvMklBH3R1u+oMB3GO01ZVsUfediF3 Mi5oQVxXx48oMTm4RUZvUUJ/xFPU2+l7zS1No= X-Forwarded-Encrypted: i=1; AL+hErEoTm8bbWYPKUauRnIDSbi8EU00T3MKcjxJE8JYj2cZGbwOp8MgsjHAaAR1VlfJRns5JCSLO6iCtQHYEFQ=@vger.kernel.org X-Received: by 2002:a17:90a:e7cf:b0:3ad:13fe:41ba with SMTP id 98e67ed59e1d1-3b182f0d331mr6271074a91.52.1794506642245; Thu, 12 Nov 2026 10:04:02 -0800 (PST) X-Received: by 2002:a17:90a:e7cf:b0:3ad:13fe:41ba with SMTP id 98e67ed59e1d1-3b182f0d331mr6271047a91.52.1794506641708; Thu, 12 Nov 2026 10:04:01 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cddc18abc06sm95004a12.22.2026.11.12.10.03.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2026 10:03:59 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Jonas Gorski , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Vivien Didelot , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net v5 8/8] net: dsa: b53: fix mirror port encoding on BCM5325 and BCM5365 Date: Thu, 12 Nov 2026 10:02:02 -0800 Message-ID: <20261112180202.324504-9-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261112180202.324504-1-florian.fainelli@broadcom.com> References: <20261112180202.324504-1-florian.fainelli@broadcom.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e BCM5325 and BCM5365 use an 11-bit bitmap for the mirror capture port, whereas newer switches use a four-bit port ID. Programming the port number directly can select no destination or the wrong destination, and can select multiple destinations. For example, port 2 requires BIT(2), but writing 2 selects port 1 instead. Use the bitmap encoding on BCM5325 and BCM5365, including translating logical CPU port 5 to hardware bit 8. Apply the corresponding field mask when checking for a conflicting destination, replacing the destination, and clearing it after the last mirror source is removed. Keep the port ID encoding for newer switches. The ingress and egress mirror source masks use the same layout on these switches, with the CPU port at bit 8 and bits 5-7 reserved, so apply the same translation when setting and clearing a source port bit. Fixes: ed3af5fd08eb ("net: dsa: b53: Add support for port mirroring") Signed-off-by: Florian Fainelli --- drivers/net/dsa/b53/b53_common.c | 46 +++++++++++++++++++++++++------- drivers/net/dsa/b53/b53_regs.h | 1 + 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index a2d46cceca47..5bdf9cf147b3 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -2608,6 +2608,31 @@ enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds, int port, } EXPORT_SYMBOL(b53_get_tag_protocol); +static u16 b53_mirror_capture_port_mask(struct b53_device *dev) +{ + if (is5325(dev) || is5365(dev)) + return CAP_PORT_MASK_25; + + return CAP_PORT_MASK; +} + +static u16 b53_mirror_port_mask(struct b53_device *dev, int port) +{ + /* These switches use a bitmap with the CPU port at bit 8. */ + if ((is5325(dev) || is5365(dev)) && port == B53_CPU_PORT_25) + port = B53_CPU_PORT; + + return BIT(port); +} + +static u16 b53_mirror_capture_port(struct b53_device *dev, int port) +{ + if (is5325(dev) || is5365(dev)) + return b53_mirror_port_mask(dev, port); + + return port; +} + int b53_mirror_init(struct dsa_switch *ds) { struct b53_device *dev = ds->priv; @@ -2631,15 +2656,15 @@ int b53_mirror_init(struct dsa_switch *ds) /* DSA retains matchall filters across suspend and resume. */ for (port = 0; port < dev->num_ports; port++) { if (dev->ports[port].mirror_count[true]) - ingress |= BIT(port); + ingress |= b53_mirror_port_mask(dev, port); if (dev->ports[port].mirror_count[false]) - egress |= BIT(port); + egress |= b53_mirror_port_mask(dev, port); } if (!(ingress | egress)) return 0; - cap_ctl = MIRROR_EN | dev->mirror_port; + cap_ctl = MIRROR_EN | b53_mirror_capture_port(dev, dev->mirror_port); ret = b53_write16(dev, B53_MGMT_PAGE, B53_MIR_CAP_CTL, cap_ctl); if (ret) return ret; @@ -2659,6 +2684,8 @@ int b53_mirror_add(struct dsa_switch *ds, int port, struct b53_device *dev = ds->priv; unsigned int *mirror_count = &dev->ports[port].mirror_count[ingress]; u16 reg, other_reg, loc, other_loc, cap_ctl; + u16 cap_mask = b53_mirror_capture_port_mask(dev); + u16 cap_port = b53_mirror_capture_port(dev, mirror->to_local_port); int ret; loc = ingress ? B53_IG_MIR_CTL : B53_EG_MIR_CTL; @@ -2677,7 +2704,7 @@ int b53_mirror_add(struct dsa_switch *ds, int port, return ret; if (((reg | other_reg) & MIRROR_MASK) && - (cap_ctl & CAP_PORT_MASK) != mirror->to_local_port) { + (cap_ctl & cap_mask) != cap_port) { NL_SET_ERR_MSG_MOD(extack, "Only one mirroring destination is supported"); return -EOPNOTSUPP; @@ -2689,14 +2716,15 @@ int b53_mirror_add(struct dsa_switch *ds, int port, } /* Select the destination before enabling the new source. */ - cap_ctl &= ~CAP_PORT_MASK; - cap_ctl |= mirror->to_local_port; + cap_ctl &= ~cap_mask; + cap_ctl |= cap_port; cap_ctl |= MIRROR_EN; ret = b53_write16(dev, B53_MGMT_PAGE, B53_MIR_CAP_CTL, cap_ctl); if (ret) return ret; - ret = b53_write16(dev, B53_MGMT_PAGE, loc, reg | BIT(port)); + ret = b53_write16(dev, B53_MGMT_PAGE, loc, + reg | b53_mirror_port_mask(dev, port)); if (ret) return ret; @@ -2730,7 +2758,7 @@ void b53_mirror_del(struct dsa_switch *ds, int port, if (ret) goto err; - reg &= ~BIT(port); + reg &= ~b53_mirror_port_mask(dev, port); ret = b53_write16(dev, B53_MGMT_PAGE, loc, reg); if (ret) goto err; @@ -2749,7 +2777,7 @@ void b53_mirror_del(struct dsa_switch *ds, int port, if (ret) goto err; - reg &= ~(MIRROR_EN | CAP_PORT_MASK); + reg &= ~(MIRROR_EN | b53_mirror_capture_port_mask(dev)); ret = b53_write16(dev, B53_MGMT_PAGE, B53_MIR_CAP_CTL, reg); if (ret) goto err; diff --git a/drivers/net/dsa/b53/b53_regs.h b/drivers/net/dsa/b53/b53_regs.h index cfdb5ed38326..ee049927a63a 100644 --- a/drivers/net/dsa/b53/b53_regs.h +++ b/drivers/net/dsa/b53/b53_regs.h @@ -239,6 +239,7 @@ /* Mirror capture control register (16 bit) */ #define B53_MIR_CAP_CTL 0x10 #define CAP_PORT_MASK 0xf +#define CAP_PORT_MASK_25 0x7ff #define BLK_NOT_MIR BIT(14) #define MIRROR_EN BIT(15) -- 2.53.0