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

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

Merge branch 'mlx4' 



Or Gerlitz says:

====================
This series adds support for the SRIOV ndo_set_vf callbacks to the mlx4 driver.

Series done against the net-next tree as of commit 0c501345 "batman-adv: fix
global protection fault during soft_iface destruction".

We have successfully tested the series on net-next, except for getting
the VF link info issue I have reported earlier today on netdev, we
see the problem for both ixgbe and mlx4 VFs. Just to make sure get
VF config is working OK with patch #6 - we have run it over 3.8.8 too.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8bfadc32 b6c39bfc

drivers/infiniband/hw/mlx4/cq.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev, int entries, int vector 
		vector = dev->eq_table[vector % ibdev->num_comp_vectors];



	err = mlx4_cq_alloc(dev->dev, entries, &cq->buf.mtt, uar,

			    cq->db.dma, &cq->mcq, vector, 0);

			    cq->db.dma, &cq->mcq, vector, 0, 0);

	if (err)

		goto err_dbmap;

drivers/net/ethernet/mellanox/mlx4/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ mlx4_core-y := alloc.o catas.o cmd.o cq.o eq.o fw.o icm.o intf.o main.o mcg.o \ 
obj-$(CONFIG_MLX4_EN)               += mlx4_en.o



mlx4_en-y := 	en_main.o en_tx.o en_rx.o en_ethtool.o en_port.o en_cq.o \

		en_resources.o en_netdev.o en_selftest.o

		en_resources.o en_netdev.o en_selftest.o en_clock.o

mlx4_en-$(CONFIG_MLX4_EN_DCB) += en_dcb_nl.o

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

+7 −3
Original line number Diff line number Diff line
@@ -240,9 +240,10 @@ static void mlx4_cq_free_icm(struct mlx4_dev *dev, int cqn) 
		__mlx4_cq_free_icm(dev, cqn);

}



int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, struct mlx4_mtt *mtt,

		  struct mlx4_uar *uar, u64 db_rec, struct mlx4_cq *cq,

		  unsigned vector, int collapsed)

int mlx4_cq_alloc(struct mlx4_dev *dev, int nent,

		  struct mlx4_mtt *mtt, struct mlx4_uar *uar, u64 db_rec,

		  struct mlx4_cq *cq, unsigned vector, int collapsed,

		  int timestamp_en)

