[PATCH RFC 01/10] mlx4_en: Include file

[PATCH RFC 01/10] mlx4_en: Include file

[Yevgeny Petrilin]

[PATCH] mlx4_en: mlx4_en.h header file.

This file includes device structures definitions, function
declarations and constants values.
All the files that belong to the driver must include this header.

Signed-off-by: Liran Liss <liranl@mellanox.co.il>
Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
---
 drivers/net/mlx4/mlx4_en.h |  645 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 645 insertions(+), 0 deletions(-)
 create mode 100644 drivers/net/mlx4/mlx4_en.h

diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/mlx4/mlx4_en.h
new file mode 100644
index 0000000..6c3f87f
--- /dev/null
+++ b/drivers/net/mlx4/mlx4_en.h
@@ -0,0 +1,645 @@
+/*
+ * Copyright (c) 2007 Mellanox Technologies. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef _MLX4_EN_H_
+#define _MLX4_EN_H_
+
+#include <linux/compiler.h>
+#include <linux/list.h>
+#include <linux/mutex.h>
+#include <linux/netdevice.h>
+#include <linux/inet_lro.h>
+
+#include <linux/mlx4/device.h>
+#include <linux/mlx4/qp.h>
+#include <linux/mlx4/srq.h>
+#include <linux/mlx4/doorbell.h>
+
+#include "en_port.h"
+
+#define DRV_NAME	"mlx4_en"
+#define DRV_VERSION	"1.0"
+#define DRV_RELDATE	"July 2008"
+
+
+#ifdef CONFIG_MLX4_EN_DEBUG
+#define mlx4_dbg(mdev, format, arg...)	\
+	printk(KERN_DEBUG "%s %s: " format , DRV_NAME ,\
+		(&mdev->pdev->dev)->bus_id , ## arg)
+#else /* CONFIG_MLX4_DEBUG */
+#define mlx4_dbg(mdev, format, arg...) do { (void) mdev; } while (0)
+#endif /* CONFIG_MLX4_DEBUG */
+
+#define mlx4_err(mdev, format, arg...) \
+	printk(KERN_ERR "%s %s: " format , DRV_NAME ,\
+		(&mdev->pdev->dev)->bus_id , ## arg)
+#define mlx4_info(mdev, format, arg...) \
+	printk(KERN_INFO "%s %s: " format , DRV_NAME ,\
+		(&mdev->pdev->dev)->bus_id , ## arg)
+#define mlx4_warn(mdev, format, arg...) \
+	printk(KERN_WARNING "%s %s: " format , DRV_NAME ,\
+		(&mdev->pdev->dev)->bus_id , ## arg)
+
+/*
+ * Device constants
+ */
+
+enum {
+	MLX4_EN_FLAG_MSI_X      = 1 << 1,
+	MLX4_EN_FLAG_HIGH_DMA   = 1 << 2,
+	MLX4_EN_FLAG_FW_RUNNING = 1 << 3
+};
+
+#define MLX4_EN_PAGE_SHIFT	12
+#define MLX4_EN_PAGE_SIZE	(1 << MLX4_EN_PAGE_SHIFT)
+#define MAX_TX_RINGS		16
+#define MIN_TX_PRIO_RINGS	9
+#define MAX_RX_RINGS		16
+#define MAX_RSS_MAP_SIZE	64
+#define RSS_FACTOR		2
+#define TXBB_SIZE		32
+#define HEADROOM		(2048 / TXBB_SIZE)
+#define MAX_LSO_HDR_SIZE	92
+#define STAMP_STRIDE		16
+#define STAMP_SHIFT		31
+#define STAMP_VAL		0x7fffffff
+#define STATS_DELAY		(HZ / 4)
+
+/* Typical TSO descriptor with 16 gather entries is 352 bytes... */
+#define MAX_DESC_SIZE		512
+#define MAX_DESC_TXBBS		(MAX_DESC_SIZE / TXBB_SIZE)
+
+/*
+ * OS related constants and tunables
+ */
+
+#define MLX4_EN_WATCHDOG_TIMEOUT	(15 * HZ)
+
+#define MLX4_EN_ALLOC_ORDER	2
+#define MLX4_EN_ALLOC_SIZE	(PAGE_SIZE << MLX4_EN_ALLOC_ORDER)
+
+#define MLX4_EN_MAX_LRO_DESCRIPTORS	32
+
+/* Receive fragment sizes; we use at most 4 fragments (for 9600 byte MTU
+ * and 4K allocations) */
+enum {
+	FRAG_SZ0 = 512 - NET_IP_ALIGN,
+	FRAG_SZ1 = 1024,
+	FRAG_SZ2 = 4096,
+	FRAG_SZ3 = MLX4_EN_ALLOC_SIZE
+};
+#define MLX4_EN_MAX_RX_FRAGS	4
+
+/* Minimum ring size for our page-allocation sceme to work */
+#define MLX4_EN_MIN_RX_SIZE	(MLX4_EN_ALLOC_SIZE / SMP_CACHE_BYTES)
+
+#define MLX4_EN_TX_RING_NUM		9
+#define MLX4_EN_DEF_TX_RING_SIZE	4096
+#define MLX4_EN_DEF_RX_RING_SIZE  	4096
+
+/* Target number of bytes to coalesce with interrupt moderation */
+#define MLX4_EN_RX_COAL_TARGET	0x20000
+#define MLX4_EN_TX_COAL_TARGET	0x80000
+#define MLX4_EN_RX_COAL_TIME	0x10
+#define MLX4_EN_TX_COAL_TIME	0x40
+
+#define MLX4_EN_RX_RATE_LOW		(64 * 1024)
+#define MLX4_EN_RX_COAL_TIME_LOW	0
+#define MLX4_EN_RX_RATE_HIGH		(128 * 1024)
+#define MLX4_EN_RX_COAL_TIME_HIGH	128
+#define MLX4_EN_RX_SIZE_THRESH		1024
+#define MLX4_EN_RX_RATE_THRESH		(1000000 / MLX4_EN_RX_COAL_TIME_HIGH)
+#define MODER_TARGET_PERCENT		20
+#define MLX4_EN_SAMPLE_INTERVAL		0
+
+#define MLX4_EN_MODER_AUTO_CONF	0xffff
+
+#define MLX4_EN_DEF_INT_DELAY	16
+#define MLX4_EN_DEF_RX_PAUSE	1
+#define MLX4_EN_DEF_TX_PAUSE	1
+
+/* Interval between sucessive polls in the Tx routine when polling is used
+   instead of interrupts (in per-core Tx rings) - should be power of 2 */
+#define MLX4_EN_TX_POLL_MODER	16
+#define MLX4_EN_TX_POLL_TIMEOUT	(HZ / 4)
+
+#define ETH_LLC_SNAP_SIZE	8
+
+#define SMALL_PACKET_SIZE      (256 - NET_IP_ALIGN)
+#define HEADER_COPY_SIZE       (128 - NET_IP_ALIGN)
+
+#define MLX4_EN_MIN_MTU		46
+#define MLX4_EN_MAX_MTU		9600
+#define ETH_BCAST		0xffffffffffff
+
+#ifdef CONFIG_MLX4_EN_PREFETCH
+	#define PREFETCH(x)		prefetch(x)
+#else
+	#define PREFETCH(x)
+#endif
+
+#ifdef CONFIG_MLX4_EN_SW_COUNTERS
+#define DO_SW_COUNTERS			1
+#define SET_SW_COUNTER(cnt, val)	((cnt) = (val))
+#define INC_SW_COUNTER(cnt)		(++(cnt))
+#define ADD_SW_COUNTER(cnt, add)	((cnt) += (add))
+#else
+#define DO_SW_COUNTERS			0
+#define SET_SW_COUNTER(cnt, val)
+#define INC_SW_COUNTER(cnt)
+#define ADD_SW_COUNTER(cnt, add)
+#endif
+
+
+#ifdef CONFIG_MLX4_EN_PERF_STAT
+/* Number of samples to 'average' */
+#define AVG_SIZE			128
+#define AVG_FACTOR			1024
+#define NUM_PERF_STATS			NUM_PERF_COUNTERS
+
+#define INC_PERF_COUNTER(cnt)		(++(cnt))
+#define ADD_PERF_COUNTER(cnt, add)	((cnt) += (add))
+#define AVG_PERF_COUNTER(cnt, sample) \
+	((cnt) = ((cnt) * (AVG_SIZE - 1) + (sample) * AVG_FACTOR) / AVG_SIZE)
+#define GET_PERF_COUNTER(cnt)		(cnt)
+#define GET_AVG_PERF_COUNTER(cnt)	((cnt) / AVG_FACTOR)
+
+#else
+
+#define NUM_PERF_STATS			0
+#define INC_PERF_COUNTER(cnt)
+#define ADD_PERF_COUNTER(cnt, add)
+#define AVG_PERF_COUNTER(cnt, sample)
+#define GET_PERF_COUNTER(cnt)		(0)
+#define GET_AVG_PERF_COUNTER(cnt)	(0)
+#endif /* MLX4_EN_PERF_STAT */
+
+/*
+ * Configurables
+ */
+
+enum rx_buf_mode {
+	RX_BUF_NORMAL = 0,
+	RX_BUF_HEAD_SEP = 1,
+	RX_BUF_EXACT_HEAD_SEP = 2,
+};
+
+enum cq_type {
+	RX = 0,
+	TX = 1,
+};
+
+
+enum mlx4_en_access_flags {
+	MLX4_EN_ACCESS_LOCAL_WRITE	= 1,
+	MLX4_EN_ACCESS_REMOTE_WRITE	= (1<<1),
+	MLX4_EN_ACCESS_REMOTE_READ	= (1<<2),
+	MLX4_EN_ACCESS_REMOTE_ATOMIC	= (1<<3),
+	MLX4_EN_ACCESS_MW_BIND		= (1<<4)
+};
+
+/*
+ * Useful macros
+ */
+
+#define ROUNDUP_LOG2(x)		ilog2(roundup_pow_of_two(x))
+#define XNOR(x, y)		(!(x) == !(y))
+#define MIN(a, b)		((a) < (b) ? (a) : (b))
+#define MAX(a, b)		((a) > (b) ? (a) : (b))
+
+
+enum mlx4_en_state {
+	DEVICE_DOWN,
+	DEVICE_UP,
+	DEVICE_GOING_DOWN,
+	DEVICE_DISABLED
+};
+
+struct mlx4_en_tx_info {
+	struct sk_buff *skb;
+	u32 nr_txbb;
+	u8 linear;
+	u8 frags;
+	u8 data_offset;
+};
+
+struct mlx4_en_ctrl_seg {
+	__be32 op_own;
+#define MLX4_EN_BIT_DESC_OWN	0x80000000
+#define MLX4_EN_OPCODE_SEND	0xa
+#define MLX4_EN_OPCODE_LSO	0xe
+	__be32 size_vlan;
+#define MLX4_EN_BIT_INS_VLAN	0x4000
+	__be32 flags;
+#define MLX4_EN_BIT_NO_ICRC	0x2
+#define MLX4_EN_BIT_TX_COMP	0xc
+#define MLX4_EN_BIT_TX_IP_CS	0x10
+#define MLX4_EN_BIT_TX_TCP_CS	0x20
+	__be32 reserved;
+};
+#define CTRL_SIZE	sizeof(struct mlx4_en_ctrl_seg)
+
+struct mlx4_en_data_seg {
+	__be32 count;
+#define MLX4_EN_INLINE		0x80000000
+	__be32 mem_type;
+#define MLX4_EN_MEMTYPE_PAD	0x100
+	__be64 addr;
+};
+#define DS_SIZE		sizeof(struct mlx4_en_data_seg)
+
+struct mlx4_en_lso_seg {
+	__be16 mss;
+	__be16 header_size;
+#define LSO_PREFIX_SIZE		4
+	u8 header_data[0]; /* copy of L2/IP/TCP headers */
+#define MLX4_EN_MAX_LSO_HEADER	(MAX_DESC_SIZE - CTRL_SIZE - DS_SIZE)
+};
+
+struct mlx4_en_tx_desc {
+	struct mlx4_en_ctrl_seg ctrl;
+	union {
+		struct mlx4_en_data_seg data; /* at least one data segment */
+		struct mlx4_en_lso_seg lso;
+	};
+};
+
+#define MLX4_EN_USE_SRQ		0x01000000
+
+struct mlx4_en_rx_alloc {
+	struct page *page;
+	u16 offset;
+};
+
+struct mlx4_en_tx_ring {
+	struct mlx4_hwq_resources wqres;
+	u32 size ; /* number of TXBBs */
+	u32 size_mask;
+	u16 stride;
+	u16 cqn;	/* index of port CQ associated with this ring */
+	u32 prod;
+	u32 cons;
+	u32 buf_size;
+	u32 doorbell_qpn;
+	void *buf;
+	u16 poll_cnt;
+	int blocked;
+	struct mlx4_en_tx_info *tx_info;
+	u8 *bounce_buf;
+	u32 last_nr_txbb;
+	struct mlx4_qp qp;
+	struct mlx4_qp_context context;
+	u32 qpn;
+	enum mlx4_qp_state qp_state;
+	struct mlx4_srq dummy;
+	unsigned long bytes;
+	unsigned long packets;
+};
+
+struct mlx4_en_rx_desc {
+	struct mlx4_wqe_srq_next_seg next;
+	/* actual number of entries depends on rx ring stride */
+	struct mlx4_en_data_seg data[0];
+};
+
+struct mlx4_en_rx_ring {
+	struct mlx4_srq srq;
+	struct mlx4_hwq_resources wqres;
+	struct mlx4_en_rx_alloc page_alloc[MLX4_EN_MAX_RX_FRAGS];
+	struct net_lro_mgr lro;
+	u32 size ;	/* number of Rx descs*/
+	u32 size_mask;
+	u16 stride;
+	u16 log_stride;
+	u16 cqn;	/* index of port CQ associated with this ring */
+	u32 prod;
+	u32 cons;
+	u32 buf_size;
+	int need_refill;
+	int full;
+	void *buf;
+	void *rx_info;
+	unsigned long bytes;
+	unsigned long packets;
+};
+
+struct mlx4_en_cqe {
+	u8 vp; /* VLAN present */
+#define MLX4_EN_BIT_VLANN_PRESENT	0x20
+	u8 reserved1[3];
+	__be32 rss_hash;
+	u32 reserved2;
+	__be16 vlan_prio;
+	u16 reserved3;
+	u8 flags_h;
+#define MLX4_EN_BIT_IPOK		0x10
+#define MLX4_EN_BIT_UDP			0x08
+#define MLX4_EN_BIT_TCP			0x04
+#define MLX4_EN_BIT_IPV4_OPT		0x02
+#define MLX4_EN_BIT_IPV6		0x01
+	u8 flags_l_rht;
+#define MLX4_EN_BIT_IPV4F		0x80
+#define MLX4_EN_BIT_IPV4		0x40
+	u8 ipv6_mask;
+	u8 enc_bf;
+#define MLX4_EN_BIT_BAD_FCS		0x10
+#define MLX4_EN_BIT_LLC			0x01
+#define MLX4_EN_BIT_SNAP		0x02
+	__be32 byte_cnt;
+	__be16 index;
+	__be16 chksum;
+	u8 reserved4[3];
+	u8 op_tr_own;
+};
+
+#define TCPIP_MASK_32		0x1fc00003
+#define MLX4_EN_BIT_IPOK_32	(MLX4_EN_BIT_IPOK << 24)
+#define MLX4_EN_BIT_TCP_32	(MLX4_EN_BIT_TCP << 24)
+#define MLX4_EN_BIT_IPV4_32	(MLX4_EN_BIT_IPV4 << 16)
+#define LRO_MASK_32 (MLX4_EN_BIT_IPV4_32 | MLX4_EN_BIT_TCP_32 | MLX4_EN_BIT_IPOK_32)
+
+struct mlx4_en_cq {
+	struct mlx4_cq          mcq;
+	struct mlx4_hwq_resources wqres;
+	int                     ring;
+	spinlock_t              lock;
+	struct net_device      *dev;
+	struct napi_struct	napi;
+	/* Per-core Tx cq processing support */
+	struct timer_list timer;
+	int size;
+	int buf_size;
+	enum cq_type is_tx;
+	u16 moder_time;
+	u16 moder_cnt;
+	struct mlx4_en_cqe *buf;
+#define MLX4_EN_OPCODE_ERROR	0x1e
+};
+
+struct mlx4_en_port_profile {
+	enum rx_buf_mode rx_buf;
+	u32 flags;
+
+	u32 tx_ring_num;
+	u32 rx_ring_num;
+	u32 tx_ring_size;
+	u32 rx_ring_size;
+};
+
+struct mlx4_en_profile {
+	int rss_xor;
+	int num_lro;
+	u8 rss_mask;
+	u32 active_ports;
+	u32 small_pkt_int;
+	int tx_moder_cnt;
+	int tx_moder_time;
+	int rx_moder_cnt;
+	int rx_moder_time;
+	int min_int_delay;
+	int auto_moder;
+	u8 rx_pause;
+	u8 rx_ppp;
+	u8 tx_pause;
+	u8 tx_ppp;
+	u8 no_reset;
+	struct mlx4_en_port_profile prof[MLX4_MAX_PORTS + 1];
+};
+
+struct mlx4_en_dev {
+	struct mlx4_dev         *dev;
+	struct pci_dev		*pdev;
+	struct semaphore        state_sem;
+	struct net_device       *pndev[MLX4_MAX_PORTS + 1];
+	u32		 	ports_map;
+	u32                     port_cnt;
+	enum mlx4_en_state      state;
+	struct mlx4_en_profile  profile;
+	u32                     mlx4_en_flags;
+	unsigned long           device_cap_flags;
+	struct workqueue_struct *workqueue;
+	struct device           *dma_device;
+	void __iomem            *uar_map;
+	struct mlx4_uar         priv_uar;
+	struct mlx4_mr		mr;
+	u32                     priv_pdn;
+	spinlock_t              uar_lock;
+};
+
+enum mlx4_en_port_state {
+	PORT_DOWN,
+	PORT_UP
+};
+
+struct mlx4_en_rss_map {
+	int size;
+	int base_qpn;
+	u16 map[MAX_RSS_MAP_SIZE];
+	struct mlx4_qp qps[MAX_RSS_MAP_SIZE];
+	enum mlx4_qp_state state[MAX_RSS_MAP_SIZE];
+	struct mlx4_qp indir_qp;
+	enum mlx4_qp_state indir_state;
+};
+
+struct mlx4_en_rss_context {
+	__be32 base_qpn;
+	__be32 default_qpn;
+	u16 reserved;
+	u8 hash_fn;
+	u8 flags;
+	__be32 rss_key[10];
+};
+
+struct mlx4_en_port_stats {
+	u32 rst_cnt;
+	u32 lro_session_ovfl;
+	u32 queue_stopped;
+#define NUM_PORT_STATS		3
+};
+
+struct mlx4_en_perf_stats {
+	u32 tx_poll;
+	u64 tso;
+	u64 tx_pktsz_avg;
+	u32 inflight_avg;
+	u16 tx_coal_avg;
+	u16 rx_coal_avg;
+	u64 lro_size_avg;
+	u64 lro_flushes;
+	u64 lro_misses;
+	u32 napi_quota;
+	u32 rx_chksum_none;
+	u32 rx_alloc_failed;
+#define NUM_PERF_COUNTERS	12
+};
+
+struct mlx4_en_frag_info {
+	u16 frag_size;
+	u16 frag_prefix_size;
+	u16 frag_stride;
+	u16 frag_align;
+	u16 last_offset;
+
+};
+
+struct mlx4_en_priv {
+	struct mlx4_en_dev *mdev;
+	struct mlx4_en_port_profile *prof;
+	struct net_device *dev;
+	struct vlan_group *vlgrp;
+	struct net_device_stats stats;
+	spinlock_t stats_lock;
+
+	unsigned long last_moder_packets;
+	unsigned long last_moder_tx_packets;
+	unsigned long last_moder_bytes;
+	unsigned long last_moder_jiffies;
+	int last_moder_time;
+	u16 rx_usecs;
+	u16 rx_frames;
+	u16 tx_usecs;
+	u16 tx_frames;
+	u32 pkt_rate_low;
+	u16 rx_usecs_low;
+	u32 pkt_rate_high;
+	u16 rx_usecs_high;
+	u16 sample_interval;
+	u16 adaptive_rx_coal;
+
+	struct mlx4_hwq_resources res;
+	int link_state;
+	int last_link_state;
+	enum mlx4_en_port_state port_state;
+	int port;
+	int registered;
+	int rx_csum;
+	u64 mac;
+	int mac_index;
+	int max_mtu;
+	int base_qpn;
+
+	enum rx_buf_mode rx_buf;
+	struct mlx4_en_rss_map rss_map;
+	u16 tx_prio_map[8];
+	u32 flags;
+#define MLX4_EN_FLAG_PROMISC	0x1
+	u32 tx_ring_num;
+	u32 rx_ring_num;
+	u32 rx_skb_size;
+	struct mlx4_en_frag_info frag_info[MLX4_EN_MAX_RX_FRAGS];
+	u16 num_frags;
+	u16 log_rx_info;
+
+	struct mlx4_en_tx_ring tx_ring[MAX_TX_RINGS];
+	struct mlx4_en_rx_ring rx_ring[MAX_RX_RINGS];
+	struct mlx4_en_cq tx_cq[MAX_TX_RINGS];
+	struct mlx4_en_cq rx_cq[MAX_RX_RINGS];
+	struct work_struct mcast_task;
+	struct work_struct mac_task;
+	struct delayed_work refill_task;
+	struct work_struct watchdog_task;
+	struct work_struct linkstate_task;
+	struct delayed_work stats_task;
+	struct mlx4_en_perf_stats pstats;
+	struct mlx4_en_port_stats port_stats;
+	struct dev_mc_list *mc_list;
+	struct mlx4_en_stat_out_mbox hw_stats;
+};
+
+
+void mlx4_en_destroy_netdev(struct net_device *dev);
+int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
+			struct mlx4_en_port_profile *prof);
+
+int mlx4_en_get_dma_mr(struct mlx4_en_dev *mdev, int acc);
+
+int mlx4_en_start_port(struct net_device *dev);
+void mlx4_en_stop_port(struct net_device *dev);
+
+int mlx4_en_get_profile(struct mlx4_en_dev *mdev);
+
+int mlx4_en_create_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq,
+		      int entries, int ring, enum cq_type mode);
+void mlx4_en_destroy_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);
+int mlx4_en_set_cq_moder(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);
+int mlx4_en_arm_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);
+
+void mlx4_en_process_tx_cq(struct net_device *dev, struct mlx4_en_cq *cq);
+void mlx4_en_poll_tx_cq(unsigned long data);
+int mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev);
+
+int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, struct mlx4_en_tx_ring *ring,
+			   u32 size, u16 stride);
+void mlx4_en_destroy_tx_ring(struct mlx4_en_priv *priv, struct mlx4_en_tx_ring *ring);
+int mlx4_en_activate_tx_ring(struct mlx4_en_priv *priv,
+			     struct mlx4_en_tx_ring *ring,
+			     int cq, int srqn);
+void mlx4_en_deactivate_tx_ring(struct mlx4_en_priv *priv,
+				struct mlx4_en_tx_ring *ring);
+
+int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv, struct mlx4_en_rx_ring *ring,
+			   u32 size, u16 stride, int cq);
+void mlx4_en_destroy_rx_ring(struct mlx4_en_priv *priv, struct mlx4_en_rx_ring *ring);
+int mlx4_en_process_rx_cq(struct net_device *dev,
+			  struct mlx4_en_cq *cq,
+			  int budget);
+int mlx4_en_poll_rx_cq(struct napi_struct *napi, int budget);
+void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride,
+			     int is_tx, int rss, int qpn, int cqn, int srqn,
+			     struct mlx4_qp_context *context);
+
+void mlx4_en_calc_rx_buf(struct net_device *dev);
+void mlx4_en_set_default_rss_map(struct mlx4_en_dev *mdev,
+				 struct mlx4_en_rss_map *rss_map,
+				 int num_entries, int num_rings);
+void mlx4_en_set_prio_map(struct mlx4_en_dev *mdev, u16 *prio_map, u32 ring_num);
+int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv);
+void mlx4_en_release_rss_steer(struct mlx4_en_priv *priv);
+int mlx4_en_free_tx_buf(struct net_device *dev, struct mlx4_en_tx_ring *ring);
+void mlx4_en_rx_refill(struct work_struct *work);
+void mlx4_en_rx_irq(struct mlx4_cq *mcq);
+
+int mlx4_SET_MCAST_FLTR(struct mlx4_dev *dev, u8 port, u64 mac, u64 clear, u8 mode);
+int mlx4_SET_VLAN_FLTR(struct mlx4_dev *dev, u8 port, struct vlan_group *grp);
+int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu,
+			  u8 pptx, u8 pfctx, u8 pprx, u8 pfcrx);
+int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
+			   u8 promisc);
+
+int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset);
+
+/*
+ * Globals
+ */
+extern const struct ethtool_ops mlx4_en_ethtool_ops;
+#endif
-- 
1.5.3.7

