diff mbox series

[v2,24/42] net/e1000/base: move the device reset definition

Message ID	20200624075337.6768-25-guinanx.sun@intel.com (mailing list archive)
State	Superseded, archived
Delegated to:	Qi Zhang
Headers	IronPort-SDR: kyYoUwVSoRfqwPZTqCFoo/duyRA5mgZc+YzN0mkCLbAkaiBnd7ABTEb+yUnPNNcGXYF8Tr4e9D 5ziU8ImwUQuQ== IronPort-SDR: NRhpyiPdVfqmNDtt4WItUMkDilYT/Lc8Ufe15egeK+X38K2yuXSJTlhxosXfLII71zEWxTCMQT O1Fx5U1fOeOQ== From: Guinan Sun <guinanx.sun@intel.com> To: dev@dpdk.org Cc: Jeff Guo <jia.guo@intel.com>, Wenzhuo Lu <wenzhuo.lu@intel.com>, Guinan Sun <guinanx.sun@intel.com>, Sasha Neftin <sasha.neftin@intel.com> Date: Wed, 24 Jun 2020 07:53:19 +0000 Message-Id: <20200624075337.6768-25-guinanx.sun@intel.com> In-Reply-To: <20200624075337.6768-1-guinanx.sun@intel.com> References: <20200622064634.70941-1-guinanx.sun@intel.com> <20200624075337.6768-1-guinanx.sun@intel.com> Subject: [dpdk-dev] [PATCH v2 24/42] net/e1000/base: move the device reset definition Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	update e1000 base code \| [v2,00/42] update e1000 base code [v2,01/42] net/e1000/base: resolve flash presence for i210 devices [v2,02/42] net/e1000/base: i210 slow system clock update [v2,03/42] net/e1000/base: add ICL device id's [v2,04/42] net/e1000/base: remove shadowing variable declarations [v2,05/42] net/e1000/base: introduce flags [v2,06/42] net/e1000/base: modify MAC initialization for i211 [v2,07/42] net/e1000/base: modify parens to match other MAC checks [v2,08/42] net/e1000/base: expose xmdio methods [v2,09/42] net/e1000/base: fall through explicitly [v2,10/42] net/e1000/base: add function parameter descriptions [v2,11/42] net/e1000/base: modify fall through code comments [v2,12/42] net/e1000/base: modify klocwork errors [v2,13/42] net/e1000/base: modify klockwork about unused return values [v2,14/42] net/e1000/base: improve coding style [v2,15/42] net/e1000/base: modify HW level time sync mechanisms [v2,16/42] net/e1000/base: modify description [v2,17/42] net/e1000/base: remove duplicated codes from 82575 [v2,18/42] net/e1000/base: add definitions for ETQF register bit [v2,19/42] net/e1000/base: cleanup duplicate declaration [v2,20/42] net/e1000/base: expose MAC functions [v2,21/42] net/e1000/base: move definitions from 82575 to defines file [v2,22/42] net/e1000/base: add define to PCIm function state [v2,23/42] net/e1000/base: add missing register defines [v2,24/42] net/e1000/base: move the device reset definition [v2,25/42] net/e1000/base: increased timeout for ME ULP exit [v2,26/42] net/e1000/base: add missing device ID [v2,27/42] net/e1000/base: expose more future extended NVM [v2,28/42] net/e1000/base: add definition of EEE 2.5G setup register [v2,29/42] net/e1000/base: remove definitions [v2,30/42] net/e1000/base: remove useless statement [v2,31/42] net/e1000/base: add missed define for VFTA [v2,32/42] net/e1000/base: modify flow control setup [v2,33/42] net/e1000/base: led blinking fix for i210 [v2,34/42] net/e1000/base: expose new FEXTNVM registers and masks [v2,35/42] net/e1000/base: cleanup duplicate defines [v2,36/42] net/e1000/base: add support for Nahum10 [v2,37/42] net/e1000/base: add fall-through comments for switch cases [v2,38/42] net/e1000/base: modify typo in Alder Lake brand name [v2,39/42] net/e1000/base: introduce DPGFR register [v2,40/42] net/e1000/base: remove conditional compilation wrapper [v2,41/42] net/e1000/base: modify copyright [v2,42/42] net/e1000/base: update version

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK
ci/Intel-compilation	success	Compilation OK

Commit Message

Guinan Sun June 24, 2020, 7:53 a.m. UTC

  Move the device reset definition from _82575.h file to _defines.h file.

Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
---
 drivers/net/e1000/base/e1000_82575.h   | 1 -
 drivers/net/e1000/base/e1000_defines.h | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/drivers/net/e1000/base/e1000_82575.h b/drivers/net/e1000/base/e1000_82575.h
index c5e5f8221..e572fe0e1 100644
--- a/drivers/net/e1000/base/e1000_82575.h
+++ b/drivers/net/e1000/base/e1000_82575.h
@@ -25,7 +25,6 @@ 
 #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 {
diff --git a/drivers/net/e1000/base/e1000_defines.h b/drivers/net/e1000/base/e1000_defines.h
index b73a67f30..41a2b5c3f 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 */