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

Pull InfiniBand/RDMA changes for the 3.4 merge window from Roland Dreier:
 "Nothing big really stands out; by patch count lots of fixes to the
  mlx4 driver plus some cleanups and fixes to the core and other
  drivers."

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (28 commits)
  mlx4_core: Scale size of MTT table with system RAM
  mlx4_core: Allow dynamic MTU configuration for IB ports
  IB/mlx4: Fix info returned when querying IBoE ports
  IB/mlx4: Fix possible missed completion event
  mlx4_core: Report thermal error events
  mlx4_core: Fix one more static exported function
  IB: Change CQE "csum_ok" field to a bit flag
  RDMA/iwcm: Reject connect requests if cmid is not in LISTEN state
  RDMA/cxgb3: Don't pass irq flags to flush_qp()
  mlx4_core: Get rid of redundant ext_port_cap flags
  RDMA/ucma: Fix AB-BA deadlock
  IB/ehca: Fix ilog2() compile failure
  IB: Use central enum for speed instead of hard-coded values
  IB/iser: Post initial receive buffers before sending the final login request
  IB/iser: Free IB connection resources in the proper place
  IB/srp: Consolidate repetitive sysfs code
  IB/srp: Use pr_fmt() and pr_err()/pr_warn()
  IB/core: Fix SDR rates in sysfs
  mlx4: Enforce device max FMR maps in FMR alloc
  IB/mlx4: Set bad_wr for invalid send opcode
  ...

1 files changed, 31 insertions, 1 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
index 9129ace02560..3b6f8efbf141 100644
--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -79,7 +79,8 @@ enum {
                                (1ull << MLX4_EVENT_TYPE_SRQ_LIMIT)          | \
                                (1ull << MLX4_EVENT_TYPE_CMD)                | \
                                (1ull << MLX4_EVENT_TYPE_COMM_CHANNEL)       | \
-                               (1ull << MLX4_EVENT_TYPE_FLR_EVENT))
+                               (1ull << MLX4_EVENT_TYPE_FLR_EVENT)          | \
+                               (1ull << MLX4_EVENT_TYPE_FATAL_WARNING))
 
 static void eq_set_ci(struct mlx4_eq *eq, int req_not)
 {
@@ -443,6 +444,35 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
                         queue_work(priv->mfunc.master.comm_wq,
                                    &priv->mfunc.master.slave_flr_event_work);
                         break;
+
+                case MLX4_EVENT_TYPE_FATAL_WARNING:
+                        if (eqe->subtype == MLX4_FATAL_WARNING_SUBTYPE_WARMING) {
+                                if (mlx4_is_master(dev))
+                                        for (i = 0; i < dev->num_slaves; i++) {
+                                                mlx4_dbg(dev, "%s: Sending "
+                                                        "MLX4_FATAL_WARNING_SUBTYPE_WARMING"
+                                                        " to slave: %d\n", __func__, i);
+                                                if (i == dev->caps.function)
+                                                        continue;
+                                                mlx4_slave_event(dev, i, eqe);
+                                        }
+                                mlx4_err(dev, "Temperature Threshold was reached! "
+                                        "Threshold: %d celsius degrees; "
+                                        "Current Temperature: %d\n",
+                                        be16_to_cpu(eqe->event.warming.warning_threshold),
+                                        be16_to_cpu(eqe->event.warming.current_temperature));
+                        } else
+                                mlx4_warn(dev, "Unhandled event FATAL WARNING (%02x), "
+                                          "subtype %02x on EQ %d at index %u. owner=%x, "
+                                          "nent=0x%x, slave=%x, ownership=%s\n",
+                                          eqe->type, eqe->subtype, eq->eqn,
+                                          eq->cons_index, eqe->owner, eq->nent,
+                                          eqe->slave_id,
+                                          !!(eqe->owner & 0x80) ^
+                                          !!(eq->cons_index & eq->nent) ? "HW" : "SW");
+
+                        break;
+
                 case MLX4_EVENT_TYPE_EEC_CATAS_ERROR:
                 case MLX4_EVENT_TYPE_ECC_DETECT:
                 default: