From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.57]) by mx.groups.io with SMTP id smtpd.web11.62684.1595875423143998355 for ; Mon, 27 Jul 2020 11:43:43 -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=H0R6RrvO; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.244.57, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FvupVWrvVNZBcGkboanR69pZiek0WHqP18tJ4geZ2cwQMInKMZlC52rcsnweG7qQeCv5YV1A2wH3A/yz4jkC1l0aZ7F/5DsLj8v+8fEVktyxa093MjNz3dcgA0VgGozLWhZHQtp0f8hRMEQv4+2K1a9w5+Wnzl9ux54NCeCM6I3ESyPQn86FveygnFXjUkP20nDqD5dX2+JL6JIDU2WdskOFXYdtcuDAz07tzw84iUJr4VKGusxpYTbUtQMSaGtZ08wA7e1ZEGUzzTnRkg6MDCsPQgPposlsexHjVSRol0JhxondPn3+ySikYFjevSZkgnqDcTPSAnKw7no0Tt5hmg== 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=y42cNfhmfyz07xseYeQYH9zbpfMlzMLWf83yCfosPcg=; b=BzkCJSocDNdCYfd9pF6zxZatSpRynSONTD8RtJ8c7JvjLVm28Dxm64Ny03j37mZ5K4+HBPlleiH+dHMIGZ4pMYl/RTgVyECZaRaFlKNvt31BFcgD6wiEwt8t/IUfgy3jPHP8uf2HhQW+m2zgkh+PT8AjRi9LWbonlXccTuY84YDZ99ufxwZOeIvuWONd5VSV6zuIo6kkttwtXI4dutHBjAzE/9UgqhvRh65CQxtq38Jc2C98DzcQpk6ok8miSvuE+VnvRkw1OVS8MO4KDvWcMVX9MO5b3tJ3Frit/7BzgZFQ1i5q4G9ssblgTREqryzwkYhscJdGV6t2HQXfVyK2hg== 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=y42cNfhmfyz07xseYeQYH9zbpfMlzMLWf83yCfosPcg=; b=H0R6RrvOnFk6gS9CNTE8tD9YQCxXCMbDZ5Tx94eTN72faIIqjAaDxMo6Fa6UzU+GavEGbj9j91wC2I5G338M1ex5Ecy0a7gMTSAopS0XSMOriqZv+H2+7+W/V4IZShjXzUrOcG/F2Za+HKEWjjgaRob0TXEtkx2lN015+gKeJOE= 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 DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM5PR12MB1257.namprd12.prod.outlook.com (2603:10b6:3:74::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.24; Mon, 27 Jul 2020 18:43:41 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::25ec:e6ba:197c:4eb0]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::25ec:e6ba:197c:4eb0%8]) with mapi id 15.20.3216.031; Mon, 27 Jul 2020 18:43:41 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io Subject: [PATCH v12 40/46] UefiCpuPkg: Add a 16-bit protected mode code segment descriptor Date: Mon, 27 Jul 2020 13:43:25 -0500 Message-ID: <3c4bf390c535277d371e95e738fe93da850e1b32.1595863587.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-ClientProxiedBy: DM6PR02CA0115.namprd02.prod.outlook.com (2603:10b6:5:1b4::17) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) Return-Path: thomas.lendacky@amd.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from tlendack-t1.amd.com (165.204.77.1) by DM6PR02CA0115.namprd02.prod.outlook.com (2603:10b6:5:1b4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.20 via Frontend Transport; Mon, 27 Jul 2020 18:43:40 +0000 X-Mailer: git-send-email 2.27.0 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: e30d2d0f-30cf-4590-ba8b-08d8325cfb75 X-MS-TrafficTypeDiagnostic: DM5PR12MB1257: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IdZRFLunDtXm7UoAxjUA7OVNuHFu9PEDLGcfv/tB32ETmx3sqOJoH3q8PhLWE7P09jJ719lIFDY6vaPGggQ5IiBeOdZCu4kxvkX/isvtnI8MGTbCBSuf1w/jHYOsoqA2z67Au27fUyH9EniXwN917pJGw9w23RhkwOG2EpfuNt+tfwenpnhEV5oWQHFG1IQxDMoJeav8eHC1OVPHavptc038fKPgbVYNxebqOnuYhCCDpL4VzlRTznqNSC/jCjUd7lfClLvIxs/SjLjXmkGuKgKG096d+9oSYUpqcna3LyJp6e2GAdgmvA3WSk5Y+j5TzMIAtcdCpXMNrqRGKQ3RY5d1ru/ICob82a3MKrrIFFZyrh1Nw8wJwlfsW9oCGi+6kDE6cX0H5raodDkn4MWp5GQmKMOjiI1KtamvbYpLYx5vMFn34FSvd0Kv7D6cQzoy1kt2GKqEbMuyS1vgx3V8+g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR12MB1355.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(136003)(346002)(396003)(376002)(39860400002)(5660300002)(66476007)(66556008)(36756003)(8936002)(66946007)(6666004)(478600001)(186003)(16526019)(83380400001)(2906002)(26005)(52116002)(7696005)(2616005)(956004)(6486002)(86362001)(6916009)(8676002)(966005)(316002)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: NL/zFCC7NyyJAfO3X/6HhUUk4sFUUAicYUAhhjgx+tQ1Xd24EAXIxbiQ6NjfajV8dA1JybMalQBUjzaWcTsD/dcogOnJn+pCqoKgqYo//J339WABLdRn+PvLgoDOURS2dQcw96jgMaMevtD3p4AxkKM3wLgHECMV4Nmyapli5Va5+xJ+fUQckReeRpc0+/elHdiXUiKODRw/X0HhbF+XxzM8SNFtgNqKmOL8yq7n+a9t6fPTs1s8nMDYdsmk2AJ/OAtGyFf3uXQF1G+1dyHvhbiPMU5FyT0I8O4eGPLR5fFDebaYlmar2L4DbcY24D1MrBssj4TVDOk8yiU0fbl+W5cJ8m8qREjVBUf0lCkzVsV0XijdLlqDpiEUeQQ3gjse6mPNPUdkUtnLGumnKEeUq/EwGEVz1Zwqlw7M5Vhsk6tWz1QisbdT+ztSwCvJ1MRgYMPd5HSQZLWlVg094m4VZYqxEByCBipfYOUeoDox7Io= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: e30d2d0f-30cf-4590-ba8b-08d8325cfb75 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jul 2020 18:43:41.1871 (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: SiZf9wIADjw/NXsYUQlZEBiQjnHNkam55cWMf2e1VJb3c3phMA8Bg5pIMk0Ljh5vOnjYTzaDyOY2MzxqaZIzpw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1257 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2198 A hypervisor is not allowed to update an SEV-ES guests register state, so when booting an SEV-ES guest AP, the hypervisor is not allowed to set the RIP to the guest requested value. Instead, an SEV-ES AP must be transition from 64-bit long mode to 16-bit real mode in response to an INIT-SIPI-SIPI sequence. This requires a 16-bit code segment descriptor. For PEI, create this descriptor in the reset vector GDT table. For DXE, create this descriptor from the newly reserved entry at location 0x28. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Reviewed-by: Eric Dong Signed-off-by: Tom Lendacky --- UefiCpuPkg/CpuDxe/CpuGdt.h | 4 ++-- UefiCpuPkg/CpuDxe/CpuGdt.c | 8 ++++---- UefiCpuPkg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm | 9 +++++++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/UefiCpuPkg/CpuDxe/CpuGdt.h b/UefiCpuPkg/CpuDxe/CpuGdt.h index 3a0210b2f172..1c94487cbee8 100644 --- a/UefiCpuPkg/CpuDxe/CpuGdt.h +++ b/UefiCpuPkg/CpuDxe/CpuGdt.h @@ -36,7 +36,7 @@ struct _GDT_ENTRIES { GDT_ENTRY LinearCode; GDT_ENTRY SysData; GDT_ENTRY SysCode; - GDT_ENTRY Spare4; + GDT_ENTRY SysCode16; GDT_ENTRY LinearData64; GDT_ENTRY LinearCode64; GDT_ENTRY Spare5; @@ -49,7 +49,7 @@ struct _GDT_ENTRIES { #define LINEAR_CODE_SEL OFFSET_OF (GDT_ENTRIES, LinearCode) #define SYS_DATA_SEL OFFSET_OF (GDT_ENTRIES, SysData) #define SYS_CODE_SEL OFFSET_OF (GDT_ENTRIES, SysCode) -#define SPARE4_SEL OFFSET_OF (GDT_ENTRIES, Spare4) +#define SYS_CODE16_SEL OFFSET_OF (GDT_ENTRIES, SysCode16) #define LINEAR_DATA64_SEL OFFSET_OF (GDT_ENTRIES, LinearData64) #define LINEAR_CODE64_SEL OFFSET_OF (GDT_ENTRIES, LinearCode64) #define SPARE5_SEL OFFSET_OF (GDT_ENTRIES, Spare5) diff --git a/UefiCpuPkg/CpuDxe/CpuGdt.c b/UefiCpuPkg/CpuDxe/CpuGdt.c index 64efadeba601..a1ab543f2da5 100644 --- a/UefiCpuPkg/CpuDxe/CpuGdt.c +++ b/UefiCpuPkg/CpuDxe/CpuGdt.c @@ -70,14 +70,14 @@ STATIC GDT_ENTRIES GdtTemplate =3D { 0x0, }, // - // SPARE4_SEL + // SYS_CODE16_SEL // { - 0x0, // limit 15:0 + 0x0FFFF, // limit 15:0 0x0, // base 15:0 0x0, // base 23:16 - 0x0, // type - 0x0, // limit 19:16, flags + 0x09A, // present, ring 0, code, execute/read + 0x08F, // page-granular, 16-bit 0x0, // base 31:24 }, // diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm b/UefiCpuP= kg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm index ce4ebfffb688..0e79a3984b16 100644 --- a/UefiCpuPkg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm +++ b/UefiCpuPkg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm @@ -129,5 +129,14 @@ LINEAR_CODE64_SEL equ $-GDT_BASE DB 0 ; base 31:24 %endif =20 +; linear code segment descriptor +LINEAR_CODE16_SEL equ $-GDT_BASE + DW 0xffff ; limit 15:0 + DW 0 ; base 15:0 + DB 0 ; base 23:16 + DB PRESENT_FLAG(1)|DPL(0)|SYSTEM_FLAG(1)|DESC_TYPE(CODE32_TYPE) + DB GRANULARITY_FLAG(1)|DEFAULT_SIZE32(0)|CODE64_FLAG(0)|UPPER_LIM= IT(0xf) + DB 0 ; base 31:24 + GDT_END: =20 --=20 2.27.0