Skip to content

Commit 02dc765

Browse files
committed
Merge branch 'fjes-next'
Taku Izumi says: ==================== FUJITSU Extended Socket driver version 1.2 This patchset updates FUJITSU Extended Socket network driver into version 1.2. This includes the following enhancements: - ethtool -d support - ethtool -S enhancement - ethtool -w/-W support - Add some debugging feature (tracepoints etc) v1 -> v2: - Use u64 instead of phys_addr_t as TP_STRUCT__entry - Use ethtool facility to achieve debug mode instead of using debugfs ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents 9c7664c + 8f87d77 commit 02dc765

File tree

9 files changed

+983
-11
lines changed

9 files changed

+983
-11
lines changed

drivers/net/fjes/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@
2727

2828
obj-$(CONFIG_FUJITSU_ES) += fjes.o
2929

30-
fjes-objs := fjes_main.o fjes_hw.o fjes_ethtool.o
30+
fjes-objs := fjes_main.o fjes_hw.o fjes_ethtool.o fjes_trace.o fjes_debugfs.o

drivers/net/fjes/fjes.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ struct fjes_adapter {
6666
bool interrupt_watch_enable;
6767

6868
struct fjes_hw hw;
69+
70+
#ifdef CONFIG_DEBUG_FS
71+
struct dentry *dbg_adapter;
72+
#endif
6973
};
7074

7175
extern char fjes_driver_name[];
@@ -74,4 +78,16 @@ extern const u32 fjes_support_mtu[];
7478

7579
void fjes_set_ethtool_ops(struct net_device *);
7680

81+
#ifdef CONFIG_DEBUG_FS
82+
void fjes_dbg_adapter_init(struct fjes_adapter *adapter);
83+
void fjes_dbg_adapter_exit(struct fjes_adapter *adapter);
84+
void fjes_dbg_init(void);
85+
void fjes_dbg_exit(void);
86+
#else
87+
static inline void fjes_dbg_adapter_init(struct fjes_adapter *adapter) {}
88+
static inline void fjes_dbg_adapter_exit(struct fjes_adapter *adapter) {}
89+
static inline void fjes_dbg_init(void) {}
90+
static inline void fjes_dbg_exit(void) {}
91+
#endif /* CONFIG_DEBUG_FS */
92+
7793
#endif /* FJES_H_ */

