From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web09.12418.1604058714886008655 for ; Fri, 30 Oct 2020 04:51:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=RjwLNJ0p; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: eric.dong@intel.com) IronPort-SDR: R0yGv/JyQZpj7tD83o8XNB9OA9oUSh5Q+Ql/jwHXu+soBYVrk50sHXlBfCYwYR9E0dYQ/owM00 M3XKzEtYyH4Q== X-IronPort-AV: E=McAfee;i="6000,8403,9789"; a="167813144" X-IronPort-AV: E=Sophos;i="5.77,433,1596524400"; d="scan'208";a="167813144" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Oct 2020 04:51:53 -0700 IronPort-SDR: GJF1hufFoAfBaeZWe1Ojf/mLqtLMEtJxRUEWdQecwgCmF8df3Jfes34zqYlbEcmVpqAc9b72ep BIvekNBL2NvA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,433,1596524400"; d="scan'208";a="356573506" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga002.fm.intel.com with ESMTP; 30 Oct 2020 04:51:52 -0700 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Fri, 30 Oct 2020 04:51:52 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Fri, 30 Oct 2020 04:51:52 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.168) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Fri, 30 Oct 2020 04:51:52 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ymx0RC7S52GahGcgCBxewQ+d4Ee5I+EFtBNaU9z/V6tM4J6+S0Sj5lbgOQi8sdFRlI3g1XM0EPjponhcZcVa1u10n2KPFhnVzNbV4dvHOtVIQulA5XzM64a8yXWF1u6ej6lttXjPBpM1rLn5ZSHclVB+3GO/I5FFjI2tTJEiS5ChLnE0Q5V8A74OAiMG7yyfEtiDQR7bX3p/+KhPiALv8NNDfOciAj+0HUzTjAk2Urjr1SkB/0jiaX5YYD/rUzwWuPC/ySDo5+YblVgHmbGW9lwM4ogFDzHa1ZM9Vo7pT5mvjC+eGPv8go1ksLfpNNUTC/u11BA7/1BZJPFvfMqmaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kzK9xS5x8vvBkzYJ3vYxIUK/YBu3NxmqVxRGQR1+hkM=; b=JpBlzHsuy7A5zIXYXhrfvgCvw3wftebXsfOwWcQWToDls/DeFdkSNZKfwQuL6htSj21DbHP+twPE/ZJ0ChYqzXn2Vrm0b392miwy+YkfSZaZKEP2UFNaWTWhUXo/MhVjvVWbOqxVNR6s+r/XdaD3njkTvR25zrwRqUdfjk+F8UpgjBkOqV0VjUZvEDkAwB9IFShK09pEtvLdJHoS5iNLovw4zNz5yujHVRAAP/PaC2O53yj+mqmGE/J9QqEGtQTc8qOvDfo9XezVes08c0sePF3p+BnsCbZyYobYOje45W8teHRvEfYzOBQbj1rc1MKsmoFAL4DVEWyW65HFLxLT5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kzK9xS5x8vvBkzYJ3vYxIUK/YBu3NxmqVxRGQR1+hkM=; b=RjwLNJ0pNEAW2bGFi9yKm108RjZN3jVqR1yJXDCmhUTQ6D1jB/QlQvvH7DgJr5q6u4URzTrVd0OpjFb6WkiuzA89nyUj3MAHh2xFfFKiWrEuTKfpjFG9B6CFOaUi/nFv4DO8GHMoyKSAfpP20X5jCvP3NrOr3/TvkR/kb6LEcFA= Received: from CY4PR11MB1272.namprd11.prod.outlook.com (2603:10b6:903:29::9) by CY4PR11MB1975.namprd11.prod.outlook.com (2603:10b6:903:11f::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19; Fri, 30 Oct 2020 11:51:50 +0000 Received: from CY4PR11MB1272.namprd11.prod.outlook.com ([fe80::5cb2:9510:d640:fa56]) by CY4PR11MB1272.namprd11.prod.outlook.com ([fe80::5cb2:9510:d640:fa56%4]) with mapi id 15.20.3499.028; Fri, 30 Oct 2020 11:51:49 +0000 From: "Dong, Eric" To: "Luo, Heng" , "devel@edk2.groups.io" CC: Michael Kubacki , "Chiu, Chasel" , "Desimone, Nathaniel L" Subject: Re: [PATCH] BoardModulePkg: Early connect PCI Root Bridge in BoardBdsHookLib Thread-Topic: [PATCH] BoardModulePkg: Early connect PCI Root Bridge in BoardBdsHookLib Thread-Index: AQHWp0p3KeNHSzWdR0efT4A5JXNl+amwF2kA Date: Fri, 30 Oct 2020 11:51:49 +0000 Message-ID: References: <20201021013505.3073-1-heng.luo@intel.com> In-Reply-To: <20201021013505.3073-1-heng.luo@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.46.36] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 4a638e3b-18d4-49ea-d7c2-08d87cca2fb6 x-ms-traffictypediagnostic: CY4PR11MB1975: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7691; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: gipW6MvRpI/Me8yNmGRiJ/FEMTKBtsRv3WcoPNlWVC0qzidBDYg9bQ1dpp+shChFgRBC8P+aDAKNnr1taHw6EjYACbXYQzrw21nGiWQwTgEDPnopSmy5KBo45esIeVO6v3XvJv4UeMTtnnKpG+qMU5KisD7Xsx4TV+YSdPDVT4NQNoNDmgIimcV/b0irUNJ/N+vEpCMgj3QXfHyME5B1jWOWG8UA/5Yh6k1oqHncCw/t1d2/9IOS9hOrdzWow+9D6hGVvCzJf9gbCYPCCVkSpPLsfSmbXQAKpY9MquzJlfdFuTWNEpuL/WGhcD/Vb1yn7BZomCYQS34l3AZsvyGUNtKkivuubTifr/4XoVzVunZSBzosjHL9jl/Z33E3Pyx+vwUY7b489iG33CH/aWX0ApPna/BwTtX6JlPWsu2uU/ws578DJf7YrcngeZ4tLiJHcBsyXN8qXw5Y/rg/9IZqDw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY4PR11MB1272.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(396003)(346002)(136003)(366004)(39860400002)(9686003)(86362001)(110136005)(6506007)(33656002)(71200400001)(83380400001)(478600001)(66946007)(55016002)(2906002)(186003)(76116006)(66476007)(7696005)(316002)(64756008)(54906003)(66556008)(8936002)(4326008)(966005)(52536014)(8676002)(107886003)(66446008)(26005)(5660300002)(53546011)(156123004);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: Hh+kruk5awJ5fFff965fYQH2gsJVIok3dVX+4K8KJ2q7D4J4BFkWuK94/OVUXV8a0KIljJYtjMxT+H3Nj+xXygvdiXjNvfGVCq9hn+jDsAjYG4HHI0AphCaS25W37HG3xDQOD6nJJezHbeaNTABnYA4cqueBgynkP5D6I4bf28moTGPrTNXWTV1B51Yrx9H9T9IWk8OshWpaUkNMjSxyGf+4JqjMiebmiaAJtIYB4xx29Yb//3XsGT8JBkZGrjCpOlrUYg1Qp93r4sEyMYrX+nB6ZOSLIV5BEeN5/pCRVHeTndddHn1s/3vd1sgYD9u7umINOGKFZ+WtACL30P1k+UdREZxbshb0hjsH+QVa1tXPlZJkjguJau6yIur1yiIRQQLvkM2KDrARQbvZis9yvBnimS0zoK6LXiA/8XNCKp2DeO1R1gCKql9MaLx9g8zNIqOViWGjlPyuDQFctUBLHpgVY7XWm23VtNZeT8fG7dmw4N6ZC9Euf3qmFwv90WOjudzBGNXXMBOufx3LiiqPplSbdSoqqBqA4Et13b7gn+Hvv2FGgl91okCg43pJgwKXrQOIoeD2sK78/QQAzrDGa2HgtwWso8u6kldQZRRHcYitXrfbyBNMt4qKAKlWIVNZQ4CRFoT+w/GPyR0Rqg5U7w== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CY4PR11MB1272.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a638e3b-18d4-49ea-d7c2-08d87cca2fb6 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Oct 2020 11:51:49.8095 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: dJbe+TrvS3QCSr7DpocLqb10k5cJeIrg67IK/qGjVnu35SkuZhrZJ7LO3dy8x/qvB0+3znyGTao++bOO1c8YCg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR11MB1975 Return-Path: eric.dong@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Eric Dong -----Original Message----- From: Luo, Heng =20 Sent: Wednesday, October 21, 2020 9:35 AM To: devel@edk2.groups.io Cc: Dong, Eric ; Michael Kubacki ; Chiu, Chasel ; Desimone, Nathaniel L Subject: [PATCH] BoardModulePkg: Early connect PCI Root Bridge in BoardBdsH= ookLib REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3016 Trigger PCI Bus scanning at BdsBeforeConsoleAfterTrustedConsoleCallback(). Move the call to EnumUsbKeyboard() to after PciEnumComplete. Cc: Eric Dong Cc: Michael Kubacki Cc: Chasel Chiu Cc: Nate DeSimone Signed-off-by: Heng Luo --- Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHookLib.c | = 77 ++++++++++++++++++++++++++++++++++++++----------------------------------= ----- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBds= HookLib.c b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsH= ookLib.c index 9d42a8c27f..d7612fb80a 100644 --- a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHookLib= .c +++ b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHookLib= .c @@ -1141,11 +1141,6 @@ BdsPciEnumCompleteCallback ( =20 gBootMode =3D GetBootModeHob (); =20 - // - // Connect Root Bridge to make PCI BAR resource allocated and all PciIo = created - // - ConnectRootBridge (FALSE); - // // Fill ConIn/ConOut in Full Configuration boot mode // @@ -1180,6 +1175,42 @@ BdsPciEnumCompleteCallback ( } } =20 + // + // Enumerate USB keyboard + // + EnumUsbKeyboard (); + + // + // For trusted console it must be handled here. + // + UpdateGraphicConOut (TRUE); + + // + // Register Boot Options + // + RegisterDefaultBootOption (); + + // + // Register Static Hot keys + // + RegisterStaticHotkey (); + + // + // Process Physical Preo + // + PERF_START_EX(NULL,"EventRec", NULL, AsmReadTsc(), 0x7010); + if (PcdGetBool (PcdTpm2Enable)) { + ProcessTcgPp (); + ProcessTcgMor (); + } + PERF_END_EX(NULL,"EventRec", NULL, AsmReadTsc(), 0x7011); + + // + // Perform memory test + // We should make all UEFI memory and GCD information populated before E= xitPmAuth. + // SMM may consume these information. + // + MemoryTest((EXTENDMEM_COVERAGE_LEVEL) PcdGet32 (PcdPlatformMemoryCheckLe= vel)); } =20 /** @@ -1265,41 +1296,9 @@ BdsBeforeConsoleAfterTrustedConsoleCallback ( DEBUG ((DEBUG_INFO, "Event gBdsEventBeforeConsoleBeforeEndOfDxeGuid call= back starts\n")); =20 // - // Enumerate USB keyboard - // - EnumUsbKeyboard (); - - // - // For trusted console it must be handled here. - // - UpdateGraphicConOut (TRUE); - - // - // Register Boot Options - // - RegisterDefaultBootOption (); - - // - // Register Static Hot keys - // - RegisterStaticHotkey (); - - // - // Process Physical Preo - // - PERF_START_EX(NULL,"EventRec", NULL, AsmReadTsc(), 0x7010); - if (PcdGetBool (PcdTpm2Enable)) { - ProcessTcgPp (); - ProcessTcgMor (); - } - PERF_END_EX(NULL,"EventRec", NULL, AsmReadTsc(), 0x7011); - - // - // Perform memory test - // We should make all UEFI memory and GCD information populated before E= xitPmAuth. - // SMM may consume these information. + // Connect Root Bridge to make PCI BAR resource allocated and all PciIo = created // - MemoryTest((EXTENDMEM_COVERAGE_LEVEL) PcdGet32 (PcdPlatformMemoryCheckLe= vel)); + ConnectRootBridge (FALSE); } =20 =20 --=20 2.24.0.windows.2