From: Laszlo Ersek <lersek@redhat.com>
To: Ruiyu Ni <ruiyu.ni@intel.com>, edk2-devel@lists.01.org
Cc: Star Zeng <star.zeng@intel.com>
Subject: Re: [PATCH v2 4/4] MdeModulePkg/PciHostBridge: Move declaration of mIoMmu to header file
Date: Tue, 25 Sep 2018 12:43:17 +0200 [thread overview]
Message-ID: <9a533ea8-64b0-efe2-d8b1-83190e022c34@redhat.com> (raw)
In-Reply-To: <20180925062117.34772-5-ruiyu.ni@intel.com>
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 <ruiyu.ni@intel.com>
> Suggested-by: Star Zeng <star.zeng@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> ---
> .../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 <Library/MemoryAllocationLib.h>
> #include <Library/PciHostBridgeLib.h>
> #include <Protocol/PciHostBridgeResourceAllocation.h>
> +#include <Protocol/IoMmu.h>
>
> #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 <Protocol/CpuIo2.h>
> #include <Protocol/DevicePath.h>
> #include <Protocol/PciRootBridgeIo.h>
> -#include <Protocol/IoMmu.h>
> #include <Library/DebugLib.h>
> #include <Library/DevicePathLib.h>
> #include <Library/BaseMemoryLib.h>
> 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 <lersek@redhat.com>
next prev parent reply other threads:[~2018-09-25 10:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-25 6:21 [PATCH v2 0/4] Fix a bug that prevents PMEM access Ruiyu Ni
2018-09-25 6:21 ` [PATCH v2 1/4] MdeModulePkg/PciHostBridge: Enhance boundary check in Io/Mem.Read/Write Ruiyu Ni
2018-09-25 6:21 ` [PATCH v2 2/4] MdeModulePkg/PciHostBridge: Fix a bug that prevents PMEM access Ruiyu Ni
2018-09-25 6:21 ` [PATCH v2 3/4] MdeModulePkg/PciHostBridge: Add RESOURCE_VALID() to simplify code Ruiyu Ni
2018-09-25 6:21 ` [PATCH v2 4/4] MdeModulePkg/PciHostBridge: Move declaration of mIoMmu to header file Ruiyu Ni
2018-09-25 10:43 ` Laszlo Ersek [this message]
2018-09-25 10:44 ` Laszlo Ersek
2018-09-25 12:12 ` [PATCH v2 0/4] Fix a bug that prevents PMEM access Zeng, Star
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9a533ea8-64b0-efe2-d8b1-83190e022c34@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox