From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=66.187.233.73; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) (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 0E8D720957B1D for ; Thu, 24 May 2018 13:04:37 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BF9E4401EF00; Thu, 24 May 2018 20:04:35 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-121-84.rdu2.redhat.com [10.10.121.84]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E6892166BB2; Thu, 24 May 2018 20:04:34 +0000 (UTC) From: Laszlo Ersek To: edk2-devel-01 Cc: Jordan Justen , Ard Biesheuvel References: <20180523202121.8125-1-lersek@redhat.com> Message-ID: Date: Thu, 24 May 2018 22:04:34 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180523202121.8125-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 24 May 2018 20:04:35 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 24 May 2018 20:04:35 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lersek@redhat.com' RCPT:'' Subject: Re: [PATCH v2 0/7] OvmfPkg, ArmVirtPkg: add and use PCI(E) Capabilities Library X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 May 2018 20:04:38 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 05/23/18 22:21, Laszlo Ersek wrote: > Repo: https://github.com/lersek/edk2.git > Branch: pci_cap_v2 > > In v2, the new libs are initially introduced under OvmfPkg, rather > than MdePkg. v1 was posted at > . > > Cc: Ard Biesheuvel > Cc: Jordan Justen I've addressed Ard's requests with the following (cumulative) diff: > diff --git a/OvmfPkg/Library/BasePciCapLib/BasePciCapLib.c > b/OvmfPkg/Library/BasePciCapLib/BasePciCapLib.c > index 6789359f0a54..c059264b322d 100644 > --- a/OvmfPkg/Library/BasePciCapLib/BasePciCapLib.c > +++ b/OvmfPkg/Library/BasePciCapLib/BasePciCapLib.c > @@ -874,6 +874,8 @@ PciCapGetInfo ( > { > PCI_CAP *InstanceZero; > > + ASSERT (Info != NULL); > + > InstanceZero = (Cap->Key.Instance == 0 ? Cap : > Cap->NumInstancesUnion.InstanceZero); > > diff --git a/OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.c > b/OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.c > index 84369e4dc3a8..358d87f93103 100644 > --- a/OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.c > +++ b/OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.c > @@ -73,10 +73,10 @@ ProtoDevTransferConfig ( > // possible in one iteration of the loop. Otherwise, transfer only one > // unit, to improve the alignment. > // > - if (Size >= BIT2 && (ConfigOffset & (BIT2 - 1)) == 0) { > + if (Size >= 4 && (ConfigOffset & 3) == 0) { > Width = EfiPciIoWidthUint32; > Count = Size >> Width; > - } else if (Size >= BIT1 && (ConfigOffset & (BIT1 - 1)) == 0) { > + } else if (Size >= 2 && (ConfigOffset & 1) == 0) { > Width = EfiPciIoWidthUint16; > Count = 1; > } else { After retesting the series, I pushed it as commit range 4b8552d794e7..5685a243b6f8. I've also filed about upstreaming the libraries from the first three patches to a more central package. Thanks! Laszlo