[Patch RFC 01/10] mlx4_en: Include file

[Yevgeny Petrilin]

This file includes device structures definitions, function
declarations and constants values.
All the files that belong to the driver must include this header.

Signed-off-by: Liran Liss <liranl@mellanox.co.il>
Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
---
 drivers/net/mlx4/mlx4_en.h |  645 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 645 insertions(+), 0 deletions(-)
 create mode 100644 drivers/net/mlx4/mlx4_en.h

diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/mlx4/mlx4_en.h
new file mode 100644
index 0000000..6c3f87f
--- /dev/null
+++ b/drivers/net/mlx4/mlx4_en.h
@@ -0,0 +1,645 @@
+/*
+ * Copyright (c) 2007 Mellanox Technologies. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef _MLX4_EN_H_
+#define _MLX4_EN_H_
+
+#include <linux/compiler.h>
+#include <linux/list.h>
+#include <linux/mutex.h>
+#include <linux/netdevice.h>
+#include <linux/inet_lro.h>
+
+#include <linux/mlx4/device.h>
+#include <linux/mlx4/qp.h>
+#include <linux/mlx4/srq.h>
+#include <linux/mlx4/doorbell.h>
+
+#include "en_port.h"
+
+#define DRV_NAME	"mlx4_en"
+#define DRV_VERSION	"1.0"
+#define DRV_RELDATE	"July 2008"
+
+
+#ifdef CONFIG_MLX4_EN_DEBUG
+#define mlx4_dbg(mdev, format, arg...)	\
+	printk(KERN_DEBUG "%s %s: " format , DRV_NAME ,\
+		(&mdev->pdev->dev)->bus_id , ## arg)
+#else /* CONFIG_MLX4_DEBUG */
+#define mlx4_dbg(mdev, format, arg...) do { (void) mdev; } while (0)
+#endif /* CONFIG_MLX4_DEBUG */
+
+#define mlx4_err(mdev, format, arg...) \
+	printk(KERN_ERR "%s %s: " format , DRV_NAME ,\
+		(&mdev->pdev->dev)->bus_id , ## arg)
+#define mlx4_info(mdev, format, arg...) \
+	printk(KERN_INFO "%s %s: " format , DRV_NAME ,\
+		(&mdev->pdev->dev)->bus_id , ## arg)
+#define mlx4_warn(mdev, format, arg...) \
+	printk(KERN_WARNING "%s %s: " format , DRV_NAME ,\
+		(&mdev->pdev->dev)->bus_id , ## arg)
+
+/*
+ * Device constants
+ */
+
+enum {
+	MLX4_EN_FLAG_MSI_X      = 1 << 1,
+	MLX4_EN_FLAG_HIGH_DMA   = 1 << 2,
+	MLX4_EN_FLAG_FW_RUNNING = 1 << 3
+};
+
+#define MLX4_EN_PAGE_SHIFT	12
+#define MLX4_EN_PAGE_SIZE	(1 << MLX4_EN_PAGE_SHIFT)
+#define MAX_TX_RINGS		16
+#define MIN_TX_PRIO_RINGS	9
+#define MAX_RX_RINGS		16
+#define MAX_RSS_MAP_SIZE	64
+#define RSS_FACTOR		2
+#define TXBB_SIZE		32
+#define HEADROOM		(2048 / TXBB_SIZE)
+#define MAX_LSO_HDR_SIZE	92
+#define STAMP_STRIDE		16
+#define STAMP_SHIFT		31
+#define STAMP_VAL		0x7fffffff
+#define STATS_DELAY		(HZ / 4)
+
+/* Typical TSO descriptor with 16 gather entries is 352 bytes... */
+#define MAX_DESC_SIZE		512
+#define MAX_DESC_TXBBS		(MAX_DESC_SIZE / TXBB_SIZE)
+
+/*
+ * OS related constants and tunables
+ */
+
+#define MLX4_EN_WATCHDOG_TIMEOUT	(15 * HZ)
+
+#define MLX4_EN_ALLOC_ORDER	2
+#define MLX4_EN_ALLOC_SIZE	(PAGE_SIZE << MLX4_EN_ALLOC_ORDER)
+
+#define MLX4_EN_MAX_LRO_DESCRIPTORS	32
+
+/* Receive fragment sizes; we use at most 4 fragments (for 9600 byte MTU
+ * and 4K allocations) */
+enum {
+	FRAG_SZ0 = 512 - NET_IP_ALIGN,
+	FRAG_SZ1 = 1024,
+	FRAG_SZ2 = 4096,
+	FRAG_SZ3 = MLX4_EN_ALLOC_SIZE
+};
+#define MLX4_EN_MAX_RX_FRAGS	4
+
+/* Minimum ring size for our page-allocation sceme to work */
+#define MLX4_EN_MIN_RX_SIZE	(MLX4_EN_ALLOC_SIZE / SMP_CACHE_BYTES)
+
+#define MLX4_EN_TX_RING_NUM		9
+#define MLX4_EN_DEF_TX_RING_SIZE	4096
+#define MLX4_EN_DEF_RX_RING_SIZE  	4096
+
+/* Target number of bytes to coalesce with interrupt moderation */
+#define MLX4_EN_RX_COAL_TARGET	0x20000
+#define MLX4_EN_TX_COAL_TARGET	0x80000
+#define MLX4_EN_RX_COAL_TIME	0x10
+#define MLX4_EN_TX_COAL_TIME	0x40
+
+#define MLX4_EN_RX_RATE_LOW		(64 * 1024)
+#define MLX4_EN_RX_COAL_TIME_LOW	0
+#define MLX4_EN_RX_RATE_HIGH		(128 * 1024)
+#define MLX4_EN_RX_COAL_TIME_HIGH	128
+#define MLX4_EN_RX_SIZE_THRESH		1024
+#define MLX4_EN_RX_RATE_THRESH		(1000000 / MLX4_EN_RX_COAL_TIME_HIGH)
+#define MODER_TARGET_PERCENT		20
+#define MLX4_EN_SAMPLE_INTERVAL		0
+
+#define MLX4_EN_MODER_AUTO_CONF	0xffff
+
+#define MLX4_EN_DEF_INT_DELAY	16
+#define MLX4_EN_DEF_RX_PAUSE	1
+#define MLX4_EN_DEF_TX_PAUSE	1
+
+/* Interval between sucessive polls in the Tx routine when polling is used
+   instead of interrupts (in per-core Tx rings) - should be power of 2 */
+#define MLX4_EN_TX_POLL_MODER	16
+#define MLX4_EN_TX_POLL_TIMEOUT	(HZ / 4)
+
+#define ETH_LLC_SNAP_SIZE	8
+
+#define SMALL_PACKET_SIZE      (256 - NET_IP_ALIGN)
+#define HEADER_COPY_SIZE       (128 - NET_IP_ALIGN)
+
+#define MLX4_EN_MIN_MTU		46
+#define MLX4_EN_MAX_MTU		9600
+#define ETH_BCAST		0xffffffffffff
+
+#ifdef CONFIG_MLX4_EN_PREFETCH
+	#define PREFETCH(x)		prefetch(x)
+#else
+	#define PREFETCH(x)
+#endif
+
+#ifdef CONFIG_MLX4_EN_SW_COUNTERS
+#define DO_SW_COUNTERS			1
+#define SET_SW_COUNTER(cnt, val)	((cnt) = (val))
+#define INC_SW_COUNTER(cnt)		(++(cnt))
+#define ADD_SW_COUNTER(cnt, add)	((cnt) += (add))
+#else
+#define DO_SW_COUNTERS			0
+#define SET_SW_COUNTER(cnt, val)
+#define INC_SW_COUNTER(cnt)
+#define ADD_SW_COUNTER(cnt, add)
+#endif
+
+
+#ifdef CONFIG_MLX4_EN_PERF_STAT
+/* Number of samples to 'average' */
+#define AVG_SIZE			128
+#define AVG_FACTOR			1024
+#define NUM_PERF_STATS			NUM_PERF_COUNTERS
+
+#define INC_PERF_COUNTER(cnt)		(++(cnt))
+#define ADD_PERF_COUNTER(cnt, add)	((cnt) += (add))
+#define AVG_PERF_COUNTER(cnt, sample) \
+	((cnt) = ((cnt) * (AVG_SIZE - 1) + (sample) * AVG_FACTOR) / AVG_SIZE)
+#define GET_PERF_COUNTER(cnt)		(cnt)
+#define GET_AVG_PERF_COUNTER(cnt)	((cnt) / AVG_FACTOR)
+
+#else
+
+#define NUM_PERF_STATS			0
+#define INC_PERF_COUNTER(cnt)
+#define ADD_PERF_COUNTER(cnt, add)
+#define AVG_PERF_COUNTER(cnt, sample)
+#define GET_PERF_COUNTER(cnt)		(0)
+#define GET_AVG_PERF_COUNTER(cnt)	(0)
+#endif /* MLX4_EN_PERF_STAT */
+
+/*
+ * Configurables
+ */
+
+enum rx_buf_mode {
+	RX_BUF_NORMAL = 0,
+	RX_BUF_HEAD_SEP = 1,
+	RX_BUF_EXACT_HEAD_SEP = 2,
+};
+
+enum cq_type {
+	RX = 0,
+	TX = 1,
+};
+
+
+enum mlx4_en_access_flags {
+	MLX4_EN_ACCESS_LOCAL_WRITE	= 1,
+	MLX4_EN_ACCESS_REMOTE_WRITE	= (1<<1),
+	MLX4_EN_ACCESS_REMOTE_READ	= (1<<2),
+	MLX4_EN_ACCESS_REMOTE_ATOMIC	= (1<<3),
+	MLX4_EN_ACCESS_MW_BIND		= (1<<4)
+};
+
+/*
+ * Useful macros
+ */
+
+#define ROUNDUP_LOG2(x)		ilog2(roundup_pow_of_two(x))
+#define XNOR(x, y)		(!(x) == !(y))
+#define MIN(a, b)		((a) < (b) ? (a) : (b))
+#define MAX(a, b)		((a) > (b) ? (a) : (b))
+
+
+enum mlx4_en_state {
+	DEVICE_DOWN,
+	DEVICE_UP,
+	DEVICE_GOING_DOWN,
+	DEVICE_DISABLED
+};
+
+struct mlx4_en_tx_info {
+	struct sk_buff *skb;
+	u32 nr_txbb;
+	u8 linear;
+	u8 frags;
+	u8 data_offset;
+};
+
+struct mlx4_en_ctrl_seg {
+	__be32 op_own;
+#define MLX4_EN_BIT_DESC_OWN	0x80000000
+#define MLX4_EN_OPCODE_SEND	0xa
+#define MLX4_EN_OPCODE_LSO	0xe
+	__be32 size_vlan;
+#define MLX4_EN_BIT_INS_VLAN	0x4000
+	__be32 flags;
+#define MLX4_EN_BIT_NO_ICRC	0x2
+#define MLX4_EN_BIT_TX_COMP	0xc
+#define MLX4_EN_BIT_TX_IP_CS	0x10
+#define MLX4_EN_BIT_TX_TCP_CS	0x20
+	__be32 reserved;
+};
+#define CTRL_SIZE	sizeof(struct mlx4_en_ctrl_seg)
+
+struct mlx4_en_data_seg {
+	__be32 count;
+#define MLX4_EN_INLINE		0x80000000
+	__be32 mem_type;
+#define MLX4_EN_MEMTYPE_PAD	0x100
+	__be64 addr;
+};
+#define DS_SIZE		sizeof(struct mlx4_en_data_seg)
+
+struct mlx4_en_lso_seg {
+	__be16 mss;
+	__be16 header_size;
+#define LSO_PREFIX_SIZE		4
+	u8 header_data[0]; /* copy of L2/IP/TCP headers */
+#define MLX4_EN_MAX_LSO_HEADER	(MAX_DESC_SIZE - CTRL_SIZE - DS_SIZE)
+};
+
+struct mlx4_en_tx_desc {
+	struct mlx4_en_ctrl_seg ctrl;
+	union {
+		struct mlx4_en_data_seg data; /* at least one data segment */
+		struct mlx4_en_lso_seg lso;
+	};
+};
+
+#define MLX4_EN_USE_SRQ		0x01000000
+
+struct mlx4_en_rx_alloc {
+	struct page *page;
+	u16 offset;
+};
+
+struct mlx4_en_tx_ring {
+	struct mlx4_hwq_resources wqres;
+	u32 size ; /* number of TXBBs */
+	u32 size_mask;
+	u16 stride;
+	u16 cqn;	/* index of port CQ associated with this ring */
+	u32 prod;
+	u32 cons;
+	u32 buf_size;
+	u32 doorbell_qpn;
+	void *buf;
+	u16 poll_cnt;
+	int blocked;
+	struct mlx4_en_tx_info *tx_info;
+	u8 *bounce_buf;
+	u32 last_nr_txbb;
+	struct mlx4_qp qp;
+	struct mlx4_qp_context context;
+	u32 qpn;
+	enum mlx4_qp_state qp_state;
+	struct mlx4_srq dummy;
+	unsigned long bytes;
+	unsigned long packets;
+};
+
+struct mlx4_en_rx_desc {
+	struct mlx4_wqe_srq_next_seg next;
+	/* actual number of entries depends on rx ring stride */
+	struct mlx4_en_data_seg data[0];
+};
+
+struct mlx4_en_rx_ring {
+	struct mlx4_srq srq;
+	struct mlx4_hwq_resources wqres;
+	struct mlx4_en_rx_alloc page_alloc[MLX4_EN_MAX_RX_FRAGS];
+	struct net_lro_mgr lro;
+	u32 size ;	/* number of Rx descs*/
+	u32 size_mask;
+	u16 stride;
+	u16 log_stride;
+	u16 cqn;	/* index of port CQ associated with this ring */
+	u32 prod;
+	u32 cons;
+	u32 buf_size;
+	int need_refill;
+	int full;
+	void *buf;
+	void *rx_info;
+	unsigned long bytes;
+	unsigned long packets;
+};
+
+struct mlx4_en_cqe {
+	u8 vp; /* VLAN present */
+#define MLX4_EN_BIT_VLANN_PRESENT	0x20
+	u8 reserved1[3];
+	__be32 rss_hash;
+	u32 reserved2;
+	__be16 vlan_prio;
+	u16 reserved3;
+	u8 flags_h;
+#define MLX4_EN_BIT_IPOK		0x10
+#define MLX4_EN_BIT_UDP			0x08
+#define MLX4_EN_BIT_TCP			0x04
+#define MLX4_EN_BIT_IPV4_OPT		0x02
+#define MLX4_EN_BIT_IPV6		0x01
+	u8 flags_l_rht;
+#define MLX4_EN_BIT_IPV4F		0x80
+#define MLX4_EN_BIT_IPV4		0x40
+	u8 ipv6_mask;
+	u8 enc_bf;
+#define MLX4_EN_BIT_BAD_FCS		0x10
+#define MLX4_EN_BIT_LLC			0x01
+#define MLX4_EN_BIT_SNAP		0x02
+	__be32 byte_cnt;
+	__be16 index;
+	__be16 chksum;
+	u8 reserved4[3];
+	u8 op_tr_own;
+};
+
+#define TCPIP_MASK_32		0x1fc00003
+#define MLX4_EN_BIT_IPOK_32	(MLX4_EN_BIT_IPOK << 24)
+#define MLX4_EN_BIT_TCP_32	(MLX4_EN_BIT_TCP << 24)
+#define MLX4_EN_BIT_IPV4_32	(MLX4_EN_BIT_IPV4 << 16)
+#define LRO_MASK_32 (MLX4_EN_BIT_IPV4_32 | MLX4_EN_BIT_TCP_32 | MLX4_EN_BIT_IPOK_32)
+
+struct mlx4_en_cq {
+	struct mlx4_cq          mcq;
+	struct mlx4_hwq_resources wqres;
+	int                     ring;
+	spinlock_t              lock;
+	struct net_device      *dev;
+	struct napi_struct	napi;
+	/* Per-core Tx cq processing support */
+	struct timer_list timer;
+	int size;
+	int buf_size;
+	enum cq_type is_tx;
+	u16 moder_time;
+	u16 moder_cnt;
+	struct mlx4_en_cqe *buf;
+#define MLX4_EN_OPCODE_ERROR	0x1e
+};
+
+struct mlx4_en_port_profile {
+	enum rx_buf_mode rx_buf;
+	u32 flags;
+
+	u32 tx_ring_num;
+	u32 rx_ring_num;
+	u32 tx_ring_size;
+	u32 rx_ring_size;
+};
+
+struct mlx4_en_profile {
+	int rss_xor;
+	int num_lro;
+	u8 rss_mask;
+	u32 active_ports;
+	u32 small_pkt_int;
+	int tx_moder_cnt;
+	int tx_moder_time;
+	int rx_moder_cnt;
+	int rx_moder_time;
+	int min_int_delay;
+	int auto_moder;
+	u8 rx_pause;
+	u8 rx_ppp;
+	u8 tx_pause;
+	u8 tx_ppp;
+	u8 no_reset;
+	struct mlx4_en_port_profile prof[MLX4_MAX_PORTS + 1];
+};
+
+struct mlx4_en_dev {
+	struct mlx4_dev         *dev;
+	struct pci_dev		*pdev;
+	struct semaphore        state_sem;
+	struct net_device       *pndev[MLX4_MAX_PORTS + 1];
+	u32		 	ports_map;
+	u32                     port_cnt;
+	enum mlx4_en_state      state;
+	struct mlx4_en_profile  profile;
+	u32                     mlx4_en_flags;
+	unsigned long           device_cap_flags;
+	struct workqueue_struct *workqueue;
+	struct device           *dma_device;
+	void __iomem            *uar_map;
+	struct mlx4_uar         priv_uar;
+	struct mlx4_mr		mr;
+	u32                     priv_pdn;
+	spinlock_t              uar_lock;
+};
+
+enum mlx4_en_port_state {
+	PORT_DOWN,
+	PORT_UP
+};
+
+struct mlx4_en_rss_map {
+	int size;
+	int base_qpn;
+	u16 map[MAX_RSS_MAP_SIZE];
+	struct mlx4_qp qps[MAX_RSS_MAP_SIZE];
+	enum mlx4_qp_state state[MAX_RSS_MAP_SIZE];
+	struct mlx4_qp indir_qp;
+	enum mlx4_qp_state indir_state;
+};
+
+struct mlx4_en_rss_context {
+	__be32 base_qpn;
+	__be32 default_qpn;
+	u16 reserved;
+	u8 hash_fn;
+	u8 flags;
+	__be32 rss_key[10];
+};
+
+struct mlx4_en_port_stats {
+	u32 rst_cnt;
+	u32 lro_session_ovfl;
+	u32 queue_stopped;
+#define NUM_PORT_STATS		3
+};
+
+struct mlx4_en_perf_stats {
+	u32 tx_poll;
+	u64 tso;
+	u64 tx_pktsz_avg;
+	u32 inflight_avg;
+	u16 tx_coal_avg;
+	u16 rx_coal_avg;
+	u64 lro_size_avg;
+	u64 lro_flushes;
+	u64 lro_misses;
+	u32 napi_quota;
+	u32 rx_chksum_none;
+	u32 rx_alloc_failed;
+#define NUM_PERF_COUNTERS	12
+};
+
+struct mlx4_en_frag_info {
+	u16 frag_size;
+	u16 frag_prefix_size;
+	u16 frag_stride;
+	u16 frag_align;
+	u16 last_offset;
+
+};
+
+struct mlx4_en_priv {
+	struct mlx4_en_dev *mdev;
+	struct mlx4_en_port_profile *prof;
+	struct net_device *dev;
+	struct vlan_group *vlgrp;
+	struct net_device_stats stats;
+	spinlock_t stats_lock;
+
+	unsigned long last_moder_packets;
+	unsigned long last_moder_tx_packets;
+	unsigned long last_moder_bytes;
+	unsigned long last_moder_jiffies;
+	int last_moder_time;
+	u16 rx_usecs;
+	u16 rx_frames;
+	u16 tx_usecs;
+	u16 tx_frames;
+	u32 pkt_rate_low;
+	u16 rx_usecs_low;
+	u32 pkt_rate_high;
+	u16 rx_usecs_high;
+	u16 sample_interval;
+	u16 adaptive_rx_coal;
+
+	struct mlx4_hwq_resources res;
+	int link_state;
+	int last_link_state;
+	enum mlx4_en_port_state port_state;
+	int port;
+	int registered;
+	int rx_csum;
+	u64 mac;
+	int mac_index;
+	int max_mtu;
+	int base_qpn;
+
+	enum rx_buf_mode rx_buf;
+	struct mlx4_en_rss_map rss_map;
+	u16 tx_prio_map[8];
+	u32 flags;
+#define MLX4_EN_FLAG_PROMISC	0x1
+	u32 tx_ring_num;
+	u32 rx_ring_num;
+	u32 rx_skb_size;
+	struct mlx4_en_frag_info frag_info[MLX4_EN_MAX_RX_FRAGS];
+	u16 num_frags;
+	u16 log_rx_info;
+
+	struct mlx4_en_tx_ring tx_ring[MAX_TX_RINGS];
+	struct mlx4_en_rx_ring rx_ring[MAX_RX_RINGS];
+	struct mlx4_en_cq tx_cq[MAX_TX_RINGS];
+	struct mlx4_en_cq rx_cq[MAX_RX_RINGS];
+	struct work_struct mcast_task;
+	struct work_struct mac_task;
+	struct delayed_work refill_task;
+	struct work_struct watchdog_task;
+	struct work_struct linkstate_task;
+	struct delayed_work stats_task;
+	struct mlx4_en_perf_stats pstats;
+	struct mlx4_en_port_stats port_stats;
+	struct dev_mc_list *mc_list;
+	struct mlx4_en_stat_out_mbox hw_stats;
+};
+
+
+void mlx4_en_destroy_netdev(struct net_device *dev);
+int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
+			struct mlx4_en_port_profile *prof);
+
+int mlx4_en_get_dma_mr(struct mlx4_en_dev *mdev, int acc);
+
+int mlx4_en_start_port(struct net_device *dev);
+void mlx4_en_stop_port(struct net_device *dev);
+
+int mlx4_en_get_profile(struct mlx4_en_dev *mdev);
+
+int mlx4_en_create_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq,
+		      int entries, int ring, enum cq_type mode);
+void mlx4_en_destroy_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);
+int mlx4_en_set_cq_moder(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);
+int mlx4_en_arm_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);
+
+void mlx4_en_process_tx_cq(struct net_device *dev, struct mlx4_en_cq *cq);
+void mlx4_en_poll_tx_cq(unsigned long data);
+int mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev);
+
+int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, struct mlx4_en_tx_ring *ring,
+			   u32 size, u16 stride);
+void mlx4_en_destroy_tx_ring(struct mlx4_en_priv *priv, struct mlx4_en_tx_ring *ring);
+int mlx4_en_activate_tx_ring(struct mlx4_en_priv *priv,
+			     struct mlx4_en_tx_ring *ring,
+			     int cq, int srqn);
+void mlx4_en_deactivate_tx_ring(struct mlx4_en_priv *priv,
+				struct mlx4_en_tx_ring *ring);
+
+int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv, struct mlx4_en_rx_ring *ring,
+			   u32 size, u16 stride, int cq);
+void mlx4_en_destroy_rx_ring(struct mlx4_en_priv *priv, struct mlx4_en_rx_ring *ring);
+int mlx4_en_process_rx_cq(struct net_device *dev,
+			  struct mlx4_en_cq *cq,
+			  int budget);
+int mlx4_en_poll_rx_cq(struct napi_struct *napi, int budget);
+void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride,
+			     int is_tx, int rss, int qpn, int cqn, int srqn,
+			     struct mlx4_qp_context *context);
+
+void mlx4_en_calc_rx_buf(struct net_device *dev);
+void mlx4_en_set_default_rss_map(struct mlx4_en_dev *mdev,
+				 struct mlx4_en_rss_map *rss_map,
+				 int num_entries, int num_rings);
+void mlx4_en_set_prio_map(struct mlx4_en_dev *mdev, u16 *prio_map, u32 ring_num);
+int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv);
+void mlx4_en_release_rss_steer(struct mlx4_en_priv *priv);
+int mlx4_en_free_tx_buf(struct net_device *dev, struct mlx4_en_tx_ring *ring);
+void mlx4_en_rx_refill(struct work_struct *work);
+void mlx4_en_rx_irq(struct mlx4_cq *mcq);
+
+int mlx4_SET_MCAST_FLTR(struct mlx4_dev *dev, u8 port, u64 mac, u64 clear, u8 mode);
+int mlx4_SET_VLAN_FLTR(struct mlx4_dev *dev, u8 port, struct vlan_group *grp);
+int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu,
+			  u8 pptx, u8 pfctx, u8 pprx, u8 pfcrx);
+int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
+			   u8 promisc);
+
+int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset);
+
+/*
+ * Globals
+ */
+extern const struct ethtool_ops mlx4_en_ethtool_ops;
+#endif
-- 
1.5.3.7

