Commit 464dce18 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum_router: Add basic ipv4 router initialization 



Create a skeleton router file and do basic HW initialization of router.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bbf2a475

drivers/net/ethernet/mellanox/mlxsw/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,5 +7,5 @@ obj-$(CONFIG_MLXSW_SWITCHX2) += mlxsw_switchx2.o 
mlxsw_switchx2-objs		:= switchx2.o

obj-$(CONFIG_MLXSW_SPECTRUM)	+= mlxsw_spectrum.o

mlxsw_spectrum-objs		:= spectrum.o spectrum_buffers.o \

				   spectrum_switchdev.o

				   spectrum_switchdev.o spectrum_router.o

mlxsw_spectrum-$(CONFIG_MLXSW_SPECTRUM_DCB)	+= spectrum_dcb.o

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+9 −0
Original line number Diff line number Diff line
@@ -2438,6 +2438,12 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
		goto err_switchdev_init;

	}



	err = mlxsw_sp_router_init(mlxsw_sp);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to initialize router\n");

		goto err_router_init;

	}



	err = mlxsw_sp_ports_create(mlxsw_sp);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to create ports\n");
@@ -2447,6 +2453,8 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
	return 0;



err_ports_create:

	mlxsw_sp_router_fini(mlxsw_sp);

err_router_init:

	mlxsw_sp_switchdev_fini(mlxsw_sp);

err_switchdev_init:

err_lag_init:
@@ -2464,6 +2472,7 @@ static void mlxsw_sp_fini(struct mlxsw_core *mlxsw_core) 
	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);



	mlxsw_sp_ports_remove(mlxsw_sp);

	mlxsw_sp_router_fini(mlxsw_sp);

	mlxsw_sp_switchdev_fini(mlxsw_sp);

	mlxsw_sp_buffers_fini(mlxsw_sp);

	mlxsw_sp_traps_fini(mlxsw_sp);

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+5 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ 


#define MLXSW_SP_CELL_FACTOR 2	/* 2 * cell_size / (IPG + cell_size + 1) */



#define MLXSW_SP_RIF_MAX 800



static inline u16 mlxsw_sp_pfc_delay_get(int mtu, u16 delay)

{

	delay = MLXSW_SP_BYTES_TO_CELLS(DIV_ROUND_UP(delay, BITS_PER_BYTE));
@@ -411,4 +413,7 @@ static inline void mlxsw_sp_port_dcb_fini(struct mlxsw_sp_port *mlxsw_sp_port) 


#endif



int mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp);

void mlxsw_sp_router_fini(struct mlxsw_sp *mlxsw_sp);



#endif

drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

0 → 100644
+68 −0
Original line number Diff line number Diff line 
/*

 * drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

 * Copyright (c) 2016 Mellanox Technologies. All rights reserved.

 * Copyright (c) 2016 Jiri Pirko <jiri@mellanox.com>

 * Copyright (c) 2016 Ido Schimmel <idosch@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 <linux/types.h>



#include "spectrum.h"

#include "core.h"

#include "reg.h"



static int __mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp)

{

	char rgcr_pl[MLXSW_REG_RGCR_LEN];



	mlxsw_reg_rgcr_pack(rgcr_pl, true);

	mlxsw_reg_rgcr_max_router_interfaces_set(rgcr_pl, MLXSW_SP_RIF_MAX);

	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(rgcr), rgcr_pl);

}



static void __mlxsw_sp_router_fini(struct mlxsw_sp *mlxsw_sp)

{

	char rgcr_pl[MLXSW_REG_RGCR_LEN];



	mlxsw_reg_rgcr_pack(rgcr_pl, false);

	mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(rgcr), rgcr_pl);

}



int mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp)

{

	return __mlxsw_sp_router_init(mlxsw_sp);

}



void mlxsw_sp_router_fini(struct mlxsw_sp *mlxsw_sp)

{

	__mlxsw_sp_router_fini(mlxsw_sp);

}