Skip to content

S
Software for White Rabbit PTP Core
Commit 1ea37179 authored by Tristan Gingold's avatar Tristan Gingold
Browse files
Options

Extract task-diags.c from monitor_ppsi.c

parent ee54d112
Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 123 deletions
lib/lib.mk
View file @ 1ea37179
obj-y += \
lib/util.o \
lib/wrc-tasks.o \
obj-$(CONFIG_WRPC_PPSI) += \
lib/events-ptp.o \
obj-$(CONFIG_ARCH_LM32) += \
lib/assert.o \
lib/usleep.o \
lib/event.o
obj-$(CONFIG_ARCH_RISCV) += \
lib/assert.o \
lib/usleep.o \
lib/event.o
obj-$(CONFIG_WRPC_PPSI) += \
lib/events-ptp.o \
obj-$(CONFIG_EMBEDDED_NODE) += lib/task-diags.o
obj-$(CONFIG_WR_NODE) += lib/net.o
......
lib/task-diags.c 0 → 100644
View file @ 1ea37179
/*
* This work is part of the White Rabbit project
*
* Copyright (C) 2021 CERN
* Author: Wesley W. Terpstra <w.terpstra@gsi.de>
*
* Released according to the GNU GPL, version 2 or any later version.
*/
/* This periodic task is responsible of updating diagnostics
data (in wdiags) */
#include <inttypes.h>
#include "wrc-task.h"
#include "ppsi/ppsi.h"
#include "wrpc.h"
#include "dev/wdiags.h"
#include "sensors.h"
#include "softpll/softpll_ng.h"
#include "dev/netif.h"
#include "dev/pps_gen.h"
#include "wrc_global.h"
#define WRC_DIAG_REFRESH_PERIOD (1 * TICS_PER_SECOND)
int wrc_wr_diags(void)
{
struct wrc_port_state ps;
static uint32_t last_update_tick;
int tx, rx, rx_err;
uint64_t sec;
uint32_t nsec;
int n_out;
uint32_t aux_stat = 0;
int temp = 0, valid = 0, snapshot = 0, i;
struct pp_instance *ppi = ppg->pp_instances;
valid = wdiag_get_valid();
snapshot = wdiag_get_snapshot();
/* if the data is snapshot and there is already valid data, do not
* refresh */
if (valid & snapshot)
return 0;
/* ***************** lock data from reading by user **************** */
/* stats update condition */
if (wrc_task_not_yet(&last_update_tick, WRC_DIAG_REFRESH_PERIOD))
return 0;
/* ***************** lock data from reading by user **************** */
wdiag_set_valid(0);
/* frame statistics */
minic_get_stats(&tx, &rx, &rx_err);
wdiags_write_cnts(tx, rx, rx_err);
/* local time */
shw_pps_gen_get_time(&sec, &nsec);
wdiags_write_time(sec, nsec);
/* port state */
wrpc_get_port_state(&ps, NULL);
wdiags_write_port_state((wrc_global_link.link_up == NETIF_LINK_UP), (ps.locked ? 1 : 0));
/* port PTP State (from ppsi)
* see: ppsi/include/ppsi/ieee1588_types.h
0 : none
1 : PPS_INITIALIZING
2 : PPS_FAULTY
3 : PPS_DISABLED
4 : PPS_LISTENING
5 : PPS_PRE_MASTER
6 : PPS_MASTER
7 : PPS_PASSIVE
8 : PPS_UNCALIBRATED
9 : PPS_SLAVE
*/
wdiags_write_ptp_state((uint8_t)ppi->state);
/* servo state (if slave)s */
if (ptp_mode == WRC_MODE_SLAVE) {
struct pp_servo *s = SRV(ppg->pp_instances);
struct wr_servo_ext *wr_servo_ext = NULL;
struct wrh_servo_t *wrh_servo = NULL;
int32_t asym;
int wr_mode;
int32_t cur_setpoint_ps = 0;
uint64_t mu = 0;
asym = interval_to_picos(ppi_static.portDS->delayAsymmetry);
wr_mode = (s->flags & PP_SERVO_FLAG_VALID) ? 1 : 0;
wrh_servo = (ppi_static.protocol_extension == PPSI_EXT_WR && ppi_static.extState == PP_EXSTATE_ACTIVE) ?
(wrh_servo_t*) ppi_static.ext_data : NULL;
if (wrh_servo) {
wr_servo_ext = &((struct wr_data *)wrh_servo)->servo_ext;
mu = pp_time_to_picos(&wr_servo_ext->rawDelayMM),
cur_setpoint_ps = wrh_servo->cur_setpoint_ps;
}
/* see ppsi/include/hw-specific/wrh.h:
0: WRH_UNINITIALIZED = 0,
1: WRH_SYNC_TAI,
2: WRH_SYNC_NSEC,
3: WRH_SYNC_PHASE,
4: WRH_TRACK_PHASE,
5: WRH_WAIT_OFFSET_STABLE */
wdiags_write_servo_state(wr_mode,
s->state,
mu,
pp_time_to_picos(&s->delayMS),
asym,
(int32_t) pp_time_to_picos(&s->offsetFromMaster),
cur_setpoint_ps,
ppi_static.servo->update_count, 0, 0);
}
/* Auxiliar channels (if any) */
spll_get_num_channels(NULL, &n_out);
if (n_out > 8) n_out = 8; /* hardware limit. */
for (i = 0; i < n_out; i++) {
aux_stat |= ((SPLL_AUX_SLAVE_LOCKED | SPLL_AUX_MONITOR_READY) & spll_get_aux_status(i).flags) << i;
}
wdiags_write_aux_state(aux_stat);
/* temperature */
if (HAS_TEMP_SENSORS) {
temp = wrc_temp_get("pcb");
wdiags_write_temp(temp);
}
/* **************** unlock data from reading by user ************** */
wdiag_set_valid(1);
return 1;
}
monitor/monitor_ppsi.c
View file @ 1ea37179
......@@ -36,7 +36,6 @@
#define WRC_MONITOR_REFRESH_PERIOD (1 * TICS_PER_SECOND)
#define WRC_DIAG_REFRESH_PERIOD (1 * TICS_PER_SECOND)
#define DESCRIPTION_MAIN 1
#define DESCRIPTION_SERVO 2
......@@ -890,119 +889,6 @@ int wrc_log_stats(void)
return 1;
}
int wrc_wr_diags(void)
{
struct wrc_port_state ps;
static uint32_t last_update_tick;
int tx, rx, rx_err;
uint64_t sec;
uint32_t nsec;
int n_out;
uint32_t aux_stat = 0;
int temp = 0, valid = 0, snapshot = 0, i;
struct pp_instance *ppi = ppg->pp_instances;
valid = wdiag_get_valid();
snapshot = wdiag_get_snapshot();
/* if the data is snapshot and there is already valid data, do not
* refresh */
if (valid & snapshot)
return 0;
/* ***************** lock data from reading by user **************** */
/* stats update condition */
if (wrc_task_not_yet(&last_update_tick, WRC_DIAG_REFRESH_PERIOD))
return 0;
/* ***************** lock data from reading by user **************** */
wdiag_set_valid(0);
/* frame statistics */
minic_get_stats(&tx, &rx, &rx_err);
wdiags_write_cnts(tx, rx, rx_err);
/* local time */
shw_pps_gen_get_time(&sec, &nsec);
wdiags_write_time(sec, nsec);
/* port state */
wrpc_get_port_state(&ps, NULL);
wdiags_write_port_state((wrc_global_link.link_up == NETIF_LINK_UP), (ps.locked ? 1 : 0));
/* port PTP State (from ppsi)
* see: ppsi/include/ppsi/ieee1588_types.h
0 : none
1 : PPS_INITIALIZING
2 : PPS_FAULTY
3 : PPS_DISABLED
4 : PPS_LISTENING
5 : PPS_PRE_MASTER
6 : PPS_MASTER
7 : PPS_PASSIVE
8 : PPS_UNCALIBRATED
9 : PPS_SLAVE
*/
wdiags_write_ptp_state((uint8_t)ppi->state);
/* servo state (if slave)s */
if (ptp_mode == WRC_MODE_SLAVE) {
struct pp_servo *s = SRV(ppg->pp_instances);
struct wr_servo_ext *wr_servo_ext = NULL;
struct wrh_servo_t *wrh_servo = NULL;
int32_t asym;
int wr_mode;
int32_t cur_setpoint_ps = 0;
uint64_t mu = 0;
asym = interval_to_picos(ppi_static.portDS->delayAsymmetry);
wr_mode = (s->flags & PP_SERVO_FLAG_VALID) ? 1 : 0;
wrh_servo = (ppi_static.protocol_extension == PPSI_EXT_WR && ppi_static.extState == PP_EXSTATE_ACTIVE) ?
(wrh_servo_t*) ppi_static.ext_data : NULL;
if (wrh_servo) {
wr_servo_ext = &((struct wr_data *)wrh_servo)->servo_ext;
mu = pp_time_to_picos(&wr_servo_ext->rawDelayMM),
cur_setpoint_ps = wrh_servo->cur_setpoint_ps;
}
/* see ppsi/include/hw-specific/wrh.h:
0: WRH_UNINITIALIZED = 0,
1: WRH_SYNC_TAI,
2: WRH_SYNC_NSEC,
3: WRH_SYNC_PHASE,
4: WRH_TRACK_PHASE,
5: WRH_WAIT_OFFSET_STABLE */
wdiags_write_servo_state(wr_mode,
s->state,
mu,
pp_time_to_picos(&s->delayMS),
asym,
(int32_t) pp_time_to_picos(&s->offsetFromMaster),
cur_setpoint_ps,
ppi_static.servo->update_count, 0, 0);
}
/* Auxiliar channels (if any) */
spll_get_num_channels(NULL, &n_out);
if (n_out > 8) n_out = 8; /* hardware limit. */
for (i = 0; i < n_out; i++) {
aux_stat |= ((SPLL_AUX_SLAVE_LOCKED | SPLL_AUX_MONITOR_READY) & spll_get_aux_status(i).flags) << i;
}
wdiags_write_aux_state(aux_stat);
/* temperature */
if (HAS_TEMP_SENSORS) {
temp = wrc_temp_get("pcb");
wdiags_write_temp(temp);
}
/* **************** unlock data from reading by user ************** */
wdiag_set_valid(1);
return 1;
}
#if 0
......
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