From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 CA1E5449EB6 for ; Fri, 22 May 2026 14:20:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779459642; cv=none; b=a3FOu6M+6kYuEHAcZ1Wbv1ctHE+us8igl/whr0ZfnISytQTxNO3ubuUoJd3AEiOrrAaVVg0JHKPLGYD26tnKGodP9QoxIsvKkh/gSUOxMAjWVmZU+pGqc6/ciPOicGUqHex6pYf8agvyMiRWeCxOOYG46PqMAjQmDQj9Czs7A+Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779459642; c=relaxed/simple; bh=rms8v8da6YwHU/fexmhwIaKhosdhS8a5enXtjSD9FEQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=AIhLux1CE4D7oVFokNFuZfuGQuRf+zqcwxCX63K1JOzlC5Si25mE/9Qq5nby1sjQE4qYgb3HGjXP6Z08nDADlpa8MC5w7Hzkb6YbI/+GEjjewZbtLhpscuytGzjzPiTJgs229nkOwOxvo9sf2tmGIySCUSN2tphxSyjby2pEaW4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=E+W7wlmM; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="E+W7wlmM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C04131F00A3E; Fri, 22 May 2026 14:20:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779459633; bh=KMOg+jIFzKoR+MDQSP+sdqbBfrIpOv5CDMN5EJGNh5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=E+W7wlmM3XJVZwZz2XX9vHRsZGSo+lrXIM85vfaQ8xDGxQLgQSvEvXFpR/EbiLbPL hKhdIlR20CaaUl5QmgRrqgs8493yKARsqpG1gYSDCpzUFYBMwyVURUHzALAvI1moiO CdYQSIA3Qxag8kLJRJLlmqM1yN7S/cNsp8xzzpZcB64z3KJHsnOwF/mQYwyQvS3Vta 2Sl8eKoJfXHcAMaS4DpeWdUbcrNmQ804CxKHqC2NDHMoIv/fvbu1RjTsulE9rykjQo SqV5fYAu+miQFBNbXav4cqb6SIajfXfMoTQlz2QpyYwuOb2GJg1dcBnMM4S00VhWAc keuiPXXwjI2Eg== From: Arnd Bergmann To: Ingo Molnar Cc: Arnd Bergmann , Richard Weinberger , Anton Ivanov , Johannes Berg , Thomas Gleixner , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Peter Zijlstra , Will Deacon , Boqun Feng , Gary Guo , Yury Norov , Rasmus Villemoes , Boris Ostrovsky , Alexander Usyskin , Tony Nguyen , Przemek Kitszel , x86@kernel.org, linux-kernel@vger.kernel.org, linux-um@lists.infradead.org Subject: [PATCH 2/8] =?UTF-8?q?x86:=20remove=20AMD=20=C3=89lan=20remnants?= Date: Fri, 22 May 2026 16:19:53 +0200 Message-Id: <20260522141959.1071595-3-arnd@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260522141959.1071595-1-arnd@kernel.org> References: <20260522141959.1071595-1-arnd@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Arnd Bergmann There is one more leftover line in Kconfig and the detection for AMD Generation 4 CPUs (5k86 and Élan) that can now get removed following the increase of the minimum CPU level to 586TSC. Signed-off-by: Arnd Bergmann --- arch/x86/Kconfig.cpu | 1 - arch/x86/kernel/cpu/amd.c | 20 -------------------- 2 files changed, 21 deletions(-) diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 1377edd9a997..f4a12b74bed3 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -32,7 +32,6 @@ choice - "Athlon" for the AMD K7 family (Athlon/Duron/Thunderbird). - "Crusoe" for the Transmeta Crusoe series. - "Efficeon" for the Transmeta Efficeon series. - - "AMD Elan" for the 32-bit AMD Elan embedded CPU. - "GeodeGX1" for Geode GX1 (Cyrix MediaGX). - "Geode GX/LX" For AMD Geode GX and LX processors. - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3. diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 62f74a7f2f8d..b04e1f6fe430 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -91,25 +91,6 @@ __asm__(".text\n" "vide: ret\n"); #endif -static void init_amd_k5(struct cpuinfo_x86 *c) -{ -#ifdef CONFIG_X86_32 -/* - * General Systems BIOSen alias the cpu frequency registers - * of the Elan at 0x000df000. Unfortunately, one of the Linux - * drivers subsequently pokes it, and changes the CPU speed. - * Workaround : Remove the unneeded alias. - */ -#define CBAR (0xfffc) /* Configuration Base Address (32-bit) */ -#define CBAR_ENB (0x80000000) -#define CBAR_KEY (0X000000CB) - if (c->x86_model == 9 || c->x86_model == 10) { - if (inl(CBAR) & CBAR_ENB) - outl(0 | CBAR_KEY, CBAR); - } -#endif -} - static void init_amd_k6(struct cpuinfo_x86 *c) { #ifdef CONFIG_X86_32 @@ -1065,7 +1046,6 @@ static void init_amd(struct cpuinfo_x86 *c) clear_cpu_cap(c, X86_FEATURE_MCE); switch (c->x86) { - case 4: init_amd_k5(c); break; case 5: init_amd_k6(c); break; case 6: init_amd_k7(c); break; case 0xf: init_amd_k8(c); break; -- 2.39.5