From 14004d1a4d4b5b155e1c94da222388167456c3cd Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Tue, 8 Nov 2005 12:24:23 -0800
Subject: [PATCH] ethtool: Format register dump for tg3

Format output of "ethtool -d" for tg3 devices to make it more
readable. Each register is displayed as a 32-bit value and the
undefined regions in the register space are skipped.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---
 ethtool-util.h |  3 +++
 ethtool.c      |  1 +
 tg3.c          | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/ethtool-util.h b/ethtool-util.h
index e95d75c..7d6638e 100644
--- a/ethtool-util.h
+++ b/ethtool-util.h
@@ -42,4 +42,7 @@ int fec_8xx_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs);
 /* PowerPC 4xx on-chip Ethernet controller */
 int ibm_emac_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);
+
 #endif
diff --git a/ethtool.c b/ethtool.c
index 4ee0f90..cc204ab 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -936,6 +936,7 @@ static struct {
 	{ "pcnet32", pcnet32_dump_regs },
 	{ "fec_8xx", fec_8xx_dump_regs },
 	{ "ibm_emac", ibm_emac_dump_regs },
+	{ "tg3", tg3_dump_regs },
 };
 
 static int dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
diff --git a/tg3.c b/tg3.c
index 97613e9..1ce07a8 100644
--- a/tg3.c
+++ b/tg3.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <string.h>
 #include "ethtool-util.h"
 
 #define TG3_MAGIC 0x669955aa
@@ -21,3 +22,37 @@ tg3_dump_eeprom(struct ethtool_drvinfo *info, struct ethtool_eeprom *ee)
 
 	return 0;
 }
+
+int
+tg3_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
+{
+	int i, j;
+	int reg_boundaries[] = { 0x015c, 0x0200, 0x0400, 0x0400, 0x08f0, 0x0c00,
+	       			 0x0ce0, 0x1000, 0x1004, 0x1400, 0x1480, 0x1800,
+				 0x1848, 0x1c00, 0x1c04, 0x2000, 0x225c, 0x2400,
+				 0x24c4, 0x2800, 0x2804, 0x2c00, 0x2c20, 0x3000,
+				 0x3014, 0x3400, 0x3408, 0x3800, 0x3808, 0x3c00,
+				 0x3d00, 0x4000, 0x4010, 0x4400, 0x4458, 0x4800,
+				 0x4808, 0x4c00, 0x4c08, 0x5000, 0x5280, 0x5400,
+				 0x5680, 0x5800, 0x5a10, 0x5c00, 0x5d20, 0x6000,
+				 0x600c, 0x6800, 0x6848, 0x7000, 0x7034, 0x7c00,
+				 0x7e40, 0x8000 };
+
+	fprintf(stdout, "Offset\tValue\n");
+	fprintf(stdout, "------\t----------\n");
+	for (i = 0, j = 0; i < regs->len; ) {
+		u32 reg;
+
+		memcpy(&reg, &regs->data[i], 4);
+		fprintf(stdout, "0x%04x\t0x%08x\n", i, reg);
+
+		i += 4;
+		if (i == reg_boundaries[j]) {
+			i = reg_boundaries[j + 1];
+			j += 2;
+			fprintf(stdout, "\n");
+		}
+	}
+	fprintf(stdout, "\n");
+	return 0;
+}
-- 
cgit v1.2.1