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

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

Merge branch 'mlx4' 



Amir Vadai says:

====================
net/mlx4: Mellanox driver update 15-10-2013

This patchset contains small code cleaning patches, and a patch to make
mlx4_core use module_request() in order to load the relevant link layer module
(mlx4_en or mlx4_ib) according to the port type.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c1d607cc b046ffe5

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

+0 −2
Original line number Diff line number Diff line
@@ -2253,7 +2253,6 @@ EXPORT_SYMBOL_GPL(mlx4_set_vf_mac); 
int mlx4_set_vf_vlan(struct mlx4_dev *dev, int port, int vf, u16 vlan, u8 qos)

{

	struct mlx4_priv *priv = mlx4_priv(dev);

	struct mlx4_vport_oper_state *vf_oper;

	struct mlx4_vport_state *vf_admin;

	int slave;
@@ -2269,7 +2268,6 @@ int mlx4_set_vf_vlan(struct mlx4_dev *dev, int port, int vf, u16 vlan, u8 qos) 
		return -EINVAL;



	vf_admin = &priv->mfunc.master.vf_admin[slave].vport[port];

	vf_oper = &priv->mfunc.master.vf_oper[slave].vport[port];



	if ((0 == vlan) && (0 == qos))

		vf_admin->default_vlan = MLX4_VGT;

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

+1 −1
Original line number Diff line number Diff line
@@ -1733,7 +1733,7 @@ void mlx4_en_stop_port(struct net_device *dev, int detach) 


	/* Unregister Mac address for the port */

	mlx4_en_put_qp(priv);

	if (!(mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN))

	if (!(mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_REASSIGN_MAC_EN))

		mdev->mac_removed[priv->port] = 1;



	/* Free RX Rings */

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

+1 −3
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
		 QUERY_DEV_CAP_RSVD_LKEY_OFFSET);

	MLX4_GET(field, outbox, QUERY_DEV_CAP_FW_REASSIGN_MAC);

	if (field & 1<<6)

		dev_cap->flags2 |= MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN;

		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_REASSIGN_MAC_EN;

	MLX4_GET(dev_cap->max_icm_sz, outbox,

		 QUERY_DEV_CAP_MAX_ICM_SZ_OFFSET);

	if (dev_cap->flags & MLX4_DEV_CAP_FLAG_COUNTERS)
@@ -1713,7 +1713,6 @@ void mlx4_opreq_action(struct work_struct *work) 
	u32 *outbox;

	u32 modifier;

	u16 token;

	u16 type_m;

	u16 type;

	int err;

	u32 num_qps;
@@ -1746,7 +1745,6 @@ void mlx4_opreq_action(struct work_struct *work) 
		MLX4_GET(modifier, outbox, GET_OP_REQ_MODIFIER_OFFSET);

		MLX4_GET(token, outbox, GET_OP_REQ_TOKEN_OFFSET);

		MLX4_GET(type, outbox, GET_OP_REQ_TYPE_OFFSET);

		type_m = type >> 12;

		type &= 0xfff;



		switch (type) {

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

+29 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <linux/io-mapping.h>

#include <linux/delay.h>

#include <linux/netdevice.h>

#include <linux/kmod.h>



#include <linux/mlx4/device.h>

#include <linux/mlx4/doorbell.h>
@@ -650,6 +651,27 @@ static int mlx4_slave_cap(struct mlx4_dev *dev) 
	return err;

}



static void mlx4_request_modules(struct mlx4_dev *dev)

{

	int port;

	int has_ib_port = false;

	int has_eth_port = false;

#define EN_DRV_NAME	"mlx4_en"

#define IB_DRV_NAME	"mlx4_ib"



	for (port = 1; port <= dev->caps.num_ports; port++) {

		if (dev->caps.port_type[port] == MLX4_PORT_TYPE_IB)

			has_ib_port = true;

		else if (dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH)

			has_eth_port = true;

	}



	if (has_ib_port)

		request_module_nowait(IB_DRV_NAME);

	if (has_eth_port)

		request_module_nowait(EN_DRV_NAME);

}



/*

 * Change the port configuration of the device.

 * Every user of this function must hold the port mutex.
@@ -681,6 +703,11 @@ int mlx4_change_port_types(struct mlx4_dev *dev, 
		}

		mlx4_set_port_mask(dev);

		err = mlx4_register_device(dev);

		if (err) {

			mlx4_err(dev, "Failed to register device\n");

			goto out;

		}

		mlx4_request_modules(dev);

	}



out:
@@ -2305,6 +2332,8 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data) 
	if (err)

		goto err_port;



	mlx4_request_modules(dev);



	mlx4_sense_init(dev);

	mlx4_start_sense(dev);

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

+3 −3
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ static const u8 __promisc_mode[] = { 
int mlx4_map_sw_to_hw_steering_mode(struct mlx4_dev *dev,

				    enum mlx4_net_trans_promisc_mode flow_type)

{

	if (flow_type >= MLX4_FS_MODE_NUM || flow_type < 0) {

	if (flow_type >= MLX4_FS_MODE_NUM) {

		mlx4_err(dev, "Invalid flow type. type = %d\n", flow_type);

		return -EINVAL;

	}
@@ -681,7 +681,7 @@ const u16 __sw_id_hw[] = { 
int mlx4_map_sw_to_hw_steering_id(struct mlx4_dev *dev,

				  enum mlx4_net_trans_rule_id id)

{

	if (id >= MLX4_NET_TRANS_RULE_NUM || id < 0) {

	if (id >= MLX4_NET_TRANS_RULE_NUM) {

		mlx4_err(dev, "Invalid network rule id. id = %d\n", id);

		return -EINVAL;

	}
@@ -706,7 +706,7 @@ static const int __rule_hw_sz[] = { 
int mlx4_hw_rule_sz(struct mlx4_dev *dev,

	       enum mlx4_net_trans_rule_id id)

{

	if (id >= MLX4_NET_TRANS_RULE_NUM || id < 0) {

	if (id >= MLX4_NET_TRANS_RULE_NUM) {

		mlx4_err(dev, "Invalid network rule id. id = %d\n", id);

		return -EINVAL;

	}