From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) by mx.groups.io with SMTP id smtpd.web10.11001.1642091447523719466 for ; Thu, 13 Jan 2022 08:30:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@google.com header.s=20210112 header.b=WsPrNTgY; spf=pass (domain: flex--pgonda.bounces.google.com, ip: 209.85.215.201, mailfrom: 3tlpgyqykbfmkbjiyvbjjbgz.xjhyzqzgzyfx.bmjpkn.dj@flex--pgonda.bounces.google.com) Received: by mail-pg1-f201.google.com with SMTP id t18-20020a63dd12000000b00342725203b5so189923pgg.16 for ; Thu, 13 Jan 2022 08:30:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=L2WG9NETFVOv3nWnFHxhm+ZgZFFCbeR4BDRsB0Jjcik=; b=WsPrNTgYP9dXzcIeHqLNzn3n6lS6bS7PzzQyXuU3jBgBGe9QD5eIBOu+EWSLvFnYQc 16ILDWoDekqS5MaTNRwqDF0juAT+AWOROjKQZ9MG2aEiWk6JFjqN5Gn0+n7v5pWCiJ1p 6K03KUvBpozzZNChTZwf8LR3nXsMNy1q6sfZiDd2aR5DSEyYVL78L1v9bUXaJcRUmHuN epFtl8934H0Ug9/7e8+dfFgkgjHdOMwwfwJ1fBBHjWA9u8N16gKz5qCfrT5O9UYe7c9N 9YzD7Z7eb3kYBRDtyIDdo8vXlb87OHIXUp7OSUR5uuxIUgWck6ilaC0rHM1EIUORJ0se oqMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=L2WG9NETFVOv3nWnFHxhm+ZgZFFCbeR4BDRsB0Jjcik=; b=GLY3jp8qZqQRFQ+iO8siZcs4wDZfnH8oQOTO5yfNjOFBvnYsiXB+RgssGf7wp69wBw +QLNE5Gn2PauCewt+eA+kLrzh1aWzFIO9vANUslGivOAT2H/gfK0Ejw11tnMh6UO5dD4 pgLaL7v6+8JGgyFpQReXYANm/5ZcxbMojVvsbyhzuNVvxFGw4PTpz7+wqHg8L40sbuk1 X3/A6MtRPGCdRnCyqqvWyeRbL+NrhvCAlJLjNgI+6h/r2zlShCU9WYs8Jn5mB1BVJm7h EZp92PDaaO2OL68/M3Bn/Ts4of4Dkjr8UwtLE7Fnn7Epy1EGlxkPqfWxu9NSwoTxkOQ5 y0Sw== X-Gm-Message-State: AOAM5318PHHh57b13ggu0DTJitzt8bS5XILEMkET1/q7wa8uaX/owx27 X4WYX3M0Red5TtXGUTQuAemmQlJnq0zeYexK3nxpaD4nLEzd9rSOWamxWH3WqTqWLM0OnSOQj0x DNHqaeUrfRdaG+SWxhs0gbIwd+eZTLbFFAvU55toAQItE3pVU5hGvRRAVyKA= X-Google-Smtp-Source: ABdhPJyOqsHHjKpgpK4wP7XafTT08QdyTpfodHjrchQD1IZyQYEi2Xc3KWc+vC9zgu4fRxzKPmXe4hPWjNQ= X-Received: from pgonda1.kir.corp.google.com ([2620:15c:29:203:cc6d:a07f:db7:214d]) (user=pgonda job=sendgmr) by 2002:a17:902:6906:b0:149:7087:355c with SMTP id j6-20020a170902690600b001497087355cmr5070683plk.153.1642091446564; Thu, 13 Jan 2022 08:30:46 -0800 (PST) Date: Thu, 13 Jan 2022 08:30:43 -0800 Message-Id: Mime-Version: 1.0 X-Mailer: git-send-email 2.34.1.575.g55b058a8bb-goog Subject: [PATCH v2] OvmfPkg/ResetVector: Removing SEV-ES CPUID bit check From: "Peter Gonda" To: devel@edk2.groups.io Cc: Peter Gonda , James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas , Brijesh Singh , Marc Orr Content-Type: text/plain; charset="UTF-8" The SEV-ES bit of Fn800-001F[EAX] - Bit 3 is used for a host to determine support for running SEV-ES guests. It should not be checked by a guest to determine if it is running under SEV-ES. The guest should use the SEV_STATUS MSR Bit 1 to determine if SEV-ES is enabled. This check was not part of the original SEV-ES support and was added in a91b700e38. Removing the check makes this code consistent with the Linux kernel Fixes: a91b700e38 (Ovmf/ResetVector: Simplify and consolidate the SEV features checks) 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: Brijesh Singh Cc: Erdem Aktas Cc: Marc Orr Signed-off-by: Peter Gonda --- OvmfPkg/ResetVector/Ia32/AmdSev.asm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/OvmfPkg/ResetVector/Ia32/AmdSev.asm b/OvmfPkg/ResetVector/Ia32/AmdSev.asm index 1f827da3b9..77692db27e 100644 --- a/OvmfPkg/ResetVector/Ia32/AmdSev.asm +++ b/OvmfPkg/ResetVector/Ia32/AmdSev.asm @@ -265,14 +265,6 @@ CheckSevFeatures: ; Set the work area header to indicate that the SEV is enabled mov byte[WORK_AREA_GUEST_TYPE], 1 - ; Check for SEV-ES memory encryption feature: - ; CPUID Fn8000_001F[EAX] - Bit 3 - ; CPUID raises a #VC exception if running as an SEV-ES guest - mov eax, 0x8000001f - cpuid - bt eax, 3 - jnc GetSevEncBit - ; Check if SEV-ES is enabled ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) mov ecx, SEV_STATUS_MSR -- 2.34.1.575.g55b058a8bb-goog