diff options
Diffstat (limited to 'drivers/net/jme.c')
| -rw-r--r-- | drivers/net/jme.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c index c3873879003b..e10d9f38662c 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c | |||
| @@ -435,15 +435,18 @@ jme_check_link(struct net_device *netdev, int testonly) | |||
| 435 | GHC_DPX); | 435 | GHC_DPX); |
| 436 | switch (phylink & PHY_LINK_SPEED_MASK) { | 436 | switch (phylink & PHY_LINK_SPEED_MASK) { |
| 437 | case PHY_LINK_SPEED_10M: | 437 | case PHY_LINK_SPEED_10M: |
| 438 | ghc |= GHC_SPEED_10M; | 438 | ghc |= GHC_SPEED_10M | |
| 439 | GHC_TO_CLK_PCIE | GHC_TXMAC_CLK_PCIE; | ||
| 439 | strcat(linkmsg, "10 Mbps, "); | 440 | strcat(linkmsg, "10 Mbps, "); |
| 440 | break; | 441 | break; |
| 441 | case PHY_LINK_SPEED_100M: | 442 | case PHY_LINK_SPEED_100M: |
| 442 | ghc |= GHC_SPEED_100M; | 443 | ghc |= GHC_SPEED_100M | |
| 444 | GHC_TO_CLK_PCIE | GHC_TXMAC_CLK_PCIE; | ||
| 443 | strcat(linkmsg, "100 Mbps, "); | 445 | strcat(linkmsg, "100 Mbps, "); |
| 444 | break; | 446 | break; |
| 445 | case PHY_LINK_SPEED_1000M: | 447 | case PHY_LINK_SPEED_1000M: |
| 446 | ghc |= GHC_SPEED_1000M; | 448 | ghc |= GHC_SPEED_1000M | |
| 449 | GHC_TO_CLK_GPHY | GHC_TXMAC_CLK_GPHY; | ||
| 447 | strcat(linkmsg, "1000 Mbps, "); | 450 | strcat(linkmsg, "1000 Mbps, "); |
| 448 | break; | 451 | break; |
| 449 | default: | 452 | default: |
| @@ -463,14 +466,6 @@ jme_check_link(struct net_device *netdev, int testonly) | |||
| 463 | TXTRHD_TXREN | | 466 | TXTRHD_TXREN | |
| 464 | ((8 << TXTRHD_TXRL_SHIFT) & TXTRHD_TXRL)); | 467 | ((8 << TXTRHD_TXRL_SHIFT) & TXTRHD_TXRL)); |
| 465 | } | 468 | } |
| 466 | strcat(linkmsg, (phylink & PHY_LINK_DUPLEX) ? | ||
| 467 | "Full-Duplex, " : | ||
| 468 | "Half-Duplex, "); | ||
| 469 | |||
| 470 | if (phylink & PHY_LINK_MDI_STAT) | ||
| 471 | strcat(linkmsg, "MDI-X"); | ||
| 472 | else | ||
| 473 | strcat(linkmsg, "MDI"); | ||
| 474 | 469 | ||
| 475 | gpreg1 = GPREG1_DEFAULT; | 470 | gpreg1 = GPREG1_DEFAULT; |
| 476 | if (is_buggy250(jme->pdev->device, jme->chiprev)) { | 471 | if (is_buggy250(jme->pdev->device, jme->chiprev)) { |
| @@ -492,11 +487,17 @@ jme_check_link(struct net_device *netdev, int testonly) | |||
| 492 | break; | 487 | break; |
| 493 | } | 488 | } |
| 494 | } | 489 | } |
| 495 | jwrite32(jme, JME_GPREG1, gpreg1); | ||
| 496 | 490 | ||
| 497 | jme->reg_ghc = ghc; | 491 | jwrite32(jme, JME_GPREG1, gpreg1); |
| 498 | jwrite32(jme, JME_GHC, ghc); | 492 | jwrite32(jme, JME_GHC, ghc); |
| 493 | jme->reg_ghc = ghc; | ||
| 499 | 494 | ||
| 495 | strcat(linkmsg, (phylink & PHY_LINK_DUPLEX) ? | ||
| 496 | "Full-Duplex, " : | ||
| 497 | "Half-Duplex, "); | ||
| 498 | strcat(linkmsg, (phylink & PHY_LINK_MDI_STAT) ? | ||
| 499 | "MDI-X" : | ||
| 500 | "MDI"); | ||
| 500 | msg_link(jme, "Link is up at %s.\n", linkmsg); | 501 | msg_link(jme, "Link is up at %s.\n", linkmsg); |
| 501 | netif_carrier_on(netdev); | 502 | netif_carrier_on(netdev); |
| 502 | } else { | 503 | } else { |