[Feature: 1045] userspace/wrsw_hal: add support of the synced led

Enable synced LED (right LED of each port) when ppsi's servo got synced. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

[Feature: 1045] userspace/wrsw_hal: add support of the synced led
Enable synced LED (right LED of each port) when ppsi's servo got synced. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
84cfe29a · Adam Wujek · 4d12719d · 84cfe29a · 84cfe29a · 84cfe29a
Commit 84cfe29a authored Nov 25, 2016 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 158 additions and 4 deletions

wrs-user-manual.in doc/wrs-user-manual.in +4 -1

Makefile userspace/wrsw_hal/Makefile +3 -1

hal_ports.c userspace/wrsw_hal/hal_ports.c +151 -2

No files found.
--- a/doc/wrs-user-manual.in
+++ b/doc/wrs-user-manual.in
@@ -1308,7 +1308,10 @@ the configured function. For ports configured as a slave the LED is green, for
 master ports the LED is yellow. For ports configured as an auto, none, non-wr
 and other cases (including wrong configuration) the left LED is orange.
-The right LED blinks when packet is transmitted or received on a port.
+The right LED is green when a particular port is synchronized to the master.
+When a packet is transmitted or received on a port the right LED blinks orange.
+If a port is also synced then it blinks yellow instead.
 @c ############################################################################
 @node Booting with Barebox

--- a/userspace/wrsw_hal/Makefile
+++ b/userspace/wrsw_hal/Makefile
@@ -21,7 +21,9 @@ CFLAGS = -O -g -Wall \
 	-I../include \
 	-I../libwr/include \
 	-I../mini-rpc \
-	-I$(LINUX)/arch/arm/mach-at91/include
+	-I$(LINUX)/arch/arm/mach-at91/include \
+	-I../ppsi/include \
+	-I../ppsi/arch-wrs/include
 GIT_VER = $(shell git describe --always --dirty | sed  's;^wr-switch-sw-;;')
 CFLAGS += -D__GIT_VER__="\"${GIT_VER}\""

--- a/userspace/wrsw_hal/hal_ports.c
+++ b/userspace/wrsw_hal/hal_ports.c
@@ -23,6 +23,7 @@
 #include <libwr/shmem.h>
 #include <libwr/config.h>
+#include <ppsi/ppsi.h>
 #include "wrsw_hal.h"
 #include "timeout.h"
 #include <rt_ipc.h>
@@ -50,7 +51,15 @@ static int hal_port_rts_state_valid = 0;
 static timeout_t hal_port_tmo_rts, hal_port_tmo_sfp;
 static int hal_port_nports;
+static struct wr_servo_state *ppsi_servo;
+static struct wr_servo_state ppsi_servo_local;
+static struct wrs_shm_head *ppsi_head;
 int hal_port_check_lock(const char *port_name);
+static void set_led_synced(int p_index, int val);
+static void update_sync_leds(void);
+static int read_servo(void);
+static int try_open_ppsi_shmem(void);
 int hal_port_any_locked(void)
 {
@@ -364,6 +373,9 @@ static int hal_port_link_down(struct hal_port_state * p, int link_up)
 				rts_set_mode(RTS_MODE_GM_FREERUNNING);
 		}
+		/* turn off synced LED */
+		set_led_synced(p->hw_index, 0);
 		/* turn off link/wrmode LEDs */
 		shw_sfp_set_led_wrmode_off(p->hw_index);
 		p->state = HAL_PORT_STATE_LINK_DOWN;
@@ -661,6 +673,8 @@ void hal_port_update_all()
 	/* unlock shmem */
 	wrs_shm_write(hal_shmem_hdr, WRS_SHM_WRITE_END);
+	/* update LEDs of synced ports */
+	update_sync_leds();
 }
 int hal_port_enable_tracking(const char *port_name)
@@ -722,5 +736,140 @@ int hal_port_check_lock(const char *port_name)
 		(hs->flags & RTS_REF_LOCKED));
 }
