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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 53C7FC05027 for ; Tue, 14 Feb 2023 22:05:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=60VD34OQB6kCknCEK02NuYc9xDYE/fFJv+FQcPjWTSc=; b=q8XBoWF1gtaHSp fLWW6on0fyhDgbe9OKRl+Z38a/o1YZhBtPHwz7m5FtaSDoeux9+49CXAzPhE6TTdK84tjgumrQ0A2 IAbeqvZKgO1hkox7kEaRBSRdreh3Pud2NmuBaVkx2cM4VBnHAWUp2I+m3c4vJSRJ2FPvQzbpSYDZv 3dXQU+6XiGIEmAEF1hXCdXSHRWVrQIMf7EJvR+wlUCAx9y9c1dBY48AymngG+yKDzf06gvatJlySJ x5sPq1h4AVAhow1YXhoxndreGHAPHVBq6KVi8O1dTsg6YKcxyaJewcg416MI2x9vQYG43/LCGvToz 1afKd23VG63RTRwal7Bg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pS3Po-003jMr-Dw; Tue, 14 Feb 2023 22:04:44 +0000 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pS3Pl-003jLT-6I for linux-arm-kernel@lists.infradead.org; Tue, 14 Feb 2023 22:04:42 +0000 Received: by mail-pl1-x62c.google.com with SMTP id be8so18446259plb.7 for ; Tue, 14 Feb 2023 14:04:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=oV3VgFBLdqdFf0Ea+vkgthoqfBBbr34vGspqoFBdBuY=; b=ci6jB/L5E5M98Nw7Z5xC1J1e0t9D3ayUJF0Fb03GdIxeHHbkym8/PRcs7av+rDcq1Z osJFuYQ8zwoJKUO+5e2xMLXaT6pfQmtI/3I0a2uX6gOH3ZaxXZNdgOJ6QFMBjaWHw3q7 LMeEpIavISB31JJvk35mO0ZCv35C9poV2uiT3Lz92wgCB3GbwXvrmErdjuapg2PLuk0U 8n3bV6OteJRnbhggxEMnlylqFr6RB3kQwSBDYgutxYEkVGijTvXdAFNb1cJpk2BPt2L8 HRFL1nw32Oz854hiCrt7iUQs1iC0DyKo4p2UzdzHuHnDmvHPcs5LMz7/w1UhAGTfrgqM 22NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oV3VgFBLdqdFf0Ea+vkgthoqfBBbr34vGspqoFBdBuY=; b=pI3oHGeBbrjrMVpAm51nBfcmd3FzGoPj+CudtKNee9Ys0xTmq1clbALU3aOWHAmo1n j11RypzJEKhKIvDBiE1evtjDWAYVlc4YPP4DFrQALOlqFT9WKxfxOWhGOkTCGNM/DQ4u /RbGwz/EOGyikjSu3AokN8nkYMfrmjFuO9s+Dnx+Y4IzAPC9HprsYq+e6XXGNw1xK3bD d8i8t62AiyfAX3e91EIf7DH72aT2YtBf+XA7KrgI+OQvVA20UscSNvOFtwA/4O+KQNmz hC9ElUy1k9EQto2S4cCZqWjMafTkwJqhJgnfpg6cWzUH+suQHHFmAVnB1prVJULfLnzJ 3aNw== X-Gm-Message-State: AO0yUKU6yqQzpa/kGQ5tFyOqGiBUndTaUhhRp5spNHAoIszf49FN73u0 mwH9MLdreisttc9u9tCZec8= X-Google-Smtp-Source: AK7set+JFYJC70ppqj6wFSZKns7z/qYnwZw5g3Dtklhm0QZPoVE5Foy6hPNHInIp/4cr3C64xgUXWQ== X-Received: by 2002:a17:90b:4b0b:b0:233:e940:d3f9 with SMTP id lx11-20020a17090b4b0b00b00233e940d3f9mr347227pjb.34.1676412279094; Tue, 14 Feb 2023 14:04:39 -0800 (PST) Received: from kazuki-mac.lan ([2400:4051:ea3:5910::19a]) by smtp.gmail.com with ESMTPSA id e17-20020a17090ab39100b00233e8a83853sm23759pjr.34.2023.02.14.14.04.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Feb 2023 14:04:38 -0800 (PST) From: Kazuki Hashimoto To: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sudeep Holla , "Rafael J. Wysocki" , Daniel Lezcano , Lorenzo Pieralisi , Hector Martin , Sven Peter , Len Brown , Pavel Machek , Kazuki Hashimoto Subject: [PATCH] PM: s2idle: Don't allow s2idle when cpuidle isn't supported Date: Wed, 15 Feb 2023 06:50:03 +0900 Message-Id: <20230214215003.70683-1-kazukih0205@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230214_140441_255211_0534D877 X-CRM114-Status: GOOD ( 12.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org s2idle isn't supported on platforms that don't support cpuidle as of 31a3409065d1 ("cpuidle / sleep: Do sanity checks in cpuidle_enter_freeze() too"), so update the suspend framework to reflect this in order to avoid breakages. Link: https://lore.kernel.org/all/20230204152747.drte4uitljzngdt6@kazuki-mac Fixes: 31a3409065d1 ("cpuidle / sleep: Do sanity checks in cpuidle_enter_freeze() too") Signed-off-by: Kazuki Hashimoto --- kernel/power/suspend.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 3f436282547c..27507ae7c9c9 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -556,6 +556,12 @@ static int enter_state(suspend_state_t state) trace_suspend_resume(TPS("suspend_enter"), state, true); if (state == PM_SUSPEND_TO_IDLE) { + struct cpuidle_device *dev = cpuidle_get_device(); + struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev); + + if (cpuidle_not_available(drv, dev)) + return -EINVAL; + #ifdef CONFIG_PM_DEBUG if (pm_test_level != TEST_NONE && pm_test_level <= TEST_CPUS) { pr_warn("Unsupported test mode for suspend to idle, please choose none/freezer/devices/platform.\n"); -- 2.39.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel