From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.136; helo=mga12.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 36C0621163271 for ; Sun, 7 Oct 2018 18:42:36 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Oct 2018 18:42:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,355,1534834800"; d="scan'208";a="98246647" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga002.jf.intel.com with ESMTP; 07 Oct 2018 18:41:41 -0700 Received: from fmsmsx117.amr.corp.intel.com (10.18.116.17) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 7 Oct 2018 18:41:33 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx117.amr.corp.intel.com (10.18.116.17) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 7 Oct 2018 18:41:33 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.48]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.245]) with mapi id 14.03.0319.002; Mon, 8 Oct 2018 09:41:31 +0800 From: "Gao, Liming" To: "Tomas Pilar (tpilar)" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [PATCH] BaseTools: Allow multiple PciDeviceId in Fdf OptionROM override Thread-Index: AQHUWl66AcaRwtP+l0+fu9l2gX3L6KUUmjeg Date: Mon, 8 Oct 2018 01:41:31 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E331FCA@SHSMSX104.ccr.corp.intel.com> References: <436c51f1-3ca0-9efa-c79d-b12f46be10ff@solarflare.com> In-Reply-To: <436c51f1-3ca0-9efa-c79d-b12f46be10ff@solarflare.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] BaseTools: Allow multiple PciDeviceId in Fdf OptionROM override X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Oct 2018 01:42:36 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Pilar: The change is good. Could you also update INF and FDF spec for this usage= ? If you don't know how to update INF and FDF spec, please submit BZ. I wil= l provide the spec patch.=20 Reviewed-by: Liming Gao Thanks Liming >-----Original Message----- >From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of >Tomas Pilar (tpilar) >Sent: Tuesday, October 02, 2018 10:46 PM >To: edk2-devel@lists.01.org >Subject: [edk2] [PATCH] BaseTools: Allow multiple PciDeviceId in Fdf >OptionROM override > >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Tomas Pilar >--- > BaseTools/Source/Python/GenFds/FdfParser.py | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > >diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py >b/BaseTools/Source/Python/GenFds/FdfParser.py >index 63687e98bb..a65f2cfd2d 100644 >--- a/BaseTools/Source/Python/GenFds/FdfParser.py >+++ b/BaseTools/Source/Python/GenFds/FdfParser.py >@@ -4469,10 +4469,15 @@ class FdfParser: > if self.__IsKeyword( "PCI_DEVICE_ID"): > if not self.__IsToken( "=3D"): > raise Warning("expected '=3D'", self.FileName, >self.CurrentLineNumber) >- if not self.__GetNextHexNumber(): >- raise Warning("expected Hex device id", self.File= Name, >self.CurrentLineNumber) > >- Overrides.PciDeviceId =3D self.__Token >+ # Get a list of PCI IDs >+ Overrides.PciDeviceId =3D "" >+ >+ while self.__GetNextHexNumber(): >+ Overrides.PciDeviceId +=3D " " + self.__Token >+ >+ if not Overrides.PciDeviceId: >+ raise Warning("expected one or more Hex device id= s", >self.FileName, self.CurrentLineNumber) > continue > > if self.__IsKeyword( "PCI_REVISION"): >-- >2.17.1 > >_______________________________________________ >edk2-devel mailing list >edk2-devel@lists.01.org >https://lists.01.org/mailman/listinfo/edk2-devel