From patchwork Fri Dec 4 18:41:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Strudel X-Patchwork-Id: 338104 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-23.5 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96A51C4167B for ; Fri, 4 Dec 2020 18:43:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7211B22CA1 for ; Fri, 4 Dec 2020 18:43:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730230AbgLDSmv (ORCPT ); Fri, 4 Dec 2020 13:42:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729897AbgLDSmu (ORCPT ); Fri, 4 Dec 2020 13:42:50 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6574C061A53 for ; Fri, 4 Dec 2020 10:42:04 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id z83so8152444ybz.2 for ; Fri, 04 Dec 2020 10:42:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to:cc; bh=qYqdLh2r9ds49rUYM9FZPJyUKuPOU47SmGZigVynXKs=; b=Q2AMV/9A3jFEOq6M9VJy0Oqg82Ibmk8kaxkd0OnHys1ZC5ZmdBThPlK4JUqug5mTS+ KzP6Hn9VvcVEhNwe48pQb8iH8aIfx7ng+R1VZj+3b0VQVEKY6zTxcJlh4tp2BEAa4mqM INlJ2wDN5es7SmaHswQ149yybKCocdj37OmvhUQ2fgQQQMkbvEVbMsdgAOdNw1kNY5vy MX6aJwBMCg4uUg/HvL8KZ4X9F+uYJ4InfuJNUOcWv6LKDvW3WlxGMGkQd7IbR6TRx84f 2T3mQPUMTpC1Y5Fgx+KV0jbJVrEHTqLOe3HaVYGaewfcD6iBdsds2wot5X/e3PBGjdWc gXBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=qYqdLh2r9ds49rUYM9FZPJyUKuPOU47SmGZigVynXKs=; b=Vztmb+jGrF1knwtltnN17UASW8mKswrWowSW095I24La3aoNMXE2FDkKPrZjDPpRVe R+HHYTIWKc+VEfDr5+GqbMDQN8OES5vKFND/eYSGpoIY83cXfvskqUn0yCCZDrQwbP9F Cd9VLMrgBd6hv9NlIkoWDQjRL9QP9NZSxFtsPNua8NRjnDozFKaPK89z2TRLQ9E8phqB WKLbv3gusqWDaf8CvjAIRgx2IH21xLiMQ8k3llmJtSJ4yikd+ymVm48O/aBaMCryFnVw GnnegiY6DFukLGaA6QhulYeG8XQQRxZls4ppDO1SOX4ofSt4WjN1utRUvi5v1CptHjis AcKQ== X-Gm-Message-State: AOAM531UwFKvkiZYDj9DKWQg+GMGdmY8fKQ/AkuVkRvw0jk0DNsOHGKw Im9PcYeNyLkbnZ0KTxMmxpN6SRTdHkN9sg== X-Google-Smtp-Source: ABdhPJzaFMRnjSfkArW15w0TJtc/X1de0v4Zw7VW53oAoljTA9N9aKVmkT12EP9Tlg2JvL0CvkFvdl/o6XTL3g== Sender: "tstrudel via sendgmr" X-Received: from legoland2.mtv.corp.google.com ([2620:15c:211:1:7220:84ff:fe09:fd20]) (user=tstrudel job=sendgmr) by 2002:a25:e758:: with SMTP id e85mr7814924ybh.51.1607107323941; Fri, 04 Dec 2020 10:42:03 -0800 (PST) Date: Fri, 4 Dec 2020 10:41:59 -0800 Message-Id: <20201204184159.4043159-1-tstrudel@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.29.2.576.ga3fc446d84-goog Subject: [PATCH v2] PM: domains: create debugfs nodes when adding power domains From: Thierry Strudel To: "Rafael J. Wysocki" , Kevin Hilman , Ulf Hansson Cc: Greg Kroah-Hartman , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Thierry Strudel Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org debugfs nodes were created in genpd_debug_init alled in late_initcall preventing power domains registered though loadable modules to have a debugfs entry. Create/remove debugfs nodes when the power domain is added/removed to/from the internal gpd_list. Signed-off-by: Thierry Strudel Reported-by: kernel test robot --- v2: fix forward declaration and genpd_debugfs_dir being NULL - Ulf drivers/base/power/domain.c | 83 ++++++++++++++++++++++++------------- 1 file changed, 55 insertions(+), 28 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 743268996336..3e40ef5cd9ab 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -24,6 +24,16 @@ #include "power.h" +#ifdef CONFIG_DEBUG_FS +#include +#include +#include +#include 4 +#include +#include +static struct dentry *genpd_debugfs_dir; +#endif + #define GENPD_RETRY_MAX_MS 250 /* Approximate */ #define GENPD_DEV_CALLBACK(genpd, type, callback, dev) \ @@ -1880,6 +1890,21 @@ static void genpd_lock_init(struct generic_pm_domain *genpd) } } +#ifdef CONFIG_DEBUG_FS +static void genpd_debug_add(struct generic_pm_domain *genpd); + +static void genpd_debug_remove(struct generic_pm_domain *genpd) +{ + struct dentry *d; + + d = debugfs_lookup(genpd->name, genpd_debugfs_dir); + debugfs_remove(d); +} +#else +static void genpd_debug_add(struct generic_pm_domain *genpd) {} +static void genpd_debug_remove(struct generic_pm_domain *genpd) {} +#endif + /** * pm_genpd_init - Initialize a generic I/O PM domain object. * @genpd: PM domain object to initialize. @@ -1954,6 +1979,7 @@ int pm_genpd_init(struct generic_pm_domain *genpd, mutex_lock(&gpd_list_lock); list_add(&genpd->gpd_list_node, &gpd_list); + genpd_debug_add(genpd); mutex_unlock(&gpd_list_lock); return 0; @@ -1987,6 +2013,7 @@ static int genpd_remove(struct generic_pm_domain *genpd) kfree(link); } + genpd_debug_remove(genpd); list_del(&genpd->gpd_list_node); genpd_unlock(genpd); cancel_work_sync(&genpd->power_off_work); @@ -2893,14 +2920,6 @@ core_initcall(genpd_bus_init); /*** debugfs support ***/ #ifdef CONFIG_DEBUG_FS -#include -#include -#include -#include -#include -#include -static struct dentry *genpd_debugfs_dir; - /* * TODO: This function is a slightly modified version of rtpm_status_show * from sysfs.c, so generalize it. @@ -3177,9 +3196,34 @@ DEFINE_SHOW_ATTRIBUTE(total_idle_time); DEFINE_SHOW_ATTRIBUTE(devices); DEFINE_SHOW_ATTRIBUTE(perf_state); -static int __init genpd_debug_init(void) +static void genpd_debug_add(struct generic_pm_domain *genpd) { struct dentry *d; + + if (!genpd_debugfs_dir) + return; + + d = debugfs_create_dir(genpd->name, genpd_debugfs_dir); + + debugfs_create_file("current_state", 0444, + d, genpd, &status_fops); + debugfs_create_file("sub_domains", 0444, + d, genpd, &sub_domains_fops); + debugfs_create_file("idle_states", 0444, + d, genpd, &idle_states_fops); + debugfs_create_file("active_time", 0444, + d, genpd, &active_time_fops); + debugfs_create_file("total_idle_time", 0444, + d, genpd, &total_idle_time_fops); + debugfs_create_file("devices", 0444, + d, genpd, &devices_fops); + if (genpd->set_performance_state) + debugfs_create_file("perf_state", 0444, + d, genpd, &perf_state_fops); +} + +static int __init genpd_debug_init(void) +{ struct generic_pm_domain *genpd; genpd_debugfs_dir = debugfs_create_dir("pm_genpd", NULL); @@ -3187,25 +3231,8 @@ static int __init genpd_debug_init(void) debugfs_create_file("pm_genpd_summary", S_IRUGO, genpd_debugfs_dir, NULL, &summary_fops); - list_for_each_entry(genpd, &gpd_list, gpd_list_node) { - d = debugfs_create_dir(genpd->name, genpd_debugfs_dir); - - debugfs_create_file("current_state", 0444, - d, genpd, &status_fops); - debugfs_create_file("sub_domains", 0444, - d, genpd, &sub_domains_fops); - debugfs_create_file("idle_states", 0444, - d, genpd, &idle_states_fops); - debugfs_create_file("active_time", 0444, - d, genpd, &active_time_fops); - debugfs_create_file("total_idle_time", 0444, - d, genpd, &total_idle_time_fops); - debugfs_create_file("devices", 0444, - d, genpd, &devices_fops); - if (genpd->set_performance_state) - debugfs_create_file("perf_state", 0444, - d, genpd, &perf_state_fops); - } + list_for_each_entry(genpd, &gpd_list, gpd_list_node) + genpd_debug_add(genpd); return 0; }