100 lines
3.6 KiB
Diff
100 lines
3.6 KiB
Diff
From f13b2b33c7674fa0988dfaa9adb95d7d912b489f Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Wed, 10 Apr 2024 20:42:38 +0100
|
|
Subject: [PATCH 1/2] net: dsa: introduce dsa_phylink_to_port()
|
|
|
|
We convert from a phylink_config struct to a dsa_port struct in many
|
|
places, let's provide a helper for this.
|
|
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
|
|
Link: https://lore.kernel.org/r/E1rudqA-006K9B-85@rmk-PC.armlinux.org.uk
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
include/net/dsa.h | 6 ++++++
|
|
net/dsa/port.c | 12 ++++++------
|
|
2 files changed, 12 insertions(+), 6 deletions(-)
|
|
|
|
--- a/include/net/dsa.h
|
|
+++ b/include/net/dsa.h
|
|
@@ -337,6 +337,12 @@ struct dsa_port {
|
|
struct list_head vlans;
|
|
};
|
|
|
|
+static inline struct dsa_port *
|
|
+dsa_phylink_to_port(struct phylink_config *config)
|
|
+{
|
|
+ return container_of(config, struct dsa_port, pl_config);
|
|
+}
|
|
+
|
|
/* TODO: ideally DSA ports would have a single dp->link_dp member,
|
|
* and no dst->rtable nor this struct dsa_link would be needed,
|
|
* but this would require some more complex tree walking,
|
|
--- a/net/dsa/port.c
|
|
+++ b/net/dsa/port.c
|
|
@@ -1552,7 +1552,7 @@ static void dsa_port_phylink_validate(st
|
|
unsigned long *supported,
|
|
struct phylink_link_state *state)
|
|
{
|
|
- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);
|
|
+ struct dsa_port *dp = dsa_phylink_to_port(config);
|
|
struct dsa_switch *ds = dp->ds;
|
|
|
|
if (!ds->ops->phylink_validate) {
|
|
@@ -1567,7 +1567,7 @@ static void dsa_port_phylink_validate(st
|
|
static void dsa_port_phylink_mac_pcs_get_state(struct phylink_config *config,
|
|
struct phylink_link_state *state)
|
|
{
|
|
- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);
|
|
+ struct dsa_port *dp = dsa_phylink_to_port(config);
|
|
struct dsa_switch *ds = dp->ds;
|
|
int err;
|
|
|
|
@@ -1589,7 +1589,7 @@ static struct phylink_pcs *
|
|
dsa_port_phylink_mac_select_pcs(struct phylink_config *config,
|
|
phy_interface_t interface)
|
|
{
|
|
- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);
|
|
+ struct dsa_port *dp = dsa_phylink_to_port(config);
|
|
struct phylink_pcs *pcs = ERR_PTR(-EOPNOTSUPP);
|
|
struct dsa_switch *ds = dp->ds;
|
|
|
|
@@ -1603,7 +1603,7 @@ static void dsa_port_phylink_mac_config(
|
|
unsigned int mode,
|
|
const struct phylink_link_state *state)
|
|
{
|
|
- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);
|
|
+ struct dsa_port *dp = dsa_phylink_to_port(config);
|
|
struct dsa_switch *ds = dp->ds;
|
|
|
|
if (!ds->ops->phylink_mac_config)
|
|
@@ -1614,7 +1614,7 @@ static void dsa_port_phylink_mac_config(
|
|
|
|
static void dsa_port_phylink_mac_an_restart(struct phylink_config *config)
|
|
{
|
|
- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);
|
|
+ struct dsa_port *dp = dsa_phylink_to_port(config);
|
|
struct dsa_switch *ds = dp->ds;
|
|
|
|
if (!ds->ops->phylink_mac_an_restart)
|
|
@@ -1627,7 +1627,7 @@ static void dsa_port_phylink_mac_link_do
|
|
unsigned int mode,
|
|
phy_interface_t interface)
|
|
{
|
|
- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);
|
|
+ struct dsa_port *dp = dsa_phylink_to_port(config);
|
|
struct phy_device *phydev = NULL;
|
|
struct dsa_switch *ds = dp->ds;
|
|
|
|
@@ -1650,7 +1650,7 @@ static void dsa_port_phylink_mac_link_up
|
|
int speed, int duplex,
|
|
bool tx_pause, bool rx_pause)
|
|
{
|
|
- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);
|
|
+ struct dsa_port *dp = dsa_phylink_to_port(config);
|
|
struct dsa_switch *ds = dp->ds;
|
|
|
|
if (!ds->ops->phylink_mac_link_up) {
|