linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the net-next tree with the infiniband tree
@ 2013-04-18  3:18 Stephen Rothwell
       [not found] ` <20130418131843.bfeb6b1ad5fba1b0f706076e-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
  0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2013-04-18  3:18 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Thadeu Lima de Souza Cascardo,
	Roland Dreier, linux-rdma, Vipul Pandya

[-- Attachment #1: Type: text/plain, Size: 561 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/infiniband/hw/cxgb4/qp.c between commit 5b0c275926b8
("RDMA/cxgb4: Fix SQ allocation when on-chip SQ is disabled") from the
infiniband tree and commit 9919d5bd01b9 ("RDMA/cxgb4: Fix onchip queue
support for T5") from the net-next tree.

I think that they are 2 different fixes for the same problem, so I just
used the net-next version and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread
* linux-next: manual merge of the net-next tree with the infiniband tree
@ 2012-11-27  0:47 Stephen Rothwell
  2012-11-27  6:43 ` Or Gerlitz
  0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2012-11-27  0:47 UTC (permalink / raw)
  To: David Miller, netdev-u79uwXL29TY76Z2rM5mHXA
  Cc: linux-next-u79uwXL29TY76Z2rM5mHXA,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA, Or Gerlitz, Roland Dreier,
	linux-rdma-u79uwXL29TY76Z2rM5mHXA, Ben Hutchings

[-- Attachment #1: Type: text/plain, Size: 1077 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/mellanox/mlx4/en_rx.c between commit 08ff32352d6f
("mlx4: 64-byte CQE/EQE support") from the infiniband tree and commit
f1d29a3fa68b ("mlx4_en: Remove remnants of LRO support") from the
net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org

diff --cc drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 6fa106f,f76c967..0000000
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@@ -710,12 -709,9 +710,9 @@@ next
  
  		++cq->mcq.cons_index;
  		index = (cq->mcq.cons_index) & ring->size_mask;
 -		cqe = &cq->buf[index];
 +		cqe = &cq->buf[(index << factor) + factor];
- 		if (++polled == budget) {
- 			/* We are here because we reached the NAPI budget -
- 			 * flush only pending LRO sessions */
+ 		if (++polled == budget)
  			goto out;
- 		}
  	}
  
  out:

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread
* linux-next: manual merge of the net-next tree with the infiniband tree
@ 2012-07-12  2:13 Stephen Rothwell
  2012-07-12 12:57 ` Hadar Hen Zion
  2012-07-16  8:34 ` Jack Morgenstein
  0 siblings, 2 replies; 12+ messages in thread
From: Stephen Rothwell @ 2012-07-12  2:13 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Hadar Hen Zion, Or Gerlitz,
	Jack Morgenstein, Roland Dreier, linux-rdma