-/* Public function for querying the state of a particular port (DMTD
+/* to avoid i2c transfers to set the synced LEDs, cache their state */
- * phase, calibration deltas, etc.) */
+static void set_led_synced(int p_index, int val)
+{
+	/* We assume that after the HAL is started all LEDs are off */
+	static int leds_map[HAL_MAX_PORTS];
+	if (p_index >= HAL_MAX_PORTS)
+		return;
+	if (leds_map[p_index] == val) {
+		/* value has not changed */
+		return;
+	}
+	/* update the LED */
+	shw_sfp_set_led_synced(p_index, val);
+	leds_map[p_index] = val;
+}
+static void update_sync_leds(void)
+{
+	int i;
+	static uint32_t update_count = 0;
+	static uint32_t since_last_servo_update = 0;
+	/* try to open ppsi's shmem */
+	if (!try_open_ppsi_shmem())
+		return;
+	/* read servo */
+	if (read_servo())
+		return;
+	if (!strnlen(ppsi_servo_local.if_name, 16))
+		return;
+	for (i = 0; i < HAL_MAX_PORTS; i++) {
+		/* Check:
+		 * --port in use
+		 * --link is up
+		 * --interface name matches between port and servo
+		 * If all is true then turn on the sync status LED, otherwise
+		 * turn it off
+		 */
+		if (ports[i].in_use
+		    && state_up(ports[i].state)
+		    && !strcmp(ppsi_servo_local.if_name, ports[i].name)) {
+			if (update_count == ppsi_servo_local.update_count) {
+				if (since_last_servo_update < 10)
+					since_last_servo_update++;
+			} else {
+				since_last_servo_update = 0;
+				update_count = ppsi_servo_local.update_count;
+			}
+			/* Check:
+			* --port in slave mode
+			* --servo is in track phase
+			* --servo is updating
+			*/
+			if (ports[i].mode == HEXP_PORT_MODE_WR_SLAVE
+			    && ppsi_servo_local.state == WR_TRACK_PHASE
+			    && since_last_servo_update < 10
+			    ) {
+				set_led_synced(i, 1);
+			} else {
+				set_led_synced(i, 0);
+			}
+		}
+	}
+}
+static int read_servo(void){
+	unsigned ii;
+	unsigned retries = 0;
+	/* read data, with the sequential lock to have all data consistent */
+	while (1) {
+		ii = wrs_shm_seqbegin(ppsi_head);
+		memcpy(&ppsi_servo_local, ppsi_servo, sizeof(*ppsi_servo));
+		retries++;
+		if (retries > 100)
+			return -1;
+		if (!wrs_shm_seqretry(ppsi_head, ii))
+			break; /* consistent read */
+	}
+	return 0;
+}
+static int try_open_ppsi_shmem(void)
+{
+	int ret;
+	struct pp_globals *ppg;
+	static int open_error;
+	if (ppsi_servo) {
+		/* shmem already opened */
+		return 1;
+	}
+	if (!ppsi_head) {
+		ret = wrs_shm_get_and_check(wrs_shm_ptp, &ppsi_head);
+		if (ret == WRS_SHM_OPEN_FAILED) {
+			if (open_error > 100)
+				pr_error("Unable to open PPSI's shm !\n");
+			else
+				open_error++;
+			return 0;
+		}
+		if (ret == WRS_SHM_WRONG_VERSION) {
+			pr_error("Unable to read PPSI's version!\n");
+			return 0;
+		}
+		if (ret == WRS_SHM_INCONSISTENT_DATA) {
+			pr_error("Unable to read consistent data from PPSI's "
+				 "shmem!\n");
+			return 0;
+		}
+	}
+	/* check ppsi's shm version */
+	if (ppsi_head->version != WRS_PPSI_SHMEM_VERSION) {
+		pr_error("Unknown PPSI's shm version %i (known is %i)\n",
+			 ppsi_head->version, WRS_PPSI_SHMEM_VERSION);
+		return 0;
+	}
+	ppg = (void *)ppsi_head + ppsi_head->data_off;
+	/* there is an assumption that there is only one servo in ppsi! */
+	ppsi_servo = wrs_shm_follow(ppsi_head, ppg->global_ext_data);
+	if (!ppsi_servo) {
+		pr_error("Cannot follow ppsi_servo in shmem.\n");
+		return 0;
+	}
+	return 1;
+}