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 6428A2C0F6F for ; Sun, 14 Dec 2025 08:47:38 +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=1765702058; cv=none; b=IcplPF+crMgrBL9jrTgVS5HFUsN7YzP7ShClPgwVo8HMjQDHUS++WdWz3x92qPFJ/UOd3JIdXEy4+lwlo6hUgQcNRU34HjVqSsXGe68bjlCqHj++6WMUKitPKz+dty70HcvMFW1gA1WmurbUe+L8iE7ZJCSpyTee8CgrkKPlvSE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765702058; c=relaxed/simple; bh=6rrt/3gNix6+k6EnDeoZHliqoq3sBnIF12BjIvmOv6I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L/uIcBvIc3i2tshY8vuwzg/PcoEi98VHdUAfB+ZUpNFicDN1q6/kQhsH0Z2p6Xggb+tTbLukUvIFSBpUy9WBS5l3QKDYBRMIHG2djJnW2NBPgSAjbV6Oad30dP6f8ZewCCSck39UHGeQZPbepONK4frcS+RPbmNuY3OeWeWLCk4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pHPqNNhD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pHPqNNhD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC80FC4CEF1; Sun, 14 Dec 2025 08:47:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765702058; bh=6rrt/3gNix6+k6EnDeoZHliqoq3sBnIF12BjIvmOv6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pHPqNNhDLYBSgNFLgoNHSP2j4GPsxQcQhEoen3VmtmmHNn4iUy+ShD8HZ3OGZfvrS T+RMs2wyawWqWzDIuqVQ4xWW6YYsJeFHKY/xoWDM0lGUQ8uPWWzZNCwBI+WMXX7vvW w2Eii1QW3G/aBcrEwHej+OMJ7FyaLHyt9pIxFlPsJ0cehYXkxRZtBuneplvZtFpmjP qTv8mQ9N+zKG7eVgDgqFtyFW3MzPXEzNLJhoYstJldgYBwhR0BXxB1AaGDP9NPWZB3 rOEkN4Ani0Vlcx7peTe5vDPxsTuLvVyY/pCKzWfnLvoB8oBbZYYu4pThsYw/xENVxm Yc+dYOmUnU+Lw== From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , "Ahmed S . Darwish" , Andrew Cooper , Ard Biesheuvel , Arnd Bergmann , Borislav Petkov , Dave Hansen , "H . Peter Anvin" , John Ogness , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Arnd Bergmann Subject: [PATCH 04/15] x86/cpu: Remove TSC-less CONFIG_M586 support Date: Sun, 14 Dec 2025 09:46:52 +0100 Message-ID: <20251214084710.3606385-5-mingo@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251214084710.3606385-1-mingo@kernel.org> References: <20251214084710.3606385-1-mingo@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Remove support for TSC-less Pentium variants. All TSC-capable Pentium variants, derivatives and clones should still work under the M586TSC or M586MMX options. Signed-off-by: Ingo Molnar Reviewed-by: Arnd Bergmann Acked-by: Dave Hansen Cc: Ahmed S . Darwish Cc: Andrew Cooper Cc: Ard Biesheuvel Cc: H . Peter Anvin Cc: John Ogness Cc: Linus Torvalds Cc: Peter Zijlstra Link: https://lore.kernel.org/r/20250425084216.3913608-5-mingo@kernel.org --- arch/x86/Kconfig.cpu | 10 +--------- arch/x86/Makefile_32.cpu | 1 - arch/x86/include/asm/vermagic.h | 2 -- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index ac53e422f423..052e06fec3b1 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -43,14 +43,6 @@ choice See each option's help text for additional details. If you don't know what to do, choose "Pentium-Pro". -config M586 - bool "586/K5/5x86/6x86/6x86MX" - depends on X86_32 - help - Select this for an 586 or 686 series processor such as the AMD K5, - the Cyrix 5x86, 6x86 and 6x86MX. This choice does not - assume the RDTSC (Read Time Stamp Counter) instruction. - config M586TSC bool "Pentium-Classic" depends on X86_32 @@ -250,7 +242,7 @@ config X86_L1_CACHE_SHIFT default "7" if MPENTIUM4 default "6" if MK7 || MPENTIUMM || MATOM || MVIAC7 || X86_GENERIC || X86_64 default "4" if MGEODEGX1 - default "5" if MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX + default "5" if MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MVIAC3_2 || MGEODE_LX config X86_F00F_BUG def_bool y diff --git a/arch/x86/Makefile_32.cpu b/arch/x86/Makefile_32.cpu index 2dda0a19b06a..43226c9fe795 100644 --- a/arch/x86/Makefile_32.cpu +++ b/arch/x86/Makefile_32.cpu @@ -10,7 +10,6 @@ else align := -falign-functions=0 -falign-jumps=0 -falign-loops=0 endif -cflags-$(CONFIG_M586) += -march=i586 cflags-$(CONFIG_M586TSC) += -march=i586 cflags-$(CONFIG_M586MMX) += -march=pentium-mmx cflags-$(CONFIG_M686) += -march=i686 diff --git a/arch/x86/include/asm/vermagic.h b/arch/x86/include/asm/vermagic.h index b3a8beb32dfd..e26061df0c9b 100644 --- a/arch/x86/include/asm/vermagic.h +++ b/arch/x86/include/asm/vermagic.h @@ -5,8 +5,6 @@ #ifdef CONFIG_X86_64 /* X86_64 does not define MODULE_PROC_FAMILY */ -#elif defined CONFIG_M586 -#define MODULE_PROC_FAMILY "586 " #elif defined CONFIG_M586TSC #define MODULE_PROC_FAMILY "586TSC " #elif defined CONFIG_M586MMX -- 2.51.0