From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2F77C433F5 for ; Tue, 28 Sep 2021 13:24:06 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4F0E061139 for ; Tue, 28 Sep 2021 13:24:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4F0E061139 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:44170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVD5Z-0001W9-Fk for qemu-devel@archiver.kernel.org; Tue, 28 Sep 2021 09:24:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVCaG-0006Yc-QX for qemu-devel@nongnu.org; Tue, 28 Sep 2021 08:51:44 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]:44877) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVCaB-0001TJ-TP for qemu-devel@nongnu.org; Tue, 28 Sep 2021 08:51:42 -0400 Received: by mail-ed1-x52b.google.com with SMTP id v18so47486825edc.11 for ; Tue, 28 Sep 2021 05:51:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VDdHQ7wAYQQjw1FA0X2CemkmylszfW2NxiKOBkxwC/s=; b=G2hxwVaYmYTouEficz6IpWTbFODxX2ZeUBLtBZ0OAu5MLHNyKO5npYt31fjltGlLRF Jcpfor9gfLTjpPqI4123UHRDV9m2nFL5EQb4im2l5x+SqxH4TY/U6Wsn0EZL0JhnIqEg WBXNsEKBlL5PuuLcyNW5vUvpCfEu9bQ0xGDY36i77TZqibYUFAkhgg65WXcqf5kRSCJV 5HvIVCt2CKoe4sYBP2OqSTN1EEXBFu5ljQq/X5IDfDQGwMrO+aMdcAHO+nzliKsbi0xT O8ICwqgjbA3s2B/ocG8+ik4vr6suh29qIwVZKfYhTdQZburyVaAwDN3RBQXza9S0eVFX CqVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=VDdHQ7wAYQQjw1FA0X2CemkmylszfW2NxiKOBkxwC/s=; b=oj88hjWLXJ8ccF5fjORnHC5io0TOl1u+Qq3bid2qIXT9DOqGM5kpwtOWiHH0brdQLy mOnv71Iq2tFDBpAyWeL/jgoCRpVHwgoJ7D6QdQwRw6ng+jz0UnI15IjnQ8X1HYocF4FY qGr9e6jKdUGe/CiUyDdLRokTrcx4DbyKki+PjazP84eQR1gvRogJyC4/8ebeYwtn+Xaj tfH0+dmXxzVQXQBQHX9+HaHcbQ+Jxn/rMMdu6w5MDDQjsC7e1jCfEyy6xUMzSGL9R9tU 1PT31vPAHQ0b1oKgjYraLsSpAcQjuYQGFDNaomhn/BLl4ausIDWszmM4r+Vgt4G2iFej bQwg== X-Gm-Message-State: AOAM531fEXLphymUK4oojuIzQxHd+Dz/ije6ZsQTyKkzHMRzjDWUBuWN bqeLXDFBJTc+l/CAvHNC7aRQWCRVK3s= X-Google-Smtp-Source: ABdhPJwBCVM7VTHic1sYvntuT0gdkm/XHf9RsheMsIR/MVmh3pjsMZXhdN8xWM+rUALMcJ1HkINhMA== X-Received: by 2002:a05:6402:1841:: with SMTP id v1mr7377592edy.170.1632833491401; Tue, 28 Sep 2021 05:51:31 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id p24sm12641685edq.27.2021.09.28.05.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Sep 2021 05:51:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 16/33] Adjust min CPUID level to 0x12 when SGX is enabled Date: Tue, 28 Sep 2021 14:50:59 +0200 Message-Id: <20210928125116.183620-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210928125116.183620-1-pbonzini@redhat.com> References: <20210928125116.183620-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52b.google.com X-Spam_score_int: 4 X-Spam_score: 0.4 X-Spam_bar: / X-Spam_report: (0.4 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 , Sean Christopherson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Sean Christopherson SGX capabilities are enumerated through CPUID_0x12. Signed-off-by: Sean Christopherson Signed-off-by: Yang Zhong Message-Id: <20210719112136.57018-16-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index de58599a3d..cacec605bf 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6154,6 +6154,11 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **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); + } } /* Set cpuid_*level* based on cpuid_min_*level, if not explicitly set */ -- 2.31.1