Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12a889c0 authored by Ido Shamay's avatar Ido Shamay Committed by David S. Miller
Browse files

net/mlx4: New file for QoS related firmware commands 



Create two new files fw_qos.h and fw_qos.c in mlx4_core module.

It gathers all relevant QoS firmware related commands etc, thus improving
encapsulation of the mlx4_core module. For now it contains the QoS existing
commands: mlx4_SET_PORT_SCHEDULER and mlx4_SET_PORT_PRIO2TC.

Signed-off-by: default avatarIdo Shamay <idos@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4abccb61

drivers/net/ethernet/mellanox/mlx4/Makefile

+3 −2
Original line number Diff line number Diff line 
obj-$(CONFIG_MLX4_CORE)		+= mlx4_core.o



mlx4_core-y :=	alloc.o catas.o cmd.o cq.o eq.o fw.o icm.o intf.o main.o mcg.o \

		mr.o pd.o port.o profile.o qp.o reset.o sense.o srq.o resource_tracker.o

mlx4_core-y :=	alloc.o catas.o cmd.o cq.o eq.o fw.o fw_qos.o icm.o intf.o \

		main.o mcg.o mr.o pd.o port.o profile.o qp.o reset.o sense.o \

		srq.o resource_tracker.o



obj-$(CONFIG_MLX4_EN)               += mlx4_en.o

drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/math64.h>



#include "mlx4_en.h"

#include "fw_qos.h"



/* Definitions for QCN

 */

drivers/net/ethernet/mellanox/mlx4/fw_qos.c

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

 * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.

 * Copyright (c) 2005, 2006, 2007, 2008 Mellanox Technologies.

 * All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 *      - 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.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#include <linux/export.h>

#include "fw_qos.h"



struct mlx4_set_port_prio2tc_context {

	u8 prio2tc[4];

};



struct mlx4_port_scheduler_tc_cfg_be {

	__be16 pg;

	__be16 bw_precentage;

	__be16 max_bw_units; /* 3-100Mbps, 4-1Gbps, other values - reserved */

	__be16 max_bw_value;

};



struct mlx4_set_port_scheduler_context {

	struct mlx4_port_scheduler_tc_cfg_be tc[MLX4_NUM_TC];

};



int mlx4_SET_PORT_PRIO2TC(struct mlx4_dev *dev, u8 port, u8 *prio2tc)

{

	struct mlx4_cmd_mailbox *mailbox;

	struct mlx4_set_port_prio2tc_context *context;

	int err;

	u32 in_mod;

	int i;



	mailbox = mlx4_alloc_cmd_mailbox(dev);

	if (IS_ERR(mailbox))

		return PTR_ERR(mailbox);



	context = mailbox->buf;



	for (i = 0; i < MLX4_NUM_UP; i += 2)

		context->prio2tc[i >> 1] = prio2tc[i] << 4 | prio2tc[i + 1];



	in_mod = MLX4_SET_PORT_PRIO2TC << 8 | port;

	err = mlx4_cmd(dev, mailbox->dma, in_mod, 1, MLX4_CMD_SET_PORT,

		       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);



	mlx4_free_cmd_mailbox(dev, mailbox);

	return err;

}

EXPORT_SYMBOL(mlx4_SET_PORT_PRIO2TC);



int mlx4_SET_PORT_SCHEDULER(struct mlx4_dev *dev, u8 port, u8 *tc_tx_bw,

			    u8 *pg, u16 *ratelimit)

