Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mlx4_core: Save/restore default port IB capability mask

Commit 7ff93f8b ("mlx4_core: Multiple port type support") introduced
support for different port types. As part of that support, SET_PORT
is invoked to set the port type during driver startup. However, as a
side-effect, for IB ports the invocation of this command also sets the
port's capability mask to zero (losing the default value set by FW).

To fix this, get the default ib port capabilities (via a MAD_IFC Port
Info query) during driver startup, and save them for use in the
mlx4_SET_PORT command when setting the port-type to Infiniband.

This patch fixes problems with subnet manager (SM) failover such as
<https://bugs.openfabrics.org/show_bug.cgi?id=1183>, which occurred
because the IsTrapSupported bit in the capability mask was zeroed.

Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

authored by

Jack Morgenstein and committed by
Roland Dreier
9a5aa622 4ffaf869

+48 -1
+8
drivers/net/mlx4/main.c
··· 753 753 struct mlx4_priv *priv = mlx4_priv(dev); 754 754 int err; 755 755 int port; 756 + __be32 ib_port_default_caps; 756 757 757 758 err = mlx4_init_uar_table(dev); 758 759 if (err) { ··· 853 852 } 854 853 855 854 for (port = 1; port <= dev->caps.num_ports; port++) { 855 + ib_port_default_caps = 0; 856 + err = mlx4_get_port_ib_caps(dev, port, &ib_port_default_caps); 857 + if (err) 858 + mlx4_warn(dev, "failed to get port %d default " 859 + "ib capabilities (%d). Continuing with " 860 + "caps = 0\n", port, err); 861 + dev->caps.ib_port_def_cap[port] = ib_port_default_caps; 856 862 err = mlx4_SET_PORT(dev, port); 857 863 if (err) { 858 864 mlx4_err(dev, "Failed to set port %d, aborting\n",
+1
drivers/net/mlx4/mlx4.h
··· 385 385 void mlx4_init_vlan_table(struct mlx4_dev *dev, struct mlx4_vlan_table *table); 386 386 387 387 int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port); 388 + int mlx4_get_port_ib_caps(struct mlx4_dev *dev, u8 port, __be32 *caps); 388 389 389 390 #endif /* MLX4_H */
+38 -1
drivers/net/mlx4/port.c
··· 258 258 } 259 259 EXPORT_SYMBOL_GPL(mlx4_unregister_vlan); 260 260 261 + int mlx4_get_port_ib_caps(struct mlx4_dev *dev, u8 port, __be32 *caps) 262 + { 263 + struct mlx4_cmd_mailbox *inmailbox, *outmailbox; 264 + u8 *inbuf, *outbuf; 265 + int err; 266 + 267 + inmailbox = mlx4_alloc_cmd_mailbox(dev); 268 + if (IS_ERR(inmailbox)) 269 + return PTR_ERR(inmailbox); 270 + 271 + outmailbox = mlx4_alloc_cmd_mailbox(dev); 272 + if (IS_ERR(outmailbox)) { 273 + mlx4_free_cmd_mailbox(dev, inmailbox); 274 + return PTR_ERR(outmailbox); 275 + } 276 + 277 + inbuf = inmailbox->buf; 278 + outbuf = outmailbox->buf; 279 + memset(inbuf, 0, 256); 280 + memset(outbuf, 0, 256); 281 + inbuf[0] = 1; 282 + inbuf[1] = 1; 283 + inbuf[2] = 1; 284 + inbuf[3] = 1; 285 + *(__be16 *) (&inbuf[16]) = cpu_to_be16(0x0015); 286 + *(__be32 *) (&inbuf[20]) = cpu_to_be32(port); 287 + 288 + err = mlx4_cmd_box(dev, inmailbox->dma, outmailbox->dma, port, 3, 289 + MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C); 290 + if (!err) 291 + *caps = *(__be32 *) (outbuf + 84); 292 + mlx4_free_cmd_mailbox(dev, inmailbox); 293 + mlx4_free_cmd_mailbox(dev, outmailbox); 294 + return err; 295 + } 296 + 261 297 int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port) 262 298 { 263 299 struct mlx4_cmd_mailbox *mailbox; ··· 309 273 ((u8 *) mailbox->buf)[3] = 6; 310 274 ((__be16 *) mailbox->buf)[4] = cpu_to_be16(1 << 15); 311 275 ((__be16 *) mailbox->buf)[6] = cpu_to_be16(1 << 15); 312 - } 276 + } else 277 + ((__be32 *) mailbox->buf)[1] = dev->caps.ib_port_def_cap[port]; 313 278 err = mlx4_cmd(dev, mailbox->dma, port, is_eth, MLX4_CMD_SET_PORT, 314 279 MLX4_CMD_TIME_CLASS_B); 315 280
+1
include/linux/mlx4/device.h
··· 179 179 int num_ports; 180 180 int vl_cap[MLX4_MAX_PORTS + 1]; 181 181 int ib_mtu_cap[MLX4_MAX_PORTS + 1]; 182 + __be32 ib_port_def_cap[MLX4_MAX_PORTS + 1]; 182 183 u64 def_mac[MLX4_MAX_PORTS + 1]; 183 184 int eth_mtu_cap[MLX4_MAX_PORTS + 1]; 184 185 int gid_table_len[MLX4_MAX_PORTS + 1];