From: Nicholas Nunley [EMAIL PROTECTED]
This adds support for dumping ixgb registers in readable format.
Signed-off-by: Nicholas Nunley [EMAIL PROTECTED]
Signed-off-by: Auke Kok [EMAIL PROTECTED]
---
Makefile.am|4 +-
ethtool-util.h |3 +
ethtool.c |2 +
ixgb.c | 147
4 files changed, 154 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index cf4ebc5..c78eecf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,8 +6,8 @@ EXTRA_DIST = ethtool.8 ethtool.spec.in a
sbin_PROGRAMS = ethtool
ethtool_SOURCES = ethtool.c ethtool-copy.h ethtool-util.h \
amd8111e.c de2104x.c e100.c e1000.c \
- fec_8xx.c ibm_emac.c natsemi.c pcnet32.c \
- realtek.c tg3.c skge.c
+ fec_8xx.c ibm_emac.c ixgb.c natsemi.c \
+ pcnet32.c realtek.c tg3.c skge.c
dist-hook:
cp $(top_srcdir)/ethtool.spec $(distdir)
diff --git a/ethtool-util.h b/ethtool-util.h
index 52c43bf..0e6fce2 100644
--- a/ethtool-util.h
+++ b/ethtool-util.h
@@ -42,6 +42,9 @@ int fec_8xx_dump_regs(struct ethtool_drv
/* PowerPC 4xx on-chip Ethernet controller */
int ibm_emac_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs
*regs);
+/* Intel(R) PRO/10GBe Gigabit Adapter Family */
+int ixgb_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs);
+
/* Broadcom Tigon3 Ethernet controller */
int tg3_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs);
diff --git a/ethtool.c b/ethtool.c
index 87e22ab..02b9fb7 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -10,6 +10,7 @@
* ETHTOOL_PHYS_ID support by Chris Leech [EMAIL PROTECTED]
* e1000 support by Scott Feldman [EMAIL PROTECTED]
* e100 support by Wen Tao [EMAIL PROTECTED]
+ * ixgb support by Nicholas Nunley [EMAIL PROTECTED]
* amd8111e support by Reeja John [EMAIL PROTECTED]
* long arguments by Andi Kleen.
*
@@ -937,6 +938,7 @@ static struct {
{ r8169, realtek_dump_regs },
{ de2104x, de2104x_dump_regs },
{ e1000, e1000_dump_regs },
+ { ixgb, ixgb_dump_regs },
{ natsemi, natsemi_dump_regs },
{ e100, e100_dump_regs },
{ amd8111e, amd8111e_dump_regs },
diff --git a/ixgb.c b/ixgb.c
new file mode 100644
index 000..06b4da2
--- /dev/null
+++ b/ixgb.c
@@ -0,0 +1,147 @@
+/* Copyright (c) 2006 Intel Corporation */
+#include stdio.h
+#include ethtool-util.h
+
+/* CTRL0 Bit Masks */
+#define IXGB_CTRL0_LRST 0x0008
+#define IXGB_CTRL0_VME0x4000
+
+/* STATUS Bit Masks */
+#define IXGB_STATUS_LU0x0002
+#define IXGB_STATUS_BUS64 0x1000
+#define IXGB_STATUS_PCIX_MODE 0x2000
+#define IXGB_STATUS_PCIX_SPD_100 0x4000
+#define IXGB_STATUS_PCIX_SPD_133 0x8000
+
+/* RCTL Bit Masks */
+#define IXGB_RCTL_RXEN0x0002
+#define IXGB_RCTL_SBP 0x0004
+#define IXGB_RCTL_UPE 0x0008
+#define IXGB_RCTL_MPE 0x0010
+#define IXGB_RCTL_RDMTS_MASK 0x0300
+#define IXGB_RCTL_RDMTS_1_2 0x
+#define IXGB_RCTL_RDMTS_1_4 0x0100
+#define IXGB_RCTL_RDMTS_1_8 0x0200
+#define IXGB_RCTL_BAM 0x8000
+#define IXGB_RCTL_BSIZE_MASK 0x0003
+#define IXGB_RCTL_BSIZE_4096 0x0001
+#define IXGB_RCTL_BSIZE_8192 0x0002
+#define IXGB_RCTL_BSIZE_16384 0x0003
+#define IXGB_RCTL_VFE 0x0004
+#define IXGB_RCTL_CFIEN 0x0008
+
+/* TCTL Bit Masks */
+#define IXGB_TCTL_TXEN0x0002
+
+/* RAH Bit Masks */
+#define IXGB_RAH_ASEL_DEST0x
+#define IXGB_RAH_ASEL_SRC 0x0001
+#define IXGB_RAH_AV 0x8000
+
+int
+ixgb_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
+{
+ u32 *regs_buff = (u32 *)regs-data;
+ u8 version = (u8)(regs-version 24);
+ u32 reg;
+
+ if (version != 1)
+ return -1;
+ fprintf(stdout, MAC Registers\n);
+ fprintf(stdout, -\n);
+
+ /* Device control register */
+ reg = regs_buff[0];
+ fprintf(stdout,
+ 0x0: CTRL0 (Device control register) 0x%08X\n
+ Link reset:%s\n
+ VLAN mode: %s\n,
+ reg,
+ reg IXGB_CTRL0_LRST ? reset: normal,
+ reg IXGB_CTRL0_VME? enabled : disabled);
+
+ /* Device status register */
+ reg = regs_buff[2];
+ fprintf(stdout,
+ 0x00010: STATUS (Device status register) 0x%08X\n
+ Link up: %s\n
+ Bus type: %s\n
+ Bus speed: %s\n
+ Bus width: %s\n,
+
