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

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

Merge tag 'mlx5-updates-2019-04-02' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mamameed says:

====================
mlx5-updates-2019-04-02

This series provides misc updates to mlx5 driver

1) Aya Levin (1): Handle event of power detection in the PCIE slot

2) Eli Britstein (6):
  Some TC VLAN related updates and fixes to the previous VLAN modify action
  support patchset.
  Offload TC e-switch rules with egress/ingress VLAN devices

3) Max Gurtovoy (1): Fix double mutex initialization in esiwtch.c

4) Tariq Toukan (3): Misc small updates
  A write memory barrier is sufficient in EQ ci update
  Obsolete param field holding a constant value
  Unify logic of MTU boundaries

5) Tonghao Zhang (4): Misc updates to en_tc.c
  Make the log friendly when decapsulation offload not supported
  Remove 'parse_attr' argument in parse_tc_fdb_actions()
  Deletes unnecessary setting of esw_attr->parse_attr
  Return -EOPNOTSUPP when attempting to offload an unsupported action
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ed514fc5 6d7ee2ed

drivers/infiniband/hw/mlx5/cmd.c

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ int mlx5_cmd_alloc_memic(struct mlx5_memic *memic, phys_addr_t *addr, 
			return ret;

		}



		*addr = pci_resource_start(dev->pdev, 0) +

		*addr = dev->bar_addr +

			MLX5_GET64(alloc_memic_out, out, memic_start_addr);



		return 0;
@@ -167,7 +167,7 @@ int mlx5_cmd_dealloc_memic(struct mlx5_memic *memic, u64 addr, u64 length) 
	u64 start_page_idx;

	int err;



	addr -= pci_resource_start(dev->pdev, 0);

	addr -= dev->bar_addr;

	start_page_idx = (addr - hw_start_addr) >> PAGE_SHIFT;



	MLX5_SET(dealloc_memic_in, in, opcode, MLX5_CMD_OP_DEALLOC_MEMIC);

drivers/infiniband/hw/mlx5/main.c

+4 −4
Original line number Diff line number Diff line
@@ -2009,7 +2009,7 @@ static phys_addr_t uar_index2pfn(struct mlx5_ib_dev *dev, 


	fw_uars_per_page = MLX5_CAP_GEN(dev->mdev, uar_4k) ? MLX5_UARS_IN_PAGE : 1;



	return (pci_resource_start(dev->mdev->pdev, 0) >> PAGE_SHIFT) + uar_idx / fw_uars_per_page;

	return (dev->mdev->bar_addr >> PAGE_SHIFT) + uar_idx / fw_uars_per_page;

}



