From patchwork Thu Apr 12 11:14:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 133260 Delivered-To: patches@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1573970ljb; Thu, 12 Apr 2018 04:15:17 -0700 (PDT) X-Received: by 2002:a19:1f4a:: with SMTP id f71-v6mr5128110lff.12.1523531717590; Thu, 12 Apr 2018 04:15:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523531717; cv=none; d=google.com; s=arc-20160816; b=SyE8eF53Yyg/Q7rTHJxazGo+1edxL5jv9wJNsBALvrnwjJl3j1AEK3RxKxSQIEzhKp 6cJPEjk/2wsSyGnC2c3Z0N6Q1cdouqYvm4uvv2emmtcau1BJTkOaXC8k/G2KOtv7oH4S eOoN8Dx3rcT/vetjGo8l4B0svvFnbPf7QU3e5OPv4pWJY7b/l5XgxVZaE+NduPadHMAy YSAgsrG3ayvoo0toIo5rxNAUhrQ4RdXMojNKW48Or+KBASlqAvBY9YLW0oHErKiwkA61 d/YQ7OXHlogq87qyzUkIZvobEw/yFF802tak6W4H1q2xgqnJ+Xpcnqn/VoaSRpilXNpN XkXA== 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:arc-authentication-results; bh=lZist5inIuwEEJSIxPuSJiISOfPfHnqhezws3XCN9lc=; b=bBHt/mGSJve0RWrDHeEti5a2m/2N7jLE3Y0i35Uk2F1HT6/R2XfMoylW7kklaxH7sv ve3Eqq+p0ROQMrIVR3zsSNxJSEEMNZ0xSQ7o+EaOdB44xD/2NyAYCwdnbfMcw6BtTXNX B+vEy3m7VG6o8c1CaNbA4FJSOLm4pwe5yleBzogNA4YEBdVT+tKr86pJwrTs6Lm/DPTO RqSyEAjswGmOoTT04TAi7PqrENkMh9x6NOgfewPqrfkb35hAD8MXmuqT85J+ID8PhOll 33c0L656vTI4/KDK3e7UPeJ/aWxt4AlIfSr4L5pP5u9CrJ0hSUmPwF9LcXw4hxFzxbGJ XlNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WN9dcA8v; 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 g77-v6sor950256lfl.87.2018.04.12.04.15.17 for (Google Transport Security); Thu, 12 Apr 2018 04:15:17 -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=WN9dcA8v; 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=lZist5inIuwEEJSIxPuSJiISOfPfHnqhezws3XCN9lc=; b=WN9dcA8vguQOooj6w8FPqwlbVFl3avmSvgi73nSPSzIzPMt8tyGkFI0Aiby80guIfU YGdl2aAYZKkJ6NQjpXEKOXtFwGgPwNn3MdrB9os5ALVKnpLGbDKQVwxOO6LS/G7aIWdR VxD1XqQdMweeUzk6WjzD3vsYD/hdI/Dw7HslA= 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=lZist5inIuwEEJSIxPuSJiISOfPfHnqhezws3XCN9lc=; b=SvHVQPE+6WLoR1/5aupSZDyH/6scjJeQ1tOBqMNsXJUVX3jb8QzHVbu9zyOJ9mv0O1 6+oOLrM04Y0xI0+nzRavFlOPtqnNXU6aL2sNDytUJ/nMS/ovbEV0zL0gzqb6oBxeOTRu pliSNIWAU1Q4TLCpx1J04+MRDmv4UT4hkOQ/Xt8aViXtfizhful64QeraYq47EnX2+XX v4XDTN5fX0NUTYz5y3YE4edk/OJI5ZCITXIe3W/uXWPiL5mZmtwg4EbjRWxIgiQ+KolZ NfabkieldkgoV6NulOzIJ8IY5zlaxIBghH0wBA+8vVDSiUc/f3d0QEwV+mhBOGOwWyvn 09lg== X-Gm-Message-State: ALQs6tDeBoUjz8/dP9XwLq6Or9zMVVAN6XwZt5IXjs4Aydnu6N0uFmRA +KjRqj1sZOgbG/o3VLn2z06Cghzr X-Google-Smtp-Source: AIpwx4+C7PjClXuqUwftpnZzR/2DE/kVp24K5WNvnaedGYhtjGzgPg/0lnI2ea4EpLYSZwN/+7h93w== X-Received: by 2002:a19:9c0d:: with SMTP id f13-v6mr5201837lfe.9.1523531717327; Thu, 12 Apr 2018 04:15:17 -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 r29sm543187lje.72.2018.04.12.04.15.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Apr 2018 04:15:16 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Sudeep Holla , Lorenzo Pieralisi , Mark Rutland , linux-pm@vger.kernel.org Cc: Kevin Hilman , Lina Iyer , Lina Iyer , Ulf Hansson , Rob Herring , Daniel Lezcano , Thomas Gleixner , Vincent Guittot , Stephen Boyd , Juri Lelli , Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 22/26] drivers: firmware: psci: Introduce psci_dt_topology_init() Date: Thu, 12 Apr 2018 13:14:27 +0200 Message-Id: <1523531671-27491-23-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523531671-27491-1-git-send-email-ulf.hansson@linaro.org> References: <1523531671-27491-1-git-send-email-ulf.hansson@linaro.org> In case the hierarchical layout is used in DT, we want to initialize the corresponding PM domain topology for the CPUs, by using the generic PM domain (aka genpd) infrastructure. At first glance, it may seem feasible to hook into the existing psci_dt_init() function, although because it's called quite early in the boot sequence, allocating the dynamic data structure for a genpd doesn't work. Therefore, let's export a new init function for PSCI, psci_dt_topology_init(), which the ARM machine code should call from a suitable initcall. Succeeding to initialize the PM domain topology, which means at least one instance of a genpd becomes created, allows us to continue to enable the PSCI OS initiated mode for the platform. If everything turns out fine, let's print a message in log to inform the user about the changed mode. In case of any failures, we stick to the default PSCI Platform Coordinated mode. Moreover, in case the kernel started from a kexec call, let's make sure to explicitly default to this mode during boot, in case the previous kernel changed the mode. Cc: Lina Iyer Co-developed-by: Lina Iyer Signed-off-by: Ulf Hansson --- drivers/firmware/psci/psci.c | 38 +++++++++++++++++++++++++++++++++++++- include/linux/psci.h | 2 ++ 2 files changed, 39 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index 463f78c..80c286d 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -691,9 +691,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"); + /* Make sure we default to PC mode. */ + invoke_psci_fn(PSCI_1_0_FN_SET_SUSPEND_MODE, + PSCI_1_0_SUSPEND_MODE_PC, 0, 0); + } + return 0; } @@ -723,6 +728,37 @@ int __init psci_dt_init(void) return ret; } +int __init psci_dt_topology_init(void) +{ + struct device_node *np; + int ret; + + if (!psci_has_osi_support()) + return 0; + + np = of_find_matching_node_and_match(NULL, psci_of_match, NULL); + if (!np) + return -ENODEV; + + /* Initialize the CPU PM domains based on topology described in DT. */ + ret = psci_dt_init_pm_domains(np); + if (ret <= 0) + goto out; + + /* Enable OSI mode. */ + ret = invoke_psci_fn(PSCI_1_0_FN_SET_SUSPEND_MODE, + PSCI_1_0_SUSPEND_MODE_OSI, 0, 0); + if (ret) { + pr_info("failed to enable OSI mode: %d\n", ret); + goto out; + } + + pr_info("OSI mode enabled.\n"); +out: + of_node_put(np); + return ret; +} + #ifdef CONFIG_ACPI /* * We use PSCI 0.2+ when ACPI is deployed on ARM64 and it's diff --git a/include/linux/psci.h b/include/linux/psci.h index 8b1b3b5..298a044 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -53,8 +53,10 @@ extern struct psci_operations psci_ops; #if defined(CONFIG_ARM_PSCI_FW) int __init psci_dt_init(void); +int __init psci_dt_topology_init(void); #else static inline int psci_dt_init(void) { return 0; } +static inline int psci_dt_topology_init(void) { return 0; } #endif #if defined(CONFIG_ARM_PSCI_FW) && defined(CONFIG_ACPI)