| Message ID | 20190504010030.29233-7-pierre-louis.bossart@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | soundwire: add sysfs and debugfs support | expand |
On Fri, May 03, 2019 at 08:00:29PM -0500, Pierre-Louis Bossart wrote: > Add debugfs file to dump the Cadence master registers > > Credits: this patch is based on an earlier internal contribution by > Vinod Koul, Sanyog Kale, Shreyas Nc and Hardik Shah. The main change > is the use of scnprintf to avoid known issues with snprintf. > > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > drivers/soundwire/cadence_master.c | 98 ++++++++++++++++++++++++++++++ > drivers/soundwire/cadence_master.h | 5 ++ > 2 files changed, 103 insertions(+) > > diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c > index 682789bb8ab3..e9c30f18ce25 100644 > --- a/drivers/soundwire/cadence_master.c > +++ b/drivers/soundwire/cadence_master.c > @@ -8,6 +8,7 @@ > > #include <linux/delay.h> > #include <linux/device.h> > +#include <linux/debugfs.h> > #include <linux/interrupt.h> > #include <linux/module.h> > #include <linux/mod_devicetable.h> > @@ -222,6 +223,103 @@ static int cdns_clear_bit(struct sdw_cdns *cdns, int offset, u32 value) > return -EAGAIN; > } > > +/* > + * debugfs > + */ > + > +#define RD_BUF (2 * PAGE_SIZE) > + > +static ssize_t cdns_sprintf(struct sdw_cdns *cdns, > + char *buf, size_t pos, unsigned int reg) > +{ > + return scnprintf(buf + pos, RD_BUF - pos, > + "%4x\t%4x\n", reg, cdns_readl(cdns, reg)); > +} > + > +static ssize_t cdns_reg_read(struct file *file, char __user *user_buf, > + size_t count, loff_t *ppos) > +{ > + struct sdw_cdns *cdns = file->private_data; > + char *buf; > + ssize_t ret; > + int i, j; > + > + buf = kzalloc(RD_BUF, GFP_KERNEL); > + if (!buf) > + return -ENOMEM; > + > + ret = scnprintf(buf, RD_BUF, "Register Value\n"); > + ret += scnprintf(buf + ret, RD_BUF - ret, "\nMCP Registers\n"); > + for (i = 0; i < 8; i++) /* 8 MCP registers */ > + ret += cdns_sprintf(cdns, buf, ret, i * 4); > + > + ret += scnprintf(buf + ret, RD_BUF - ret, > + "\nStatus & Intr Registers\n"); > + for (i = 0; i < 13; i++) /* 13 Status & Intr registers */ > + ret += cdns_sprintf(cdns, buf, ret, CDNS_MCP_STAT + i * 4); > + > + ret += scnprintf(buf + ret, RD_BUF - ret, > + "\nSSP & Clk ctrl Registers\n"); > + ret += cdns_sprintf(cdns, buf, ret, CDNS_MCP_SSP_CTRL0); > + ret += cdns_sprintf(cdns, buf, ret, CDNS_MCP_SSP_CTRL1); > + ret += cdns_sprintf(cdns, buf, ret, CDNS_MCP_CLK_CTRL0); > + ret += cdns_sprintf(cdns, buf, ret, CDNS_MCP_CLK_CTRL1); > + > + ret += scnprintf(buf + ret, RD_BUF - ret, > + "\nDPn B0 Registers\n"); > + for (i = 0; i < 7; i++) { > + ret += scnprintf(buf + ret, RD_BUF - ret, > + "\nDP-%d\n", i); > + for (j = 0; j < 6; j++) > + ret += cdns_sprintf(cdns, buf, ret, > + CDNS_DPN_B0_CONFIG(i) + j * 4); > + } > + > + ret += scnprintf(buf + ret, RD_BUF - ret, > + "\nDPn B1 Registers\n"); > + for (i = 0; i < 7; i++) { > + ret += scnprintf(buf + ret, RD_BUF - ret, > + "\nDP-%d\n", i); > + > + for (j = 0; j < 6; j++) > + ret += cdns_sprintf(cdns, buf, ret, > + CDNS_DPN_B1_CONFIG(i) + j * 4); > + } > + > + ret += scnprintf(buf + ret, RD_BUF - ret, > + "\nDPn Control Registers\n"); > + for (i = 0; i < 7; i++) > + ret += cdns_sprintf(cdns, buf, ret, > + CDNS_PORTCTRL + i * CDNS_PORT_OFFSET); > + > + ret += scnprintf(buf + ret, RD_BUF - ret, > + "\nPDIn Config Registers\n"); > + for (i = 0; i < 7; i++) > + ret += cdns_sprintf(cdns, buf, ret, CDNS_PDI_CONFIG(i)); > + > + ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret); > + kfree(buf); > + > + return ret; > +} > + > +static const struct file_operations cdns_reg_fops = { > + .open = simple_open, > + .read = cdns_reg_read, > + .llseek = default_llseek, > +}; > + > +/** > + * sdw_cdns_debugfs_init() - Cadence debugfs init > + * @cdns: Cadence instance > + * @root: debugfs root > + */ > +void sdw_cdns_debugfs_init(struct sdw_cdns *cdns, struct dentry *root) > +{ > + debugfs_create_file("cdns-registers", 0400, root, cdns, &cdns_reg_fops); > +} > +EXPORT_SYMBOL(sdw_cdns_debugfs_init); Don't wrap debugfs calls with export symbol without using EXPORT_SYMBOL_GPL() or you will get grumpy emails from me :) thanks, greg k-h
On Fri, May 03, 2019 at 08:00:29PM -0500, Pierre-Louis Bossart wrote: > Add debugfs file to dump the Cadence master registers > > Credits: this patch is based on an earlier internal contribution by > Vinod Koul, Sanyog Kale, Shreyas Nc and Hardik Shah. The main change > is the use of scnprintf to avoid known issues with snprintf. > > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > drivers/soundwire/cadence_master.c | 98 ++++++++++++++++++++++++++++++ > drivers/soundwire/cadence_master.h | 5 ++ > 2 files changed, 103 insertions(+) > > diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c > index 682789bb8ab3..e9c30f18ce25 100644 > --- a/drivers/soundwire/cadence_master.c > +++ b/drivers/soundwire/cadence_master.c > @@ -8,6 +8,7 @@ > > #include <linux/delay.h> > #include <linux/device.h> > +#include <linux/debugfs.h> > #include <linux/interrupt.h> > #include <linux/module.h> > #include <linux/mod_devicetable.h> > @@ -222,6 +223,103 @@ static int cdns_clear_bit(struct sdw_cdns *cdns, int offset, u32 value) > return -EAGAIN; > } > > +/* > + * debugfs > + */ > + > +#define RD_BUF (2 * PAGE_SIZE) > + > +static ssize_t cdns_sprintf(struct sdw_cdns *cdns, > + char *buf, size_t pos, unsigned int reg) > +{ > + return scnprintf(buf + pos, RD_BUF - pos, > + "%4x\t%4x\n", reg, cdns_readl(cdns, reg)); > +} > + > +static ssize_t cdns_reg_read(struct file *file, char __user *user_buf, > + size_t count, loff_t *ppos) > +{ > + struct sdw_cdns *cdns = file->private_data; > + char *buf; > + ssize_t ret; > + int i, j; > + > + buf = kzalloc(RD_BUF, GFP_KERNEL); > + if (!buf) > + return -ENOMEM; > + > + ret = scnprintf(buf, RD_BUF, "Register Value\n"); > + ret += scnprintf(buf + ret, RD_BUF - ret, "\nMCP Registers\n"); > + for (i = 0; i < 8; i++) /* 8 MCP registers */ > + ret += cdns_sprintf(cdns, buf, ret, i * 4); > + > + ret += scnprintf(buf + ret, RD_BUF - ret, > + "\nStatus & Intr Registers\n"); > + for (i = 0; i < 13; i++) /* 13 Status & Intr registers */ > + ret += cdns_sprintf(cdns, buf, ret, CDNS_MCP_STAT + i * 4); > + > + ret += scnprintf(buf + ret, RD_BUF - ret, > + "\nSSP & Clk ctrl Registers\n"); > + ret += cdns_sprintf(cdns, buf, ret, CDNS_MCP_SSP_CTRL0); > + ret += cdns_sprintf(cdns, buf, ret, CDNS_MCP_SSP_CTRL1); > + ret += cdns_sprintf(cdns, buf, ret, CDNS_MCP_CLK_CTRL0); > + ret += cdns_sprintf(cdns, buf, ret, CDNS_MCP_CLK_CTRL1); > + > + ret += scnprintf(buf + ret, RD_BUF - ret, > + "\nDPn B0 Registers\n"); > + for (i = 0; i < 7; i++) { > + ret += scnprintf(buf + ret, RD_BUF - ret, > + "\nDP-%d\n", i); > + for (j = 0; j < 6; j++) > + ret += cdns_sprintf(cdns, buf, ret, > + CDNS_DPN_B0_CONFIG(i) + j * 4); > + } > + > + ret += scnprintf(buf + ret, RD_BUF - ret, > + "\nDPn B1 Registers\n"); > + for (i = 0; i < 7; i++) { > + ret += scnprintf(buf + ret, RD_BUF - ret, > + "\nDP-%d\n", i); > + > + for (j = 0; j < 6; j++) > + ret += cdns_sprintf(cdns, buf, ret, > + CDNS_DPN_B1_CONFIG(i) + j * 4); > + } > + > + ret += scnprintf(buf + ret, RD_BUF - ret, > + "\nDPn Control Registers\n"); > + for (i = 0; i < 7; i++) > + ret += cdns_sprintf(cdns, buf, ret, > + CDNS_PORTCTRL + i * CDNS_PORT_OFFSET); > + > + ret += scnprintf(buf + ret, RD_BUF - ret, > + "\nPDIn Config Registers\n"); > + for (i = 0; i < 7; i++) > + ret += cdns_sprintf(cdns, buf, ret, CDNS_PDI_CONFIG(i)); > + > + ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret); > + kfree(buf); > + > + return ret; > +} > + > +static const struct file_operations cdns_reg_fops = { > + .open = simple_open, > + .read = cdns_reg_read, > + .llseek = default_llseek, > +}; > + > +/** > + * sdw_cdns_debugfs_init() - Cadence debugfs init > + * @cdns: Cadence instance > + * @root: debugfs root > + */ > +void sdw_cdns_debugfs_init(struct sdw_cdns *cdns, struct dentry *root) > +{ > + debugfs_create_file("cdns-registers", 0400, root, cdns, &cdns_reg_fops); > +} > +EXPORT_SYMBOL(sdw_cdns_debugfs_init); Wait, why is this exported at all? No one is calling it.
>> +void sdw_cdns_debugfs_init(struct sdw_cdns *cdns, struct dentry *root) >> +{ >> + debugfs_create_file("cdns-registers", 0400, root, cdns, &cdns_reg_fops); >> +} >> +EXPORT_SYMBOL(sdw_cdns_debugfs_init); > > Don't wrap debugfs calls with export symbol without using > EXPORT_SYMBOL_GPL() or you will get grumpy emails from me :) Yes, that's a miss. I've already seen this comment and fixed it for SOF, I should have thought about it for SoundWire, my bad.
diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c index 682789bb8ab3..e9c30f18ce25 100644 --- a/drivers/soundwire/cadence_master.c +++ b/drivers/soundwire/cadence_master.c @@ -8,6 +8,7 @@ #include <linux/delay.h> #include <linux/device.h> +#include <linux/debugfs.h> #include <linux/interrupt.h> #include <linux/module.h> #include <linux/mod_devicetable.h> @@ -222,6 +223,103 @@ static int cdns_clear_bit(struct sdw_cdns *cdns, int offset, u32 value) return -EAGAIN; } +/* + * debugfs + */ + +#define RD_BUF (2 * PAGE_SIZE) + +static ssize_t cdns_sprintf(struct sdw_cdns *cdns, + char *buf, size_t pos, unsigned int reg) +{ + return scnprintf(buf + pos, RD_BUF - pos, + "%4x\t%4x\n", reg, cdns_readl(cdns, reg)); +} + +static ssize_t cdns_reg_read(struct file *file, char __user *user_buf, + size_t count, loff_t *ppos) +{ + struct sdw_cdns *cdns = file->private_data; + char *buf; + ssize_t ret; + int i, j; + + buf = kzalloc(RD_BUF, GFP_KERNEL); + if (!buf) + return -ENOMEM; + + ret = scnprintf(buf, RD_BUF, "Register Value\n"); + ret += scnprintf(buf + ret, RD_BUF - ret, "\nMCP Registers\n"); + for (i = 0; i < 8; i++) /* 8 MCP registers */ + ret += cdns_sprintf(cdns, buf, ret, i * 4); + + ret += scnprintf(buf + ret, RD_BUF - ret, + "\nStatus & Intr Registers\n"); + for (i = 0; i < 13; i++) /* 13 Status & Intr registers */ + ret += cdns_sprintf(cdns, buf, ret, CDNS_MCP_STAT + i * 4); + + ret += scnprintf(buf + ret, RD_BUF - ret, + "\nSSP & Clk ctrl Registers\n"); + ret += cdns_sprintf(cdns, buf, ret, CDNS_MCP_SSP_CTRL0); + ret += cdns_sprintf(cdns, buf, ret, CDNS_MCP_SSP_CTRL1); + ret += cdns_sprintf(cdns, buf, ret, CDNS_MCP_CLK_CTRL0); + ret += cdns_sprintf(cdns, buf, ret, CDNS_MCP_CLK_CTRL1); + + ret += scnprintf(buf + ret, RD_BUF - ret, + "\nDPn B0 Registers\n"); + for (i = 0; i < 7; i++) { + ret += scnprintf(buf + ret, RD_BUF - ret, + "\nDP-%d\n", i); + for (j = 0; j < 6; j++) + ret += cdns_sprintf(cdns, buf, ret, + CDNS_DPN_B0_CONFIG(i) + j * 4); + } + + ret += scnprintf(buf + ret, RD_BUF - ret, + "\nDPn B1 Registers\n"); + for (i = 0; i < 7; i++) { + ret += scnprintf(buf + ret, RD_BUF - ret, + "\nDP-%d\n", i); + + for (j = 0; j < 6; j++) + ret += cdns_sprintf(cdns, buf, ret, + CDNS_DPN_B1_CONFIG(i) + j * 4); + } + + ret += scnprintf(buf + ret, RD_BUF - ret, + "\nDPn Control Registers\n"); + for (i = 0; i < 7; i++) + ret += cdns_sprintf(cdns, buf, ret, + CDNS_PORTCTRL + i * CDNS_PORT_OFFSET); + + ret += scnprintf(buf + ret, RD_BUF - ret, + "\nPDIn Config Registers\n"); + for (i = 0; i < 7; i++) + ret += cdns_sprintf(cdns, buf, ret, CDNS_PDI_CONFIG(i)); + + ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret); + kfree(buf); + + return ret; +} + +static const struct file_operations cdns_reg_fops = { + .open = simple_open, + .read = cdns_reg_read, + .llseek = default_llseek, +}; + +/** + * sdw_cdns_debugfs_init() - Cadence debugfs init + * @cdns: Cadence instance + * @root: debugfs root + */ +void sdw_cdns_debugfs_init(struct sdw_cdns *cdns, struct dentry *root) +{ + debugfs_create_file("cdns-registers", 0400, root, cdns, &cdns_reg_fops); +} +EXPORT_SYMBOL(sdw_cdns_debugfs_init); + /* * IO Calls */ diff --git a/drivers/soundwire/cadence_master.h b/drivers/soundwire/cadence_master.h index fe2af62958b1..d375bbfead18 100644 --- a/drivers/soundwire/cadence_master.h +++ b/drivers/soundwire/cadence_master.h @@ -163,6 +163,11 @@ int sdw_cdns_pdi_init(struct sdw_cdns *cdns, struct sdw_cdns_stream_config config); int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns); +void sdw_cdns_debugfs_init(struct sdw_cdns *cdns, struct dentry *root); + +int sdw_cdns_suspend(struct sdw_cdns *cdns); +bool sdw_cdns_check_resume_status(struct sdw_cdns *cdns); + int sdw_cdns_get_stream(struct sdw_cdns *cdns, struct sdw_cdns_streams *stream, u32 ch, u32 dir);
Add debugfs file to dump the Cadence master registers Credits: this patch is based on an earlier internal contribution by Vinod Koul, Sanyog Kale, Shreyas Nc and Hardik Shah. The main change is the use of scnprintf to avoid known issues with snprintf. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- drivers/soundwire/cadence_master.c | 98 ++++++++++++++++++++++++++++++ drivers/soundwire/cadence_master.h | 5 ++ 2 files changed, 103 insertions(+)