From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.120; helo=mga04.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 5828421B02822 for ; Wed, 12 Sep 2018 19:27:01 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Sep 2018 19:27:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,367,1531810800"; d="scan'208";a="232445432" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga004.jf.intel.com with ESMTP; 12 Sep 2018 19:25:04 -0700 Received: from fmsmsx112.amr.corp.intel.com (10.18.116.6) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 12 Sep 2018 19:25:04 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by FMSMSX112.amr.corp.intel.com (10.18.116.6) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 12 Sep 2018 19:25:04 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.143]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.240]) with mapi id 14.03.0319.002; Thu, 13 Sep 2018 10:25:02 +0800 From: "Ni, Ruiyu" To: "Bi, Dandan" , "edk2-devel@lists.01.org" CC: "Zeng, Star" Thread-Topic: [patch 3/3] MdeModulePkg: Avoid key notification called more than once Thread-Index: AQHUSNWy91SCZ2Xcj0edFaeXHB3O26TtgDbQ Date: Thu, 13 Sep 2018 02:24:24 +0000 Deferred-Delivery: Thu, 13 Sep 2018 02:25:00 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5BE0703A@SHSMSX104.ccr.corp.intel.com> References: <20180910071202.11008-1-dandan.bi@intel.com> <20180910071202.11008-3-dandan.bi@intel.com> In-Reply-To: <20180910071202.11008-3-dandan.bi@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [patch 3/3] MdeModulePkg: Avoid key notification called more than once 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: Thu, 13 Sep 2018 02:27:01 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ruiyu Ni Thanks/Ray > -----Original Message----- > From: Bi, Dandan > Sent: Monday, September 10, 2018 3:12 PM > To: edk2-devel@lists.01.org > Cc: Bi, Dandan ; Ni, Ruiyu ; Zen= g, > Star > Subject: [patch 3/3] MdeModulePkg: Avoid key notification called more tha= n > once >=20 > From: Dandan Bi >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D996 >=20 > Issue: > In current code logic, when a key is pressed, it will search the whole > NotifyList to find whether a notification has been registered with the > keystroke. if yes, it will en-queue the key for notification execution la= ter. > And now if different notification functions have been registered with the > same key, then the key will be en-queued more than once. Then it will cau= se > the notification executed more than once. >=20 > This patch is to enhance the code logic to fix this issue. >=20 > Cc: Ruiyu Ni > Cc: Star Zeng > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Dandan Bi > --- > MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c | 1 + > MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c | 1 + > MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c | 1 + > 3 files changed, 3 insertions(+) >=20 > diff --git a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c > b/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c > index 2ee293d64d..53cb6f0b48 100644 > --- a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c > +++ b/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c > @@ -1449,10 +1449,11 @@ KeyGetchar ( > // while current TPL is TPL_NOTIFY. It will be invoked in > // KeyNotifyProcessHandler() which runs at TPL_CALLBACK. > // > PushEfikeyBufTail (&ConsoleIn->EfiKeyQueueForNotify, &KeyData); > gBS->SignalEvent (ConsoleIn->KeyNotifyProcessEvent); > + break; > } > } >=20 > PushEfikeyBufTail (&ConsoleIn->EfiKeyQueue, &KeyData); } diff --git > a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c > b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c > index b3b5fb9ff4..9cb4b5db6b 100644 > --- a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c > +++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c > @@ -1693,10 +1693,11 @@ UsbKeyCodeToEfiInputKey ( > // while current TPL is TPL_NOTIFY. It will be invoked in > // KeyNotifyProcessHandler() which runs at TPL_CALLBACK. > // > Enqueue (&UsbKeyboardDevice->EfiKeyQueueForNotify, KeyData, sizeof > (*KeyData)); > gBS->SignalEvent (UsbKeyboardDevice->KeyNotifyProcessEvent); > + break; > } > } >=20 > return EFI_SUCCESS; > } > diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c > b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c > index 33f9b6e585..d681a3039e 100644 > --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c > +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c > @@ -985,10 +985,11 @@ EfiKeyFiFoInsertOneKey ( > // while current TPL is TPL_NOTIFY. It will be invoked in > // KeyNotifyProcessHandler() which runs at TPL_CALLBACK. > // > EfiKeyFiFoForNotifyInsertOneKey (TerminalDevice->EfiKeyFiFoForNoti= fy, > Key); > gBS->SignalEvent (TerminalDevice->KeyNotifyProcessEvent); > + break; > } > } > if (IsEfiKeyFiFoFull (TerminalDevice)) { > // > // Efi Key FIFO is full > -- > 2.14.3.windows.1