please pull infiniband.git
Linus, please pull from
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree is also available from kernel.org mirrors at:
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This will get a new PCI ID for the mlx4 driver, which also requires handling one new firmware status code. The chance of regressions should be near-nil, since existing devices won't hit any of the new code (and the worst case seems to be printing an incorrect error message anyway).
Yevgeny Petrilin (2):
mlx4_core: Handle multi-physical function devices
mlx4_core: Add new ConnectX EN PCI ID 0x6764
drivers/net/mlx4/cmd.c | 5 ++++- drivers/net/mlx4/main.c | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/net/mlx4/cmd.c +4 -1
@@ -80,7 +80,9 @@ enum {/* Bad management packet (silently discarded): */ CMD_STAT_BAD_PKT =0x30 ,/* More outstanding CQEs in CQ than new CQ size: */ -CMD_STAT_BAD_SIZE =0x40 +CMD_STAT_BAD_SIZE =0x40 , +/* Multi Function device support required: */ + CMD_STAT_MULTI_FUNC_REQ = 0x50, }; enum {
@@ -128,6 +130,7 @@ static int mlx4_status_to_errno(u8 status) [CMD_STAT_LAM_NOT_PRE] = -EAGAIN, [CMD_STAT_BAD_PKT] = -EINVAL, [CMD_STAT_BAD_SIZE] = -ENOMEM, + [CMD_STAT_MULTI_FUNC_REQ] = -EACCES, }; if (status >= ARRAY_SIZE(trans_table) ||
drivers/net/mlx4/main.c +5 -1
@@ -729,7 +729,10 @@ static int mlx4_init_hca(struct mlx4_dev *dev) err =mlx4_QUERY_FW (dev);if (err) { -mlx4_err (dev,"QUERY_FW command failed, aborting.\n" ); +if (err == -EACCES ) +mlx4_info (dev,"non-primary physical function, skipping.\n" ); +else +mlx4_err (dev,"QUERY_FW command failed, aborting.\n" );return err; }
@@ -1285,6 +1288,7 @@ static struct pci_device_id mlx4_pci_table[] = { { PCI_VDEVICE(MELLANOX, 0x6750) }, /* MT25408 "Hermon" EN 10GigE PCIe gen2 */ { PCI_VDEVICE(MELLANOX, 0x6372) }, /* MT25458 ConnectX EN 10GBASE-T 10GigE */ { PCI_VDEVICE(MELLANOX, 0x675a) }, /* MT25458 ConnectX EN 10GBASE-T+Gen2 10GigE */ + { PCI_VDEVICE(MELLANOX, 0x6764) }, /* MT26468 ConnectX EN 10GigE PCIe gen2*/ { 0, } };