drivers/net/fjes/fjes_debugfs.c

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
/*
2+
* FUJITSU Extended Socket Network Device driver
3+
* Copyright (c) 2015-2016 FUJITSU LIMITED
4+
*
5+
* This program is free software; you can redistribute it and/or modify it
6+
* under the terms and conditions of the GNU General Public License,
7+
* version 2, as published by the Free Software Foundation.
8+
*
9+
* This program is distributed in the hope it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
12+
* more details.
13+
*
14+
* You should have received a copy of the GNU General Public License along with
15+
* this program; if not, see <http://www.gnu.org/licenses/>.
16+
*
17+
* The full GNU General Public License is included in this distribution in
18+
* the file called "COPYING".
19+
*
20+
*/
21+
22+
/* debugfs support for fjes driver */
23+
24+
#ifdef CONFIG_DEBUG_FS
25+
26+
#include <linux/debugfs.h>
27+
#include <linux/seq_file.h>
28+
#include <linux/platform_device.h>
29+
30+
#include "fjes.h"
31+
32+
static struct dentry *fjes_debug_root;
33+
34+
static const char * const ep_status_string[] = {
35+
"unshared",
36+
"shared",
37+
"waiting",
38+
"complete",
39+
};
40+
41+
static int fjes_dbg_status_show(struct seq_file *m, void *v)
42+
{
43+
struct fjes_adapter *adapter = m->private;
44+
struct fjes_hw *hw = &adapter->hw;
45+
int max_epid = hw->max_epid;
46+
int my_epid = hw->my_epid;
47+
int epidx;
48+
49+
seq_puts(m, "EPID\tSTATUS SAME_ZONE CONNECTED\n");
50+
for (epidx = 0; epidx < max_epid; epidx++) {
51+
if (epidx == my_epid) {
52+
seq_printf(m, "ep%d\t%-16c %-16c %-16c\n",
53+
epidx, '-', '-', '-');
54+
} else {
55+
seq_printf(m, "ep%d\t%-16s %-16c %-16c\n",
56+
epidx,
57+
ep_status_string[fjes_hw_get_partner_ep_status(hw, epidx)],
58+
fjes_hw_epid_is_same_zone(hw, epidx) ? 'Y' : 'N',
59+
fjes_hw_epid_is_shared(hw->hw_info.share, epidx) ? 'Y' : 'N');
60+
}
61+
}
62+
63+
return 0;
64+
}
65+
66+
static int fjes_dbg_status_open(struct inode *inode, struct file *file)
67+
{
68+
return single_open(file, fjes_dbg_status_show, inode->i_private);
69+
}
70+
71+
static const struct file_operations fjes_dbg_status_fops = {
72+
.owner = THIS_MODULE,
73+
.open = fjes_dbg_status_open,
74+
.read = seq_read,
75+
.llseek = seq_lseek,
76+
.release = single_release,
77+
};
78+
79+
void fjes_dbg_adapter_init(struct fjes_adapter *adapter)
80+
{
81+
const char *name = dev_name(&adapter->plat_dev->dev);
82+
struct dentry *pfile;
83+
84+
adapter->dbg_adapter = debugfs_create_dir(name, fjes_debug_root);
85+
if (!adapter->dbg_adapter) {
86+
dev_err(&adapter->plat_dev->dev,
87+
"debugfs entry for %s failed\n", name);
88+
return;
89+
}
90+
91+
pfile = debugfs_create_file("status", 0444, adapter->dbg_adapter,
92+
adapter, &fjes_dbg_status_fops);
93+
if (!pfile)
94+
dev_err(&adapter->plat_dev->dev,
95+
"debugfs status for %s failed\n", name);
96+
}
97+
98+
void fjes_dbg_adapter_exit(struct fjes_adapter *adapter)
99+
{
100+
debugfs_remove_recursive(adapter->dbg_adapter);
101+
adapter->dbg_adapter = NULL;
102+
}
103+
104+
void fjes_dbg_init(void)
105+
{
106+
fjes_debug_root = debugfs_create_dir(fjes_driver_name, NULL);
107+
if (!fjes_debug_root)
108+
pr_info("init of debugfs failed\n");
109+
}
110+
111+
void fjes_dbg_exit(void)
112+
{
113+
debugfs_remove_recursive(fjes_debug_root);
114+
fjes_debug_root = NULL;
115+
}
116+
117+
#endif /* CONFIG_DEBUG_FS */

drivers/net/fjes/fjes_ethtool.c

Lines changed: 180 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,18 @@ static const struct fjes_stats fjes_gstrings_stats[] = {
4949
FJES_STAT("tx_dropped", stats64.tx_dropped),
5050
};
5151

52+
#define FJES_EP_STATS_LEN 14
53+
#define FJES_STATS_LEN \
54+
(ARRAY_SIZE(fjes_gstrings_stats) + \
55+
((&((struct fjes_adapter *)netdev_priv(netdev))->hw)->max_epid - 1) * \
56+
FJES_EP_STATS_LEN)
57+
5258
static void fjes_get_ethtool_stats(struct net_device *netdev,
5359
struct ethtool_stats *stats, u64 *data)
5460
{
5561
struct fjes_adapter *adapter = netdev_priv(netdev);
62+
struct fjes_hw *hw = &adapter->hw;
63+
int epidx;
5664
char *p;
5765
int i;
5866

@@ -61,11 +69,39 @@ static void fjes_get_ethtool_stats(struct net_device *netdev,
6169
data[i] = (fjes_gstrings_stats[i].sizeof_stat == sizeof(u64))
6270
? *(u64 *)p : *(u32 *)p;
6371
}
72+
for (epidx = 0; epidx < hw->max_epid; epidx++) {
73+
if (epidx == hw->my_epid)
74+
continue;
75+
data[i++] = hw->ep_shm_info[epidx].ep_stats
76+
.com_regist_buf_exec;
77+
data[i++] = hw->ep_shm_info[epidx].ep_stats
78+
.com_unregist_buf_exec;
79+
data[i++] = hw->ep_shm_info[epidx].ep_stats.send_intr_rx;
80+
data[i++] = hw->ep_shm_info[epidx].ep_stats.send_intr_unshare;
81+
data[i++] = hw->ep_shm_info[epidx].ep_stats
82+
.send_intr_zoneupdate;
83+
data[i++] = hw->ep_shm_info[epidx].ep_stats.recv_intr_rx;
84+
data[i++] = hw->ep_shm_info[epidx].ep_stats.recv_intr_unshare;
85+
data[i++] = hw->ep_shm_info[epidx].ep_stats.recv_intr_stop;
86+
data[i++] = hw->ep_shm_info[epidx].ep_stats
87+
.recv_intr_zoneupdate;
88+
data[i++] = hw->ep_shm_info[epidx].ep_stats.tx_buffer_full;
89+
data[i++] = hw->ep_shm_info[epidx].ep_stats
90+
.tx_dropped_not_shared;
91+
data[i++] = hw->ep_shm_info[epidx].ep_stats
92+
.tx_dropped_ver_mismatch;
93+
data[i++] = hw->ep_shm_info[epidx].ep_stats
94+
.tx_dropped_buf_size_mismatch;
95+
data[i++] = hw->ep_shm_info[epidx].ep_stats
96+
.tx_dropped_vlanid_mismatch;
97+
}
6498
}
6599

