Commit 9dd43aa2 authored Sep 18, 2020 by Andrew Lunn Committed by David S. Miller Sep 18, 2020

net: dsa: mv88e6xxx: Move devlink code into its own file



There will soon be more devlink code. Move the existing code into a
file of its own, before we start adding this new code.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 97c82c23

drivers/net/dsa/mv88e6xxx/Makefile

+1 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o
		mv88e6xxx-objs := chip.o
		mv88e6xxx-objs += devlink.o
		mv88e6xxx-objs += global1.o
		mv88e6xxx-objs += global1_atu.o
		mv88e6xxx-objs += global1_vtu.o

drivers/net/dsa/mv88e6xxx/chip.c

+1 −254

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@
		#include <net/dsa.h>

		#include "chip.h"
		#include "devlink.h"
		#include "global1.h"
		#include "global2.h"
		#include "hwtstamp.h"
		@@ -1508,22 +1509,6 @@ static int mv88e6xxx_atu_new(struct mv88e6xxx_chip chip, u16 fid)
		return mv88e6xxx_g1_atu_flush(chip, *fid, true);
		}

		static int mv88e6xxx_atu_get_hash(struct mv88e6xxx_chip chip, u8 hash)
		{
		if (chip->info->ops->atu_get_hash)
		return chip->info->ops->atu_get_hash(chip, hash);

		return -EOPNOTSUPP;
		}

		static int mv88e6xxx_atu_set_hash(struct mv88e6xxx_chip *chip, u8 hash)
		{
		if (chip->info->ops->atu_set_hash)
		return chip->info->ops->atu_set_hash(chip, hash);

		return -EOPNOTSUPP;
		}

		static int mv88e6xxx_port_check_hw_vlan(struct dsa_switch *ds, int port,
		u16 vid_begin, u16 vid_end)
		{
		@@ -2837,244 +2822,6 @@ static int mv88e6390_setup_errata(struct mv88e6xxx_chip *chip)
		return mv88e6xxx_software_reset(chip);
		}

		enum mv88e6xxx_devlink_param_id {
		MV88E6XXX_DEVLINK_PARAM_ID_BASE = DEVLINK_PARAM_GENERIC_ID_MAX,
		MV88E6XXX_DEVLINK_PARAM_ID_ATU_HASH,
		};

		static int mv88e6xxx_devlink_param_get(struct dsa_switch *ds, u32 id,
		struct devlink_param_gset_ctx *ctx)
		{
		struct mv88e6xxx_chip *chip = ds->priv;
		int err;

		mv88e6xxx_reg_lock(chip);

		switch (id) {
		case MV88E6XXX_DEVLINK_PARAM_ID_ATU_HASH:
		err = mv88e6xxx_atu_get_hash(chip, &ctx->val.vu8);
		break;
		default:
		err = -EOPNOTSUPP;
		break;
		}

		mv88e6xxx_reg_unlock(chip);

		return err;
		}

		static int mv88e6xxx_devlink_param_set(struct dsa_switch *ds, u32 id,
		struct devlink_param_gset_ctx *ctx)
		{
		struct mv88e6xxx_chip *chip = ds->priv;
		int err;

		mv88e6xxx_reg_lock(chip);

		switch (id) {
		case MV88E6XXX_DEVLINK_PARAM_ID_ATU_HASH:
		err = mv88e6xxx_atu_set_hash(chip, ctx->val.vu8);
		break;
		default:
		err = -EOPNOTSUPP;
		break;
		}

		mv88e6xxx_reg_unlock(chip);

		return err;
		}

		static const struct devlink_param mv88e6xxx_devlink_params[] = {
		DSA_DEVLINK_PARAM_DRIVER(MV88E6XXX_DEVLINK_PARAM_ID_ATU_HASH,
		"ATU_hash", DEVLINK_PARAM_TYPE_U8,
		BIT(DEVLINK_PARAM_CMODE_RUNTIME)),
		};

		static int mv88e6xxx_setup_devlink_params(struct dsa_switch *ds)
		{
		return dsa_devlink_params_register(ds, mv88e6xxx_devlink_params,
		ARRAY_SIZE(mv88e6xxx_devlink_params));
		}

		static void mv88e6xxx_teardown_devlink_params(struct dsa_switch *ds)
		{
		dsa_devlink_params_unregister(ds, mv88e6xxx_devlink_params,
		ARRAY_SIZE(mv88e6xxx_devlink_params));
		}

		enum mv88e6xxx_devlink_resource_id {
		MV88E6XXX_RESOURCE_ID_ATU,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_0,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_1,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_2,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_3,
		};

		static u64 mv88e6xxx_devlink_atu_bin_get(struct mv88e6xxx_chip *chip,
		u16 bin)
		{
		u16 occupancy = 0;
		int err;

		mv88e6xxx_reg_lock(chip);

		err = mv88e6xxx_g2_atu_stats_set(chip, MV88E6XXX_G2_ATU_STATS_MODE_ALL,
		bin);
		if (err) {
		dev_err(chip->dev, "failed to set ATU stats kind/bin\n");
		goto unlock;
		}

		err = mv88e6xxx_g1_atu_get_next(chip, 0);
		if (err) {
		dev_err(chip->dev, "failed to perform ATU get next\n");
		goto unlock;
		}

		err = mv88e6xxx_g2_atu_stats_get(chip, &occupancy);
		if (err) {
		dev_err(chip->dev, "failed to get ATU stats\n");
		goto unlock;
		}

		occupancy &= MV88E6XXX_G2_ATU_STATS_MASK;

		unlock:
		mv88e6xxx_reg_unlock(chip);

		return occupancy;
		}

		static u64 mv88e6xxx_devlink_atu_bin_0_get(void *priv)
		{
		struct mv88e6xxx_chip *chip = priv;

		return mv88e6xxx_devlink_atu_bin_get(chip,
		MV88E6XXX_G2_ATU_STATS_BIN_0);
		}

		static u64 mv88e6xxx_devlink_atu_bin_1_get(void *priv)
		{
		struct mv88e6xxx_chip *chip = priv;

		return mv88e6xxx_devlink_atu_bin_get(chip,
		MV88E6XXX_G2_ATU_STATS_BIN_1);
		}

		static u64 mv88e6xxx_devlink_atu_bin_2_get(void *priv)
		{
		struct mv88e6xxx_chip *chip = priv;

		return mv88e6xxx_devlink_atu_bin_get(chip,
		MV88E6XXX_G2_ATU_STATS_BIN_2);
		}

		static u64 mv88e6xxx_devlink_atu_bin_3_get(void *priv)
		{
		struct mv88e6xxx_chip *chip = priv;

		return mv88e6xxx_devlink_atu_bin_get(chip,
		MV88E6XXX_G2_ATU_STATS_BIN_3);
		}

		static u64 mv88e6xxx_devlink_atu_get(void *priv)
		{
		return mv88e6xxx_devlink_atu_bin_0_get(priv) +
		mv88e6xxx_devlink_atu_bin_1_get(priv) +
		mv88e6xxx_devlink_atu_bin_2_get(priv) +
		mv88e6xxx_devlink_atu_bin_3_get(priv);
		}

		static int mv88e6xxx_setup_devlink_resources(struct dsa_switch *ds)
		{
		struct devlink_resource_size_params size_params;
		struct mv88e6xxx_chip *chip = ds->priv;
		int err;

		devlink_resource_size_params_init(&size_params,
		mv88e6xxx_num_macs(chip),
		mv88e6xxx_num_macs(chip),
		1, DEVLINK_RESOURCE_UNIT_ENTRY);

		err = dsa_devlink_resource_register(ds, "ATU",
		mv88e6xxx_num_macs(chip),
		MV88E6XXX_RESOURCE_ID_ATU,
		DEVLINK_RESOURCE_ID_PARENT_TOP,
		&size_params);
		if (err)
		goto out;

		devlink_resource_size_params_init(&size_params,
		mv88e6xxx_num_macs(chip) / 4,
		mv88e6xxx_num_macs(chip) / 4,
		1, DEVLINK_RESOURCE_UNIT_ENTRY);

		err = dsa_devlink_resource_register(ds, "ATU_bin_0",
		mv88e6xxx_num_macs(chip) / 4,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_0,
		MV88E6XXX_RESOURCE_ID_ATU,
		&size_params);
		if (err)
		goto out;

		err = dsa_devlink_resource_register(ds, "ATU_bin_1",
		mv88e6xxx_num_macs(chip) / 4,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_1,
		MV88E6XXX_RESOURCE_ID_ATU,
		&size_params);
		if (err)
		goto out;

		err = dsa_devlink_resource_register(ds, "ATU_bin_2",
		mv88e6xxx_num_macs(chip) / 4,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_2,
		MV88E6XXX_RESOURCE_ID_ATU,
		&size_params);
		if (err)
		goto out;

		err = dsa_devlink_resource_register(ds, "ATU_bin_3",
		mv88e6xxx_num_macs(chip) / 4,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_3,
		MV88E6XXX_RESOURCE_ID_ATU,
		&size_params);
		if (err)
		goto out;

		dsa_devlink_resource_occ_get_register(ds,
		MV88E6XXX_RESOURCE_ID_ATU,
		mv88e6xxx_devlink_atu_get,
		chip);

		dsa_devlink_resource_occ_get_register(ds,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_0,
		mv88e6xxx_devlink_atu_bin_0_get,
		chip);

		dsa_devlink_resource_occ_get_register(ds,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_1,
		mv88e6xxx_devlink_atu_bin_1_get,
		chip);

		dsa_devlink_resource_occ_get_register(ds,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_2,
		mv88e6xxx_devlink_atu_bin_2_get,
		chip);

		dsa_devlink_resource_occ_get_register(ds,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_3,
		mv88e6xxx_devlink_atu_bin_3_get,
		chip);

		return 0;

		out:
		dsa_devlink_resources_unregister(ds);
		return err;
		}

		static void mv88e6xxx_teardown(struct dsa_switch *ds)
		{
		mv88e6xxx_teardown_devlink_params(ds);

drivers/net/dsa/mv88e6xxx/devlink.c

0 → 100644

+261 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-or-later
		#include <net/dsa.h>

		#include "chip.h"
		#include "devlink.h"
		#include "global1.h"
		#include "global2.h"

		static int mv88e6xxx_atu_get_hash(struct mv88e6xxx_chip chip, u8 hash)
		{
		if (chip->info->ops->atu_get_hash)
		return chip->info->ops->atu_get_hash(chip, hash);

		return -EOPNOTSUPP;
		}

		static int mv88e6xxx_atu_set_hash(struct mv88e6xxx_chip *chip, u8 hash)
		{
		if (chip->info->ops->atu_set_hash)
		return chip->info->ops->atu_set_hash(chip, hash);

		return -EOPNOTSUPP;
		}

		enum mv88e6xxx_devlink_param_id {
		MV88E6XXX_DEVLINK_PARAM_ID_BASE = DEVLINK_PARAM_GENERIC_ID_MAX,
		MV88E6XXX_DEVLINK_PARAM_ID_ATU_HASH,
		};

		int mv88e6xxx_devlink_param_get(struct dsa_switch *ds, u32 id,
		struct devlink_param_gset_ctx *ctx)
		{
		struct mv88e6xxx_chip *chip = ds->priv;
		int err;

		mv88e6xxx_reg_lock(chip);

		switch (id) {
		case MV88E6XXX_DEVLINK_PARAM_ID_ATU_HASH:
		err = mv88e6xxx_atu_get_hash(chip, &ctx->val.vu8);
		break;
		default:
		err = -EOPNOTSUPP;
		break;
		}

		mv88e6xxx_reg_unlock(chip);

		return err;
		}

		int mv88e6xxx_devlink_param_set(struct dsa_switch *ds, u32 id,
		struct devlink_param_gset_ctx *ctx)
		{
		struct mv88e6xxx_chip *chip = ds->priv;
		int err;

		mv88e6xxx_reg_lock(chip);

		switch (id) {
		case MV88E6XXX_DEVLINK_PARAM_ID_ATU_HASH:
		err = mv88e6xxx_atu_set_hash(chip, ctx->val.vu8);
		break;
		default:
		err = -EOPNOTSUPP;
		break;
		}

		mv88e6xxx_reg_unlock(chip);

		return err;
		}

		static const struct devlink_param mv88e6xxx_devlink_params[] = {
		DSA_DEVLINK_PARAM_DRIVER(MV88E6XXX_DEVLINK_PARAM_ID_ATU_HASH,
		"ATU_hash", DEVLINK_PARAM_TYPE_U8,
		BIT(DEVLINK_PARAM_CMODE_RUNTIME)),
		};

		int mv88e6xxx_setup_devlink_params(struct dsa_switch *ds)
		{
		return dsa_devlink_params_register(ds, mv88e6xxx_devlink_params,
		ARRAY_SIZE(mv88e6xxx_devlink_params));
		}

		void mv88e6xxx_teardown_devlink_params(struct dsa_switch *ds)
		{
		dsa_devlink_params_unregister(ds, mv88e6xxx_devlink_params,
		ARRAY_SIZE(mv88e6xxx_devlink_params));
		}

		enum mv88e6xxx_devlink_resource_id {
		MV88E6XXX_RESOURCE_ID_ATU,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_0,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_1,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_2,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_3,
		};

		static u64 mv88e6xxx_devlink_atu_bin_get(struct mv88e6xxx_chip *chip,
		u16 bin)
		{
		u16 occupancy = 0;
		int err;

		mv88e6xxx_reg_lock(chip);

		err = mv88e6xxx_g2_atu_stats_set(chip, MV88E6XXX_G2_ATU_STATS_MODE_ALL,
		bin);
		if (err) {
		dev_err(chip->dev, "failed to set ATU stats kind/bin\n");
		goto unlock;
		}

		err = mv88e6xxx_g1_atu_get_next(chip, 0);
		if (err) {
		dev_err(chip->dev, "failed to perform ATU get next\n");
		goto unlock;
		}

		err = mv88e6xxx_g2_atu_stats_get(chip, &occupancy);
		if (err) {
		dev_err(chip->dev, "failed to get ATU stats\n");
		goto unlock;
		}

		occupancy &= MV88E6XXX_G2_ATU_STATS_MASK;

		unlock:
		mv88e6xxx_reg_unlock(chip);

		return occupancy;
		}

		static u64 mv88e6xxx_devlink_atu_bin_0_get(void *priv)
		{
		struct mv88e6xxx_chip *chip = priv;

		return mv88e6xxx_devlink_atu_bin_get(chip,
		MV88E6XXX_G2_ATU_STATS_BIN_0);
		}

		static u64 mv88e6xxx_devlink_atu_bin_1_get(void *priv)
		{
		struct mv88e6xxx_chip *chip = priv;

		return mv88e6xxx_devlink_atu_bin_get(chip,
		MV88E6XXX_G2_ATU_STATS_BIN_1);
		}

		static u64 mv88e6xxx_devlink_atu_bin_2_get(void *priv)
		{
		struct mv88e6xxx_chip *chip = priv;

		return mv88e6xxx_devlink_atu_bin_get(chip,
		MV88E6XXX_G2_ATU_STATS_BIN_2);
		}

		static u64 mv88e6xxx_devlink_atu_bin_3_get(void *priv)
		{
		struct mv88e6xxx_chip *chip = priv;

		return mv88e6xxx_devlink_atu_bin_get(chip,
		MV88E6XXX_G2_ATU_STATS_BIN_3);
		}

		static u64 mv88e6xxx_devlink_atu_get(void *priv)
		{
		return mv88e6xxx_devlink_atu_bin_0_get(priv) +
		mv88e6xxx_devlink_atu_bin_1_get(priv) +
		mv88e6xxx_devlink_atu_bin_2_get(priv) +
		mv88e6xxx_devlink_atu_bin_3_get(priv);
		}

		int mv88e6xxx_setup_devlink_resources(struct dsa_switch *ds)
		{
		struct devlink_resource_size_params size_params;
		struct mv88e6xxx_chip *chip = ds->priv;
		int err;

		devlink_resource_size_params_init(&size_params,
		mv88e6xxx_num_macs(chip),
		mv88e6xxx_num_macs(chip),
		1, DEVLINK_RESOURCE_UNIT_ENTRY);

		err = dsa_devlink_resource_register(ds, "ATU",
		mv88e6xxx_num_macs(chip),
		MV88E6XXX_RESOURCE_ID_ATU,
		DEVLINK_RESOURCE_ID_PARENT_TOP,
		&size_params);
		if (err)
		goto out;

		devlink_resource_size_params_init(&size_params,
		mv88e6xxx_num_macs(chip) / 4,
		mv88e6xxx_num_macs(chip) / 4,
		1, DEVLINK_RESOURCE_UNIT_ENTRY);

		err = dsa_devlink_resource_register(ds, "ATU_bin_0",
		mv88e6xxx_num_macs(chip) / 4,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_0,
		MV88E6XXX_RESOURCE_ID_ATU,
		&size_params);
		if (err)
		goto out;

		err = dsa_devlink_resource_register(ds, "ATU_bin_1",
		mv88e6xxx_num_macs(chip) / 4,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_1,
		MV88E6XXX_RESOURCE_ID_ATU,
		&size_params);
		if (err)
		goto out;

		err = dsa_devlink_resource_register(ds, "ATU_bin_2",
		mv88e6xxx_num_macs(chip) / 4,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_2,
		MV88E6XXX_RESOURCE_ID_ATU,
		&size_params);
		if (err)
		goto out;

		err = dsa_devlink_resource_register(ds, "ATU_bin_3",
		mv88e6xxx_num_macs(chip) / 4,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_3,
		MV88E6XXX_RESOURCE_ID_ATU,
		&size_params);
		if (err)
		goto out;

		dsa_devlink_resource_occ_get_register(ds,
		MV88E6XXX_RESOURCE_ID_ATU,
		mv88e6xxx_devlink_atu_get,
		chip);

		dsa_devlink_resource_occ_get_register(ds,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_0,
		mv88e6xxx_devlink_atu_bin_0_get,
		chip);

		dsa_devlink_resource_occ_get_register(ds,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_1,
		mv88e6xxx_devlink_atu_bin_1_get,
		chip);

		dsa_devlink_resource_occ_get_register(ds,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_2,
		mv88e6xxx_devlink_atu_bin_2_get,
		chip);

		dsa_devlink_resource_occ_get_register(ds,
		MV88E6XXX_RESOURCE_ID_ATU_BIN_3,
		mv88e6xxx_devlink_atu_bin_3_get,
		chip);

		return 0;

		out:
		dsa_devlink_resources_unregister(ds);
		return err;
		}

drivers/net/dsa/mv88e6xxx/devlink.h

0 → 100644

+16 −0

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-or-later */

		/* Marvell 88E6xxx Switch devlink support. */

		#ifndef _MV88E6XXX_DEVLINK_H
		#define _MV88E6XXX_DEVLINK_H

		int mv88e6xxx_setup_devlink_params(struct dsa_switch *ds);
		void mv88e6xxx_teardown_devlink_params(struct dsa_switch *ds);
		int mv88e6xxx_setup_devlink_resources(struct dsa_switch *ds);
		int mv88e6xxx_devlink_param_get(struct dsa_switch *ds, u32 id,
		struct devlink_param_gset_ctx *ctx);
		int mv88e6xxx_devlink_param_set(struct dsa_switch *ds, u32 id,
		struct devlink_param_gset_ctx *ctx);

		#endif /* _MV88E6XXX_DEVLINK_H */