Skip to content

Commit d1d1b53

Browse files
Nicolas Ferredavem330
authored andcommitted
net/macb: ethtool interface: add register dump feature
Add macb_get_regs() ethtool function and its helper function: macb_get_regs_len(). The version field is deduced from the IP revision which gives the "MACB or GEM" information. An additional version field is reserved. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Reviewed-by: Ben Hutchings <bhutchings@solarflare.com> Tested-by: Joachim Eastwood <manabian@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 55054a1 commit d1d1b53

File tree

2 files changed

+43
-0
lines changed

2 files changed

+43
-0
lines changed

drivers/net/ethernet/cadence/macb.c

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,9 +1273,49 @@ static int macb_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
12731273
return phy_ethtool_sset(phydev, cmd);
12741274
}
12751275

1276+
static int macb_get_regs_len(struct net_device *netdev)
1277+
{
1278+
return MACB_GREGS_NBR * sizeof(u32);
1279+
}
1280+
1281+
static void macb_get_regs(struct net_device *dev, struct ethtool_regs *regs,
1282+
void *p)
1283+
{
1284+
struct macb *bp = netdev_priv(dev);
1285+
unsigned int tail, head;
1286+
u32 *regs_buff = p;
1287+
1288+
regs->version = (macb_readl(bp, MID) & ((1 << MACB_REV_SIZE) - 1))
1289+
| MACB_GREGS_VERSION;
1290+
1291+
tail = macb_tx_ring_wrap(bp->tx_tail);
1292+
head = macb_tx_ring_wrap(bp->tx_head);
1293+
1294+
regs_buff[0] = macb_readl(bp, NCR);
1295+
regs_buff[1] = macb_or_gem_readl(bp, NCFGR);
1296+
regs_buff[2] = macb_readl(bp, NSR);
1297+
regs_buff[3] = macb_readl(bp, TSR);
1298+
regs_buff[4] = macb_readl(bp, RBQP);
1299+
regs_buff[5] = macb_readl(bp, TBQP);
1300+
regs_buff[6] = macb_readl(bp, RSR);
1301+
regs_buff[7] = macb_readl(bp, IMR);
1302+
1303+
regs_buff[8] = tail;
1304+
regs_buff[9] = head;
1305+
regs_buff[10] = macb_tx_dma(bp, tail);
1306+
regs_buff[11] = macb_tx_dma(bp, head);
1307+
1308+
if (macb_is_gem(bp)) {
1309+
regs_buff[12] = gem_readl(bp, USRIO);
1310+
regs_buff[13] = gem_readl(bp, DMACFG);
1311+
}
1312+
}
1313+
12761314
const struct ethtool_ops macb_ethtool_ops = {
12771315
.get_settings = macb_get_settings,
12781316
.set_settings = macb_set_settings,
1317+
.get_regs_len = macb_get_regs_len,
1318+
.get_regs = macb_get_regs,
12791319
.get_link = ethtool_op_get_link,
12801320
.get_ts_info = ethtool_op_get_ts_info,
12811321
};

drivers/net/ethernet/cadence/macb.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
#ifndef _MACB_H
1111
#define _MACB_H
1212

13+
#define MACB_GREGS_NBR 16
14+
#define MACB_GREGS_VERSION 1
15+
1316
/* MACB register offsets */
1417
#define MACB_NCR 0x0000
1518
#define MACB_NCFGR 0x0004

0 commit comments

Comments
 (0)