From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 50C9215838C for ; Fri, 19 Jan 2024 18:29:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 966ABE29D6; Fri, 19 Jan 2024 18:29:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 77403E29D6 for ; Fri, 19 Jan 2024 18:29:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B29343433B8 for ; Fri, 19 Jan 2024 18:29:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56CB9A15 for ; Fri, 19 Jan 2024 18:29:07 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1705688785.4c52a1b8f83494c72d036f0955c5ad57c51e554e.bkohler@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_configkernel.sh genkernel X-VCS-Directories: / X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: 4c52a1b8f83494c72d036f0955c5ad57c51e554e X-VCS-Branch: master Date: Fri, 19 Jan 2024 18:29:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4c16393d-a6b7-4232-aa89-e78ad48151a6 X-Archives-Hash: 7583f5c11948f418be7aa5f4a7ae15cd commit: 4c52a1b8f83494c72d036f0955c5ad57c51e554e Author: Michal Privoznik gmail com> AuthorDate: Fri Dec 8 13:16:50 2023 +0000 Commit: Ben Kohler gentoo org> CommitDate: Fri Jan 19 18:26:25 2024 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4c52a1b8 gen_configkernel: Prepare for kernel-6.6 The microcode related config options were removed in [1] and microcode loading is enabled when support for corresponding CPU is enabled. Basically, this is equivalent to renaming options: CONFIG_MICROCODE_AMD -> CONFIG_CPU_SUP_AMD CONFIG_MICROCODE_INTEL -> CONFIG_CPU_SUP_INTEL Reflect this change in gen_configkernel.sh. Bug: https://bugs.gentoo.org/913659 1: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e6bcfdd75d53390a67f67237f4eafc77d9772056 Signed-off-by: Michal Privoznik gmail.com> Signed-off-by: Ben Kohler gentoo.org> gen_configkernel.sh | 16 ++++++++++------ genkernel | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gen_configkernel.sh b/gen_configkernel.sh index d074005..17f9eaf 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -991,11 +991,13 @@ config_kernel() { [ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode+=( 'CONFIG_MICROCODE_EARLY' ) # Intel - kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL' ) + [ ${KV_NUMERIC} -ge 6006 ] && kconfigs_microcode_intel+=( 'CONFIG_CPU_SUP_INTEL' ) + [ ${KV_NUMERIC} -lt 6006 ] && kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL' ) [ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL_EARLY' ) # AMD - kconfigs_microcode_amd=( 'CONFIG_MICROCODE_AMD' ) + [ ${KV_NUMERIC} -ge 6006 ] && kconfigs_microcode_amd+=( 'CONFIG_CPU_SUP_AMD' ) + [ ${KV_NUMERIC} -lt 6006 ] && kconfigs_microcode_amd+=( 'CONFIG_MICROCODE_AMD' ) [ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode_amd+=( 'CONFIG_MICROCODE_AMD_EARLY' ) [[ "${MICROCODE}" == all ]] && kconfigs_microcode+=( ${kconfigs_microcode_amd[@]} ${kconfigs_microcode_intel[@]} ) @@ -1016,14 +1018,16 @@ config_kernel() { required_kernel_options+=( 'CONFIG_MICROCODE' ) case "${MICROCODE}" in amd) - required_kernel_options+=( 'CONFIG_MICROCODE_AMD' ) + [ ${KV_NUMERIC} -ge 6006 ] && required_kernel_options+=( 'CONFIG_CPU_SUP_AMD' ) + [ ${KV_NUMERIC} -lt 6006 ] && required_kernel_options+=( 'CONFIG_MICROCODE_AMD' ) ;; intel) - required_kernel_options+=( 'CONFIG_MICROCODE_INTEL' ) + [ ${KV_NUMERIC} -ge 6006 ] && required_kernel_options+=( 'CONFIG_CPU_SUP_INTEL' ) + [ ${KV_NUMERIC} -lt 6006 ] && required_kernel_options+=( 'CONFIG_MICROCODE_INTEL' ) ;; all) - required_kernel_options+=( 'CONFIG_MICROCODE_AMD' ) - required_kernel_options+=( 'CONFIG_MICROCODE_INTEL' ) + [ ${KV_NUMERIC} -ge 6006 ] && required_kernel_options+=( 'CONFIG_CPU_SUP_AMD' 'CONFIG_CPU_SUP_INTEL' ) + [ ${KV_NUMERIC} -lt 6006 ] && required_kernel_options+=( 'CONFIG_MICROCODE_AMD' 'CONFIG_MICROCODE_INTEL' ) ;; esac else diff --git a/genkernel b/genkernel index ab0e9d6..feaaad6 100755 --- a/genkernel +++ b/genkernel @@ -2,7 +2,7 @@ # $Id$ PATH="${PATH}:/sbin:/usr/sbin" -GK_V='4.3.8' +GK_V='4.3.9' # Normalize locales export LC_ALL=C