[-- Attachment #1: Type: text/plain, Size: 3011 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
include/linux/mlx4/device.h between commit 396f2feb05d7 ("mlx4_core:
Implement mechanism for reserved Q_Keys") from the infiniband tree and
commit 0ff1fb654bec ("{NET, IB}/mlx4: Add device managed flow steering
firmware API") from the net-next tree.

Just context changes.  I fixed it up (see below) and can carry the fix
as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/mlx4/device.h
index 441caf1,6f0d133..0000000
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@@ -540,83 -542,10 +573,85 @@@ struct mlx4_dev 
  	u8			rev_id;
  	char			board_id[MLX4_BOARD_ID_LEN];
  	int			num_vfs;
+ 	u64			regid_promisc_array[MLX4_MAX_PORTS + 1];
+ 	u64			regid_allmulti_array[MLX4_MAX_PORTS + 1];
  };
  
 +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 {
 +			__be32	slave_id;
 +		} __packed flr_event;
 +		struct {
 +			__be16  current_temperature;
 +			__be16  warning_threshold;
 +		} __packed warming;
 +		struct {
 +			u8 reserved[3];
 +			u8 port;
 +			union {
 +				struct {
 +					__be16 mstr_sm_lid;
 +					__be16 port_lid;
 +					__be32 changed_attr;
 +					u8 reserved[3];
 +					u8 mstr_sm_sl;
 +					__be64 gid_prefix;
 +				} __packed port_info;
 +				struct {
 +					__be32 block_ptr;
 +					__be32 tbl_entries_mask;
 +				} __packed tbl_change_info;
 +			} params;
 +		} __packed port_mgmt_change;
 +	}			event;
 +	u8			slave_id;
 +	u8			reserved3[2];
 +	u8			owner;
 +} __packed;
 +
  struct mlx4_init_port_param {
  	int			set_guid0;
  	int			set_node_guid;
@@@ -783,6 -793,8 +908,10 @@@ int mlx4_wol_write(struct mlx4_dev *dev
  int mlx4_counter_alloc(struct mlx4_dev *dev, u32 *idx);
  void mlx4_counter_free(struct mlx4_dev *dev, u32 idx);
  
 +int mlx4_get_parav_qkey(struct mlx4_dev *dev, u32 qpn, u32 *qkey);
 +
+ int mlx4_flow_attach(struct mlx4_dev *dev,
+ 		     struct mlx4_net_trans_rule *rule, u64 *reg_id);
+ int mlx4_flow_detach(struct mlx4_dev *dev, u64 reg_id);
+ 
  #endif /* MLX4_DEVICE_H */

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread
* linux-next: manual merge of the net-next tree with the infiniband tree
@ 2012-07-12  2:09 Stephen Rothwell
  2012-07-12 12:59 ` Hadar Hen Zion
  2012-07-16  8:33 ` Jack Morgenstein
  0 siblings, 2 replies; 12+ messages in thread
From: Stephen Rothwell @ 2012-07-12  2:09 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Jack Morgenstein, Roland Dreier,
	linux-rdma, Hadar Hen Zion, Or Gerlitz

[-- Attachment #1: Type: text/plain, Size: 1561 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/mellanox/mlx4/main.c between commit 6634961c14d3
("mlx4: Put physical GID and P_Key table sizes in mlx4_phys_caps struct
and paravirtualize them") from the infiniband tree and commit
0ff1fb654bec ("{NET, IB}/mlx4: Add device managed flow steering firmware
API") from the net-next tree.

Just context changes (I think).  I have fixed it up (see below) and can
carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/ethernet/mellanox/mlx4/main.c
index 5df3ac4,4264516..0000000
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@@ -1232,10 -1231,26 +1258,29 @@@ static int mlx4_init_hca(struct mlx4_de
  			goto err_stop_fw;
  		}
  
 +		if (mlx4_is_master(dev))
 +			mlx4_parav_master_pf_caps(dev);
 +
+ 		priv->fs_hash_mode = MLX4_FS_L2_HASH;
+ 
+ 		switch (priv->fs_hash_mode) {
+ 		case MLX4_FS_L2_HASH:
+ 			init_hca.fs_hash_enable_bits = 0;
+ 			break;
+ 
+ 		case MLX4_FS_L2_L3_L4_HASH:
+ 			/* Enable flow steering with
+ 			 * udp unicast and tcp unicast
+ 			 */
+ 			init_hca.fs_hash_enable_bits =
+ 				MLX4_FS_UDP_UC_EN | MLX4_FS_TCP_UC_EN;
+ 			break;
+ 		}
+ 
  		profile = default_profile;
+ 		if (dev->caps.steering_mode ==
+ 		    MLX4_STEERING_MODE_DEVICE_MANAGED)
+ 			profile.num_mcg = MLX4_FS_NUM_MCG;
  
  		icm_size = mlx4_make_profile(dev, &profile, &dev_cap,
  					     &init_hca);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread
* linux-next: manual merge of the net-next tree with the infiniband tree
@ 2012-04-24  2:06 Stephen Rothwell
  0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2012-04-24  2:06 UTC (permalink / raw)
  To: David Miller, netdev-u79uwXL29TY76Z2rM5mHXA
  Cc: linux-next-u79uwXL29TY76Z2rM5mHXA,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA, Roland Dreier,
	linux-rdma-u79uwXL29TY76Z2rM5mHXA, Parav Pandit, Ajit Khaparde

[-- Attachment #1: Type: text/plain, Size: 1974 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/emulex/benet/be.h between commit c72adfd767af
("be2net: Add functionality to support RoCE driver") from the infiniband
tree and commit 42f11cf20cc5 ("be2net: fix ethtool get settings") from
the net-next tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org

diff --cc drivers/net/ethernet/emulex/benet/be.h
index 7bb2e97,ad69cf8..0000000
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@@ -379,22 -394,7 +396,18 @@@ struct be_adapter 
  	u32 rx_fc;		/* Rx flow control */
  	u32 tx_fc;		/* Tx flow control */
  	bool stats_cmd_sent;
- 	int link_speed;
- 	u8 port_type;
- 	u8 transceiver;
- 	u8 autoneg;
  	u8 generation;		/* BladeEngine ASIC generation */
 +	u32 if_type;
 +	struct {
 +		u8 __iomem *base;	/* Door Bell */
 +		u32 size;
 +		u32 total_size;
 +		u64 io_addr;
 +	} roce_db;
 +	u32 num_msix_roce_vec;
 +	struct ocrdma_dev *ocrdma_dev;
 +	struct list_head entry;
 +
  	u32 flash_status;
  	struct completion flash_compl;
  
@@@ -606,17 -597,5 +620,18 @@@ extern void be_link_status_update(struc
  extern void be_parse_stats(struct be_adapter *adapter);
  extern int be_load_fw(struct be_adapter *adapter, u8 *func);
  extern bool be_is_wol_supported(struct be_adapter *adapter);
+ extern bool be_pause_supported(struct be_adapter *adapter);
 +
 +/*
 + * internal function to initialize-cleanup roce device.
 + */
 +extern void be_roce_dev_add(struct be_adapter *);
 +extern void be_roce_dev_remove(struct be_adapter *);
 +
 +/*
 + * internal function to open-close roce device during ifup-ifdown.
 + */
 +extern void be_roce_dev_open(struct be_adapter *);
 +extern void be_roce_dev_close(struct be_adapter *);
 +
  #endif				/* BE_H */

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2013-04-26  3:50 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-18  3:18 linux-next: manual merge of the net-next tree with the infiniband tree Stephen Rothwell
     [not found] ` <20130418131843.bfeb6b1ad5fba1b0f706076e-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2013-04-24 17:53   ` Thadeu Lima de Souza Cascardo
     [not found]     ` <20130424175304.GA701-kqNz3JI7O+u3AZEqMmYM8VaTQe2KTcn/@public.gmane.org>
2013-04-26  3:50       ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2012-11-27  0:47 Stephen Rothwell
2012-11-27  6:43 ` Or Gerlitz
2012-07-12  2:13 Stephen Rothwell
2012-07-12 12:57 ` Hadar Hen Zion
2012-07-16  8:34 ` Jack Morgenstein
2012-07-12  2:09 Stephen Rothwell
2012-07-12 12:59 ` Hadar Hen Zion
2012-07-16  8:33 ` Jack Morgenstein
2012-04-24  2:06 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).