From patchwork Sun Feb 4 08:10:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 196455 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp247140dyb; Sun, 4 Feb 2024 00:10:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IEenyoW/TZLIz898LwsC1BgCxdpQ4AmiGGOXrgL/suFZgWaYCKye59OmdfvS9xTXQzmA3i3 X-Received: by 2002:a17:902:a513:b0:1d8:ee41:de89 with SMTP id s19-20020a170902a51300b001d8ee41de89mr10651871plq.69.1707034241439; Sun, 04 Feb 2024 00:10:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707034241; cv=pass; d=google.com; s=arc-20160816; b=X56jQ7Vno50FZYeDXt3S1Kh0EdA4GzCC+5O0ASGHlQEVIcbiBQy4AzSjv56m8e4yhV YgNApvVzjg80+2TsFqve8mavSdvrnNa1/icRoUxXsfUhbhMTqpT/Q7qZnl8mpaOnhDTN k0BXs/EZtUiUlotvecI9xmBmEuyZ20dUjGqdA6DOguPQUaQt5dNTYLRhGXDb56bEi7t2 qSQZ7amMC+dl/dr1f5ikoUkCc/gbiINCMBaYn36daFxlGwypBkdsF1JcpkympwKFQBmE +TnHC1MOHIkr34NPrzIrrVJnSIjEHNv7R6lzz7/YKYtKmcEjX9bF4aI7Q291v+M2rstQ i2kg== 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=t0Pu4rk9cTGlo8KzzUbHG7ewTcZn+S4cJcrX3uG1dN4=; fh=Dzcn0tr7P7t8zxQrQf9uWF5XOaM70drHERAN0cNY0LQ=; b=WN608+LyULBup+tE8E2f5GwRUmFbfUqHxP2VCQZoBzlFD05Ubf7ehUQ1TVUn9SadeO kYJxhHV8CXAL3jvKBscK3Ns0vhzIVIttitcVd1T+JmToUu64T7TSI0Rgxr6ts1ajzURY hhVi/4GjTi4EultszSlRpqVXzHmkxq3CJLnB3ruSadooSgrtaJeLT/UhX4Ucx+uw4Stn B1noUStwVQt5sVW0+SbPJG0q9PqJ5A4fg/IJ/RItYKx01TFFd1QP4MOedTgD2U8CukeS S5aoEtGmK39NYX9BQCwFPDGt0fZvyHTVVibaZSfzK7Wf7OsVNIc8xZPdeCrUqZUKgXQ7 gWEw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=q7vEqYW4; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-51513-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-51513-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=1; AJvYcCWoT4QVXsRWAzieOGXP02h2YugTICTKpfQoaf9N9hr4QaoMXyMi9Emuro+hMcKEX7WplPCnPUflAo8ZVPCCNOidz72eBg== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id r17-20020a170903015100b001d6ed2e9c87si4364804plc.29.2024.02.04.00.10.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Feb 2024 00:10:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-51513-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=q7vEqYW4; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-51513-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-51513-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 6C2D1B2315F for ; Sun, 4 Feb 2024 08:10:29 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D60FF111AE; Sun, 4 Feb 2024 08:10:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="q7vEqYW4" 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 392D310A09 for ; Sun, 4 Feb 2024 08:10:13 +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=1707034214; cv=none; b=WmWJjCAFiaT6MAz/18AP+qrTf4eNSm81khpV7K4k74/w+YddFB4Df2uIeM/RWyebiQWnB+1iVM9VG1wj5Z+cTAg4iNpnzwftXYArMghBCV6hJT4jZplmDAuuwt54xweA4NN9+A3u81EOXZEPTAM+EWH23D3e7CeMlPCdlOM6hBg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707034214; c=relaxed/simple; bh=ETBf1FO+9nmgKQPZs8HdwPMyJlT1LQh/VW2kdPjj5ug=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=YkJ14qwhQRm/jBqqiRoU9mTCEofa7jmQl9Ljht+AefTg4ldIgckg6iGhyvEFNlrNvZfIGJdZFnI9nntnUgtcXeqQs8i6E/+FFy322MrkBN/x98g5ghkrFYVfByvD1h/LesgJshoWILK6H+AoqwLBWepwYuouIjSYRHsgAuUVAfI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=q7vEqYW4; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16DE2C433C7; Sun, 4 Feb 2024 08:10:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707034213; bh=ETBf1FO+9nmgKQPZs8HdwPMyJlT1LQh/VW2kdPjj5ug=; h=From:To:Cc:Subject:Date:From; b=q7vEqYW4MpSQte4JFhgfQ4DF6zyFO/T8rMaCa/8PRlIuy6ReGDKRr+Vv5iGFbMBEu LrUthmt//6M5m1s+TOzT4nOZAe5ANbqubJA0+HtyYmGrNGNV8++IVH9WLVVn9VYZRE PrSQA8YBx9STdhHXbLrluKk06SB1WU+XXdrg3HlZonzHH/Gupc5Ng8qQOOwjkKFDGh vAj6CUcUcvL1ALzW53nuiFfVhpqwXOYLAvST2v/rXk6VTOD0mv0HoMQf0epE7Y+2cS /x6os5UP8yown/e26xArgGGYmvMd2xUcWThYjwjxmigVhRhFBokiDZzEFk5c9OEwWK 4+YB0ReqAdvqw== From: Masahiro Yamada To: linux-kernel@vger.kernel.org, Greg Kroah-Hartman Cc: Masahiro Yamada , Greg Hackmann , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Ingo Molnar , Thomas Gleixner , x86@kernel.org Subject: [PATCH] platform: goldfish: move the separate 'default' propery for CONFIG_GOLDFISH Date: Sun, 4 Feb 2024 17:10:04 +0900 Message-Id: <20240204081004.33871-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: 1789955136626658336 X-GMAIL-MSGID: 1789955136626658336 Currently, there are two entries for CONFIG_GOLDFISH. In arch/x86/Kconfig: config GOLDFISH def_bool y depends on X86_GOLDFISH In drivers/platform/goldfish/Kconfig: menuconfig GOLDFISH bool "Platform support for Goldfish virtual devices" depends on HAS_IOMEM && HAS_DMA While Kconfig allows multiple entries, it generally leads to tricky code. Prior to commit bd2f348db503 ("goldfish: refactor goldfish platform configs"), CONFIG_GOLDFISH was an alias of CONFIG_X86_GOLDFISH. After the mentioned commit added the second entry with a user prompt, the former provides the 'default' property that is effective only when X86_GOLDFISH=y. Merge them tegether to clarify how it has worked in the past 8 years. Cc: Greg Hackmann Signed-off-by: Masahiro Yamada --- arch/x86/Kconfig | 4 ---- drivers/platform/goldfish/Kconfig | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 5edec175b9bf..eb6c9f5b3be7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -471,10 +471,6 @@ config X86_MPPARSE For old smp systems that do not have proper acpi support. Newer systems (esp with 64bit cpus) with acpi support, MADT and DSDT will override it -config GOLDFISH - def_bool y - depends on X86_GOLDFISH - config X86_CPU_RESCTRL bool "x86 CPU resource control support" depends on X86 && (CPU_SUP_INTEL || CPU_SUP_AMD) diff --git a/drivers/platform/goldfish/Kconfig b/drivers/platform/goldfish/Kconfig index f3d09b1631e3..03ca5bf19f98 100644 --- a/drivers/platform/goldfish/Kconfig +++ b/drivers/platform/goldfish/Kconfig @@ -2,6 +2,7 @@ menuconfig GOLDFISH bool "Platform support for Goldfish virtual devices" depends on HAS_IOMEM && HAS_DMA + default X86_GOLDFISH help Say Y here to get to see options for the Goldfish virtual platform. This option alone does not add any kernel code.