Design change request. i225 devices going to use device reset
instead of port soft reset. Move the device reset definition
from _82575.h file to _defines.h file and add appropriate wrap.
The reset flow changes for i225 will be submitted in separate patch.
Signed-off-by: Sasha Neftin <sasha.nef...@intel.com>
Signed-off-by: Guinan Sun <guinanx....@intel.com>
---
drivers/net/e1000/base/e1000_82575.h | 3 ---
drivers/net/e1000/base/e1000_defines.h | 1 +
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/e1000/base/e1000_82575.h
b/drivers/net/e1000/base/e1000_82575.h
index d8ea3ae1f..b03d4b66f 100644
--- a/drivers/net/e1000/base/e1000_82575.h
+++ b/drivers/net/e1000/base/e1000_82575.h
@@ -25,9 +25,7 @@
#define E1000_RAR_ENTRIES_I350 32
#define E1000_SW_SYNCH_MB 0x00000100
#define E1000_STAT_DEV_RST_SET 0x00100000
-#define E1000_CTRL_DEV_RST 0x20000000
-#ifdef E1000_BIT_FIELDS
struct e1000_adv_data_desc {
__le64 buffer_addr; /* Address of the descriptor's data buffer */
union {
@@ -90,7 +88,6 @@ struct e1000_adv_context_desc {
} fields;
} l4_setup;
};
-#endif
/* SRRCTL bit definitions */
#define E1000_SRRCTL_BSIZEHDRSIZE_MASK 0x00000F00
diff --git a/drivers/net/e1000/base/e1000_defines.h
b/drivers/net/e1000/base/e1000_defines.h
index a909aa979..abe83ad7d 100644
--- a/drivers/net/e1000/base/e1000_defines.h
+++ b/drivers/net/e1000/base/e1000_defines.h
@@ -251,6 +251,7 @@
#define E1000_CTRL_SWDPIO0 0x00400000 /* SWDPIN 0 Input or output */
#define E1000_CTRL_SWDPIO2 0x01000000 /* SWDPIN 2 input or output */
#define E1000_CTRL_SWDPIO3 0x02000000 /* SWDPIN 3 input or output */
+#define E1000_CTRL_DEV_RST 0x20000000 /* Device reset */
#define E1000_CTRL_RST 0x04000000 /* Global reset */
#define E1000_CTRL_RFCE 0x08000000 /* Receive Flow Control
enable */
#define E1000_CTRL_TFCE 0x10000000 /* Transmit flow control
enable */
--
2.17.1
