From nobody Wed Dec 25 02:14:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1509687604099659.8494911407918; Thu, 2 Nov 2017 22:40:04 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id AF9882034A7A2; Thu, 2 Nov 2017 22:36:07 -0700 (PDT) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 6BBBE202E5E7F for ; Thu, 2 Nov 2017 22:36:06 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP; 02 Nov 2017 22:40:00 -0700 Received: from shwdeopenpsi068.ccr.corp.intel.com ([10.239.9.31]) by fmsmga001.fm.intel.com with ESMTP; 02 Nov 2017 22:39:59 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,337,1505804400"; d="scan'208";a="1213728635" From: Star Zeng To: edk2-devel@lists.01.org Date: Fri, 3 Nov 2017 13:39:57 +0800 Message-Id: <1509687597-63876-1-git-send-email-star.zeng@intel.com> X-Mailer: git-send-email 2.7.0.windows.1 Subject: [edk2] [PATCH] IntelSiliconPkg IntelVTdDxe: Use ACPI table event to get DMAR table X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiewen Yao , Star Zeng MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Use ACPI table event to get DMAR table instead of using ACPI SDT notification as ACPI SDT is optional and the default value of PcdInstallAcpiSdtProtocol is FALSE in MdeModulePkg.dec. Cc: Jiewen Yao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Star Zeng Reviewed-by: Jiewen.yao@intel.com --- .../Feature/VTd/IntelVTdDxe/DmaProtection.c | 55 +++++++++++++-----= ---- .../Feature/VTd/IntelVTdDxe/DmaProtection.h | 1 - .../Feature/VTd/IntelVTdDxe/DmarAcpiTable.c | 8 +++- .../Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf | 12 +++-- 4 files changed, 46 insertions(+), 30 deletions(-) diff --git a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.c b/Inte= lSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.c index 4a4d82e7f106..6052a0aebe45 100644 --- a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.c +++ b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.c @@ -13,7 +13,6 @@ =20 #include "DmaProtection.h" =20 -EFI_ACPI_SDT_PROTOCOL *mAcpiSdt; UINT64 mBelow4GMemoryLimit; UINT64 mAbove4GMemoryLimit; =20 @@ -350,11 +349,6 @@ SetupVtd ( // // 1. setup // - DEBUG ((DEBUG_INFO, "GetDmarAcpiTable\n")); - Status =3D GetDmarAcpiTable (); - if (EFI_ERROR (Status)) { - return; - } DEBUG ((DEBUG_INFO, "ParseDmarAcpiTable\n")); Status =3D ParseDmarAcpiTableDrhd (); if (EFI_ERROR (Status)) { @@ -399,27 +393,29 @@ SetupVtd ( } =20 /** - ACPI notification function. + Notification function of ACPI Table change. + + This is a notification function registered on ACPI Table change event. =20 - @param[in] Table A pointer to the ACPI table header. - @param[in] Version The ACPI table's version. - @param[in] TableKey The table key for this ACPI table. + @param Event Event whose notification function is being invoked. + @param Context Pointer to the notification function's context. =20 - @retval EFI_SUCCESS The notification function is executed. **/ -EFI_STATUS +VOID EFIAPI AcpiNotificationFunc ( - IN EFI_ACPI_SDT_HEADER *Table, - IN EFI_ACPI_TABLE_VERSION Version, - IN UINTN TableKey + IN EFI_EVENT Event, + IN VOID *Context ) { - if (Table->Signature =3D=3D EFI_ACPI_4_0_DMA_REMAPPING_TABLE_SIGNATURE) { - DEBUG((DEBUG_INFO, "Vtd AcpiNotificationFunc\n")); - SetupVtd (); + EFI_STATUS Status; + + Status =3D GetDmarAcpiTable (); + if (EFI_ERROR (Status)) { + return; } - return EFI_SUCCESS; + SetupVtd (); + gBS->CloseEvent (Event); } =20 /** @@ -474,11 +470,26 @@ InitializeDmaProtection ( EFI_STATUS Status; EFI_EVENT ExitBootServicesEvent; EFI_EVENT LegacyBootEvent; - - Status =3D gBS->LocateProtocol (&gEfiAcpiSdtProtocolGuid, NULL, (VOID **= ) &mAcpiSdt); + EFI_EVENT Event; + =20 + Status =3D gBS->CreateEventEx ( + EVT_NOTIFY_SIGNAL, + TPL_CALLBACK, + AcpiNotificationFunc, + NULL, + &gEfiAcpi10TableGuid, + &Event + ); ASSERT_EFI_ERROR (Status); =20 - Status =3D mAcpiSdt->RegisterNotify (TRUE, AcpiNotificationFunc); + Status =3D gBS->CreateEventEx ( + EVT_NOTIFY_SIGNAL, + TPL_CALLBACK, + AcpiNotificationFunc, + NULL, + &gEfiAcpi20TableGuid, + &Event + ); ASSERT_EFI_ERROR (Status); =20 Status =3D gBS->CreateEventEx ( diff --git a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.h b/Inte= lSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.h index f7b5292f23e8..0886647ea673 100644 --- a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.h +++ b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.h @@ -36,7 +36,6 @@ #include #include #include -#include #include #include =20 diff --git a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c b/Inte= lSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c index 39b70a134e1e..81dec109675b 100644 --- a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c +++ b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c @@ -989,6 +989,10 @@ GetDmarAcpiTable ( VOID *AcpiTable; EFI_STATUS Status; =20 + if (mAcpiDmarTable !=3D NULL) { + return EFI_SUCCESS; + } + AcpiTable =3D NULL; Status =3D EfiGetSystemConfigurationTable ( &gEfiAcpi20TableGuid, @@ -1006,10 +1010,10 @@ GetDmarAcpiTable ( (EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER *)Acpi= Table, EFI_ACPI_4_0_DMA_REMAPPING_TABLE_SIGNATURE ); - DEBUG ((DEBUG_INFO,"DMAR Table - 0x%08x\n", mAcpiDmarTable)); if (mAcpiDmarTable =3D=3D NULL) { - return EFI_UNSUPPORTED; + return EFI_NOT_FOUND; } + DEBUG ((DEBUG_INFO,"DMAR Table - 0x%08x\n", mAcpiDmarTable)); VtdDumpDmarTable(); =20 return EFI_SUCCESS; diff --git a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf b/Inte= lSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf index fde33bb224ca..bfb677704069 100644 --- a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf +++ b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf @@ -63,12 +63,15 @@ [LibraryClasses] =20 [Guids] gEfiEventExitBootServicesGuid ## CONSUMES ## Event - gEfiAcpi20TableGuid ## CONSUMES ## SystemTable - gEfiAcpi10TableGuid ## CONSUMES ## SystemTable + ## CONSUMES ## SystemTable + ## CONSUMES ## Event + gEfiAcpi20TableGuid + ## CONSUMES ## SystemTable + ## CONSUMES ## Event + gEfiAcpi10TableGuid =20 [Protocols] gEdkiiIoMmuProtocolGuid ## PRODUCES - gEfiAcpiSdtProtocolGuid ## CONSUMES gEfiPciIoProtocolGuid ## CONSUMES gEfiPciEnumerationCompleteProtocolGuid ## CONSUMES gEdkiiPlatformVTdPolicyProtocolGuid ## SOMETIMES_CONSUMES @@ -77,8 +80,7 @@ [Pcd] gIntelSiliconPkgTokenSpaceGuid.PcdVTdPolicyPropertyMask ## CONSUMES =20 [Depex] - gEfiPciRootBridgeIoProtocolGuid AND - gEfiAcpiSdtProtocolGuid + gEfiPciRootBridgeIoProtocolGuid =20 [UserExtensions.TianoCore."ExtraFiles"] IntelVTdDxeExtra.uni --=20 2.7.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel