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

Commit 4790f4dc authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'misc', 'mlx4', 'mthca', 'nes' and 'srp' into for-next

parents f0626710 da995a8a eb4a7cbf 843276ad 695b8349

drivers/infiniband/hw/mlx4/main.c

+7 −5
Original line number Diff line number Diff line
@@ -623,8 +623,9 @@ static int mlx4_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 
	struct mlx4_ib_dev *mdev = to_mdev(ibqp->device);

	struct mlx4_ib_qp *mqp = to_mqp(ibqp);



	err = mlx4_multicast_attach(mdev->dev, &mqp->mqp, gid->raw, !!(mqp->flags &

				    MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK));

	err = mlx4_multicast_attach(mdev->dev, &mqp->mqp, gid->raw,

				    !!(mqp->flags & MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK),

				    MLX4_PROTOCOL_IB);

	if (err)

		return err;
@@ -635,7 +636,7 @@ static int mlx4_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 
	return 0;



err_add:

	mlx4_multicast_detach(mdev->dev, &mqp->mqp, gid->raw);

	mlx4_multicast_detach(mdev->dev, &mqp->mqp, gid->raw, MLX4_PROTOCOL_IB);

	return err;

}
@@ -665,7 +666,7 @@ static int mlx4_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 
	struct mlx4_ib_gid_entry *ge;



	err = mlx4_multicast_detach(mdev->dev,

				    &mqp->mqp, gid->raw);

				    &mqp->mqp, gid->raw, MLX4_PROTOCOL_IB);

	if (err)

		return err;
@@ -1005,7 +1006,8 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 
	if (mlx4_uar_alloc(dev, &ibdev->priv_uar))

		goto err_pd;



	ibdev->uar_map = ioremap(ibdev->priv_uar.pfn << PAGE_SHIFT, PAGE_SIZE);

	ibdev->uar_map = ioremap((phys_addr_t) ibdev->priv_uar.pfn << PAGE_SHIFT,

				 PAGE_SIZE);

	if (!ibdev->uar_map)

		goto err_uar;

	MLX4_INIT_DOORBELL_LOCK(&ibdev->uar_lock);

drivers/infiniband/hw/mthca/mthca_catas.c

+3 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static void poll_catas(unsigned long dev_ptr) 


void mthca_start_catas_poll(struct mthca_dev *dev)

{

	unsigned long addr;

	phys_addr_t addr;



	init_timer(&dev->catas_err.timer);

	dev->catas_err.map  = NULL;
@@ -158,7 +158,8 @@ void mthca_start_catas_poll(struct mthca_dev *dev) 
	dev->catas_err.map = ioremap(addr, dev->catas_err.size * 4);

	if (!dev->catas_err.map) {

		mthca_warn(dev, "couldn't map catastrophic error region "

			   "at 0x%lx/0x%x\n", addr, dev->catas_err.size * 4);

			   "at 0x%llx/0x%x\n", (unsigned long long) addr,

			   dev->catas_err.size * 4);

		return;

	}

drivers/infiniband/hw/mthca/mthca_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ int mthca_RUN_FW(struct mthca_dev *dev, u8 *status) 


static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)

{

	unsigned long addr;

	phys_addr_t addr;

	u16 max_off = 0;

	int i;

drivers/infiniband/hw/mthca/mthca_eq.c

+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static int mthca_map_reg(struct mthca_dev *dev, 
			 unsigned long offset, unsigned long size,

			 void __iomem **map)

{

	unsigned long base = pci_resource_start(dev->pdev, 0);

	phys_addr_t base = pci_resource_start(dev->pdev, 0);



	*map = ioremap(base + offset, size);

	if (!*map)

drivers/infiniband/hw/mthca/mthca_main.c

+1 −1
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ static int mthca_setup_hca(struct mthca_dev *dev) 
		goto err_uar_table_free;

	}



	dev->kar = ioremap(dev->driver_uar.pfn << PAGE_SHIFT, PAGE_SIZE);

	dev->kar = ioremap((phys_addr_t) dev->driver_uar.pfn << PAGE_SHIFT, PAGE_SIZE);

	if (!dev->kar) {

		mthca_err(dev, "Couldn't map kernel access region, "

			  "aborting.\n");