Commit 0a7bdbc2 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: sja1105: move devlink param code to sja1105_devlink.c 



We'll have more devlink code soon. Group it together in a separate
translation object.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e666a4c6

drivers/net/dsa/sja1105/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ sja1105-objs := \ 
    sja1105_main.o \

    sja1105_flower.o \

    sja1105_ethtool.o \

    sja1105_devlink.o \

    sja1105_clocking.o \

    sja1105_static_config.o \

    sja1105_dynamic_config.o \

drivers/net/dsa/sja1105/sja1105.h

+9 −1
Original line number Diff line number Diff line
@@ -244,9 +244,17 @@ enum sja1105_reset_reason { 


int sja1105_static_config_reload(struct sja1105_private *priv,

				 enum sja1105_reset_reason reason);



int sja1105_vlan_filtering(struct dsa_switch *ds, int port, bool enabled);

void sja1105_frame_memory_partitioning(struct sja1105_private *priv);



/* From sja1105_devlink.c */

int sja1105_devlink_setup(struct dsa_switch *ds);

void sja1105_devlink_teardown(struct dsa_switch *ds);

int sja1105_devlink_param_get(struct dsa_switch *ds, u32 id,

			      struct devlink_param_gset_ctx *ctx);

int sja1105_devlink_param_set(struct dsa_switch *ds, u32 id,

			      struct devlink_param_gset_ctx *ctx);



/* From sja1105_spi.c */

int sja1105_xfer_buf(const struct sja1105_private *priv,

		     sja1105_spi_rw_mode_t rw, u64 reg_addr,

drivers/net/dsa/sja1105/sja1105_devlink.c

0 → 100644
+119 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com>

 */

#include "sja1105.h"



static int sja1105_best_effort_vlan_filtering_get(struct sja1105_private *priv,

						  bool *be_vlan)

{

	*be_vlan = priv->best_effort_vlan_filtering;



	return 0;

}



static int sja1105_best_effort_vlan_filtering_set(struct sja1105_private *priv,

						  bool be_vlan)

{

	struct dsa_switch *ds = priv->ds;

	bool vlan_filtering;

	int port;

	int rc;



	priv->best_effort_vlan_filtering = be_vlan;



	rtnl_lock();

	for (port = 0; port < ds->num_ports; port++) {

		struct dsa_port *dp;



		if (!dsa_is_user_port(ds, port))

			continue;



		dp = dsa_to_port(ds, port);

		vlan_filtering = dsa_port_is_vlan_filtering(dp);



		rc = sja1105_vlan_filtering(ds, port, vlan_filtering);

		if (rc)

			break;

	}

	rtnl_unlock();



	return rc;

}



enum sja1105_devlink_param_id {

	SJA1105_DEVLINK_PARAM_ID_BASE = DEVLINK_PARAM_GENERIC_ID_MAX,

	SJA1105_DEVLINK_PARAM_ID_BEST_EFFORT_VLAN_FILTERING,

};



int sja1105_devlink_param_get(struct dsa_switch *ds, u32 id,

			      struct devlink_param_gset_ctx *ctx)

{

	struct sja1105_private *priv = ds->priv;

	int err;



	switch (id) {

	case SJA1105_DEVLINK_PARAM_ID_BEST_EFFORT_VLAN_FILTERING:

		err = sja1105_best_effort_vlan_filtering_get(priv,

							     &ctx->val.vbool);

		break;

	default:

		err = -EOPNOTSUPP;

		break;

	}



	return err;

}



int sja1105_devlink_param_set(struct dsa_switch *ds, u32 id,

			      struct devlink_param_gset_ctx *ctx)

{

	struct sja1105_private *priv = ds->priv;

	int err;



	switch (id) {

	case SJA1105_DEVLINK_PARAM_ID_BEST_EFFORT_VLAN_FILTERING:

		err = sja1105_best_effort_vlan_filtering_set(priv,

							     ctx->val.vbool);

		break;

	default:

		err = -EOPNOTSUPP;

		break;

	}



	return err;

}



static const struct devlink_param sja1105_devlink_params[] = {

	DSA_DEVLINK_PARAM_DRIVER(SJA1105_DEVLINK_PARAM_ID_BEST_EFFORT_VLAN_FILTERING,

				 "best_effort_vlan_filtering",

				 DEVLINK_PARAM_TYPE_BOOL,

				 BIT(DEVLINK_PARAM_CMODE_RUNTIME)),

};



static int sja1105_setup_devlink_params(struct dsa_switch *ds)

{

	return dsa_devlink_params_register(ds, sja1105_devlink_params,

					   ARRAY_SIZE(sja1105_devlink_params));

}



static void sja1105_teardown_devlink_params(struct dsa_switch *ds)

{

	dsa_devlink_params_unregister(ds, sja1105_devlink_params,

				      ARRAY_SIZE(sja1105_devlink_params));

}



int sja1105_devlink_setup(struct dsa_switch *ds)

{

	int rc;



	rc = sja1105_setup_devlink_params(ds);

	if (rc)

		return rc;



	return 0;

}



void sja1105_devlink_teardown(struct dsa_switch *ds)

{

	sja1105_teardown_devlink_params(ds);

}

drivers/net/dsa/sja1105/sja1105_main.c

+3 −102
Original line number Diff line number Diff line
@@ -2634,7 +2634,7 @@ static int sja1105_vlan_prepare(struct dsa_switch *ds, int port, 
 * which can only be partially reconfigured at runtime (and not the TPID).

 * So a switch reset is required.

 */

static int sja1105_vlan_filtering(struct dsa_switch *ds, int port, bool enabled)

int sja1105_vlan_filtering(struct dsa_switch *ds, int port, bool enabled)

{

	struct sja1105_l2_lookup_params_entry *l2_lookup_params;

	struct sja1105_general_params_entry *general_params;
@@ -2864,105 +2864,6 @@ static const struct dsa_8021q_ops sja1105_dsa_8021q_ops = { 
	.vlan_del	= sja1105_dsa_8021q_vlan_del,

};



static int sja1105_best_effort_vlan_filtering_get(struct sja1105_private *priv,

						  bool *be_vlan)

{

	*be_vlan = priv->best_effort_vlan_filtering;



	return 0;

}



static int sja1105_best_effort_vlan_filtering_set(struct sja1105_private *priv,

						  bool be_vlan)

{

	struct dsa_switch *ds = priv->ds;

	bool vlan_filtering;

	int port;

	int rc;



	priv->best_effort_vlan_filtering = be_vlan;



	rtnl_lock();

	for (port = 0; port < ds->num_ports; port++) {

		struct dsa_port *dp;



		if (!dsa_is_user_port(ds, port))

			continue;



		dp = dsa_to_port(ds, port);

		vlan_filtering = dsa_port_is_vlan_filtering(dp);



		rc = sja1105_vlan_filtering(ds, port, vlan_filtering);

		if (rc)

			break;

	}

	rtnl_unlock();



	return rc;

}



enum sja1105_devlink_param_id {

	SJA1105_DEVLINK_PARAM_ID_BASE = DEVLINK_PARAM_GENERIC_ID_MAX,

	SJA1105_DEVLINK_PARAM_ID_BEST_EFFORT_VLAN_FILTERING,

};



static int sja1105_devlink_param_get(struct dsa_switch *ds, u32 id,

				     struct devlink_param_gset_ctx *ctx)

{

	struct sja1105_private *priv = ds->priv;

	int err;



	switch (id) {

	case SJA1105_DEVLINK_PARAM_ID_BEST_EFFORT_VLAN_FILTERING:

		err = sja1105_best_effort_vlan_filtering_get(priv,

							     &ctx->val.vbool);

		break;

	default:

		err = -EOPNOTSUPP;

		break;

	}



	return err;

}



static int sja1105_devlink_param_set(struct dsa_switch *ds, u32 id,

				     struct devlink_param_gset_ctx *ctx)

{

	struct sja1105_private *priv = ds->priv;

	int err;



	switch (id) {

	case SJA1105_DEVLINK_PARAM_ID_BEST_EFFORT_VLAN_FILTERING:

		err = sja1105_best_effort_vlan_filtering_set(priv,

							     ctx->val.vbool);

		break;

	default:

		err = -EOPNOTSUPP;

		break;

	}



	return err;

}



static const struct devlink_param sja1105_devlink_params[] = {

	DSA_DEVLINK_PARAM_DRIVER(SJA1105_DEVLINK_PARAM_ID_BEST_EFFORT_VLAN_FILTERING,

				 "best_effort_vlan_filtering",

				 DEVLINK_PARAM_TYPE_BOOL,

				 BIT(DEVLINK_PARAM_CMODE_RUNTIME)),

};



static int sja1105_setup_devlink_params(struct dsa_switch *ds)

{

	return dsa_devlink_params_register(ds, sja1105_devlink_params,

					   ARRAY_SIZE(sja1105_devlink_params));

}



static void sja1105_teardown_devlink_params(struct dsa_switch *ds)

{

	dsa_devlink_params_unregister(ds, sja1105_devlink_params,

				      ARRAY_SIZE(sja1105_devlink_params));

}



/* The programming model for the SJA1105 switch is "all-at-once" via static

 * configuration tables. Some of these can be dynamically modified at runtime,

 * but not the xMII mode parameters table.
@@ -3030,7 +2931,7 @@ static int sja1105_setup(struct dsa_switch *ds) 


	ds->configure_vlan_while_not_filtering = true;



	rc = sja1105_setup_devlink_params(ds);

	rc = sja1105_devlink_setup(ds);

	if (rc < 0)

		return rc;
@@ -3061,7 +2962,7 @@ static void sja1105_teardown(struct dsa_switch *ds) 
			kthread_destroy_worker(sp->xmit_worker);

	}



	sja1105_teardown_devlink_params(ds);

	sja1105_devlink_teardown(ds);

	sja1105_flower_teardown(ds);

	sja1105_tas_teardown(ds);

	sja1105_ptp_clock_unregister(ds);