Re: [PATCH RFC 01/10] mlx4_en: Include file

[Ben Hutchings]

Yevgeny Petrilin wrote:
[...]
> +#ifdef CONFIG_MLX4_EN_DEBUG
> +#define mlx4_dbg(mdev, format, arg...)	\
> +	printk(KERN_DEBUG "%s %s: " format , DRV_NAME ,\
> +		(&mdev->pdev->dev)->bus_id , ## arg)
> +#else /* CONFIG_MLX4_DEBUG */
> +#define mlx4_dbg(mdev, format, arg...) do { (void) mdev; } while (0)
> +#endif /* CONFIG_MLX4_DEBUG */
> +
> +#define mlx4_err(mdev, format, arg...) \
> +	printk(KERN_ERR "%s %s: " format , DRV_NAME ,\
> +		(&mdev->pdev->dev)->bus_id , ## arg)
> +#define mlx4_info(mdev, format, arg...) \
> +	printk(KERN_INFO "%s %s: " format , DRV_NAME ,\
> +		(&mdev->pdev->dev)->bus_id , ## arg)
> +#define mlx4_warn(mdev, format, arg...) \
> +	printk(KERN_WARNING "%s %s: " format , DRV_NAME ,\
> +		(&mdev->pdev->dev)->bus_id , ## arg)

I think these should be defined in terms of dev_dbg etc.

[...]
> +#ifdef CONFIG_MLX4_EN_PREFETCH
> +	#define PREFETCH(x)		prefetch(x)
> +#else
> +	#define PREFETCH(x)
> +#endif
> +
> +#ifdef CONFIG_MLX4_EN_SW_COUNTERS
> +#define DO_SW_COUNTERS			1
> +#define SET_SW_COUNTER(cnt, val)	((cnt) = (val))
> +#define INC_SW_COUNTER(cnt)		(++(cnt))
> +#define ADD_SW_COUNTER(cnt, add)	((cnt) += (add))
> +#else
> +#define DO_SW_COUNTERS			0
> +#define SET_SW_COUNTER(cnt, val)
> +#define INC_SW_COUNTER(cnt)
> +#define ADD_SW_COUNTER(cnt, add)
> +#endif

The do-nothing implementations should be do {} while (0).

[...]
> +/*
> + * Useful macros
> + */
> +
> +#define ROUNDUP_LOG2(x)		ilog2(roundup_pow_of_two(x))
> +#define XNOR(x, y)		(!(x) == !(y))
> +#define MIN(a, b)		((a) < (b) ? (a) : (b))
> +#define MAX(a, b)		((a) > (b) ? (a) : (b))

So useful that <linux/kernel.h> already has quite a few of them...

Ben.

-- 
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.

Re: [PATCH RFC 01/10] mlx4_en: Include file

[Ben Hutchings]

Yevgeny Petrilin wrote:
[...]
> +#ifdef CONFIG_MLX4_EN_DEBUG
> +#define mlx4_dbg(mdev, format, arg...)	\
> +	printk(KERN_DEBUG "%s %s: " format , DRV_NAME ,\
> +		(&mdev->pdev->dev)->bus_id , ## arg)

CONFIG_MLX4_EN_DEBUG isn't in Kconfig.  If you expect debugging to be
enabled through tweaking EXTRA_CFLAGS then the macro should be called
something else.

[...]
> +#ifdef CONFIG_MLX4_EN_PREFETCH
> +	#define PREFETCH(x)		prefetch(x)

Neither is CONFIG_MLX4_EN_PREFETCH in Kconfig.  Why don't you do this
unconditionally?

There are several more CONFIG macros tested here which should be removed
or renamed (or possibly added to Kconfig).

Ben.

-- 
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.

Re: [PATCH RFC 01/10] mlx4_en: Include file

[Roland Dreier]

 > +struct mlx4_en_ctrl_seg {
 > +	__be32 op_own;
 > +#define MLX4_EN_BIT_DESC_OWN	0x80000000
 > +#define MLX4_EN_OPCODE_SEND	0xa
 > +#define MLX4_EN_OPCODE_LSO	0xe
 > +	__be32 size_vlan;
 > +#define MLX4_EN_BIT_INS_VLAN	0x4000
 > +	__be32 flags;
 > +#define MLX4_EN_BIT_NO_ICRC	0x2
 > +#define MLX4_EN_BIT_TX_COMP	0xc
 > +#define MLX4_EN_BIT_TX_IP_CS	0x10
 > +#define MLX4_EN_BIT_TX_TCP_CS	0x20
 > +	__be32 reserved;
 > +};
 > +#define CTRL_SIZE	sizeof(struct mlx4_en_ctrl_seg)
 > +
 > +struct mlx4_en_data_seg {
 > +	__be32 count;
 > +#define MLX4_EN_INLINE		0x80000000
 > +	__be32 mem_type;
 > +#define MLX4_EN_MEMTYPE_PAD	0x100
 > +	__be64 addr;
 > +};
 > +#define DS_SIZE		sizeof(struct mlx4_en_data_seg)
 > +
 > +struct mlx4_en_lso_seg {
 > +	__be16 mss;
 > +	__be16 header_size;
 > +#define LSO_PREFIX_SIZE		4
 > +	u8 header_data[0]; /* copy of L2/IP/TCP headers */
 > +#define MLX4_EN_MAX_LSO_HEADER	(MAX_DESC_SIZE - CTRL_SIZE - DS_SIZE)
 > +};

I think it would be better to reuse the mlx4_wqe_ctrl_seg,
mlx4_wqe_data_seg and mlx4_wqe_lso_seg already defined in
<linux/mlx4/qp.h>.  That was the whole point in putting those structures
in a common location.

Re: [PATCH RFC 01/10] mlx4_en: Include file

[Roland Dreier]

 > +/*
 > + * Useful macros
 > + */
 > +
 > +#define ROUNDUP_LOG2(x)		ilog2(roundup_pow_of_two(x))

<linux/log2.h> calls this order_base_2()

 > +#define XNOR(x, y)		(!(x) == !(y))

You only use this once, and I think it would be much clearer to just
open-code this there -- I don't think "XNOR" is sufficiently
self-documenting.

 > +#define MIN(a, b)		((a) < (b) ? (a) : (b))
 > +#define MAX(a, b)		((a) > (b) ? (a) : (b))

Don't worry -- the min()/max() macros in <linux/kernel.h> won't wear out
from overuse.

 - R.

Re: [PATCH RFC 01/10] mlx4_en: Include file

[Roland Dreier]

 > +enum mlx4_en_access_flags {
 > +	MLX4_EN_ACCESS_LOCAL_WRITE	= 1,
 > +	MLX4_EN_ACCESS_REMOTE_WRITE	= (1<<1),
 > +	MLX4_EN_ACCESS_REMOTE_READ	= (1<<2),
 > +	MLX4_EN_ACCESS_REMOTE_ATOMIC	= (1<<3),
 > +	MLX4_EN_ACCESS_MW_BIND		= (1<<4)
 > +};
 > 
 > +static u32 convert_access(int acc)
 > +{
 > +	return (acc & MLX4_EN_ACCESS_REMOTE_ATOMIC ? MLX4_PERM_ATOMIC       : 0) |
 > +	       (acc & MLX4_EN_ACCESS_REMOTE_WRITE  ? MLX4_PERM_REMOTE_WRITE : 0) |
 > +	       (acc & MLX4_EN_ACCESS_REMOTE_READ   ? MLX4_PERM_REMOTE_READ  : 0) |
 > +	       (acc & MLX4_EN_ACCESS_LOCAL_WRITE   ? MLX4_PERM_LOCAL_WRITE  : 0) |
 > +	       MLX4_PERM_LOCAL_READ;
 > +}
 > +
 > +int mlx4_en_get_dma_mr(struct mlx4_en_dev *mdev, int acc)
 > +{
 > +	int err;
 > +
 > +	err = mlx4_mr_alloc(mdev->dev, mdev->priv_pdn, 0, ~0ull,
 > +			    convert_access(acc), 0, 0, &mdev->mr);
 > +	if (err)
 > +		return err;
 > +
 > +	err = mlx4_mr_enable(mdev->dev, &mdev->mr);
 > +	if (err)
 > +		goto err_mr;
 > +
 > +	return 0;
 > +
 > +err_mr:
 > +	mlx4_mr_free(mdev->dev, &mdev->mr);
 > +	return err;
 > +}

I don't think you need all this access permission stuff, given that you
only have a single call to mlx4_en_get_dma_mr():

 > +	if (mlx4_en_get_dma_mr(mdev, MLX4_EN_ACCESS_LOCAL_WRITE)) {

and it seems really really unlikely that you would ever add any
remote permissions etc.

 - R.

Re: [PATCH RFC 01/10] mlx4_en: Include file

[Roland Dreier]

 > +	MLX4_EN_FLAG_HIGH_DMA   = 1 << 2,
 > +	MLX4_EN_FLAG_FW_RUNNING = 1 << 3

I don't see anywhere that sets either of these flags.  The test of
HIGH_DMA seems strange:

 > +	if (mdev->mlx4_en_flags & MLX4_EN_FLAG_HIGH_DMA)
 > +		dev->features |= NETIF_F_HIGHDMA;

I think you can safely assume that an mlx4 device can DMA to any bus
address, and just set NETIF_F_HIGHDMA unconditionally.

Re: [PATCH RFC 01/10] mlx4_en: Include file

[Roland Dreier]

 > +enum mlx4_en_state {
 > +	DEVICE_DOWN,
 > +	DEVICE_UP,
 > +	DEVICE_GOING_DOWN,
 > +	DEVICE_DISABLED
 > +};

I don't see any place that sets the state to anything other than UP or
DOWN.  Maybe it would be clearer to get rid of the enum and just have

	bool      device_up;

in your structure?

Re: [PATCH RFC 01/10] mlx4_en: Include file

[Roland Dreier]

 > +struct mlx4_en_cqe {

Same as WQE structs ... can we share the existing struct mlx4_cqe from
<linux/mlx4/cq.h>?

Re: [PATCH RFC 01/10] mlx4_en: Include file

[Yevgeny Petrilin]

Roland Dreier wrote:
>  > +struct mlx4_en_cqe {
> 
> Same as WQE structs ... can we share the existing struct mlx4_cqe from
> <linux/mlx4/cq.h>?
> 
Will change the code to reuse the structs defined in mlx4_core

Thanks, Yevgeny