From nobody Sat Nov 15 12:46:53 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1752493157; cv=none; d=zohomail.com; s=zohoarc; b=BsQ2JcKpqOjLNthg3HpMBjmYW5tHsteVHE5jtf1DSqwZOmtBVFCbcbpgYHcRKvk0POIjgpSw1q0VIHWPTsSNb59dczX1cmoCSeUi950IIjQesbOXlZnerVJbBuuNHTX3aFzcURYdbP1W+a9RGlMJOE6CZ4lc2tycK3xPCWCVg6o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752493157; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3poyEKrP2QccOsBnw3+qFZ7NtXzgmSIMZDOuRbq9Mjs=; b=W9BwkN8RHeidWxVTHRqTA8M6n+jhqjoufJrlhswNDbWMLJj4p1TewclRGG7GRekwPJWWatMeFCoBlsrtw2Ey9rqQzWqChu9ob55V6B5WrcPc3Cdx9rbt9OIzECJoqz+99tWpYh7riwnO4hJivpOZFKY/objZfQJWJcpqnLKXTy4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1752493157849460.8060097599978; Mon, 14 Jul 2025 04:39:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ubHV2-0007Qb-7B; Mon, 14 Jul 2025 07:37:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ubH1l-00028R-9T for qemu-devel@nongnu.org; Mon, 14 Jul 2025 07:07:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ubH1i-0002HL-Hz for qemu-devel@nongnu.org; Mon, 14 Jul 2025 07:07:20 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-663-catAXm3aPIWWivKIydfJew-1; Mon, 14 Jul 2025 07:07:16 -0400 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3a4eec544c6so1839235f8f.0 for ; Mon, 14 Jul 2025 04:07:16 -0700 (PDT) Received: from [192.168.10.48] ([151.49.73.155]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b5e8e0d872sm12279345f8f.60.2025.07.14.04.07.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jul 2025 04:07:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752491237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3poyEKrP2QccOsBnw3+qFZ7NtXzgmSIMZDOuRbq9Mjs=; b=T2TXf5Hy2vxse2dZyOdlmw4gexylmaK2aRH/8JvnFAFcy0lvBcmXIvPLEFJxMWPkA0F919 bvtPAP+O+jiXMeUMCvEBv8fUd7yiJiC5S0YY2AekoK6IuA/RKnTmGrwyKM+gt3j+Lm8e7F s+A2QtPyO18ZZ2gQUV88QFjfCjNbexo= X-MC-Unique: catAXm3aPIWWivKIydfJew-1 X-Mimecast-MFC-AGG-ID: catAXm3aPIWWivKIydfJew_1752491235 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752491234; x=1753096034; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3poyEKrP2QccOsBnw3+qFZ7NtXzgmSIMZDOuRbq9Mjs=; b=LV9YT1bGxT7Syeery1N5TcU/hftci68cPW+2u6TIZEnqLlP/B92M4VTvjVjWWIdZZ7 APAGu/lfouHIaMbO2PJb6FG36foTKdS6fZ+PBjDn6cOJCWVE7wBQHvbVT/tGu+j7et2S LuEV/cATwI4oOiipjNmYRp7hJLMZRwrNQqU7xqpJ1tmCOT+mdZ6xnSITr+Rwu9BG1jdT LdZQ5f/lBjY+D8tWzL/JLx9VAI+4rI1y3ALNmkkuCe4zeWH7xVmZcGlHm2YpslZOyYnX 4l7heN+YKhhG+kXDr5U9mXshgGo/4aDU9ea/3icbIeE5x8C8iejnk3ux3JSmDcerG8qO BXrg== X-Gm-Message-State: AOJu0Yy8Vhe+cYlEotx1lvFzCMMs0CobXfkRq1yrWpqOS6SO/+8ii/9R YR4E5YdHFqN3dknTmz24EyA3cy1YOi1JZxHhPgKbNBZlFeSPcvF/Hjrt8mxLwioHkGWYPYEB+4W hkQ+lKFVvmQg9GDI19IB74tDEPK9Fq2i5v/vhBA3hlzlAQfIN8duC/tnuakBIa2BCDLOoKDb2in EJlXrv/8IWL8V3aovEHfkBojVzQ6dTwXRoXkST555L X-Gm-Gg: ASbGncuWe5GMQmNZppLZK2U1iMizfCmS6ITMYZ6nXbgUdwxzT11QZ3hBiouUFvPTjhk 7cmRBulcTltHrkhMX/x7b4hPSCZb47o84UrF+spe435ZuYCYlEnly104Ts24JCnGZ4nrb9ElWSJ RHnkZOvcQwoX9n/Hcv7MdzfMXu6eO26t49sRBvQiVgCBFyxRxuiGu9nYBKlz8RhMzJKOaIUkh/v GskAcj8TUjB9Dvm4p3sa0obiz4Yx5A931kuyQr/ycuR8qW3VpzalthXd2Bf8vKbB0BhHSs3v0Qz wmRnp7yEgMPQI+bOQljaBvYqPaEmA9UFw5MRxyYAg2o= X-Received: by 2002:a5d:4104:0:b0:3b3:9cc4:6830 with SMTP id ffacd0b85a97d-3b5f18d32ecmr9487307f8f.48.1752491234555; Mon, 14 Jul 2025 04:07:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEqyOkV3uJ/cxXCSI6reKUeZK7KTQXaYb1TKAO9xCddGqX4pP6A5xN0IgUN4YttGEcr1jbqYg== X-Received: by 2002:a5d:4104:0:b0:3b3:9cc4:6830 with SMTP id ffacd0b85a97d-3b5f18d32ecmr9487274f8f.48.1752491234080; Mon, 14 Jul 2025 04:07:14 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Zhao Liu , Tao Su Subject: [PULL 73/77] i386/cpu: Reorder CPUID leaves in cpu_x86_cpuid() Date: Mon, 14 Jul 2025 13:04:02 +0200 Message-ID: <20250714110406.117772-74-pbonzini@redhat.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250714110406.117772-1-pbonzini@redhat.com> References: <20250714110406.117772-1-pbonzini@redhat.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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1752493159475116600 Content-Type: text/plain; charset="utf-8" From: Zhao Liu Sort the CPUID leaves strictly by index to facilitate checking and changing. Signed-off-by: Zhao Liu Reviewed-by: Tao Su Link: https://lore.kernel.org/r/20250627035129.2755537-5-zhao1.liu@intel.com Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 60 +++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 1a2cae6ea1f..3b7c22e5d38 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -8052,21 +8052,6 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,= uint32_t count, assert(!(*eax & ~0x1f)); *ebx &=3D 0xffff; /* The count doesn't need to be reliable. */ break; - case 0x1C: - if (cpu->enable_pmu && (env->features[FEAT_7_0_EDX] & CPUID_7_0_ED= X_ARCH_LBR)) { - x86_cpu_get_supported_cpuid(0x1C, 0, eax, ebx, ecx, edx); - *edx =3D 0; - } - break; - case 0x1F: - /* V2 Extended Topology Enumeration Leaf */ - if (!x86_has_cpuid_0x1f(cpu)) { - *eax =3D *ebx =3D *ecx =3D *edx =3D 0; - break; - } - - encode_topo_cpuid1f(env, count, topo_info, eax, ebx, ecx, edx); - break; case 0xD: { /* Processor Extended State */ *eax =3D 0; @@ -8207,6 +8192,12 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,= uint32_t count, } break; } + case 0x1C: + if (cpu->enable_pmu && (env->features[FEAT_7_0_EDX] & CPUID_7_0_ED= X_ARCH_LBR)) { + x86_cpu_get_supported_cpuid(0x1C, 0, eax, ebx, ecx, edx); + *edx =3D 0; + } + break; case 0x1D: { /* AMX TILE, for now hardcoded for Sapphire Rapids*/ *eax =3D 0; @@ -8244,6 +8235,15 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,= uint32_t count, } break; } + case 0x1F: + /* V2 Extended Topology Enumeration Leaf */ + if (!x86_has_cpuid_0x1f(cpu)) { + *eax =3D *ebx =3D *ecx =3D *edx =3D 0; + break; + } + + encode_topo_cpuid1f(env, count, topo_info, eax, ebx, ecx, edx); + break; case 0x24: { *eax =3D 0; *ebx =3D 0; @@ -8472,6 +8472,21 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,= uint32_t count, *edx =3D 0; } break; + case 0x8000001F: + *eax =3D *ebx =3D *ecx =3D *edx =3D 0; + if (sev_enabled()) { + *eax =3D 0x2; + *eax |=3D sev_es_enabled() ? 0x8 : 0; + *eax |=3D sev_snp_enabled() ? 0x10 : 0; + *ebx =3D sev_get_cbit_position() & 0x3f; /* EBX[5:0] */ + *ebx |=3D (sev_get_reduced_phys_bits() & 0x3f) << 6; /* EBX[11= :6] */ + } + break; + case 0x80000021: + *eax =3D *ebx =3D *ecx =3D *edx =3D 0; + *eax =3D env->features[FEAT_8000_0021_EAX]; + *ebx =3D env->features[FEAT_8000_0021_EBX]; + break; case 0x80000022: *eax =3D *ebx =3D *ecx =3D *edx =3D 0; /* AMD Extended Performance Monitoring and Debug */ @@ -8504,21 +8519,6 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,= uint32_t count, *ecx =3D 0; *edx =3D 0; break; - case 0x8000001F: - *eax =3D *ebx =3D *ecx =3D *edx =3D 0; - if (sev_enabled()) { - *eax =3D 0x2; - *eax |=3D sev_es_enabled() ? 0x8 : 0; - *eax |=3D sev_snp_enabled() ? 0x10 : 0; - *ebx =3D sev_get_cbit_position() & 0x3f; /* EBX[5:0] */ - *ebx |=3D (sev_get_reduced_phys_bits() & 0x3f) << 6; /* EBX[11= :6] */ - } - break; - case 0x80000021: - *eax =3D *ebx =3D *ecx =3D *edx =3D 0; - *eax =3D env->features[FEAT_8000_0021_EAX]; - *ebx =3D env->features[FEAT_8000_0021_EBX]; - break; default: /* reserved values: zero */ *eax =3D 0; --=20 2.50.0