| Message ID | 20220513225924.1655-9-jonathan.lemon@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ptp: ocp: various updates | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/fixes_present | success | Fixes tag not required for -next series |
| netdev/subject_prefix | success | Link |
| netdev/cover_letter | success | Series has a cover letter |
| netdev/patch_count | success | Link |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/cc_maintainers | success | CCed 3 of 3 maintainers |
| netdev/build_clang | success | Errors and warnings before: 0 this patch: 0 |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/verify_fixes | success | No Fixes tag |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 53 lines checked |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
On Fri, 13 May 2022 15:59:22 -0700 Jonathan Lemon wrote: > 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> This one and patch 10 need Fixes tags
On Mon, May 16, 2022 at 05:43:17PM -0700, Jakub Kicinski wrote: > On Fri, 13 May 2022 15:59:22 -0700 Jonathan Lemon wrote: > > 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> > > This one and patch 10 need Fixes tags This is for a debugfs entry. I disagree that a Fixes: tag is needed here. I'll do it for patch 10 if you insist, but this only happens if ptp_clock_register() fails, which not normally seen.
On Mon, 16 May 2022 18:54:28 -0700 Jonathan Lemon wrote: > On Mon, May 16, 2022 at 05:43:17PM -0700, Jakub Kicinski wrote: > > On Fri, 13 May 2022 15:59:22 -0700 Jonathan Lemon wrote: > > > 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> > > > > This one and patch 10 need Fixes tags > > This is for a debugfs entry. I disagree that a Fixes: tag > is needed here. > > I'll do it for patch 10 if you insist, but this only happens > if ptp_clock_register() fails, which not normally seen. Fixes need a fixes tag and need to target the right tree.
On Mon, May 16, 2022 at 06:54:28PM -0700, Jonathan Lemon wrote: > On Mon, May 16, 2022 at 05:43:17PM -0700, Jakub Kicinski wrote: > > On Fri, 13 May 2022 15:59:22 -0700 Jonathan Lemon wrote: > > > 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> > > > > This one and patch 10 need Fixes tags > > This is for a debugfs entry. I disagree that a Fixes: tag > is needed here. > > I'll do it for patch 10 if you insist, but this only happens > if ptp_clock_register() fails, which not normally seen. Actually, patch 10 would be: Fixes: c205d53c4923 ("ptp: ocp: Add firmware capability bits for feature gating") Which is only in 5.18-rcX at this point. Do we need a fixes tags for code which hasn't made it into a full release release yet?
On Tue, 17 May 2022 08:39:42 -0700 Jonathan Lemon wrote: > On Mon, May 16, 2022 at 06:54:28PM -0700, Jonathan Lemon wrote: > > On Mon, May 16, 2022 at 05:43:17PM -0700, Jakub Kicinski wrote: > > > This one and patch 10 need Fixes tags > > > > This is for a debugfs entry. I disagree that a Fixes: tag > > is needed here. > > > > I'll do it for patch 10 if you insist, but this only happens > > if ptp_clock_register() fails, which not normally seen. > > Actually, patch 10 would be: > > Fixes: c205d53c4923 ("ptp: ocp: Add firmware capability bits for feature gating") > > Which is only in 5.18-rcX at this point. > > Do we need a fixes tags for code which hasn't made it into a > full release release yet? Yup, having the Fixes tag makes it obvious to the maintainer that the tree selection is correct and helps backporters figure out if they need to worry that the patch didn't apply.
diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c index af776c788379..67733b319bdc 100644 --- a/drivers/ptp/ptp_ocp.c +++ b/drivers/ptp/ptp_ocp.c @@ -3070,10 +3070,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; @@ -3236,17 +3236,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) + } 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); @@ -3271,12 +3280,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;
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 | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)