mlx4: Use port management change event instead of smp_snoop

The port management change event can replace smp_snoop.  If the
capability bit for this event is set in dev-caps, the event is used
(by the driver setting the PORT_MNG_CHG_EVENT bit in the async event
mask in the MAP_EQ fw command).  In this case, when the driver passes
incoming SMP PORT_INFO SET mads to the FW, the FW generates port
management change events to signal any changes to the driver.

If the FW generates these events, smp_snoop shouldn't be invoked in
ib_process_mad(), or duplicate events will occur (once from the
FW-generated event, and once from smp_snoop).

In the case where the FW does not generate port management change
events smp_snoop needs to be invoked to create these events.  The flow
in smp_snoop has been modified to make use of the same procedures as
in the fw-generated-event event case to generate the port management
events (LID change, Client-rereg, Pkey change, and/or GID change).

Port management change event handling required changing the
mlx4_ib_event and mlx4_dispatch_event prototypes; the "param" argument
(last argument) had to be changed to unsigned long in order to
accomodate passing the EQE pointer.

We also needed to move the definition of struct mlx4_eqe from
net/mlx4.h to file device.h -- to make it available to the IB driver,
to handle port management change events.

Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

5 files changed, 27 insertions, 69 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
index 69ba57270481..a52922ed85c1 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c
@@ -131,7 +131,7 @@ static void *mlx4_en_get_netdev(struct mlx4_dev *dev, void *ctx, u8 port)
 }
 
 static void mlx4_en_event(struct mlx4_dev *dev, void *endev_ptr,
-                          enum mlx4_dev_event event, int port)
+                          enum mlx4_dev_event event, unsigned long port)
 {
         struct mlx4_en_dev *mdev = (struct mlx4_en_dev *) endev_ptr;
         struct mlx4_en_priv *priv;
@@ -156,7 +156,8 @@ static void mlx4_en_event(struct mlx4_dev *dev, void *endev_ptr,
                 if (port < 1 || port > dev->caps.num_ports ||
                     !mdev->pndev[port])
                         return;
-                mlx4_warn(mdev, "Unhandled event %d for port %d\n", event, port);
+                mlx4_warn(mdev, "Unhandled event %d for port %d\n", event,
+                          (int) port);
         }
 }
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
index bce98d9c0039..9b15d0219950 100644
--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -82,6 +82,15 @@ enum {
                                (1ull << MLX4_EVENT_TYPE_FLR_EVENT)          | \
                                (1ull << MLX4_EVENT_TYPE_FATAL_WARNING))
 
