Merge tag 'rdma-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

Pull InfiniBand/RDMA changes from Roland Dreier:
 - Updates to the qib low-level driver
 - First chunk of changes for SR-IOV support for mlx4 IB
 - RDMA CM support for IPv6-only binding
 - Other misc cleanups and fixes

Fix up some add-add conflicts in include/linux/mlx4/device.h and
drivers/net/ethernet/mellanox/mlx4/main.c

* tag 'rdma-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (30 commits)
  IB/qib: checkpatch fixes
  IB/qib: Add congestion control agent implementation
  IB/qib: Reduce sdma_lock contention
  IB/qib: Fix an incorrect log message
  IB/qib: Fix QP RCU sparse warnings
  mlx4: Put physical GID and P_Key table sizes in mlx4_phys_caps struct and paravirtualize them
  mlx4_core: Allow guests to have IB ports
  mlx4_core: Implement mechanism for reserved Q_Keys
  net/mlx4_core: Free ICM table in case of error
  IB/cm: Destroy idr as part of the module init error flow
  mlx4_core: Remove double function declarations
  IB/mlx4: Fill the masked_atomic_cap attribute in query device
  IB/mthca: Fill in sq_sig_type in query QP
  IB/mthca: Warning about event for non-existent QPs should show event type
  IB/qib: Fix sparse RCU warnings in qib_keys.c
  net/mlx4_core: Initialize IB port capabilities for all slaves
  mlx4: Use port management change event instead of smp_snoop
  IB/qib: RCU locking for MR validation
  IB/qib: Avoid returning EBUSY from MR deregister
  IB/qib: Fix UC MR refs for immediate operations
  ...

6 files changed, 176 insertions, 2 deletions

diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 4d7761f8c3f6..bd6c9fcdf2dd 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -57,6 +57,13 @@ enum {
         MLX4_MAX_PORTS          = 2
 };
 
+/* base qkey for use in sriov tunnel-qp/proxy-qp communication.
+ * These qkeys must not be allowed for general use. This is a 64k range,
+ * and to test for violation, we use the mask (protect against future chg).
+ */
+#define MLX4_RESERVED_QKEY_BASE  (0xFFFF0000)
+#define MLX4_RESERVED_QKEY_MASK  (0xFFFF0000)
+
 enum {
         MLX4_BOARD_ID_LEN = 64
 };
@@ -127,7 +134,8 @@ enum {
         MLX4_DEV_CAP_FLAG_VEP_UC_STEER  = 1LL << 41,
         MLX4_DEV_CAP_FLAG_VEP_MC_STEER  = 1LL << 42,
         MLX4_DEV_CAP_FLAG_COUNTERS      = 1LL << 48,
-        MLX4_DEV_CAP_FLAG_SENSE_SUPPORT = 1LL << 55
+        MLX4_DEV_CAP_FLAG_SENSE_SUPPORT = 1LL << 55,
+        MLX4_DEV_CAP_FLAG_PORT_MNG_CHG_EV = 1LL << 59,
 };
 
 enum {
@@ -170,6 +178,7 @@ enum mlx4_event {
         MLX4_EVENT_TYPE_COMM_CHANNEL       = 0x18,
         MLX4_EVENT_TYPE_FATAL_WARNING      = 0x1b,
         MLX4_EVENT_TYPE_FLR_EVENT          = 0x1c,
+        MLX4_EVENT_TYPE_PORT_MNG_CHG_EVENT = 0x1d,
         MLX4_EVENT_TYPE_NONE               = 0xff,
 };
 
@@ -267,12 +276,32 @@ enum {
         MLX4_MAX_FAST_REG_PAGES = 511,
 };
 
+enum {
+        MLX4_DEV_PMC_SUBTYPE_GUID_INFO   = 0x14,
+        MLX4_DEV_PMC_SUBTYPE_PORT_INFO   = 0x15,
+        MLX4_DEV_PMC_SUBTYPE_PKEY_TABLE  = 0x16,
+};
+
+/* Port mgmt change event handling */
+enum {
+        MLX4_EQ_PORT_INFO_MSTR_SM_LID_CHANGE_MASK       = 1 << 0,
+        MLX4_EQ_PORT_INFO_GID_PFX_CHANGE_MASK           = 1 << 1,
+        MLX4_EQ_PORT_INFO_LID_CHANGE_MASK               = 1 << 2,
+        MLX4_EQ_PORT_INFO_CLIENT_REREG_MASK             = 1 << 3,
+        MLX4_EQ_PORT_INFO_MSTR_SM_SL_CHANGE_MASK        = 1 << 4,
+};
+
+#define MSTR_SM_CHANGE_MASK (MLX4_EQ_PORT_INFO_MSTR_SM_SL_CHANGE_MASK | \
+                             MLX4_EQ_PORT_INFO_MSTR_SM_LID_CHANGE_MASK)
+
 static inline u64 mlx4_fw_ver(u64 major, u64 minor, u64 subminor)
 {
         return (major << 32) | (minor << 16) | subminor;
 }
 
 struct mlx4_phys_caps {
+        u32                     gid_phys_table_len[MLX4_MAX_PORTS + 1];
+        u32                     pkey_phys_table_len[MLX4_MAX_PORTS + 1];
         u32                     num_phys_eqs;
 };
 
