From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9EBF5A0350; Mon, 29 Jun 2020 05:29:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6605F5B30; Mon, 29 Jun 2020 05:29:54 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 76EAA1150 for ; Mon, 29 Jun 2020 05:29:52 +0200 (CEST) IronPort-SDR: viTj+5PURCztji5Fi6Z8USHseabsPbCinS7TRfZfsn9JBEoZpDwwQdO8TI/9vSFo3Hyez+prL+ IqQc7iANoycw== X-IronPort-AV: E=McAfee;i="6000,8403,9666"; a="133331120" X-IronPort-AV: E=Sophos;i="5.75,293,1589266800"; d="scan'208";a="133331120" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jun 2020 20:29:51 -0700 IronPort-SDR: y02fCojrCsrcp6+QgcF7Rx1WH/mngiAc4d1O0w5KYMa5od66M+C5aF+ffvtQbZ+3f5lNJRZt2t XtctrhKmUzfA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,293,1589266800"; d="scan'208";a="454037488" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga005.jf.intel.com with ESMTP; 28 Jun 2020 20:29:51 -0700 Received: from fmsmsx111.amr.corp.intel.com (10.18.116.5) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 28 Jun 2020 20:29:50 -0700 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by fmsmsx111.amr.corp.intel.com (10.18.116.5) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 28 Jun 2020 20:29:50 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.106) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 28 Jun 2020 20:29:50 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fjH7pWSXlw+MQZ66m3rw+9Ig6RIdf0Q5LbKLtwg27NlMgAsEPzHIlzmrGqYA3wvQJxAPZa3FUeaZiUmrMq12c2g9S1Ex0ljfHEJ0ETVk5JE2OxK7Fq1gkxIBxV6r04D1lJ5x/8AAi4GkFE1PSQYl1WSEnapAQGYPQQwiCIMy4tEUfpEQFYgVnYYNg+HJ+GppgYKzK4A6ApTruu5MAHCAfZwd10QRHHIuVmxxJ98OA4Eap4kkkdP5UvqdLQer7DkNy7G8DfQlur9ggJgcWvqa52++xd+3IaL12PYiHijFqx3NPD5GNTb1xzLpUsMObKZk2636AAz+OIQZBj7RTTsGmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OIrbSyxZq2LH6JlxVJxiHm1W4XZbdg2e101fUvR7Wzc=; b=dcLZYj86AN2cSoYQioQU2DX8pRGe99dmAFHs2K1uWqIRBXeBMb+7SeYiOVcy9YsxI2XzDagQs0whQkGJF7TXx3IVLreAKcwHY5vHWQaP1/BPxeUvfEZKPQD6LMJEybvRZQsdf0C7CGpT+IjP7Q6baX3M+g7ir0lH3CwB8WVgo5i3xVxk00ekVWRSaXmoFdbaubjB4dqRvbDf6oozPdfm9GBLVsfTu3QxMtIw0Qub1S07s5M7bQcLBXAFuK7VWIRGnlDKsJvW1uy0S9M8HHmiCcTVQxB9r3SSxYXpuBDBpXCa5JtDz4+WYwKgaX0jc82QXtLSIb5GBAIfGw+U5UHqyQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OIrbSyxZq2LH6JlxVJxiHm1W4XZbdg2e101fUvR7Wzc=; b=EalJ3FzvWFL753C4+CkRK/krFdsf/Fq6uXM2sLVqe9F4r1jhDC2Mkh5zSqAI6Wbd5K7wh/qsLVnt+NxCh7dRVbMmBYGxuMB5N4A6ELWyVlPcm5vGd0AuKubVbOnmNUPeUoyA5dDczuDMAJIf7q6ABsg9q5s/PA7xPddSGhyt4CM= Received: from BN6PR11MB0017.namprd11.prod.outlook.com (2603:10b6:405:6c::34) by BN8PR11MB3812.namprd11.prod.outlook.com (2603:10b6:408:90::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.21; Mon, 29 Jun 2020 03:29:48 +0000 Received: from BN6PR11MB0017.namprd11.prod.outlook.com ([fe80::c8eb:f4c9:5b58:3120]) by BN6PR11MB0017.namprd11.prod.outlook.com ([fe80::c8eb:f4c9:5b58:3120%6]) with mapi id 15.20.3131.026; Mon, 29 Jun 2020 03:29:48 +0000 From: "Yang, Qiming" To: "Sun, GuinanX" , "dev@dpdk.org" CC: "Guo, Jia" , "Lu, Wenzhuo" , "Sun, GuinanX" , "Neftin, Sasha" Thread-Topic: [dpdk-dev] [PATCH v2 01/42] net/e1000/base: resolve flash presence for i210 devices Thread-Index: AQHWSf3Lyk2keAfWUEeL0FybRqBX5aju9q4w Date: Mon, 29 Jun 2020 03:29:47 +0000 Message-ID: References: <20200622064634.70941-1-guinanx.sun@intel.com> <20200624075337.6768-1-guinanx.sun@intel.com> <20200624075337.6768-2-guinanx.sun@intel.com> In-Reply-To: <20200624075337.6768-2-guinanx.sun@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.102.204.38] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 254afbe9-40d8-4a38-ff3d-08d81bdcacf4 x-ms-traffictypediagnostic: BN8PR11MB3812: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:206; x-forefront-prvs: 044968D9E1 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: sRZELMeW4qVFIsL4CmYuCwedWB3A/+VVPjhiT1PWPnrNrW2S1kUofdNKjJkPrv5OLjuaCn7cCQSW0HwvLcbfmHTjM5tbmS6DX5CbrEBByHeG0cuFBwsa4ciEVZ4BUYvnWGdXL5WB8MU3rNvD0Hktzsb/F2cWTiQPwokwApIgpe6EQS66n08wXN/hc6kXWea2sk8dTNUqvI0B652qbLr4ziyTZ22TH4218p3kQbKo7GhTRkMgJRfMl/W7CVutJcLSSPtK0hnz1jv/RAAi71YewEVTQmNixOq1HAFjiVoSC/A2JNdtTO6pPzwamqfWeOvW x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN6PR11MB0017.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(396003)(346002)(39860400002)(136003)(376002)(366004)(478600001)(110136005)(64756008)(5660300002)(66446008)(54906003)(66476007)(66946007)(66556008)(55016002)(76116006)(107886003)(7696005)(9686003)(316002)(53546011)(26005)(83380400001)(86362001)(8936002)(52536014)(33656002)(4326008)(71200400001)(186003)(2906002)(6506007); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: 6gDFvY1Jp+o0amsrAnQke60f0QOYYPVBh3GJG5MDM3HuhVmuHM7aUjKwoXB21rCGMCyAyhR9mIVBvQlW6jZN/FyRZqbC083N4eXtlFs750nqnWo42mrp+NG5CQFQBbj5Q3wjiRfNK7wsEKTczeLP9snvzVBGpXMK97Chk4DpBKkwwQZdM+Dteh8x35gvityc9RWaGXB+UF0Vw82aNmgXIdh6XPRGsva4JYyEtlxCDtnEXqGS/vL8fHQo4W8WWAUxeo79yF09bupb+TJeFz5mdH3XXHO+91FdheeEpei3Z9RVLGZ3oGGwZPDqIDx8JjsaXVBOViYhnjT2QwQ849IN1bnL6i6KoZuMUvNYvqqF5OkWchG597gV6uaRbXS96UJxeLJTrsiBYh2Dw6LXsT3RVnLRLCwuvEaM+V1aUdw+QLF0FGWBNklXJvYPE+5gON3jktqLH+AVb/Sy6g9f/TL1Zfiiov7T8swpX37DsTrWxyZZe6LNw/MwVDM4eAB8Rrv9 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN6PR11MB0017.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 254afbe9-40d8-4a38-ff3d-08d81bdcacf4 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jun 2020 03:29:47.9688 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: XUUBR81A2CIP9GqYUhcVYok+55/vX6XVcWLSQg5DP5OBC9HlHX1TjmPMo/QHItVx9e8u8OYI55xtckTnWVqoRA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR11MB3812 X-OriginatorOrg: intel.com Subject: Re: [dpdk-dev] [PATCH v2 01/42] net/e1000/base: resolve flash presence for i210 devices X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" > -----Original Message----- > From: dev On Behalf Of Guinan Sun > Sent: Wednesday, June 24, 2020 15:53 > To: dev@dpdk.org > Cc: Guo, Jia ; Lu, Wenzhuo ; > Sun, GuinanX ; Neftin, Sasha > > Subject: [dpdk-dev] [PATCH v2 01/42] net/e1000/base: resolve flash > presence for i210 devices >=20 > 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 fo= r i211 in this patch. >=20 > Signed-off-by: Sasha Neftin > Signed-off-by: Guinan Sun > --- > drivers/net/e1000/base/e1000_nvm.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) >=20 > 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, >=20 > DEBUGFUNC("e1000_read_pba_string_generic"); >=20 > - if ((hw->mac.type >=3D e1000_i210) && > - !e1000_get_flash_presence_i210(hw)) { > + if ((hw->mac.type =3D=3D e1000_i210 || > + hw->mac.type =3D=3D e1000_i211) && > + !e1000_get_flash_presence_i210(hw)) { > DEBUGOUT("Flashless no PBA string\n"); > return -E1000_ERR_NVM_PBA_SECTION; > } > -- > 2.17.1