From patchwork Thu Feb 22 16:28:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 129295 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp778099lja; Thu, 22 Feb 2018 08:28:41 -0800 (PST) X-Google-Smtp-Source: AH8x225k2RX6FdrgxnApptIpsHUk0qh2u6xd8N8wyHNJFeaXoqsF/iNu6MxDb8I6oMhbaPUVNwwJ X-Received: by 10.101.81.204 with SMTP id i12mr6104499pgq.206.1519316921033; Thu, 22 Feb 2018 08:28:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519316921; cv=none; d=google.com; s=arc-20160816; b=jhd0BG0GK/tHbWu6VUw3cNhARtWAkv1YOFg9qb1JingaFLbeUMfThAxWTS6JHPfiNB pM9hqrfwt48GXiQIwAK2Urutb/OZQ7rFTpcY3N2oXph0Ezeq/q36byiWf2hSnJkGs0wX RGFUTwrRreErPGDfyshLEn/fPJ/vcHM2WdGa82epnvw816A/WhP8uXmksBlw3ksE2cMU /fIH/2IuE1cF8DbtDBeC8bxlemwU0pzqHLQsji8FwOgomhJDTEgA8kdgDEuTXXxcFPNA cfPFbDDKd1EYPGFlnWPLCctq35VFw5nUCWsteq8z6QgvbCWczTNZQ7fd/zgdj9riy0uT 5DCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=JKOsypktGMN1+l+OGZ1BSg3Xd5XYqFWQ6gvV24RPbnI=; b=drY/Rt2n1zvxUpYJQBYOWfgW8pcR3TxajlzIY1yJ4gENSgpdHjkJLC1o+Sngq9urZH jV5CcHdb3MH6QIdOW8JmMDb75tW3OeIRU0+ehwLX8111AYUyS7ccGl5svBaW1uwbnqGk Nl4Pe6rVE9EtAp+So5dYWj6yKlVy6wgWiTPXFsi9iCoPQW6sVf/f6PsqNDuDAyJMX/gt D17JCSsPCyOkAd9EDsAhjhNxpxa6Ws5cAiBu1o5AmKpp6kyFZEc+WYcAHVCNxARS8Jc1 j/eSRcHu+6ipJ4ClUDrgeXPcvuGoxwWrkPhxhXh1yA7M74siMmPQvWvmQNR6wFyCW4Rj z58w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Cckigs2t; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id s24-v6si267609plp.291.2018.02.22.08.28.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Feb 2018 08:28:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Cckigs2t; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id B6D43222630B7; Thu, 22 Feb 2018 08:22:39 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::242; helo=mail-wr0-x242.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7D139222630A6 for ; Thu, 22 Feb 2018 08:22:37 -0800 (PST) Received: by mail-wr0-x242.google.com with SMTP id s5so11206513wra.0 for ; Thu, 22 Feb 2018 08:28:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CUF/cW1RhdfOEvVGwGv53rfm4gUuwed03kAkL/w32wU=; b=Cckigs2tF8X5lZwItseb6ZmYk4Hw+wkmtn39I6i1D5U1XJ1FwRavuFM5jXPYKYgemD 1cUuL6NSWLZpFu7WimP5Z9/nJf8bipbWezlyzJe7vyxbOmqeBHWXHelEho17yZtJRQvb xUvbRZDp9eF5caZp1IcR4EHVq3YgMQl5Ch0oc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CUF/cW1RhdfOEvVGwGv53rfm4gUuwed03kAkL/w32wU=; b=t1bFpmzjyka1o4pvNHTfZD7foB5Z/h4bpx2GypUnCCKLNVkzeI0UDSgWws2tft4Ouy +rLE0/IB6MRo2dT4aHg//ocoi+mErH4YrWClhS/GeSfXkJR94z0B3mSjBRpgIodXBj1R bFXo3ArEHvHANreX83NBZQ+RSZbjn/yYU+2Yj1/tQjS5Pm8HaYMfgKvQ8FBlG+W4eOWl wOgf4TKhEDNgS4ULV6vNnebs6y87hNnPGRQOSJ17x75f5Rjow4u3X3cfF4IZnU8JI+k5 ZpNtp76+yvbINhPcyLRuZmFuTtb+6iBDQiXwh4LGrcog+IvocJrqtyCS8WnyZql775Ex RqdQ== X-Gm-Message-State: APf1xPAmdysCJrzH0B2b/qQTLkdFTPaiDUKaoqi92zQc8h2qiHyogydQ w8NkboAhx3+RAB93CrFfkiaXJN/1IHQ= X-Received: by 10.223.164.14 with SMTP id d14mr6262878wra.182.1519316916105; Thu, 22 Feb 2018 08:28:36 -0800 (PST) Received: from localhost.localdomain ([196.90.4.100]) by smtp.gmail.com with ESMTPSA id b185sm867955wmb.24.2018.02.22.08.28.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Feb 2018 08:28:35 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Thu, 22 Feb 2018 16:28:21 +0000 Message-Id: <20180222162822.22703-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180222162822.22703-1-ard.biesheuvel@linaro.org> References: <20180222162822.22703-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms v2 1/2] MdePkg: introduce DxeRuntimeDebugLibSerialPort X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ruiyu.ni@intel.com, Ard Biesheuvel , afish@apple.com, liming.gao@intel.com, leif.lindholm@linaro.org, michael.d.kinney@intel.com, lersek@redhat.com, star.zeng@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Introduce a variant of BaseDebugLibSerialPort that behaves correctly with regards to the use of the serial port after ExitBootServices(). Also, it caches PCD values in the constructor so that no calls into PcdLib are made at runtime. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- MdePkg/Library/DxeRuntimeDebugLibSerialPort/DebugLib.c | 373 ++++++++++++++++++++ MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf | 56 +++ MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.uni | 21 ++ 3 files changed, 450 insertions(+) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Laszlo Ersek diff --git a/MdePkg/Library/DxeRuntimeDebugLibSerialPort/DebugLib.c b/MdePkg/Library/DxeRuntimeDebugLibSerialPort/DebugLib.c new file mode 100644 index 000000000000..8579469029a1 --- /dev/null +++ b/MdePkg/Library/DxeRuntimeDebugLibSerialPort/DebugLib.c @@ -0,0 +1,373 @@ +/** @file + DXE runtime Debug library instance based on Serial Port library. + It takes care not to call into SerialPortLib or PcdLib after + ExitBootServices() has been called, to prevent touching hardware that is + no longer owned by the firmware, or invoking protocols that are not safe + for runtime (such as gEfiPcdProtocolGuid) + + Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+ Copyright (c) 2018, Linaro, Ltd. All rights reserved.
+ + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php. + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +#include +#include +#include +#include +#include +#include +#include +#include + +STATIC EFI_EVENT mEfiExitBootServicesEvent; +STATIC BOOLEAN mEfiAtRuntime; + +STATIC UINT8 mDebugClearMemoryValue; +STATIC UINT8 mDebugPropertyMask; +STATIC UINT32 mFixedDebugPrintErrorLevel; + +// +// Define the maximum debug and assert message length that this library supports +// +#define MAX_DEBUG_MESSAGE_LENGTH 0x100 + +/** + Set AtRuntime flag as TRUE after ExitBootServices. + + @param[in] Event The Event that is being processed. + @param[in] Context The Event Context. + +**/ +STATIC +VOID +EFIAPI +ExitBootServicesEvent ( + IN EFI_EVENT Event, + IN VOID *Context + ) +{ + mEfiAtRuntime = TRUE; +} + +/** + The constructor function to initialize the Serial Port library and + register a callback for the ExitBootServices event. + + @param[in] ImageHandle The firmware allocated handle for the EFI image. + @param[in] SystemTable A pointer to the EFI System Table. + + @retval EFI_SUCCESS The operation completed successfully. + @retval other Either the serial port failed to initialize or the + ExitBootServices event callback registration failed. +**/ +EFI_STATUS +EFIAPI +DxeRuntimeDebugLibSerialPortConstructor ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status; + + mDebugClearMemoryValue = PcdGet8 (PcdDebugClearMemoryValue); + mDebugPropertyMask = PcdGet8 (PcdDebugPropertyMask); + mFixedDebugPrintErrorLevel = PcdGet32 (PcdFixedDebugPrintErrorLevel); + + Status = SerialPortInitialize (); + if (EFI_ERROR (Status)) { + return Status; + } + + return SystemTable->BootServices->CreateEventEx (EVT_NOTIFY_SIGNAL, + TPL_NOTIFY, ExitBootServicesEvent, NULL, + &gEfiEventExitBootServicesGuid, + &mEfiExitBootServicesEvent); +} + +/** + If a runtime driver exits with an error, it must call this routine + to free the allocated resource before the exiting. + + @param[in] ImageHandle The firmware allocated handle for the EFI image. + @param[in] SystemTable A pointer to the EFI System Table. + + @retval EFI_SUCCESS The Runtime Driver Lib shutdown successfully. + @retval EFI_UNSUPPORTED Runtime Driver lib was not initialized. +**/ +EFI_STATUS +EFIAPI +DxeRuntimeDebugLibSerialPortDestructor ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + return SystemTable->BootServices->CloseEvent (mEfiExitBootServicesEvent); +} + +/** + Prints a debug message to the debug output device if the specified error level + is enabled. + + If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function + GetDebugPrintErrorLevel (), then print the message specified by Format and the + associated variable argument list to the debug output device. + + If Format is NULL, then ASSERT(). + + @param ErrorLevel The error level of the debug message. + @param Format Format string for the debug message to print. + @param ... Variable argument list whose contents are accessed + based on the format string specified by Format. + +**/ +VOID +EFIAPI +DebugPrint ( + IN UINTN ErrorLevel, + IN CONST CHAR8 *Format, + ... + ) +{ + CHAR8 Buffer[MAX_DEBUG_MESSAGE_LENGTH]; + VA_LIST Marker; + + if (mEfiAtRuntime) { + return; + } + + ASSERT (Format != NULL); + + // + // Check driver debug mask value and global mask + // + if ((ErrorLevel & GetDebugPrintErrorLevel ()) == 0) { + return; + } + + // + // Convert the DEBUG() message to an ASCII String + // + VA_START (Marker, Format); + AsciiVSPrint (Buffer, sizeof (Buffer), Format, Marker); + VA_END (Marker); + + // + // Send the print string to a Serial Port + // + SerialPortWrite ((UINT8 *)Buffer, AsciiStrLen (Buffer)); +} + + +/** + Prints an assert message containing a filename, line number, and description. + This may be followed by a breakpoint or a dead loop. + + Print a message of the form "ASSERT (): \n" + to the debug output device. If DEBUG_PROPERTY_ASSERT_BREAKPOINT_ENABLED bit + of PcdDebugProperyMask is set then CpuBreakpoint() is called. Otherwise, if + DEBUG_PROPERTY_ASSERT_DEADLOOP_ENABLED bit of PcdDebugProperyMask is set then + CpuDeadLoop() is called. If neither of these bits are set, then this function + returns immediately after the message is printed to the debug output device. + DebugAssert() must actively prevent recursion. If DebugAssert() is called + while processing another DebugAssert(), then DebugAssert() must return + immediately. + + If FileName is NULL, then a string of "(NULL) Filename" is printed. + If Description is NULL, then a string of "(NULL) Description" is + printed. + + @param FileName The pointer to the name of the source file that generated + the assert condition. + @param LineNumber The line number in the source file that generated the + assert condition + @param Description The pointer to the description of the assert condition. + +**/ +VOID +EFIAPI +DebugAssert ( + IN CONST CHAR8 *FileName, + IN UINTN LineNumber, + IN CONST CHAR8 *Description + ) +{ + CHAR8 Buffer[MAX_DEBUG_MESSAGE_LENGTH]; + + if (!mEfiAtRuntime) { + // + // Generate the ASSERT() message in Ascii format + // + AsciiSPrint (Buffer, sizeof (Buffer), "ASSERT [%a] %a(%d): %a\n", + gEfiCallerBaseName, FileName, LineNumber, Description); + + // + // Send the print string to the Console Output device + // + SerialPortWrite ((UINT8 *)Buffer, AsciiStrLen (Buffer)); + } + + // + // Generate a Breakpoint, DeadLoop, or NOP based on PCD settings + // + if ((mDebugPropertyMask & DEBUG_PROPERTY_ASSERT_BREAKPOINT_ENABLED) != 0) { + CpuBreakpoint (); + } else if ((mDebugPropertyMask & + DEBUG_PROPERTY_ASSERT_DEADLOOP_ENABLED) != 0) { + CpuDeadLoop (); + } +} + + +/** + Fills a target buffer with PcdDebugClearMemoryValue, and returns the target + buffer. + + This function fills Length bytes of Buffer with the value specified by + PcdDebugClearMemoryValue, and returns Buffer. + + If Buffer is NULL, then ASSERT(). + If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). + + @param Buffer The pointer to the target buffer to be filled with + PcdDebugClearMemoryValue. + @param Length The number of bytes in Buffer to fill with + PcdDebugClearMemoryValue. + + @return Buffer The pointer to the target buffer filled with + PcdDebugClearMemoryValue. + +**/ +VOID * +EFIAPI +DebugClearMemory ( + OUT VOID *Buffer, + IN UINTN Length + ) +{ + if (!mEfiAtRuntime) { + ASSERT (Buffer != NULL); + ASSERT (Length <= (MAX_ADDRESS - (UINTN)Buffer + 1)); + } + + return SetMem (Buffer, Length, mDebugClearMemoryValue); +} + + +/** + Returns TRUE if ASSERT() macros are enabled. + + This function returns TRUE if the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of + PcdDebugProperyMask is set. Otherwise FALSE is returned. + + @retval TRUE The DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of + PcdDebugProperyMask is set. + @retval FALSE The DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of + PcdDebugProperyMask is clear. + +**/ +BOOLEAN +EFIAPI +DebugAssertEnabled ( + VOID + ) +{ + return (BOOLEAN)((mDebugPropertyMask & + DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED) != 0); +} + + +/** + Returns TRUE if DEBUG() macros are enabled. + + This function returns TRUE if the DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of + PcdDebugProperyMask is set. Otherwise FALSE is returned. + + @retval TRUE The DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of + PcdDebugProperyMask is set. + @retval FALSE The DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of + PcdDebugProperyMask is clear. + +**/ +BOOLEAN +EFIAPI +DebugPrintEnabled ( + VOID + ) +{ + return (BOOLEAN)((mDebugPropertyMask & + DEBUG_PROPERTY_DEBUG_PRINT_ENABLED) != 0); +} + + +/** + Returns TRUE if DEBUG_CODE() macros are enabled. + + This function returns TRUE if the DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of + PcdDebugProperyMask is set. Otherwise FALSE is returned. + + @retval TRUE The DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of + PcdDebugProperyMask is set. + @retval FALSE The DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of + PcdDebugProperyMask is clear. + +**/ +BOOLEAN +EFIAPI +DebugCodeEnabled ( + VOID + ) +{ + return (BOOLEAN)((mDebugPropertyMask & + DEBUG_PROPERTY_DEBUG_CODE_ENABLED) != 0); +} + + +/** + Returns TRUE if DEBUG_CLEAR_MEMORY() macro is enabled. + + This function returns TRUE if the DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of + PcdDebugProperyMask is set. Otherwise FALSE is returned. + + @retval TRUE The DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of + PcdDebugProperyMask is set. + @retval FALSE The DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of + PcdDebugProperyMask is clear. + +**/ +BOOLEAN +EFIAPI +DebugClearMemoryEnabled ( + VOID + ) +{ + return (BOOLEAN)((mDebugPropertyMask & + DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED) != 0); +} + +/** + Returns TRUE if any one of the bit is set both in ErrorLevel and + PcdFixedDebugPrintErrorLevel. + + This function compares the bit mask of ErrorLevel and + PcdFixedDebugPrintErrorLevel. + + @retval TRUE Current ErrorLevel is supported. + @retval FALSE Current ErrorLevel is not supported. + +**/ +BOOLEAN +EFIAPI +DebugPrintLevelEnabled ( + IN CONST UINTN ErrorLevel + ) +{ + return (BOOLEAN)((ErrorLevel & mFixedDebugPrintErrorLevel) != 0); +} diff --git a/MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf b/MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf new file mode 100644 index 000000000000..d5e9d3f8dee7 --- /dev/null +++ b/MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf @@ -0,0 +1,56 @@ +## @file +# DXE runtime Debug library instance based on Serial Port library. +# It takes care not to call into SerialPortLib or PcdLib after +# ExitBootServices() has been called, to prevent touching hardware that is +# no longer owned by the firmware, or invoking protocols that are not safe +# for runtime (such as gEfiPcdProtocolGuid) +# +# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
+# Copyright (c) 2018, Linaro, Ltd. All rights reserved.
+# +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php. +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# +# +## + +[Defines] + INF_VERSION = 0x0001001A + BASE_NAME = DxeRuntimeDebugLibSerialPort + MODULE_UNI_FILE = DxeRuntimeDebugLibSerialPort.uni + FILE_GUID = 9D914E2F-7CCB-41DB-8E74-9AFF8F3BBFBF + MODULE_TYPE = DXE_RUNTIME_DRIVER + VERSION_STRING = 1.0 + LIBRARY_CLASS = DebugLib|DXE_RUNTIME_DRIVER + CONSTRUCTOR = DxeRuntimeDebugLibSerialPortConstructor + DESTRUCTOR = DxeRuntimeDebugLibSerialPortDestructor + +# +# VALID_ARCHITECTURES = AARCH64 ARM IA32 X64 IPF EBC +# + +[Sources] + DebugLib.c + +[Packages] + MdePkg/MdePkg.dec + +[LibraryClasses] + BaseLib + BaseMemoryLib + DebugPrintErrorLevelLib + PcdLib + PrintLib + SerialPortLib + +[Guids] + gEfiEventExitBootServicesGuid ## CONSUMES ## Event + +[Pcd] + gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue ## CONSUMES + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask ## CONSUMES + gEfiMdePkgTokenSpaceGuid.PcdFixedDebugPrintErrorLevel ## CONSUMES diff --git a/MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.uni b/MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.uni new file mode 100644 index 000000000000..cd65515c4177 --- /dev/null +++ b/MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.uni @@ -0,0 +1,21 @@ +// /** @file +// Instance of Debug Library based on Serial Port Library. +// +// It uses Print Library to produce formatted output strings to seiral port device. +// +// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+// +// This program and the accompanying materials +// are licensed and made available under the terms and conditions of the BSD License +// which accompanies this distribution. The full text of the license may be found at +// http://opensource.org/licenses/bsd-license.php. +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// **/ + + +#string STR_MODULE_ABSTRACT #language en-US "Instance of Debug Library based on Serial Port Library" + +#string STR_MODULE_DESCRIPTION #language en-US "It uses Print Library to produce formatted output strings to a serial port device." + From patchwork Thu Feb 22 16:28:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 129296 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp778145lja; Thu, 22 Feb 2018 08:28:43 -0800 (PST) X-Google-Smtp-Source: AH8x224KE+s2f8quR4kFyYneo+x4Q6E6/c3rilfdllBJOTC2GY8hVvjZrjf0vdHwh+kZDKlbeBB8 X-Received: by 10.98.36.25 with SMTP id r25mr7541769pfj.106.1519316923431; Thu, 22 Feb 2018 08:28:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519316923; cv=none; d=google.com; s=arc-20160816; b=F7+PYvYKB5XDvdYoBUZN7Ke1tKW51/DZyeYnpqyoxvIPRT1VqqfHX3cChdL3D9RUEk 4aqiluQZIYpXCTKS+CeqPQeqZiBfSxDMkPLN7bCChkNFNJrXBTcufWM+rqXyiwfwS1wr bkQ24c+ciCiH3fL4XdeH/+MLIhmmoZdSl7/i6jOE7IKS8zd60sv20TpFwECk2oXKzwlu PT5dpHiveMEm0UZgwrhon8EoiEm6srBvfTltmeWEiWegRDvoy0ROGrKeLuES3+IfQwF3 IhgIdlA1H4x2thGto+82Vqq2ifkEjAo0Nz8VYoWm2b40xfppQuwU8rXTK1UPy5a9ahWz H0+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=NZlaNGt6lLWlfQWOXhP9IqtZ7vt5eN42pn0GCHG1dc0=; b=VZsRxg8NiTzxI1XseByRVhchjY85C4aAYWgulfLga3n2hrKGdE9XFtuIFa+rS6D/cg jo/zyn5lSVOUnOh4QidbyC6C5l8WMDT3WCWGH28J64PHmgVHkMvMgHtEVYZ+svnbuQr1 rtxdx2FZBoZBMiws3bV0Cn8X2mMNLVPKAzOxQQo9U2eJHXb1TEWTMG6gXutWfjMNinTq USTeB17137jBSd6VSJ219R/C4BZV95R8VC7QseYA/AWwGIkgaythqcwyaH7Do9eTBd6d I7K8PatfKHhdSuOACkXqKE7Xbk/2jNyTb++0DdmE6+dw6j3R58zCZSJuwmYCcVvAaGlM IZIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=K/sudv/K; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id o11si220392pgp.624.2018.02.22.08.28.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Feb 2018 08:28:43 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=K/sudv/K; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1DE04222630B9; Thu, 22 Feb 2018 08:22:42 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::241; helo=mail-wr0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E2E97222630B9 for ; Thu, 22 Feb 2018 08:22:39 -0800 (PST) Received: by mail-wr0-x241.google.com with SMTP id o76so11183061wrb.7 for ; Thu, 22 Feb 2018 08:28:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cvMTjgZGSz6IjFwJzTXruH7M4yz4o4rO/2h8Mubh5Sg=; b=K/sudv/KWlECTK/HULHGLmOTYc4iodfTANPTE+aRoZnTu8p5DAqfEol5W66d53+NoQ M/IGsqodNQcUS3hLmNJF7RzGEzcsophSMKM2YpeCvqrpNWRXkT6RJdY01oeno2ck0nt3 MNOF3sGirbh+N21ZSk4uO7ntXwcc4hIrgQrBw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cvMTjgZGSz6IjFwJzTXruH7M4yz4o4rO/2h8Mubh5Sg=; b=qi6PBkV3xizudsYJpqUfVvBqDJRBZchcll0n2pugRMWI7x2LXhb7w/LLoeRpbOmcM0 Ox2uz74L/i8uP4jjVGfoeGT/x0Nf1jh1a1/9MgQtKvwtWtC4Svy4BITdIGuj5DD0wHMs p1aEMvN3MqeYx22W+DVehWw2lNKy3NOsaG/Dr+N1YUOtWc3ldr1nxCQgk4VoFKsI9XKH cqSQhKWrH+HvIYGzn9ZC+R+9Zv5aruaQXHGFfn35Def9Bf4fYByYt6jCijXk6rIXSf6F 8l4TUulOfzK6wzQpZWHK05+yOsqj/l4OS1pyCiqDGUc/JnX+KwEwKyygrWEu1XUTRIHE I6cQ== X-Gm-Message-State: APf1xPD386iJr5npb3z9UxNIbSRdJsk/cuK21a5x9yBwrg5AWzMLEnuR ZvNn8K1n3PJFHwnjq0xcRV9r8Yc53z8= X-Received: by 10.223.150.42 with SMTP id b39mr1709448wra.55.1519316919029; Thu, 22 Feb 2018 08:28:39 -0800 (PST) Received: from localhost.localdomain ([196.90.4.100]) by smtp.gmail.com with ESMTPSA id b185sm867955wmb.24.2018.02.22.08.28.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Feb 2018 08:28:37 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Thu, 22 Feb 2018 16:28:22 +0000 Message-Id: <20180222162822.22703-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180222162822.22703-1-ard.biesheuvel@linaro.org> References: <20180222162822.22703-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms v2 2/2] ArmVirtPkg: switch to DXE runtime version of DebugLib where appropriate X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ruiyu.ni@intel.com, Ard Biesheuvel , afish@apple.com, liming.gao@intel.com, leif.lindholm@linaro.org, michael.d.kinney@intel.com, lersek@redhat.com, star.zeng@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Switch all users of ArmVirt.dsc.inc to the new DebugLib implementation that was created especially for DXE_RUNTIME_DRIVER modules, ensuring that DEBUG() calls do not touch the UART at runtime. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Reviewed-by: Laszlo Ersek --- ArmVirtPkg/ArmVirt.dsc.inc | 3 +++ 1 file changed, 3 insertions(+) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 0cb48f08e9bf..cde514958da2 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -231,6 +231,9 @@ [LibraryClasses.common.UEFI_DRIVER] [LibraryClasses.common.DXE_RUNTIME_DRIVER] MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf +!if $(TARGET) != RELEASE + DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf +!endif !if $(SECURE_BOOT_ENABLE) == TRUE BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf