From mboxrd@z Thu Jan 1 00:00:00 1970 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 B6F68C0015E for ; Sun, 16 Jul 2023 20:15:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231624AbjGPUPn (ORCPT ); Sun, 16 Jul 2023 16:15:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231618AbjGPUPm (ORCPT ); Sun, 16 Jul 2023 16:15:42 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F7051B9 for ; Sun, 16 Jul 2023 13:15:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (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 dfw.source.kernel.org (Postfix) with ESMTPS id 0617C60E65 for ; Sun, 16 Jul 2023 20:15:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17308C433C8; Sun, 16 Jul 2023 20:15:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1689538540; bh=3oFi179g+ZxZVreJ5Aqi4NgEacGvnSOGcqeM/j0xf0s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OgErQDphMkdqFyEiufosLeP0FZ2H1x8bu7haElonZHMfWE8ChcVRiLbHbFxOH6sbc PiwNsw5yDpZu8uzuXzHEvzn+vaYtil7A8HgJhTUZtuNqSS8Kyxg29tgtIJ7+NWf61Q qCysNwJCRDFbvzcnr0EV5I6PQMr4OU+2PTj460Ys= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Conor Dooley , JeeHeng Sia , Song Shuai , Palmer Dabbelt , Sasha Levin Subject: [PATCH 6.4 486/800] riscv: hibernation: Remove duplicate call of suspend_restore_csrs Date: Sun, 16 Jul 2023 21:45:39 +0200 Message-ID: <20230716195000.368880265@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230716194949.099592437@linuxfoundation.org> References: <20230716194949.099592437@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Song Shuai [ Upstream commit c6399b893043a5bb634de8677362f96684f1c0c8 ] The suspend_restore_csrs is called in both __hibernate_cpu_resume and the `else` of subsequent swsusp_arch_suspend. Removing the first call makes both suspend_{save,restore}_csrs left in swsusp_arch_suspend for clean code. Fixes: c0317210012e ("RISC-V: Add arch functions to support hibernation/suspend-to-disk") Reviewed-by: Conor Dooley Reviewed-by: JeeHeng Sia Signed-off-by: Song Shuai Link: https://lore.kernel.org/r/20230522025020.285042-1-songshuaishuai@tinylab.org Signed-off-by: Palmer Dabbelt Signed-off-by: Sasha Levin --- arch/riscv/kernel/hibernate-asm.S | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/riscv/kernel/hibernate-asm.S b/arch/riscv/kernel/hibernate-asm.S index effaf5ca5da0e..f3e62e766cb29 100644 --- a/arch/riscv/kernel/hibernate-asm.S +++ b/arch/riscv/kernel/hibernate-asm.S @@ -28,7 +28,6 @@ ENTRY(__hibernate_cpu_resume) REG_L a0, hibernate_cpu_context - suspend_restore_csrs suspend_restore_regs /* Return zero value. */ -- 2.39.2