diff mbox series

[v5,03/14] ASoC: SOF: Add driver debug support.

Message ID 20190321161016.26515-4-pierre-louis.bossart@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series ASoC: Sound Open Firmware (SOF) core | expand

Commit Message

Pierre-Louis Bossart March 21, 2019, 4:10 p.m. UTC
From: Liam Girdwood <liam.r.girdwood@linux.intel.com>

Add debugFS files that can be used to expose DSP memories and
and peripherals to userspace to assist with firmware debugging.

Since we cannot rely on debugFS, errors are logged but don't stop
execution.

When a resource cannot be read in D3, it is optionally cached on
suspend. Copying memories from IO will increase the suspend latency,
this should only used in engineering builds w/ debug options. This
part will have to be enhanced when support for D0ix states is
provided, currently only D0 and D3 are supported.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/sof/debug.c | 219 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 219 insertions(+)
 create mode 100644 sound/soc/sof/debug.c

Comments

Takashi Iwai March 29, 2019, 4:04 p.m. UTC | #1
On Thu, 21 Mar 2019 17:10:05 +0100,
Pierre-Louis Bossart wrote:
> 
> +static ssize_t sof_dfsentry_read(struct file *file, char __user *buffer,
> +				 size_t count, loff_t *ppos)
> +{
> +	struct snd_sof_dfsentry *dfse = file->private_data;
> +	struct snd_sof_dev *sdev = dfse->sdev;
> +	int size;
> +	u32 *buf;
> +	loff_t pos = *ppos;
> +	size_t size_ret;
> +
> +	size = dfse->size;
> +
> +	/* validate position & count */
> +	if (pos < 0)
> +		return -EINVAL;
> +	if (pos >= size || !count)
> +		return 0;
> +	/* find the minimum. min() is not used since it adds sparse warnings */
> +	if (count > size - pos)
> +		count = size - pos;
> +
> +	/* intermediate buffer size must be u32 multiple */
> +	size = ALIGN(count, 4);

Doesn't pos need to be aligned to 32bit as well (at least at actually
reading from iomem)?


thanks,

Takashi
Pierre-Louis Bossart April 1, 2019, 5:15 p.m. UTC | #2
On 3/29/19 12:04 PM, Takashi Iwai wrote:
> On Thu, 21 Mar 2019 17:10:05 +0100,
> Pierre-Louis Bossart wrote:
>>
>> +static ssize_t sof_dfsentry_read(struct file *file, char __user *buffer,
>> +				 size_t count, loff_t *ppos)
>> +{
>> +	struct snd_sof_dfsentry *dfse = file->private_data;
>> +	struct snd_sof_dev *sdev = dfse->sdev;
>> +	int size;
>> +	u32 *buf;
>> +	loff_t pos = *ppos;
>> +	size_t size_ret;
>> +
>> +	size = dfse->size;
>> +
>> +	/* validate position & count */
>> +	if (pos < 0)
>> +		return -EINVAL;
>> +	if (pos >= size || !count)
>> +		return 0;
>> +	/* find the minimum. min() is not used since it adds sparse warnings */
>> +	if (count > size - pos)
>> +		count = size - pos;
>> +
>> +	/* intermediate buffer size must be u32 multiple */
>> +	size = ALIGN(count, 4);
> 
> Doesn't pos need to be aligned to 32bit as well (at least at actually
> reading from iomem)?

Good point,  we can either return an error if the count in both a 
multiple of 32 bits, or do some caching to allow for arbitrary size 
access. The former is very simple but not sure if this is accepted 
behavior for debugfs.
Mark Brown April 2, 2019, 5:44 a.m. UTC | #3
On Mon, Apr 01, 2019 at 01:15:46PM -0400, Pierre-Louis Bossart wrote:
> On 3/29/19 12:04 PM, Takashi Iwai wrote:

> > Doesn't pos need to be aligned to 32bit as well (at least at actually
> > reading from iomem)?

> Good point,  we can either return an error if the count in both a multiple
> of 32 bits, or do some caching to allow for arbitrary size access. The
> former is very simple but not sure if this is accepted behavior for debugfs.

