diff options
author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-04-10 20:42:43 +0100 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2024-04-11 20:01:14 -0700 |
commit | cae425cb43feddd9fd62fc1b25567f9463da4915 (patch) | |
tree | 7643586e81d8d0f28eca234df0cae6bb8b7aebb6 /net/dsa/dsa.c | |
parent | dd0c9855b41310470086500c9963bbb64bb90dd0 (diff) |
net: dsa: allow DSA switch drivers to provide their own phylink mac ops
Rather than having a shim for each and every phylink MAC operation,
allow DSA switch drivers to provide their own ops structure. When a
DSA driver provides the phylink MAC operations, the shimmed ops must
not be provided, so fail an attempt to register a switch with both
the phylink_mac_ops in struct dsa_switch and the phylink_mac_*
operations populated in dsa_switch_ops populated.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/E1rudqF-006K9H-Cc@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/dsa/dsa.c')
-rw-r--r-- | net/dsa/dsa.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 09d2f5d4b3dd..2f347cd37316 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -1505,6 +1505,17 @@ static int dsa_switch_probe(struct dsa_switch *ds) if (!ds->num_ports) return -EINVAL; + if (ds->phylink_mac_ops) { + if (ds->ops->phylink_mac_select_pcs || + ds->ops->phylink_mac_prepare || + ds->ops->phylink_mac_config || + ds->ops->phylink_mac_finish || + ds->ops->phylink_mac_link_down || + ds->ops->phylink_mac_link_up || + ds->ops->adjust_link) + return -EINVAL; + } + if (np) { err = dsa_switch_parse_of(ds, np); if (err) |