aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Kuchta <michal.kuchta@intel.com>2017-12-18 05:17:03 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2018-01-23 14:29:19 -0500
commitd95cd48060e69d7135e65e667777ab7ddb1c9846 (patch)
treee4b2755b5d9918e532e10f12d28d784591d69b12
parent06aa040f039404a0039a5158cd12f41187487a1f (diff)
i40e: Fix for blinking activity instead of link LEDs
This fix solves an issue occurring while calling i40e_led_set function from the driver with "blink" parameter set as TRUE. This call resulted in Activity LED blinking instead of Link LED, which may lead to errors in physically identifying the port, since Activity LED may be blinking for different reasons as well. Signed-off-by: Michal Kuchta <michal.kuchta@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_common.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
index cf929cc47245..ee6052ecd215 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
@@ -1486,6 +1486,7 @@ u32 i40e_led_get(struct i40e_hw *hw)
1486 case I40E_COMBINED_ACTIVITY: 1486 case I40E_COMBINED_ACTIVITY:
1487 case I40E_FILTER_ACTIVITY: 1487 case I40E_FILTER_ACTIVITY:
1488 case I40E_MAC_ACTIVITY: 1488 case I40E_MAC_ACTIVITY:
1489 case I40E_LINK_ACTIVITY:
1489 continue; 1490 continue;
1490 default: 1491 default:
1491 break; 1492 break;
@@ -1534,6 +1535,7 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink)
1534 case I40E_COMBINED_ACTIVITY: 1535 case I40E_COMBINED_ACTIVITY:
1535 case I40E_FILTER_ACTIVITY: 1536 case I40E_FILTER_ACTIVITY:
1536 case I40E_MAC_ACTIVITY: 1537 case I40E_MAC_ACTIVITY:
1538 case I40E_LINK_ACTIVITY:
1537 continue; 1539 continue;
1538 default: 1540 default:
1539 break; 1541 break;
@@ -1544,9 +1546,6 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink)
1544 gpio_val |= ((mode << I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT) & 1546 gpio_val |= ((mode << I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT) &
1545 I40E_GLGEN_GPIO_CTL_LED_MODE_MASK); 1547 I40E_GLGEN_GPIO_CTL_LED_MODE_MASK);
1546 1548
1547 if (mode == I40E_LINK_ACTIVITY)
1548 blink = false;
1549
1550 if (blink) 1549 if (blink)
1551 gpio_val |= BIT(I40E_GLGEN_GPIO_CTL_LED_BLINK_SHIFT); 1550 gpio_val |= BIT(I40E_GLGEN_GPIO_CTL_LED_BLINK_SHIFT);
1552 else 1551 else