{

	struct mlx4_priv *priv = mlx4_priv(dev);

	struct mlx4_cq_table *cq_table = &priv->cq_table;
@@ -276,6 +277,9 @@ int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, struct mlx4_mtt *mtt, 
	memset(cq_context, 0, sizeof *cq_context);



	cq_context->flags	    = cpu_to_be32(!!collapsed << 18);

	if (timestamp_en)

		cq_context->flags  |= cpu_to_be32(1 << 19);



	cq_context->logsize_usrpage = cpu_to_be32((ilog2(nent) << 24) | uar->index);

	cq_context->comp_eqn	    = priv->eq_table.eq[vector].eqn;

	cq_context->log_page_size   = mtt->page_shift - MLX4_ICM_PAGE_SHIFT;

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

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

 * Copyright (c) 2012 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/mlx4/device.h>



#include "mlx4_en.h"



int mlx4_en_timestamp_config(struct net_device *dev, int tx_type, int rx_filter)

{

	struct mlx4_en_priv *priv = netdev_priv(dev);

	struct mlx4_en_dev *mdev = priv->mdev;

	int port_up = 0;

	int err = 0;



	mutex_lock(&mdev->state_lock);

	if (priv->port_up) {

		port_up = 1;

		mlx4_en_stop_port(dev, 1);

	}



	mlx4_en_free_resources(priv);



	en_warn(priv, "Changing Time Stamp configuration\n");



	priv->hwtstamp_config.tx_type = tx_type;

	priv->hwtstamp_config.rx_filter = rx_filter;



	if (rx_filter != HWTSTAMP_FILTER_NONE)

		dev->features &= ~NETIF_F_HW_VLAN_CTAG_RX;

	else

		dev->features |= NETIF_F_HW_VLAN_CTAG_RX;



	err = mlx4_en_alloc_resources(priv);

	if (err) {

		en_err(priv, "Failed reallocating port resources\n");

		goto out;

	}

	if (port_up) {

		err = mlx4_en_start_port(dev);

		if (err)

			en_err(priv, "Failed starting port\n");

	}



out:

	mutex_unlock(&mdev->state_lock);

	netdev_features_change(dev);

	return err;

}



/* mlx4_en_read_clock - read raw cycle counter (to be used by time counter)

 */

static cycle_t mlx4_en_read_clock(const struct cyclecounter *tc)

{

	struct mlx4_en_dev *mdev =

		container_of(tc, struct mlx4_en_dev, cycles);

	struct mlx4_dev *dev = mdev->dev;



	return mlx4_read_clock(dev) & tc->mask;

}



u64 mlx4_en_get_cqe_ts(struct mlx4_cqe *cqe)

{

	u64 hi, lo;

	struct mlx4_ts_cqe *ts_cqe = (struct mlx4_ts_cqe *)cqe;



	lo = (u64)be16_to_cpu(ts_cqe->timestamp_lo);

	hi = ((u64)be32_to_cpu(ts_cqe->timestamp_hi) + !lo) << 16;



	return hi | lo;

}



void mlx4_en_fill_hwtstamps(struct mlx4_en_dev *mdev,

			    struct skb_shared_hwtstamps *hwts,

			    u64 timestamp)

{

	u64 nsec;



	nsec = timecounter_cyc2time(&mdev->clock, timestamp);



	memset(hwts, 0, sizeof(struct skb_shared_hwtstamps));

	hwts->hwtstamp = ns_to_ktime(nsec);

}



void mlx4_en_init_timestamp(struct mlx4_en_dev *mdev)

{

	struct mlx4_dev *dev = mdev->dev;



	memset(&mdev->cycles, 0, sizeof(mdev->cycles));

	mdev->cycles.read = mlx4_en_read_clock;

	mdev->cycles.mask = CLOCKSOURCE_MASK(48);

	/* Using shift to make calculation more accurate. Since current HW

	 * clock frequency is 427 MHz, and cycles are given using a 48 bits

	 * register, the biggest shift when calculating using u64, is 14

	 * (max_cycles * multiplier < 2^64)

	 */

	mdev->cycles.shift = 14;

	mdev->cycles.mult =

		clocksource_khz2mult(1000 * dev->caps.hca_core_clock, mdev->cycles.shift);



	timecounter_init(&mdev->clock, &mdev->cycles,

			 ktime_to_ns(ktime_get_real()));



	/* Calculate period in seconds to call the overflow watchdog - to make

	 * sure counter is checked at least once every wrap around.

	 */

	mdev->overflow_period =

		(cyclecounter_cyc2ns(&mdev->cycles,

				    mdev->cycles.mask) / NSEC_PER_SEC / 2)

		* HZ;

}



void mlx4_en_ptp_overflow_check(struct mlx4_en_dev *mdev)

{

	bool timeout = time_is_before_jiffies(mdev->last_overflow_check +

					      mdev->overflow_period);



	if (timeout) {

		timecounter_read(&mdev->clock);

		mdev->last_overflow_check = jiffies;

	}

}

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

+8 −2
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq, 
	struct mlx4_en_dev *mdev = priv->mdev;

	int err = 0;

	char name[25];

	int timestamp_en = 0;

	struct cpu_rmap *rmap =

#ifdef CONFIG_RFS_ACCEL

		priv->dev->rx_cpu_rmap;
@@ -123,8 +124,13 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq, 
	if (!cq->is_tx)

		cq->size = priv->rx_ring[cq->ring].actual_size;



	err = mlx4_cq_alloc(mdev->dev, cq->size, &cq->wqres.mtt, &mdev->priv_uar,

			    cq->wqres.db.dma, &cq->mcq, cq->vector, 0);

	if ((cq->is_tx && priv->hwtstamp_config.tx_type) ||

	    (!cq->is_tx && priv->hwtstamp_config.rx_filter))

		timestamp_en = 1;



	err = mlx4_cq_alloc(mdev->dev, cq->size, &cq->wqres.mtt,

			    &mdev->priv_uar, cq->wqres.db.dma, &cq->mcq,

			    cq->vector, 0, timestamp_en);

	if (err)

		return err;