You really want something that will work with arbatrary userspace tools
if you can rather than requiring special magic read sizes - things like
cat and cp should probably work.  A common thing is to do reads/writes
of the correct sizes into a buffer and then pick the relevant bits out
of the buffer to satisfy what userspace actually asked for.
Pierre-Louis Bossart April 2, 2019, 1:47 p.m. UTC | #4
>>> Doesn't pos need to be aligned to 32bit as well (at least at actually
>>> reading from iomem)?
>> Good point,  we can either return an error if the count in both a multiple
>> of 32 bits, or do some caching to allow for arbitrary size access. The
>> former is very simple but not sure if this is accepted behavior for debugfs.
> You really want something that will work with arbatrary userspace tools
> if you can rather than requiring special magic read sizes - things like
> cat and cp should probably work.  A common thing is to do reads/writes
> of the correct sizes into a buffer and then pick the relevant bits out
> of the buffer to satisfy what userspace actually asked for.

Thanks for the advice. The data is already in a buffer so it's not 
difficult to implement support for sizes that aren't multiple of 4 bytes.
diff mbox series

Patch

diff --git a/sound/soc/sof/debug.c b/sound/soc/sof/debug.c
new file mode 100644
index 000000000000..5876269aa776
--- /dev/null
+++ b/sound/soc/sof/debug.c
@@ -0,0 +1,219 @@ 
+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
+//
+// This file is provided under a dual BSD/GPLv2 license.  When using or
+// redistributing this file, you may do so under either license.
+//
+// Copyright(c) 2018 Intel Corporation. All rights reserved.
+//
+// Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
+//
+// Generic debug routines used to export DSP MMIO and memories to userspace
+// for firmware debugging.
+//
+
+#include <linux/debugfs.h>
+#include <linux/io.h>
+#include <linux/pm_runtime.h>
+#include "sof-priv.h"
+#include "ops.h"
+
+static ssize_t sof_dfsentry_read(struct file *file, char __user *buffer,
+				 size_t count, loff_t *ppos)
+{
+	struct snd_sof_dfsentry *dfse = file->private_data;
+	struct snd_sof_dev *sdev = dfse->sdev;
+	int size;
+	u32 *buf;
+	loff_t pos = *ppos;
+	size_t size_ret;
+
+	size = dfse->size;
+
+	/* validate position & count */
+	if (pos < 0)
+		return -EINVAL;
+	if (pos >= size || !count)
+		return 0;
+	/* find the minimum. min() is not used since it adds sparse warnings */
+	if (count > size - pos)
+		count = size - pos;
+
+	/* intermediate buffer size must be u32 multiple */
+	size = ALIGN(count, 4);
+
+	buf = kzalloc(size, GFP_KERNEL);
+	if (!buf)
+		return -ENOMEM;
+
+	if (dfse->type == SOF_DFSENTRY_TYPE_IOMEM) {
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_ENABLE_DEBUGFS_CACHE)
+		/*
+		 * If the DSP is active: copy from IO.
+		 * If the DSP is suspended:
+		 *	- Copy from IO if the memory is always accessible.
+		 *	- Otherwise, copy from cached buffer.
+		 */
+		if (pm_runtime_active(sdev->dev) ||
+		    dfse->access_type == SOF_DEBUGFS_ACCESS_ALWAYS) {
+			memcpy_fromio(buf, dfse->io_mem + pos, size);
+		} else {
+			dev_info(sdev->dev,
+				 "Copying cached debugfs data\n");
+			memcpy(buf, dfse->cache_buf + pos, size);
+		}
+#else
+		/* if the DSP is in D3 */
+		if (!pm_runtime_active(sdev->dev) &&
+		    dfse->access_type == SOF_DEBUGFS_ACCESS_D0_ONLY) {
+			dev_err(sdev->dev,
+				"error: debugfs entry %s cannot be read in DSP D3\n",
+				dfse->dfsentry->d_name.name);
+			return -EINVAL;
+		}
+
+		memcpy_fromio(buf, dfse->io_mem + pos, size);
+#endif
+	} else {
+		memcpy(buf, ((u8 *)(dfse->buf) + pos), size);
+	}
+
+	/* copy to userspace */
+	size_ret = copy_to_user(buffer, buf, count);
+	kfree(buf);
+
+	/* update count & position if copy succeeded */
+	if (size_ret)
+		return -EFAULT;
+
+	*ppos = pos + count;
+
+	return count;
+}
+
+static const struct file_operations sof_dfs_fops = {
+	.open = simple_open,
+	.read = sof_dfsentry_read,
+	.llseek = default_llseek,
+};
+
+/* create FS entry for debug files that can expose DSP memories, registers */
+int snd_sof_debugfs_io_item(struct snd_sof_dev *sdev,
+			    void __iomem *base, size_t size,
+			    const char *name,
+			    enum sof_debugfs_access_type access_type)
+{
+	struct snd_sof_dfsentry *dfse;
+
+	if (!sdev)
+		return -EINVAL;
+
+	dfse = devm_kzalloc(sdev->dev, sizeof(*dfse), GFP_KERNEL);
+	if (!dfse)
+		return -ENOMEM;
+
+	dfse->type = SOF_DFSENTRY_TYPE_IOMEM;
+	dfse->io_mem = base;
+	dfse->size = size;
+	dfse->sdev = sdev;
+	dfse->access_type = access_type;
+
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_ENABLE_DEBUGFS_CACHE)
+	/*
+	 * allocate cache buffer that will be used to save the mem window
+	 * contents prior to suspend
+	 */
+	if (access_type == SOF_DEBUGFS_ACCESS_D0_ONLY) {
+		dfse->cache_buf = devm_kzalloc(sdev->dev, size, GFP_KERNEL);
+		if (!dfse->cache_buf)
+			return -ENOMEM;
+	}
+#endif
+
+	dfse->dfsentry = debugfs_create_file(name, 0444, sdev->debugfs_root,
+					     dfse, &sof_dfs_fops);
+	if (!dfse->dfsentry) {
+		/* can't rely on debugfs, only log error and keep going */
+		dev_err(sdev->dev, "error: cannot create debugfs entry %s\n",
+			name);
+	} else {
+		/* add to dfsentry list */
+		list_add(&dfse->list, &sdev->dfsentry_list);
+
+	}
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(snd_sof_debugfs_io_item);
+
+/* create FS entry for debug files to expose kernel memory */
+int snd_sof_debugfs_buf_item(struct snd_sof_dev *sdev,
+			     void *base, size_t size,
+			     const char *name)
+{
+	struct snd_sof_dfsentry *dfse;
+
+	if (!sdev)
+		return -EINVAL;
+
+	dfse = devm_kzalloc(sdev->dev, sizeof(*dfse), GFP_KERNEL);
+	if (!dfse)
+		return -ENOMEM;
+
+	dfse->type = SOF_DFSENTRY_TYPE_BUF;
+	dfse->buf = base;
+	dfse->size = size;
+	dfse->sdev = sdev;
+
+	dfse->dfsentry = debugfs_create_file(name, 0444, sdev->debugfs_root,
+					     dfse, &sof_dfs_fops);
+	if (!dfse->dfsentry) {
+		/* can't rely on debugfs, only log error and keep going */
+		dev_err(sdev->dev, "error: cannot create debugfs entry %s\n",
+			name);
+	} else {
+		/* add to dfsentry list */
+		list_add(&dfse->list, &sdev->dfsentry_list);
+	}
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(snd_sof_debugfs_buf_item);
+
+int snd_sof_dbg_init(struct snd_sof_dev *sdev)
+{
+	const struct snd_sof_dsp_ops *ops = sof_ops(sdev);
+	const struct snd_sof_debugfs_map *map;
+	int i;
+	int err;
+
+	/* use "sof" as top level debugFS dir */
+	sdev->debugfs_root = debugfs_create_dir("sof", NULL);
+	if (IS_ERR_OR_NULL(sdev->debugfs_root)) {
+		dev_err(sdev->dev, "error: failed to create debugfs directory\n");
+		return 0;
+	}
+
+	/* init dfsentry list */
+	INIT_LIST_HEAD(&sdev->dfsentry_list);
+
+	/* create debugFS files for platform specific MMIO/DSP memories */
+	for (i = 0; i < ops->debug_map_count; i++) {
+		map = &ops->debug_map[i];
+
+		err = snd_sof_debugfs_io_item(sdev, sdev->bar[map->bar] +
+					      map->offset, map->size,
+					      map->name, map->access_type);
+		/* errors are only due to memory allocation, not debugfs */
+		if (err < 0)
+			return err;
+	}
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(snd_sof_dbg_init);
+
+void snd_sof_free_debug(struct snd_sof_dev *sdev)
+{
+	debugfs_remove_recursive(sdev->debugfs_root);
+}
+EXPORT_SYMBOL_GPL(snd_sof_free_debug);