All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bjorn Helgaas <bhelgaas@google.com>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>,
	linux-pci@vger.kernel.org, linux-tegra@vger.kernel.org
Subject: Re: [PATCH] PCI: tegra: Add debugfs support
Date: Tue, 22 Jul 2014 12:35:23 -0600	[thread overview]
Message-ID: <20140722183523.GB19181@google.com> (raw)
In-Reply-To: <1405062024-2364-1-git-send-email-thierry.reding@gmail.com>

On Fri, Jul 11, 2014 at 09:00:24AM +0200, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> Provide a debugfs file that shows the current link status for each root
> port.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>

I applied this with Stephen's ack to my pci/host-tegra branch for v3.17.
Let me know if you prefer a different merge strategy.  I'll be on vacation
until Aug 11, so it won't be in my first pull request, but I plan to do
another for things like this.

> ---
>  drivers/pci/host/pci-tegra.c | 118 +++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 118 insertions(+)
> 
> diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c
> index 14ec5b2c69e0..49b3bd5f5926 100644
> --- a/drivers/pci/host/pci-tegra.c
> +++ b/drivers/pci/host/pci-tegra.c
> @@ -25,6 +25,7 @@
>   */
>  
>  #include <linux/clk.h>
> +#include <linux/debugfs.h>
>  #include <linux/delay.h>
>  #include <linux/export.h>
>  #include <linux/interrupt.h>
> @@ -275,6 +276,7 @@ struct tegra_pcie {
>  	unsigned int num_supplies;
>  
>  	const struct tegra_pcie_soc_data *soc_data;
> +	struct dentry *debugfs;
>  };
>  
>  struct tegra_pcie_port {
> @@ -1664,6 +1666,115 @@ static const struct of_device_id tegra_pcie_of_match[] = {
>  };
>  MODULE_DEVICE_TABLE(of, tegra_pcie_of_match);
>  
> +static void *tegra_pcie_ports_seq_start(struct seq_file *s, loff_t *pos)
> +{
> +	struct tegra_pcie *pcie = s->private;
> +
> +	if (list_empty(&pcie->ports))
> +		return NULL;
> +
> +	seq_printf(s, "Index  Status\n");
> +
> +	return seq_list_start(&pcie->ports, *pos);
> +}
> +
> +static void *tegra_pcie_ports_seq_next(struct seq_file *s, void *v, loff_t *pos)
> +{
> +	struct tegra_pcie *pcie = s->private;
> +
> +	return seq_list_next(v, &pcie->ports, pos);
> +}
> +
> +static void tegra_pcie_ports_seq_stop(struct seq_file *s, void *v)
> +{
> +}
> +
> +static int tegra_pcie_ports_seq_show(struct seq_file *s, void *v)
> +{
> +	bool up = false, active = false;
> +	struct tegra_pcie_port *port;
> +	unsigned int value;
> +
> +	port = list_entry(v, struct tegra_pcie_port, list);
> +
> +	value = readl(port->base + RP_VEND_XP);
> +
> +	if (value & RP_VEND_XP_DL_UP)
> +		up = true;
> +
> +	value = readl(port->base + RP_LINK_CONTROL_STATUS);
> +
> +	if (value & RP_LINK_CONTROL_STATUS_DL_LINK_ACTIVE)
> +		active = true;
> +
> +	seq_printf(s, "%2u     ", port->index);
> +
> +	if (up)
> +		seq_printf(s, "up");
> +
> +	if (active) {
> +		if (up)
> +			seq_printf(s, ", ");
> +
> +		seq_printf(s, "active");
> +	}
> +
> +	seq_printf(s, "\n");
> +	return 0;
> +}
> +
> +static const struct seq_operations tegra_pcie_ports_seq_ops = {
> +	.start = tegra_pcie_ports_seq_start,
> +	.next = tegra_pcie_ports_seq_next,
> +	.stop = tegra_pcie_ports_seq_stop,
> +	.show = tegra_pcie_ports_seq_show,
> +};
> +
> +static int tegra_pcie_ports_open(struct inode *inode, struct file *file)
> +{
> +	struct tegra_pcie *pcie = inode->i_private;
> +	struct seq_file *s;
> +	int err;
> +
> +	err = seq_open(file, &tegra_pcie_ports_seq_ops);
> +	if (err)
> +		return err;
> +
> +	s = file->private_data;
> +	s->private = pcie;
> +
> +	return 0;
> +}
> +
> +static const struct file_operations tegra_pcie_ports_ops = {
> +	.owner = THIS_MODULE,
> +	.open = tegra_pcie_ports_open,
> +	.read = seq_read,
> +	.llseek = seq_lseek,
> +	.release = seq_release,
> +};
> +
> +static int tegra_pcie_debugfs_init(struct tegra_pcie *pcie)
> +{
> +	struct dentry *file;
> +
> +	pcie->debugfs = debugfs_create_dir("pcie", NULL);
> +	if (!pcie->debugfs)
> +		return -ENOMEM;
> +
> +	file = debugfs_create_file("ports", S_IFREG | S_IRUGO, pcie->debugfs,
> +				   pcie, &tegra_pcie_ports_ops);
> +	if (!file)
> +		goto remove;
> +
> +	return 0;
> +
> +remove:
> +	debugfs_remove_recursive(pcie->debugfs);
> +	pcie->debugfs = NULL;
> +	return -ENOMEM;
> +}
> +
>  static int tegra_pcie_probe(struct platform_device *pdev)
>  {
>  	const struct of_device_id *match;
> @@ -1718,6 +1829,13 @@ static int tegra_pcie_probe(struct platform_device *pdev)
>  		goto disable_msi;
>  	}
>  
> +	if (IS_ENABLED(CONFIG_DEBUG_FS)) {
> +		err = tegra_pcie_debugfs_init(pcie);
> +		if (err < 0)
> +			dev_err(&pdev->dev, "failed to setup debugfs: %d\n",
> +				err);
> +	}
> +
>  	platform_set_drvdata(pdev, pcie);
>  	return 0;
>  
> -- 
> 2.0.1
> 

WARNING: multiple messages have this Message-ID (diff)
From: Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
To: Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>,
	linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [PATCH] PCI: tegra: Add debugfs support
Date: Tue, 22 Jul 2014 12:35:23 -0600	[thread overview]
Message-ID: <20140722183523.GB19181@google.com> (raw)
In-Reply-To: <1405062024-2364-1-git-send-email-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

On Fri, Jul 11, 2014 at 09:00:24AM +0200, Thierry Reding wrote:
> From: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> 
> Provide a debugfs file that shows the current link status for each root
> port.
> 
> Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

I applied this with Stephen's ack to my pci/host-tegra branch for v3.17.
Let me know if you prefer a different merge strategy.  I'll be on vacation
until Aug 11, so it won't be in my first pull request, but I plan to do
another for things like this.

> ---
>  drivers/pci/host/pci-tegra.c | 118 +++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 118 insertions(+)
> 
> diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c
> index 14ec5b2c69e0..49b3bd5f5926 100644
> --- a/drivers/pci/host/pci-tegra.c
> +++ b/drivers/pci/host/pci-tegra.c
> @@ -25,6 +25,7 @@
>   */
>  
>  #include <linux/clk.h>
> +#include <linux/debugfs.h>
>  #include <linux/delay.h>
>  #include <linux/export.h>
>  #include <linux/interrupt.h>
> @@ -275,6 +276,7 @@ struct tegra_pcie {
>  	unsigned int num_supplies;
>  
>  	const struct tegra_pcie_soc_data *soc_data;
> +	struct dentry *debugfs;
>  };
>  
>  struct tegra_pcie_port {
> @@ -1664,6 +1666,115 @@ static const struct of_device_id tegra_pcie_of_match[] = {
>  };
>  MODULE_DEVICE_TABLE(of, tegra_pcie_of_match);
>  
> +static void *tegra_pcie_ports_seq_start(struct seq_file *s, loff_t *pos)
> +{
> +	struct tegra_pcie *pcie = s->private;
> +
> +	if (list_empty(&pcie->ports))
> +		return NULL;
> +
> +	seq_printf(s, "Index  Status\n");
> +
> +	return seq_list_start(&pcie->ports, *pos);
> +}
> +
> +static void *tegra_pcie_ports_seq_next(struct seq_file *s, void *v, loff_t *pos)
> +{
> +	struct tegra_pcie *pcie = s->private;
> +
> +	return seq_list_next(v, &pcie->ports, pos);
> +}
> +
> +static void tegra_pcie_ports_seq_stop(struct seq_file *s, void *v)
> +{
> +}
> +
> +static int tegra_pcie_ports_seq_show(struct seq_file *s, void *v)
> +{
> +	bool up = false, active = false;
> +	struct tegra_pcie_port *port;
> +	unsigned int value;
> +
> +	port = list_entry(v, struct tegra_pcie_port, list);
> +
> +	value = readl(port->base + RP_VEND_XP);
> +
> +	if (value & RP_VEND_XP_DL_UP)
> +		up = true;
> +
> +	value = readl(port->base + RP_LINK_CONTROL_STATUS);
> +
> +	if (value & RP_LINK_CONTROL_STATUS_DL_LINK_ACTIVE)
> +		active = true;
> +
> +	seq_printf(s, "%2u     ", port->index);
> +
> +	if (up)
> +		seq_printf(s, "up");
> +
> +	if (active) {
> +		if (up)
> +			seq_printf(s, ", ");
> +
> +		seq_printf(s, "active");
> +	}
> +
> +	seq_printf(s, "\n");
> +	return 0;
> +}
> +
> +static const struct seq_operations tegra_pcie_ports_seq_ops = {
> +	.start = tegra_pcie_ports_seq_start,
> +	.next = tegra_pcie_ports_seq_next,
> +	.stop = tegra_pcie_ports_seq_stop,
> +	.show = tegra_pcie_ports_seq_show,
> +};
> +
> +static int tegra_pcie_ports_open(struct inode *inode, struct file *file)
> +{
> +	struct tegra_pcie *pcie = inode->i_private;
> +	struct seq_file *s;
> +	int err;
> +
> +	err = seq_open(file, &tegra_pcie_ports_seq_ops);
> +	if (err)
> +		return err;
> +
> +	s = file->private_data;
> +	s->private = pcie;
> +
> +	return 0;
> +}
> +
> +static const struct file_operations tegra_pcie_ports_ops = {
> +	.owner = THIS_MODULE,
> +	.open = tegra_pcie_ports_open,
> +	.read = seq_read,
> +	.llseek = seq_lseek,
> +	.release = seq_release,
> +};
> +
> +static int tegra_pcie_debugfs_init(struct tegra_pcie *pcie)
> +{
> +	struct dentry *file;
> +
> +	pcie->debugfs = debugfs_create_dir("pcie", NULL);
> +	if (!pcie->debugfs)
> +		return -ENOMEM;
> +
> +	file = debugfs_create_file("ports", S_IFREG | S_IRUGO, pcie->debugfs,
> +				   pcie, &tegra_pcie_ports_ops);
> +	if (!file)
> +		goto remove;
> +
> +	return 0;
> +
> +remove:
> +	debugfs_remove_recursive(pcie->debugfs);
> +	pcie->debugfs = NULL;
> +	return -ENOMEM;
> +}
> +
>  static int tegra_pcie_probe(struct platform_device *pdev)
>  {
>  	const struct of_device_id *match;
> @@ -1718,6 +1829,13 @@ static int tegra_pcie_probe(struct platform_device *pdev)
>  		goto disable_msi;
>  	}
>  
> +	if (IS_ENABLED(CONFIG_DEBUG_FS)) {
> +		err = tegra_pcie_debugfs_init(pcie);
> +		if (err < 0)
> +			dev_err(&pdev->dev, "failed to setup debugfs: %d\n",
> +				err);
> +	}
> +
>  	platform_set_drvdata(pdev, pcie);
>  	return 0;
>  
> -- 
> 2.0.1
> 

  parent reply	other threads:[~2014-07-22 18:35 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-11  7:00 [PATCH] PCI: tegra: Add debugfs support Thierry Reding
2014-07-11  7:00 ` Thierry Reding
2014-07-21 15:54 ` Stephen Warren
2014-07-21 15:54   ` Stephen Warren
2014-07-21 21:19   ` Thierry Reding
2014-07-22 18:35 ` Bjorn Helgaas [this message]
2014-07-22 18:35   ` Bjorn Helgaas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140722183523.GB19181@google.com \
    --to=bhelgaas@google.com \
    --cc=linux-pci@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=swarren@wwwdotorg.org \
    --cc=thierry.reding@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.