Skip to content

W
White Rabbit Switch - Software
Commit 0fc2dcdd authored by Adam Wujek's avatar Adam Wujek
Browse files
Options

[BUG: 224] Kconfig: genereate PPS in free running master 

Signed-off-by: 's avatarAdam Wujek <dev_public@wujek.eu>
parent 7974fc67
Pipeline #4561 failed with stage
    in 7 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 29 additions and 8 deletions
    Kconfig
    View file @ 0fc2dcdd
    ......@@ -734,12 +734,23 @@ config PPSGEN_GM_DELAY_TO_GEN_PPS_SEC
    transitory phase is terminated. This option then allows to define a delay in seconds to respect before
    generating the PPS when a GM by BMCA is detected.
    A 0 value desactivate this feature.
    config PPSGEN_FORCE
    bool "Force PPS for testing purpose"
    default N
    bool "Force generation of PPS all the time (not for FR)"
    depends on !TIME_FM
    default n
    help
    This option enables the PPS generation all the time in various modes
    except Free-Running Master.
    config PPSGEN_FR_ON_SYNC_ONLY
    bool "In FR mode generate PPS only when synchronized to master"
    depends on TIME_FM
    default n
    help
    This option enables the PPS generation for all cases. It should only be used for testing purpose.
    If device is configured as Free-Running master, generate PPS only
    when synchronized to another master. Otherwise PPS is generated all
    the time."
    endmenu
    ......
    doc/wrs-user-manual.in
    View file @ 0fc2dcdd
    ......@@ -1207,6 +1207,7 @@ appropriate way, before the respective service is started.
    @itemx CONFIG_PPSGEN_PTP_THRESHOLD_MS
    @itemx CONFIG_PPSGEN_GM_DELAY_TO_GEN_PPS_SEC
    @itemx CONFIG_PPSGEN_FORCE
    @itemx CONFIG_PPSGEN_FR_ON_SYNC_ONLY
    Configuration of the 1-PPS (Pulse Per Second) output.
    The generation of 1-PPS output heavily depends on the configured timing mode:
    ......@@ -1214,7 +1215,9 @@ appropriate way, before the respective service is started.
    @item GrandMaster (@t{CONFIG_TIME_GM}, PTP clock class 6)
    PPS generation is always enabled.
    @item Free-running Master (@t{CONFIG_TIME_FM}, PTP clock class 193)
    PPS generation is always enabled.
    PPS generation is by default always enabled.
    If @t{CONFIG_PPSGEN_FR_ON_SYNC_ONLY} is set, then PPS is generated only
    when a switch becomes slave and synchronize to another master.
    @item Arbitrary GrandMaster (@t{CONFIG_TIME_ARB_GM}, PTP clock class 13)
    PPS generation is disabled unless @t{CONFIG_PPSGEN_FORCE} is set
    @item Boundary Clock (@t{CONFIG_TIME_BC}, PTP clock class 248)
    ......
    ppsi @ 851c4244
    Subproject commit 702fc230c4652e5e96bca7b52a69ce7a22f4290d
    Subproject commit 851c424498e6dd1d3091ba1fcc11792e2973c14c
    userspace/rootfs_override/wr/bin/assembly_ppsi_conf.sh
    View file @ 0fc2dcdd
    ......@@ -427,11 +427,18 @@ fi
    if [ -n "$CONFIG_PPSGEN_GM_DELAY_TO_GEN_PPS_SEC" ]; then
    globals[gmDelayToGenPpsSec]="$CONFIG_PPSGEN_GM_DELAY_TO_GEN_PPS_SEC"
    fi
    if [ -n "$CONFIG_PPSGEN_FORCE" ]; then
    # Force PPS generation if selected and if not TIME_FM
    if [ -n "$CONFIG_PPSGEN_FORCE" ] && ! [ "$CONFIG_TIME_FM" = y ]; then
    globals[forcePpsGen]="$CONFIG_PPSGEN_FORCE"
    fi
    # Force PPS generation in TIME_FM unless PPSGEN_FR_ON_SYNC_ONLY selected
    if [ "$CONFIG_TIME_FM" = y ] && ! [ "$CONFIG_PPSGEN_FR_ON_SYNC_ONLY" = y ]; then
    globals[forcePpsGen]=y
    fi
    vlan_error_detected=0 # If a VLAN error is detected, then VLAN are disabled on all ports
    for i_port in {01..18}; do # scan all the physical ports
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment