Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150237
b: refs/heads/master
c: 6bc5046
h: refs/heads/master
i:
  150235: 706f23e
v: v3
  • Loading branch information
Ben Hutchings authored and David S. Miller committed May 18, 2009
1 parent 516a098 commit 0de4118
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 74 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e0b221bf4e07edf2fda645e457dc3c35c2f2f3a9
refs/heads/master: 6bc5046e6df7d7122631c82ccaa6edf7085331ac
16 changes: 2 additions & 14 deletions trunk/drivers/net/sfc/tenxpress.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,6 @@
*/
#define MAX_BAD_LP_TRIES (5)

/* LASI Control */
#define PMA_PMD_LASI_CTRL 36866
#define PMA_PMD_LASI_STATUS 36869
#define PMA_PMD_LS_ALARM_LBN 0
#define PMA_PMD_LS_ALARM_WIDTH 1
#define PMA_PMD_TX_ALARM_LBN 1
#define PMA_PMD_TX_ALARM_WIDTH 1
#define PMA_PMD_RX_ALARM_LBN 2
#define PMA_PMD_RX_ALARM_WIDTH 1
#define PMA_PMD_AN_ALARM_LBN 3
#define PMA_PMD_AN_ALARM_WIDTH 1

/* Extended control register */
#define PMA_PMD_XCONTROL_REG 49152
#define PMA_PMD_EXT_GMII_EN_LBN 1
Expand Down Expand Up @@ -579,8 +567,8 @@ static void tenxpress_phy_poll(struct efx_nic *efx)
change = true;
} else {
int status = efx_mdio_read(efx, MDIO_MMD_PMAPMD,
PMA_PMD_LASI_STATUS);
if (status & (1 << PMA_PMD_LS_ALARM_LBN))
MDIO_PMA_LASI_STAT);
if (status & MDIO_PMA_LASI_LSALARM)
change = true;
}

Expand Down
57 changes: 0 additions & 57 deletions trunk/drivers/net/sfc/xenpack.h

This file was deleted.

4 changes: 2 additions & 2 deletions trunk/drivers/net/sfc/xfp_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <linux/delay.h>
#include "efx.h"
#include "mdio_10g.h"
#include "xenpack.h"
#include "phy.h"
#include "falcon.h"

Expand Down Expand Up @@ -169,7 +168,8 @@ static int xfp_phy_init(struct efx_nic *efx)

static void xfp_phy_clear_interrupt(struct efx_nic *efx)
{
xenpack_clear_lasi_irqs(efx);
/* Read to clear link status alarm */
efx_mdio_read(efx, MDIO_MMD_PMAPMD, MDIO_PMA_LASI_STAT);
}

static int xfp_link_ok(struct efx_nic *efx)
Expand Down

0 comments on commit 0de4118

Please sign in to comment.