@@ -305,6 +334,8 @@ struct mlx4_caps {
         int                     max_qp_init_rdma;
         int                     max_qp_dest_rdma;
         int                     sqp_start;
+        u32                     base_sqpn;
+        u32                     base_tunnel_sqpn;
         int                     num_srqs;
         int                     max_srq_wqes;
         int                     max_srq_sge;
@@ -547,6 +578,81 @@ struct mlx4_dev {
         u64                     regid_allmulti_array[MLX4_MAX_PORTS + 1];
 };
 
+struct mlx4_eqe {
+        u8                      reserved1;
+        u8                      type;
+        u8                      reserved2;
+        u8                      subtype;
+        union {
+                u32             raw[6];
+                struct {
+                        __be32  cqn;
+                } __packed comp;
+                struct {
+                        u16     reserved1;
+                        __be16  token;
+                        u32     reserved2;
+                        u8      reserved3[3];
+                        u8      status;
+                        __be64  out_param;
+                } __packed cmd;
+                struct {
+                        __be32  qpn;
+                } __packed qp;
+                struct {
+                        __be32  srqn;
+                } __packed srq;
+                struct {
+                        __be32  cqn;
+                        u32     reserved1;
+                        u8      reserved2[3];
+                        u8      syndrome;
+                } __packed cq_err;
+                struct {
+                        u32     reserved1[2];
+                        __be32  port;
+                } __packed port_change;
+                struct {
+                        #define COMM_CHANNEL_BIT_ARRAY_SIZE     4
+                        u32 reserved;
+                        u32 bit_vec[COMM_CHANNEL_BIT_ARRAY_SIZE];
+                } __packed comm_channel_arm;
+                struct {
+                        u8      port;
+                        u8      reserved[3];
+                        __be64  mac;
+                } __packed mac_update;
+                struct {
+                        __be32  slave_id;
+                } __packed flr_event;
+                struct {
+                        __be16  current_temperature;
+                        __be16  warning_threshold;
+                } __packed warming;
+                struct {
+                        u8 reserved[3];
+                        u8 port;
+                        union {
+                                struct {
+                                        __be16 mstr_sm_lid;
+                                        __be16 port_lid;
+                                        __be32 changed_attr;
+                                        u8 reserved[3];
+                                        u8 mstr_sm_sl;
+                                        __be64 gid_prefix;
+                                } __packed port_info;
+                                struct {
+                                        __be32 block_ptr;
+                                        __be32 tbl_entries_mask;
+                                } __packed tbl_change_info;
+                        } params;
+                } __packed port_mgmt_change;
+        }                       event;
+        u8                      slave_id;
+        u8                      reserved3[2];
+        u8                      owner;
+} __packed;
+
 struct mlx4_init_port_param {
         int                     set_guid0;
         int                     set_node_guid;
@@ -570,6 +676,15 @@ struct mlx4_init_port_param {
                 if (((dev)->caps.port_mask[port] == MLX4_PORT_TYPE_IB) || \
                         ((dev)->caps.flags & MLX4_DEV_CAP_FLAG_IBOE))
 
+#define MLX4_INVALID_SLAVE_ID   0xFF
+
+void handle_port_mgmt_change_event(struct work_struct *work);
+
+static inline int mlx4_master_func_num(struct mlx4_dev *dev)
+{
+        return dev->caps.function;
+}
+
 static inline int mlx4_is_master(struct mlx4_dev *dev)
 {
         return dev->flags & MLX4_FLAG_MASTER;
@@ -799,4 +914,6 @@ int mlx4_flow_attach(struct mlx4_dev *dev,
                      struct mlx4_net_trans_rule *rule, u64 *reg_id);
 int mlx4_flow_detach(struct mlx4_dev *dev, u64 reg_id);
 
+int mlx4_get_parav_qkey(struct mlx4_dev *dev, u32 qpn, u32 *qkey);
+
 #endif /* MLX4_DEVICE_H */
diff --git a/include/linux/mlx4/driver.h b/include/linux/mlx4/driver.h
index 8dc485febc6b..d813704b963b 100644
--- a/include/linux/mlx4/driver.h
+++ b/include/linux/mlx4/driver.h
@@ -44,13 +44,14 @@ enum mlx4_dev_event {
         MLX4_DEV_EVENT_PORT_UP,
         MLX4_DEV_EVENT_PORT_DOWN,
         MLX4_DEV_EVENT_PORT_REINIT,
+        MLX4_DEV_EVENT_PORT_MGMT_CHANGE,
 };
 
 struct mlx4_interface {
         void *                  (*add)   (struct mlx4_dev *dev);
         void                    (*remove)(struct mlx4_dev *dev, void *context);
         void                    (*event) (struct mlx4_dev *dev, void *context,
-                                          enum mlx4_dev_event event, int port);
+                                          enum mlx4_dev_event event, unsigned long param);
         void *                  (*get_dev)(struct mlx4_dev *dev, void *context, u8 port);
         struct list_head        list;
         enum mlx4_protocol      protocol;
diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h
index 83f77ac33957..0e3ff30647d5 100644
--- a/include/rdma/ib_cm.h
+++ b/include/rdma/ib_cm.h
@@ -262,6 +262,18 @@ struct ib_cm_event {
         void                    *private_data;
 };
 
+#define CM_REQ_ATTR_ID          cpu_to_be16(0x0010)
+#define CM_MRA_ATTR_ID          cpu_to_be16(0x0011)
+#define CM_REJ_ATTR_ID          cpu_to_be16(0x0012)
+#define CM_REP_ATTR_ID          cpu_to_be16(0x0013)
+#define CM_RTU_ATTR_ID          cpu_to_be16(0x0014)
+#define CM_DREQ_ATTR_ID         cpu_to_be16(0x0015)
+#define CM_DREP_ATTR_ID         cpu_to_be16(0x0016)
+#define CM_SIDR_REQ_ATTR_ID     cpu_to_be16(0x0017)
+#define CM_SIDR_REP_ATTR_ID     cpu_to_be16(0x0018)
+#define CM_LAP_ATTR_ID          cpu_to_be16(0x0019)
+#define CM_APR_ATTR_ID          cpu_to_be16(0x001A)
+
 /**
  * ib_cm_handler - User-defined callback to process communication events.
  * @cm_id: Communication identifier associated with the reported event.
diff --git a/include/rdma/ib_sa.h b/include/rdma/ib_sa.h
index d44a56388a3e..8275e539bace 100644
--- a/include/rdma/ib_sa.h
+++ b/include/rdma/ib_sa.h
@@ -251,6 +251,28 @@ struct ib_sa_service_rec {
         u64             data64[2];
 };
 
+#define IB_SA_GUIDINFO_REC_LID          IB_SA_COMP_MASK(0)
+#define IB_SA_GUIDINFO_REC_BLOCK_NUM    IB_SA_COMP_MASK(1)
+#define IB_SA_GUIDINFO_REC_RES1         IB_SA_COMP_MASK(2)
+#define IB_SA_GUIDINFO_REC_RES2         IB_SA_COMP_MASK(3)
+#define IB_SA_GUIDINFO_REC_GID0         IB_SA_COMP_MASK(4)
+#define IB_SA_GUIDINFO_REC_GID1         IB_SA_COMP_MASK(5)
+#define IB_SA_GUIDINFO_REC_GID2         IB_SA_COMP_MASK(6)
+#define IB_SA_GUIDINFO_REC_GID3         IB_SA_COMP_MASK(7)
+#define IB_SA_GUIDINFO_REC_GID4         IB_SA_COMP_MASK(8)
+#define IB_SA_GUIDINFO_REC_GID5         IB_SA_COMP_MASK(9)
+#define IB_SA_GUIDINFO_REC_GID6         IB_SA_COMP_MASK(10)
+#define IB_SA_GUIDINFO_REC_GID7         IB_SA_COMP_MASK(11)
+
+struct ib_sa_guidinfo_rec {
+        __be16  lid;
+        u8      block_num;
+        /* reserved */
+        u8      res1;
+        __be32  res2;
+        u8      guid_info_list[64];
+};
+
 struct ib_sa_client {
         atomic_t users;
         struct completion comp;
@@ -385,4 +407,15 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num,
  */
 void ib_sa_unpack_path(void *attribute, struct ib_sa_path_rec *rec);
 
+/* Support GuidInfoRecord */
+int ib_sa_guid_info_rec_query(struct ib_sa_client *client,
+                              struct ib_device *device, u8 port_num,
+                              struct ib_sa_guidinfo_rec *rec,
+                              ib_sa_comp_mask comp_mask, u8 method,
+                              int timeout_ms, gfp_t gfp_mask,
+                              void (*callback)(int status,
+                                               struct ib_sa_guidinfo_rec *resp,
+                                               void *context),
+                              void *context,
+                              struct ib_sa_query **sa_query);
 #endif /* IB_SA_H */
diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h
index 51988f808181..ad3a3142383a 100644
--- a/include/rdma/rdma_cm.h
+++ b/include/rdma/rdma_cm.h
@@ -357,4 +357,14 @@ void rdma_set_service_type(struct rdma_cm_id *id, int tos);
  */
 int rdma_set_reuseaddr(struct rdma_cm_id *id, int reuse);
 
+/**
+ * rdma_set_afonly - Specify that listens are restricted to the
+ *    bound address family only.
+ * @id: Communication identifer to configure.
+ * @afonly: Value indicating if listens are restricted.
+ *
+ * Must be set before identifier is in the listening state.
+ */
+int rdma_set_afonly(struct rdma_cm_id *id, int afonly);
+
 #endif /* RDMA_CM_H */
diff --git a/include/rdma/rdma_user_cm.h b/include/rdma/rdma_user_cm.h
index 5348a000c8f3..1ee9239ff8c2 100644
--- a/include/rdma/rdma_user_cm.h
+++ b/include/rdma/rdma_user_cm.h
@@ -224,6 +224,7 @@ enum {
 enum {
         RDMA_OPTION_ID_TOS       = 0,
         RDMA_OPTION_ID_REUSEADDR = 1,
+        RDMA_OPTION_ID_AFONLY    = 2,
         RDMA_OPTION_IB_PATH      = 1
 };