Thread (15 messages) 15 messages, 2 authors, 2011-03-11

[net-next-2.6 08/11] e1000e: do not toggle LANPHYPC value bit when PHY reset is blocked

flat view
STALE5700d SUPERSEDED: 1 (0M)

From: Jeff Kirsher <hidden>
Date: 2011-03-11 11:06:51
Subsystem: networking drivers, the rest · Maintainers: Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds

Revision v1 of 149 in this series; 1 review trailer.

Revisions (149)
  1. v1
  2. v2 [diff vs current]
  3. v1
  4. v1
  5. v1 current
  6. v1
  7. v1
  8. v1
  9. v1
  10. v2 [diff vs current]
  11. v1
  12. v3 [diff vs current]
  13. v1
  14. v1
  15. v1
  16. v2 [diff vs current]
  17. v2 [diff vs current]
  18. v1
  19. v1
  20. v1
  21. v2 [diff vs current]
  22. v1
  23. v1
  24. v1
  25. v1
  26. v1
  27. v2 [diff vs current]
  28. v1
  29. v1
  30. v1
  31. v1
  32. v1
  33. v1
  34. v1
  35. v1
  36. v1
  37. v1
  38. v1
  39. v1
  40. v1
  41. v1
  42. v1
  43. v1
  44. v1
  45. v1
  46. v1
  47. v1
  48. v1
  49. v1
  50. v1
  51. v1
  52. v1
  53. v2 [diff vs current]
  54. v1
  55. v1
  56. v1
  57. v1
  58. v2 [diff vs current]
  59. v1
  60. v1
  61. v2 [diff vs current]
  62. v1
  63. v2 [diff vs current]
  64. v1
  65. v1
  66. v1
  67. v1
  68. v1
  69. v1
  70. v1
  71. v1
  72. v2 [diff vs current]
  73. v1
  74. v1
  75. v2 [diff vs current]
  76. v1
  77. v1
  78. v1
  79. v1
  80. v1
  81. v1
  82. v2 [diff vs current]
  83. v1
  84. v2 [diff vs current]
  85. v2 [diff vs current]
  86. v1
  87. v2 [diff vs current]
  88. v3 [diff vs current]
  89. v1
  90. v4 [diff vs current]
  91. v1
  92. v5 [diff vs current]
  93. v6 [diff vs current]
  94. v7 [diff vs current]
  95. v1
  96. v1
  97. v1
  98. v2 [diff vs current]
  99. v1
  100. v1
  101. v1
  102. v1
  103. v1
  104. v1
  105. v1
  106. v2 [diff vs current]
  107. v1
  108. v1
  109. v2 [diff vs current]
  110. v3 [diff vs current]
  111. v4 [diff vs current]
  112. v1
  113. v1
  114. v2 [diff vs current]
  115. v5 [diff vs current]
  116. v1
  117. v1
  118. v1
  119. v2 [diff vs current]
  120. v1
  121. v1
  122. v2 [diff vs current]
  123. v3 [diff vs current]
  124. v1
  125. v2 [diff vs current]
  126. v1
  127. v1
  128. v2 [diff vs current]
  129. v1
  130. v2 [diff vs current]
  131. v1
  132. v2 [diff vs current]
  133. v3 [diff vs current]
  134. v1
  135. v1
  136. v1
  137. v2 [diff vs current]
  138. v1
  139. v1
  140. v1
  141. v1
  142. v1
  143. v2 [diff vs current]
  144. v1
  145. v1
  146. v1
  147. v2 [diff vs current]
  148. v1
  149. v1 
From: Bruce Allan <redacted>

When PHY reset is intentionally blocked on 82577/8/9, do not toggle the
LANPHYPC value bit (essentially performing a hard power reset of the
device) otherwise the PHY can be put into an unknown state.

Cleanup whitespace in the same function.

Signed-off-by: Bruce Allan <redacted>
Tested-by: Jeff Pieper <redacted>
Signed-off-by: Jeff Kirsher <redacted>
---
 drivers/net/e1000e/ich8lan.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index cf18d65..9b434c0 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -307,9 +307,9 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
 	 * the interconnect to PCIe mode.
 	 */
 	fwsm = er32(FWSM);
-	if (!(fwsm & E1000_ICH_FWSM_FW_VALID)) {
+	if (!(fwsm & E1000_ICH_FWSM_FW_VALID) && !e1000_check_reset_block(hw)) {
 		ctrl = er32(CTRL);
-		ctrl |=  E1000_CTRL_LANPHYPC_OVERRIDE;
+		ctrl |= E1000_CTRL_LANPHYPC_OVERRIDE;
 		ctrl &= ~E1000_CTRL_LANPHYPC_VALUE;
 		ew32(CTRL, ctrl);
 		udelay(10);
@@ -336,7 +336,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
 		goto out;
 
 	/* Ungate automatic PHY configuration on non-managed 82579 */
-	if ((hw->mac.type == e1000_pch2lan)  &&
+	if ((hw->mac.type == e1000_pch2lan) &&
 	    !(fwsm & E1000_ICH_FWSM_FW_VALID)) {
 		msleep(10);
 		e1000_gate_hw_phy_config_ich8lan(hw, false);
@@ -371,7 +371,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
 	case e1000_phy_82579:
 		phy->ops.check_polarity = e1000_check_polarity_82577;
 		phy->ops.force_speed_duplex =
-			e1000_phy_force_speed_duplex_82577;
+		    e1000_phy_force_speed_duplex_82577;
 		phy->ops.get_cable_length = e1000_get_cable_length_82577;
 		phy->ops.get_info = e1000_get_phy_info_82577;
 		phy->ops.commit = e1000e_phy_sw_reset;
-- 
1.7.4
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help