netdev - [PATCH net-next 2/2] net: dsa: b53: Add CPU port election callback

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20191028223236.31642-3-f.fainelli@gmail.com>
Date:   Mon, 28 Oct 2019 15:32:36 -0700
From:   Florian Fainelli <f.fainelli@...il.com>
To:     netdev@...r.kernel.org
Cc:     Florian Fainelli <f.fainelli@...il.com>, andrew@...n.ch,
        vivien.didelot@...il.com, davem@...emloft.net,
        Jakub Kicinski <jakub.kicinski@...ronome.com>
Subject: [PATCH net-next 2/2] net: dsa: b53: Add CPU port election callback

Add the ability to select a particular CPU port to be chosen when
multiple such ports are defined/available in the platform configuration.
On all Broadcom switches but 5325 and 5365, port 8 should be selected.

Signed-off-by: Florian Fainelli <f.fainelli@...il.com>
---
 drivers/net/dsa/b53/b53_common.c | 17 +++++++++++++++++
 drivers/net/dsa/b53/b53_priv.h   |  1 +
 drivers/net/dsa/bcm_sf2.c        |  1 +
 3 files changed, 19 insertions(+)

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index baadf622ac55..ce7c22f151a6 100644
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -1833,6 +1833,22 @@ enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds, int port)
 }
 EXPORT_SYMBOL(b53_get_tag_protocol);
 
+int b53_elect_cpu_port(struct dsa_switch *ds, int port)
+{
+	struct b53_device *dev = ds->priv;
+	int cpu_port = dev->cpu_port;
+
+	if (is5325(dev) || is5365(dev))
+		cpu_port = B53_CPU_PORT_25;
+
+	/* We would prefer to use a different CPU port that this one */
+	if (port != cpu_port)
+		return -EINVAL;
+
+	return 0;
+}
+EXPORT_SYMBOL(b53_elect_cpu_port);
+
 int b53_mirror_add(struct dsa_switch *ds, int port,
 		   struct dsa_mall_mirror_tc_entry *mirror, bool ingress)
 {
@@ -1962,6 +1978,7 @@ EXPORT_SYMBOL(b53_set_mac_eee);
 
 static const struct dsa_switch_ops b53_switch_ops = {
 	.get_tag_protocol	= b53_get_tag_protocol,
+	.elect_cpu_port		= b53_elect_cpu_port,
 	.setup			= b53_setup,
 	.get_strings		= b53_get_strings,
 	.get_ethtool_stats	= b53_get_ethtool_stats,
diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h
index a7dd8acc281b..f12b0fae6743 100644
--- a/drivers/net/dsa/b53/b53_priv.h
+++ b/drivers/net/dsa/b53/b53_priv.h
@@ -354,6 +354,7 @@ int b53_fdb_dump(struct dsa_switch *ds, int port,
 int b53_mirror_add(struct dsa_switch *ds, int port,
 		   struct dsa_mall_mirror_tc_entry *mirror, bool ingress);
 enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds, int port);
+int b53_elect_cpu_port(struct dsa_switch *ds, int port);
 void b53_mirror_del(struct dsa_switch *ds, int port,
 		    struct dsa_mall_mirror_tc_entry *mirror);
 int b53_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy);
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index c068a3b7207b..ab399d7d76b6 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -934,6 +934,7 @@ static int bcm_sf2_sw_get_sset_count(struct dsa_switch *ds, int port,
 
 static const struct dsa_switch_ops bcm_sf2_ops = {
 	.get_tag_protocol	= b53_get_tag_protocol,
+	.elect_cpu_port		= b53_elect_cpu_port,
 	.setup			= bcm_sf2_sw_setup,
 	.get_strings		= bcm_sf2_sw_get_strings,
 	.get_ethtool_stats	= bcm_sf2_sw_get_ethtool_stats,
-- 
2.17.1