66100
static void fjes_get_strings(struct net_device *netdev,
67101
u32 stringset, u8 *data)
68102
{
103+
struct fjes_adapter *adapter = netdev_priv(netdev);
104+
struct fjes_hw *hw = &adapter->hw;
69105
u8 *p = data;
70106
int i;
71107

@@ -76,6 +112,38 @@ static void fjes_get_strings(struct net_device *netdev,
76112
ETH_GSTRING_LEN);
77113
p += ETH_GSTRING_LEN;
78114
}
115+
for (i = 0; i < hw->max_epid; i++) {
116+
if (i == hw->my_epid)
117+
continue;
118+
sprintf(p, "ep%u_com_regist_buf_exec", i);
119+
p += ETH_GSTRING_LEN;
120+
sprintf(p, "ep%u_com_unregist_buf_exec", i);
121+
p += ETH_GSTRING_LEN;
122+
sprintf(p, "ep%u_send_intr_rx", i);
123+
p += ETH_GSTRING_LEN;
124+
sprintf(p, "ep%u_send_intr_unshare", i);
125+
p += ETH_GSTRING_LEN;
126+
sprintf(p, "ep%u_send_intr_zoneupdate", i);
127+
p += ETH_GSTRING_LEN;
128+
sprintf(p, "ep%u_recv_intr_rx", i);
129+
p += ETH_GSTRING_LEN;
130+
sprintf(p, "ep%u_recv_intr_unshare", i);
131+
p += ETH_GSTRING_LEN;
132+
sprintf(p, "ep%u_recv_intr_stop", i);
133+
p += ETH_GSTRING_LEN;
134+
sprintf(p, "ep%u_recv_intr_zoneupdate", i);
135+
p += ETH_GSTRING_LEN;
136+
sprintf(p, "ep%u_tx_buffer_full", i);
137+
p += ETH_GSTRING_LEN;
138+
sprintf(p, "ep%u_tx_dropped_not_shared", i);
139+
p += ETH_GSTRING_LEN;
140+
sprintf(p, "ep%u_tx_dropped_ver_mismatch", i);
141+
p += ETH_GSTRING_LEN;
142+
sprintf(p, "ep%u_tx_dropped_buf_size_mismatch", i);
143+
p += ETH_GSTRING_LEN;
144+
sprintf(p, "ep%u_tx_dropped_vlanid_mismatch", i);
145+
p += ETH_GSTRING_LEN;
146+
}
79147
break;
80148
}
81149
}
@@ -84,7 +152,7 @@ static int fjes_get_sset_count(struct net_device *netdev, int sset)
84152
{
85153
switch (sset) {
86154
case ETH_SS_STATS:
87-
return ARRAY_SIZE(fjes_gstrings_stats);
155+
return FJES_STATS_LEN;
88156
default:
89157
return -EOPNOTSUPP;
90158
}
@@ -121,12 +189,123 @@ static int fjes_get_settings(struct net_device *netdev,
121189
return 0;
122190
}
123191

192+
static int fjes_get_regs_len(struct net_device *netdev)
193+
{
194+
#define FJES_REGS_LEN 37
195+
return FJES_REGS_LEN * sizeof(u32);
196+
}
197+
198+
static void fjes_get_regs(struct net_device *netdev,
199+
struct ethtool_regs *regs, void *p)
200+
{
201+
struct fjes_adapter *adapter = netdev_priv(netdev);
202+
struct fjes_hw *hw = &adapter->hw;
203+
u32 *regs_buff = p;
204+
205+
memset(p, 0, FJES_REGS_LEN * sizeof(u32));
206+
207+
regs->version = 1;
208+
209+
/* Information registers */
210+
regs_buff[0] = rd32(XSCT_OWNER_EPID);
211+
regs_buff[1] = rd32(XSCT_MAX_EP);
212+
213+
/* Device Control registers */
214+
regs_buff[4] = rd32(XSCT_DCTL);
215+
216+
/* Command Control registers */
217+
regs_buff[8] = rd32(XSCT_CR);
218+
regs_buff[9] = rd32(XSCT_CS);
219+
regs_buff[10] = rd32(XSCT_SHSTSAL);
220+
regs_buff[11] = rd32(XSCT_SHSTSAH);
221+
222+
regs_buff[13] = rd32(XSCT_REQBL);
223+
regs_buff[14] = rd32(XSCT_REQBAL);
224+
regs_buff[15] = rd32(XSCT_REQBAH);
225+
226+
regs_buff[17] = rd32(XSCT_RESPBL);
227+
regs_buff[18] = rd32(XSCT_RESPBAL);
228+
regs_buff[19] = rd32(XSCT_RESPBAH);
229+
230+
/* Interrupt Control registers */
231+
regs_buff[32] = rd32(XSCT_IS);
232+
regs_buff[33] = rd32(XSCT_IMS);
233+
regs_buff[34] = rd32(XSCT_IMC);
234+
regs_buff[35] = rd32(XSCT_IG);
235+
regs_buff[36] = rd32(XSCT_ICTL);
236+
}
237+
238+
static int fjes_set_dump(struct net_device *netdev, struct ethtool_dump *dump)
239+
{
240+
struct fjes_adapter *adapter = netdev_priv(netdev);
241+
struct fjes_hw *hw = &adapter->hw;
242+
int ret = 0;
243+
244+
if (dump->flag) {
245+
if (hw->debug_mode)
246+
return -EPERM;
247+
248+
hw->debug_mode = dump->flag;
249+
250+
/* enable debug mode */
251+
mutex_lock(&hw->hw_info.lock);
252+
ret = fjes_hw_start_debug(hw);
253+
mutex_unlock(&hw->hw_info.lock);
254+
255+
if (ret)
256+
hw->debug_mode = 0;
257+
} else {
258+
if (!hw->debug_mode)
259+
return -EPERM;
260+
261+
/* disable debug mode */
262+
mutex_lock(&hw->hw_info.lock);
263+
ret = fjes_hw_stop_debug(hw);
264+
mutex_unlock(&hw->hw_info.lock);
265+
}
266+
267+
return ret;
268+
}
269+
270+
static int fjes_get_dump_flag(struct net_device *netdev,
271+
struct ethtool_dump *dump)
272+
{
273+
struct fjes_adapter *adapter = netdev_priv(netdev);
274+
struct fjes_hw *hw = &adapter->hw;
275+
276+
dump->len = hw->hw_info.trace_size;
277+
dump->version = 1;
278+
dump->flag = hw->debug_mode;
279+
280+
return 0;
281+
}
282+
283+
static int fjes_get_dump_data(struct net_device *netdev,
284+
struct ethtool_dump *dump, void *buf)
285+
{
286+
struct fjes_adapter *adapter = netdev_priv(netdev);
287+
struct fjes_hw *hw = &adapter->hw;
288+
int ret = 0;
289+
290+
if (hw->hw_info.trace)
291+
memcpy(buf, hw->hw_info.trace, hw->hw_info.trace_size);
292+
else
293+
ret = -EPERM;
294+
295+
return ret;
296+
}
297+
124298
static const struct ethtool_ops fjes_ethtool_ops = {
125299
.get_settings = fjes_get_settings,
126300
.get_drvinfo = fjes_get_drvinfo,
127301
.get_ethtool_stats = fjes_get_ethtool_stats,
128302
.get_strings = fjes_get_strings,
129303
.get_sset_count = fjes_get_sset_count,
304+
.get_regs = fjes_get_regs,
305+
.get_regs_len = fjes_get_regs_len,
306+
.set_dump = fjes_set_dump,
307+
.get_dump_flag = fjes_get_dump_flag,
308+
.get_dump_data = fjes_get_dump_data,
130309
};
131310

132311
void fjes_set_ethtool_ops(struct net_device *netdev)

0 commit comments

Comments
 (0)