qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Zhao Liu <zhao1.liu@intel.com>
Subject: [PULL 05/10] target/i386/cpu: Add dependencies of CPUID 0x12 leaves
Date: Wed, 31 Jul 2024 13:18:01 +0200	[thread overview]
Message-ID: <20240731111806.167225-6-pbonzini@redhat.com> (raw)
In-Reply-To: <20240731111806.167225-1-pbonzini@redhat.com>

From: Zhao Liu <zhao1.liu@intel.com>

As SDM stated, CPUID 0x12 leaves depend on CPUID_7_0_EBX_SGX (SGX
feature word).

Since FEAT_SGX_12_0_EAX, FEAT_SGX_12_0_EBX and FEAT_SGX_12_1_EAX define
multiple feature words, add the dependencies of those registers to
report the warning to user if SGX is absent.

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Link: https://lore.kernel.org/r/20240730045544.2516284-4-zhao1.liu@intel.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 target/i386/cpu.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index e864f55d4fc..28b46ef536f 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -1734,6 +1734,18 @@ static FeatureDep feature_dependencies[] = {
         .from = { FEAT_7_0_EBX,             CPUID_7_0_EBX_SGX },
         .to = { FEAT_7_0_ECX,               CPUID_7_0_ECX_SGX_LC },
     },
+    {
+        .from = { FEAT_7_0_EBX,             CPUID_7_0_EBX_SGX },
+        .to = { FEAT_SGX_12_0_EAX,          ~0ull },
+    },
+    {
+        .from = { FEAT_7_0_EBX,             CPUID_7_0_EBX_SGX },
+        .to = { FEAT_SGX_12_0_EBX,          ~0ull },
+    },
+    {
+        .from = { FEAT_7_0_EBX,             CPUID_7_0_EBX_SGX },
+        .to = { FEAT_SGX_12_1_EAX,          ~0ull },
+    },
 };
 
 typedef struct X86RegisterInfo32 {
-- 
2.45.2



  parent reply	other threads:[~2024-07-31 11:19 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-31 11:17 [PULL 00/10] i386, tests/vm changes for QEMU 9.1-rc Paolo Bonzini
2024-07-31 11:17 ` [PULL 01/10] tests/vm/openbsd: Install tomli Paolo Bonzini
2024-07-31 11:17 ` [PULL 02/10] target/i386: Change unavail from u32 to u64 Paolo Bonzini
2024-07-31 11:17 ` [PULL 03/10] target/i386/cpu: Remove unnecessary SGX feature words checks Paolo Bonzini
2024-07-31 11:18 ` [PULL 04/10] target/i386/cpu: Explicitly express SGX_LC and SGX feature words dependency Paolo Bonzini
2024-07-31 11:18 ` Paolo Bonzini [this message]
2024-07-31 11:18 ` [PULL 06/10] target/i386/cpu: Mask off SGX/SGX_LC feature words for non-PC machine Paolo Bonzini
2024-07-31 11:18 ` [PULL 07/10] target/i386: Fix typo that assign same value twice Paolo Bonzini
2024-07-31 11:18 ` [PULL 08/10] target/i386: Clean up error cases for vmsr_read_thread_stat() Paolo Bonzini
2024-07-31 11:18 ` [PULL 09/10] qemu-vmsr-helper: fix socket loop breakage Paolo Bonzini
2024-07-31 11:18 ` [PULL 10/10] qemu-vmsr-helper: implement --verbose/-v Paolo Bonzini
2024-08-01  0:00 ` [PULL 00/10] i386, tests/vm changes for QEMU 9.1-rc Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240731111806.167225-6-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=zhao1.liu@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).