From: Ansuel Smith <ansuelsmth@gmail.com>
To: Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Vladimir Oltean <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Russell King <linux@armlinux.org.uk>,
Ansuel Smith <ansuelsmth@gmail.com>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: [net-next PATCH 11/19] net: dsa: qca8k: add support for mirror mode
Date: Wed, 17 Nov 2021 22:04:43 +0100 [thread overview]
Message-ID: <20211117210451.26415-12-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20211117210451.26415-1-ansuelsmth@gmail.com>
The switch support mirror mode. Only one port can set as mirror port and
every other port can set to both ingress and egress mode. The mirror
port is disabled and reverted to normal operation once every port is
removed from sending packet to the mirror mode.
Also modify the fdb logit to send packet to both destination and mirror
port by default to support mirror mode.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
drivers/net/dsa/qca8k.c | 95 +++++++++++++++++++++++++++++++++++++++++
drivers/net/dsa/qca8k.h | 5 +++
2 files changed, 100 insertions(+)
diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index d73886b36e6a..a74099131e3d 100644
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -1938,6 +1938,99 @@ qca8k_port_fdb_dump(struct dsa_switch *ds, int port,
return 0;
}
+static int
+qca8k_port_mirror_add(struct dsa_switch *ds, int port,
+ struct dsa_mall_mirror_tc_entry *mirror,
+ bool ingress)
+{
+ struct qca8k_priv *priv = ds->priv;
+ int monitor_port, ret;
+ u32 reg, val;
+
+ /* Check for existent entry */
+ if ((ingress ? priv->mirror_rx : priv->mirror_tx) & BIT(port))
+ return -EEXIST;
+
+ ret = regmap_read(priv->regmap, QCA8K_REG_GLOBAL_FW_CTRL0, &val);
+ if (ret)
+ return ret;
+
+ /* QCA83xx can have only one port set to mirror mode.
+ * Check that the correct port is requested and return error otherwise.
+ * When no mirror port is set, the values is set to 0xF
+ */
+ monitor_port = FIELD_GET(QCA8K_GLOBAL_FW_CTRL0_MIRROR_PORT_NUM, val);
+ if (monitor_port != 0xF && monitor_port != mirror->to_local_port)
+ return -EEXIST;
+
+ /* Set the monitor port */
+ val = FIELD_PREP(QCA8K_GLOBAL_FW_CTRL0_MIRROR_PORT_NUM,
+ mirror->to_local_port);
+ ret = regmap_update_bits(priv->regmap, QCA8K_REG_GLOBAL_FW_CTRL0,
+ QCA8K_GLOBAL_FW_CTRL0_MIRROR_PORT_NUM, val);
+ if (ret)
+ return ret;
+
+ if (ingress) {
+ reg = QCA8K_PORT_LOOKUP_CTRL(port);
+ val = QCA8K_PORT_LOOKUP_ING_MIRROR_EN;
+ } else {
+ reg = QCA8K_REG_PORT_HOL_CTRL1(port);
+ val = QCA8K_PORT_HOL_CTRL1_EG_MIRROR_EN;
+ }
+
+ ret = regmap_update_bits(priv->regmap, reg, val, val);
+ if (ret)
+ return ret;
+
+ /* Track mirror port for tx and rx to decide when the
+ * mirror port has to be disabled.
+ */
+ if (ingress)
+ priv->mirror_rx |= BIT(port);
+ else
+ priv->mirror_tx |= BIT(port);
+
+ return 0;
+}
+
+static void
+qca8k_port_mirror_del(struct dsa_switch *ds, int port,
+ struct dsa_mall_mirror_tc_entry *mirror)
+{
+ struct qca8k_priv *priv = ds->priv;
+ u32 reg, val;
+ int ret;
+
+ if (mirror->ingress) {
+ reg = QCA8K_PORT_LOOKUP_CTRL(port);
+ val = QCA8K_PORT_LOOKUP_ING_MIRROR_EN;
+ } else {
+ reg = QCA8K_REG_PORT_HOL_CTRL1(port);
+ val = QCA8K_PORT_HOL_CTRL1_EG_MIRROR_EN;
+ }
+
+ ret = regmap_clear_bits(priv->regmap, reg, val);
+ if (ret)
+ goto err;
+
+ if (mirror->ingress)
+ priv->mirror_rx &= ~BIT(port);
+ else
+ priv->mirror_tx &= ~BIT(port);
+
+ /* No port set to send packet to mirror port. Disable mirror port */
+ if (!priv->mirror_rx && !priv->mirror_tx) {
+ val = FIELD_PREP(QCA8K_GLOBAL_FW_CTRL0_MIRROR_PORT_NUM, 0xF);
+ ret = regmap_update_bits(priv->regmap, QCA8K_REG_GLOBAL_FW_CTRL0,
+ QCA8K_GLOBAL_FW_CTRL0_MIRROR_PORT_NUM, val);
+ if (ret)
+ goto err;
+ }
+err:
+ dev_err(priv->dev, "Failed to del mirror port from %d", port);
+}
+
static int
qca8k_port_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering,
struct netlink_ext_ack *extack)
@@ -2045,6 +2138,8 @@ static const struct dsa_switch_ops qca8k_switch_ops = {
.port_fdb_add = qca8k_port_fdb_add,
.port_fdb_del = qca8k_port_fdb_del,
.port_fdb_dump = qca8k_port_fdb_dump,
+ .port_mirror_add = qca8k_port_mirror_add,
+ .port_mirror_del = qca8k_port_mirror_del,
.port_vlan_filtering = qca8k_port_vlan_filtering,
.port_vlan_add = qca8k_port_vlan_add,
.port_vlan_del = qca8k_port_vlan_del,
diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h
index c5d83514ad2e..d25afdab4dea 100644
--- a/drivers/net/dsa/qca8k.h
+++ b/drivers/net/dsa/qca8k.h
@@ -177,6 +177,7 @@
#define QCA8K_VTU_FUNC1_FULL BIT(4)
#define QCA8K_REG_GLOBAL_FW_CTRL0 0x620
#define QCA8K_GLOBAL_FW_CTRL0_CPU_PORT_EN BIT(10)
+#define QCA8K_GLOBAL_FW_CTRL0_MIRROR_PORT_NUM GENMASK(7, 4)
#define QCA8K_REG_GLOBAL_FW_CTRL1 0x624
#define QCA8K_GLOBAL_FW_CTRL1_IGMP_DP_MASK GENMASK(30, 24)
#define QCA8K_GLOBAL_FW_CTRL1_BC_DP_MASK GENMASK(22, 16)
@@ -198,6 +199,7 @@
#define QCA8K_PORT_LOOKUP_STATE_LEARNING QCA8K_PORT_LOOKUP_STATE(0x3)
#define QCA8K_PORT_LOOKUP_STATE_FORWARD QCA8K_PORT_LOOKUP_STATE(0x4)
#define QCA8K_PORT_LOOKUP_LEARN BIT(20)
+#define QCA8K_PORT_LOOKUP_ING_MIRROR_EN BIT(25)
#define QCA8K_REG_GLOBAL_FC_THRESH 0x800
#define QCA8K_GLOBAL_FC_GOL_XON_THRES_MASK GENMASK(24, 16)
@@ -262,6 +264,7 @@ enum qca8k_fdb_cmd {
QCA8K_FDB_FLUSH = 1,
QCA8K_FDB_LOAD = 2,
QCA8K_FDB_PURGE = 3,
+ QCA8K_FDB_FLUSH_PORT = 5,
QCA8K_FDB_NEXT = 6,
QCA8K_FDB_SEARCH = 7,
};
@@ -302,6 +305,8 @@ struct qca8k_ports_config {
struct qca8k_priv {
u8 switch_id;
u8 switch_revision;
+ u8 mirror_rx;
+ u8 mirror_tx;
bool legacy_phy_port_mapping;
struct qca8k_ports_config ports_config;
struct regmap *regmap;
--
2.32.0
next prev parent reply other threads:[~2021-11-17 21:06 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-17 21:04 [net-next PATCH 00/19] Multiple cleanup and feature for qca8k Ansuel Smith
2021-11-17 21:04 ` regmap: allow to define reg_update_bits for no bus configuration Ansuel Smith
2021-11-17 22:15 ` Mark Brown
2021-11-17 22:19 ` Ansuel Smith
2021-11-17 22:33 ` Mark Brown
2021-11-19 1:54 ` Jakub Kicinski
2021-11-19 2:00 ` Ansuel Smith
2021-11-19 2:00 ` patchwork-bot+netdevbpf
2021-11-17 21:04 ` [net-next PATCH 02/19] net: dsa: qca8k: remove redundant check in parse_port_config Ansuel Smith
2021-11-18 23:59 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 03/19] net: dsa: qca8k: skip sgmii delay on double cpu conf Ansuel Smith
2021-11-19 0:58 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 04/19] net: dsa: qca8k: convert to GENMASK/FIELD_PREP/FIELD_GET Ansuel Smith
2021-11-17 21:04 ` [net-next PATCH 05/19] net: dsa: qca8k: move read switch id function in qca8k_setup Ansuel Smith
2021-11-19 1:03 ` Vladimir Oltean
2021-11-19 1:08 ` Ansuel Smith
2021-11-21 18:34 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 06/19] net: dsa: qca8k: remove extra mutex_init " Ansuel Smith
2021-11-17 21:04 ` [net-next PATCH 07/19] net: dsa: qca8k: set regmap init as mandatory for regmap conversion Ansuel Smith
2021-11-19 1:09 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 08/19] net: dsa: qca8k: convert qca8k to regmap helper Ansuel Smith
2021-11-19 1:14 ` Vladimir Oltean
2021-11-19 1:28 ` Ansuel Smith
2021-11-21 18:31 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 09/19] net: dsa: qca8k: add additional MIB counter and make it dynamic Ansuel Smith
2021-11-19 1:17 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 10/19] net: dsa: qca8k: add support for port fast aging Ansuel Smith
2021-11-19 1:20 ` Vladimir Oltean
2021-11-17 21:04 ` Ansuel Smith [this message]
2021-11-19 1:42 ` [net-next PATCH 11/19] net: dsa: qca8k: add support for mirror mode Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 12/19] net: dsa: qca8k: add set_ageing_time support Ansuel Smith
2021-11-19 1:47 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 13/19] net: dsa: qca8k: add min/max ageing time Ansuel Smith
2021-11-19 1:49 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 14/19] net: dsa: qca8k: add support for mdb_add/del Ansuel Smith
2021-11-19 2:06 ` Vladimir Oltean
2021-11-19 2:19 ` Ansuel Smith
2021-11-19 2:33 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 15/19] net: dsa: qca8k: add LAG support Ansuel Smith
2021-11-19 2:13 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 16/19] net: dsa: qca8k: enable mtu_enforcement_ingress Ansuel Smith
2021-11-19 2:20 ` Vladimir Oltean
2021-11-19 2:28 ` Ansuel Smith
2021-11-21 18:11 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 17/19] net: dsa: qca8k: move qca8k to qca dir Ansuel Smith
2021-11-17 21:04 ` [net-next PATCH 18/19] net: dsa: qca8k: use device_get_match_data instead of the OF variant Ansuel Smith
2021-11-19 2:21 ` Vladimir Oltean
2021-11-19 2:32 ` Ansuel Smith
2021-11-21 18:03 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 19/19] net: dsa: qca8k: split qca8k in common and 8xxx specific code Ansuel Smith
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211117210451.26415-12-ansuelsmth@gmail.com \
--to=ansuelsmth@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=vivien.didelot@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).