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

Commit 4a7eca82 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'ehca', 'misc', 'mlx4', 'mthca' and 'nes' into for-linus

parents 1d4d6da5 716abb1f e727f5cd 99987bea 68237a0f

drivers/infiniband/core/addr.c

+2 −2
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ static struct notifier_block nb = { 
	.notifier_call = netevent_callback

};



static int addr_init(void)

static int __init addr_init(void)

{

	addr_wq = create_singlethread_workqueue("ib_addr");

	if (!addr_wq)
@@ -524,7 +524,7 @@ static int addr_init(void) 
	return 0;

}



static void addr_cleanup(void)

static void __exit addr_cleanup(void)

{

	unregister_netevent_notifier(&nb);

	destroy_workqueue(addr_wq);

drivers/infiniband/core/cma.c

+2 −2
Original line number Diff line number Diff line
@@ -2960,7 +2960,7 @@ static void cma_remove_one(struct ib_device *device) 
	kfree(cma_dev);

}



static int cma_init(void)

static int __init cma_init(void)

{

	int ret, low, high, remaining;
@@ -2990,7 +2990,7 @@ static int cma_init(void) 
	return ret;

}



static void cma_cleanup(void)

static void __exit cma_cleanup(void)

{

	ib_unregister_client(&cma_client);

	unregister_netdevice_notifier(&cma_nb);

drivers/infiniband/hw/mthca/mthca_mr.c

+10 −3
Original line number Diff line number Diff line
@@ -352,10 +352,14 @@ static void mthca_arbel_write_mtt_seg(struct mthca_dev *dev, 


	BUG_ON(!mtts);



	dma_sync_single_for_cpu(&dev->pdev->dev, dma_handle,

				list_len * sizeof (u64), DMA_TO_DEVICE);



	for (i = 0; i < list_len; ++i)

		mtts[i] = cpu_to_be64(buffer_list[i] | MTHCA_MTT_FLAG_PRESENT);



	dma_sync_single(&dev->pdev->dev, dma_handle, list_len * sizeof (u64), DMA_TO_DEVICE);

	dma_sync_single_for_device(&dev->pdev->dev, dma_handle,

				   list_len * sizeof (u64), DMA_TO_DEVICE);

}



int mthca_write_mtt(struct mthca_dev *dev, struct mthca_mtt *mtt,
@@ -803,11 +807,14 @@ int mthca_arbel_map_phys_fmr(struct ib_fmr *ibfmr, u64 *page_list, 


	wmb();



	dma_sync_single_for_cpu(&dev->pdev->dev, fmr->mem.arbel.dma_handle,

				list_len * sizeof(u64), DMA_TO_DEVICE);



	for (i = 0; i < list_len; ++i)

		fmr->mem.arbel.mtts[i] = cpu_to_be64(page_list[i] |

						     MTHCA_MTT_FLAG_PRESENT);



	dma_sync_single(&dev->pdev->dev, fmr->mem.arbel.dma_handle,

	dma_sync_single_for_device(&dev->pdev->dev, fmr->mem.arbel.dma_handle,

				   list_len * sizeof(u64), DMA_TO_DEVICE);



	fmr->mem.arbel.mpt->key    = cpu_to_be32(key);

drivers/infiniband/hw/nes/nes_cm.c

+5 −3
Original line number Diff line number Diff line
@@ -472,6 +472,7 @@ int schedule_nes_timer(struct nes_cm_node *cm_node, struct sk_buff *skb, 


static void nes_retrans_expired(struct nes_cm_node *cm_node)

{

	struct iw_cm_id *cm_id = cm_node->cm_id;

	switch (cm_node->state) {

	case NES_CM_STATE_SYN_RCVD:

	case NES_CM_STATE_CLOSING:
@@ -479,7 +480,9 @@ static void nes_retrans_expired(struct nes_cm_node *cm_node) 
		break;

	case NES_CM_STATE_LAST_ACK:

	case NES_CM_STATE_FIN_WAIT1:

	case NES_CM_STATE_MPAREJ_RCVD:

		if (cm_node->cm_id)

			cm_id->rem_ref(cm_id);

		cm_node->state = NES_CM_STATE_CLOSED;

		send_reset(cm_node, NULL);

		break;

	default:
@@ -1406,6 +1409,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb, 
	case NES_CM_STATE_CLOSED:

		drop_packet(skb);

		break;

	case NES_CM_STATE_FIN_WAIT1:

	case NES_CM_STATE_LAST_ACK:

		cm_node->cm_id->rem_ref(cm_node->cm_id);

	case NES_CM_STATE_TIME_WAIT:
@@ -1413,8 +1417,6 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb, 
		rem_ref_cm_node(cm_node->cm_core, cm_node);

		drop_packet(skb);

		break;

	case NES_CM_STATE_FIN_WAIT1:

		nes_debug(NES_DBG_CM, "Bad state %s[%u]\n", __func__, __LINE__);

	default:

		drop_packet(skb);

		break;

drivers/infiniband/hw/nes/nes_verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ static int nes_query_device(struct ib_device *ibdev, struct ib_device_attr *prop 
		default:

			props->max_qp_rd_atom = 0;

	}

	props->max_qp_init_rd_atom = props->max_qp_wr;

	props->max_qp_init_rd_atom = props->max_qp_rd_atom;

	props->atomic_cap = IB_ATOMIC_NONE;

	props->max_map_per_fmr = 1;