mlx4_en: Added self diagnostics test implementation
Subsystems (2)
PATCH 4/7 mlx4_en: Added self diagnostics test implementation
The test includes 5 tests:
1. Interrupt test: Executing commands and receiving command completion on all our interrupt vectors.
2. Link test: Verifying we are connected to valid link partner.
3. Speed test: Check that we negotiated link speed correctly.
4. Registers test: Activate HW health check command.
5. Loopback test: Send a packet on loopback interface and catch it on RX side.
Signed-off-by Yevgeny Petrilin <[email protected]>
--- drivers/net/mlx4/Makefile | 2 +- drivers/net/mlx4/en_ethtool.c | 79 ++++++++++++------ drivers/net/mlx4/en_netdev.c | 2 +- drivers/net/mlx4/en_port.c | 32 +++++++ drivers/net/mlx4/en_port.h | 14 +++ drivers/net/mlx4/en_rx.c | 7 ++ drivers/net/mlx4/en_selftest.c | 182 ++++++++++++++++++++++++++++++++++++++++ drivers/net/mlx4/en_tx.c | 16 ++++ drivers/net/mlx4/mlx4_en.h | 21 +++++- 9 files changed, 327 insertions(+), 28 deletions(-) create mode 100644 drivers/net/mlx4/en_selftest.c
drivers/net/mlx4/Makefile +1 -1
@@ -6,4 +6,4 @@ mlx4_core-y := alloc.o catas.o cmd.o cq.o eq.o fw.o icm.o intf.o main.o mcg.o \ obj-$(CONFIG_MLX4_EN) += mlx4_en.o mlx4_en-y := en_main.o en_tx.o en_rx.o en_ethtool.o en_port.o en_cq.o \ - en_resources.o en_netdev.o + en_resources.o en_netdev.o en_selftest.o
drivers/net/mlx4/en_ethtool.c +54 -25
112 lines not on this page · raw message
drivers/net/mlx4/en_netdev.c +1 -1
@@ -108,7 +108,7 @@ static void mlx4_en_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)mutex_unlock (&mdev->state_lock); } -static u64 mlx4_en_mac_to_u64 (u8 *addr) +u64 mlx4_en_mac_to_u64 (u8 *addr) {u64 mac =0 ;int i;
drivers/net/mlx4/en_port.c +32 -0
@@ -142,6 +142,38 @@ int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,return err; } +int mlx4_en_QUERY_PORT (struct mlx4_en_dev *mdev,u8 port) +{ +struct mlx4_en_query_port_context *qport_context; +struct mlx4_en_priv *priv =netdev_priv (mdev->pndev[port]); +struct mlx4_en_port_state *state = &priv->port_state; +struct mlx4_cmd_mailbox *mailbox; +int err; + + mailbox =mlx4_alloc_cmd_mailbox (mdev->dev); +if (IS_ERR (mailbox)) +return PTR_ERR (mailbox); +memset (mailbox->buf,0 ,sizeof (*qport_context)); + err =mlx4_cmd_box (mdev->dev,0 , mailbox->dma, port,0 , +MLX4_CMD_QUERY_PORT ,MLX4_CMD_TIME_CLASS_B ); +if (err) + goto out; + qport_context = mailbox->buf; + +/* This command is always accessed from Ethtool context +* already synchronized, no need in locking */ + state->link_state = !!(qport_context->link_up &MLX4_EN_LINK_UP_MASK ); +if ((qport_context->link_speed &MLX4_EN_SPEED_MASK ) == +MLX4_EN_1G_SPEED ) + state->link_speed =1000 ; +else + state->link_speed =10000 ; + state->transciver = qport_context->transceiver; + +out: +mlx4_free_cmd_mailbox (mdev->dev, mailbox); +return err; +}int mlx4_en_DUMP_ETH_STATS (struct mlx4_en_dev *mdev,u8 port,u8 reset) {
drivers/net/mlx4/en_port.h +14 -0
@@ -84,6 +84,20 @@ enum { MLX4_MCAST_ENABLE = 2, }; +struct mlx4_en_query_port_context { +u8 link_up; +#define MLX4_EN_LINK_UP_MASK 0x80 +u8 reserved; +__be16 mtu; +u8 reserved2; +u8 link_speed; +#define MLX4_EN_SPEED_MASK 0x3 +#define MLX4_EN_1G_SPEED 0x2 +u16 reserved3[5 ]; +__be64 mac; +u8 transceiver; +}; +struct mlx4_en_stat_out_mbox {/* Received frames with a length of 64 octets */
drivers/net/mlx4/en_rx.c +7 -0
@@ -654,6 +654,13 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud goto next; } +if (unlikely (priv->validate_loopback)) { + priv->loopback_ok = + !strcmp ((skb->data +ETH_HLEN ),"MLX4 Loopback" ); +dev_kfree_skb_any (skb); + goto next; + } + skb->ip_summed = ip_summed; skb->protocol =eth_type_trans (skb, dev);skb_record_rx_queue (skb, cq->ring);
drivers/net/mlx4/en_selftest.c new file +182 -0
182 lines not on this page · raw message
drivers/net/mlx4/en_tx.c +16 -0
@@ -599,6 +599,9 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)struct mlx4_wqe_data_seg *data;struct skb_frag_struct *frag;struct mlx4_en_tx_info *tx_info; +struct ethhdr *ethh; +u64 mac; +u32 mac_l, mac_h;int tx_ind =0 ;int nr_txbb;int desc_size;
@@ -675,6 +678,19 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) priv->port_stats.tx_chksum_offload++; } +if (unlikely (priv->validate_loopback)) { +/* Copy dst mac address to wqe */ +skb_reset_mac_header (skb); + ethh =eth_hdr (skb); +if (ethh && ethh->h_dest) { + mac =mlx4_en_mac_to_u64 (ethh->h_dest); + mac_h = (u32) ((mac &0xffff00000000 ) >>16 ); + mac_l = (u32) (mac &0xffffffff ); + tx_desc->ctrl.srcrb_flags |=cpu_to_be32 (mac_h); + tx_desc->ctrl.imm =cpu_to_be32 (mac_l); + } + } +/* Handle LSO (TSO) packets */ if (lso_header_size) {/* Mark opcode as LSO */
drivers/net/mlx4/mlx4_en.h +20 -1
@@ -45,6 +45,7 @@#include <linux/mlx4/cq.h> #include <linux/mlx4/srq.h> #include <linux/mlx4/doorbell.h> +#include <linux/mlx4/cmd.h> #include "en_port.h"
@@ -52,7 +53,6 @@#define DRV_VERSION "1.4.1.1"#define DRV_RELDATE "June 2009" -#define MLX4_EN_MSG_LEVEL (NETIF_MSG_LINK | NETIF_MSG_IFDOWN) #define en_print(level, priv, format, arg...) \
@@ -171,10 +171,14 @@ enum {#define SMALL_PACKET_SIZE (256 - NET_IP_ALIGN)#define HEADER_COPY_SIZE (128 - NET_IP_ALIGN) +#define MLX4_LOOPBACK_TEST_PAYLOAD (HEADER_COPY_SIZE - ETH_HLEN)#define MLX4_EN_MIN_MTU 46#define ETH_BCAST 0xffffffffffffULL +#define MLX4_EN_LOOPBACK_RETRIES 5 +#define MLX4_EN_LOOPBACK_TIMEOUT 100 +#ifdef MLX4_EN_PERF_STAT /* Number of samples to 'average' */ #define AVG_SIZE 128
@@ -389,6 +393,12 @@ struct mlx4_en_rss_context {__be32 rss_key[10 ]; }; +struct mlx4_en_port_state { +int link_state; +int link_speed; +int transciver; +}; +struct mlx4_en_pkt_stats {unsigned long broadcast;unsigned long rx_prio[8 ];
@@ -437,6 +447,7 @@ struct mlx4_en_priv {struct vlan_group *vlgrp;struct net_device_stats stats;struct net_device_stats ret_stats; +struct mlx4_en_port_state port_state;spinlock_t stats_lock;unsigned long last_moder_packets;
@@ -455,6 +466,8 @@ struct mlx4_en_priv {u16 sample_interval;u16 adaptive_rx_coal;u32 msg_enable; +u32 loopback_ok; +u32 validate_loopback;struct mlx4_hwq_resources res;int link_state;
@@ -494,6 +507,7 @@ struct mlx4_en_priv {struct mlx4_en_port_stats port_stats;struct dev_mc_list *mc_list;struct mlx4_en_stat_out_mbox hw_stats; + };
@@ -562,6 +576,11 @@ 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); +int mlx4_en_QUERY_PORT (struct mlx4_en_dev *mdev,u8 port); + +#define MLX4_EN_NUM_SELF_TEST 5 +void mlx4_en_ex_selftest (struct net_device *dev,u32 *flags,u64 *buf); +u64 mlx4_en_mac_to_u64 (u8 *addr);/* * Globals
Signature · 1 line
1.6.1.3