From patchwork Tue Oct 29 16:44:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 178034 Delivered-To: patches@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp51780ill; Tue, 29 Oct 2019 09:44:48 -0700 (PDT) X-Received: by 2002:a19:f811:: with SMTP id a17mr3064991lff.132.1572367488880; Tue, 29 Oct 2019 09:44:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572367488; cv=none; d=google.com; s=arc-20160816; b=IWGkcQDILbYQPQ9B/pv+gdZco0DOf6NQR24C9Ai8I/rcNeMFHeAF3+r5TTD+mvxDx2 2yI4txKHTDiMji/7jeC8sEbHoOGwxWMam5k5RZdIoinx6oVG9Nyw+37yhfKXQUZF2IVG ExBngTQnu71f/d28fbCLz8WHHkElhQTOnRkWYjtqHlrUH0qKA4M+AP3ljO6Gh7NolQ8r yhSoJ0WwFERMUrJWv+x4tBIxh36B/nluyAHtMrp0AMNfPyusW+1HGcSTxkL6cF/v3fRQ JQen5Tx7J8Z4QshRizxi9PKRxBf5+qKUQGZXw981s6diLffotT5VhQ2NjQpI+7Hgte/5 YU3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pxj7KLSW5R2axCiapc3eou/vjW6LvEtO3EFuHvUy+4g=; b=nhF7B3cWFYJuvrdw7ZlW2IETvQjIF9m80RRe9E0LCUDxRg9OaUBLjnFMQm88I7U/LF cZw9/uj8EaSh8DzpFpbOVsXWvK+FDlNyViItnfo6Pp/8fjptNQYygm51BUcN0cRKRQx3 0ammqJ/4mgl5cq3WxzAzg5Ev2fdOuRvpxvELSpleQJUNk+guxhBWR4e7lP/ggVyF6tsk By4Qr/1b6dEWkzn9KvObeLrbWIKiyOleVpJmp66gTzTnawa5p8a72Eko6X4xT4lP/8A+ Y8LlbPP0Ffw8LFFUD/pLBlmCdx1vIUPR0DUmk5qNpzFsVQjovbObW9MJJuEWKjcop4cH cZ1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YplOBV9M; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id w14sor8263026ljw.48.2019.10.29.09.44.48 for (Google Transport Security); Tue, 29 Oct 2019 09:44:48 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YplOBV9M; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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; bh=pxj7KLSW5R2axCiapc3eou/vjW6LvEtO3EFuHvUy+4g=; b=YplOBV9MJp6EqG3mBNIF6X+EXkSFeG7T2VIHeODHEiXdaWz4zntnkKVjKaEGbI0f7R G1A3ZryFYT2UlYqsMdN/gzyqvvBDLriCWS/mNDFxaZwYrOCO8d6H6+BjlQyw+EnzsiWW u+Ypmf3mJBfP68rmHWB+MHCs+KuSiKH0I1wHy/mK+sLeXog+tuKsTV2PQoDIY/2AnrO5 B2PRaJLBliCJARdr2V0NbAM0At2TTYQL3cAjEAOv3MHVMQNlBsqKv8UE+wFZQWsnqRyk +O8j5iezP2XmZtk9vE+QNwVVh83h+umuALjKvcTgvqsVMruxhWmQ07eIhO0QU2DJaODO sU7Q== 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; bh=pxj7KLSW5R2axCiapc3eou/vjW6LvEtO3EFuHvUy+4g=; b=KcCt1feLaJRP/+0BDozohOc8X9ti3wnzG2Cq2+yoPbBxf9orVaF6LQGwwJoF5Dcefr lqDW9GKvCE44xr6G8WPrM4wkDjka9kpvFxR8AbL0ZdlJ/qiQjUxTITbRy1u7TQ8iFwBL rXQH60EFIf9zsc9X0E+eln7pXjHun1RxxuuWATQiEp7FoFTi2ERpbCk49hoA/WPTwJFT m2ZTymVsJP3m1rIJFS0h8OFkIoZlCS1kKcZDbrKYtOQjCV+HrIEE4jH8uozo4eMQ/3jT Obq/Ps2bBOuYCOu2dbvu51R2Aawv9e3TS04glVO6HQ8eCUiPX1va0sC+lqpgWN4Nfxt0 kZZQ== X-Gm-Message-State: APjAAAV3KfBjZbPg0pyNwQSSVwMilUr6TinJpqptU0SHXvrp/NLpiMSd GrEtMMabNjkL5qWsUX66Lq3l12eGZYCySQ== X-Google-Smtp-Source: APXvYqxTjxZNGQL/LqFi3IPfYCjxpsMyLxV8MH634j47PS/Jjpjo1p7lcpDprbECJDfAoIIUSpu45A== X-Received: by 2002:a2e:9d06:: with SMTP id t6mr3391781lji.253.1572367488497; Tue, 29 Oct 2019 09:44:48 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id f28sm2048161lfh.35.2019.10.29.09.44.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Oct 2019 09:44:47 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Daniel Lezcano , Sudeep Holla , Lorenzo Pieralisi , Mark Rutland , Lina Iyer , linux-pm@vger.kernel.org Cc: Rob Herring , Vincent Guittot , Stephen Boyd , Andy Gross , Bjorn Andersson , Kevin Hilman , Ulf Hansson , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v2 03/13] firmware: psci: Export functions to manage the OSI mode Date: Tue, 29 Oct 2019 17:44:28 +0100 Message-Id: <20191029164438.17012-4-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191029164438.17012-1-ulf.hansson@linaro.org> References: <20191029164438.17012-1-ulf.hansson@linaro.org> To allow subsequent changes to implement support for OSI mode through the cpuidle-psci driver, export the existing psci_has_osi_support(). Export also a new function, psci_set_osi_mode(), that allows its caller to enable the OS-initiated CPU-suspend mode in the PSCI FW. To deal with backwards compatibility for a kernel started through a kexec call, default to set the CPU-suspend mode to the Platform Coordinated mode during boot. Signed-off-by: Ulf Hansson Reviewed-by: Sudeep Holla --- Changes in v2: - Added tags. --- drivers/firmware/psci/psci.c | 18 ++++++++++++++++-- include/linux/psci.h | 2 ++ 2 files changed, 18 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index 84f4ff351c62..76f3a991d4d7 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -89,7 +89,7 @@ static inline bool psci_has_ext_power_state(void) PSCI_1_0_FEATURES_CPU_SUSPEND_PF_MASK; } -static inline bool psci_has_osi_support(void) +bool psci_has_osi_support(void) { return psci_cpu_suspend_feature & PSCI_1_0_OS_INITIATED; } @@ -154,6 +154,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 err; + + err = invoke_psci_fn(PSCI_1_0_FN_SET_SUSPEND_MODE, + PSCI_1_0_SUSPEND_MODE_OSI, 0, 0); + return psci_to_linux_errno(err); +} + static int psci_cpu_suspend(u32 state, unsigned long entry_point) { int err; @@ -536,9 +545,14 @@ static int __init psci_1_0_init(struct device_node *np) if (err) return err; - if (psci_has_osi_support()) + if (psci_has_osi_support()) { 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); + } + return 0; } diff --git a/include/linux/psci.h b/include/linux/psci.h index e2bacc6fd2f2..f76b45341adf 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -17,6 +17,8 @@ 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); +bool psci_has_osi_support(void); enum psci_conduit { PSCI_CONDUIT_NONE,