mirror of https://gitee.com/openkylin/linux.git
mlxsw: spectrum: Add placeholder for dpipe
Add placeholder for dpipe. Support for specific tables and headers will be introduced in following patches. The headers are shared between all mlxsw_sp instances. Signed-off-by: Arkadi Sharshevsky <arkadis@mellanox.com> Signed-off-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
0f630fcbe5
commit
230ead0141
|
@ -16,7 +16,7 @@ mlxsw_spectrum-objs := spectrum.o spectrum_buffers.o \
|
||||||
spectrum_switchdev.o spectrum_router.o \
|
spectrum_switchdev.o spectrum_router.o \
|
||||||
spectrum_kvdl.o spectrum_acl_tcam.o \
|
spectrum_kvdl.o spectrum_acl_tcam.o \
|
||||||
spectrum_acl.o spectrum_flower.o \
|
spectrum_acl.o spectrum_flower.o \
|
||||||
spectrum_cnt.o
|
spectrum_cnt.o spectrum_dpipe.o
|
||||||
mlxsw_spectrum-$(CONFIG_MLXSW_SPECTRUM_DCB) += spectrum_dcb.o
|
mlxsw_spectrum-$(CONFIG_MLXSW_SPECTRUM_DCB) += spectrum_dcb.o
|
||||||
obj-$(CONFIG_MLXSW_MINIMAL) += mlxsw_minimal.o
|
obj-$(CONFIG_MLXSW_MINIMAL) += mlxsw_minimal.o
|
||||||
mlxsw_minimal-objs := minimal.o
|
mlxsw_minimal-objs := minimal.o
|
||||||
|
|
|
@ -67,6 +67,7 @@
|
||||||
#include "trap.h"
|
#include "trap.h"
|
||||||
#include "txheader.h"
|
#include "txheader.h"
|
||||||
#include "spectrum_cnt.h"
|
#include "spectrum_cnt.h"
|
||||||
|
#include "spectrum_dpipe.h"
|
||||||
|
|
||||||
static const char mlxsw_sp_driver_name[] = "mlxsw_spectrum";
|
static const char mlxsw_sp_driver_name[] = "mlxsw_spectrum";
|
||||||
static const char mlxsw_sp_driver_version[] = "1.0";
|
static const char mlxsw_sp_driver_version[] = "1.0";
|
||||||
|
@ -3339,6 +3340,12 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core,
|
||||||
goto err_counter_pool_init;
|
goto err_counter_pool_init;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
err = mlxsw_sp_dpipe_init(mlxsw_sp);
|
||||||
|
if (err) {
|
||||||
|
dev_err(mlxsw_sp->bus_info->dev, "Failed to init pipeline debug\n");
|
||||||
|
goto err_dpipe_init;
|
||||||
|
}
|
||||||
|
|
||||||
err = mlxsw_sp_ports_create(mlxsw_sp);
|
err = mlxsw_sp_ports_create(mlxsw_sp);
|
||||||
if (err) {
|
if (err) {
|
||||||
dev_err(mlxsw_sp->bus_info->dev, "Failed to create ports\n");
|
dev_err(mlxsw_sp->bus_info->dev, "Failed to create ports\n");
|
||||||
|
@ -3348,6 +3355,8 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core,
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err_ports_create:
|
err_ports_create:
|
||||||
|
mlxsw_sp_dpipe_fini(mlxsw_sp);
|
||||||
|
err_dpipe_init:
|
||||||
mlxsw_sp_counter_pool_fini(mlxsw_sp);
|
mlxsw_sp_counter_pool_fini(mlxsw_sp);
|
||||||
err_counter_pool_init:
|
err_counter_pool_init:
|
||||||
mlxsw_sp_acl_fini(mlxsw_sp);
|
mlxsw_sp_acl_fini(mlxsw_sp);
|
||||||
|
@ -3372,6 +3381,7 @@ static void mlxsw_sp_fini(struct mlxsw_core *mlxsw_core)
|
||||||
struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);
|
struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);
|
||||||
|
|
||||||
mlxsw_sp_ports_remove(mlxsw_sp);
|
mlxsw_sp_ports_remove(mlxsw_sp);
|
||||||
|
mlxsw_sp_dpipe_fini(mlxsw_sp);
|
||||||
mlxsw_sp_counter_pool_fini(mlxsw_sp);
|
mlxsw_sp_counter_pool_fini(mlxsw_sp);
|
||||||
mlxsw_sp_acl_fini(mlxsw_sp);
|
mlxsw_sp_acl_fini(mlxsw_sp);
|
||||||
mlxsw_sp_span_fini(mlxsw_sp);
|
mlxsw_sp_span_fini(mlxsw_sp);
|
||||||
|
|
|
@ -0,0 +1,57 @@
|
||||||
|
/*
|
||||||
|
* drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
|
||||||
|
* Copyright (c) 2017 Mellanox Technologies. All rights reserved.
|
||||||
|
* Copyright (c) 2017 Arkadi Sharshevsky <arakdis@mellanox.com>
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* 3. Neither the names of the copyright holders nor the names of its
|
||||||
|
* contributors may be used to endorse or promote products derived from
|
||||||
|
* this software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* Alternatively, this software may be distributed under the terms of the
|
||||||
|
* GNU General Public License ("GPL") version 2 as published by the Free
|
||||||
|
* Software Foundation.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||||
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||||
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||||
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <linux/kernel.h>
|
||||||
|
#include <net/devlink.h>
|
||||||
|
|
||||||
|
#include "spectrum.h"
|
||||||
|
#include "spectrum_dpipe.h"
|
||||||
|
|
||||||
|
static struct devlink_dpipe_header *mlxsw_dpipe_headers[] = {};
|
||||||
|
|
||||||
|
static struct devlink_dpipe_headers mlxsw_sp_dpipe_headers = {
|
||||||
|
.headers = mlxsw_dpipe_headers,
|
||||||
|
.headers_count = ARRAY_SIZE(mlxsw_dpipe_headers),
|
||||||
|
};
|
||||||
|
|
||||||
|
int mlxsw_sp_dpipe_init(struct mlxsw_sp *mlxsw_sp)
|
||||||
|
{
|
||||||
|
return devlink_dpipe_headers_register(priv_to_devlink(mlxsw_sp->core),
|
||||||
|
&mlxsw_sp_dpipe_headers);
|
||||||
|
}
|
||||||
|
|
||||||
|
void mlxsw_sp_dpipe_fini(struct mlxsw_sp *mlxsw_sp)
|
||||||
|
{
|
||||||
|
devlink_dpipe_headers_unregister(priv_to_devlink(mlxsw_sp->core));
|
||||||
|
}
|
|
@ -0,0 +1,41 @@
|
||||||
|
/*
|
||||||
|
* drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.h
|
||||||
|
* Copyright (c) 2017 Mellanox Technologies. All rights reserved.
|
||||||
|
* Copyright (c) 2017 Arkadi Sharshevsky <arkadis@mellanox.com>
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* 3. Neither the names of the copyright holders nor the names of its
|
||||||
|
* contributors may be used to endorse or promote products derived from
|
||||||
|
* this software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* Alternatively, this software may be distributed under the terms of the
|
||||||
|
* GNU General Public License ("GPL") version 2 as published by the Free
|
||||||
|
* Software Foundation.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||||
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||||
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||||
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _MLXSW_PIPELINE_H_
|
||||||
|
#define _MLXSW_PIPELINE_H_
|
||||||
|
|
||||||
|
int mlxsw_sp_dpipe_init(struct mlxsw_sp *mlxsw_sp);
|
||||||
|
void mlxsw_sp_dpipe_fini(struct mlxsw_sp *mlxsw_sp);
|
||||||
|
|
||||||
|
#endif /* _MLXSW_PIPELINE_H_*/
|
Loading…
Reference in New Issue