From nobody Tue May 13 15:32:47 2025 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; 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=pass(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1675331084; cv=none; d=zohomail.com; s=zohoarc; b=OuIzE4KapsyV3JXFDXR1mJ5fYY9Oz+m6VeY75cpjKO3T49r4WRsvcAFO11uCQZyJ0DA5gsy09Q+S10Z9XRaXX+1H08A6r6CidFjTJW02yYC7xBm/cr/eLcUs6aRBCFmqjuBHtwk0nMrssx1ZjOBz3qe6QJBFbncD9DBfyeqXDCI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675331084; 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=TOLME3hzJslfCIL14XNXopnjG/8NS3gErfJbrHEVjy4=; b=DMI1TP4mVoGq83ed0khJK0BbrHOXCjuG50+J2La22W7O0fqzVAm8Q4NNP4NjHJownfgbiaobN+RESepnoxBYVgmJuArZYUw++3lbr2GFg36uV5UclafXuwZle3tv2Q2RpG7IG7r6hAxj1ohYGRmsvFCSLhVOv9s7/BMQEGWSQv8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675331084850955.0132598377807; Thu, 2 Feb 2023 01:44:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNW8a-0007Kc-AB; Thu, 02 Feb 2023 04:44:12 -0500 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 1pNW8X-0007FR-Uq for qemu-devel@nongnu.org; Thu, 02 Feb 2023 04:44:09 -0500 Received: from mga02.intel.com ([134.134.136.20]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNW8W-0006Pg-BB for qemu-devel@nongnu.org; Thu, 02 Feb 2023 04:44:09 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Feb 2023 01:42:43 -0800 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.112]) by fmsmga001.fm.intel.com with ESMTP; 02 Feb 2023 01:42:41 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675331048; x=1706867048; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uLL+NWRhAQrmrOXrW9mrGp0p9bgRS48bvW90TKnZBAM=; b=jOrb500suwK4IYaPCIItGB+irpwlFpMvOCw2B3q6gVJsmJuiVa57LPw2 waNCufiUmJfjXAA+kNu2zhT46WeGLEMM8JtlAa3dgoomX9f9uk1Flg/+i ZEwMdt/66GZiNCd3iSWi+VNmRJ4gEPF1uzA4Yvuqw1Wra3y9UQOASo9zI lsca4Gvpqyq+Sev4bVzKYDeRaD5QVFLf4V9Hg+fKm+Wh+P78krfq/+RGo 27Y9bZwEY6OMZDGSld0FCEcHWoORIhwkfBUMs8M5g52uNto7lUt9st/1z cK1UnoKxjlnu/CiWTw7gB72CJc/iNoPSOwFIxLVU9gabugbBemNDaMypf w==; X-IronPort-AV: E=McAfee;i="6500,9779,10608"; a="316402169" X-IronPort-AV: E=Sophos;i="5.97,267,1669104000"; d="scan'208";a="316402169" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10608"; a="807909500" X-IronPort-AV: E=Sophos;i="5.97,267,1669104000"; d="scan'208";a="807909500" From: Zhao Liu To: Eduardo Habkost , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , "Michael S . Tsirkin" , Richard Henderson , Paolo Bonzini Cc: qemu-devel@nongnu.org, Zhenyu Wang , Zhao Liu Subject: [PATCH 17/18] i386: Use CPUCacheInfo.share_level to encode CPUID[0x8000001D].EAX[bits 25:14] Date: Thu, 2 Feb 2023 17:49:28 +0800 Message-Id: <20230202094929.343799-18-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230202094929.343799-1-zhao1.liu@linux.intel.com> References: <20230202094929.343799-1-zhao1.liu@linux.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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=134.134.136.20; envelope-from=zhao1.liu@linux.intel.com; helo=mga02.intel.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1675331086358100003 Content-Type: text/plain; charset="utf-8" From: Zhao Liu CPUID[0x8000001D].EAX[bits 25:14] is used to represent the cache topology for amd CPUs. After cache models have topology information, we can use CPUCacheInfo.share_level to decide which topology level to be encoded into CPUID[0x8000001D].EAX[bits 25:14]. Signed-off-by: Zhao Liu --- target/i386/cpu.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index d691c02e3c06..5816dc99b1d4 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -355,20 +355,12 @@ static void encode_cache_cpuid8000001d(CPUCacheInfo *= cache, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) { - uint32_t sharing_apic_ids; assert(cache->size =3D=3D cache->line_size * cache->associativity * cache->partitions * cache->sets); =20 *eax =3D CACHE_TYPE(cache->type) | CACHE_LEVEL(cache->level) | (cache->self_init ? CACHE_SELF_INIT_LEVEL : 0); - - /* L3 is shared among multiple cores */ - if (cache->level =3D=3D 3) { - sharing_apic_ids =3D 1 << apicid_die_offset(topo_info); - } else { - sharing_apic_ids =3D 1 << apicid_core_offset(topo_info); - } - *eax |=3D (sharing_apic_ids - 1) << 14; + *eax |=3D max_processor_ids_for_cache(cache, topo_info) << 14; =20 assert(cache->line_size > 0); assert(cache->partitions > 0); --=20 2.34.1