Add support for Gen5 pattern mon/gen

Add support for the MRPC pattern generator and monitor set/get commands.
Sets the sub command ID to the correct version depending on gen.
New command line arg with the pattern gen function for the link speed
that the pattern generator command needs in the gen5 spec.

Author: BenReed161

cli/diag.c

@@ -1769,6 +1769,14 @@ static const struct argconfig_choice pattern_types[] = {
 	{}
 };
 
+static const struct argconfig_choice pat_gen_link_speeds[] = {
+	{"GEN1", SWITCHTEC_DIAG_PAT_LINK_GEN1, "GEN1 Pattern Generator Speed"},
+	{"GEN2", SWITCHTEC_DIAG_PAT_LINK_GEN2, "GEN2 Pattern Generator Speed"},
+	{"GEN3", SWITCHTEC_DIAG_PAT_LINK_GEN3, "GEN3 Pattern Generator Speed"},
+	{"GEN4", SWITCHTEC_DIAG_PAT_LINK_GEN4, "GEN4 Pattern Generator Speed"},
+	{"GEN5", SWITCHTEC_DIAG_PAT_LINK_GEN5, "GEN5 Pattern Generator Speed"},
+};
+
 static const char *pattern_to_str(enum switchtec_diag_pattern type)
 {
 	const struct argconfig_choice *s;
@@ -1794,7 +1802,8 @@ static int print_pattern_mode(struct switchtec_dev *dev,
 		return -1;
 	}
 
-	ret = switchtec_diag_pattern_mon_get(dev, port_id, 0, &mon_pat, &err_cnt);
+	ret = switchtec_diag_pattern_mon_get(dev, port_id, 0, &mon_pat, 
+					     &err_cnt);
 	if (ret) {
 		switchtec_perror("pattern_mon_get");
 		return -1;
@@ -1814,12 +1823,18 @@ static int print_pattern_mode(struct switchtec_dev *dev,
 		for (lane_id = 1; lane_id < port->cfg_lnk_width; lane_id++) {
 			ret = switchtec_diag_pattern_mon_get(dev, port_id,
 					lane_id, NULL, &err_cnt);
-			printf("    Lane %-2d    Errors: 0x%llx\n", lane_id,
-			       err_cnt);
-			if (ret) {
+			if (ret == 0x70b02) {
+				printf("    Lane %d has the pattern monitor disabled.\n", 
+					lane_id);
+			}
+			else if (ret) {
 				switchtec_perror("pattern_mon_get");
 				return -1;
 			}
+			else {
+				printf("    Lane %-2d    Errors: 0x%llx\n", 
+					lane_id, err_cnt);
+			}
 		}
 	}
 
@@ -1841,7 +1856,9 @@ static int pattern(int argc, char **argv)
 		int monitor;
 		int pattern;
 		int inject_errs;
+		int link_speed;
 	} cfg = {
+		.link_speed = SWITCHTEC_DIAG_PAT_LINK_DISABLED,
 		.port_id = -1,
 		.pattern = SWITCHTEC_DIAG_PATTERN_PRBS_31,
 	};
@@ -1863,6 +1880,10 @@ static int pattern(int argc, char **argv)
 		 required_argument,
 		 "pattern to generate or monitor for (default: PRBS31)",
 		 .choices = pattern_types},
+		{"speed", 's', "SPEED", CFG_CHOICES, &cfg.link_speed,
+		 required_argument, 
+		 "link speed that applies to the pattern generator (default: GEN1)",
+		 .choices = pat_gen_link_speeds},
 		{NULL}};
 
 	argconfig_parse(argc, argv, CMD_DESC_PATTERN, opts, &cfg, sizeof(cfg));
@@ -1878,6 +1899,12 @@ static int pattern(int argc, char **argv)
 		return -1;
 	}
 
+	if (cfg.link_speed && cfg.monitor) {
+		fprintf (stderr,
+			"Cannot enable link speed -s / --speed on pattern monitor\n");
+		return -1;
+	}
+	
 	ret = get_port(cfg.dev, cfg.port_id, &cfg.port);
 	if (ret)
 		return ret;
