igc: Change Device Reset to Port Reset

The _reset_hw_base method switched from port reset (CTRL[26]) to device
reset (CTRL[29]) since the FW was receiving an interrupt on CTRL[29].
FW code was later modified to also receive an interrupt on CTRL[26].
Since certain HW values are not reset to default by CTRL[29], we go back
to CTRL[26] for the HW reset, as it meets all current requirements.

This reverts commit bb4265ec24c1 ("igc: Update the MAC reset flow").

Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Nechama Kraus <nechamax.kraus@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/igc/igc_base.c b/drivers/net/ethernet/intel/igc/igc_base.c
index 2612a58fc52a4e7f47e4767e1a7f2424ecf1604e..f068b66b8025105bcb44e5ecc71c5ca43a6e0db4 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_base.c
+++ b/drivers/net/ethernet/intel/igc/igc_base.c
@@ -40,7 +40,7 @@ static s32 igc_reset_hw_base(struct igc_hw *hw)
        ctrl = rd32(IGC_CTRL);
 
        hw_dbg("Issuing a global reset to MAC\n");
-       wr32(IGC_CTRL, ctrl | IGC_CTRL_DEV_RST);
+       wr32(IGC_CTRL, ctrl | IGC_CTRL_RST);
 
        ret_val = igc_get_auto_rd_done(hw);
        if (ret_val) {

diff --git a/drivers/net/ethernet/intel/igc/igc_defines.h b/drivers/net/ethernet/intel/igc/igc_defines.h
index a4bbee74879845f9f6749b8137fb427bf4188302..c7fe61509d5b510911b4c6f01c7cee63e48c54fb 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_defines.h
+++ b/drivers/net/ethernet/intel/igc/igc_defines.h
@@ -130,7 +130,7 @@
 #define IGC_ERR_SWFW_SYNC              13
 
 /* Device Control */
-#define IGC_CTRL_DEV_RST       0x20000000  /* Device reset */
+#define IGC_CTRL_RST           0x04000000  /* Global reset */
 
 #define IGC_CTRL_PHY_RST       0x80000000  /* PHY Reset */
 #define IGC_CTRL_SLU           0x00000040  /* Set link up (Force Link) */