From nobody Mon Feb 9 20:11:02 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1620715386; cv=none; d=zohomail.com; s=zohoarc; b=A+l5czVH0/7g1F8KGrFk/TeJtjHWGuCI7iG59GgWoutUx93NaQD4iu/hRG5bCgsQ4cygpkc6DXs8u/bH0iCVcDd8A3FiMRcKz6gqHz6ZQF4NbWtuUCzlZ4meMPkmhu1EOa0QC6UrEp+WXdPYv9xmSefRz200rkV0ct6L6bhBzJE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620715386; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aLPfqGlcQR3LNqZ8mAdT+iIhPN6gMCnQ7JaY2cz3w9w=; b=TsUaQC9bX/4H2ohd2MEzF8FVi/n/Iq92jsLbcUZ/HU43CubTJs6C9P8VsoiAqB2xrK1oGab6DUS+1U5YskMe3L1Ky8drOcPJ1Zo0yo6Of7Q76cmt/nAZJWgidfgDA7WWvOu7VXrY82bwHNDXLXqOlE4niXaJ7vg4W4K7YrodkJw= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620715386178477.3197966144987; Mon, 10 May 2021 23:43:06 -0700 (PDT) Received: from localhost ([::1]:36092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgM6j-0002jd-2i for importer@patchew.org; Tue, 11 May 2021 02:43:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgLsd-0006V8-Ab for qemu-devel@nongnu.org; Tue, 11 May 2021 02:28:32 -0400 Received: from mga06.intel.com ([134.134.136.31]:46441) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgLsb-0004it-Kl for qemu-devel@nongnu.org; Tue, 11 May 2021 02:28:31 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2021 23:27:59 -0700 Received: from icx-2s.bj.intel.com ([10.240.192.119]) by orsmga003.jf.intel.com with ESMTP; 10 May 2021 23:27:58 -0700 IronPort-SDR: fO4cBLAE9D7fzS5YZzDsOUsvq/eHN0RK8SZmuVUznvo6I9MItUYFewnmhmnMWJLDnkGyCLDI3b s0WxZTt/DPFg== X-IronPort-AV: E=McAfee;i="6200,9189,9980"; a="260631533" X-IronPort-AV: E=Sophos;i="5.82,290,1613462400"; d="scan'208";a="260631533" IronPort-SDR: 2ND7B5Pmc4oRdjxrZasJ3NzdoIXdov85latbagS5czQeHnM/Zr6b3shDjZGZWSiOezhpIQRqnv Vjtpudmjtm2A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,290,1613462400"; d="scan'208";a="391281236" From: Yang Zhong To: qemu-devel@nongnu.org Subject: [PATCH v2 16/32] Adjust min CPUID level to 0x12 when SGX is enabled Date: Tue, 11 May 2021 14:20:35 +0800 Message-Id: <20210511062051.41948-17-yang.zhong@intel.com> X-Mailer: git-send-email 2.29.2.334.gfaefdd61ec In-Reply-To: <20210511062051.41948-1-yang.zhong@intel.com> References: <20210511062051.41948-1-yang.zhong@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=134.134.136.31; envelope-from=yang.zhong@intel.com; helo=mga06.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, pbonzini@redhat.com, kai.huang@intel.com, seanjc@google.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Sean Christopherson SGX capabilities are enumerated through CPUID_0x12. Signed-off-by: Sean Christopherson Signed-off-by: Yang Zhong --- target/i386/cpu.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 63253bf606..41050960c5 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6741,6 +6741,11 @@ static void x86_cpu_expand_features(X86CPU *cpu, Err= or **errp) if (sev_enabled()) { x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000001F); } + + /* SGX requires CPUID[0x12] for EPC enumeration */ + if (env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_SGX) { + x86_cpu_adjust_level(cpu, &env->cpuid_min_level, 0x12); + } } =20 /* Set cpuid_*level* based on cpuid_min_*level, if not explicitly set = */ --=20 2.29.2.334.gfaefdd61ec