From patchwork Wed Jun 20 17:22:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 139390 Delivered-To: patches@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1051048lji; Wed, 20 Jun 2018 10:23:15 -0700 (PDT) X-Received: by 2002:a2e:905a:: with SMTP id n26-v6mr14408078ljg.33.1529515395703; Wed, 20 Jun 2018 10:23:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529515395; cv=none; d=google.com; s=arc-20160816; b=rnmxa+aJvDpdYvJrQmvPn+6Ne+/K5hftRAQVcHPvWQO+xB8E039NWjrsxBU1rer8lw ovG0Jw/mnGA/wCI5ZNgJftU6tP1ErBuelsFpO58zWyI6ja0VxEWHQvAVfeRkxFT0Pf7c L3EpfIscay3UcHfL9a0daNRzRP9mNIilDfmhluDFs9nL6akmBqUm/9BITcdd906bwghp t5M0Y2NsUhfVAOBX8Aaqs8kuZB80ZnJJx59wSx8aqftuc1D8u77xf5zgDNlGPbSaX4hB zTcaISmENWnjaGVU9PzNpqvUFKnguJ7rHr/NoPl4P3aznEZzgU5jUb9fVh0ln7nuSLaK h4bA== 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=obVnlFJdxsGUIrbcYFsNPcmvDAVODyR1tm0m+FESLs4=; b=quqmizTkaOl5UsT/EnOs4frbwlmVike0gdkJfrw3OKTzvrrI5sS3BY6YWLh/njmIwN ggpD79Umb0XxKpri5PopMeLLIxwtYysQe9eqPr9Oe0C2OfwL/oLw5WKXLXGCPHmJ5R4U r9b/tBua71fJlaYO7n8jmU/eZSr4hxfsiD2c1/4mrlQ4t7GniZEdDlQ5WVwFUcfocL+/ zqdX/MSXoICg6hrfiy7hRndeL4GSvvevG7LPLXr7BR0E6TyHRqXrQ/a0UVCKQopuzwZx /8EaZf47z+kF5SCM7ipPnO5bFLulMsiaAAG6uIEed6Dcw0+7QnLT9J9vwl3MkltrcYBT 1jJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AnCYg2NX; 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 t9-v6sor739638ljh.51.2018.06.20.10.23.15 for (Google Transport Security); Wed, 20 Jun 2018 10:23:15 -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=AnCYg2NX; 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=obVnlFJdxsGUIrbcYFsNPcmvDAVODyR1tm0m+FESLs4=; b=AnCYg2NXxTXPOMS3NLdA54taBopJhCvN4sAF0xjh3TeRtV28/1UJ5iN37Mx8z8MtQ+ Sd03v3uXI+8MfdqapNB1+BCvfPIiOAB9CYEYGOdXpOlm9d0aJUQE6uKIxBvvT3TqWJPX y9oI25toX9WaZ3/Z2AaDFlQONWJ5W8lKApHQA= 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=obVnlFJdxsGUIrbcYFsNPcmvDAVODyR1tm0m+FESLs4=; b=hB6t+DFlRgh4y1J12fiuuXth5V7zoZ3CAGC88hVjaxxEYuCJBMN/PbKEAHhYny3Uz+ SvsPS4ahVMDoNADFaJWAHtp1f93U5Mt6D4R9s9FhrmLqICWvS6v7Rfdn2ksekkHxt8CO 9RU/Z+fVcQLyY5CSfdH3BnpNHWg0XjCSmHZeZ2Y6VRixjCcUo2umUxvdHvDtsuOJZur/ eVyC0kFUQqA6JW9MghYixIdjh/DtRaZBqRIjogK3h/GnCIpBml7rio/I5WlaCSTYL8tV MmZPsFCX9HBNtQjw4e8MUamaJwHrgrURaqzpEoPr9BtAiZwPNDkpM1m7Nta6ceFy8rO8 q7aw== X-Gm-Message-State: APt69E2xRp8YkVLCHI37+ZMvv/5S+oiuYtc2vetzvRWIFHMF79e4f4CQ 72Sr3Qek8YnR6sDRxylEqcGAJhIp X-Google-Smtp-Source: ADUXVKKP3XsV0AqKdjZqk5wC3TpY+18fzUVAsruGPiCBE3ius4Z6oJKYgOGVAhcSursIh5yCF97r/Q== X-Received: by 2002:a2e:750d:: with SMTP id q13-v6mr14484271ljc.56.1529515395487; Wed, 20 Jun 2018 10:23:15 -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 b2-v6sm514441lji.85.2018.06.20.10.23.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Jun 2018 10:23:14 -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 v8 22/26] drivers: firmware: psci: Introduce psci_dt_topology_init() Date: Wed, 20 Jun 2018 19:22:22 +0200 Message-Id: <20180620172226.15012-23-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180620172226.15012-1-ulf.hansson@linaro.org> References: <20180620172226.15012-1-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.17.1 diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index 463f78cda3be..80c286d83369 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 8b1b3b5935ab..298a044407f0 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)