AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] skge: expand ethtool debug register dump

Browse Source 
Expand the returned data for ethtool debug access to include
all of the mapped PCI area; except for the small set of registers
that are for diagnostic RAM access. Access to those registers
will hang the system.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Stephen Hemminger 2005-09-19 15:37:34 -07:00 committed by Jeff Garzik
parent 552709d5ae
commit c3f8be9618
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/net/skge.c
View File

@ -105,41 +105,28 @@ static const u32 rxirqmask[] = { IS_R1_F, IS_R2_F };
static const u32 txirqmask[] = { IS_XA1_F, IS_XA2_F }; static const u32 txirqmask[] = { IS_XA1_F, IS_XA2_F };
static const u32 portirqmask[] = { IS_PORT_1, IS_PORT_2 }; static const u32 portirqmask[] = { IS_PORT_1, IS_PORT_2 };
/* Don't need to look at whole 16K.
* last interesting register is descriptor poll timer.
*/
#define SKGE_REGS_LEN (29*128)
static int skge_get_regs_len(struct net_device *dev) static int skge_get_regs_len(struct net_device *dev)
{ {
return SKGE_REGS_LEN; return 0x4000;
} }
/* /*
* Returns copy of control register region * Returns copy of whole control register region
* I/O region is divided into banks and certain regions are unreadable * Note: skip RAM address register because accessing it will
* cause bus hangs!
*/ */
static void skge_get_regs(struct net_device *dev, struct ethtool_regs *regs, static void skge_get_regs(struct net_device *dev, struct ethtool_regs *regs,
void *p) void *p)
{ {
const struct skge_port *skge = netdev_priv(dev); const struct skge_port *skge = netdev_priv(dev);
unsigned long offs;
const void __iomem *io = skge->hw->regs; const void __iomem *io = skge->hw->regs;
static const unsigned long bankmap
= (1<<0) | (1<<2) | (1<<8) | (1<<9)
| (1<<12) | (1<<13) | (1<<14) | (1<<15) | (1<<16)
| (1<<17) | (1<<20) | (1<<21) | (1<<22) | (1<<23)
| (1<<24) | (1<<25) | (1<<26) | (1<<27) | (1<<28);
regs->version = 1; regs->version = 1;
for (offs = 0; offs < regs->len; offs += 128) { memset(p, 0, regs->len);
u32 len = min_t(u32, 128, regs->len - offs); memcpy_fromio(p, io, B3_RAM_ADDR);
if (bankmap & (1<<(offs/128))) memcpy_fromio(p + B3_RI_WTO_R1, io + B3_RI_WTO_R1,
memcpy_fromio(p + offs, io + offs, len); regs->len - B3_RI_WTO_R1);
else
memset(p + offs, 0, len);
}
} }
/* Wake on Lan only supported on Yukon chps with rev 1 or above */ /* Wake on Lan only supported on Yukon chps with rev 1 or above */