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

Merge tag 'mlx5-updates-2021-10-15' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2021-10-15

1) From Rongwei Liu:

Use system_image_guid and native_port_num when bonding.
Don't relay on PCIe ids anymore.

With some specific NIC, the physical devices may have PCIe IDs like
0001:01:00.0/1 and 0002:02:00.0/1. All of these devices should have
the same system_image_guid and device index can be queried from
native_port_num.

For matching sibling devices/port of the same HCA, compare the HCA
GUID reported on each device rather than just assuming PCIe ids have
similar attributes.

2) From Amir Tzin: Use HCA defined Timouts

Replace hard coded timeouts with values stored by firmware in default
timeouts register (DTOR). Timeouts are read during driver load. If DTOR
is not supported by firmware then fallback to hard coded defaults
instead.

3) From Shay Drory: Disable roce at HCA level
Disable RoCE in Firmware when devlink roce parameter is set to off.

4) A small set of trivial cleanups
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 803a4344 8a543184

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ mlx5_core-y := main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \ 
		fs_counters.o fs_ft_pool.o rl.o lag.o dev.o events.o wq.o lib/gid.o \

		lib/devcom.o lib/pci_vsc.o lib/dm.o lib/fs_ttc.o diag/fs_tracepoint.o \

		diag/fw_tracer.o diag/crdump.o devlink.o diag/rsc_dump.o \

		fw_reset.o qos.o

		fw_reset.o qos.o lib/tout.o



#

# Netdev basic

drivers/net/ethernet/mellanox/mlx5/core/cmd.c

+13 −5
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 


#include "mlx5_core.h"

#include "lib/eq.h"

#include "lib/tout.h"



enum {

	CMD_IF_REV = 5,
@@ -225,9 +226,13 @@ static void set_signature(struct mlx5_cmd_work_ent *ent, int csum) 


static void poll_timeout(struct mlx5_cmd_work_ent *ent)

{

	unsigned long poll_end = jiffies + msecs_to_jiffies(MLX5_CMD_TIMEOUT_MSEC + 1000);

	struct mlx5_core_dev *dev = container_of(ent->cmd, struct mlx5_core_dev, cmd);

	u64 cmd_to_ms = mlx5_tout_ms(dev, CMD);

	unsigned long poll_end;

	u8 own;



	poll_end = jiffies + msecs_to_jiffies(cmd_to_ms + 1000);



	do {

		own = READ_ONCE(ent->lay->status_own);

		if (!(own & CMD_OWNER_HW)) {
@@ -925,15 +930,18 @@ static void cmd_work_handler(struct work_struct *work) 
{

	struct mlx5_cmd_work_ent *ent = container_of(work, struct mlx5_cmd_work_ent, work);

	struct mlx5_cmd *cmd = ent->cmd;

	struct mlx5_core_dev *dev = container_of(cmd, struct mlx5_core_dev, cmd);

	unsigned long cb_timeout = msecs_to_jiffies(MLX5_CMD_TIMEOUT_MSEC);

	bool poll_cmd = ent->polling;

	struct mlx5_cmd_layout *lay;

	struct mlx5_core_dev *dev;

	unsigned long cb_timeout;

	struct semaphore *sem;

	unsigned long flags;

	bool poll_cmd = ent->polling;

	int alloc_ret;

	int cmd_mode;



	dev = container_of(cmd, struct mlx5_core_dev, cmd);

	cb_timeout = msecs_to_jiffies(mlx5_tout_ms(dev, CMD));



	complete(&ent->handling);

	sem = ent->page_queue ? &cmd->pages_sem : &cmd->sem;

	down(sem);
@@ -1073,7 +1081,7 @@ static void wait_func_handle_exec_timeout(struct mlx5_core_dev *dev, 


static int wait_func(struct mlx5_core_dev *dev, struct mlx5_cmd_work_ent *ent)

{

	unsigned long timeout = msecs_to_jiffies(MLX5_CMD_TIMEOUT_MSEC);

	unsigned long timeout = msecs_to_jiffies(mlx5_tout_ms(dev, CMD));

	struct mlx5_cmd *cmd = &dev->cmd;

	int err;

drivers/net/ethernet/mellanox/mlx5/core/dev.c

+13 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/mlx5/driver.h>

#include <linux/mlx5/eswitch.h>

#include <linux/mlx5/mlx5_ifc_vdpa.h>

#include <linux/mlx5/vport.h>

#include "mlx5_core.h"



/* intf dev list mutex */
@@ -537,6 +538,16 @@ int mlx5_rescan_drivers_locked(struct mlx5_core_dev *dev) 
	return add_drivers(dev);

}



static bool mlx5_same_hw_devs(struct mlx5_core_dev *dev, struct mlx5_core_dev *peer_dev)

{

	u64 fsystem_guid, psystem_guid;



	fsystem_guid = mlx5_query_nic_system_image_guid(dev);

	psystem_guid = mlx5_query_nic_system_image_guid(peer_dev);



	return (fsystem_guid && psystem_guid && fsystem_guid == psystem_guid);

}



static u32 mlx5_gen_pci_id(const struct mlx5_core_dev *dev)

{

	return (u32)((pci_domain_nr(dev->pdev->bus) << 16) |
@@ -556,7 +567,8 @@ static int next_phys_dev(struct device *dev, const void *data) 
	if (mdev == curr)

		return 0;



	if (mlx5_gen_pci_id(mdev) != mlx5_gen_pci_id(curr))

	if (!mlx5_same_hw_devs(mdev, (struct mlx5_core_dev *)curr) &&

	    mlx5_gen_pci_id(mdev) != mlx5_gen_pci_id(curr))

		return 0;



	return 1;

drivers/net/ethernet/mellanox/mlx5/core/devlink.c

+2 −1
Original line number Diff line number Diff line
@@ -454,7 +454,8 @@ static int mlx5_devlink_enable_roce_validate(struct devlink *devlink, u32 id, 
	struct mlx5_core_dev *dev = devlink_priv(devlink);

	bool new_state = val.vbool;



	if (new_state && !MLX5_CAP_GEN(dev, roce)) {

	if (new_state && !MLX5_CAP_GEN(dev, roce) &&

	    !MLX5_CAP_GEN(dev, roce_rw_supported)) {

		NL_SET_ERR_MSG_MOD(extack, "Device doesn't support RoCE");

		return -EOPNOTSUPP;

	}

drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ int mlx5e_devlink_port_register(struct mlx5e_priv *priv) 


	if (mlx5_core_is_pf(priv->mdev)) {

		attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;

		attrs.phys.port_number = PCI_FUNC(priv->mdev->pdev->devfn);

		attrs.phys.port_number = mlx5_get_dev_index(priv->mdev);

		if (MLX5_ESWITCH_MANAGER(priv->mdev)) {

			mlx5e_devlink_get_port_parent_id(priv->mdev, &ppid);

			memcpy(attrs.switch_id.id, ppid.id, ppid.id_len);