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 B81A021148DBF for ; Tue, 25 Sep 2018 03:43:20 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 405E83082140; Tue, 25 Sep 2018 10:43:20 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-71.rdu2.redhat.com [10.10.120.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A3D23001930; Tue, 25 Sep 2018 10:43:18 +0000 (UTC) To: Ruiyu Ni , edk2-devel@lists.01.org Cc: Star Zeng References: <20180925062117.34772-1-ruiyu.ni@intel.com> <20180925062117.34772-5-ruiyu.ni@intel.com> From: Laszlo Ersek Message-ID: <9a533ea8-64b0-efe2-d8b1-83190e022c34@redhat.com> Date: Tue, 25 Sep 2018 12:43:17 +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: <20180925062117.34772-5-ruiyu.ni@intel.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 25 Sep 2018 10:43:20 +0000 (UTC) Subject: Re: [PATCH v2 4/4] MdeModulePkg/PciHostBridge: Move declaration of mIoMmu to header file 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: Tue, 25 Sep 2018 10:43:20 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 09/25/18 08:21, Ruiyu Ni wrote: > The change doesn't have functionality impact. > It just renames the mIoMmuProtocol to mIoMmu and moves the\ > declaration from PciRootBridgeIo.c to PciHostBridge.h. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ruiyu Ni > Suggested-by: Star Zeng > Cc: Star Zeng > --- > .../Bus/Pci/PciHostBridgeDxe/PciHostBridge.c | 4 +- > .../Bus/Pci/PciHostBridgeDxe/PciHostBridge.h | 3 ++ > .../Bus/Pci/PciHostBridgeDxe/PciRootBridge.h | 1 - > .../Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c | 60 +++++++++++----------- > 4 files changed, 34 insertions(+), 34 deletions(-) > > diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c > index 0c1f75efcb..a74c6f0d30 100644 > --- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c > +++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c > @@ -26,7 +26,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CHAR16 *mPciResourceTypeStr[] = { > L"I/O", L"Mem", L"PMem", L"Mem64", L"PMem64", L"Bus" > }; > > -EDKII_IOMMU_PROTOCOL *mIoMmuProtocol; > +EDKII_IOMMU_PROTOCOL *mIoMmu; > EFI_EVENT mIoMmuEvent; > VOID *mIoMmuRegistration; > > @@ -363,7 +363,7 @@ IoMmuProtocolCallback ( > { > EFI_STATUS Status; > > - Status = gBS->LocateProtocol (&gEdkiiIoMmuProtocolGuid, NULL, (VOID **)&mIoMmuProtocol); > + Status = gBS->LocateProtocol (&gEdkiiIoMmuProtocolGuid, NULL, (VOID **)&mIoMmu); > if (!EFI_ERROR(Status)) { > gBS->CloseEvent (mIoMmuEvent); > } > diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.h b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.h > index bc9c7214dd..e0ed39eebc 100644 > --- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.h > +++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.h > @@ -23,6 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. > #include > #include > #include > +#include > > #include "PciRootBridge.h" > > @@ -269,4 +270,6 @@ GetTranslationByResourceType ( > ); > > extern EFI_CPU_IO2_PROTOCOL *mCpuIo; > +extern EDKII_IOMMU_PROTOCOL *mIoMmu; > + > #endif > diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridge.h b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridge.h > index 06871052e7..e8513c906f 100644 > --- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridge.h > +++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridge.h > @@ -26,7 +26,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. > #include > #include > #include > -#include > #include > #include > #include > diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c > index 16413b60a6..4c908fad88 100644 > --- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c > +++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c > @@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. > #include "PciRootBridge.h" > #include "PciHostResource.h" > > -extern EDKII_IOMMU_PROTOCOL *mIoMmuProtocol; > - > #define NO_MAPPING (VOID *) (UINTN) -1 > > #define RESOURCE_VALID(Resource) ((Resource)->Base <= (Resource)->Limit) > @@ -1269,7 +1267,7 @@ RootBridgeIoMap ( > > RootBridge = ROOT_BRIDGE_FROM_THIS (This); > > - if (mIoMmuProtocol != NULL) { > + if (mIoMmu != NULL) { > if (!RootBridge->DmaAbove4G) { > // > // Clear 64bit support > @@ -1278,14 +1276,14 @@ RootBridgeIoMap ( > Operation = (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_OPERATION) (Operation - EfiPciOperationBusMasterRead64); > } > } > - Status = mIoMmuProtocol->Map ( > - mIoMmuProtocol, > - (EDKII_IOMMU_OPERATION) Operation, > - HostAddress, > - NumberOfBytes, > - DeviceAddress, > - Mapping > - ); > + Status = mIoMmu->Map ( > + mIoMmu, > + (EDKII_IOMMU_OPERATION) Operation, > + HostAddress, > + NumberOfBytes, > + DeviceAddress, > + Mapping > + ); > return Status; > } > > @@ -1413,11 +1411,11 @@ RootBridgeIoUnmap ( > PCI_ROOT_BRIDGE_INSTANCE *RootBridge; > EFI_STATUS Status; > > - if (mIoMmuProtocol != NULL) { > - Status = mIoMmuProtocol->Unmap ( > - mIoMmuProtocol, > - Mapping > - ); > + if (mIoMmu != NULL) { > + Status = mIoMmu->Unmap ( > + mIoMmu, > + Mapping > + ); > return Status; > } > > @@ -1539,21 +1537,21 @@ RootBridgeIoAllocateBuffer ( > > RootBridge = ROOT_BRIDGE_FROM_THIS (This); > > - if (mIoMmuProtocol != NULL) { > + if (mIoMmu != NULL) { > if (!RootBridge->DmaAbove4G) { > // > // Clear DUAL_ADDRESS_CYCLE > // > Attributes &= ~((UINT64) EFI_PCI_ATTRIBUTE_DUAL_ADDRESS_CYCLE); > } > - Status = mIoMmuProtocol->AllocateBuffer ( > - mIoMmuProtocol, > - Type, > - MemoryType, > - Pages, > - HostAddress, > - Attributes > - ); > + Status = mIoMmu->AllocateBuffer ( > + mIoMmu, > + Type, > + MemoryType, > + Pages, > + HostAddress, > + Attributes > + ); > return Status; > } > > @@ -1603,12 +1601,12 @@ RootBridgeIoFreeBuffer ( > { > EFI_STATUS Status; > > - if (mIoMmuProtocol != NULL) { > - Status = mIoMmuProtocol->FreeBuffer ( > - mIoMmuProtocol, > - Pages, > - HostAddress > - ); > + if (mIoMmu != NULL) { > + Status = mIoMmu->FreeBuffer ( > + mIoMmu, > + Pages, > + HostAddress > + ); > return Status; > } > > Reviewed-by: Laszlo Ersek