From patchwork Tue Sep 1 12:12:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 11748017 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5E4EF13B6 for ; Tue, 1 Sep 2020 12:12:57 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3594F206EB for ; Tue, 1 Sep 2020 12:12:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="2JSifEBF"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="tFGpbEeR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3594F206EB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ewkVVVDjhGE7kf1rXw8pJBLUT0b2i6mzPaxmp33n3js=; b=2JSifEBFggI1vDWSiKRU8d/7r 2tus6AaON1r5no28Rvcds0oNV+lq1QNxAJOyhK77I2jTF2iseD986GtZGW5YLaZQ+YJylO6TgYV5v KT27tmbxk2LzWemnWNeaJLGB7OuXdnvI+dR4ZgYJ0IVkZ0rfEOH6jaQmRilAuCw5a+SyJm1ep7Y5j UQBi53pD3lRiNmMOWMjbV4TdlKXTnmj4Q1wILyqBS783DeUn+aF+D2gVa+ln3OrZ8Y3eDYfoIOrOb wbCjf6w0eHkDdJOXvEzm5mh+klN5xCXyqmmVKY+Fp5llaHNycOI24YhgPQr411QNMh8CEYnlYOvI0 6p/7iel0A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kD59V-0001eq-UE; Tue, 01 Sep 2020 12:12:41 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kD59S-0001eA-OM for linux-arm-kernel@lists.infradead.org; Tue, 01 Sep 2020 12:12:39 +0000 Received: by mail-lj1-x243.google.com with SMTP id h19so1173906ljg.13 for ; Tue, 01 Sep 2020 05:12:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KcabfpNUbz/94m2beE+mIi0sXiS5hWouLrlZQW6A0Y8=; b=tFGpbEeRPaD/7SAstAub6FEw+WEvnVTGkhEeyL6nCREb3OqTlxa9EvlkGGqsAuSD0I oaav8ujwDhRA3r023cxpDaTEsOiA307jLZL1B/hmJshz5Sl+0/ZSWx6W1UHRpaT4eIPb +O6tEgWgTWdUmwNsGAyCtd4sGtsCKjOoVlRfrhXEXp0MfPp0GN1FSmiQI2z+ZuyYLXPD NP7dGfwJwvLsn6pzlvFtQNHojbjzO0NR7NFOU0QcjlDtii3Xy3I7ZTg4whZBzCrEyl9V Y3z42lmtIqv9N9lny3HUry9lBuqN1V9VCzWSsQE4my9nTlfPAMi6ZjqUqKMot5jkw5EB P7zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KcabfpNUbz/94m2beE+mIi0sXiS5hWouLrlZQW6A0Y8=; b=JPPf4nkZOqOFazxK7wuGCtTQ95T1jEK+dkQab+LHobQwtR48cOnuEkMpm6JliOVqi4 kyhqOSkrj4IxibkfdaTj2XF50+wjm78t6BLEO44a1rUgeujj84GVS5qRjwDOfwzy6Gv+ mYHNUW2AcSqn4oCOjuYR3nkxXJG8t0/GQVJ74YmUhVvc/Dwb5RQLL9ziYzf4oqG26dOe rJAzlEEJKRzkohpzWT4F3Dj3F9alTQ26qXw7OI7gKn8wXazv5hogFSfMdOYgqAHWenO5 jkX0VWoOcjdnyaoF5zCKTuK1HhE9ND6YCQ2DdGK6uhyzs1GBLdc9RIZlA9uyVZZxRWd0 NGmA== X-Gm-Message-State: AOAM532jXA0hurHz9Q0moFfVLMt1aJEdU9JI+dAUx7bciypswP8r7iHs b9fwJh609C2T20yKTxGpJgVbwQ== X-Google-Smtp-Source: ABdhPJwSUvot8vq5xYnb2+1JuH6uVSjJsEVhPQ3s0aSQUvNrkB6VE+cTn0rhlDdWzXfSBxy7OGrMqg== X-Received: by 2002:a2e:89d9:: with SMTP id c25mr465597ljk.46.1598962357475; Tue, 01 Sep 2020 05:12:37 -0700 (PDT) Received: from localhost.localdomain (h-98-128-180-79.NA.cust.bahnhof.se. [98.128.180.79]) by smtp.gmail.com with ESMTPSA id u6sm241193ljg.105.2020.09.01.05.12.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 05:12:36 -0700 (PDT) From: Ulf Hansson To: Sudeep Holla , Lorenzo Pieralisi , linux-pm@vger.kernel.org Subject: [PATCH v2 1/2] firmware: psci: Extend psci_set_osi_mode() to allow reset to PC mode Date: Tue, 1 Sep 2020 14:12:25 +0200 Message-Id: <20200901121226.217568-2-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200901121226.217568-1-ulf.hansson@linaro.org> References: <20200901121226.217568-1-ulf.hansson@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200901_081238_803676_DAE14EDA X-CRM114-Status: GOOD ( 15.99 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:243 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Ulf Hansson , Vincent Guittot , Benjamin Gaignard , Stephen Boyd , Daniel Lezcano , "Rafael J . Wysocki" , Lina Iyer , Bjorn Andersson , linux-arm-kernel@lists.infradead.org, Lukasz Luba Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The current user (cpuidle-psci) of psci_set_osi_mode() only needs to enable the PSCI OSI mode. Although, as subsequent changes shows, there is a need to be able to reset back into the PSCI PC mode. Therefore, let's extend psci_set_osi_mode() to take a bool as in-parameter, to let the user indicate whether to enable OSI or to switch back to PC mode. Signed-off-by: Ulf Hansson Reviewed-by: Sudeep Holla --- drivers/cpuidle/cpuidle-psci-domain.c | 2 +- drivers/firmware/psci/psci.c | 12 +++++++----- include/linux/psci.h | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/cpuidle/cpuidle-psci-domain.c b/drivers/cpuidle/cpuidle-psci-domain.c index b6e9649ab0da..b6ab0415f450 100644 --- a/drivers/cpuidle/cpuidle-psci-domain.c +++ b/drivers/cpuidle/cpuidle-psci-domain.c @@ -278,7 +278,7 @@ static int psci_cpuidle_domain_probe(struct platform_device *pdev) goto remove_pd; /* Try to enable OSI mode. */ - ret = psci_set_osi_mode(); + ret = psci_set_osi_mode(true); if (ret) { pr_warn("failed to enable OSI mode: %d\n", ret); psci_pd_remove_topology(np); diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index 92013ecc2d9e..00af99b6f97c 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -151,12 +151,15 @@ static u32 psci_get_version(void) return invoke_psci_fn(PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0); } -int psci_set_osi_mode(void) +int psci_set_osi_mode(bool enable) { + unsigned long suspend_mode; int err; - err = invoke_psci_fn(PSCI_1_0_FN_SET_SUSPEND_MODE, - PSCI_1_0_SUSPEND_MODE_OSI, 0, 0); + suspend_mode = enable ? PSCI_1_0_SUSPEND_MODE_OSI : + PSCI_1_0_SUSPEND_MODE_PC; + + err = invoke_psci_fn(PSCI_1_0_FN_SET_SUSPEND_MODE, suspend_mode, 0, 0); return psci_to_linux_errno(err); } @@ -546,8 +549,7 @@ static int __init psci_1_0_init(struct device_node *np) pr_info("OSI mode supported.\n"); /* Default to PC mode. */ - invoke_psci_fn(PSCI_1_0_FN_SET_SUSPEND_MODE, - PSCI_1_0_SUSPEND_MODE_PC, 0, 0); + psci_set_osi_mode(false); } return 0; diff --git a/include/linux/psci.h b/include/linux/psci.h index 14ad9b9ebcd6..2a1bfb890e58 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -18,7 +18,7 @@ bool psci_tos_resident_on(int cpu); int psci_cpu_suspend_enter(u32 state); bool psci_power_state_is_valid(u32 state); -int psci_set_osi_mode(void); +int psci_set_osi_mode(bool enable); bool psci_has_osi_support(void); struct psci_operations {