Commit 17705434 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Devlink-regions-for-SJA1105-DSA-driver' 

Vladimir Oltean says:

====================
Devlink regions for SJA1105 DSA driver

This series exposes the SJA1105 static config as a devlink region. This
can be used for debugging, for example with the sja1105_dump user space
program that I have derived from Andrew Lunn's mv88e6xxx_dump:

https://github.com/vladimiroltean/mv88e6xxx_dump/tree/sja1105



Changes in v2:
- Tear down devlink params on initialization failure.
- Add driver identification through devlink.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e666a4c6 ff4cf8ea

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

+15 −1
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ struct sja1105_private { 
	struct mutex mgmt_lock;

	struct dsa_8021q_context *dsa_8021q_ctx;

	enum sja1105_vlan_state vlan_state;

	struct devlink_region **regions;

	struct sja1105_cbs_entry *cbs;

	struct sja1105_tagger_data tagger_data;

	struct sja1105_ptp_data ptp_data;
@@ -244,9 +245,20 @@ 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);

int sja1105_devlink_info_get(struct dsa_switch *ds,

			     struct devlink_info_req *req,

			     struct netlink_ext_ack *extack);



/* From sja1105_spi.c */

int sja1105_xfer_buf(const struct sja1105_private *priv,

		     sja1105_spi_rw_mode_t rw, u64 reg_addr,
@@ -257,6 +269,8 @@ int sja1105_xfer_u32(const struct sja1105_private *priv, 
int sja1105_xfer_u64(const struct sja1105_private *priv,

		     sja1105_spi_rw_mode_t rw, u64 reg_addr, u64 *value,

		     struct ptp_system_timestamp *ptp_sts);

int static_config_buf_prepare_for_upload(struct sja1105_private *priv,

					 void *config_buf, int buf_len);

int sja1105_static_config_upload(struct sja1105_private *priv);

int sja1105_inhibit_tx(const struct sja1105_private *priv,

		       unsigned long port_bitmap, bool tx_inhibited);

drivers/net/dsa/sja1105/sja1105_devlink.c

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

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

 * Copyright 2020 NXP Semiconductors

 */

#include "sja1105.h"



/* Since devlink regions have a fixed size and the static config has a variable

 * size, we need to calculate the maximum possible static config size by

 * creating a dummy config with all table entries populated to the max, and get

 * its packed length. This is done dynamically as opposed to simply hardcoding

 * a number, since currently not all static config tables are implemented, so

 * we are avoiding a possible code desynchronization.

 */

static size_t sja1105_static_config_get_max_size(struct sja1105_private *priv)

{

	struct sja1105_static_config config;

	enum sja1105_blk_idx blk_idx;

	int rc;



	rc = sja1105_static_config_init(&config,

					priv->info->static_ops,

					priv->info->device_id);

	if (rc)

		return 0;



	for (blk_idx = 0; blk_idx < BLK_IDX_MAX; blk_idx++) {

		struct sja1105_table *table = &config.tables[blk_idx];



		table->entry_count = table->ops->max_entry_count;

	}



	return sja1105_static_config_get_length(&config);

}



static int

sja1105_region_static_config_snapshot(struct devlink *dl,

				      const struct devlink_region_ops *ops,

				      struct netlink_ext_ack *extack,

				      u8 **data)

{

	struct dsa_switch *ds = dsa_devlink_to_ds(dl);

	struct sja1105_private *priv = ds->priv;

	size_t max_len, len;



	len = sja1105_static_config_get_length(&priv->static_config);

	max_len = sja1105_static_config_get_max_size(priv);



	*data = kcalloc(max_len, sizeof(u8), GFP_KERNEL);

	if (!*data)

		return -ENOMEM;



	return static_config_buf_prepare_for_upload(priv, *data, len);

}



static struct devlink_region_ops sja1105_region_static_config_ops = {

	.name = "static-config",

	.snapshot = sja1105_region_static_config_snapshot,

	.destructor = kfree,

};



enum sja1105_region_id {

	SJA1105_REGION_STATIC_CONFIG = 0,

};



struct sja1105_region {

	const struct devlink_region_ops *ops;

	size_t (*get_size)(struct sja1105_private *priv);

};



static struct sja1105_region sja1105_regions[] = {

	[SJA1105_REGION_STATIC_CONFIG] = {

		.ops = &sja1105_region_static_config_ops,

		.get_size = sja1105_static_config_get_max_size,

	},

};



static int sja1105_setup_devlink_regions(struct dsa_switch *ds)

{

	int i, num_regions = ARRAY_SIZE(sja1105_regions);

	struct sja1105_private *priv = ds->priv;

	const struct devlink_region_ops *ops;

	struct devlink_region *region;

	u64 size;



	priv->regions = kcalloc(num_regions, sizeof(struct devlink_region *),

				GFP_KERNEL);

	if (!priv->regions)

		return -ENOMEM;



	for (i = 0; i < num_regions; i++) {

		size = sja1105_regions[i].get_size(priv);

		ops = sja1105_regions[i].ops;



		region = dsa_devlink_region_create(ds, ops, 1, size);

		if (IS_ERR(region)) {

			while (i-- >= 0)

				dsa_devlink_region_destroy(priv->regions[i]);

			return PTR_ERR(region);

		}



		priv->regions[i] = region;

	}



	return 0;

}



static void sja1105_teardown_devlink_regions(struct dsa_switch *ds)

{

	int i, num_regions = ARRAY_SIZE(sja1105_regions);

	struct sja1105_private *priv = ds->priv;



	for (i = 0; i < num_regions; i++)

		dsa_devlink_region_destroy(priv->regions[i]);



	kfree(priv->regions);

}



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_info_get(struct dsa_switch *ds,

			     struct devlink_info_req *req,

			     struct netlink_ext_ack *extack)

{

	struct sja1105_private *priv = ds->priv;

	int rc;



	rc = devlink_info_driver_name_put(req, "sja1105");

	if (rc)

		return rc;



	rc = devlink_info_version_fixed_put(req,

					    DEVLINK_INFO_VERSION_GENERIC_ASIC_ID,

					    priv->info->name);

	return rc;

}



int sja1105_devlink_setup(struct dsa_switch *ds)

{

	int rc;



	rc = sja1105_setup_devlink_params(ds);

	if (rc)

		return rc;



	rc = sja1105_setup_devlink_regions(ds);

	if (rc < 0) {

		sja1105_teardown_devlink_params(ds);

		return rc;

	}



	return 0;

}



void sja1105_devlink_teardown(struct dsa_switch *ds)

{

	sja1105_teardown_devlink_params(ds);

	sja1105_teardown_devlink_regions(ds);

}

drivers/net/dsa/sja1105/sja1105_main.c

+4 −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);
@@ -3415,6 +3316,7 @@ static const struct dsa_switch_ops sja1105_switch_ops = { 
	.crosschip_bridge_leave	= sja1105_crosschip_bridge_leave,

	.devlink_param_get	= sja1105_devlink_param_get,

	.devlink_param_set	= sja1105_devlink_param_set,

	.devlink_info_get	= sja1105_devlink_info_get,

};



static const struct of_device_id sja1105_dt_ids[];

drivers/net/dsa/sja1105/sja1105_spi.c

+2 −3
Original line number Diff line number Diff line
@@ -302,8 +302,7 @@ static int sja1105_status_get(struct sja1105_private *priv, 
 * for upload requires the recalculation of table CRCs and updating the

 * structures with these.

 */

static int

static_config_buf_prepare_for_upload(struct sja1105_private *priv,

int static_config_buf_prepare_for_upload(struct sja1105_private *priv,

					 void *config_buf, int buf_len)

{

	struct sja1105_static_config *config = &priv->static_config;