Commit 21bd64bd authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: dsa: consolidate phylink creation 



The code in port.c and slave.c creating the phylink instance is very
similar - let's consolidate this into a single function.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarMarek Behún <kabel@kernel.org>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8057cbb8

net/dsa/dsa_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -258,13 +258,13 @@ int dsa_port_mrp_add_ring_role(const struct dsa_port *dp, 
			       const struct switchdev_obj_ring_role_mrp *mrp);

int dsa_port_mrp_del_ring_role(const struct dsa_port *dp,

			       const struct switchdev_obj_ring_role_mrp *mrp);

int dsa_port_phylink_create(struct dsa_port *dp);

int dsa_port_link_register_of(struct dsa_port *dp);

void dsa_port_link_unregister_of(struct dsa_port *dp);

int dsa_port_hsr_join(struct dsa_port *dp, struct net_device *hsr);

void dsa_port_hsr_leave(struct dsa_port *dp, struct net_device *hsr);

int dsa_port_tag_8021q_vlan_add(struct dsa_port *dp, u16 vid, bool broadcast);

void dsa_port_tag_8021q_vlan_del(struct dsa_port *dp, u16 vid, bool broadcast);

extern const struct phylink_mac_ops dsa_port_phylink_mac_ops;



static inline bool dsa_port_offloads_bridge_port(struct dsa_port *dp,

						 const struct net_device *dev)

net/dsa/port.c

+28 −16
Original line number Diff line number Diff line
@@ -1072,7 +1072,7 @@ static void dsa_port_phylink_mac_link_up(struct phylink_config *config, 
				     speed, duplex, tx_pause, rx_pause);

}



const struct phylink_mac_ops dsa_port_phylink_mac_ops = {

static const struct phylink_mac_ops dsa_port_phylink_mac_ops = {

	.validate = dsa_port_phylink_validate,

	.mac_pcs_get_state = dsa_port_phylink_mac_pcs_get_state,

	.mac_config = dsa_port_phylink_mac_config,
@@ -1081,6 +1081,30 @@ const struct phylink_mac_ops dsa_port_phylink_mac_ops = { 
	.mac_link_up = dsa_port_phylink_mac_link_up,

};



int dsa_port_phylink_create(struct dsa_port *dp)

{

	struct dsa_switch *ds = dp->ds;

	phy_interface_t mode;

	int err;



	err = of_get_phy_mode(dp->dn, &mode);

	if (err)

		mode = PHY_INTERFACE_MODE_NA;



	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(dp->dn),

				mode, &dsa_port_phylink_mac_ops);

	if (IS_ERR(dp->pl)) {

		pr_err("error creating PHYLINK: %ld\n", PTR_ERR(dp->pl));

		return PTR_ERR(dp->pl);

	}



	return 0;

}



static int dsa_port_setup_phy_of(struct dsa_port *dp, bool enable)

{

	struct dsa_switch *ds = dp->ds;
@@ -1157,27 +1181,15 @@ static int dsa_port_phylink_register(struct dsa_port *dp) 
{

	struct dsa_switch *ds = dp->ds;

	struct device_node *port_dn = dp->dn;

	phy_interface_t mode;

	int err;



	err = of_get_phy_mode(port_dn, &mode);

	if (err)

		mode = PHY_INTERFACE_MODE_NA;



	dp->pl_config.dev = ds->dev;

	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)) {

		pr_err("error creating PHYLINK: %ld\n", PTR_ERR(dp->pl));

		return PTR_ERR(dp->pl);

	}

	err = dsa_port_phylink_create(dp);

	if (err)

		return err;



	err = phylink_of_phy_connect(dp->pl, port_dn, 0);

	if (err && err != -ENODEV) {

net/dsa/slave.c

+3 −16
Original line number Diff line number Diff line
@@ -1851,14 +1851,9 @@ static int dsa_slave_phy_setup(struct net_device *slave_dev) 
	struct dsa_port *dp = dsa_slave_to_port(slave_dev);

	struct device_node *port_dn = dp->dn;

	struct dsa_switch *ds = dp->ds;

	phy_interface_t mode;

	u32 phy_flags = 0;

	int ret;



	ret = of_get_phy_mode(port_dn, &mode);

	if (ret)

		mode = PHY_INTERFACE_MODE_NA;



	dp->pl_config.dev = &slave_dev->dev;

	dp->pl_config.type = PHYLINK_NETDEV;
@@ -1871,17 +1866,9 @@ static int dsa_slave_phy_setup(struct net_device *slave_dev) 
		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)) {

		netdev_err(slave_dev,

			   "error creating PHYLINK: %ld\n", PTR_ERR(dp->pl));

		return PTR_ERR(dp->pl);

	}

	ret = dsa_port_phylink_create(dp);

	if (ret)

		return ret;



	if (ds->ops->get_phy_flags)

		phy_flags = ds->ops->get_phy_flags(ds, dp->index);