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 1A1DE211B5A57 for ; Tue, 15 Jan 2019 02:09:48 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 73433D56EF; Tue, 15 Jan 2019 10:09:48 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-50.rdu2.redhat.com [10.10.120.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F147600C8; Tue, 15 Jan 2019 10:09:47 +0000 (UTC) To: Ard Biesheuvel , edk2-devel@lists.01.org References: <20190115082345.3711-1-ard.biesheuvel@linaro.org> <20190115082345.3711-6-ard.biesheuvel@linaro.org> From: Laszlo Ersek Message-ID: <76d33f86-fa11-dac2-8975-2cc2691f32f1@redhat.com> Date: Tue, 15 Jan 2019 11:09:46 +0100 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: <20190115082345.3711-6-ard.biesheuvel@linaro.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 15 Jan 2019 10:09:48 +0000 (UTC) Subject: Re: [PATCH v2 5/5] ArmPkg/DefaultExceptionHandlerLib: use console if available 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, 15 Jan 2019 10:09:49 -0000 X-List-Received-Date: Tue, 15 Jan 2019 10:09:49 -0000 X-List-Received-Date: Tue, 15 Jan 2019 10:09:49 -0000 X-List-Received-Date: Tue, 15 Jan 2019 10:09:49 -0000 X-List-Received-Date: Tue, 15 Jan 2019 10:09:49 -0000 X-List-Received-Date: Tue, 15 Jan 2019 10:09:49 -0000 X-List-Received-Date: Tue, 15 Jan 2019 10:09:49 -0000 X-List-Received-Date: Tue, 15 Jan 2019 10:09:49 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 01/15/19 09:23, Ard Biesheuvel wrote: > Print the minimal 'exception occurred' message to the console instead > of straight to the serial port if the console is available. This makes > such messages visible on systems where the console is graphical and > the serial is not connected. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ard Biesheuvel > Reviewed-by: Leif Lindholm > --- > ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c | 12 ++++++++++-- > ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c | 7 ++++++- > ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf | 1 + > 3 files changed, 17 insertions(+), 3 deletions(-) Please consider updating the following, before pushing the patch: > diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c b/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c > index 1024bf48c63d..362acd5ba6d2 100644 > --- a/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c > +++ b/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c > @@ -22,6 +22,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -159,14 +160,21 @@ DefaultExceptionHandler ( > INT32 Offset; > > if (mRecursiveException) { > - CharCount = AsciiSPrint (Buffer, sizeof (Buffer),"\nRecursive exception occurred while dumping the CPU state\n"); > - SerialPortWrite ((UINT8 *) Buffer, CharCount); > + STATIC CHAR8 CONST Message[] = "\nRecursive exception occurred while dumping the CPU state\n"; > + > + SerialPortWrite ((UINT8 *)Message, AsciiStrLen (Message)); (1) A micro-optimization could be (sizeof Message - 1) rather than AsciiStrLen (Message), but it's mostly irrelevant. > + if (gST->ConOut != NULL) { > + AsciiPrint (Message); > + } > CpuDeadLoop (); > } > mRecursiveException = TRUE; > > CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"\n\n%a Exception at 0x%016lx\n", gExceptionTypeString[ExceptionType], SystemContext.SystemContextAArch64->ELR); > SerialPortWrite ((UINT8 *) Buffer, CharCount); > + if (gST->ConOut != NULL) { > + AsciiPrint (Buffer); > + } > > DEBUG_CODE_BEGIN (); > CHAR8 *Pdb, *PrevPdb; > diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c b/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c > index cc79cb2fa301..a79f73725aed 100644 > --- a/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c > +++ b/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c > @@ -21,6 +21,7 @@ > #include > #include > #include > +#include > > #include > > @@ -194,7 +195,11 @@ DefaultExceptionHandler ( > > CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"\n%a Exception PC at 0x%08x CPSR 0x%08x ", > gExceptionTypeString[ExceptionType], SystemContext.SystemContextArm->PC, SystemContext.SystemContextArm->CPSR); > - SerialPortWrite ((UINT8 *) Buffer, CharCount); > + if (gST->ConOut != NULL) { > + AsciiPrint (Buffer); > + } else { > + SerialPortWrite ((UINT8 *)Buffer, CharCount); > + } (2) I think the "serial PLUS console" reporting applies to the 32-bit lib instance as well, so I assume not updating this from v1 was an oversight. > > DEBUG_CODE_BEGIN (); > CHAR8 *Pdb; > diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf > index 7609f82d89a1..6bc48714c9dc 100644 > --- a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf > +++ b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf > @@ -42,6 +42,7 @@ [LibraryClasses] > PeCoffGetEntryPointLib > ArmDisassemblerLib > SerialPortLib > + UefiBootServicesTableLib > > [Guids] > gEfiDebugImageInfoTableGuid > With (2) updated, and regardless of (1): Acked-by: Laszlo Ersek Thanks! Laszlo