Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 354133
b: refs/heads/master
c: c8b0a48
h: refs/heads/master
i:
  354131: 9271f44
v: v3
  • Loading branch information
Mark Einon authored and Greg Kroah-Hartman committed Jan 22, 2013
1 parent 90c4b10 commit b403bb4
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 37 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c095454e4b6acc8a5e7908647ec60d6088be90c8
refs/heads/master: c8b0a484ccf408cafa9e2ec6a2fad6701c8deec4
97 changes: 61 additions & 36 deletions trunk/drivers/staging/et131x/et131x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3456,51 +3456,76 @@ static void et131x_get_regs(struct net_device *netdev,
struct address_map __iomem *aregs = adapter->regs;
u32 *regs_buff = regs_data;
u32 num = 0;
u16 tmp;

memset(regs_data, 0, et131x_get_regs_len(netdev));

regs->version = (1 << 24) | (adapter->pdev->revision << 16) |
adapter->pdev->device;

/* PHY regs */
et131x_mii_read(adapter, MII_BMCR, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, MII_BMSR, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, MII_PHYSID1, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, MII_PHYSID2, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, MII_ADVERTISE, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, MII_LPA, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, MII_EXPANSION, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, MII_BMCR, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, MII_BMSR, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, MII_PHYSID1, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, MII_PHYSID2, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, MII_ADVERTISE, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, MII_LPA, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, MII_EXPANSION, &tmp);
regs_buff[num++] = tmp;
/* Autoneg next page transmit reg */
et131x_mii_read(adapter, 0x07, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, 0x07, &tmp);
regs_buff[num++] = tmp;
/* Link partner next page reg */
et131x_mii_read(adapter, 0x08, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, MII_CTRL1000, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, MII_STAT1000, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, 0x0b, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, 0x0c, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, MII_MMD_CTRL, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, MII_MMD_DATA, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, MII_ESTATUS, (u16 *)&regs_buff[num++]);

et131x_mii_read(adapter, PHY_INDEX_REG, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, PHY_DATA_REG, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, PHY_MPHY_CONTROL_REG,
(u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, PHY_LOOPBACK_CONTROL,
(u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, PHY_LOOPBACK_CONTROL+1,
(u16 *)&regs_buff[num++]);

et131x_mii_read(adapter, PHY_REGISTER_MGMT_CONTROL,
(u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, PHY_CONFIG, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, PHY_PHY_CONTROL, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, PHY_INTERRUPT_MASK, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, PHY_INTERRUPT_STATUS,
(u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, PHY_PHY_STATUS, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, PHY_LED_1, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, PHY_LED_2, (u16 *)&regs_buff[num++]);
et131x_mii_read(adapter, 0x08, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, MII_CTRL1000, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, MII_STAT1000, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, 0x0b, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, 0x0c, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, MII_MMD_CTRL, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, MII_MMD_DATA, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, MII_ESTATUS, &tmp);
regs_buff[num++] = tmp;

et131x_mii_read(adapter, PHY_INDEX_REG, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, PHY_DATA_REG, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, PHY_MPHY_CONTROL_REG, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, PHY_LOOPBACK_CONTROL, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, PHY_LOOPBACK_CONTROL + 1, &tmp);
regs_buff[num++] = tmp;

et131x_mii_read(adapter, PHY_REGISTER_MGMT_CONTROL, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, PHY_CONFIG, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, PHY_PHY_CONTROL, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, PHY_INTERRUPT_MASK, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, PHY_INTERRUPT_STATUS, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, PHY_PHY_STATUS, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, PHY_LED_1, &tmp);
regs_buff[num++] = tmp;
et131x_mii_read(adapter, PHY_LED_2, &tmp);
regs_buff[num++] = tmp;

/* Global regs */
regs_buff[num++] = readl(&aregs->global.txq_start_addr);
Expand Down

0 comments on commit b403bb4

Please sign in to comment.