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

Commit 9c637646 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

parents b8b99e85 834ac73d

drivers/infiniband/core/cache.c

+2 −1
Original line number Diff line number Diff line
@@ -301,7 +301,8 @@ static void ib_cache_event(struct ib_event_handler *handler, 
	    event->event == IB_EVENT_PORT_ACTIVE ||

	    event->event == IB_EVENT_LID_CHANGE  ||

	    event->event == IB_EVENT_PKEY_CHANGE ||

	    event->event == IB_EVENT_SM_CHANGE) {

	    event->event == IB_EVENT_SM_CHANGE   ||

	    event->event == IB_EVENT_CLIENT_REREGISTER) {

		work = kmalloc(sizeof *work, GFP_ATOMIC);

		if (work) {

			INIT_WORK(&work->work, ib_cache_task, work);

drivers/infiniband/core/sa_query.c

+2 −1
Original line number Diff line number Diff line
@@ -405,7 +405,8 @@ static void ib_sa_event(struct ib_event_handler *handler, struct ib_event *event 
	    event->event == IB_EVENT_PORT_ACTIVE ||

	    event->event == IB_EVENT_LID_CHANGE  ||

	    event->event == IB_EVENT_PKEY_CHANGE ||

	    event->event == IB_EVENT_SM_CHANGE) {

	    event->event == IB_EVENT_SM_CHANGE   ||

	    event->event == IB_EVENT_CLIENT_REREGISTER) {

		struct ib_sa_device *sa_dev;

		sa_dev = container_of(handler, typeof(*sa_dev), event_handler);

drivers/infiniband/hw/mthca/mthca_main.c

+3 −3
Original line number Diff line number Diff line
@@ -967,12 +967,12 @@ static struct { 
} mthca_hca_table[] = {

	[TAVOR]        = { .latest_fw = MTHCA_FW_VER(3, 4, 0),

			   .flags     = 0 },

	[ARBEL_COMPAT] = { .latest_fw = MTHCA_FW_VER(4, 7, 400),

	[ARBEL_COMPAT] = { .latest_fw = MTHCA_FW_VER(4, 7, 600),

			   .flags     = MTHCA_FLAG_PCIE },

	[ARBEL_NATIVE] = { .latest_fw = MTHCA_FW_VER(5, 1, 0),

	[ARBEL_NATIVE] = { .latest_fw = MTHCA_FW_VER(5, 1, 400),

			   .flags     = MTHCA_FLAG_MEMFREE |

					MTHCA_FLAG_PCIE },

	[SINAI]        = { .latest_fw = MTHCA_FW_VER(1, 0, 800),

	[SINAI]        = { .latest_fw = MTHCA_FW_VER(1, 1, 0),

			   .flags     = MTHCA_FLAG_MEMFREE |

					MTHCA_FLAG_PCIE    |

					MTHCA_FLAG_SINAI_OPT }

drivers/infiniband/hw/mthca/mthca_provider.c

+6 −5
Original line number Diff line number Diff line
@@ -1287,11 +1287,7 @@ int mthca_register_device(struct mthca_dev *dev) 
		(1ull << IB_USER_VERBS_CMD_MODIFY_QP)		|

		(1ull << IB_USER_VERBS_CMD_DESTROY_QP)		|

		(1ull << IB_USER_VERBS_CMD_ATTACH_MCAST)	|

		(1ull << IB_USER_VERBS_CMD_DETACH_MCAST)	|

		(1ull << IB_USER_VERBS_CMD_CREATE_SRQ)		|

		(1ull << IB_USER_VERBS_CMD_MODIFY_SRQ)		|

		(1ull << IB_USER_VERBS_CMD_QUERY_SRQ)		|

		(1ull << IB_USER_VERBS_CMD_DESTROY_SRQ);

		(1ull << IB_USER_VERBS_CMD_DETACH_MCAST);

	dev->ib_dev.node_type            = IB_NODE_CA;

	dev->ib_dev.phys_port_cnt        = dev->limits.num_ports;

	dev->ib_dev.dma_device           = &dev->pdev->dev;
@@ -1316,6 +1312,11 @@ int mthca_register_device(struct mthca_dev *dev) 
		dev->ib_dev.modify_srq           = mthca_modify_srq;

		dev->ib_dev.query_srq            = mthca_query_srq;

		dev->ib_dev.destroy_srq          = mthca_destroy_srq;

		dev->ib_dev.uverbs_cmd_mask	|=

			(1ull << IB_USER_VERBS_CMD_CREATE_SRQ)		|

			(1ull << IB_USER_VERBS_CMD_MODIFY_SRQ)		|

			(1ull << IB_USER_VERBS_CMD_QUERY_SRQ)		|

			(1ull << IB_USER_VERBS_CMD_DESTROY_SRQ);



		if (mthca_is_memfree(dev))

			dev->ib_dev.post_srq_recv = mthca_arbel_post_srq_recv;

drivers/infiniband/hw/mthca/mthca_provider.h

+2 −2
Original line number Diff line number Diff line
@@ -136,8 +136,8 @@ struct mthca_ah { 
 * We have one global lock that protects dev->cq/qp_table.  Each

 * struct mthca_cq/qp also has its own lock.  An individual qp lock

 * may be taken inside of an individual cq lock.  Both cqs attached to

 * a qp may be locked, with the send cq locked first.  No other

 * nesting should be done.

 * a qp may be locked, with the cq with the lower cqn locked first.

 * No other nesting should be done.

 *

 * Each struct mthca_cq/qp also has an ref count, protected by the

 * corresponding table lock.  The pointer from the cq/qp_table to the