From patchwork Wed Aug 2 11:12:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 129813 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp414947vqx; Wed, 2 Aug 2023 05:21:59 -0700 (PDT) X-Google-Smtp-Source: APBJJlHtNyfyT2lMa5bz9TQAblR6FXJcq7+q9ZOgk/Cps268lRLEcHz/nGWbDJpmPO0TcfDnGHj5 X-Received: by 2002:a17:906:32cd:b0:99b:e5c3:2e55 with SMTP id k13-20020a17090632cd00b0099be5c32e55mr4871292ejk.38.1690978919550; Wed, 02 Aug 2023 05:21:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690978919; cv=none; d=google.com; s=arc-20160816; b=Qm3f9Gos/OG+tcjHiZw9T5yN4KqPcvQ+0RcPuXdhGtaakD4wPGbq97GUGpVAJbFSf/ GskqYNO96Zu9OD/aj5P1jM+9Q7zQGtVqxYSuMAafOZgGpkhAjC88ZuimrfFwkKoVC8/h EQ0LpZ/VCRvh9wW086O9DYEXW34N74w4sRybk1PKj+48857NMgHVWendIHyDI/NP2eQH ec80O8LDuViA8Cbn5/Cn5xoJwmUp9E8gXMfPkYf1c4f0KV/gFNgdKCTLdz9BIrGvNhnu FII7lRkQYpB+evleznsM94rkiUA+hw6flUJ9EI70FXYZI+0KvBiqSarB7fr0YHOhHl6G iKbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5TGixWQIRCfZmaTCRgejuhSIHbAJQbk50pwuCOgDNTM=; fh=EYrKnlMSMqLZbmPIxd2rXJE6zqazJ4+3dklUElpcHMw=; b=yTO1QxuNF6oEBYkQliIWBmJ+bcg7o0cIv6k/A6AVCpeZCm3wBI6kK9Gm5f0ACXFE6n 3rwlMmTSddw7ZRFi18kFIlD5rINgqRrXWP7oWArYeIgrWqk5TrM/fDvriuU4cGd2wNVM 37PiYJP/QOfRQu03F+hQl+sejCLIr/GmQwMI8HA+Jj4x/vnRSzfrfnBMo2AEGn4HIPqk pqpjtpL9FxblwX1HsxmJmHAxsj51imqs8ndG1FP7KLLd7Ea09zrlJ/DHdbv8jztr1v3k YcpbTBZqrIk2Yj2KNTAJqn24Bz3PN4Jef2jrzRJ60Ww/R29Zml36LD+G2nk6hl5y61xC 66uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=gcOWHv7+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t25-20020a1709066bd900b00992fef5cff8si10912466ejs.552.2023.08.02.05.21.35; Wed, 02 Aug 2023 05:21:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=gcOWHv7+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233937AbjHBLOM (ORCPT + 99 others); Wed, 2 Aug 2023 07:14:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233413AbjHBLOB (ORCPT ); Wed, 2 Aug 2023 07:14:01 -0400 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD9382114 for ; Wed, 2 Aug 2023 04:14:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1690974841; x=1722510841; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+upP9bsbQbhCuHLUsyHfsie8k02JT+wkJ/OXUvH+dCU=; b=gcOWHv7+ygYl28PCWEJl3c7atCF1zN8t/9qoXSlyb3Fc7ZjWja+YgNep 2Uu1b5qs7/uDGWOCPdheXkpyJyDejplXQ57u6/FBmi+SIl6HOxnXs757n C1c2om1fBepswrkKI2oAicypR9N+41rgZLlU5O2T2NAXgpz8Gf2M0r/7W 4HESq+NEJuB7pS0wlR1+lBsQGeHFErc5+fWLrupA5ruNrpc8v4veYo9Sr 1p+NqwGBrScv5MRZQrqzk0/HkCCrzfeci8g8obakulJOBwoITN2cfwmJB bwEK7rZqt4K7y/r1dprFL+G4Tuo7XPvv5WjRpL/FaFxUs36q0rOZy/qEo A==; X-IronPort-AV: E=Sophos;i="6.01,249,1684825200"; d="scan'208";a="223462648" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 02 Aug 2023 04:14:01 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Wed, 2 Aug 2023 04:13:53 -0700 Received: from wendy.microchip.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.21 via Frontend Transport; Wed, 2 Aug 2023 04:13:50 -0700 From: Conor Dooley To: CC: , , Paul Walmsley , Atish Patra , Anup Patel , Alexandre Ghiti , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Song Shuai , JeeHeng Sia , "Petr Tesarik" , , Subject: [RFT 2/2] Revert "RISC-V: mark hibernation as nonportable" Date: Wed, 2 Aug 2023 12:12:53 +0100 Message-ID: <20230802-chef-throng-d9de8b672a49@wendy> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230802-purse-hydrant-6f44f77364b0@wendy> References: <20230802-purse-hydrant-6f44f77364b0@wendy> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=921; i=conor.dooley@microchip.com; h=from:subject:message-id; bh=+upP9bsbQbhCuHLUsyHfsie8k02JT+wkJ/OXUvH+dCU=; b=owGbwMvMwCFWscWwfUFT0iXG02pJDCmnrIwVuNwC93y7J2XVkK/6/9F8O97lc2RvBM9Z2Hh3YuHx rK2OHaUsDGIcDLJiiiyJt/tapNb/cdnh3PMWZg4rE8gQBi5OAZhI5ktGhomZ9d+dS0QK2WJO3ZFgdt WqPFWSUuq47fa0t5zly3yCaxn+KR3+ObNs0/lPHaUnqg1CpG8tu+WnzOdkF1E/j89m+dYj/AA= X-Developer-Key: i=conor.dooley@microchip.com; a=openpgp; fpr=F9ECA03CF54F12CD01F1655722E2C55B37CF380C X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773119911607554345 X-GMAIL-MSGID: 1773119911607554345 Revert commit ed309ce52218 ("RISC-V: mark hibernation as nonportable") as the kernel now has a way to handle the "no-map"-less, PMP protected, reserved memory nodes for the affected versions of OpenSBI. Signed-off-by: Conor Dooley --- arch/riscv/Kconfig | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 4c07b9189c86..47aef21073f9 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -866,11 +866,8 @@ menu "Power management options" source "kernel/power/Kconfig" -# Hibernation is only possible on systems where the SBI implementation has -# marked its reserved memory as not accessible from, or does not run -# from the same memory as, Linux config ARCH_HIBERNATION_POSSIBLE - def_bool NONPORTABLE + def_bool y config ARCH_HIBERNATION_HEADER def_bool HIBERNATION