From: Jonathan Lemon <jonathan.lemon@gmail.com>
To: netdev@vger.kernel.org
Cc: richardcochran@gmail.com, kernel-team@fb.com,
davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com
Subject: [PATCH net-next v1 08/10] ptp: ocp: fix PPS source selector reporting
Date: Thu, 5 May 2022 16:49:19 -0700 [thread overview]
Message-ID: <20220505234921.3728-9-jonathan.lemon@gmail.com> (raw)
In-Reply-To: <20220505234921.3728-1-jonathan.lemon@gmail.com>
The NTL timecard design has a PPS1 selector which selects the
the PPS source automatically, according to Section 1.9 of the
documentation.
If there is a SMA PPS input detected:
- send signal to MAC and PPS slave selector.
If there is a MAC PPS input detected:
- send GNSS1 to the MAC
- send MAC to the PPS slave
If there is a GNSS1 input detected:
- send GNSS1 to the MAC
- send GNSS1 to the PPS slave.MAC
Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com>
---
drivers/ptp/ptp_ocp.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
index 4e22c445dad4..2b1f854270b0 100644
--- a/drivers/ptp/ptp_ocp.c
+++ b/drivers/ptp/ptp_ocp.c
@@ -3072,10 +3072,10 @@ ptp_ocp_summary_show(struct seq_file *s, void *data)
struct device *dev = s->private;
struct ptp_system_timestamp sts;
struct ts_reg __iomem *ts_reg;
+ char *buf, *src, *mac_src;
struct timespec64 ts;
struct ptp_ocp *bp;
u16 sma_val[4][2];
- char *src, *buf;
u32 ctrl, val;
bool on, map;
int i;
@@ -3238,17 +3238,26 @@ ptp_ocp_summary_show(struct seq_file *s, void *data)
if (bp->pps_select) {
val = ioread32(&bp->pps_select->gpio1);
src = &buf[80];
- if (val & 0x01)
+ mac_src = "GNSS1";
+ if (val & 0x01) {
gpio_input_map(src, bp, sma_val, 0, NULL);
- else if (val & 0x02)
+ mac_src = src;
+ } else if (val & 0x02)
src = "MAC";
else if (val & 0x04)
src = "GNSS1";
- else
+ else {
src = "----";
+ mac_src = src;
+ }
} else {
src = "?";
+ mac_src = src;
}
+ seq_printf(s, "MAC PPS1 src: %s\n", mac_src);
+
+ gpio_input_map(buf, bp, sma_val, 1, "GNSS2");
+ seq_printf(s, "MAC PPS2 src: %s\n", buf);
/* assumes automatic switchover/selection */
val = ioread32(&bp->reg->select);
@@ -3273,12 +3282,6 @@ ptp_ocp_summary_show(struct seq_file *s, void *data)
seq_printf(s, "%7s: %s, state: %s\n", "PHC src", buf,
val & OCP_STATUS_IN_SYNC ? "sync" : "unsynced");
- /* reuses PPS1 src from earlier */
- seq_printf(s, "MAC PPS1 src: %s\n", src);
-
- gpio_input_map(buf, bp, sma_val, 1, "GNSS2");
- seq_printf(s, "MAC PPS2 src: %s\n", buf);
-
if (!ptp_ocp_gettimex(&bp->ptp_info, &ts, &sts)) {
struct timespec64 sys_ts;
s64 pre_ns, post_ns, ns;
--
2.31.1
next prev parent reply other threads:[~2022-05-05 23:49 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-05 23:49 [PATCH net-next v1 00/10] ptp: ocp: various updates Jonathan Lemon
2022-05-05 23:49 ` [PATCH net-next v1 01/10] ptp: ocp: 32-bit fixups for pci start address Jonathan Lemon
2022-05-05 23:49 ` [PATCH net-next v1 02/10] ptp: ocp: add Celestica timecard PCI ids Jonathan Lemon
2022-05-05 23:49 ` [PATCH net-next v1 03/10] ptp: ocp: revise firmware display Jonathan Lemon
2022-05-05 23:49 ` [PATCH net-next v1 04/10] ptp: ocp: parameterize input/output sma selectors Jonathan Lemon
2022-05-05 23:49 ` [PATCH net-next v1 05/10] ptp: ocp: constify selectors Jonathan Lemon
2022-05-05 23:49 ` [PATCH net-next v1 06/10] ptp: ocp: vectorize the sma accessor functions Jonathan Lemon
2022-05-06 4:19 ` kernel test robot
2022-05-05 23:49 ` [PATCH net-next v1 07/10] ptp: ocp: add .init function for sma_op vector Jonathan Lemon
2022-05-05 23:49 ` Jonathan Lemon [this message]
2022-05-05 23:49 ` [PATCH net-next v1 09/10] ptp: ocp: Add firmware header checks Jonathan Lemon
2022-05-05 23:49 ` [PATCH net-next v1 10/10] ptp: ocp: change sysfs attr group handling 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=20220505234921.3728-9-jonathan.lemon@gmail.com \
--to=jonathan.lemon@gmail.com \
--cc=davem@davemloft.net \
--cc=kernel-team@fb.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--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: link
Be 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).