Commit d878fe23 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  mlx4_core: Add new ConnectX EN PCI ID 0x6764
  mlx4_core: Handle multi-physical function devices
parents 62f49052 92bd3bbf

drivers/net/mlx4/cmd.c

+4 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -729,6 +729,9 @@ static int mlx4_init_hca(struct mlx4_dev *dev) 


	err = mlx4_QUERY_FW(dev);

	if (err) {

		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, }

};