From nobody Fri Jul 4 00:55:51 2025 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622571382; cv=none; d=zohomail.com; s=zohoarc; b=c6pfz10GpETJ2rmGVsEwWR90jLTLeN8Vg2IRCefnPLxxarHF55iJ3qNr25/QxMCAamDTAALc/QNRNpD2sDjKtpB9f8+te8Xl1NKOi0+5t9vqwbKFclmioiI4vBtS3NmI5U482aNXzKg7i27ONiYwHg9/D7yZhs/FJOGFIrn7h9o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622571382; h=Content-Type: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=/8o5REEym/FIQDvXvPd7+wwuWGDEnF4d7W42t5/ybzw=; b=BbkZcIQGKATm5Nxp7HO57fPGdMd7+HEnFyT5886y6dNufzphEAK23hFV967XHW5PM54O9Tj8/yHl1lbKAl1SE2z+pyg8ZHAtuafncmKBG1G+AF5x6TpFNwQHOiX7BTjc2xhWrqNYDbQYOXlB7/isufMxjMtQXxUnfItxJ2OsB9Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=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 1622571382983850.8625006278603; Tue, 1 Jun 2021 11:16:22 -0700 (PDT) Received: from localhost ([::1]:55046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lo8w9-00070q-Q0 for importer2@patchew.org; Tue, 01 Jun 2021 14:16:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lo8qU-00026V-20 for qemu-devel@nongnu.org; Tue, 01 Jun 2021 14:10:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:52905) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lo8qP-0005cb-6b for qemu-devel@nongnu.org; Tue, 01 Jun 2021 14:10:29 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-394-vetHwHL2MFK6ZqbcKEfNhA-1; Tue, 01 Jun 2021 14:10:21 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 287CE79EC5; Tue, 1 Jun 2021 18:10:20 +0000 (UTC) Received: from localhost (ovpn-112-239.rdu2.redhat.com [10.10.112.239]) by smtp.corp.redhat.com (Postfix) with ESMTP id E179510074FC; Tue, 1 Jun 2021 18:10:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622571024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/8o5REEym/FIQDvXvPd7+wwuWGDEnF4d7W42t5/ybzw=; b=AlhL+BRO9fD+IaY22qQwdGKasXaVLHlDSJ+DPAiTJlKKssSDcaG91BCZHCXAjRwIAuSAQM OWviYZRZmCDUsr/een05kXKjARVVBm3WXLOK0zY7/oXMrnuK/DNKAO4J3wLnBv1eJbQ35J n9JbCCWnfMFf0ZmQB1/mH/nl7dyrwjI= X-MC-Unique: vetHwHL2MFK6ZqbcKEfNhA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 06/24] i386: use better matching family/model/stepping for 'qemu64' CPU Date: Tue, 1 Jun 2021 14:09:56 -0400 Message-Id: <20210601181014.2568861-7-ehabkost@redhat.com> In-Reply-To: <20210601181014.2568861-1-ehabkost@redhat.com> References: <20210601181014.2568861-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.371, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Richard Henderson , Eduardo Habkost Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Daniel P. Berrang=C3=A9 The 'qemu64' CPUID currently reports a family/model/stepping that approximately corresponds to an AMD K7 vintage architecture. The K7 series predates the introduction of 64-bit support by AMD in the K8 series. This has been reported to lead to LLVM complaints about generating 64-bit code for a 32-bit CPU target LLVM ERROR: 64-bit code requested on a subtarget that doesn't support it! It appears LLVM looks at the family/model/stepping, despite qemu64 reporting it is 64-bit capable. This patch changes 'qemu64' to report a CPUID with the family, model and stepping taken from a AMD Athlon(tm) 64 X2 Dual Core Processor 4000+ which is one of the first 64-bit AMD CPUs. Closes https://gitlab.com/qemu-project/qemu/-/issues/191 Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Eduardo Habkost Message-Id: <20210507133650.645526-2-berrange@redhat.com> Signed-off-by: Eduardo Habkost --- hw/i386/pc.c | 6 +++++- target/i386/cpu.c | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 8cfaf216e7b..c6d8d0d84d9 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -94,7 +94,11 @@ #include "trace.h" #include CONFIG_DEVICES =20 -GlobalProperty pc_compat_6_0[] =3D {}; +GlobalProperty pc_compat_6_0[] =3D { + { "qemu64" "-" TYPE_X86_CPU, "family", "6" }, + { "qemu64" "-" TYPE_X86_CPU, "model", "6" }, + { "qemu64" "-" TYPE_X86_CPU, "stepping", "3" }, +}; const size_t pc_compat_6_0_len =3D G_N_ELEMENTS(pc_compat_6_0); =20 GlobalProperty pc_compat_5_2[] =3D { diff --git a/target/i386/cpu.c b/target/i386/cpu.c index ff92d924ad9..078ec905522 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1803,9 +1803,9 @@ static const X86CPUDefinition builtin_x86_defs[] =3D { .name =3D "qemu64", .level =3D 0xd, .vendor =3D CPUID_VENDOR_AMD, - .family =3D 6, - .model =3D 6, - .stepping =3D 3, + .family =3D 15, + .model =3D 107, + .stepping =3D 1, .features[FEAT_1_EDX] =3D PPRO_FEATURES | CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA | --=20 2.30.2