Received: by 10.192.165.156 with SMTP id m28csp1835326imm; Thu, 12 Apr 2018 04:28:25 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+ONTURtL/C/rLxBrEYS1O0s6BYX/BwRhUT4z9PiCsVkuavwE5K3R/neLsx9xE49CnUNg/j X-Received: by 2002:a17:902:3181:: with SMTP id x1-v6mr629339plb.2.1523532505011; Thu, 12 Apr 2018 04:28:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523532504; cv=none; d=google.com; s=arc-20160816; b=OXC5Kx7iKqlUrUimcb3flDOe5fmZ6sEO5qbV0NVwgSlBMb/OY5cCyjQqj1onAXvYeO 4WjKv+ePXBThkbXJn8haa0HGgO4x1AaSCLdbbH2qQyoGvr/ZvbN93x4UxpOeVT8lN4LT MFRtSJG+/b9E7vP2UDhWbfK1oSL6H864hkwNXY3nwrNWtd+6U9DCyuhEJDphsYDpf5Cf BMwgqJkJhsf43BYkRDZOuciKk6Yrn+bJVdsBvmHai4Ay9crITxt8N4iesUp4KWf4UA7g o9alglEPIrdQ4Lu9E/ibtBjROKqfrqZcrO1v7RSUkSrnPFO/N6NZQUpyLbeUusll5jXa 5M3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=1O11apE6tR+MdI607Y0iNJFhJF3NsEpjqwr8dBVhhK4=; b=YFZQ1tYC47Qh63JDiKp/tm9uLFR0XYnoMY6zgkY1c4oaYXyQYqUHdATDhYB8piTkr2 ANPuTiSv6k2KuOaUxil5KqjnN/s3ZxM985+ksc8ZW7VHhPfBXytRuL1n0scShmgWw1BQ 98eerhljwd6Vx4H3usZmf3IFzgvz0v8cEEF9JB/sIQOW1FdtgZOgjOGfuataduY4W8tb 17Pr+jAD8Nxe5T8xAy38F7pW2MaqBRIt6YdguTrj8PNZVKzZ4QVQ8zLr/A0IfbodmA5e XzWaXnwVLDw8Y4ZVSsMHOQJHS10cblAJho6vugTVPYmMZxK4C+CG4BQJOP5K9glw+Rp+ cycw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VZfh+xXH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g8si2072474pgq.544.2018.04.12.04.27.48; Thu, 12 Apr 2018 04:28:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VZfh+xXH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753442AbeDLLUY (ORCPT + 99 others); Thu, 12 Apr 2018 07:20:24 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:36228 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753056AbeDLLOt (ORCPT ); Thu, 12 Apr 2018 07:14:49 -0400 Received: by mail-lf0-f66.google.com with SMTP id d20-v6so7113421lfe.3 for ; Thu, 12 Apr 2018 04:14:47 -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; bh=1O11apE6tR+MdI607Y0iNJFhJF3NsEpjqwr8dBVhhK4=; b=VZfh+xXHn0dlNDSUDSmubXn13syh5V6LnILJj5xoBMJ/neglG7/+/mn9fvW4wv6smD GaAQGwqbZpp5DbQuN8EAyMJ2mmwKk1jj9CSHB3oWVljxA/CyBUDYaUbFyNY7RquYAfbS ofhvnv3WPd8hZTeu+fyV/RljksUMHmJ/9kr3o= 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=1O11apE6tR+MdI607Y0iNJFhJF3NsEpjqwr8dBVhhK4=; b=L9cY6BiFmQwtEA3rtuv3Q9ZBeeIQX5o3whzi/KGdqU6wzYVWqfyU2CtizYRtO/swlA 6xUTYBeqMB4O9MCMig0GSkDuPZgCF1exb219nr8kynHPDtMedJdR/xHFy/B4ro6dvbV2 npwFz4pcra/UOrT0Rg5v1ndlR2OhkjOeql4jRnxBFaawomiOOpdnwwPurTg/OKFS3hp6 lE14ExG3Y0UmvkmtTAZ+REmhO+L7n3/0oJfDrtvawYoSRzm+FmDp3o+g9R8Zitkvv8GQ VudkZ+gmNKBztt37EujOzWFjlGtaYKbazBzl260O2xhu0CALO/gRg72ZXXvofPlBpDus ijmg== X-Gm-Message-State: ALQs6tBCVRaFb6KM0kKPjlQUUTMBQlRZAyZGAJ41I4UYYa0dBQAJhXB+ F/AfLfbawhpjzrv32pWrniaPVQ== X-Received: by 10.46.128.132 with SMTP id i4mr364037ljg.51.1523531687073; Thu, 12 Apr 2018 04:14:47 -0700 (PDT) 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.14.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Apr 2018 04:14:46 -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 05/26] PM / Domains: Add helper functions to attach/detach CPUs to/from genpd Date: Thu, 12 Apr 2018 13:14:10 +0200 Message-Id: <1523531671-27491-6-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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce two new genpd helper functions, of_genpd_attach|detach_cpu(), which takes the CPU-number as an in-parameter. To attach a CPU to a genpd, of_genpd_attach_cpu() starts by fetching the struct device belonging to the CPU. Then it calls genpd_dev_pm_attach(), which via DT tries to hook up the CPU device to its corresponding PM domain. If it succeeds, of_genpd_attach_cpu() continues to prepare/enable runtime PM of the device. To detach a CPU from its PM domain, of_genpd_attach_cpu() reverse the operations made from of_genpd_attach_cpu(). However, first it checks that the CPU device has a valid PM domain pointer assigned, as to make sure it belongs to genpd. Cc: Lina Iyer Co-developed-by: Lina Iyer Signed-off-by: Ulf Hansson --- drivers/base/power/domain.c | 67 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/pm_domain.h | 9 ++++++ 2 files changed, 76 insertions(+) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index e178521..91ea9b2 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -2324,6 +2324,73 @@ int genpd_dev_pm_attach(struct device *dev) } EXPORT_SYMBOL_GPL(genpd_dev_pm_attach); +/** + * of_genpd_attach_cpu() - Attach a CPU to its PM domain + * @cpu: The CPU to be attached. + * + * Try to find the corresponding PM domain provider for the CPU's device. Use + * it to attach the CPU's device to its PM domain. If attaching is completed + * successfully, we enable runtime PM for the CPU's device. + * + * Returns zero on success else a negative error code. + */ +int of_genpd_attach_cpu(int cpu) +{ + struct device *dev = get_cpu_device(cpu); + int ret; + + if (!dev) { + pr_warn("genpd: no dev for cpu%d\n", cpu); + return -ENODEV; + } + + ret = genpd_dev_pm_attach(dev); + if (ret) { + dev_warn(dev, "genpd: attach cpu failed %d\n", ret); + return ret; + } + + pm_runtime_irq_safe(dev); + pm_runtime_get_noresume(dev); + pm_runtime_set_active(dev); + pm_runtime_enable(dev); + + dev_info(dev, "genpd: attached cpu\n"); + return 0; +} +EXPORT_SYMBOL(of_genpd_attach_cpu); + +/** + * of_genpd_detach_cpu() - Detach a CPU from its PM domain + * @cpu: The CPU to be detached. + * + * Detach the CPU's device from its corresponding PM domain. If detaching is + * completed successfully, disable runtime PM and restore the runtime PM usage + * count for the CPU's device. + */ +void of_genpd_detach_cpu(int cpu) +{ + struct device *dev = get_cpu_device(cpu); + + if (!dev) { + pr_warn("genpd: no dev for cpu%d\n", cpu); + return; + } + + /* Check that the device is attached to a genpd. */ + if (!(dev->pm_domain && dev->pm_domain->detach == genpd_dev_pm_detach)) + return; + + genpd_dev_pm_detach(dev, true); + + pm_runtime_disable(dev); + pm_runtime_put_noidle(dev); + pm_runtime_reinit(dev); + + dev_info(dev, "genpd: detached cpu\n"); +} +EXPORT_SYMBOL(of_genpd_detach_cpu); + static const struct of_device_id idle_state_match[] = { { .compatible = "domain-idle-state", }, { } diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 29ab00c..ccd7c94 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -249,6 +249,8 @@ extern int of_genpd_parse_idle_states(struct device_node *dn, struct genpd_power_state **states, int *n); int genpd_dev_pm_attach(struct device *dev); +int of_genpd_attach_cpu(int cpu); +void of_genpd_detach_cpu(int cpu); #else /* !CONFIG_PM_GENERIC_DOMAINS_OF */ static inline int of_genpd_add_provider_simple(struct device_node *np, struct generic_pm_domain *genpd) @@ -287,6 +289,13 @@ static inline int genpd_dev_pm_attach(struct device *dev) return -ENODEV; } +static inline int of_genpd_attach_cpu(int cpu) +{ + return -ENODEV; +} + +static inline void of_genpd_detach_cpu(int cpu) {} + static inline struct generic_pm_domain *of_genpd_remove_last(struct device_node *np) { -- 2.7.4