From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (NAM02-DM3-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web09.15905.1621448408814808065 for ; Wed, 19 May 2021 11:20:09 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=ej8Kk4Zm; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: , mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hYIghwGRiCluREW765rCxbxBrm0WOvfmjz76e5jOqLsCEmHeXv135lziKtxz4Sji9uM/ZWwkbFBxTHabx8td14r11NXqF6LAHn2Fm0mgyiiVeOrqwRNfDSZRQhknixZp51hky+QytZkMtwCGJuzFfyB12uKmVwxpve80e6RqzzBgiRjggc1AUgPQbeOmA/BG1CpgdlGqQaNZw+EyBhI3OLvWfuEU0EoZO+ZKNkBHK3tsJ8cFIDuEeMwfXvv6z+hc0Of8bgway70PG3MEZKut+iyLLl1CO3xUar0l04IgrVNq8Oyvh+541xPt0VYbIpQn35jyf5AJfk3/EW9Vvcr1uA== 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=Tmh8/8NdNXpAxDJxZhmAaNVFyvNztuuKLo2dFaEdq7wI/jyKGhjSAbCjCtX1Zd2ZAFa1+CiCrX0/H+NX9wal5Ria3QxJ3LnVrgh8D7LmXSKCtvve1XEQNVLKPbyf5wo/nTrKtRY4a192WVL8Zyd0H//QTI+akRWeW8woNkgmk6dhRQ9BGEOrv4/kuSafagovS7kdnJd3N8WtJFg29cAT79mM45UB/qkkWKm+y77W51TL9nI4DvkK5vmeoFg6xeTXOiBKCkWcxcHD5xPbM/q1xntKQfE0eplwk9TOBhYIf9otEpj5kK3Tb81Ea0oqw57I1T1GrxMat01DvoazhqNpRA== 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=ej8Kk4Zmdbql6+ITa4ovEKiEW54+xWP5BnVeO+a0MxUE2Xxmf4L1YpouVrcG2Om2Av5heD0AuBx1Kk/e1qVve/chVr0kSZ//HmUV+3piHHSPBJB5dwniTlkuNYp/ef0pxDEc9hdVMI655D/m/QSn7RvzV2VcBexuyVx27IOgsmw= 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 SN1PR12MB2365.namprd12.prod.outlook.com (2603:10b6:802:2e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Wed, 19 May 2021 18:20:07 +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.032; Wed, 19 May 2021 18:20:07 +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 v3 02/13] MdePkg/Register/Amd: realign macros with more space for future expansion Date: Wed, 19 May 2021 13:19:38 -0500 Message-ID: <20210519181949.6574-3-brijesh.singh@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210519181949.6574-1-brijesh.singh@amd.com> References: <20210519181949.6574-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) 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 SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Wed, 19 May 2021 18:20:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2d7f3464-a6ea-4aca-3fc3-08d91af2bb14 X-MS-TrafficTypeDiagnostic: SN1PR12MB2365: 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: aj2UVirGqZuL79lU4X5s2v0j+Ek3kw+qZYD32BCqfFZZBj45I/WVrVbHStzMBTQHtIm7F8BaOWAqSAgcqXmlL9ePm0zeD3+IoVMtI4rnqN8d2xVZIhfozf3wj/vdEaoKwDHu7iTtlNh/pcPlTa4rRFuCobn/tEapLFGpTv0DL649768rogw7OyeI9VszLXPF9rTdt74QmcqlGPWfLLlLJCHAF3DfKWpfCzN3dhOfdbEIOLrEzBLkulgdp+ew7oibQGcV0M7ysrPnB3f3ksSukuawT7uCKuWLOiBD5bhp2bZEigap2XZQa/ObYoUC1BCAIaYlcoHZQ/DiEz9wTp/W1UauAfNuv8ruLZ6b8CjEzobJ7flndfCb5ge5AeA1nlsHdlJMvuXvnsITI6UJaZeiekNskWlusSbuQXlcLNb08lnph64e9nfltjo3Ri4JjrWqij7rnaecYJHDxFFnjbfSOGdZ9UVENyeZ+i6YuIgTw6+5KyXoYPmLklUBYi2rGWJis8vH3pmIw3JwMsyy3ZrXAncIvkfr/kijxMEHppi3LQMzKD5kOjuHaWF0EWBfTJbFYNj2BKgrpDbtwCJYPGAEIC1/pmnQYrav7hCLlp+3WrvlpvmSL37mS4TyiPBnG7BbXqY1J+pN7wGRtPSJECfXTVMFlWpWoD6eRNrkSsR+okIEZozKpMEYe/b77y8BnX57QPd+tDa3NecHca3eFa85v6LPjSfworBVnyzpWVli666Vj/U9ZMHGRZGvglZ/3I4d 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)(346002)(396003)(366004)(376002)(39840400004)(16526019)(4326008)(6916009)(956004)(2616005)(478600001)(1076003)(2906002)(5660300002)(6486002)(19627235002)(966005)(54906003)(66946007)(66476007)(316002)(7416002)(8676002)(66556008)(8936002)(83380400001)(36756003)(38100700002)(38350700002)(86362001)(26005)(7696005)(52116002)(186003)(44832011)(6666004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?uBqSz4hiM1UTi79+Hghz/Sdewc6yMYTf14cG5PE6IDct2famZxSVtvWqdz5g?= =?us-ascii?Q?XbyPC/S8btGWXnRHTDj27zyzkdsLwAT0zJI/KAOjJFqOK33RKG7ksPu44jRy?= =?us-ascii?Q?vLBtyZQuukB0illDGSPZTDstzctgINh317m8X6v1CCKKUjuosaqfvanbSIXk?= =?us-ascii?Q?t90tridU8TXU3nScGlI7/fE6apm96LfO3Gcnd5k6xdDJfI6b6hp+GW58OMk5?= =?us-ascii?Q?up0FTGrKM5eykBKWXSnI88nMfNlZ+1SgnUg9VcEA/2v7SQT/ict22/bZfglQ?= =?us-ascii?Q?glaxmQNgpV95UL2SAw4oAQCj122QEehtIBScEKz5OLBKM3ERWJgvEyPYCOeZ?= =?us-ascii?Q?svkQaYV/U+W53qW3a9GLJ9CmnH3NmE0QI5P/GLSeQC2GIwUrFxNBK83ZqNaD?= =?us-ascii?Q?ytcaKfIzaW27mq5k8H0Q+SBNzrXn8UCYW/1pxdy3r5XTKFLSeBsU8ZCVb6By?= =?us-ascii?Q?KyX6K9eB2mvlwbQYvtlnYIeh87ffjCUgBsSToXkgOBFV+N7yD+DP+uGtX1DZ?= =?us-ascii?Q?pcoD4YbKAsJ1PaPs5HeV/DH4Tw3GPUMbaEYlwKGYO2jhRpWxSc2BiIixuj16?= =?us-ascii?Q?6Yl66QwO1F/wcToq+eKMpizOEcdaWT72aCKClpQ+/fCUGJpQ6W0xnuIgME8E?= =?us-ascii?Q?7RNGX6gzIcrAVfh7nLPpmA6jVANKt64mcK0ugRhqgrSvXmTyqG0ucUbsE3Na?= =?us-ascii?Q?EFe0Uff4M2cISgQvqkYu61BMJxDHzGHe7VltRS+fFNbHnNwO7PQTAYiNGyp5?= =?us-ascii?Q?ooNBw1bc6C3Ex2zLxumSHGWi865Hv4IorWxlmJjFTgkGQn8WPvKFLEEkWBdL?= =?us-ascii?Q?l+6UiVrodY4POrPL7VdKZd0+Z2rUqyI9d+2gJI5eTmYPFkdfz18ZUcOY0VRE?= =?us-ascii?Q?beaPZ2XwXQpJ+v0i5Vkxsl8ZtDWyWevxK/hDW9NYR6Vqde0chdbbkCPBatF1?= =?us-ascii?Q?F0NJvaGHx70y0E4n7lbbU5Js51sqikl5yvrnZVssBy59Th45A9qgkoBZEK01?= =?us-ascii?Q?Dsg8HRGE4IyU1BsAsSz7hh1DnP02MLwfnaTrx3G/r/MDiwzSWbPKJI/0SqUW?= =?us-ascii?Q?u2dkZZmVIH2QbBK12s3wa6KpRxnHm+KJ21I31CtKxxefAofqmhtgU60bkJCr?= =?us-ascii?Q?m+/yadsCyOl6/hhoq8UlfKP/iJ+NhTu4K5C+wr83Z7YMDmA9cXwXnt4vKb6i?= =?us-ascii?Q?nxqSxdvLmtNUQDwFls2adGwTFIH5aJClQ7wTEFJh3SYyehp+nSKBtBB1PEvm?= =?us-ascii?Q?4BCSavG2jZlMFyD3Sh9YAfYMNUnc/7y866U6OJ6ISGXNG0OtAf8BM7NMD0Fl?= =?us-ascii?Q?Njd0NkC0u9I88OTbjlGUQOE2?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d7f3464-a6ea-4aca-3fc3-08d91af2bb14 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2021 18:20:07.3769 (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: 4swz1AHaAGpU7K4SuBcqGyTq1bgvi33QZgJdBFBC0Zof7lp9KH85g9B4filUG/zhWeKk56z8mYgNArpo1uoCTA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2365 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