diff mbox series

[38/70] net/e1000/base: move the device reset definition

Message ID	20200622064634.70941-39-guinanx.sun@intel.com (mailing list archive)
State	Superseded, archived
Delegated to:	Qi Zhang
Headers	IronPort-SDR: 4VZ7EICLgKIEaaVBknRSxehCzlDNExXs6/uSZ19H6Rmh7zuOrv8mAVaKc4ltlzR8X889Wff/nB hug/YF0jjCLw== IronPort-SDR: 6eiQIbbgcxomsSstKzmgfLJ+KC28D8/8LOnOVMmskDq7kcz17cMb9JX1Fv8kwyZODcHaVYeUue Ix7Xx+ISne+w== From: Guinan Sun <guinanx.sun@intel.com> To: dev@dpdk.org Cc: Jeff Guo <jia.guo@intel.com>, Zhao1 Wei <wei.zhao1@intel.com>, Guinan Sun <guinanx.sun@intel.com>, Sasha Neftin <sasha.neftin@intel.com> Date: Mon, 22 Jun 2020 06:46:02 +0000 Message-Id: <20200622064634.70941-39-guinanx.sun@intel.com> In-Reply-To: <20200622064634.70941-1-guinanx.sun@intel.com> References: <20200622064634.70941-1-guinanx.sun@intel.com> Subject: [dpdk-dev] [PATCH 38/70] 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 \| [00/70] update e1000 base code [01/70] net/e1000/base: i210 slow system clock update [02/70] net/e1000/base: add initial support for Foxville [03/70] net/e1000/base: add ICL device id's [04/70] net/e1000/base: remove shadowing variable declarations [05/70] net/e1000/base: introduce flag [06/70] net/e1000/base: modify MAC initialization [07/70] net/e1000/base: modify flash presence for i225 devices [08/70] net/e1000/base: add i225 devices PHY type [09/70] net/e1000/base: expose xmdio methods [10/70] net/e1000/base: modify negotiation advertisement [11/70] net/e1000/base: fall through explicitly [12/70] net/e1000/base: add function parameter descriptions [13/70] net/e1000/base: modify klocwork errors [14/70] net/e1000/base: add 2.5G speed advertisement [15/70] net/e1000/base: setup copper link function for i225 [16/70] net/e1000/base: implement Low-Power-Link-Up (LPLU) for i225 [17/70] net/e1000/base: add new wakeup/proxy registers for i225 [18/70] net/e1000/base: modify klockwork about unused return values [19/70] net/e1000/base: improve coding style [20/70] net/e1000/base: modify HW level time sync mechanisms [21/70] net/e1000/base: modify description [22/70] net/e1000/base: add EEE support for i225 [23/70] net/e1000/base: remove duplicated codes from 82575 [24/70] net/e1000/base: add info structure [25/70] net/e1000/base: wrap the e1000 defines.h [26/70] net/e1000/base: wrap the e1000 regs.h file [27/70] net/e1000/base: cleanup duplicate declaration [28/70] net/e1000/base: modify wrapper for registers and definitions [29/70] net/e1000/base: more function name cleanup [30/70] net/e1000/base: expose EEE defines [31/70] net/e1000/base: expose the manage functionality [32/70] net/e1000/base: modify the wrong return value [33/70] net/e1000/base: wrap the unneeded code [34/70] net/e1000/base: clean family specific functions from base [35/70] net/e1000/base: expose more time synchronization registers [36/70] net/e1000/base: add define to PCIm function state [37/70] net/e1000/base: add missing register defines [38/70] net/e1000/base: move the device reset definition [39/70] net/e1000/base: increased timeout for ME ULP exit [40/70] net/e1000/base: add missing device ID [41/70] net/e1000/base: add Foxville device IDs [42/70] net/e1000/base: expose more future extended NVM [43/70] net/e1000/base: add definition of EEE 2.5G setup register [44/70] net/e1000/base: add FXVL's Blank NVM device ID [45/70] net/e1000/base: remove useless statement [46/70] net/e1000/base: add missed define for VFTA [47/70] net/e1000/base: modify flow control setup [48/70] net/e1000/base: support I225 update NVM flow [49/70] net/e1000/base: led blinking fix for i210 [50/70] net/e1000/base: clean up dead code [51/70] net/e1000/base: expose new FEXTNVM registers and masks [52/70] net/e1000/base: cleanup duplicate defines [53/70] net/e1000/base: add WUC registers and defines [54/70] net/e1000/base: correct PHY power up flow for i225 [55/70] net/e1000/base: add support for Nahum10 [56/70] net/e1000/base: add fall-through comments for switch cases [57/70] net/e1000/base: add EEE functions and defines for IGC [58/70] net/e1000/base: add PHY power management control [59/70] net/e1000/base: introduce DPGFR register [60/70] net/e1000/base: add new device IDs for Foxville B2 [61/70] net/e1000/base: add address and queue select [62/70] net/e1000/base: introduce IEEE PHY ID mask [63/70] net/e1000/base: modify VLAN names [64/70] net/e1000/base: add EEE set function to share code API [65/70] net/e1000/base: add defines for source address filters [66/70] net/e1000/base: add LPI counters [67/70] net/e1000/base: remove conditional compilation wrapper [68/70] net/e1000/base: modify copyright [69/70] net/e1000/base: update version [70/70] net/e1000/base: resolve core dump

Checks

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

Commit Message

Guinan Sun June 22, 2020, 6:46 a.m. UTC

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.neftin@intel.com>
Signed-off-by: Guinan Sun <guinanx.sun@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 mbox series

Patch

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 */