From nobody Fri Nov 14 08:04:19 2025 Delivered-To: importer@patchew.org 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; 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+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585866239; cv=none; d=zohomail.com; s=zohoarc; b=gqiCBid9ZZB1T77YbxJoILMcBMsTpl0dngJYrIGzGb6fAvxdyhTLs0KUY9fYIL1+SmqU0r+OJy/yb16qS4JciMczJBg1Is/3DyOwGASMsicoS37b3apxX5s10RiUY3QoxvtcpvdBG0RaZRPy6yn6zovToX8ZffpQsf0AhqSde/w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585866239; 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=Bk5VqIK038e7G5IPRCsE90+B2JrEtJOic+qVj7wHDQU=; b=W5CeUACE2YrkhEhvJvvXDeJYXmkUOV8+4GyB7hGraLcunea0/sKfVjnPf5839rodg+5utnWgJFGdX3UKZJWAC+W1qUdUICnrWJU83FyjSa4iFlulXuiRSuWBfnGbo0ifAVYtHDDZNgOSXjB1A9GG6UDdrNLQ9giDgVsG+pzDeAE= 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+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 1585866239401320.23458919064467; Thu, 2 Apr 2020 15:23:59 -0700 (PDT) Received: from localhost ([::1]:47898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jK8Fi-0006YU-86 for importer@patchew.org; Thu, 02 Apr 2020 18:23:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34551) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jK8DS-0002Dk-MI for qemu-devel@nongnu.org; Thu, 02 Apr 2020 18:21:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jK8DR-0007ap-GA for qemu-devel@nongnu.org; Thu, 02 Apr 2020 18:21:38 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:42966 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jK8DR-0007ah-Cd for qemu-devel@nongnu.org; Thu, 02 Apr 2020 18:21:37 -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-301-DERb047rPj-5PIbnUN7pPw-1; Thu, 02 Apr 2020 18:21:34 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 84A5F18A6EC0; Thu, 2 Apr 2020 22:21:33 +0000 (UTC) Received: from localhost (ovpn-116-71.gru2.redhat.com [10.97.116.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3221089F0A; Thu, 2 Apr 2020 22:21:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585866097; 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=Bk5VqIK038e7G5IPRCsE90+B2JrEtJOic+qVj7wHDQU=; b=iUxYGkdtLtuH06csAcf6gUM/e703p4DVX+CwIQSgTTcUkDog2sxj3T7gH2+TTsnOzPBp2+ zmxoATjU4oNO7O1472FvVrAhz1Sj2BzBts+HJV+KBl7dv1G8gxb7ZLXN1KAHmnPLm/MnSF nheSA6t+nsPFn3UDvaRAEuT8qRz7v3A= X-MC-Unique: DERb047rPj-5PIbnUN7pPw-1 From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 7/9] i386: Fix pkg_id offset for EPYC cpu models Date: Thu, 2 Apr 2020 19:20:49 -0300 Message-Id: <20200402222051.523093-8-ehabkost@redhat.com> In-Reply-To: <20200402222051.523093-1-ehabkost@redhat.com> References: <20200402222051.523093-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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 , Igor Mammedov , "Michael S . Tsirkin" , Babu Moger , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Babu Moger If the system is numa configured the pkg_offset needs to be adjusted for EPYC cpu models. Fix it calling the model specific handler. Signed-off-by: Babu Moger Reviewed-by: Igor Mammedov Acked-by: Michael S. Tsirkin Message-Id: <158396725589.58170.16424607815207074485.stgit@naples-babu.amd.= com> Signed-off-by: Eduardo Habkost --- hw/i386/pc.c | 1 + target/i386/cpu.c | 4 ++-- target/i386/cpu.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index b58925d063..5143c51653 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1526,6 +1526,7 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_d= ev, =20 env->nr_dies =3D x86ms->smp_dies; env->nr_nodes =3D topo_info.nodes_per_pkg; + env->pkg_offset =3D x86ms->apicid_pkg_offset(&topo_info); =20 /* * If APIC ID is not set, diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 468e03a153..6ad24774c5 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5610,7 +5610,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, = uint32_t count, *ecx |=3D CPUID_TOPOLOGY_LEVEL_SMT; break; case 1: - *eax =3D apicid_pkg_offset(&topo_info); + *eax =3D env->pkg_offset; *ebx =3D cs->nr_cores * cs->nr_threads; *ecx |=3D CPUID_TOPOLOGY_LEVEL_CORE; break; @@ -5644,7 +5644,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, = uint32_t count, *ecx |=3D CPUID_TOPOLOGY_LEVEL_CORE; break; case 2: - *eax =3D apicid_pkg_offset(&topo_info); + *eax =3D env->pkg_offset; *ebx =3D env->nr_dies * cs->nr_cores * cs->nr_threads; *ecx |=3D CPUID_TOPOLOGY_LEVEL_DIE; break; diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 8227479c94..e818fc712a 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1610,6 +1610,7 @@ typedef struct CPUX86State { =20 unsigned nr_dies; unsigned nr_nodes; + unsigned pkg_offset; } CPUX86State; =20 struct kvm_msrs; --=20 2.24.1