From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.221.227 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795115060; b=INv6aP/EsgZeYeZ7cw06WDr5YvGqSK36s5bMIYoE/7qLvqbIngWZAGm5ZXot7iIxYK7H Hy0CqvAJQ09J/0uEVABj2HaiL/RlnBeETLmiYVqFlmO4YdWI5uxcTilfA8K6ilbJdQ4iv 8jZjSPhHsaQzQTRL8wq7bfbmgWbcdix6J37/tTcDF3KePAYfzRpE/tLf8LBOFpUBARVTM p+KaRpssFbq/cbMfmDIz8o89NH/l5ic7eZn+2MG/Jq1n0GfID8c7BJ4mlIGFMpLqH25s4 Qr+tyV/SLEKlbDbp7NdyPHsSQAqj3B+hr6BiQmMykKlcayEOWOpl/27aCdl99yKYH7A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795115060; h=DMARC-Filter:Received:X-Google-DKIM-Signature:X-Gm-Message-State: X-Gm-Gg:X-Received:Received:X-Relaying-Domain:X-CFilter-Loop:Received: DKIM-Signature: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=NC6+Hq88/BH5lKJOETgjBF4IywFyoVJ5dO49DTkcORE=; b=xW1bGOz7+03XLTza89SgmdxVZ6N1Pf4JFPZz4FTOXbTAymm/GGbaUI6PDdLJM7CBdBPz X0J6cP9qGUVdyVuIMc4gRd55n+nzwRQlJKcfTChFFh6vt4qc/h8l7PDMeayOjOgFeGefM Z8RPA9MIQDWAH2Kzc7AaIhl+aSV6ZShHIJcVtCsI5wfwFySHkQGTVfdYKg+p5ZobtoaCf psgR5k+DxaIvV7U3ruJ+xCnitiVBB2rXVqI7w72DoGFbXGKOFuIiEY2kOXUJLtRWerO5s MiftEmO0A21HnY0oSvEIjVwlyFtGfFxqY2U3MByzRZOi2eCTsjx6at3ljTQALuEu9mQ== 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=UJMd3Q5r; arc=none smtp.remote-ip=209.85.221.227 Received: from mail-vk1-f227.google.com (mail-vk1-f227.google.com [209.85.221.227]) (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 CEC5360A260C for ; Thu, 19 Nov 2026 19:04:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org CEC5360A260C 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=UJMd3Q5r Received: by mail-vk1-f227.google.com with SMTP id 71dfb90a1353d-5eac6c5f927so20385e0c.0 for ; Thu, 19 Nov 2026 11:04:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795115059; x=1795719859; 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=NC6+Hq88/BH5lKJOETgjBF4IywFyoVJ5dO49DTkcORE=; b=TREeN4UIXjmvvu8tM6JlfMXL3BgUwanXlb+BDoeSFF7mUYkYM1sy3BVWNAHMc2Nn+h 6XOdgaxQFSThq28BMYQtSAz6xqR460twH3qBMckIhZn+/YtBvxjf7tq0FxxnuwnAU29O 8+HKg3WKsOUJchfOBw575Pk7b5RNFV7I8NIFi84+cRi+ds9JDTUTpVl0dZxEC46xCRf2 bQXtMDApevw74DJ9mCz7j3LvvFfUZ0NS9B8XDR+D/UKU+nL7sVciN7zIN/PKtzesuV9t DdH7jEjUNvcBVftSvZlO64mt0ZLAmUfL4OpswH9Fi6DpSqylVBTXHNuX0q0BvNsIxNDi 95Lw== X-Gm-Message-State: APuU4Z9DHZT7Z3+C06iDimKSoydHahRRd98D8tAY1PhfJJgE2UZAfdlU wStAFPtpJljuRetmVWrm1IOvggfBeB28GsEtcsseHAi8Bt6GIZaa0DA0wfklS3LNOCpfPH+dak4 65T1CH4qKgtdXHR/+I8vqQ2SLi7IqUbgMRz68RJ++vTltTchTA+NS7fs+G82jv7hyPv66TysixE X64HNBAPF/6Us3XCs517n4CZMjEYbfa3KgYryIoMS8PdkLiExwxMn7S3dfmDwC5baXq1OsJnH/k n6m7NEz5uiA3AIZ X-Gm-Gg: AYBFou3l9llEs4sSrxUNOEZHDo8I9bLmjp2sSpdZ5GzscV6UFb+Qb01EV2dik/fhbPI YH1SAXRO2gk9hAIyIjrE6XPuklmgrPhAXyJPxrNNnro58owH5+RWTiLeVM3mmHkIrWHwZXm3MJg tgcJUojAgKzKYxSX/VUPAJ0bNSAqxEnH93Ojj4jS37Q5/8+4bhouOImvsofQHjs5q4H8I1hn+LY ML1xgLk3UComsgyN2bqBSClJe0/HyV730R6Q48hObCgiRjhiUoZGMUx45RLjZlNPkghm6Xqj9a2 b8whQTJSTc5J/Sf4gAbmjhGhUx5XIsnRFYflfL5nGZz5ZUJQuxx4RQwdCZjDV1BsCCVVnqeeb5m cVTP3u65LsrWDxnBxG2PRuXhgWyif36SFWC1CCGMTa9XPtK8OU4fy578eW4a0rEEMcDxT972C3V P4UJD9Igy/6F0YKBhHfFUqqgvcIJms/OiGKn62uTZ+nqY= X-Received: by 2002:a05:6122:e44b:b0:5ea:98fb:e9de with SMTP id 71dfb90a1353d-5ee8adf3d10mr511377e0c.3.1795115058277; Thu, 19 Nov 2026 11:04:18 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-123.dlp.protect.broadcom.com. [144.49.247.123]) by smtp-relay.gmail.com with ESMTPS id a1e0cc1a2514c-99e6e02e099sm75574241.1.2026.11.19.11.04.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Nov 2026 11:04:18 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-93f32050e72so32234085a.1 for ; Thu, 19 Nov 2026 11:04:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1795115057; x=1795719857; 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=NC6+Hq88/BH5lKJOETgjBF4IywFyoVJ5dO49DTkcORE=; b=UJMd3Q5rZdzZHG/nayU2UUw0lAMYd7qsdEoMWzRnDoiBNR0rzN17xYvW1AO5lBKCmW MUFElF4bNe3AFVyBxzgSfBNx46MeH9gv/sm/UyXA19O+/JSjVgKDd639z80yiS1RaQ// GWIkdxmh+CuSzAMHQ0cinmNCDIgygfgLhBmjs= X-Received: by 2002:a05:620a:1332:b0:949:402b:f1b3 with SMTP id af79cd13be357-949bab3e8f5mr75782285a.70.1795115057218; Thu, 19 Nov 2026 11:04:17 -0800 (PST) X-Received: by 2002:a05:620a:1332:b0:949:402b:f1b3 with SMTP id af79cd13be357-949bab3e8f5mr75773285a.70.1795115056445; Thu, 19 Nov 2026 11:04:16 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id af79cd13be357-949bb3f7cf3sm24063285a.31.2026.11.19.11.04.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2026 11:04:15 -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 v7 6/6] net: dsa: b53: fix mirror destination and source state tracking Date: Thu, 19 Nov 2026 11:03:48 -0800 Message-ID: <20261119190348.2317702-7-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261119190348.2317702-1-florian.fainelli@broadcom.com> References: <20261119190348.2317702-1-florian.fainelli@broadcom.com> X-Mailing-List: netdev@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 The mirror capture control register selects one destination for all ingress and egress sources. Adding a rule for another destination currently redirects existing rules. Multiple matchall filters can also share one source bit, but deleting any one of them clears that bit and can disable mirroring while other filters still need it. Reject a different destination while either source mask is occupied, and reference count each port's ingress and egress source bit under RTNL. Program a source on its first reference and clear it on its last one. Check every mirror register access and record a first reference only after programming succeeds. Select the destination before enabling the source, and log deletion failures because the callback returns no error. Use the source masks to retain the destination after a failed source deletion and allow a new destination after a failed capture-control clear. Not all supported switches receive a hardware reset during setup, so clear stale capture and source registers before accepting mirror rules. Introduce b53_mirror_init() together with its b53 and bcm_sf2 setup callers. Rebuild active sources and their destination from the reference counts when setup runs again, preserving rules across bcm_sf2 resume. Propagate initialization failures instead of accepting stale state. This depends on "net: dsa: b53: fix mirror port encoding on BCM5325 and BCM5365" for the chip-specific source and capture-port helpers. Fixes: ed3af5fd08eb ("net: dsa: b53: Add support for port mirroring") Signed-off-by: Florian Fainelli --- drivers/net/dsa/b53/b53_common.c | 168 ++++++++++++++++++++++++------- drivers/net/dsa/b53/b53_priv.h | 4 + drivers/net/dsa/bcm_sf2.c | 4 + 3 files changed, 140 insertions(+), 36 deletions(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index ffbf5efd8d95..ee2d27732c0c 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -1360,6 +1360,10 @@ static int b53_setup(struct dsa_switch *ds) return ret; } + ret = b53_mirror_init(ds); + if (ret) + return ret; + /* setup default vlan for filtering mode */ pvid = b53_default_pvid(dev); vl = &dev->vlans[pvid]; @@ -2629,27 +2633,103 @@ static u16 b53_mirror_capture_port(struct b53_device *dev, int port) return port; } +int b53_mirror_init(struct dsa_switch *ds) +{ + struct b53_device *dev = ds->priv; + u16 ingress = 0, egress = 0, cap_ctl = 0; + unsigned int port; + int ret; + + /* A switch reset may leave the previous mirror configuration intact. */ + ret = b53_write16(dev, B53_MGMT_PAGE, B53_MIR_CAP_CTL, 0); + if (ret) + return ret; + + ret = b53_write16(dev, B53_MGMT_PAGE, B53_IG_MIR_CTL, 0); + if (ret) + return ret; + + ret = b53_write16(dev, B53_MGMT_PAGE, B53_EG_MIR_CTL, 0); + if (ret) + return ret; + + /* DSA retains matchall filters across suspend and resume. */ + for (port = 0; port < dev->num_ports; port++) { + if (dev->ports[port].mirror_count[true]) + ingress |= b53_mirror_port_mask(dev, port); + if (dev->ports[port].mirror_count[false]) + egress |= b53_mirror_port_mask(dev, port); + } + + if (!(ingress | egress)) + return 0; + + 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; + + ret = b53_write16(dev, B53_MGMT_PAGE, B53_IG_MIR_CTL, ingress); + if (ret) + return ret; + + return b53_write16(dev, B53_MGMT_PAGE, B53_EG_MIR_CTL, egress); +} +EXPORT_SYMBOL(b53_mirror_init); + int b53_mirror_add(struct dsa_switch *ds, int port, struct dsa_mall_mirror_tc_entry *mirror, bool ingress, struct netlink_ext_ack *extack) { struct b53_device *dev = ds->priv; - u16 reg, loc; + 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; - if (ingress) - loc = B53_IG_MIR_CTL; - else - loc = B53_EG_MIR_CTL; + loc = ingress ? B53_IG_MIR_CTL : B53_EG_MIR_CTL; + other_loc = ingress ? B53_EG_MIR_CTL : B53_IG_MIR_CTL; - b53_read16(dev, B53_MGMT_PAGE, loc, ®); - reg |= b53_mirror_port_mask(dev, port); - b53_write16(dev, B53_MGMT_PAGE, loc, reg); + ret = b53_read16(dev, B53_MGMT_PAGE, loc, ®); + if (ret) + return ret; - b53_read16(dev, B53_MGMT_PAGE, B53_MIR_CAP_CTL, ®); - reg &= ~b53_mirror_capture_port_mask(dev); - reg |= b53_mirror_capture_port(dev, mirror->to_local_port); - reg |= MIRROR_EN; - b53_write16(dev, B53_MGMT_PAGE, B53_MIR_CAP_CTL, reg); + ret = b53_read16(dev, B53_MGMT_PAGE, other_loc, &other_reg); + if (ret) + return ret; + + ret = b53_read16(dev, B53_MGMT_PAGE, B53_MIR_CAP_CTL, &cap_ctl); + if (ret) + return ret; + + if (((reg | other_reg) & MIRROR_MASK) && + (cap_ctl & cap_mask) != cap_port) { + NL_SET_ERR_MSG_MOD(extack, + "Only one mirroring destination is supported"); + return -EOPNOTSUPP; + } + + if (*mirror_count) { + (*mirror_count)++; + return 0; + } + + /* Select the destination before enabling the new source. */ + 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 | b53_mirror_port_mask(dev, port)); + if (ret) + return ret; + + (*mirror_count)++; + dev->mirror_port = mirror->to_local_port; return 0; } @@ -2659,38 +2739,54 @@ void b53_mirror_del(struct dsa_switch *ds, int port, struct dsa_mall_mirror_tc_entry *mirror) { struct b53_device *dev = ds->priv; - bool loc_disable = false, other_loc_disable = false; - u16 reg, loc; + unsigned int *mirror_count = + &dev->ports[port].mirror_count[mirror->ingress]; + u16 reg, other_reg, loc, other_loc; + int ret; - if (mirror->ingress) - loc = B53_IG_MIR_CTL; - else - loc = B53_EG_MIR_CTL; + if (!*mirror_count) + return; + + if (--(*mirror_count)) + return; + + loc = mirror->ingress ? B53_IG_MIR_CTL : B53_EG_MIR_CTL; + other_loc = mirror->ingress ? B53_EG_MIR_CTL : B53_IG_MIR_CTL; /* Update the desired ingress/egress register */ - b53_read16(dev, B53_MGMT_PAGE, loc, ®); + ret = b53_read16(dev, B53_MGMT_PAGE, loc, ®); + if (ret) + goto err; + reg &= ~b53_mirror_port_mask(dev, port); - if (!(reg & MIRROR_MASK)) - loc_disable = true; - b53_write16(dev, B53_MGMT_PAGE, loc, reg); + ret = b53_write16(dev, B53_MGMT_PAGE, loc, reg); + if (ret) + goto err; /* Now look at the other one to know if we can disable mirroring * entirely */ - if (mirror->ingress) - b53_read16(dev, B53_MGMT_PAGE, B53_EG_MIR_CTL, ®); - else - b53_read16(dev, B53_MGMT_PAGE, B53_IG_MIR_CTL, ®); - if (!(reg & MIRROR_MASK)) - other_loc_disable = true; + ret = b53_read16(dev, B53_MGMT_PAGE, other_loc, &other_reg); + if (ret) + goto err; - b53_read16(dev, B53_MGMT_PAGE, B53_MIR_CAP_CTL, ®); - /* Both no longer have ports, let's disable mirroring */ - if (loc_disable && other_loc_disable) { - reg &= ~MIRROR_EN; - reg &= ~b53_mirror_capture_port_mask(dev); - } - b53_write16(dev, B53_MGMT_PAGE, B53_MIR_CAP_CTL, reg); + if ((reg | other_reg) & MIRROR_MASK) + return; + + ret = b53_read16(dev, B53_MGMT_PAGE, B53_MIR_CAP_CTL, ®); + if (ret) + goto err; + + 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; + + return; + +err: + dev_err(dev->dev, "Failed to delete mirror rule for port %d: %d\n", + port, ret); } EXPORT_SYMBOL(b53_mirror_del); diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h index c4d2a41c714f..df00a5ae46c9 100644 --- a/drivers/net/dsa/b53/b53_priv.h +++ b/drivers/net/dsa/b53/b53_priv.h @@ -119,6 +119,8 @@ struct b53_pcs { #define B53_N_PCS 2 struct b53_port { + /* References to each egress/ingress mirror source mask bit. */ + unsigned int mirror_count[2]; u16 vlan_ctl_mask; u16 pvid; struct ethtool_keee eee; @@ -170,6 +172,7 @@ struct b53_device { /* run time configuration */ bool enable_jumbo; + unsigned int mirror_port; unsigned int num_vlans; struct b53_vlan *vlans; @@ -545,6 +548,7 @@ int b53_mdb_add(struct dsa_switch *ds, int port, int b53_mdb_del(struct dsa_switch *ds, int port, const struct switchdev_obj_port_mdb *mdb, struct dsa_db db); +int b53_mirror_init(struct dsa_switch *ds); int b53_mirror_add(struct dsa_switch *ds, int port, struct dsa_mall_mirror_tc_entry *mirror, bool ingress, struct netlink_ext_ack *extack); diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index 1747a1f20c78..cbaa5de9b107 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -1061,6 +1061,10 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds) unsigned int port; int ret; + ret = b53_mirror_init(ds); + if (ret) + return ret; + /* Enable all valid ports and disable those unused */ for (port = 0; port < priv->hw_params.num_ports; port++) { /* IMP port receives special treatment */ -- 2.53.0