1 files changed, 102 insertions, 30 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index 1d70657058a5..c69648487321 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;
 
@@ -174,6 +175,7 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave,
 #define QUERY_FUNC_CAP_FLAGS_OFFSET             0x0
 #define QUERY_FUNC_CAP_NUM_PORTS_OFFSET         0x1
 #define QUERY_FUNC_CAP_PF_BHVR_OFFSET           0x4
+#define QUERY_FUNC_CAP_FMR_OFFSET               0x8
 #define QUERY_FUNC_CAP_QP_QUOTA_OFFSET          0x10
 #define QUERY_FUNC_CAP_CQ_QUOTA_OFFSET          0x14
 #define QUERY_FUNC_CAP_SRQ_QUOTA_OFFSET         0x18
@@ -183,25 +185,44 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave,
 #define QUERY_FUNC_CAP_MAX_EQ_OFFSET            0x2c
 #define QUERY_FUNC_CAP_RESERVED_EQ_OFFSET       0X30
 
+#define QUERY_FUNC_CAP_FMR_FLAG                 0x80
+#define QUERY_FUNC_CAP_FLAG_RDMA                0x40
+#define QUERY_FUNC_CAP_FLAG_ETH                 0x80
+
+/* when opcode modifier = 1 */
 #define QUERY_FUNC_CAP_PHYS_PORT_OFFSET         0x3
+#define QUERY_FUNC_CAP_RDMA_PROPS_OFFSET        0x8
 #define QUERY_FUNC_CAP_ETH_PROPS_OFFSET         0xc
 
+#define QUERY_FUNC_CAP_ETH_PROPS_FORCE_MAC      0x40
+#define QUERY_FUNC_CAP_ETH_PROPS_FORCE_VLAN     0x80
+
+#define QUERY_FUNC_CAP_RDMA_PROPS_FORCE_PHY_WQE_GID 0x80
+
         if (vhcr->op_modifier == 1) {
                 field = vhcr->in_modifier;
                 MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_PHYS_PORT_OFFSET);
 
-                field = 0; /* ensure fvl bit is not set */
+                field = 0;
+                /* ensure force vlan and force mac bits are not set */
                 MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_ETH_PROPS_OFFSET);
+                /* ensure that phy_wqe_gid bit is not set */
+                MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_RDMA_PROPS_OFFSET);
+
         } else if (vhcr->op_modifier == 0) {
-                field = 1 << 7; /* enable only ethernet interface */
+                /* enable rdma and ethernet interfaces */
+                field = (QUERY_FUNC_CAP_FLAG_ETH | QUERY_FUNC_CAP_FLAG_RDMA);
                 MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_FLAGS_OFFSET);
 
                 field = dev->caps.num_ports;
                 MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_NUM_PORTS_OFFSET);
 
-                size = 0; /* no PF behavious is set for now */
+                size = 0; /* no PF behaviour is set for now */
                 MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_PF_BHVR_OFFSET);
 
+                field = 0; /* protected FMR support not available as yet */
+                MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_FMR_OFFSET);
+
                 size = dev->caps.num_qps;
                 MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_QP_QUOTA_OFFSET);
 
@@ -254,11 +275,12 @@ int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, struct mlx4_func_cap *func_cap)
         outbox = mailbox->buf;
 
         MLX4_GET(field, outbox, QUERY_FUNC_CAP_FLAGS_OFFSET);
-        if (!(field & (1 << 7))) {
-                mlx4_err(dev, "The host doesn't support eth interface\n");
+        if (!(field & (QUERY_FUNC_CAP_FLAG_ETH | QUERY_FUNC_CAP_FLAG_RDMA))) {
+                mlx4_err(dev, "The host supports neither eth nor rdma interfaces\n");
                 err = -EPROTONOSUPPORT;
                 goto out;
         }
+        func_cap->flags = field;
 
         MLX4_GET(field, outbox, QUERY_FUNC_CAP_NUM_PORTS_OFFSET);
         func_cap->num_ports = field;
@@ -297,17 +319,27 @@ int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, struct mlx4_func_cap *func_cap)
                 if (err)
                         goto out;
 
