From patchwork Thu Dec 14 15:33:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 10112533 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 62D736019C for ; Thu, 14 Dec 2017 15:36:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5314429172 for ; Thu, 14 Dec 2017 15:36:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 47F5C2935F; Thu, 14 Dec 2017 15:36:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id ABADA29172 for ; Thu, 14 Dec 2017 15:36:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=uCwQHZ3QYq2JvJf1Ko+SMw18cny6nEQ8KSkrmC1l3lY=; b=iBe3rOeodGlU2Hg1UyDKI0zJoY I++ZUO39lgkOWebYE7buyX3Hhd4fx4ec/pe6qGpN4Zh/fta5nucU+3yz6mspAq8zvxsgG9tupDxPo LTg51vY71/y9lsKWtPBu1dzbBygV2e5ozZac798Ss1QIJjSWRUeYQuZrOPOix50frJksmd1oANRxn 0BcsllLbfu9DYn5JUOXaJvcUodyuxWCHBvH3WrzdfIYhe9Kx6Xx36WxZY3hlz9Z18fu0fse8Isczx uujCI9FiYYlwZc1ifCr9icAAHcwtOq6gPjjFA/R4ypu0/Qv6i8S/LN4iemZnHcm7wSUtijQBf0USQ dPi6VKfg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ePVYG-0006ZS-SA; Thu, 14 Dec 2017 15:36:00 +0000 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ePVWk-0003ij-LK for linux-arm-kernel@lists.infradead.org; Thu, 14 Dec 2017 15:34:33 +0000 Received: by mail-pf0-x244.google.com with SMTP id j124so3858271pfc.2 for ; Thu, 14 Dec 2017 07:34:11 -0800 (PST) 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 :in-reply-to:references; bh=Y9LAhMI7yhCkqOWCqeEdKg7pECc3enz78Dn0k4Sy7n4=; b=ONj6QgwcwfOdoMBspKIyMoxw08QoDury4saq2+lCujRDwLtt+dq+R/6/zxMIeZHWUr rqp84geIiSaljK2AFHIOxCUHRwVaexv9e4Jgd9tLJGcwN+qizlR+MGk2CXsd/YKn/H7u IM9Bf8Vlt8vT/ADd43ijaOrYPqJxsjM4bb+qI= 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:in-reply-to:references; bh=Y9LAhMI7yhCkqOWCqeEdKg7pECc3enz78Dn0k4Sy7n4=; b=Wwsiv/WZTHUFQ23NtBbFubQjs+My6+5y6Zr3FzsXvMFpVkw7yTIKb6r8GeLaqclhou 1sTzuAaXYylqOzXjId74bY2V+IM7FbpLrR/pSA6HLzo2ZceeRguJ7RSYN5hc52FOCOKq n6CNg47RBhEWxOuLZkVdPDx3/vkPA2hNllgqUhT/X6aw22+EGXuCGsnuhFFHOFJoguM/ OoeSonQ7h04CFanTSGjhXpdBeQwS6z2z3RfSsaMEnyX+SD7ReLXph1Nzms2pAkB6U4I5 Ux3iRhc6jN23etNu5rIF/Q9MHwp0k4OYVMttJxxPQIcr9rx1IYk1FbD7CHXv8LBIp+M5 uFUQ== X-Gm-Message-State: AKGB3mJyJRyE8K5LzeVX+QoZvOmPiKvZr13boOTmbs8uM4WpVE7Me16J TL2K71bIraWjrvcnOJK6W4xbPw== X-Google-Smtp-Source: ACJfBoti9dW0jAdUXfJif7SS/MFq45OaBxo4vNlWr9aTQ/9yMMfWibR3MWUeZqRbyVPwol+jubEymA== X-Received: by 10.98.159.135 with SMTP id v7mr9929784pfk.162.1513265650931; Thu, 14 Dec 2017 07:34:10 -0800 (PST) Received: from localhost ([122.172.99.7]) by smtp.gmail.com with ESMTPSA id r5sm7615942pgq.25.2017.12.14.07.34.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Dec 2017 07:34:10 -0800 (PST) From: Viresh Kumar To: Greg Kroah-Hartman Subject: [PATCH V5 07/13] boot_constraint: Add debugfs support Date: Thu, 14 Dec 2017 21:03:14 +0530 Message-Id: X-Mailer: git-send-email 2.15.0.194.g9af6a3dea062 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171214_073427_750998_0413566F X-CRM114-Status: GOOD ( 15.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nm@ti.com, Rajendra Nayak , Viresh Kumar , s.hauer@pengutronix.de, Stephen Boyd , linux-kernel@vger.kernel.org, xuwei5@hisilicon.com, robdclark@gmail.com, robh+dt@kernel.org, fabio.estevam@nxp.com, Vincent Guittot , shawnguo@kernel.org, linux-arm-kernel@lists.infradead.org, l.stach@pengutronix.de MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds debugfs support for boot constraints. This is how it looks for a "vmmc-supply" constraint for the MMC device. $ ls -R /sys/kernel/debug/boot_constraints/ /sys/kernel/debug/boot_constraints/: f723d000.dwmmc0 /sys/kernel/debug/boot_constraints/f723d000.dwmmc0: clk-ciu pm-domain supply-vmmc supply-vmmcaux /sys/kernel/debug/boot_constraints/f723d000.dwmmc0/clk-ciu: /sys/kernel/debug/boot_constraints/f723d000.dwmmc0/pm-domain: /sys/kernel/debug/boot_constraints/f723d000.dwmmc0/supply-vmmc: u_volt_max u_volt_min /sys/kernel/debug/boot_constraints/f723d000.dwmmc0/supply-vmmcaux: u_volt_max u_volt_min Tested-by: Rajendra Nayak Signed-off-by: Viresh Kumar --- drivers/boot_constraint/clk.c | 3 ++ drivers/boot_constraint/core.c | 59 ++++++++++++++++++++++++++++++++++++++++ drivers/boot_constraint/core.h | 6 ++++ drivers/boot_constraint/pm.c | 11 ++++++-- drivers/boot_constraint/supply.c | 9 ++++++ 5 files changed, 86 insertions(+), 2 deletions(-) diff --git a/drivers/boot_constraint/clk.c b/drivers/boot_constraint/clk.c index db22acff43e6..ebc871c29a83 100644 --- a/drivers/boot_constraint/clk.c +++ b/drivers/boot_constraint/clk.c @@ -46,6 +46,8 @@ int constraint_clk_add(struct constraint *constraint, void *data) cclk->clk_info.name = kstrdup_const(clk_info->name, GFP_KERNEL); constraint->private = cclk; + constraint_add_debugfs(constraint, clk_info->name); + return 0; put_clk: @@ -60,6 +62,7 @@ void constraint_clk_remove(struct constraint *constraint) { struct constraint_clk *cclk = constraint->private; + constraint_remove_debugfs(constraint); kfree_const(cclk->clk_info.name); clk_disable_unprepare(cclk->clk); clk_put(cclk->clk); diff --git a/drivers/boot_constraint/core.c b/drivers/boot_constraint/core.c index b36c02aa50c5..0350c5057ee5 100644 --- a/drivers/boot_constraint/core.c +++ b/drivers/boot_constraint/core.c @@ -21,6 +21,63 @@ static LIST_HEAD(constraint_devices); static DEFINE_MUTEX(constraint_devices_mutex); +/* Debugfs */ + +static struct dentry *rootdir; + +static void constraint_device_add_debugfs(struct constraint_dev *cdev) +{ + struct device *dev = cdev->dev; + + cdev->dentry = debugfs_create_dir(dev_name(dev), rootdir); +} + +static void constraint_device_remove_debugfs(struct constraint_dev *cdev) +{ + debugfs_remove_recursive(cdev->dentry); +} + +void constraint_add_debugfs(struct constraint *constraint, const char *suffix) +{ + struct device *dev = constraint->cdev->dev; + const char *prefix; + char name[NAME_MAX]; + + switch (constraint->type) { + case DEV_BOOT_CONSTRAINT_CLK: + prefix = "clk"; + break; + case DEV_BOOT_CONSTRAINT_PM: + prefix = "pm"; + break; + case DEV_BOOT_CONSTRAINT_SUPPLY: + prefix = "supply"; + break; + default: + dev_err(dev, "%s: Constraint type (%d) not supported\n", + __func__, constraint->type); + return; + } + + snprintf(name, NAME_MAX, "%s-%s", prefix, suffix); + + constraint->dentry = debugfs_create_dir(name, constraint->cdev->dentry); +} + +void constraint_remove_debugfs(struct constraint *constraint) +{ + debugfs_remove_recursive(constraint->dentry); +} + +static int __init constraint_debugfs_init(void) +{ + rootdir = debugfs_create_dir("boot_constraints", NULL); + + return 0; +} +core_initcall(constraint_debugfs_init); + + /* Boot constraints core */ static struct constraint_dev *constraint_device_find(struct device *dev) @@ -48,12 +105,14 @@ static struct constraint_dev *constraint_device_allocate(struct device *dev) INIT_LIST_HEAD(&cdev->constraints); list_add(&cdev->node, &constraint_devices); + constraint_device_add_debugfs(cdev); return cdev; } static void constraint_device_free(struct constraint_dev *cdev) { + constraint_device_remove_debugfs(cdev); list_del(&cdev->node); kfree(cdev); } diff --git a/drivers/boot_constraint/core.h b/drivers/boot_constraint/core.h index c5b27617b4ae..9dd481d38b99 100644 --- a/drivers/boot_constraint/core.h +++ b/drivers/boot_constraint/core.h @@ -7,6 +7,7 @@ #define _CORE_H #include +#include #include #include @@ -14,6 +15,7 @@ struct constraint_dev { struct device *dev; struct list_head node; struct list_head constraints; + struct dentry *dentry; }; struct constraint { @@ -22,12 +24,16 @@ struct constraint { enum dev_boot_constraint_type type; void (*free_resources)(void *data); void *free_resources_data; + struct dentry *dentry; int (*add)(struct constraint *constraint, void *data); void (*remove)(struct constraint *constraint); void *private; }; +void constraint_add_debugfs(struct constraint *constraint, const char *suffix); +void constraint_remove_debugfs(struct constraint *constraint); + /* Forward declarations of constraint specific callbacks */ int constraint_clk_add(struct constraint *constraint, void *data); void constraint_clk_remove(struct constraint *constraint); diff --git a/drivers/boot_constraint/pm.c b/drivers/boot_constraint/pm.c index 4950ec6b248b..584d3d46ef65 100644 --- a/drivers/boot_constraint/pm.c +++ b/drivers/boot_constraint/pm.c @@ -11,11 +11,18 @@ int constraint_pm_add(struct constraint *constraint, void *data) { struct device *dev = constraint->cdev->dev; + int ret; - return dev_pm_domain_attach(dev, true); + ret = dev_pm_domain_attach(dev, true); + if (ret) + return ret; + + constraint_add_debugfs(constraint, "domain"); + + return 0; } void constraint_pm_remove(struct constraint *constraint) { - /* Nothing to do for now */ + constraint_remove_debugfs(constraint); } diff --git a/drivers/boot_constraint/supply.c b/drivers/boot_constraint/supply.c index 916e5d6848d5..28fda60a0711 100644 --- a/drivers/boot_constraint/supply.c +++ b/drivers/boot_constraint/supply.c @@ -57,6 +57,14 @@ int constraint_supply_add(struct constraint *constraint, void *data) csupply->supply.name = kstrdup_const(supply->name, GFP_KERNEL); constraint->private = csupply; + constraint_add_debugfs(constraint, supply->name); + + debugfs_create_u32("u_volt_min", 0444, constraint->dentry, + &csupply->supply.u_volt_min); + + debugfs_create_u32("u_volt_max", 0444, constraint->dentry, + &csupply->supply.u_volt_max); + return 0; remove_voltage: @@ -77,6 +85,7 @@ void constraint_supply_remove(struct constraint *constraint) struct device *dev = constraint->cdev->dev; int ret; + constraint_remove_debugfs(constraint); kfree_const(supply->name); ret = regulator_disable(csupply->reg);