|
 |
149f89 |
From 1be465a88eb247b78ddbc3129f53cc547ce8687b Mon Sep 17 00:00:00 2001
|
|
|
149f89 |
From: Taku Izumi <izumi.taku@jp.fujitsu.com>
|
|
|
149f89 |
Date: Wed, 16 Nov 2016 09:55:32 +0900
|
|
|
149f89 |
Subject: [PATCH 1/3] ethtool: add register dump support for fjes driver
|
|
|
149f89 |
|
|
|
149f89 |
This patch adds the register dump format for FUJITSU Extended
|
|
|
149f89 |
Network device like the following:
|
|
|
149f89 |
|
|
|
149f89 |
# ethtool -d es0
|
|
|
149f89 |
|
|
|
149f89 |
0x0000: OWNER_EPID (Owner EPID) 0x00000001
|
|
|
149f89 |
0x0004: MAX_EP (Maximum EP) 0x00000008
|
|
|
149f89 |
0x0010: DCTL (Device Control) 0x00000000
|
|
|
149f89 |
0x0020: CR (Command request) 0x80000002
|
|
|
149f89 |
0x0024: CS (Command status) 0x80000002
|
|
|
149f89 |
0x0028: SHSTSAL (Share status address Low) 0xE8215304
|
|
|
149f89 |
0x002C: SHSTSAH (Share status address High) 0x00000007
|
|
|
149f89 |
0x0034: REQBL (Request Buffer length) 0x00008028
|
|
|
149f89 |
0x0038: REQBAL (Request Buffer Address Low) 0xEB0A0000
|
|
|
149f89 |
0x003C: REQBAH (Request Buffer Address High) 0x00000007
|
|
|
149f89 |
0x0044: RESPBL (Response Buffer Length) 0x00000018
|
|
|
149f89 |
0x0048: RESPBAL (Response Buffer Address Low) 0xE41E1220
|
|
|
149f89 |
0x004C: RESPBAH (Response Buffer Address High) 0x00000007
|
|
|
149f89 |
0x0080: IS (Interrupt status) 0x00000000
|
|
|
149f89 |
0x0084: IMS (Interrupt mask set) 0x7FE00000
|
|
|
149f89 |
0x0088: IMC (Interrupt mask clear) 0x001F0000
|
|
|
149f89 |
0x008C: IG (Interrupt generator) 0x00010000
|
|
|
149f89 |
0x0090: ICTL (Interrupt control) 0x00000000
|
|
|
149f89 |
|
|
|
149f89 |
Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
|
|
|
149f89 |
Signed-off-by: John W. Linville <linville@tuxdriver.com>
|
|
|
149f89 |
(cherry picked from commit acc3d3a32940cdd3325520d212fa94f44b86ed09)
|
|
|
149f89 |
---
|
|
|
149f89 |
Makefile.am | 2 +-
|
|
|
149f89 |
ethtool.c | 1 +
|
|
|
149f89 |
fjes.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
149f89 |
internal.h | 2 ++
|
|
|
149f89 |
4 files changed, 93 insertions(+), 1 deletion(-)
|
|
|
149f89 |
create mode 100644 fjes.c
|
|
|
149f89 |
|
|
|
149f89 |
diff --git a/Makefile.am b/Makefile.am
|
|
|
149f89 |
index de2db2e..edbda57 100644
|
|
|
149f89 |
--- a/Makefile.am
|
|
|
149f89 |
+++ b/Makefile.am
|
|
|
149f89 |
@@ -14,7 +14,7 @@ ethtool_SOURCES += \
|
|
|
149f89 |
pcnet32.c realtek.c tg3.c marvell.c vioc.c \
|
|
|
149f89 |
smsc911x.c at76c50x-usb.c sfc.c stmmac.c \
|
|
|
149f89 |
sff-common.c sff-common.h sfpid.c sfpdiag.c \
|
|
|
149f89 |
- ixgbevf.c tse.c vmxnet3.c qsfp.c qsfp.h
|
|
|
149f89 |
+ ixgbevf.c tse.c vmxnet3.c qsfp.c qsfp.h fjes.c
|
|
|
149f89 |
endif
|
|
|
149f89 |
|
|
|
149f89 |
TESTS = test-cmdline test-features
|
|
|
149f89 |
diff --git a/ethtool.c b/ethtool.c
|
|
|
149f89 |
index 49ac94e..75299c6 100644
|
|
|
149f89 |
--- a/ethtool.c
|
|
|
149f89 |
+++ b/ethtool.c
|
|
|
149f89 |
@@ -1136,6 +1136,7 @@ static const struct {
|
|
|
149f89 |
{ "et131x", et131x_dump_regs },
|
|
|
149f89 |
{ "altera_tse", altera_tse_dump_regs },
|
|
|
149f89 |
{ "vmxnet3", vmxnet3_dump_regs },
|
|
|
149f89 |
+ { "fjes", fjes_dump_regs },
|
|
|
149f89 |
#endif
|
|
|
149f89 |
};
|
|
|
149f89 |
|
|
|
149f89 |
diff --git a/fjes.c b/fjes.c
|
|
|
149f89 |
new file mode 100644
|
|
|
149f89 |
index 0000000..52f7c28
|
|
|
149f89 |
--- /dev/null
|
|
|
149f89 |
+++ b/fjes.c
|
|
|
149f89 |
@@ -0,0 +1,89 @@
|
|
|
149f89 |
+/* Copyright (c) 2016 FUJITSU LIMITED */
|
|
|
149f89 |
+#include <stdio.h>
|
|
|
149f89 |
+#include "internal.h"
|
|
|
149f89 |
+
|
|
|
149f89 |
+int fjes_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
|
|
|
149f89 |
+{
|
|
|
149f89 |
+ u32 *regs_buff = (u32 *)regs->data;
|
|
|
149f89 |
+
|
|
|
149f89 |
+ if (regs->version != 1)
|
|
|
149f89 |
+ return -1;
|
|
|
149f89 |
+
|
|
|
149f89 |
+ /* Information registers */
|
|
|
149f89 |
+ fprintf(stdout,
|
|
|
149f89 |
+ "0x0000: OWNER_EPID (Owner EPID) 0x%08X\n",
|
|
|
149f89 |
+ regs_buff[0]);
|
|
|
149f89 |
+
|
|
|
149f89 |
+ fprintf(stdout,
|
|
|
149f89 |
+ "0x0004: MAX_EP (Maximum EP) 0x%08X\n",
|
|
|
149f89 |
+ regs_buff[1]);
|
|
|
149f89 |
+
|
|
|
149f89 |
+ /* Device Control registers */
|
|
|
149f89 |
+ fprintf(stdout,
|
|
|
149f89 |
+ "0x0010: DCTL (Device Control) 0x%08X\n",
|
|
|
149f89 |
+ regs_buff[4]);
|
|
|
149f89 |
+
|
|
|
149f89 |
+ /* Command Control registers */
|
|
|
149f89 |
+ fprintf(stdout,
|
|
|
149f89 |
+ "0x0020: CR (Command request) 0x%08X\n",
|
|
|
149f89 |
+ regs_buff[8]);
|
|
|
149f89 |
+
|
|
|
149f89 |
+ fprintf(stdout,
|
|
|
149f89 |
+ "0x0024: CS (Command status) 0x%08X\n",
|
|
|
149f89 |
+ regs_buff[9]);
|
|
|
149f89 |
+
|
|
|
149f89 |
+ fprintf(stdout,
|
|
|
149f89 |
+ "0x0028: SHSTSAL (Share status address Low) 0x%08X\n",
|
|
|
149f89 |
+ regs_buff[10]);
|
|
|
149f89 |
+
|
|
|
149f89 |
+ fprintf(stdout,
|
|
|
149f89 |
+ "0x002C: SHSTSAH (Share status address High) 0x%08X\n",
|
|
|
149f89 |
+ regs_buff[11]);
|
|
|
149f89 |
+
|
|
|
149f89 |
+ fprintf(stdout,
|
|
|
149f89 |
+ "0x0034: REQBL (Request Buffer length) 0x%08X\n",
|
|
|
149f89 |
+ regs_buff[13]);
|
|
|
149f89 |
+
|
|
|
149f89 |
+ fprintf(stdout,
|
|
|
149f89 |
+ "0x0038: REQBAL (Request Buffer Address Low) 0x%08X\n",
|
|
|
149f89 |
+ regs_buff[14]);
|
|
|
149f89 |
+
|
|
|
149f89 |
+ fprintf(stdout,
|
|
|
149f89 |
+ "0x003C: REQBAH (Request Buffer Address High) 0x%08X\n",
|
|
|
149f89 |
+ regs_buff[15]);
|
|
|
149f89 |
+
|
|
|
149f89 |
+ fprintf(stdout,
|
|
|
149f89 |
+ "0x0044: RESPBL (Response Buffer Length) 0x%08X\n",
|
|
|
149f89 |
+ regs_buff[17]);
|
|
|
149f89 |
+
|
|
|
149f89 |
+ fprintf(stdout,
|
|
|
149f89 |
+ "0x0048: RESPBAL (Response Buffer Address Low) 0x%08X\n",
|
|
|
149f89 |
+ regs_buff[18]);
|
|
|
149f89 |
+
|
|
|
149f89 |
+ fprintf(stdout,
|
|
|
149f89 |
+ "0x004C: RESPBAH (Response Buffer Address High) 0x%08X\n",
|
|
|
149f89 |
+ regs_buff[19]);
|
|
|
149f89 |
+
|
|
|
149f89 |
+ /* Interrupt Control registers */
|
|
|
149f89 |
+ fprintf(stdout,
|
|
|
149f89 |
+ "0x0080: IS (Interrupt status) 0x%08X\n",
|
|
|
149f89 |
+ regs_buff[32]);
|
|
|
149f89 |
+
|
|
|
149f89 |
+ fprintf(stdout,
|
|
|
149f89 |
+ "0x0084: IMS (Interrupt mask set) 0x%08X\n",
|
|
|
149f89 |
+ regs_buff[33]);
|
|
|
149f89 |
+
|
|
|
149f89 |
+ fprintf(stdout,
|
|
|
149f89 |
+ "0x0088: IMC (Interrupt mask clear) 0x%08X\n",
|
|
|
149f89 |
+ regs_buff[34]);
|
|
|
149f89 |
+
|
|
|
149f89 |
+ fprintf(stdout,
|
|
|
149f89 |
+ "0x008C: IG (Interrupt generator) 0x%08X\n",
|
|
|
149f89 |
+ regs_buff[35]);
|
|
|
149f89 |
+
|
|
|
149f89 |
+ fprintf(stdout,
|
|
|
149f89 |
+ "0x0090: ICTL (Interrupt control) 0x%08X\n",
|
|
|
149f89 |
+ regs_buff[36]);
|
|
|
149f89 |
+
|
|
|
149f89 |
+ return 0;
|
|
|
149f89 |
+}
|
|
|
149f89 |
diff --git a/internal.h b/internal.h
|
|
|
149f89 |
index 3c08b74..4e658ea 100644
|
|
|
149f89 |
--- a/internal.h
|
|
|
149f89 |
+++ b/internal.h
|
|
|
149f89 |
@@ -348,4 +348,6 @@ void sff8472_show_all(const __u8 *id);
|
|
|
149f89 |
/* QSFP Optics diagnostics */
|
|
|
149f89 |
void sff8636_show_all(const __u8 *id, __u32 eeprom_len);
|
|
|
149f89 |
|
|
|
149f89 |
+/* FUJITSU Extended Socket network device */
|
|
|
149f89 |
+int fjes_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs);
|
|
|
149f89 |
#endif /* ETHTOOL_INTERNAL_H__ */
|
|
|
149f89 |
--
|
|
|
149f89 |
1.8.3.1
|
|
|
149f89 |
|