-                MLX4_GET(field, outbox, QUERY_FUNC_CAP_ETH_PROPS_OFFSET);
-                if (field & (1 << 7)) {
-                        mlx4_err(dev, "VLAN is enforced on this port\n");
-                        err = -EPROTONOSUPPORT;
-                        goto out;
-                }
+                if (dev->caps.port_type[i] == MLX4_PORT_TYPE_ETH) {
+                        MLX4_GET(field, outbox, QUERY_FUNC_CAP_ETH_PROPS_OFFSET);
+                        if (field & QUERY_FUNC_CAP_ETH_PROPS_FORCE_VLAN) {
+                                mlx4_err(dev, "VLAN is enforced on this port\n");
+                                err = -EPROTONOSUPPORT;
+                                goto out;
+                        }
 
-                if (field & (1 << 6)) {
-                        mlx4_err(dev, "Force mac is enabled on this port\n");
-                        err = -EPROTONOSUPPORT;
-                        goto out;
+                        if (field & QUERY_FUNC_CAP_ETH_PROPS_FORCE_MAC) {
+                                mlx4_err(dev, "Force mac is enabled on this port\n");
+                                err = -EPROTONOSUPPORT;
+                                goto out;
+                        }
+                } else if (dev->caps.port_type[i] == MLX4_PORT_TYPE_IB) {
+                        MLX4_GET(field, outbox, QUERY_FUNC_CAP_RDMA_PROPS_OFFSET);
+                        if (field & QUERY_FUNC_CAP_RDMA_PROPS_FORCE_PHY_WQE_GID) {
+                                mlx4_err(dev, "phy_wqe_gid is "
+                                         "enforced on this ib port\n");
+                                err = -EPROTONOSUPPORT;
+                                goto out;
+                        }
                 }
 
                 MLX4_GET(field, outbox, QUERY_FUNC_CAP_PHYS_PORT_OFFSET);
@@ -707,14 +739,12 @@ int mlx4_QUERY_PORT_wrapper(struct mlx4_dev *dev, int slave,
 {
         u64 def_mac;
         u8 port_type;
+        u16 short_field;
         int err;
 
-#define MLX4_PORT_SUPPORT_IB            (1 << 0)
-#define MLX4_PORT_SUGGEST_TYPE          (1 << 3)
-#define MLX4_PORT_DEFAULT_SENSE         (1 << 4)
-#define MLX4_VF_PORT_ETH_ONLY_MASK      (0xff & ~MLX4_PORT_SUPPORT_IB & \
-                                         ~MLX4_PORT_SUGGEST_TYPE & \
-                                         ~MLX4_PORT_DEFAULT_SENSE)
+#define MLX4_VF_PORT_NO_LINK_SENSE_MASK 0xE0
+#define QUERY_PORT_CUR_MAX_PKEY_OFFSET  0x0c
+#define QUERY_PORT_CUR_MAX_GID_OFFSET   0x0e
 
         err = mlx4_cmd_box(dev, 0, outbox->dma, vhcr->in_modifier, 0,
                            MLX4_CMD_QUERY_PORT, MLX4_CMD_TIME_CLASS_B,
@@ -730,20 +760,58 @@ int mlx4_QUERY_PORT_wrapper(struct mlx4_dev *dev, int slave,
                 MLX4_GET(port_type, outbox->buf,
                          QUERY_PORT_SUPPORTED_TYPE_OFFSET);
 
-                /* Allow only Eth port, no link sensing allowed */
-                port_type &= MLX4_VF_PORT_ETH_ONLY_MASK;
-
-                /* check eth is enabled for this port */
-                if (!(port_type & 2))
-                        mlx4_dbg(dev, "QUERY PORT: eth not supported by host");
+                /* No link sensing allowed */
+                port_type &= MLX4_VF_PORT_NO_LINK_SENSE_MASK;
+                /* set port type to currently operating port type */
+                port_type |= (dev->caps.port_type[vhcr->in_modifier] & 0x3);
 
                 MLX4_PUT(outbox->buf, port_type,
                          QUERY_PORT_SUPPORTED_TYPE_OFFSET);
+
+                short_field = 1; /* slave max gids */
+                MLX4_PUT(outbox->buf, short_field,
+                         QUERY_PORT_CUR_MAX_GID_OFFSET);
+
+                short_field = dev->caps.pkey_table_len[vhcr->in_modifier];
+                MLX4_PUT(outbox->buf, short_field,
+                         QUERY_PORT_CUR_MAX_PKEY_OFFSET);
         }
 
         return err;
 }
 
+int mlx4_get_slave_pkey_gid_tbl_len(struct mlx4_dev *dev, u8 port,
+                                    int *gid_tbl_len, int *pkey_tbl_len)
+{
+        struct mlx4_cmd_mailbox *mailbox;
+        u32                     *outbox;
+        u16                     field;
+        int                     err;
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+
+        err =  mlx4_cmd_box(dev, 0, mailbox->dma, port, 0,
+                            MLX4_CMD_QUERY_PORT, MLX4_CMD_TIME_CLASS_B,
+                            MLX4_CMD_WRAPPED);
+        if (err)
+                goto out;
+
+        outbox = mailbox->buf;
+
+        MLX4_GET(field, outbox, QUERY_PORT_CUR_MAX_GID_OFFSET);
+        *gid_tbl_len = field;
+
+        MLX4_GET(field, outbox, QUERY_PORT_CUR_MAX_PKEY_OFFSET);
+        *pkey_tbl_len = field;
+
+out:
+        mlx4_free_cmd_mailbox(dev, mailbox);
+        return err;
+}
+EXPORT_SYMBOL(mlx4_get_slave_pkey_gid_tbl_len);
+
 int mlx4_map_cmd(struct mlx4_dev *dev, u16 op, struct mlx4_icm *icm, u64 virt)
 {
         struct mlx4_cmd_mailbox *mailbox;
@@ -890,11 +958,12 @@ int mlx4_QUERY_FW(struct mlx4_dev *dev)
                 ((fw_ver & 0xffff0000ull) >> 16) |
                 ((fw_ver & 0x0000ffffull) << 16);
 
+        MLX4_GET(lg, outbox, QUERY_FW_PPF_ID);
+        dev->caps.function = lg;
+
         if (mlx4_is_slave(dev))
                 goto out;
 
-        MLX4_GET(lg, outbox, QUERY_FW_PPF_ID);
-        dev->caps.function = lg;
 
         MLX4_GET(cmd_if_rev, outbox, QUERY_FW_CMD_IF_REV_OFFSET);
         if (cmd_if_rev < MLX4_COMMAND_INTERFACE_MIN_REV ||
@@ -975,9 +1044,12 @@ int mlx4_QUERY_FW_wrapper(struct mlx4_dev *dev, int slave,
         if (err)
                 return err;
 
-        /* for slaves, zero out everything except FW version */
+        /* for slaves, set pci PPF ID to invalid and zero out everything
+         * else except FW version */
         outbuf[0] = outbuf[1] = 0;
         memset(&outbuf[8], 0, QUERY_FW_OUT_SIZE - 8);
+        outbuf[QUERY_FW_PPF_ID] = MLX4_INVALID_SLAVE_ID;
+
         return 0;
 }