From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=66.187.233.73; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) (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 A2B11226CD789 for ; Fri, 13 Apr 2018 01:59:45 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4FFF2401DEA7; Fri, 13 Apr 2018 08:59:44 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-136.rdu2.redhat.com [10.10.120.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 95B9C2166BC6; Fri, 13 Apr 2018 08:59:43 +0000 (UTC) To: "Zeng, Star" , "Ni, Ruiyu" , "edk2-devel@lists.01.org" References: <20180413041352.27740-1-ruiyu.ni@intel.com> <0C09AFA07DD0434D9E2A0C6AEB0483103BAAC7D7@shsmsx102.ccr.corp.intel.com> From: Laszlo Ersek Message-ID: Date: Fri, 13 Apr 2018 10:59:42 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <0C09AFA07DD0434D9E2A0C6AEB0483103BAAC7D7@shsmsx102.ccr.corp.intel.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Fri, 13 Apr 2018 08:59:44 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Fri, 13 Apr 2018 08:59:44 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lersek@redhat.com' RCPT:'' Subject: Re: [PATCH] MdeModulePkg/Terminal: Check status of OpenProtocol in BindingStart X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2018 08:59:45 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Hi Star, On 04/13/18 07:15, Zeng, Star wrote: > Generally, I am ok with the change. > But, what is the case for the change? > If the new "if condition" is TRUE, the ASSERT above it will happen, so the new "if condition" is for RELEASE build case? > And if the code passes Support() check, then seemingly, the "if condition" in Start() will not happen. > Could more detailed information in the commit log or code comments? I believe this patch is for . It seems to be for the "input Controller handle is invalid" case. Comment 0 in that BZ describes the issue, but I agree the commit message should at least reference the BZ. Thanks Laszlo > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ruiyu Ni > Sent: Friday, April 13, 2018 12:14 PM > To: edk2-devel@lists.01.org > Cc: Zeng, Star > Subject: [edk2] [PATCH] MdeModulePkg/Terminal: Check status of OpenProtocol in BindingStart > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ruiyu Ni > Cc: Steven Shi > Cc: Star Zeng > --- > MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c > index 60de2d4d6d..66dd3ad550 100644 > --- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c > +++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c > @@ -2,7 +2,7 @@ > Produces Simple Text Input Protocol, Simple Text Input Extended Protocol and > Simple Text Output Protocol upon Serial IO Protocol. > > -Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
> +Copyright (c) 2006 - 2018, 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 @@ -488,6 +488,9 @@ TerminalDriverBindingStart ( > EFI_OPEN_PROTOCOL_BY_DRIVER > ); > ASSERT ((Status == EFI_SUCCESS) || (Status == EFI_ALREADY_STARTED)); > + if (EFI_ERROR (Status) && (Status != EFI_ALREADY_STARTED)) { > + return Status; > + } > > // > // Open the Serial I/O Protocol BY_DRIVER. It might already be started. > @@ -501,6 +504,9 @@ TerminalDriverBindingStart ( > EFI_OPEN_PROTOCOL_BY_DRIVER > ); > ASSERT ((Status == EFI_SUCCESS) || (Status == EFI_ALREADY_STARTED)); > + if (EFI_ERROR (Status) && (Status != EFI_ALREADY_STARTED)) { > + return Status; > + } > > if (!IsHotPlugDevice (ParentDevicePath)) { > // > -- > 2.14.1.windows.1 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel >