From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E66A827FD7F; Tue, 27 May 2025 16:50:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748364609; cv=none; b=bP2jLxFPvE2a98bFOLk5DI/2z4y4uILisDwfnExUKulv6+o9xE05v8N2hqCbW+jPesp7s/gEZPyyfPQLeCpMalfx0BKcb7IMhUIwy1TAl3wSwS5ebg3sgfFMZYtrtZMX3ThIXdewxyCHhRZOWXiILZs2+CWohIwpj0Lg1UAAh5c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748364609; c=relaxed/simple; bh=NKBlTaUII2uc1mku3mdeVBrPohV8ngbtcFsVRytGzgI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tCPiSp3JAbJHtsl7A822xWpKvre5zZsXdMatSvHoHsH+pHMG4j3vEGozIzqFXN0P+1RXyoOux06vSA5nJEY9tTl9uTbMV1bBuJ8EiYTTTd7xYwYo49vquWLXwkdJ2LJ/VKO9s5WMXxmL0vfpa2aASLeJAh23vF7z3QY5hc/TCwk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yk1zwe9u; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="yk1zwe9u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17683C4CEE9; Tue, 27 May 2025 16:50:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748364608; bh=NKBlTaUII2uc1mku3mdeVBrPohV8ngbtcFsVRytGzgI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yk1zwe9u47xci6e5y4G51E3bgWyn5txSk9guZ0srJlEVdVawr/RhGxXgS00BJqR9l /LAbPETPnBHFG7BPAkLZYHLqabTAmB24KqyQRgse+7GLMQn14zVKicEpb7hSnF1cjv St0S1RVBNUrOPZwxB3zD3BM19mqcq/CRwXIXY0As= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sohil Mehta , Ingo Molnar , Sasha Levin Subject: [PATCH 6.12 109/626] x86/smpboot: Fix INIT delay assignment for extended Intel Families Date: Tue, 27 May 2025 18:20:02 +0200 Message-ID: <20250527162449.470902987@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162445.028718347@linuxfoundation.org> References: <20250527162445.028718347@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sohil Mehta [ Upstream commit 7a2ad752746bfb13e89a83984ecc52a48bae4969 ] Some old crusty CPUs need an extra delay that slows down booting. See the comment above 'init_udelay' for details. Newer CPUs don't need the delay. Right now, for Intel, Family 6 and only Family 6 skips the delay. That leaves out both the Family 15 (Pentium 4s) and brand new Family 18/19 models. The omission of Family 15 (Pentium 4s) seems like an oversight and 18/19 do not need the delay. Skip the delay on all Intel processors Family 6 and beyond. Signed-off-by: Sohil Mehta Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20250219184133.816753-11-sohil.mehta@intel.com Signed-off-by: Sasha Levin --- arch/x86/kernel/smpboot.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index f1fac08fdef28..2c451de702c87 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -681,9 +681,9 @@ static void __init smp_quirk_init_udelay(void) return; /* if modern processor, use no delay */ - if (((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) && (boot_cpu_data.x86 == 6)) || - ((boot_cpu_data.x86_vendor == X86_VENDOR_HYGON) && (boot_cpu_data.x86 >= 0x18)) || - ((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) && (boot_cpu_data.x86 >= 0xF))) { + if ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && boot_cpu_data.x86_vfm >= INTEL_PENTIUM_PRO) || + (boot_cpu_data.x86_vendor == X86_VENDOR_HYGON && boot_cpu_data.x86 >= 0x18) || + (boot_cpu_data.x86_vendor == X86_VENDOR_AMD && boot_cpu_data.x86 >= 0xF)) { init_udelay = 0; return; } -- 2.39.5