{

	struct mlx4_cmd_mailbox *mailbox;

	struct mlx4_set_port_scheduler_context *context;

	int err;

	u32 in_mod;

	int i;



	mailbox = mlx4_alloc_cmd_mailbox(dev);

	if (IS_ERR(mailbox))

		return PTR_ERR(mailbox);



	context = mailbox->buf;



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

		struct mlx4_port_scheduler_tc_cfg_be *tc = &context->tc[i];

		u16 r;



		if (ratelimit && ratelimit[i]) {

			if (ratelimit[i] <= MLX4_MAX_100M_UNITS_VAL) {

				r = ratelimit[i];

				tc->max_bw_units =

					htons(MLX4_RATELIMIT_100M_UNITS);

			} else {

				r = ratelimit[i] / 10;

				tc->max_bw_units =

					htons(MLX4_RATELIMIT_1G_UNITS);

			}

			tc->max_bw_value = htons(r);

		} else {

			tc->max_bw_value = htons(MLX4_RATELIMIT_DEFAULT);

			tc->max_bw_units = htons(MLX4_RATELIMIT_1G_UNITS);

		}



		tc->pg = htons(pg[i]);

		tc->bw_precentage = htons(tc_tx_bw[i]);

	}



	in_mod = MLX4_SET_PORT_SCHEDULER << 8 | port;

	err = mlx4_cmd(dev, mailbox->dma, in_mod, 1, MLX4_CMD_SET_PORT,

		       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);



	mlx4_free_cmd_mailbox(dev, mailbox);

	return err;

}

EXPORT_SYMBOL(mlx4_SET_PORT_SCHEDULER);

drivers/net/ethernet/mellanox/mlx4/fw_qos.h

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

 * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.

 * Copyright (c) 2005, 2006, 2007, 2008 Mellanox Technologies.

 * All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 *      - 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.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#ifndef MLX4_FW_QOS_H

#define MLX4_FW_QOS_H



#include <linux/mlx4/cmd.h>

#include <linux/mlx4/device.h>



#define MLX4_NUM_UP 8

#define MLX4_NUM_TC 8



/**

 * mlx4_SET_PORT_PRIO2TC - This routine maps user priorities to traffic

 * classes of a given port and device.

 *

 * @dev: mlx4_dev.

 * @port: Physical port number.

 * @prio2tc: Array of TC associated with each priorities.

 *

 * Returns 0 on success or a negative mlx4_core errno code.

 **/

int mlx4_SET_PORT_PRIO2TC(struct mlx4_dev *dev, u8 port, u8 *prio2tc);



/**

 * mlx4_SET_PORT_SCHEDULER - This routine configures the arbitration between

 * traffic classes (ETS) and configured rate limit for traffic classes.

 * tc_tx_bw, pg and ratelimit are arrays where each index represents a TC.

 * The description for those parameters below refers to a single TC.

 *

 * @dev: mlx4_dev.

 * @port: Physical port number.

 * @tc_tx_bw: The percentage of the bandwidth allocated for traffic class

 *  within a TC group. The sum of the bw_percentage of all the traffic

 *  classes within a TC group must equal 100% for correct operation.

 * @pg: The TC group the traffic class is associated with.

 * @ratelimit: The maximal bandwidth allowed for the use by this traffic class.

 *

 * Returns 0 on success or a negative mlx4_core errno code.

 **/

int mlx4_SET_PORT_SCHEDULER(struct mlx4_dev *dev, u8 port, u8 *tc_tx_bw,

			    u8 *pg, u16 *ratelimit);



#endif /* MLX4_FW_QOS_H */

drivers/net/ethernet/mellanox/mlx4/mlx4.h

+0 −15
Original line number Diff line number Diff line
@@ -64,21 +64,6 @@ 


#define INIT_HCA_TPT_MW_ENABLE          (1 << 7)



struct mlx4_set_port_prio2tc_context {

	u8 prio2tc[4];

};



struct mlx4_port_scheduler_tc_cfg_be {

	__be16 pg;

	__be16 bw_precentage;

	__be16 max_bw_units; /* 3-100Mbps, 4-1Gbps, other values - reserved */

	__be16 max_bw_value;

};



struct mlx4_set_port_scheduler_context {

	struct mlx4_port_scheduler_tc_cfg_be tc[MLX4_NUM_TC];

};



enum {

	MLX4_HCR_BASE		= 0x80680,

	MLX4_HCR_SIZE		= 0x0001c,