@@ -1899,7 +1926,7 @@ static int pattern(int argc, char **argv)
 
 	if (cfg.generate) {
 		ret = switchtec_diag_pattern_gen_set(cfg.dev, cfg.port_id,
-						     cfg.pattern);
+						     cfg.pattern, cfg.link_speed);
 		if (ret) {
 			switchtec_perror("pattern_gen_set");
 			return -1;

inc/switchtec/mrpc.h

@@ -273,6 +273,7 @@ enum mrpc_sub_cmd {
 	MRPC_PAT_GEN_GET_MON = 7,
 	MRPC_PAT_GEN_SET_MON = 8,
 	MRPC_PAT_GEN_INJ_ERR = 9,
+	MRPC_PAT_GEN_SET_GEN_GEN5 = 10,
 
 	MRPC_EYE_OBSERVE_START = 0,
 	MRPC_EYE_OBSERVE_FETCH = 1,

inc/switchtec/switchtec.h

@@ -1284,6 +1284,15 @@ enum switchtec_diag_pattern {
 	SWITCHTEC_DIAG_PATTERN_PRBS_DISABLED,
 };
 
+enum switchtec_diag_pattern_link_rate {
+	SWITCHTEC_DIAG_PAT_LINK_DISABLED = 0,
+	SWITCHTEC_DIAG_PAT_LINK_GEN1 = 1,
+	SWITCHTEC_DIAG_PAT_LINK_GEN2 = 2,
+	SWITCHTEC_DIAG_PAT_LINK_GEN3 = 3,
+	SWITCHTEC_DIAG_PAT_LINK_GEN4 = 4,
+	SWITCHTEC_DIAG_PAT_LINK_GEN5 = 5,
+};
+
 enum switchtec_diag_ltssm_speed {
 	SWITCHTEC_DIAG_LTSSM_GEN1 = 0,
 	SWITCHTEC_DIAG_LTSSM_GEN2 = 1,
@@ -1338,7 +1347,8 @@ int switchtec_diag_loopback_set_gen5(struct switchtec_dev *dev, int port_id,
 int switchtec_diag_loopback_get(struct switchtec_dev *dev, int port_id,
 		int *enabled, enum switchtec_diag_ltssm_speed *ltssm_speed);
 int switchtec_diag_pattern_gen_set(struct switchtec_dev *dev, int port_id,
-		enum switchtec_diag_pattern type);
+		enum switchtec_diag_pattern type,
+		enum switchtec_diag_pattern_link_rate link_speed);
 int switchtec_diag_pattern_gen_get(struct switchtec_dev *dev, int port_id,
 		enum switchtec_diag_pattern *type);
 int switchtec_diag_pattern_mon_set(struct switchtec_dev *dev, int port_id,

lib/diag.c

@@ -524,13 +524,17 @@ int switchtec_diag_loopback_get(struct switchtec_dev *dev,
  * @return 0 on success, error code on failure
  */
 int switchtec_diag_pattern_gen_set(struct switchtec_dev *dev, int port_id,
-		enum switchtec_diag_pattern type)
+				   enum switchtec_diag_pattern type, 
+				   enum switchtec_diag_pattern_link_rate link_speed)
 {
 	struct switchtec_diag_pat_gen_in in = {
 		.sub_cmd = MRPC_PAT_GEN_SET_GEN,
 		.port_id = port_id,
 		.pattern_type = type,
+		.lane_id = link_speed
 	};
+	if (switchtec_is_gen5(dev))
+		in.sub_cmd = MRPC_PAT_GEN_SET_GEN_GEN5;
 
 	return switchtec_cmd(dev, MRPC_PAT_GEN, &in, sizeof(in), NULL, 0);
 }
@@ -544,7 +548,7 @@ int switchtec_diag_pattern_gen_set(struct switchtec_dev *dev, int port_id,
  * @return 0 on success, error code on failure
  */
 int switchtec_diag_pattern_gen_get(struct switchtec_dev *dev, int port_id,
-		enum switchtec_diag_pattern *type)
+				   enum switchtec_diag_pattern *type)
 {
 	struct switchtec_diag_pat_gen_in in = {
 		.sub_cmd = MRPC_PAT_GEN_GET_GEN,
@@ -594,8 +598,8 @@ int switchtec_diag_pattern_mon_set(struct switchtec_dev *dev, int port_id,
  * @return 0 on success, error code on failure
  */
 int switchtec_diag_pattern_mon_get(struct switchtec_dev *dev, int port_id,
-		int lane_id, enum switchtec_diag_pattern *type,
-		unsigned long long *err_cnt)
+				   int lane_id, enum switchtec_diag_pattern *type,
+				   unsigned long long *err_cnt)
 {
 	struct switchtec_diag_pat_gen_in in = {
 		.sub_cmd = MRPC_PAT_GEN_GET_MON,