Re: [dpdk-dev] [PATCH v2 01/42] net/e1000/base: resolve flash presence for i210 devices

[Yang, Qiming]

> -----Original Message-----
> From: dev <dev-boun...@dpdk.org> On Behalf Of Guinan Sun
> Sent: Wednesday, June 24, 2020 15:53
> To: dev@dpdk.org
> Cc: Guo, Jia <jia....@intel.com>; Lu, Wenzhuo <wenzhuo...@intel.com>;
> Sun, GuinanX <guinanx....@intel.com>; Neftin, Sasha
> <sasha.nef...@intel.com>
> Subject: [dpdk-dev] [PATCH v2 01/42] net/e1000/base: resolve flash
> presence for i210 devices
> 
> There is a conflict with legacy i210.
> This patch is for compatibility with i211.

Confuse commit log and name.
This patch should be add support for i211 and should merge other support for 
i211 in this patch.

> 
> Signed-off-by: Sasha Neftin <sasha.nef...@intel.com>
> Signed-off-by: Guinan Sun <guinanx....@intel.com>
> ---
>  drivers/net/e1000/base/e1000_nvm.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/e1000/base/e1000_nvm.c
> b/drivers/net/e1000/base/e1000_nvm.c
> index 56e2db122..4d4a8e04b 100644
> --- a/drivers/net/e1000/base/e1000_nvm.c
> +++ b/drivers/net/e1000/base/e1000_nvm.c
> @@ -749,8 +749,9 @@ s32 e1000_read_pba_string_generic(struct e1000_hw
> *hw, u8 *pba_num,
> 
>       DEBUGFUNC("e1000_read_pba_string_generic");
> 
> -     if ((hw->mac.type >= e1000_i210) &&
> -         !e1000_get_flash_presence_i210(hw)) {
> +     if ((hw->mac.type == e1000_i210 ||
> +          hw->mac.type == e1000_i211) &&
> +          !e1000_get_flash_presence_i210(hw)) {
>               DEBUGOUT("Flashless no PBA string\n");
>               return -E1000_ERR_NVM_PBA_SECTION;
>       }
> --
> 2.17.1