[v2,06/42] net/e1000/base: modify MAC initialization for i211

Message ID 20200624075337.6768-7-guinanx.sun@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Qi Zhang
Headers
Series update e1000 base code |

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
  Introduce SF/FW syncronization, acquire and release
for i211 devices.

Signed-off-by: Todd Fujinaka <todd.fujinaka@intel.com>
Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
---
 drivers/net/e1000/base/e1000_82575.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Qiming Yang June 29, 2020, 3:30 a.m. UTC | #1
This one should merge to the first patch.

> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Guinan Sun
> Sent: Wednesday, June 24, 2020 15:53
> To: dev@dpdk.org
> Cc: Guo, Jia <jia.guo@intel.com>; Lu, Wenzhuo <wenzhuo.lu@intel.com>;
> Sun, GuinanX <guinanx.sun@intel.com>; Fujinaka, Todd
> <todd.fujinaka@intel.com>
> Subject: [dpdk-dev] [PATCH v2 06/42] net/e1000/base: modify MAC
> initialization for i211
> 
> Introduce SF/FW syncronization, acquire and release for i211 devices.
> 
> Signed-off-by: Todd Fujinaka <todd.fujinaka@intel.com>
> Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
> ---
>  drivers/net/e1000/base/e1000_82575.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/e1000/base/e1000_82575.c
> b/drivers/net/e1000/base/e1000_82575.c
> index 4c3611c6d..952bb4235 100644
> --- a/drivers/net/e1000/base/e1000_82575.c
> +++ b/drivers/net/e1000/base/e1000_82575.c
> @@ -486,7 +486,7 @@ STATIC s32 e1000_init_mac_params_82575(struct
> e1000_hw *hw)
>  	/* acquire SW_FW sync */
>  	mac->ops.acquire_swfw_sync = e1000_acquire_swfw_sync_82575;
>  	mac->ops.release_swfw_sync = e1000_release_swfw_sync_82575;
> -	if (mac->type >= e1000_i210) {
> +	if (mac->type == e1000_i210 || mac->type == e1000_i211) {
>  		mac->ops.acquire_swfw_sync =
> e1000_acquire_swfw_sync_i210;
>  		mac->ops.release_swfw_sync =
> e1000_release_swfw_sync_i210;
>  	}
> --
> 2.17.1
  

Patch

diff --git a/drivers/net/e1000/base/e1000_82575.c b/drivers/net/e1000/base/e1000_82575.c
index 4c3611c6d..952bb4235 100644
--- a/drivers/net/e1000/base/e1000_82575.c
+++ b/drivers/net/e1000/base/e1000_82575.c
@@ -486,7 +486,7 @@  STATIC s32 e1000_init_mac_params_82575(struct e1000_hw *hw)
 	/* acquire SW_FW sync */
 	mac->ops.acquire_swfw_sync = e1000_acquire_swfw_sync_82575;
 	mac->ops.release_swfw_sync = e1000_release_swfw_sync_82575;
-	if (mac->type >= e1000_i210) {
+	if (mac->type == e1000_i210 || mac->type == e1000_i211) {
 		mac->ops.acquire_swfw_sync = e1000_acquire_swfw_sync_i210;
 		mac->ops.release_swfw_sync = e1000_release_swfw_sync_i210;
 	}