userspace/wrsw_hal: use new dot-config instead of wrsw_hal.conf

This commit uses dot-config (previous commit), in exactly the same
way as previous code. No change in behaviour is there, as confirmed
by looking at shared memory values.

As a side effect, the ports as listed in shared memory
(wrs_dump_shmem) are in the right order instead of random order
(this was due to use of lua's hash functions).

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

userspace/wrsw_hal/hal_main.c

@@ -14,6 +14,7 @@
 #include <libwr/switch_hw.h>
 #include <libwr/shw_io.h>
 #include <libwr/sfp_lib.h>
+#include <libwr/config.h>
 
 #include "wrsw_hal.h"
 #include <rt_ipc.h>
@@ -80,6 +81,8 @@ static int hal_init()
 
 	memset(cleanup_cb, 0, sizeof(cleanup_cb));
 
+	libwr_cfg_read_file("/wr/etc/dot-config"); /* FIXME: accept -f */
+
 	/* Set up trap for some signals - the main purpose is to
 	   prevent the hardware from working when the HAL is shut down
 	   - launching the HAL on already initialized HW will freeze

userspace/wrsw_hal/hal_ports.c

@@ -21,6 +21,7 @@
 #include <libwr/pio.h>
 #include <libwr/sfp_lib.h>
 #include <libwr/shmem.h>
+#include <libwr/config.h>
 
 #include "wrsw_hal.h"
 #include "timeout.h"
@@ -75,40 +76,6 @@ static void hal_port_reset_state(struct hal_port_state * p)
 	p->rx_cal_pending = 0;
 }
 
-#define AT_INT32 0
-#define AT_DOUBLE 1
-
-/* helper function for retreiving port parameters from the config
-   files with type checking and defaulting to a given value when the
-   parameter is not found */
-static void hal_port_cfg_get(const char *port_name, const char *param_name,
-			       void *rval, int param_type, ...)
-{
-	va_list ap;
-
-	char str[1024];
-	snprintf(str, sizeof(str), "ports.%s.%s", port_name, param_name);
-
-	va_start(ap, param_type);
-
-	switch (param_type) {
-	case AT_INT32:
-		if (hal_config_get_int(str, (int *)rval))
-			*(int *)rval = va_arg(ap, int);
-		break;
-
-	case AT_DOUBLE:
-		if (hal_config_get_double(str, (double *)rval))
-			*(double *)rval = va_arg(ap, double);
-		break;
-
-	default:
-		break;
-
-	}
-	va_end(ap);
-}
-
 /* checks if the port is supported by the FPGA firmware */
 static int hal_port_check_presence(const char *if_name)
 {
@@ -130,20 +97,12 @@ static void hal_port_enable(int port, int enable)
 	system(str);
 }
 
-/* Port initialization. Assigns the MAC address, WR timing mode, reads
- * parameters from the config file. */
-static int hal_port_init(const char *name, int index)
+/* Port initialization, from dot-config values */
+static int hal_port_init(int index)
 {
-	char key_name[128];
-	char val[128];
 	struct hal_port_state *p = &ports[index];
-
-	/* check if the port is compiled into the firmware, if not, ignore. */
-	if (!hal_port_check_presence(name)) {
-		hal_port_reset_state(p);
-		p->in_use = 0;
-		return 0;
-	}
+	char name[128], s[128];
+	int val, error;
 
 	/* make sure the states and other variables are in their init state */
 	hal_port_reset_state(p);
@@ -151,54 +110,71 @@ static int hal_port_init(const char *name, int index)
 	p->state = HAL_PORT_STATE_DISABLED;
 	p->in_use = 1;
 
+	/* read dot-config values for this index, starting from name */
+	error = libwr_cfg_convert2("PORT%02i_PARAMS", "name", LIBWR_STRING,
+				   name, index);
+	if (error)
+		return -1;
 	strncpy(p->name, name, 16);
 
-	/* read calibraton parameters (unwrapping and constant deltas) */
-	hal_port_cfg_get(name, "phy_rx_min", &p->calib.phy_rx_min,
-			   AT_INT32, 18 * 800);
-	hal_port_cfg_get(name, "phy_tx_min", &p->calib.phy_tx_min,
-			   AT_INT32, 18 * 800);
-
-	hal_port_cfg_get(name, "delta_tx_board", &p->calib.delta_tx_board,
-			   AT_INT32, 0);
-	hal_port_cfg_get(name, "delta_rx_board", &p->calib.delta_rx_board,
-			   AT_INT32, 0);
+	/* check if the port is built into the firmware, if not, we are done */
+	if (!hal_port_check_presence(name))
+		return -1;
 
+	val = 18 * 800; /* magic default from previous code */
+	error = libwr_cfg_convert2("PORT%02i_PARAMS", "tx", LIBWR_INT,
+				   &val, index);
+	if (error)
+		fprintf(stderr, "port index %i (%s): no \"tx=\" specified\n",
+			index, name);
+	p->calib.phy_tx_min = val;
+
+	val = 18 * 800; /* magic default from previous code */
+	error = libwr_cfg_convert2("PORT%02i_PARAMS", "rx", LIBWR_INT,
+				   &val, index);
+	if (error)
+		fprintf(stderr, "port index %i (%s): no \"rx=\" specified\n",
+			index, name);
+	p->calib.phy_rx_min = val;
+
+	p->calib.delta_tx_board = 0; /* never set */
+	p->calib.delta_rx_board = 0; /* never set */
 	sscanf(p->name + 2, "%d", &p->hw_index);
 
 	hal_port_enable(p->hw_index, 1);
 
-	/* Set up the endpoint's address (fixme: do this with the driver) */
-
-	/* FIXME: this address should come from the driver header */
-	p->ep_base = 0x30000 + 0x400 * p->hw_index;
-
-	/* Configure the port's timing role depending on the config file */
-	snprintf(key_name, sizeof(key_name), "ports.%s.mode", p->name);
-
-	if (!hal_config_get_string(key_name, val, sizeof(val))) {
-		if (!strcasecmp(val, "wr_m_and_s"))
-			p->mode = HEXP_PORT_MODE_WR_M_AND_S;
-		else if (!strcasecmp(val, "wr_master"))
-			p->mode = HEXP_PORT_MODE_WR_MASTER;
-		else if (!strcasecmp(val, "wr_slave"))
-			p->mode = HEXP_PORT_MODE_WR_SLAVE;
-		else if (!strcasecmp(val, "non_wr"))
-			p->mode = HEXP_PORT_MODE_NON_WR;
-		else {
-			TRACE(TRACE_ERROR, "Invalid mode specified for port %s."
-			      " Defaulting to Non-WR", p->name);
-			p->mode = HEXP_PORT_MODE_NON_WR;
-		}
+	{
+		static struct roletab { char *name; int value; } *rp, rt[] = {
+			{"auto",   HEXP_PORT_MODE_WR_M_AND_S},
+			{"master", HEXP_PORT_MODE_WR_MASTER},
+			{"slave",  HEXP_PORT_MODE_WR_SLAVE},
+			{"non-wr", HEXP_PORT_MODE_NON_WR},
+			{NULL,     HEXP_PORT_MODE_NON_WR /* default */},
+		};
 
-		TRACE(TRACE_INFO, "Port %s: mode %s", p->name, val);
-		/* nothing in the config file? Disable WR mode */
-	} else {
+		strcpy(s, "non-wr"); /* default if no string passed */
 		p->mode = HEXP_PORT_MODE_NON_WR;
+		error = libwr_cfg_convert2("PORT%02i_PARAMS", "role",
+					   LIBWR_STRING, s, index);
+		if (error)
+			fprintf(stderr, "port index %i (%s): "
+				"no \"role=\" specified\n", index, name);
+
+		for (rp = rt; rp->name; rp++)
+			if (!strcasecmp(s, rp->name))
+				break;
+		p->mode = rp->value;
+		if (!rp->name)
+			fprintf(stderr, "port index %i (%s): invalid role "
+				"\"%s\" specified\n", index, name, s);
+
+		TRACE(TRACE_INFO, "Port %s: mode %i", p->name, val);
 	}
-
 	/* Used to pre-calibrate the TX path for each port. No more in V3 */
 
+	/* FIXME: this address should come from the driver header */
+	p->ep_base = 0x30000 + 0x400 * p->hw_index;
+
 	return 0;
 }
 
@@ -206,8 +182,7 @@ static int hal_port_init(const char *name, int index)
  * intializes them one after another. */
 int hal_port_init_all()
 {
-	int index, i;
-	char port_name[128];
+	int index;
 	struct hal_shmem_header *hal_hdr;
 	struct wrs_shm_head *head;
 
@@ -224,18 +199,6 @@ int hal_port_init_all()
 			__func__, strerror(errno));
 		return -1;
 	}
-	/* Count the number of physical WR network interfaces */
-	hal_port_nports = 0;
-	for (i = 0; i < HAL_MAX_PORTS; i++) {
-		char if_name[16];
-		snprintf(if_name, sizeof(if_name), "wr%d", i);
-		if (hal_port_check_presence(if_name))
-			hal_port_nports++;
-	}
-
-	TRACE(TRACE_INFO, "Number of physical ports supported in HW: %d",
-	      hal_port_nports);
-
 	/* Allocate the ports in shared memory, so wr_mon etc can see them */
 	hal_port_shmem = wrs_shm_get(wrs_shm_hal, "wrsw_hal", WRS_SHM_WRITE);
 	if (!hal_port_shmem) {
@@ -255,12 +218,14 @@ int hal_port_init_all()
 
 	hal_hdr->ports = ports;
 
-	for (index = 0; index < HAL_MAX_PORTS; index++) {
-		if (!hal_config_iterate("ports", index,
-					port_name, sizeof(port_name)))
+	for (index = 0; index < HAL_MAX_PORTS; index++)
+		if (hal_port_init(index) < 0)
 			break;
-		hal_port_init(port_name, index);
-	}
+	hal_port_nports = index;
+
+	TRACE(TRACE_INFO, "Number of physical ports supported in HW: %d",
+	      hal_port_nports);
+
 	/* We are done, mark things as valid */
 	hal_hdr->nports = hal_port_nports;
 	head->version = HAL_SHMEM_VERSION;