From nobody Tue Sep 9 21:33:46 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1757235801729753.7811698219007; Sun, 7 Sep 2025 02:03:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uv9Px-000819-Gp; Sun, 07 Sep 2025 03:02:29 -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 1uv9Pv-00080k-PS; Sun, 07 Sep 2025 03:02:27 -0400 Received: from isrv.corpit.ru ([212.248.84.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uv9Pl-0004IB-3S; Sun, 07 Sep 2025 03:02:27 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id F032A151049; Sun, 07 Sep 2025 10:02:03 +0300 (MSK) Received: from think4mjt.origo (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id E8EF52793B6; Sun, 7 Sep 2025 10:02:04 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Michael Tokarev Subject: [Stable-10.0.4 33/81] Revert "i386/cpu: Fix cpu number overflow in CPUID.01H.EBX[23:16]" Date: Sun, 7 Sep 2025 10:01:38 +0300 Message-ID: <20250907070205.135289-1-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: 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=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, 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-ZM-MESSAGEID: 1757235810098124100 Content-Type: text/plain; charset="utf-8" This reverts commit d0975531586742ec2eff8796b7ba93bc4858e63d, which is a modified commit a62fef58299562aae6667b8d8552247423e886b3 from the master branch. Since more changes from the master branch are needed in the areas which are being touched by this one, and this change has been modified to apply without the previous commit(s), let's revert it for now, apply previous patches, and re-apply it without modifications on top. Additionally, when I cherry-picked a62fef58299562aa, it somehow lost its original authorship (Qian Wen). So this revert fixes both issues. Signed-off-by: Michael Tokarev diff --git a/target/i386/cpu.c b/target/i386/cpu.c index b768d8ea33..46619288ed 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6835,8 +6835,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, = uint32_t count, } *edx =3D env->features[FEAT_1_EDX]; if (threads_per_pkg > 1) { - /* Fixup overflow: max value for bits 23-16 is 255. */ - *ebx |=3D MIN(threads_per_pkg, 255) << 16; + *ebx |=3D threads_per_pkg << 16; } if (!cpu->enable_pmu) { *ecx &=3D ~CPUID_EXT_PDCM; --=20 2.47.3