From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (NAM10-MW2-obe.outbound.protection.outlook.com [40.107.94.63]) by mx.groups.io with SMTP id smtpd.web11.25051.1592245852109014167 for ; Mon, 15 Jun 2020 11:30:52 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=x8VeUyVB; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.94.63, mailfrom: garrett.kirkendall@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NOWntiO/51C5Xnk2Cec3kOkrGwdh3GZaLC2QitPJiD3V6e/Vz0oROLxeoN6bzBu1lodyYWZTMbw9CwbGCMv1Z4skaU+ocvf1KyJwcRgGFY0dcBXcyOle+XRoL26VGJf5rJkpCkmizcMJapAy8tiDxI9frz3PoLCy7xI59Qfi4TGFKGpINFyPXXEEXm621wuXQBP+AfO5dY2G1XdKX7nPruJ7i8L90zrBoU0i4ZsuQEuvnAr5/XAoyc6A1yqJ2bufCuw+McIv//ZVzr/hMjZEQ5TVoIB5V6NXioC4Mh9dMECNIw5mdlIwhDOlK0CYxyy3VTH7VH9ihnC/gZwDGCzVnQ== 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=auyotnFkgbqnua1VaJDJAFHx/g/lmIDSDjsz4xXJPI0=; b=jgTWgll0GzwFBjdxrAxB4SF5F/yxYPLkDiTJa77IqxSsaAglS5hx5Cy7zuzG9AkaB5MWhf2A82wKkKrzLlr1aQK6rhZVbE1tldoCiJPlFyBUgyJOhBVAD2HFQMrKnVkgK3krIyt/elhymnhyAnmHQYUY+LkDWAjPFCacsLasaZT2ulzwQD6yfgvq000LykZ/FJyk99XsyCgCBfr2+4S92MDFwJ766TRHyJwd77J8sASNP3aHJ/A7AuF/XFk4oiFrAOI3H8qYMDJ2+lMhuKl4oALlwhGvDhsA14aJAj5ESN+ge2TUq+O2xVp6ensZQSIVUNdHiARndOmd5V7QadQfgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=auyotnFkgbqnua1VaJDJAFHx/g/lmIDSDjsz4xXJPI0=; b=x8VeUyVB8UXoC671I/SmSXjGvCFHOryZfIdOx8DxuZ7Il0ZEt2QIDpxBiLSoGrT8WD5GAbBOMjq5QrjBNE/lyW+JUVLK5dTCfMwK9pgHho6OSQqmHY28OhzHzJ4mMUj87Ehk8AWVe9nUVX9Fp+hu4SrTzPKN5NCJaZSOA9X1jzo= Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=amd.com; Received: from SN1PR12MB2352.namprd12.prod.outlook.com (2603:10b6:802:25::13) by SN1PR12MB2495.namprd12.prod.outlook.com (2603:10b6:802:32::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3088.24; Mon, 15 Jun 2020 18:30:50 +0000 Received: from SN1PR12MB2352.namprd12.prod.outlook.com ([fe80::156e:ce6d:a148:274e]) by SN1PR12MB2352.namprd12.prod.outlook.com ([fe80::156e:ce6d:a148:274e%7]) with mapi id 15.20.3088.025; Mon, 15 Jun 2020 18:30:50 +0000 From: "Kirkendall, Garrett" To: devel@edk2.groups.io CC: Eric Dong , Ray Ni , Laszlo Ersek Subject: [PATCH v1 0/2] UefiCpuPkg: AMD procesor MSR_IA32_MISC_ENABLE Date: Mon, 15 Jun 2020 13:30:27 -0500 Message-ID: <20200615183029.4577-1-Garrett.Kirkendall@amd.com> X-Mailer: git-send-email 2.27.0 X-ClientProxiedBy: SA9PR03CA0020.namprd03.prod.outlook.com (2603:10b6:806:20::25) To SN1PR12MB2352.namprd12.prod.outlook.com (2603:10b6:802:25::13) Return-Path: Garrett.Kirkendall@amd.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from biosdev-01.amd.com (165.204.78.2) by SA9PR03CA0020.namprd03.prod.outlook.com (2603:10b6:806:20::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3088.27 via Frontend Transport; Mon, 15 Jun 2020 18:30:50 +0000 X-Mailer: git-send-email 2.27.0 X-Originating-IP: [165.204.78.2] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 01f2a8f9-0ce4-42e0-5ddd-08d8115a3adb X-MS-TrafficTypeDiagnostic: SN1PR12MB2495: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-Forefront-PRVS: 04359FAD81 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GzW5TKEJ3NXLKqL3m2bZJGFwsZjvtgbZmaC0bEJCYtfwN12DX0WIpmH/fHsKMsRVaXsRGItcDec2dmuAuGw4FNBT60ODk0G4KavCEIxuOMA0dUGqc5OiXcTQubyNMkbiK9Gi/dbXPqbKh+asprYMAiwjBwdt+UGkeKNcjpkHkMpKMrWKyk2KderwWO5ojutAiCBpa1Dfy+OrqUePKMR1X8G6veSOF4ACTmhMjaPAYaFo1t1gMfKF3mQpVGp80M1Dw80xDLJJ5PoC52Yk8HPtUU1AwYsyZ35YA6VMRGKF4jMy2w6PgFEvPmxfbhtLJqQg6CYLi2HHzEkYv0vBnSiqMPAt/gjJrlDQfqRlKgU1XaWJiwJFrMcQOYshx4U+/MdliMyM0oInStWSnIMxwDP9yQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN1PR12MB2352.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(39860400002)(396003)(136003)(346002)(376002)(366004)(36756003)(6916009)(19627235002)(478600001)(6666004)(4326008)(966005)(83380400001)(8676002)(316002)(8936002)(2616005)(956004)(54906003)(86362001)(66476007)(66556008)(66946007)(1076003)(6486002)(16526019)(7696005)(52116002)(26005)(5660300002)(2906002)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: ZMmUInBpD1u3U6mh84q1N0sbgNV4tygqCN+3mZr4r8OdOTwrYdeLruNd7LOd+GrrVz5lg0ee0TNEz5Xn5S4Kc9qro6e4TrN+Y/oaJ/cF8Znv48vhOygs/eW24iENqQzYzLJQ5jNtyjftELoXANZW7SYXtuNa6bhG2HnObw8bPM9zYUE7FViIC9RW79wZDYRF4es0ez83f5InHDSU5tO8jA378cmQEq0dmZ0D4ERfW8RrSp0OLtN0obzSBbfQMHxV21Ob9X4zcmgbvjy3Ry1Tb9I7xj7QseH/iQ7ReNZb6l46hnuBpB1LyvqPDmaZ8dhuJM7YhJ6N9V2ZPNzx7hAkdWkWu74ENR54NgOQIchthK3jaOv/Y9ee7jvvuDAV30/a7J2vFQtCf1mvAt1h6oLn6b7mwUqTYZGKJncNLFsFdHBZuI52b/8lALLyZ+vNiXmq7wFFFWlwbhJO2Ifu9DvnGVYEF8p238cAYROxWfx4GWw= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01f2a8f9-0ce4-42e0-5ddd-08d8115a3adb X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2020 18:30:50.7497 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: N9DNtIZbYH7+9HPc/kS29MFhFINDIyL8aWpBjwimWuMgtE8HWSHmkFYZA/uybCH3jOAV1P38QYH1bJoN6+lmuw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2495 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain AMD processor does not support MSR_IA32_MISC_ENABLE register. Accessing this register on AMD causes an unhandled exception in SmmEntry.nasm and a subsequent failure to boot since this is too early in SMM path for the exception handler to be loaded. First, to distinguish between AMD and other processors, refactor StandardSignatureIsAuthenticAMD into BaseUefiCpuLib. So there is only one copy in the source. All changed modules already include UefiCpuLib either directly or indirectly so could not easly split first patch. Second, Skip manipulation of MSR_IA32_MISC_ENABLE register if running on an AMD processor. Tested on AMD X64 processor. Modified source patching in 2/2 for FALSE and TRUE to test failure and passing case when AMD processor detected. Did not have a way to test UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm. Test BIOS used following components: UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf UefiCpuPkg/Library/MpInitLib/MpLib.c UefiCpuPkg/PiSmmCpuDxeSmm in X64 mode Garrett Kirkendall (2): UefiCpuPkg: Move StandardSignatureIsAuthenticAMD to BaseUefiCpuLib UefiCpuPkg: PiSmmCpuDxeSmm skip MSR_IA32_MISC_ENABLE manipulation on AMD UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf | 7 ++++ UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf | 2 ++ UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf | 2 ++ UefiCpuPkg/Include/Library/UefiCpuLib.h | 14 ++++++++ UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h | 3 ++ UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.c | 38 ++++++++= ++++++++++++ UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c | 25 ++------= ----- UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c | 25 ++------= ----- UefiCpuPkg/Library/MpInitLib/MpLib.c | 23 --------= ---- UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c | 9 ++++- UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm | 19 ++++++++= -- UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm | 20 ++++++++= +-- 12 files changed, 113 insertions(+), 74 deletions(-) create mode 100644 UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.c Changes at: https://github.com/gkirkendall-amd/edk2/tree/smmentry_nasm_skip_msr_xd_bit_= on_amd Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Signed-off-by: Garrett Kirkendall --=20 2.27.0