Netdev Archive on lore.kernel.org help / color / mirror / Atom feed
From: Jonathan Lemon <jonathan.lemon@gmail.com> To: davem@davemloft.net, kuba@kernel.org, richardcochran@gmail.com Cc: netdev@vger.kernel.org, kernel-team@fb.com, abyagowi@fb.com Subject: [PATCH net-next 08/11] ptp: ocp: Add sysfs attribute utc_tai_offset Date: Mon, 30 Aug 2021 16:52:33 -0700 [thread overview] Message-ID: <20210830235236.309993-9-jonathan.lemon@gmail.com> (raw) In-Reply-To: <20210830235236.309993-1-jonathan.lemon@gmail.com> IRIG and DCF output time in UTC, but the timecard operates on TAI internally. Add an attribute node which allows adding an offset to these modes before output. Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com> --- drivers/ptp/ptp_ocp.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c index fceeee380d9f..093385c6fed0 100644 --- a/drivers/ptp/ptp_ocp.c +++ b/drivers/ptp/ptp_ocp.c @@ -230,8 +230,9 @@ struct ptp_ocp { int gnss_port; int mac_port; /* miniature atomic clock */ u8 serial[6]; - int flash_start; bool has_serial; + int flash_start; + s32 utc_tai_offset; }; struct ocp_resource { @@ -1592,6 +1593,40 @@ available_sma_outputs_show(struct device *dev, } static DEVICE_ATTR_RO(available_sma_outputs); +static ssize_t +utc_tai_offset_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct ptp_ocp *bp = dev_get_drvdata(dev); + + return sysfs_emit(buf, "%d\n", bp->utc_tai_offset); +} + +static ssize_t +utc_tai_offset_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; + s32 val; + + err = kstrtos32(buf, 0, &val); + if (err) + return err; + + bp->utc_tai_offset = val; + + spin_lock_irqsave(&bp->lock, flags); + iowrite32(val, &bp->irig_out->adj_sec); + iowrite32(val, &bp->dcf_out->adj_sec); + spin_unlock_irqrestore(&bp->lock, flags); + + return count; +} +static DEVICE_ATTR_RW(utc_tai_offset); + static ssize_t clock_source_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -1644,6 +1679,7 @@ static struct attribute *timecard_attrs[] = { &dev_attr_sma4_in.attr, &dev_attr_available_sma_inputs.attr, &dev_attr_available_sma_outputs.attr, + &dev_attr_utc_tai_offset.attr, NULL, }; ATTRIBUTE_GROUPS(timecard); -- 2.31.1
next prev parent reply other threads:[~2021-08-30 23:52 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-30 23:52 [PATCH net-next 00/11] ocp timecard updates Jonathan Lemon 2021-08-30 23:52 ` [PATCH net-next 01/11] ptp: ocp: parameterize the i2c driver used Jonathan Lemon 2021-08-30 23:52 ` [PATCH net-next 02/11] ptp: ocp: Parameterize the TOD information display Jonathan Lemon 2021-08-30 23:52 ` [PATCH net-next 03/11] ptp: ocp: Skip I2C flash read when there is no controller Jonathan Lemon 2021-08-30 23:52 ` [PATCH net-next 04/11] ptp: ocp: Skip resources with out of range irqs Jonathan Lemon 2021-08-30 23:52 ` [PATCH net-next 05/11] ptp: ocp: Add third timestamper Jonathan Lemon 2021-08-30 23:52 ` [PATCH net-next 06/11] ptp: ocp: Add SMA selector and controls Jonathan Lemon 2021-09-01 23:56 ` Jakub Kicinski 2021-09-02 16:55 ` Jonathan Lemon 2021-08-30 23:52 ` [PATCH net-next 07/11] ptp: ocp: Add IRIG-B and DCF blocks Jonathan Lemon 2021-08-30 23:52 ` Jonathan Lemon [this message] 2021-09-01 23:56 ` [PATCH net-next 08/11] ptp: ocp: Add sysfs attribute utc_tai_offset Jakub Kicinski 2021-09-02 16:57 ` Jonathan Lemon 2021-08-30 23:52 ` [PATCH net-next 09/11] ptp: ocp: Add debugfs entry for timecard Jonathan Lemon 2021-09-02 0:06 ` Jakub Kicinski 2021-09-02 17:00 ` Jonathan Lemon 2021-08-30 23:52 ` [PATCH net-next 10/11] ptp: ocp: Add IRIG-B output mode control Jonathan Lemon 2021-09-02 0:07 ` Jakub Kicinski 2021-09-02 17:02 ` Jonathan Lemon 2021-09-02 22:41 ` Jakub Kicinski 2021-08-30 23:52 ` [PATCH net-next 11/11] docs: ABI: Add sysfs documentation for timecard Jonathan Lemon
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=20210830235236.309993-9-jonathan.lemon@gmail.com \ --to=jonathan.lemon@gmail.com \ --cc=abyagowi@fb.com \ --cc=davem@davemloft.net \ --cc=kernel-team@fb.com \ --cc=kuba@kernel.org \ --cc=netdev@vger.kernel.org \ --cc=richardcochran@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).