tools/ppsi_conf: support selecting instances by port

Apply setting to all instances on a selected port

Signed-off-by: Adam Wujek <dev_public@wujek.eu>

arch-wrs/include/ppsi_exports.h

@@ -21,6 +21,8 @@
 #define PPSIEXP_PARAM_INST_DELAY_REQ_INT_CMD			1
 #define PPSIEXP_PARAM_INST_SYNC_INT_CMD				2
 
+#define PPSI_INSTANCE_USE_PORT					0x80000000
+
 /* Export structures, shared by server and client for argument matching */
 #ifdef PPSI_EXPORT_STRUCTURES
 

arch-wrs/wrs-ipcserver.c

@@ -99,22 +99,17 @@ static int update_param_cmd(const struct minipc_pd *pd, uint32_t *args,
 	return 0;
 }
 
-static int update_param_instance_cmd(const struct minipc_pd *pd,
-				 uint32_t *args, void *ret)
+static int update_param_instance(struct pp_instance *ppi, int ppi_i,
+				 int param_type, int param_val)
 {
 	int rval = PPSIEXP_RET_OK;
-	int param_type = args[0];
-	int param_instance = args[1];
-	int param_val = args[2];
-	struct pp_instance *ppi;
 
 	switch (param_type) {
 	case PPSIEXP_PARAM_INST_DELAY_REQ_INT_CMD:
-		ppi = INST(ppg_local, param_instance);
 		pp_diag(ppi, config, 2,
 			"%s: cmd %d (PPSIEXP_PARAM_INST_DELAY_REQ_INT_CMD) "
 			"instance %d, port %s, value %d\n", __func__,
-			param_type, param_instance, ppi->iface_name, param_val);
+			param_type, ppi_i, ppi->iface_name, param_val);
 		if (!check_range_inst_logMinDelayReqInterval(ppi->cfg.profile,
 							     param_val)) {
 			pp_diag(ppi, config, 1,
@@ -122,7 +117,7 @@ static int update_param_instance_cmd(const struct minipc_pd *pd,
 				"logMinDelayReqInterval (%d) not in range! "
 				"cmd %d (PPSIEXP_PARAM_INST_DELAY_REQ_INT_CMD) "
 				"instance %d, port %s\n",
-				param_val, param_type, param_instance, ppi->iface_name);
+				param_val, param_type, ppi_i, ppi->iface_name);
 			rval = PPSIEXP_RET_ERROR_VAL;
 			break;
 		}
@@ -132,11 +127,10 @@ static int update_param_instance_cmd(const struct minipc_pd *pd,
 		break;
 
 	case PPSIEXP_PARAM_INST_SYNC_INT_CMD:
-		ppi = INST(ppg_local, param_instance);
 		pp_diag(ppi, config, 2,
 			"%s: cmd %d (PPSIEXP_PARAM_INST_SYNC_INT_CMD) "
 			"instance %d, port %s, value %d\n", __func__,
-			param_type, param_instance, ppi->iface_name, param_val);
+			param_type, ppi_i, ppi->iface_name, param_val);
 		if (!check_range_inst_logSyncInterval(ppi->cfg.profile,
 						      param_val)) {
 			pp_diag(ppi, config, 1,
@@ -144,7 +138,7 @@ static int update_param_instance_cmd(const struct minipc_pd *pd,
 				"logSyncInterval (%d) not in range! "
 				"cmd %d (PPSIEXP_PARAM_INST_SYNC_INT_CMD) "
 				"instance %d, port %s\n",
-				param_val, param_type, param_instance, ppi->iface_name);
+				param_val, param_type, ppi_i, ppi->iface_name);
 			rval = PPSIEXP_RET_ERROR_VAL;
 			break;
 		}
@@ -154,7 +148,6 @@ static int update_param_instance_cmd(const struct minipc_pd *pd,
 		break;
 
 	default:
-		ppi = INST(ppg_local, param_instance);
 		pp_diag(ppi, config, 1,
 			"Param update Error: not supported param instance cmd "
 			"%d value %d\n",
@@ -163,6 +156,43 @@ static int update_param_instance_cmd(const struct minipc_pd *pd,
 		break;
 	}
 
+	return rval;
+}
+
+static int update_param_instance_cmd(const struct minipc_pd *pd,
+				     uint32_t *args, void *ret)
+{
+	int i;
+	int rval = PPSIEXP_RET_OK;
+	int rval_tmp = -1;
+	int param_type = args[0];
+	int param_instance = args[1];
+	int param_val = args[2];
+	struct pp_instance *ppi;
+	char iface_name[16];
+	
+	if (param_instance & PPSI_INSTANCE_USE_PORT) {
+		/* Execute command for all instances in a given interface */
+		snprintf(iface_name, 16, "wri%d",
+			 param_instance & ~PPSI_INSTANCE_USE_PORT);
+		for (i = 0; i < get_numberPorts(GDSDEF(ppg_local)); i++) {
+			ppi = INST(ppg_local, i);
+			if (strcmp(iface_name, ppi->iface_name))
+				continue;
+			rval_tmp = update_param_instance(ppi, i, param_type,
+							 param_val);
+			if (rval_tmp != PPSIEXP_RET_OK)
+				rval = rval_tmp;
+		}
+		/* If rval_tmp == -1, no instance found on requested port */
+		if (rval_tmp == -1)
+			rval = PPSIEXP_RET_ERROR_INSTANCE;
+	} else {
+		ppi = INST(ppg_local, param_instance);
+		rval = update_param_instance(ppi, param_instance, param_type,
+					     param_val);
+	}
+
 	*(int *)ret = rval;
 	return 0;
 }

tools/ppsi_conf.c

@@ -28,6 +28,7 @@ enum input_arg {
 	arg_help = 'Z' + 1, /* avoid conflicts with short options */
 	arg_delay_req_interval,
 	arg_instance,
+	arg_port,
 	arg_prio1,
 	arg_prio2,
 	arg_sync_interval,
@@ -40,6 +41,7 @@ static struct option long_opts[] = {
 	{"delay-req-interval",          required_argument, NULL, arg_delay_req_interval},
 	{"instance",                    required_argument, NULL, arg_instance},
 	{"ppi",                         required_argument, NULL, arg_instance},
+	{"port",                        required_argument, NULL, arg_port},
 	{"prio1",                       required_argument, NULL, arg_prio1},
 	{"priority1",                   required_argument, NULL, arg_prio1},
 	{"prio2",                       required_argument, NULL, arg_prio2},
@@ -69,11 +71,12 @@ void help(char *prgname)
 		"Parameters specific for PPSi instance:\n"
 		"  --instance=<num>\n"
 		"  --ppi=<num>       - Select PPSi instance\n"
+		"  --port=<num>      - Select all instances on a defined port\n"
 		"  --delay-req-interval=<num>\n"
-		"                    - sets logarithm to the base 2 of the mean interval of delay"
+		"                    - sets logarithm to the base 2 of the mean interval of delay\n"
 		"                      request message transmission; used when a port is in Slave state\n"
 		"  --sync-interval=<num>\n"
-		"                    - sets logarithm to the base 2 of the mean interval of sync"
+		"                    - sets logarithm to the base 2 of the mean interval of sync\n"
 		"                      message transmission; used when a port is in Master state\n"
 	);
 	exit(1);
@@ -131,7 +134,10 @@ static int ppsi_set_param_instance(int param, int instance, int val)
 {
 	int rval = 0;
 	
-	printf("%s: set param instance %d val %d\n", __func__, param, val);
+	printf("%s: set param (%d) for %s %d, val %d\n",
+	       __func__, param,
+	       instance & PPSI_INSTANCE_USE_PORT ? "port" : "instance",
+	       instance & ~PPSI_INSTANCE_USE_PORT, val);
 	minipc_call(ptp_ch, MINIPC_TIMEOUT, &ppsiexp_update_param_instance_cmd, &rval,
 		    param, instance, val);
 
@@ -144,6 +150,7 @@ int main(int argc, char *argv[])
 	int tmp;
 	int ret;
 	int ppsi_instance = -1;
+	int ppsi_port = -1;
 
 	init_shm();
 
@@ -184,16 +191,20 @@ int main(int argc, char *argv[])
 			tmp = atoi(optarg);
 			if (verbose)
 				printf("Setting delay request interval for "
-				       "instance %d to %d\n",
-				       ppsi_instance, tmp);
+				       "%s %d to %d\n",
+				       ppsi_port == -1 ? "instance" : "port",
+				       ppsi_instance & ~PPSI_INSTANCE_USE_PORT,
+				       tmp);
 			ret = ppsi_set_param_instance(
 					PPSIEXP_PARAM_INST_DELAY_REQ_INT_CMD,
 					ppsi_instance,
 					tmp);
 			if (ret) {
 				fprintf(stderr, "Error setting delay request "
-					"interval for instance %d to %d\n",
-				        ppsi_instance, tmp);
+					"interval for %s %d to %d, ret %d\n",
+					ppsi_port == -1 ? "instance" : "port",
+					ppsi_instance & ~PPSI_INSTANCE_USE_PORT,
+					tmp, ret);
 				exit (1);
 			}
 			break;
@@ -201,8 +212,20 @@ int main(int argc, char *argv[])
 		case arg_instance:
 			ppsi_instance = atoi(optarg);
 			if (verbose)
-				printf("Setting instance to %d\n", ppsi_instance);
+				printf("Setting instance to %d\n",
+				       ppsi_instance);
+			ppsi_port = -1;
 			break;
+
+		case arg_port:
+			ppsi_instance = atoi(optarg);
+			if (verbose)
+				printf("Setting port to %d\n",
+				       ppsi_instance);
+			ppsi_port = ppsi_instance;
+			ppsi_instance |= PPSI_INSTANCE_USE_PORT;
+			break;
+
 		case arg_prio1:
 			tmp = atoi(optarg);
 			if (verbose)
@@ -232,17 +255,21 @@ int main(int argc, char *argv[])
 			check_instance(ppsi_instance);
 			tmp = atoi(optarg);
 			if (verbose)
-				printf("Setting sync interval for instance %d "
+				printf("Setting sync interval for %s %d"
 				       "to %d\n",
-				       ppsi_instance, tmp);
-			ret = ppsi_set_param_instance(
+				       ppsi_port == -1 ? "instance" : "port",
+				       ppsi_instance & ~PPSI_INSTANCE_USE_PORT,
+				       tmp);
+				ret = ppsi_set_param_instance(
 					PPSIEXP_PARAM_INST_SYNC_INT_CMD,
 					ppsi_instance,
 					tmp);
 			if (ret) {
 				fprintf(stderr, "Error setting sync interval "
-					"for instance %d to %d\n",
-				        ppsi_instance, tmp);
+					"for %s %d to %d, ret %d\n",
+					ppsi_port == -1 ? "instance" : "port",
+					ppsi_instance & ~PPSI_INSTANCE_USE_PORT,
+					tmp, ret);
 				exit (1);
 			}
 			break;