From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (NAM04-DM6-obe.outbound.protection.outlook.com [40.107.102.89]) by mx.groups.io with SMTP id smtpd.web08.6092.1620863207579547074 for ; Wed, 12 May 2021 16:46:47 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=rLXMbJLn; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.102.89, mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iFY+g3K+hwwG5cHKQXbnkoU+M5wfhDocNYq2hiX2zKczD4Nr7xOe7xyULAxRcAdajVV1n0awynsVd2NqtTA7VUy1Pk0gqrc0nXdbJjsRiA1H50vBj2JMNgfiChEEU6ngHNO8rbFo/5eOcGFLQuYdGfgVqldKMcezna9KfZmsAjr1JCh+AjM6KuXX1vo5d0OyGrdL16bho8HM5CEFXo9JffpMY4QvJiU9WImnfAtIrIBv4UTh8wsyDXIvRpy8Ehr/jsK1a3AFcyFZ8Thgo02riLD24RMFvwI8iO0q3oWUkeV2vxo/2wgthLaXwsYdWUl46SWtsvnrzqkWWuh+H7D0KA== 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=8ucll7LZ+tCrr/1hdfNUd5YivsHSPtAuaUgGDCtgkDA=; b=Vw1mLkxfb+VlKEJ7iHu1tQwR0uDfQ7mWSTAdBkQr/kV9cRAH7Cvm2mS9RA980uVsaEF8w0mhw8zYICvZM77IxAn7HPAsgY34S5qdL5+1oE5Cbr1wEqVH8H5FF6/fqUJzJPFG1jBVgY70OXtJd8RLX/5wgKtHvKHws1KG18oGeIF2Qju+5kzUFBXbSIyMJFm6qkmL7x6Lb08aG4o3gjplNWUnFy7pxGNroI69/JJJ23z+hvryfpiWlXTZ1ecrKfeaXCkNNJFVUzhUPF9Xv5JmZ6zQkTviJPmChVhSSATrT+8+kVffDHpftFBFBjbNhyUb+Xt1eYZBe82Av483/CwklA== 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=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8ucll7LZ+tCrr/1hdfNUd5YivsHSPtAuaUgGDCtgkDA=; b=rLXMbJLnd8aCOSgrhdwsi5O2Lst3rHmq4CUVm+an0F1Ku/0Y+DsMy4ULRqMXYoFdqfohGswzV5R6+QSBJawJ5fYohn3AZiW1nWUjVJurqm45cHWuo3elqzFw4iqqlHk/oFRydMNOGkDozgSrwvTNCG3YXdFOoYnWd7XeeCdzJSo= 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 SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SN6PR12MB2781.namprd12.prod.outlook.com (2603:10b6:805:67::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Wed, 12 May 2021 23:46:41 +0000 Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4129.025; Wed, 12 May 2021 23:46:41 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas , Michael D Kinney , Liming Gao , Zhiguang Liu Subject: [PATCH v2 02/13] MdePkg/Register/Amd: realign macros with more space for future expansion Date: Wed, 12 May 2021 18:46:04 -0500 Message-ID: <20210512234615.1726-3-brijesh.singh@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210512234615.1726-1-brijesh.singh@amd.com> References: <20210512234615.1726-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SA0PR13CA0003.namprd13.prod.outlook.com (2603:10b6:806:130::8) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) Return-Path: brijesh.singh@amd.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SA0PR13CA0003.namprd13.prod.outlook.com (2603:10b6:806:130::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.11 via Frontend Transport; Wed, 12 May 2021 23:46:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e00f5d36-7a21-4c2d-943e-08d915a030d2 X-MS-TrafficTypeDiagnostic: SN6PR12MB2781: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f1cAWkyv8Kjx0v+4uS2pRn6YVwSxzF3hPOCxZcA0rqbvM+9MURn108QUq0Ht70uusHxhFSNNqaL7tMQOdVIZ0jDCsDfMdqnNhwSGh7XpG/Z+yIX/H0o9al/voLCQVXJQqsVvIxTMMOvXRoyETBj8wneze6tDuZTBJdPsaq3mub2dtH4aeT9i19jPbYpL1eCJ0LJ9mPXYvUes6z6sQOy+Dld1MmhSTn22a/q0Byohl2oag5JmLD+2oWtKQNBb1JXpuwEhbB9H13E0SXM3FOWkjGBZYND1t+t/EZSs+YB6Z78agaIJVOwgvnD8uzWN7CTbQgyGqv57ch+H9RbN3OUWJ71+gNV2PiVfohplLl4g1ueK1QaqoQsqhcUb3r6wG5+yDw3DAz0gbfCrxRFsQhEQ7cljplDg88MWTo3Bw/bki8kMG1gRvz4pmEuwtc0TEPoBZHh/WXpXBwDrpOKPzfgx6R3wR+vjj8Mg0ynX8lU39cOD2etFbyPMlI6ZncHKkhf8fw0L1V573igSGLjQECgJgAqX4T46mzysSIO3lTNoY9B3aB6hEYvH6FkyMVYA90MUXGztpOhjtnITrhUBsNQ8j3bc3dRd1MVacSd4QqsgSkkKJLhaW/0FyrKOZzCb8hPKoNs67t8pVvkBzEVSHxFmNFs1RdkqtKuN6IEbxw5pxyGNiEEImfvoc93Fr8y66z+Mj+G1+uhcjeTwRd2MWETU3ggVTa6LNsEZD6zU3mX+FtROtUFti0iVYvtIWT8FQTHH X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2718.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(136003)(39850400004)(366004)(376002)(396003)(346002)(66946007)(36756003)(19627235002)(7416002)(66556008)(8676002)(956004)(8936002)(6486002)(6916009)(44832011)(7696005)(316002)(5660300002)(1076003)(52116002)(66476007)(6666004)(38350700002)(38100700002)(4326008)(2906002)(186003)(16526019)(26005)(83380400001)(478600001)(966005)(2616005)(86362001)(54906003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?AAMA7QIBgS8dXN/92dpoCAv28aC1nR/5ep6RVv72TZLIMOX2Cc/eOKjeRDwI?= =?us-ascii?Q?igGyUim1VaaI4ANGpwp2lO7Je8FStLM53eRJS1OcSCyAMYZnfWkzvFgKBo5E?= =?us-ascii?Q?RP2RKBhZ3PNHiVKENfM6oIqQ7KDC3za/8g0bhhOTZxQXJpDydRo7sVwcpLda?= =?us-ascii?Q?0q2mUgBq4cxk6+/NKludc9Oy4JXFhG4hevhH+jeKQETrrLC0Xph9Tlz8R+Uz?= =?us-ascii?Q?Or+YPPWw2FCz2kA0FNwo02wYnzMpFYD41iIjepjp2u5ODRH+aezk+ZO+q0OX?= =?us-ascii?Q?NkYdRG7TxXy5hwgW6/BWp18aHkrIRY/HGETfShUqj1fBU02QvuOIcYsX/INk?= =?us-ascii?Q?fu+I0T8qoHP4Zbkpjh9X8UHkx/M1b3hQ/fIgQjc/OvYa3ZJHgLEoHAlQKDOp?= =?us-ascii?Q?XUGR04QDMIFGXhJ8LyiPCiUBB0ITEJKQmMBIj4yUvFmDjFfWu/aPhXt1sNmd?= =?us-ascii?Q?uZPKH6QE+0KltAMlUPgYy2CNLiiTui+CGBejcpyeNgCFxFQjUs7ZlS/Vvhfc?= =?us-ascii?Q?5pzeN1LFmYIbkgxOGamozh4gSQ0KygTyEMgoWkTEKogBdhDpu4glzmePINYY?= =?us-ascii?Q?87HKcOSgVckmJJSBYR5MK3iihMrKZBKssHogVF3NBUB3B5wJDDTy9QgyxS0k?= =?us-ascii?Q?SeiwezeC6HUoBcSFCW6Y95iR99OZ4xgrXjFw+E7WeUg3UXuDw8J8GTrvZ2aW?= =?us-ascii?Q?A9Jzplgf3uTYpsS0ciiU01lKg2ggKa6imNJkVsA5+LuajezcevgNpOoF9sGE?= =?us-ascii?Q?wOztGql/VyBhYWw7q8fMXdbobFcG1//EjOSzp7UaQJNRcYTe09vXygwFoiA5?= =?us-ascii?Q?2tvraFTush0P5/eB9+or5cn3ZEJARCH5CkNPd/zuLK2MH4MJywVOv4z/esbN?= =?us-ascii?Q?2gHBJa3lKffHvCmNldIUX9aUvRt/bvDphtNpp/REfOqBhnsRGLm44TOUSila?= =?us-ascii?Q?VroPbogCaTms+BtbdYMeLwvf8LuStLmU0pDiU7lIZitH+E1Bi9VpnX/q6iGc?= =?us-ascii?Q?Q7Ksacw6criN3myEYBJNb6fTjt7MaBxCbwVhzFmf5K6q6Z+7u+Nn17wDNVlR?= =?us-ascii?Q?dUFVEJNpVDiSkZX0dE9PLzw5MubC1B4MNw36YlA+g6Azk8AJZp9Ezn3JLkNb?= =?us-ascii?Q?uNVZNhbDGaWj1hAW5HyradQ6FVdOzjp02RJCoOVHLgd2zB9G86PGf89QjKjZ?= =?us-ascii?Q?Tz0Owh9tUCoBcY4yJXzl5XPoP0ZRbqrK3eXJA2TLjBAQcM2RVOeeyUlrA5aG?= =?us-ascii?Q?Ugz82djEXn7zoxv+LwsMIl2zMxVprr4OQw142CgFKs8Jflmbpw5xmyVcwvIn?= =?us-ascii?Q?RF3ZxscBwwdU5FVE0JR5Hvr9?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: e00f5d36-7a21-4c2d-943e-08d915a030d2 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2021 23:46:40.9472 (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: O43+IybLAY9OgBuf6KrK3+ENZ/Z5zF/XiBdqegjfSSJZ0SInnS8gI0sXWtr6CnS8YIqar4Jfm0+2D/R2dZriLQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2781 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 Version 2 of the GHCB spec introduces several new SNP-specific NAEs. Unfortunately, the names for those NAEs break the alignment. Add some white spaces so that the SNP support patches do not break the alignment. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Reviewed-by: Laszlo Ersek Reviewed-by: Liming Gao Signed-off-by: Brijesh Singh --- MdePkg/Include/Register/Amd/Fam17Msr.h | 10 +++++----- MdePkg/Include/Register/Amd/Ghcb.h | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/MdePkg/Include/Register/Amd/Fam17Msr.h b/MdePkg/Include/Regist= er/Amd/Fam17Msr.h index 716d52fd508d..7368ce7af02a 100644 --- a/MdePkg/Include/Register/Amd/Fam17Msr.h +++ b/MdePkg/Include/Register/Amd/Fam17Msr.h @@ -53,11 +53,11 @@ typedef union { UINT64 GhcbPhysicalAddress; } MSR_SEV_ES_GHCB_REGISTER; =20 -#define GHCB_INFO_SEV_INFO 1 -#define GHCB_INFO_SEV_INFO_GET 2 -#define GHCB_INFO_CPUID_REQUEST 4 -#define GHCB_INFO_CPUID_RESPONSE 5 -#define GHCB_INFO_TERMINATE_REQUEST 256 +#define GHCB_INFO_SEV_INFO 1 +#define GHCB_INFO_SEV_INFO_GET 2 +#define GHCB_INFO_CPUID_REQUEST 4 +#define GHCB_INFO_CPUID_RESPONSE 5 +#define GHCB_INFO_TERMINATE_REQUEST 256 =20 #define GHCB_TERMINATE_GHCB 0 #define GHCB_TERMINATE_GHCB_GENERAL 0 diff --git a/MdePkg/Include/Register/Amd/Ghcb.h b/MdePkg/Include/Register/A= md/Ghcb.h index ccdb662af7a7..712dc8e769c0 100644 --- a/MdePkg/Include/Register/Amd/Ghcb.h +++ b/MdePkg/Include/Register/Amd/Ghcb.h @@ -49,12 +49,12 @@ // // VMG Special Exit Codes // -#define SVM_EXIT_MMIO_READ 0x80000001ULL -#define SVM_EXIT_MMIO_WRITE 0x80000002ULL -#define SVM_EXIT_NMI_COMPLETE 0x80000003ULL -#define SVM_EXIT_AP_RESET_HOLD 0x80000004ULL -#define SVM_EXIT_AP_JUMP_TABLE 0x80000005ULL -#define SVM_EXIT_UNSUPPORTED 0x8000FFFFULL +#define SVM_EXIT_MMIO_READ 0x80000001ULL +#define SVM_EXIT_MMIO_WRITE 0x80000002ULL +#define SVM_EXIT_NMI_COMPLETE 0x80000003ULL +#define SVM_EXIT_AP_RESET_HOLD 0x80000004ULL +#define SVM_EXIT_AP_JUMP_TABLE 0x80000005ULL +#define SVM_EXIT_UNSUPPORTED 0x8000FFFFULL =20 // // IOIO Exit Information --=20 2.17.1