static int get_command(unsigned long offset)
@@ -2199,7 +2199,7 @@ static int dm_mmap(struct ib_ucontext *context, struct vm_area_struct *vma) 
	    page_idx + npages)

		return -EINVAL;



	pfn = ((pci_resource_start(dev->mdev->pdev, 0) +

	pfn = ((dev->mdev->bar_addr +

	      MLX5_CAP64_DEV_MEM(dev->mdev, memic_bar_start_addr)) >>

	      PAGE_SHIFT) +

	      page_idx;
@@ -2283,7 +2283,7 @@ struct ib_dm *mlx5_ib_alloc_dm(struct ib_device *ibdev, 
		goto err_free;



	start_offset = memic_addr & ~PAGE_MASK;

	page_idx = (memic_addr - pci_resource_start(memic->dev->pdev, 0) -

	page_idx = (memic_addr - memic->dev->bar_addr -

		    MLX5_CAP64_DEV_MEM(memic->dev, memic_bar_start_addr)) >>

		    PAGE_SHIFT;
@@ -2326,7 +2326,7 @@ int mlx5_ib_dealloc_dm(struct ib_dm *ibdm) 
	if (ret)

		return ret;



	page_idx = (dm->dev_addr - pci_resource_start(memic->dev->pdev, 0) -

	page_idx = (dm->dev_addr - memic->dev->bar_addr -

		    MLX5_CAP64_DEV_MEM(memic->dev, memic_bar_start_addr)) >>

		    PAGE_SHIFT;

	bitmap_clear(to_mucontext(ibdm->uobject->context)->dm_pages,

drivers/infiniband/hw/mlx5/mr.c

+1 −2
Original line number Diff line number Diff line
@@ -1194,8 +1194,7 @@ static struct ib_mr *mlx5_ib_get_memic_mr(struct ib_pd *pd, u64 memic_addr, 
	MLX5_SET64(mkc, mkc, len, length);

	MLX5_SET(mkc, mkc, pd, to_mpd(pd)->pdn);

	MLX5_SET(mkc, mkc, qpn, 0xffffff);

	MLX5_SET64(mkc, mkc, start_addr,

		   memic_addr - pci_resource_start(dev->mdev->pdev, 0));

	MLX5_SET64(mkc, mkc, start_addr, memic_addr - dev->mdev->bar_addr);



	err = mlx5_core_create_mkey(mdev, &mr->mmkey, in, inlen);

	if (err)

drivers/infiniband/hw/mlx5/qp.c

+1 −1
Original line number Diff line number Diff line
@@ -5119,7 +5119,7 @@ static int _mlx5_ib_post_send(struct ib_qp *ibqp, const struct ib_send_wr *wr, 
		wmb();



		/* currently we support only regular doorbells */

		mlx5_write64((__be32 *)ctrl, bf->bfreg->map + bf->offset, NULL);

		mlx5_write64((__be32 *)ctrl, bf->bfreg->map + bf->offset);

		/* Make sure doorbells don't leak out of SQ spinlock

		 * and reach the HCA out of order.

		 */

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

+11 −11
Original line number Diff line number Diff line
@@ -1347,7 +1347,7 @@ static void set_wqname(struct mlx5_core_dev *dev) 
	struct mlx5_cmd *cmd = &dev->cmd;



	snprintf(cmd->wq_name, sizeof(cmd->wq_name), "mlx5_cmd_%s",

		 dev_name(&dev->pdev->dev));

		 dev->priv.name);

}



static void clean_debug_files(struct mlx5_core_dev *dev)
@@ -1902,7 +1902,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) 
	memset(cmd, 0, sizeof(*cmd));

	cmd_if_rev = cmdif_rev(dev);

	if (cmd_if_rev != CMD_IF_REV) {

		dev_err(&dev->pdev->dev,

		mlx5_core_err(dev,

			      "Driver cmdif rev(%d) differs from firmware's(%d)\n",

			      CMD_IF_REV, cmd_if_rev);

		return -EINVAL;
@@ -1921,14 +1921,14 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) 
	cmd->log_sz = cmd_l >> 4 & 0xf;

	cmd->log_stride = cmd_l & 0xf;

	if (1 << cmd->log_sz > MLX5_MAX_COMMANDS) {

		dev_err(&dev->pdev->dev, "firmware reports too many outstanding commands %d\n",

		mlx5_core_err(dev, "firmware reports too many outstanding commands %d\n",

			      1 << cmd->log_sz);

		err = -EINVAL;

		goto err_free_page;

	}



	if (cmd->log_sz + cmd->log_stride > MLX5_ADAPTER_PAGE_SHIFT) {

		dev_err(&dev->pdev->dev, "command queue size overflow\n");

		mlx5_core_err(dev, "command queue size overflow\n");

		err = -EINVAL;

		goto err_free_page;

	}
@@ -1939,7 +1939,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) 


	cmd->cmdif_rev = ioread32be(&dev->iseg->cmdif_rev_fw_sub) >> 16;

	if (cmd->cmdif_rev > CMD_IF_REV) {

		dev_err(&dev->pdev->dev, "driver does not support command interface version. driver %d, firmware %d\n",

		mlx5_core_err(dev, "driver does not support command interface version. driver %d, firmware %d\n",

			      CMD_IF_REV, cmd->cmdif_rev);

		err = -EOPNOTSUPP;

		goto err_free_page;
@@ -1956,7 +1956,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) 
	cmd_h = (u32)((u64)(cmd->dma) >> 32);

	cmd_l = (u32)(cmd->dma);

	if (cmd_l & 0xfff) {

		dev_err(&dev->pdev->dev, "invalid command queue address\n");

		mlx5_core_err(dev, "invalid command queue address\n");

		err = -ENOMEM;

		goto err_free_page;

	}
@@ -1976,7 +1976,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) 
	set_wqname(dev);

	cmd->wq = create_singlethread_workqueue(cmd->wq_name);

	if (!cmd->wq) {

		dev_err(&dev->pdev->dev, "failed to create command workqueue\n");

		mlx5_core_err(dev, "failed to create command workqueue\n");

		err = -ENOMEM;

		goto err_cache;

	}