kernel: bump 5.4 to 5.4.153
[openwrt/staging/chunkeey.git] / target / linux / layerscape / patches-5.4 / 809-jailhouse-0008-ivshmem-net-Add-ethtool-register-dump.patch
1 From 65e624b3708cb35942297f699d886aa4c8a7e613 Mon Sep 17 00:00:00 2001
2 From: Jan Kiszka <jan.kiszka@siemens.com>
3 Date: Sun, 1 Jan 2017 15:46:26 +0100
4 Subject: [PATCH] ivshmem-net: Add ethtool register dump
5
6 Helps debugging inconsistent states.
7
8 Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
9 (cherry picked from commit 81674136b6936fb8219dac1dcdb6df8fe424143d)
10 ---
11 drivers/net/ivshmem-net.c | 31 +++++++++++++++++++++++++++++++
12 1 file changed, 31 insertions(+)
13
14 --- a/drivers/net/ivshmem-net.c
15 +++ b/drivers/net/ivshmem-net.c
16 @@ -748,10 +748,41 @@ static void ivshm_net_get_ethtool_stats(
17 memset(&in->stats, 0, sizeof(in->stats));
18 }
19
20 +#define IVSHM_NET_REGS_LEN (3 * sizeof(u32) + 6 * sizeof(u16))
21 +
22 +static int ivshm_net_get_regs_len(struct net_device *ndev)
23 +{
24 + return IVSHM_NET_REGS_LEN;
25 +}
26 +
27 +static void ivshm_net_get_regs(struct net_device *ndev,
28 + struct ethtool_regs *regs, void *p)
29 +{
30 + struct ivshm_net *in = netdev_priv(ndev);
31 + u32 *reg32 = p;
32 + u16 *reg16;
33 +
34 + *reg32++ = in->lstate;
35 + *reg32++ = in->rstate;
36 + *reg32++ = in->qlen;
37 +
38 + reg16 = (u16 *)reg32;
39 +
40 + *reg16++ = in->tx.vr.avail ? in->tx.vr.avail->idx : 0;
41 + *reg16++ = in->tx.vr.used ? in->tx.vr.used->idx : 0;
42 + *reg16++ = in->tx.vr.avail ? vring_avail_event(&in->tx.vr) : 0;
43 +
44 + *reg16++ = in->rx.vr.avail ? in->rx.vr.avail->idx : 0;
45 + *reg16++ = in->rx.vr.used ? in->rx.vr.used->idx : 0;
46 + *reg16++ = in->rx.vr.avail ? vring_avail_event(&in->rx.vr) : 0;
47 +}
48 +
49 static const struct ethtool_ops ivshm_net_ethtool_ops = {
50 .get_sset_count = ivshm_net_get_sset_count,
51 .get_strings = ivshm_net_get_strings,
52 .get_ethtool_stats = ivshm_net_get_ethtool_stats,
53 + .get_regs_len = ivshm_net_get_regs_len,
54 + .get_regs = ivshm_net_get_regs,
55 };
56
57 static int ivshm_net_probe(struct pci_dev *pdev,