From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lersek@redhat.com>
Received-SPF: Pass (sender SPF authorized) identity=mailfrom;
 client-ip=209.132.183.28; helo=mx1.redhat.com; envelope-from=lersek@redhat.com;
 receiver=edk2-devel@lists.01.org 
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28])
 (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 538D4210F93C3
 for <edk2-devel@lists.01.org>; Tue,  2 Oct 2018 07:52:26 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.redhat.com (Postfix) with ESMTPS id 3D6353082AF3;
 Tue,  2 Oct 2018 14:52:26 +0000 (UTC)
Received: from lacos-laptop-7.usersys.redhat.com (ovpn-123-140.rdu2.redhat.com
 [10.10.123.140])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 18494100034B;
 Tue,  2 Oct 2018 14:52:24 +0000 (UTC)
To: "edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
References: <436c51f1-3ca0-9efa-c79d-b12f46be10ff@solarflare.com>
Cc: "Tomas Pilar (tpilar)" <tpilar@solarflare.com>,
 Yonghong Zhu <yonghong.zhu@intel.com>, Liming Gao <liming.gao@intel.com>
From: Laszlo Ersek <lersek@redhat.com>
Message-ID: <655bafd3-f912-78c5-18d0-7bd9254dd573@redhat.com>
Date: Tue, 2 Oct 2018 16:52:23 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.9.1
MIME-Version: 1.0
In-Reply-To: <436c51f1-3ca0-9efa-c79d-b12f46be10ff@solarflare.com>
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
 (mx1.redhat.com [10.5.110.45]); Tue, 02 Oct 2018 14:52:26 +0000 (UTC)
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  <edk2-devel.lists.01.org>
List-Unsubscribe: <https://lists.01.org/mailman/options/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=unsubscribe>
List-Archive: <http://lists.01.org/pipermail/edk2-devel/>
List-Post: <mailto:edk2-devel@lists.01.org>
List-Help: <mailto:edk2-devel-request@lists.01.org?subject=help>
List-Subscribe: <https://lists.01.org/mailman/listinfo/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2018 14:52:27 -0000
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit

+Yonghong, +Liming

On 10/02/18 16:46, Tomas Pilar (tpilar) wrote:
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Tomas Pilar <tpilar@solarflare.com>
> ---
>  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( "="):
>                          raise Warning("expected '='", self.FileName, self.CurrentLineNumber)
> -                    if not self.__GetNextHexNumber():
> -                        raise Warning("expected Hex device id", self.FileName, self.CurrentLineNumber)
>  
> -                    Overrides.PciDeviceId = self.__Token
> +                    # Get a list of PCI IDs
> +                    Overrides.PciDeviceId = ""
> +
> +                    while self.__GetNextHexNumber():
> +                        Overrides.PciDeviceId += " " + self.__Token
> +
> +                    if not Overrides.PciDeviceId:
> +                        raise Warning("expected one or more Hex device ids", self.FileName, self.CurrentLineNumber)
>                      continue
>  
>                  if self.__IsKeyword( "PCI_REVISION"):
>