From: Doug Ledford <dledford@redhat.com>
Date: Mon, 25 Sep 2017 15:18:35 +0000 (-0400)
Subject: Merge branch 'qedr' into k.o/for-next
X-Git-Tag: v4.15-rc1~96^2~111^2~99
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=7ae6f2a3d552dc01c4423c0cdede1daa9fd07991;p=linux.git

Merge branch 'qedr' into k.o/for-next

Signed-off-by: Doug Ledford <dledford@redhat.com>
---

7ae6f2a3d552dc01c4423c0cdede1daa9fd07991
diff --cc drivers/infiniband/hw/qedr/qedr.h
index b2bb42e2805d,06cb96d86332..bcfa1f901281
--- a/drivers/infiniband/hw/qedr/qedr.h
+++ b/drivers/infiniband/hw/qedr/qedr.h
@@@ -41,8 -42,11 +42,10 @@@
  #include <linux/qed/roce_common.h>
  #include "qedr_hsi_rdma.h"
  
 -#define QEDR_MODULE_VERSION	"8.10.10.0"
  #define QEDR_NODE_DESC "QLogic 579xx RoCE HCA"
  #define DP_NAME(dev) ((dev)->ibdev.name)
+ #define IS_IWARP(_dev) ((_dev)->rdma_type == QED_RDMA_TYPE_IWARP)
+ #define IS_ROCE(_dev) ((_dev)->rdma_type == QED_RDMA_TYPE_ROCE)
  
  #define DP_DEBUG(dev, module, fmt, ...)					\
  	pr_debug("(%s) " module ": " fmt,				\
@@@ -160,10 -165,13 +164,15 @@@ struct qedr_dev 
  	struct qedr_cq		*gsi_sqcq;
  	struct qedr_cq		*gsi_rqcq;
  	struct qedr_qp		*gsi_qp;
+ 	enum qed_rdma_type	rdma_type;
+ 	spinlock_t		idr_lock; /* Protect qpidr data-structure */
+ 	struct idr		qpidr;
+ 	struct workqueue_struct *iwarp_wq;
+ 	u16			iwarp_max_mtu;
  
  	unsigned long enet_state;
 +
 +	u8 user_dpm_enabled;
  };
  
  #define QEDR_MAX_SQ_PBL			(0x8000)