From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 6B6A12114B135 for ; Fri, 21 Sep 2018 04:12:04 -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 E524B3091D52; Fri, 21 Sep 2018 11:12:03 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-8.rdu2.redhat.com [10.10.120.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE3071001938; Fri, 21 Sep 2018 11:12:02 +0000 (UTC) To: Ruiyu Ni , edk2-devel@lists.01.org Cc: Star Zeng References: <20180921072539.268068-1-ruiyu.ni@intel.com> <20180921072539.268068-4-ruiyu.ni@intel.com> From: Laszlo Ersek Message-ID: <12daedaa-952f-fc73-3ed5-62970f869ba9@redhat.com> Date: Fri, 21 Sep 2018 13:12:01 +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: <20180921072539.268068-4-ruiyu.ni@intel.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.42]); Fri, 21 Sep 2018 11:12:04 +0000 (UTC) Subject: Re: [PATCH 3/3] MdeModulePkg/PciHostBridge: Add RESOURCE_VALID() to simplify code 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: Fri, 21 Sep 2018 11:12:04 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 09/21/18 09:25, Ruiyu Ni wrote: > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ruiyu Ni > Cc: Star Zeng > --- > .../Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c | 26 ++++++++++------------ > 1 file changed, 12 insertions(+), 14 deletions(-) > > diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c > index f6234b5d11..916709e276 100644 > --- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c > +++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c > @@ -21,6 +21,8 @@ extern EDKII_IOMMU_PROTOCOL *mIoMmuProtocol; > > #define NO_MAPPING (VOID *) (UINTN) -1 > > +#define RESOURCE_VALID(R) ((R).Base <= (R).Limit) > + > // > // Lookup table for increment values based on transfer widths > // > @@ -122,25 +124,25 @@ CreateRootBridge ( > // > // Make sure Mem and MemAbove4G apertures are valid > // > - if (Bridge->Mem.Base <= Bridge->Mem.Limit) { > + if (RESOURCE_VALID (Bridge->Mem)) { > ASSERT (Bridge->Mem.Limit < SIZE_4GB); > if (Bridge->Mem.Limit >= SIZE_4GB) { > return NULL; > } > } > - if (Bridge->MemAbove4G.Base <= Bridge->MemAbove4G.Limit) { > + if (RESOURCE_VALID (Bridge->MemAbove4G)) { > ASSERT (Bridge->MemAbove4G.Base >= SIZE_4GB); > if (Bridge->MemAbove4G.Base < SIZE_4GB) { > return NULL; > } > } > - if (Bridge->PMem.Base <= Bridge->PMem.Limit) { > + if (RESOURCE_VALID (Bridge->PMem)) { > ASSERT (Bridge->PMem.Limit < SIZE_4GB); > if (Bridge->PMem.Limit >= SIZE_4GB) { > return NULL; > } > } > - if (Bridge->PMemAbove4G.Base <= Bridge->PMemAbove4G.Limit) { > + if (RESOURCE_VALID (Bridge->PMemAbove4G)) { > ASSERT (Bridge->PMemAbove4G.Base >= SIZE_4GB); > if (Bridge->PMemAbove4G.Base < SIZE_4GB) { > return NULL; > @@ -157,11 +159,9 @@ CreateRootBridge ( > // support separate windows for Non-prefetchable and Prefetchable > // memory. > // > - ASSERT (Bridge->PMem.Base > Bridge->PMem.Limit); > - ASSERT (Bridge->PMemAbove4G.Base > Bridge->PMemAbove4G.Limit); > - if ((Bridge->PMem.Base <= Bridge->PMem.Limit) || > - (Bridge->PMemAbove4G.Base <= Bridge->PMemAbove4G.Limit) > - ) { > + ASSERT (!RESOURCE_VALID (Bridge->PMem)); > + ASSERT (!RESOURCE_VALID (Bridge->PMemAbove4G)); > + if (RESOURCE_VALID (Bridge->PMem) || RESOURCE_VALID (Bridge->PMemAbove4G)) { > return NULL; > } > } > @@ -171,11 +171,9 @@ CreateRootBridge ( > // If this bit is not set, then the PCI Root Bridge does not support > // 64 bit memory windows. > // > - ASSERT (Bridge->MemAbove4G.Base > Bridge->MemAbove4G.Limit); > - ASSERT (Bridge->PMemAbove4G.Base > Bridge->PMemAbove4G.Limit); > - if ((Bridge->MemAbove4G.Base <= Bridge->MemAbove4G.Limit) || > - (Bridge->PMemAbove4G.Base <= Bridge->PMemAbove4G.Limit) > - ) { > + ASSERT (!RESOURCE_VALID (Bridge->MemAbove4G)); > + ASSERT (!RESOURCE_VALID (Bridge->PMemAbove4G)); > + if (RESOURCE_VALID (Bridge->MemAbove4G) || RESOURCE_VALID (Bridge->PMemAbove4G)) { > return NULL; > } > } > Two superficial comments: - edk2 prefers long parameter names, so I suggest replacing "R" in the macro definition with "Resource" - taking the parameter as a pointer is frequently considered more flexible. #define RESOURCE_VALID(Resource) ((Resource)->Base <= (Resource)->Limit) ... if (RESOURCE_VALID (&Bridge->Mem)) { ... Up to you -- if you like these, feel free to update the patch before pushing it (from my side anyway; you do need MdeModulePkg maintainer review as well). With or without changes: Reviewed-by: Laszlo Ersek Thanks Laszlo