| Message ID | 20210830235236.309993-11-jonathan.lemon@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ocp timecard updates | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 3 of 3 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 76 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
On Mon, 30 Aug 2021 16:52:35 -0700 Jonathan Lemon wrote: > + err = kstrtou8(buf, 0, &val); > + if (err) > + return err; > + if (val > 7) > + return -EINVAL; > + > + reg = ((val & 0x7) << 16); > + > + spin_lock_irqsave(&bp->lock, flags); > + iowrite32(0, &bp->irig_out->ctrl); /* disable */ > + iowrite32(reg, &bp->irig_out->ctrl); /* change mode */ > + iowrite32(reg | IRIG_M_CTRL_ENABLE, &bp->irig_out->ctrl); > + spin_unlock_irqrestore(&bp->lock, flags); locking
On Wed, Sep 01, 2021 at 05:07:00PM -0700, Jakub Kicinski wrote: > On Mon, 30 Aug 2021 16:52:35 -0700 Jonathan Lemon wrote: > > + err = kstrtou8(buf, 0, &val); > > + if (err) > > + return err; > > + if (val > 7) > > + return -EINVAL; > > + > > + reg = ((val & 0x7) << 16); > > + > > + spin_lock_irqsave(&bp->lock, flags); > > + iowrite32(0, &bp->irig_out->ctrl); /* disable */ > > + iowrite32(reg, &bp->irig_out->ctrl); /* change mode */ > > + iowrite32(reg | IRIG_M_CTRL_ENABLE, &bp->irig_out->ctrl); > > + spin_unlock_irqrestore(&bp->lock, flags); > > locking Not sure what you mean - all register manipulations are already done under the lock here.
On Thu, 2 Sep 2021 10:02:16 -0700 Jonathan Lemon wrote: > On Wed, Sep 01, 2021 at 05:07:00PM -0700, Jakub Kicinski wrote: > > On Mon, 30 Aug 2021 16:52:35 -0700 Jonathan Lemon wrote: > > > + err = kstrtou8(buf, 0, &val); > > > + if (err) > > > + return err; > > > + if (val > 7) > > > + return -EINVAL; > > > + > > > + reg = ((val & 0x7) << 16); > > > + > > > + spin_lock_irqsave(&bp->lock, flags); > > > + iowrite32(0, &bp->irig_out->ctrl); /* disable */ > > > + iowrite32(reg, &bp->irig_out->ctrl); /* change mode */ > > > + iowrite32(reg | IRIG_M_CTRL_ENABLE, &bp->irig_out->ctrl); > > > + spin_unlock_irqrestore(&bp->lock, flags); > > > > locking > > Not sure what you mean - all register manipulations are > already done under the lock here. I must have misread and thought it has the same problem as patch 8, ignore, sorry.
diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c index daa95f48c39f..3cc1b5e661af 100644 --- a/drivers/ptp/ptp_ocp.c +++ b/drivers/ptp/ptp_ocp.c @@ -1634,6 +1634,46 @@ utc_tai_offset_store(struct device *dev, } static DEVICE_ATTR_RW(utc_tai_offset); +static ssize_t +irig_b_mode_show(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct ptp_ocp *bp = dev_get_drvdata(dev); + u32 val; + + val = ioread32(&bp->irig_out->ctrl); + val = (val >> 16) & 0x07; + return sysfs_emit(buf, "%d\n", val); +} + +static ssize_t +irig_b_mode_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct ptp_ocp *bp = dev_get_drvdata(dev); + unsigned long flags; + int err; + u32 reg; + u8 val; + + err = kstrtou8(buf, 0, &val); + if (err) + return err; + if (val > 7) + return -EINVAL; + + reg = ((val & 0x7) << 16); + + spin_lock_irqsave(&bp->lock, flags); + iowrite32(0, &bp->irig_out->ctrl); /* disable */ + iowrite32(reg, &bp->irig_out->ctrl); /* change mode */ + iowrite32(reg | IRIG_M_CTRL_ENABLE, &bp->irig_out->ctrl); + spin_unlock_irqrestore(&bp->lock, flags); + + return count; +} +static DEVICE_ATTR_RW(irig_b_mode); + static ssize_t clock_source_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -1687,6 +1727,7 @@ static struct attribute *timecard_attrs[] = { &dev_attr_available_sma_inputs.attr, &dev_attr_available_sma_outputs.attr, &dev_attr_utc_tai_offset.attr, + &dev_attr_irig_b_mode.attr, NULL, }; ATTRIBUTE_GROUPS(timecard); @@ -1718,7 +1759,7 @@ ptp_ocp_summary_show(struct seq_file *s, void *data) { struct device *dev = s->private; struct ts_reg __iomem *ts_reg; - u32 sma_in, sma_out, val; + u32 sma_in, sma_out, ctrl, val; struct timespec64 ts; struct ptp_ocp *bp; char *buf, *src; @@ -1769,11 +1810,12 @@ ptp_ocp_summary_show(struct seq_file *s, void *data) } if (bp->irig_out) { - on = ioread32(&bp->irig_out->ctrl) & IRIG_M_CTRL_ENABLE; + ctrl = ioread32(&bp->irig_out->ctrl); + on = ctrl & IRIG_M_CTRL_ENABLE; val = ioread32(&bp->irig_out->status); gpio_multi_map(buf, sma_out, 4, "sma1", "sma2", "----"); - seq_printf(s, "%7s: %s, error: %d, out: %s\n", "IRIG", - on ? " ON" : "OFF", val, buf); + seq_printf(s, "%7s: %s, error: %d, mode %d, out: %s\n", "IRIG", + on ? " ON" : "OFF", val, (ctrl >> 16), buf); } if (bp->irig_in) {
IRIG-B has several different output formats, the timecard defaults to using B007. Add a control which selects different output modes. Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com> --- drivers/ptp/ptp_ocp.c | 50 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 4 deletions(-)