2022-07-25 00:31:20 +00:00
|
|
|
From c07c6e8eb4b38bae921f9e2f108d1e7f8e14226e Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@kernel.org>
|
|
|
|
|
Date: Thu, 28 Oct 2021 18:00:14 +0100
|
|
|
|
|
Subject: [PATCH] net: dsa: populate supported_interfaces member
|
|
|
|
|
MIME-Version: 1.0
|
|
|
|
|
Content-Type: text/plain; charset=UTF-8
|
|
|
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
|
|
|
|
|
|
Add a new DSA switch operation, phylink_get_interfaces, which should
|
|
|
|
|
fill in which PHY_INTERFACE_MODE_* are supported by given port.
|
|
|
|
|
|
|
|
|
|
Use this before phylink_create() to fill phylinks supported_interfaces
|
|
|
|
|
member, allowing phylink to determine which PHY_INTERFACE_MODEs are
|
|
|
|
|
supported.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
|
|
|
[tweaked patch and description to add more complete support -- rmk]
|
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
|
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
|
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
|
|
---
|
|
|
|
|
include/net/dsa.h | 2 ++
|
|
|
|
|
net/dsa/port.c | 4 ++++
|
|
|
|
|
net/dsa/slave.c | 4 ++++
|
|
|
|
|
3 files changed, 10 insertions(+)
|
|
|
|
|
|
|
|
|
|
--- a/include/net/dsa.h
|
|
|
|
|
+++ b/include/net/dsa.h
|
2023-06-06 14:45:47 +00:00
|
|
|
@@ -654,6 +654,8 @@ struct dsa_switch_ops {
|
2022-07-25 00:31:20 +00:00
|
|
|
/*
|
|
|
|
|
* PHYLINK integration
|
|
|
|
|
*/
|
|
|
|
|
+ void (*phylink_get_interfaces)(struct dsa_switch *ds, int port,
|
|
|
|
|
+ unsigned long *supported_interfaces);
|
|
|
|
|
void (*phylink_validate)(struct dsa_switch *ds, int port,
|
|
|
|
|
unsigned long *supported,
|
|
|
|
|
struct phylink_link_state *state);
|
|
|
|
|
--- a/net/dsa/port.c
|
|
|
|
|
+++ b/net/dsa/port.c
|
2022-11-26 11:51:56 +00:00
|
|
|
@@ -1188,6 +1188,10 @@ static int dsa_port_phylink_register(str
|
2022-07-25 00:31:20 +00:00
|
|
|
dp->pl_config.type = PHYLINK_DEV;
|
|
|
|
|
dp->pl_config.pcs_poll = ds->pcs_poll;
|
|
|
|
|
|
|
|
|
|
+ if (ds->ops->phylink_get_interfaces)
|
|
|
|
|
+ ds->ops->phylink_get_interfaces(ds, dp->index,
|
|
|
|
|
+ dp->pl_config.supported_interfaces);
|
|
|
|
|
+
|
|
|
|
|
dp->pl = phylink_create(&dp->pl_config, of_fwnode_handle(port_dn),
|
|
|
|
|
mode, &dsa_port_phylink_mac_ops);
|
|
|
|
|
if (IS_ERR(dp->pl)) {
|
|
|
|
|
--- a/net/dsa/slave.c
|
|
|
|
|
+++ b/net/dsa/slave.c
|
|
|
|
|
@@ -1837,6 +1837,10 @@ static int dsa_slave_phy_setup(struct ne
|
|
|
|
|
dp->pl_config.poll_fixed_state = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if (ds->ops->phylink_get_interfaces)
|
|
|
|
|
+ ds->ops->phylink_get_interfaces(ds, dp->index,
|
|
|
|
|
+ dp->pl_config.supported_interfaces);
|
|
|
|
|
+
|
|
|
|
|
dp->pl = phylink_create(&dp->pl_config, of_fwnode_handle(port_dn), mode,
|
|
|
|
|
&dsa_port_phylink_mac_ops);
|
|
|
|
|
if (IS_ERR(dp->pl)) {
|
