From patchwork Sun Feb 4 10:07:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 196474 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp279227dyb; Sun, 4 Feb 2024 02:07:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IHegb+bW0EXgTvnt7AnD+y8Saz0A5tswonoheeVX09vuY8G02V+2PJjN4GpboD2LulfcPAS X-Received: by 2002:a05:6358:4b41:b0:178:72b5:cf49 with SMTP id ks1-20020a0563584b4100b0017872b5cf49mr13930280rwc.8.1707041263495; Sun, 04 Feb 2024 02:07:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707041263; cv=pass; d=google.com; s=arc-20160816; b=jRgjBagrYLvSmwgUKxrFyMw/rHEEl/2VSlm1Wmf0twVqeJbCmknEOjiJmNVjSw2Fi2 duojykWr3jNTNkxe1z2W8le8x+U1H96dPJMyQacrcgic39KLeQUiLt24PzK9Gf9gdj8K KbQ8xpktaW4jx5m5knQQlEorashasPiKSLjli5yWlj/R4XAkpab0B/HDhU/n7yUeZf02 DmhN9kCjN06dIKSRYG8NP6shHSkOmIQOsnQAPyQ8RooXT6LfWhR2dEU8ggbtGU7rajFl ToA5eM2jqpk2NqWd6jcydCYWoaQT9WFKRDwnftFVHc+YHyDtTyEUkeEWYNG3h7gpfvNa 4S3w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=n+FTlRmKbVfB9PbJf7m8wgutRYPbyN6yYH4WoaVjpG0=; fh=64Z3RIZ5wlNFNTXcOafuJ1FkIfN5vFrYEgg3nyVgEeU=; b=Ibq9EfDZZF1cvPW/8zefqBpvJWxLJaQbO3i/N798KG3LJE/twOH6NApNAykdI9oRFa +abLuGCqFR3Z0b9bJwq4buvw5FRzfLx5a2Zfx77pVQdTROigATlVFlbqRHa9DpaHKBtc tm1G8SNMGJ0hxKFGnOxws2UlEwAyMzz0OP42usmhhSUsa/XILinA47qLnI8DlJj1Axx5 O93rh6yeUXCUIRWGfV0Mp2HrLFqT2sBkIveMuKTRGe3duFN7F5WMzV0q+Uz3XDfAHu5P 92iBaNGW+KxmGfPElOeTtSjMSJsa/57jT2IIP84t6y+gQAJcaWwJ8ozJhADOZrAAK2/9 KZxg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZOe8SSkx; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-51572-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-51572-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=1; AJvYcCVnwZ8xE87VfXK7eHpDEJSIbibQSyIseXOB0O7fVyfni4Uy189ndTaBxwJc7lNyZXpwbXa9UeHtCDaw1NUr+0ypohOPzw== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id z19-20020a656653000000b005d8b30f48b6si4396052pgv.652.2024.02.04.02.07.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Feb 2024 02:07:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-51572-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZOe8SSkx; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-51572-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-51572-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 3FEDA2826BA for ; Sun, 4 Feb 2024 10:07:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 794C01B7F4; Sun, 4 Feb 2024 10:07:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZOe8SSkx" 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 CCF301B593 for ; Sun, 4 Feb 2024 10:07:26 +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=1707041246; cv=none; b=IAv9pYV9F9or93+jBxX0HiUO6quDddE7LvbcmezAVGSLW10EyfD+JfAEc9CbCxaMi12MkrKiHZsu5//JXepvCDOOeMDFUT9lUow23EPAm/4yTI6Z2pznNtrVacAi4LneovMgVvlWuHZ2rMG5kvfgRV0KDvWi+2cn0k+0iRc1Afo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707041246; c=relaxed/simple; bh=jEYaX48BEGS+LMq5Y/H4VKraoGO9OXxW2lnCHE7vAWU=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=p76P5Ujlccc4wT0PYq/oEcgDod6yc90dPh3lPOYkyjQ2xzC8MQfKO86eCZqQWVzWyW/IBOOEnThjMhl24Ah1vbCPmI8/TIxncllEwZQyg9ndp4ilqRa5k7TvfUT519pm2LqC+0yF5xXPDC4MYVnnk2XjlagQx3QB8KqzVRJwB6E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZOe8SSkx; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50911C433F1; Sun, 4 Feb 2024 10:07:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707041246; bh=jEYaX48BEGS+LMq5Y/H4VKraoGO9OXxW2lnCHE7vAWU=; h=From:To:Cc:Subject:Date:From; b=ZOe8SSkxk5l7gRnYuxDcs9N9nCioljYd3k9SdqfayGHyJ2QraA2o5i2SVNtguxQdM JrRwgM67mhsNjXWU5m9WO7mYFHUNmXS4UuAxblED5jllO07fAaeRYBDK7si1wpd9wN TqiOzvd2HMubG2fLUmz6fZKhwUu9L3EFdx0Vs8m1t7hxJYSGKdIMxsIGh4waQyiql6 UxJCgAvuYIrf4UP0G/BoWYNDKNheqk4E7gYi+nnTnlW8vLMlDqXbxYV3Ldik0brrVn KQRwFpKH2KEWkJsObLG4tZiQjPg9i5AsP7xNNMflInbRcJ+IcLEZDiI9KC1igwypZa 6+xbJO03GItcg== From: Masahiro Yamada To: x86@kernel.org Cc: Masahiro Yamada , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Ingo Molnar , Thomas Gleixner , linux-kernel@vger.kernel.org Subject: [PATCH] x86: merge two CONFIG_X86_EXTENDED_PLATFORM entries Date: Sun, 4 Feb 2024 19:07:19 +0900 Message-Id: <20240204100719.42574-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789962499984687358 X-GMAIL-MSGID: 1789962499984687358 There are two menu entries for X86_EXTENDED_PLATFORM, one for X86_32 and the other for X64_64. These entries are nearly identical, with the only difference being the platform list in the help message. While I know this structure was intended by commit 8425091ff8af ("x86: improve the help text of X86_EXTENDED_PLATFORM"), IMHO there is no need to duplicate the entire config entry. Instead, we can provide a little more clarification in the help message. Signed-off-by: Masahiro Yamada --- arch/x86/Kconfig | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index eb6c9f5b3be7..aa9723dd5e97 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -492,10 +492,9 @@ config X86_CPU_RESCTRL Say N if unsure. -if X86_32 config X86_BIGSMP bool "Support for big SMP systems with more than 8 CPUs" - depends on SMP + depends on SMP && X86_32 help This option is needed for the systems that have more than 8 CPUs. @@ -508,7 +507,10 @@ config X86_EXTENDED_PLATFORM systems out there.) If you enable this option then you'll be able to select support - for the following (non-PC) 32 bit x86 platforms: + for the following non-PC x86 platforms, depending on the value of + CONFIG_64BIT. + + 32 bit platforms (CONFIG_64BIT=n): Goldfish (Android emulator) AMD Elan RDC R-321x SoC @@ -516,28 +518,14 @@ config X86_EXTENDED_PLATFORM STA2X11-based (e.g. Northville) Moorestown MID devices - If you have one of these systems, or if you want to build a - generic distribution kernel, say Y here - otherwise say N. -endif # X86_32 - -if X86_64 -config X86_EXTENDED_PLATFORM - bool "Support for extended (non-PC) x86 platforms" - default y - help - If you disable this option then the kernel will only support - standard PC platforms. (which covers the vast majority of - systems out there.) - - If you enable this option then you'll be able to select support - for the following (non-PC) 64 bit x86 platforms: + 64 bit platforms (CONFIG_64BIT=y): Numascale NumaChip ScaleMP vSMP SGI Ultraviolet If you have one of these systems, or if you want to build a generic distribution kernel, say Y here - otherwise say N. -endif # X86_64 + # This is an alphabetically sorted list of 64 bit extended platforms # Please maintain the alphabetic order if and when there are additions config X86_NUMACHIP