+static u64 get_async_ev_mask(struct mlx4_dev *dev)
+{
+        u64 async_ev_mask = MLX4_ASYNC_EVENT_MASK;
+        if (dev->caps.flags & MLX4_DEV_CAP_FLAG_PORT_MNG_CHG_EV)
+                async_ev_mask |= (1ull << MLX4_EVENT_TYPE_PORT_MNG_CHG_EVENT);
+
+        return async_ev_mask;
+}
+
 static void eq_set_ci(struct mlx4_eq *eq, int req_not)
 {
         __raw_writel((__force u32) cpu_to_be32((eq->cons_index & 0xffffff) |
@@ -473,6 +482,11 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
 
                         break;
 
+                case MLX4_EVENT_TYPE_PORT_MNG_CHG_EVENT:
+                        mlx4_dispatch_event(dev, MLX4_DEV_EVENT_PORT_MGMT_CHANGE,
+                                            (unsigned long) eqe);
+                        break;
+
                 case MLX4_EVENT_TYPE_EEC_CATAS_ERROR:
                 case MLX4_EVENT_TYPE_ECC_DETECT:
                 default:
@@ -956,7 +970,7 @@ int mlx4_init_eq_table(struct mlx4_dev *dev)
                 priv->eq_table.have_irq = 1;
         }
 
-        err = mlx4_MAP_EQ(dev, MLX4_ASYNC_EVENT_MASK, 0,
+        err = mlx4_MAP_EQ(dev, get_async_ev_mask(dev), 0,
                           priv->eq_table.eq[dev->caps.num_comp_vectors].eqn);
         if (err)
                 mlx4_warn(dev, "MAP_EQ for async EQ %d failed (%d)\n",
@@ -996,7 +1010,7 @@ void mlx4_cleanup_eq_table(struct mlx4_dev *dev)
         struct mlx4_priv *priv = mlx4_priv(dev);
         int i;
 
-        mlx4_MAP_EQ(dev, MLX4_ASYNC_EVENT_MASK, 1,
+        mlx4_MAP_EQ(dev, get_async_ev_mask(dev), 1,
                     priv->eq_table.eq[dev->caps.num_comp_vectors].eqn);
 
         mlx4_free_irqs(dev);
@@ -1040,7 +1054,7 @@ int mlx4_test_interrupts(struct mlx4_dev *dev)
                 mlx4_cmd_use_polling(dev);
 
                 /* Map the new eq to handle all asyncronous events */
-                err = mlx4_MAP_EQ(dev, MLX4_ASYNC_EVENT_MASK, 0,
+                err = mlx4_MAP_EQ(dev, get_async_ev_mask(dev), 0,
                                   priv->eq_table.eq[i].eqn);
                 if (err) {
                         mlx4_warn(dev, "Failed mapping eq for interrupt test\n");
@@ -1054,7 +1068,7 @@ int mlx4_test_interrupts(struct mlx4_dev *dev)
         }
 
         /* Return to default */
-        mlx4_MAP_EQ(dev, MLX4_ASYNC_EVENT_MASK, 0,
+        mlx4_MAP_EQ(dev, get_async_ev_mask(dev), 0,
                     priv->eq_table.eq[dev->caps.num_comp_vectors].eqn);
         return err;
 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index 4281ce09add8..ee9d6b0b4d20 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -109,6 +109,7 @@ static void dump_dev_cap_flags(struct mlx4_dev *dev, u64 flags)
                 [41] = "Unicast VEP steering support",
                 [42] = "Multicast VEP steering support",
                 [48] = "Counters support",
+                [59] = "Port management change event support",
         };
         int i;
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/intf.c b/drivers/net/ethernet/mellanox/mlx4/intf.c
index b4e9f6f5cc04..116895ac8b35 100644
--- a/drivers/net/ethernet/mellanox/mlx4/intf.c
+++ b/drivers/net/ethernet/mellanox/mlx4/intf.c
@@ -115,7 +115,8 @@ void mlx4_unregister_interface(struct mlx4_interface *intf)
 }
 EXPORT_SYMBOL_GPL(mlx4_unregister_interface);
 
-void mlx4_dispatch_event(struct mlx4_dev *dev, enum mlx4_dev_event type, int port)
+void mlx4_dispatch_event(struct mlx4_dev *dev, enum mlx4_dev_event type,
+                         unsigned long param)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct mlx4_device_context *dev_ctx;
@@ -125,7 +126,7 @@ void mlx4_dispatch_event(struct mlx4_dev *dev, enum mlx4_dev_event type, int por
 
         list_for_each_entry(dev_ctx, &priv->ctx_list, list)
                 if (dev_ctx->intf->event)
-                        dev_ctx->intf->event(dev, dev_ctx->context, type, port);
+                        dev_ctx->intf->event(dev, dev_ctx->context, type, param);
 
         spin_unlock_irqrestore(&priv->ctx_lock, flags);
 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
index e5d20220762c..4d11d12b9db4 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@ -338,66 +338,6 @@ struct mlx4_srq_context {
         __be64                  db_rec_addr;
 };
 
-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 {
-                        u8      port;
-                } __packed sw_event;
-                struct {
-                        __be32  slave_id;
-                } __packed flr_event;
-                struct {
-                        __be16  current_temperature;
-                        __be16  warning_threshold;
-                } __packed warming;
-        }                       event;
-        u8                      slave_id;
-        u8                      reserved3[2];
-        u8                      owner;
-} __packed;
-
 struct mlx4_eq {
         struct mlx4_dev        *dev;
         void __iomem           *doorbell;
@@ -887,7 +827,8 @@ void mlx4_catas_init(void);
 int mlx4_restart_one(struct pci_dev *pdev);
 int mlx4_register_device(struct mlx4_dev *dev);
 void mlx4_unregister_device(struct mlx4_dev *dev);
-void mlx4_dispatch_event(struct mlx4_dev *dev, enum mlx4_dev_event type, int port);
+void mlx4_dispatch_event(struct mlx4_dev *dev, enum mlx4_dev_event type,
+                         unsigned long param);
 
 struct mlx4_dev_cap;
 struct mlx4_init_hca_param;