From patchwork Sat Sep 16 12:07:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yuan Tan X-Patchwork-Id: 13388352 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC526CD37BD for ; Sat, 16 Sep 2023 12:08:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231897AbjIPMIU (ORCPT ); Sat, 16 Sep 2023 08:08:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234214AbjIPMHz (ORCPT ); Sat, 16 Sep 2023 08:07:55 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.154.54.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DB9FCEC; Sat, 16 Sep 2023 05:07:48 -0700 (PDT) X-QQ-mid: bizesmtp66t1694866051te28ik3h Received: from main2-ubuntu.tail147f4.ts.net ( [202.201.15.117]) by bizesmtp.qq.com (ESMTP) with id ; Sat, 16 Sep 2023 20:07:28 +0800 (CST) X-QQ-SSF: 00200000000000907000000A0000000 X-QQ-FEAT: ILHsT53NKPinfg/p+z1G2E9e3NW+1dB7RwH2dNmSyLeOWs6uypJRtXNlBG2wA /I6CdQIZoskrKIZYMbXeySfBlNz8hdAxVWSUjRCBo7DfqN+Ub/VSRedjSlD6nLz5yO1y5a/ HwlgRg2/MoS/24bb/YC8DvSic3wZnyhv8vuOb1GqOSs0WdPGEI2eLpYUKv1aGz8fijQFrEf t7h2jhB3Tc1fgibtbhwVRaH77xdLyJp56TDtFjwEW2oZoljGQ60sSyqDzIy0OGCrh43MFAv HY6Fp6yPqHah9ttcOpzXDDybuQWBRi4PO1oBI0cW/by4qPInn8llp1TMuvIWwAI1syuYuTd Dslbs70oKZgjG98qSopv4a2hsyICQ+NkVMaZYc1b96he8B185Is4pqUv5q4xA== X-QQ-GoodBg: 0 X-BIZMAIL-ID: 14415695682620573037 From: Yuan Tan To: philmd@linaro.org Cc: tsbogend@alpha.franken.de, 42.hyeyoo@gmail.com, linux-mips@vger.kernel.org, christophe.leroy@csgroup.eu, linux-kernel@vger.kernel.org, falcon@tinylab.org, w@1wt.eu, linux@weissschuh.net, tanyuan@tinylab.org Subject: [PATCH v4 1/2] MIPS: Cleanup malta_defconfig Date: Sat, 16 Sep 2023 20:07:27 +0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrgz:qybglogicsvrgz5a-1 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Use 'make savedefconfig' to cleanup malta_defconfig. Suggested-by: Philippe Mathieu-Daudé Suggested-by: Christophe Leroy Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Yuan Tan --- arch/mips/configs/malta_defconfig | 39 +++++++------------------------ 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index ae1a7793e810..7ae07d57b79a 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig @@ -6,18 +6,17 @@ CONFIG_NAMESPACES=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y CONFIG_EXPERT=y -# CONFIG_COMPAT_BRK is not set CONFIG_MIPS_MALTA=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPU_MIPS32_R2=y CONFIG_PAGE_SIZE_16KB=y CONFIG_NR_CPUS=8 CONFIG_HZ_100=y -CONFIG_PCI=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y +# CONFIG_COMPAT_BRK is not set CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -133,19 +132,6 @@ CONFIG_IP_NF_RAW=m CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -177,7 +163,6 @@ CONFIG_IPDDP=m CONFIG_IPDDP_ENCAP=y CONFIG_PHONET=m CONFIG_NET_SCHED=y -CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_PRIO=m @@ -186,16 +171,12 @@ CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_TEQL=m CONFIG_NET_SCH_TBF=m CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_ACT=y CONFIG_NET_ACT_POLICE=y @@ -211,6 +192,7 @@ CONFIG_CFG80211=m CONFIG_MAC80211=m CONFIG_MAC80211_MESH=y CONFIG_RFKILL=m +CONFIG_PCI=y CONFIG_DEVTMPFS=y CONFIG_CONNECTOR=m CONFIG_MTD=y @@ -220,7 +202,6 @@ CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_CFI_STAA=y -CONFIG_MTD_PHYSMAP_OF=y CONFIG_MTD_UBI=m CONFIG_MTD_UBI_GLUEBI=m CONFIG_BLK_DEV_FD=m @@ -396,20 +377,16 @@ CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_CRYPTO_CRYPTD=m -CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_XCBC=m From patchwork Sat Sep 16 12:07:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yuan Tan X-Patchwork-Id: 13388351 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81798CD37BB for ; Sat, 16 Sep 2023 12:08:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236593AbjIPMIU (ORCPT ); Sat, 16 Sep 2023 08:08:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238089AbjIPMII (ORCPT ); Sat, 16 Sep 2023 08:08:08 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.155.65.254]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DBE6CED; Sat, 16 Sep 2023 05:08:02 -0700 (PDT) X-QQ-mid: bizesmtp91t1694866064t8l0a72a Received: from main2-ubuntu.tail147f4.ts.net ( [202.201.15.117]) by bizesmtp.qq.com (ESMTP) with id ; Sat, 16 Sep 2023 20:07:41 +0800 (CST) X-QQ-SSF: 00200000000000907000000A0000000 X-QQ-FEAT: znfcQSa1hKbOWPpeocnk9p3hBnV5lSgG39wRYFvZp0ZJo2u0QcBtKK5FxZqXs CLQ8iul5Q9g8SR3Wml2ccUAdeART+ZB6BgDiABmmbknJBW9jgGQvf1u1llhBm1sk28dH5h4 OyqWYbVqmE6AVz8vNsyKjU6+4LWQ/6ab6V6fhvIzfpKglzNnxxGbNDxEp8s16rdGTPKljvT eh8TdwkkN97uLINi0GmdeSD6mY6QP/RUPid/jGolVosHsxBnee4s5SpI5aFZz4awZnhMwUr MQB9cSoDmAIO7mbIdvg1HBW/Kp2snNj5ZOdNr7hgNXRmQVRAjs9q6/v1XqV6NzMRZk2o2q1 gIW+mola5Ket6yGL/PuDcjhqJQ/K1nxsk/RXKYNV4Prdoo9nL8= X-QQ-GoodBg: 0 X-BIZMAIL-ID: 14865914680998969880 From: Yuan Tan To: philmd@linaro.org Cc: tsbogend@alpha.franken.de, 42.hyeyoo@gmail.com, linux-mips@vger.kernel.org, christophe.leroy@csgroup.eu, linux-kernel@vger.kernel.org, falcon@tinylab.org, w@1wt.eu, linux@weissschuh.net, tanyuan@tinylab.org Subject: [PATCH v4 2/2] Kconfig: add dependencies of POWER_RESET for mips malta Date: Sat, 16 Sep 2023 20:07:40 +0800 Message-Id: <413b332868bac086c32b7486a7cb9c6fc81c15c0.1694865711.git.tanyuan@tinylab.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrgz:qybglogicsvrgz5a-1 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org MIPS Malta's power off depends on PCI, PCI_QUIRKS, and POWER_RESET_PIIX4_POWEROFF to work. Enable them when POWER_RESET is set for convenience. Then regenerate malta_defconfig with 'make savedefconfig'. Suggested-by: Philippe Mathieu-Daudé Suggested-by: Christophe Leroy Suggested-by: Zhangjin Wu Signed-off-by: Yuan Tan Reviewed-by: Philippe Mathieu-Daudé --- arch/mips/Kconfig | 3 +++ arch/mips/configs/malta_defconfig | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index fc6fba925aea..b63a93e39f23 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -547,6 +547,9 @@ config MIPS_MALTA select MIPS_L1_CACHE_SHIFT_6 select MIPS_MSC select PCI_GT64XXX_PCI0 + select PCI if POWER_RESET + select PCI_QUIRKS if POWER_RESET + select POWER_RESET_PIIX4_POWEROFF if POWER_RESET select SMP_UP if SMP select SWAP_IO_SPACE select SYS_HAS_CPU_MIPS32_R1 diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 7ae07d57b79a..99049e993192 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig @@ -192,7 +192,6 @@ CONFIG_CFG80211=m CONFIG_MAC80211=m CONFIG_MAC80211_MESH=y CONFIG_RFKILL=m -CONFIG_PCI=y CONFIG_DEVTMPFS=y CONFIG_CONNECTOR=m CONFIG_MTD=y @@ -284,7 +283,6 @@ CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_POWER_RESET=y -CONFIG_POWER_RESET_PIIX4_POWEROFF=y CONFIG_POWER_RESET_SYSCON=y # CONFIG_HWMON is not set CONFIG_FB=y