[PATCH 1/2] net: dsa: mv88e6xxx: add write access to debugfs regs file
Allow write access to the regs file in the debugfs interface, with the following parameters: echo> regs Where "name" is the register name (as shown in the header row), "reg" is the register address (as shown in the first column) and "value" is the 16-bit value. e.g.: echo GLOBAL 1a 5550 > regs Signed-off-by: Vivien Didelot --- drivers/net/dsa/mv88e6xxx.c | 32 +++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c index 8c130c0..04e6eb6 100644 --- a/drivers/net/dsa/mv88e6xxx.c +++ b/drivers/net/dsa/mv88e6xxx.c @@ -1648,6 +1648,35 @@ static int mv88e6xxx_regs_show(struct seq_file *s, void *p) return 0; } +static ssize_t mv88e6xxx_regs_write(struct file *file, const char __user *buf, + size_t count, loff_t *ppos) +{ + struct seq_file *s = file->private_data; + struct dsa_switch *ds = s->private; + struct mv88e6xxx_priv_state *ps = ds_to_priv(ds); + char name[count]; + unsigned int port, reg, val; + int ret; + + ret = sscanf(buf, "%s %x %x", name, ®, &val); + if (ret != 3) + return -EINVAL; + + if (reg > 0x1f || val > 0x) + return -ERANGE; + + if (strcasecmp(name, "GLOBAL") == 0) + ret = mv88e6xxx_reg_write(ds, REG_GLOBAL, reg, val); + else if (strcasecmp(name, "GLOBAL2") == 0) + ret = mv88e6xxx_reg_write(ds, REG_GLOBAL2, reg, val); + else if (kstrtouint(name, 10, &port) == 0 && port < ps->num_ports) + ret = mv88e6xxx_reg_write(ds, REG_PORT(port), reg, val); + else + return -EINVAL; + + return ret < 0 ? ret : count; +} + static int mv88e6xxx_regs_open(struct inode *inode, struct file *file) { return single_open(file, mv88e6xxx_regs_show, inode->i_private); @@ -1656,6 +1685,7 @@ static int mv88e6xxx_regs_open(struct inode *inode, struct file *file) static const struct file_operations mv88e6xxx_regs_fops = { .open = mv88e6xxx_regs_open, .read = seq_read, + .write = mv88e6xxx_regs_write, .llseek = no_llseek, .release = single_release, .owner = THIS_MODULE, @@ -1895,7 +1925,7 @@ int mv88e6xxx_setup_common(struct dsa_switch *ds) ps->dbgfs = debugfs_create_dir(name, NULL); kfree(name); - debugfs_create_file("regs", S_IRUGO, ps->dbgfs, ds, + debugfs_create_file("regs", S_IRUGO | S_IWUSR, ps->dbgfs, ds, &mv88e6xxx_regs_fops); debugfs_create_file("atu", S_IRUGO, ps->dbgfs, ds, -- 2.4.5 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] net: dsa: mv88e6xxx: add write access to debugfs regs file
On Wed, Jul 08, 2015 at 04:36:18PM -0400, Vivien Didelot wrote: > Allow write access to the regs file in the debugfs interface, with the > following parameters: > > echo> regs > > Where "name" is the register name (as shown in the header row), "reg" is > the register address (as shown in the first column) and "value" is the > 16-bit value. e.g.: > > echo GLOBAL 1a 5550 > regs > > Signed-off-by: Vivien Didelot > --- > drivers/net/dsa/mv88e6xxx.c | 32 +++- > 1 file changed, 31 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c > index 8c130c0..04e6eb6 100644 > --- a/drivers/net/dsa/mv88e6xxx.c > +++ b/drivers/net/dsa/mv88e6xxx.c > @@ -1648,6 +1648,35 @@ static int mv88e6xxx_regs_show(struct seq_file *s, > void *p) > return 0; > } > > +static ssize_t mv88e6xxx_regs_write(struct file *file, const char __user > *buf, > + size_t count, loff_t *ppos) > +{ > + struct seq_file *s = file->private_data; > + struct dsa_switch *ds = s->private; > + struct mv88e6xxx_priv_state *ps = ds_to_priv(ds); > + char name[count]; Is this safe? Is count somehow limited? If i was to echo 8K to the file would i not exceed the kernel stack space? Andrew -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] net: dsa: mv88e6xxx: add write access to debugfs regs file
Hi Andrew, - On Jul 8, 2015, at 4:53 PM, Andrew Lunn and...@lunn.ch wrote: > On Wed, Jul 08, 2015 at 04:36:18PM -0400, Vivien Didelot wrote: >> Allow write access to the regs file in the debugfs interface, with the >> following parameters: >> >> echo> regs >> >> Where "name" is the register name (as shown in the header row), "reg" is >> the register address (as shown in the first column) and "value" is the >> 16-bit value. e.g.: >> >> echo GLOBAL 1a 5550 > regs >> >> Signed-off-by: Vivien Didelot >> --- >> drivers/net/dsa/mv88e6xxx.c | 32 +++- >> 1 file changed, 31 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c >> index 8c130c0..04e6eb6 100644 >> --- a/drivers/net/dsa/mv88e6xxx.c >> +++ b/drivers/net/dsa/mv88e6xxx.c >> @@ -1648,6 +1648,35 @@ static int mv88e6xxx_regs_show(struct seq_file *s, >> void >> *p) >> return 0; >> } >> >> +static ssize_t mv88e6xxx_regs_write(struct file *file, const char __user >> *buf, >> +size_t count, loff_t *ppos) >> +{ >> +struct seq_file *s = file->private_data; >> +struct dsa_switch *ds = s->private; >> +struct mv88e6xxx_priv_state *ps = ds_to_priv(ds); >> +char name[count]; > > Is this safe? Is count somehow limited? If i was to echo 8K to the > file would i not exceed the kernel stack space? > > Andrew I thought it was. But maybe 32 is a better value here. I'll resend these two patches with char name[32] instead, tomorrow. Thanks for your time, -v -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html