Merge branch 'devel'

Author: xyan264

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: install packages
-        run: sudo apt-get install gcc-multilib
+        run: sudo apt-get update; sudo apt-get install gcc-multilib
       - uses: actions/checkout@v2
       - name: configure
         run: ./configure

cli/diag.c

@@ -118,6 +118,49 @@ static int diag_parse_common_cfg(int argc, char **argv, const char *desc,
 	return 0;
 }
 
+#define CMD_DESC_LTSSM_LOG "Display LTSSM log"
+static int ltssm_log(int argc, char **argv) {
+	struct diag_common_cfg cfg = DEFAULT_DIAG_COMMON_CFG;
+
+	const struct argconfig_options opts[] = {
+		DEVICE_OPTION, PORT_OPTION, {}
+	};
+
+	struct switchtec_diag_ltssm_log output[128];
+	int ret;
+	int port;
+	int log_count = 128;
+	int i;
+
+	ret = diag_parse_common_cfg(argc, argv, CMD_DESC_LTSSM_LOG,
+				    &cfg, opts);
+	if (ret)
+		return ret;
+
+	if (switchtec_is_gen3(cfg.dev)) {
+		fprintf (stderr,
+			 "This command is not supported on Gen3 devices\n");
+		return 0;
+	}
+	port = cfg.port_id;
+	ret = switchtec_diag_ltssm_log(cfg.dev, port, &log_count, output);
+	if (ret) {
+		switchtec_perror("ltssm_log");
+		return ret;
+	}
+
+	printf("LTSSM Log for Physical Port %d (autowrap ON)\n\n", port);
+	printf("Idx\tDelta Time\tPCIe Rate\tState\n");
+	for(i = 0; i < log_count ; i++) {
+		printf("%3d\t", i);
+		printf("%09x\t", output[i].timestamp);
+		printf("%.1fG\t\t", output[i].link_rate);
+		printf("%s\n", switchtec_ltssm_str(output[i].link_state, 1));
+	}
+
+	return ret;
+}
+
 static const struct argconfig_choice eye_modes[] = {
 	{"RAW", SWITCHTEC_DIAG_EYE_RAW,
 	 "raw data mode (slow, more accurate)"},
@@ -1936,27 +1979,34 @@ static int refclk(int argc, char **argv)
 		int stack_id;
 		int enable;
 		int disable;
-	} cfg = {};
+	} cfg = {
+		.stack_id = -1
+	};
 	const struct argconfig_options opts[] = {
 		DEVICE_OPTION,
 		{"disable", 'd', "", CFG_NONE, &cfg.disable, no_argument,
 		 "disable the rfclk output"},
 		{"enable", 'e', "", CFG_NONE, &cfg.enable, no_argument,
 		 "enable the rfclk output"},
-		{"stack", 's', "NUM", CFG_POSITIVE, &cfg.stack_id,
+		{"stack", 's', "NUM", CFG_NONNEGATIVE, &cfg.stack_id,
 		required_argument, "stack to operate on"},
 		{NULL}};
 
 	argconfig_parse(argc, argv, CMD_DESC_REF_CLK, opts, &cfg,
 			sizeof(cfg));
 
 	if (!cfg.enable && !cfg.disable) {
-		fprintf(stderr, "Must set either --enable or --disable");
+		fprintf(stderr, "Must set either --enable or --disable\n");
 		return -1;
 	}
 
 	if (cfg.enable && cfg.disable) {
-		fprintf(stderr, "Must not set both --enable and --disable");
+		fprintf(stderr, "Must not set both --enable and --disable\n");
+		return -1;
+	}
+
+	if (cfg.stack_id == -1) {
+		fprintf(stderr, "Must specify stack ID using --stack or -s\n");
 		return -1;
 	}
 
@@ -1984,6 +2034,7 @@ static const struct cmd commands[] = {
 	CMD(rcvr_extended,	CMD_DESC_RCVR_EXTENDED),
 	CMD(rcvr_obj,		CMD_DESC_RCVR_OBJ),
 	CMD(refclk,		CMD_DESC_REF_CLK),
+	CMD(ltssm_log,		CMD_DESC_LTSSM_LOG),
 	{}
 };
 

cli/main.c

@@ -2123,19 +2123,20 @@ static int fw_read(int argc, char **argv)
 	static struct {
 		struct switchtec_dev *dev;
 		int out_fd;
-		const char *out_filename;
+		char *out_filename;
 		int assume_yes;
 		int inactive;
 		int data;
 		int bl2;
 		int key;
 		int no_progress_bar;
-	} cfg = {};
+	} cfg = {
+		.out_fd = -1
+	};
 	const struct argconfig_options opts[] = {
 		DEVICE_OPTION,
 		{"filename", .cfg_type=CFG_FD_WR, .value_addr=&cfg.out_fd,
 		  .argument_type=optional_positional,
-		  .force_default="image.pmc",
 		  .help="image file to display information for"},
 		{"yes", 'y', "", CFG_NONE, &cfg.assume_yes, no_argument,
 		 "assume yes when prompted"},
@@ -2155,6 +2156,15 @@ static int fw_read(int argc, char **argv)
 
 	argconfig_parse(argc, argv, CMD_DESC_FW_READ, opts, &cfg, sizeof(cfg));
 
+	if(cfg.out_fd == -1) {
+		if (switchtec_is_gen3(cfg.dev))
+			cfg.out_filename = "image.pmc";
+		else
+			cfg.out_filename = "image.fwimg";
+
+		cfg.out_fd = fileno(fopen(cfg.out_filename, "w"));
+	}
+
 	sum = switchtec_fw_part_summary(cfg.dev);
 	if (!sum) {
 		switchtec_perror("fw_part_summary");

inc/switchtec/fabric.h

@@ -76,7 +76,8 @@ struct switchtec_fab_port_info {
 struct switchtec_fab_topo_info {
 	uint8_t sw_idx;			//!< Switch index
 	uint8_t rsvd[3];
-	uint32_t stack_bif[7]; 		//!< Port bifurcation
+	int num_stack_bif;		//!< Number of port bifurcation fields
+	uint32_t stack_bif[8]; 		//!< Port bifurcation
 	uint8_t route_port[16];		//!< Route port
 	uint64_t port_bitmap;		//!< Enabled physical port bitmap
 

inc/switchtec/mrpc.h

@@ -116,7 +116,7 @@ enum mrpc_cmd {
 	MRPC_SECURITY_CONFIG_GET_GEN5 = 0x10C,
 	MRPC_SECURITY_CONFIG_SET_GEN5 = 0x10D,
 
-	MRPC_MAX_ID = 0x140,
+	MRPC_MAX_ID = 0x10E,
 };
 
 enum mrpc_bg_status {
@@ -197,6 +197,7 @@ enum mrpc_sub_cmd {
 	MRPC_TOPO_INFO_DUMP_STATUS_GET = 2,
 	MRPC_TOPO_INFO_DUMP_DATA_GET = 3,
 	MRPC_TOPO_INFO_DUMP_FINISH = 4,
+	MRPC_TOPO_INFO_DUMP_DATA_GET_GEN5 = 5,
 
 	MRPC_GFMS_DB_DUMP_FABRIC = 0,
 	MRPC_GFMS_DB_DUMP_PAX_ALL,

inc/switchtec/switchtec.h

@@ -1158,6 +1158,12 @@ enum switchtec_diag_link {
 	SWITCHTEC_DIAG_LINK_PREVIOUS,
 };
 
+struct switchtec_diag_ltssm_log {
+	unsigned int timestamp;
+	float link_rate;
+	int link_state;
+};
+
 int switchtec_diag_cross_hair_enable(struct switchtec_dev *dev, int lane_id);
 int switchtec_diag_cross_hair_disable(struct switchtec_dev *dev);
 int switchtec_diag_cross_hair_get(struct switchtec_dev *dev, int start_lane_id,
@@ -1209,6 +1215,9 @@ int switchtec_diag_port_eq_tx_fslf(struct switchtec_dev *dev, int port_id,
 int switchtec_diag_perm_table(struct switchtec_dev *dev,
 			      struct switchtec_mrpc table[MRPC_MAX_ID]);
 int switchtec_diag_refclk_ctl(struct switchtec_dev *dev, int stack_id, bool en);
+int switchtec_diag_ltssm_log(struct switchtec_dev *dev,
+			     int port, int *log_count,
+			     struct switchtec_diag_ltssm_log *log_data);
 
 #ifdef __cplusplus
 }

lib/diag.c

@@ -192,6 +192,8 @@ int switchtec_diag_eye_start(struct switchtec_dev *dev, int lane_mask[4],
 			     struct range *x_range, struct range *y_range,
 			     int step_interval)
 {
+	int err;
+	int ret;
 	struct switchtec_diag_port_eye_start in = {
 		.sub_cmd = MRPC_EYE_OBSERVE_START,
 		.lane_mask[0] = lane_mask[0],
@@ -207,7 +209,14 @@ int switchtec_diag_eye_start(struct switchtec_dev *dev, int lane_mask[4],
 		.step_interval = step_interval,
 	};
 
-	return switchtec_diag_eye_cmd(dev, &in, sizeof(in));
+	ret = switchtec_diag_eye_cmd(dev, &in, sizeof(in));
+
+	/* Add delay so hardware has enough time to start */
+	err = errno;
+	usleep(200000);
+	errno = err;
+
+	return ret;
 }
 
 static uint64_t hi_lo_to_uint64(uint32_t lo, uint32_t hi)
@@ -296,11 +305,20 @@ int switchtec_diag_eye_fetch(struct switchtec_dev *dev, double *pixels,
  */
 int switchtec_diag_eye_cancel(struct switchtec_dev *dev)
 {
+	int ret;
+	int err;
 	struct switchtec_diag_port_eye_cmd in = {
 		.sub_cmd = MRPC_EYE_OBSERVE_CANCEL,
 	};
 
-	return switchtec_diag_eye_cmd(dev, &in, sizeof(in));
+	ret = switchtec_diag_eye_cmd(dev, &in, sizeof(in));
+
+	/* Add delay so hardware can stop completely */
+	err = errno;
+	usleep(200000);
+	errno = err;
+
+	return ret;
 }
 
 /**
@@ -844,7 +862,7 @@ int switchtec_diag_rcvr_ext(struct switchtec_dev *dev, int port_id,
 int switchtec_diag_perm_table(struct switchtec_dev *dev,
 			      struct switchtec_mrpc table[MRPC_MAX_ID])
 {
-	uint32_t perms[MRPC_MAX_ID / 32];
+	uint32_t perms[(MRPC_MAX_ID + 31) / 32];
 	int i, ret;
 
 	ret = switchtec_cmd(dev, MRPC_MRPC_PERM_TABLE_GET, NULL, 0,
@@ -888,4 +906,125 @@ int switchtec_diag_refclk_ctl(struct switchtec_dev *dev, int stack_id, bool en)
 	return switchtec_cmd(dev, MRPC_REFCLK_S, &cmd, sizeof(cmd), NULL, 0);
 }
 
+/**
+ * @brief Get the LTSSM log of a port on a switchtec device
+ * @param[in]	dev    Switchtec device handle
+ * @param[in]	port   Switchtec Port
+ * @param[inout] log_count number of log entries
+ * @param[out] log    A pointer to an array containing the log
+ *
+ */
+int switchtec_diag_ltssm_log(struct switchtec_dev *dev,
+			     int port, int *log_count,
+			     struct switchtec_diag_ltssm_log *log_data)
+{
+	struct {
+		uint8_t sub_cmd;
+		uint8_t port;
+		uint8_t freeze;
+		uint8_t unused;
+	} ltssm_freeze;
+
+	struct {
+		uint8_t sub_cmd;
+		uint8_t port;
+	} status;
+	struct {
+		uint32_t w0_trigger_count;
+		uint32_t w1_trigger_count;
+		uint8_t log_num;
+	} status_output;
+
+	struct {
+		uint8_t sub_cmd;
+		uint8_t port;
+		uint8_t log_index;
+		uint8_t no_of_logs;
+	} log_dump;
+	struct {
+		uint32_t dw0;
+		uint32_t dw1;
+	} log_dump_out[256];
+
+	uint32_t dw1;
+	uint32_t dw0;
+	int major;
+	int minor;
+	int rate;
+	int ret;
+	int i;
+
+	/* freeze logs */
+	ltssm_freeze.sub_cmd = 14;
+	ltssm_freeze.port = port;
+	ltssm_freeze.freeze = 1;
+
+	ret = switchtec_cmd(dev, MRPC_DIAG_PORT_LTSSM_LOG, &ltssm_freeze,
+			    sizeof(ltssm_freeze), NULL, 0);
+	if (ret)
+		return ret;
+
+	/* get number of entries */
+	status.sub_cmd = 13;
+	status.port = port;
+	ret = switchtec_cmd(dev, MRPC_DIAG_PORT_LTSSM_LOG, &status,
+			    sizeof(status), &status_output,
+			    sizeof(status_output));
+	if (ret)
+		return ret;
+
+	if (status_output.log_num < *log_count)
+		*log_count = status_output.log_num;
+
+	/* get log data */
+	log_dump.sub_cmd = 15;
+	log_dump.port = port;
+	log_dump.log_index = 0;
+	log_dump.no_of_logs = *log_count;
+	if(log_dump.no_of_logs <= 126) {
+		ret = switchtec_cmd(dev, MRPC_DIAG_PORT_LTSSM_LOG, &log_dump,
+				    sizeof(log_dump), log_dump_out,
+				    8 * log_dump.no_of_logs);
+		if (ret)
+			return ret;
+	} else {
+		log_dump.no_of_logs = 126;
+		ret = switchtec_cmd(dev, MRPC_DIAG_PORT_LTSSM_LOG, &log_dump,
+				    sizeof(log_dump), log_dump_out,
+				    8 * log_dump.no_of_logs);
+		if (ret)
+			return ret;
+
+		log_dump.log_index = 126;
+		log_dump.no_of_logs = *log_count - 126;
+
+		ret = switchtec_cmd(dev, MRPC_DIAG_PORT_LTSSM_LOG, &log_dump,
+				    sizeof(log_dump), log_dump_out + 126,
+				    8 * log_dump.no_of_logs);
+		if (ret)
+			return ret;
+	}
+	for (i = 0; i < *log_count; i++) {
+		dw1 = log_dump_out[i].dw1;
+		dw0 = log_dump_out[i].dw0;
+		rate = (dw0 >> 13) & 0x3;
+		major = (dw0 >> 7) & 0xf;
+		minor = (dw0 >> 3) & 0xf;
+
+		log_data[i].timestamp = dw1 & 0x3ffffff;
+		log_data[i].link_rate = switchtec_gen_transfers[rate + 1];
+		log_data[i].link_state = major | (minor << 8);
+	}
+
+	/* unfreeze logs */
+	ltssm_freeze.sub_cmd = 14;
+	ltssm_freeze.port = port;
+	ltssm_freeze.freeze = 0;
+
+	ret = switchtec_cmd(dev, MRPC_DIAG_PORT_LTSSM_LOG, &ltssm_freeze,
+			    sizeof(ltssm_freeze), NULL, 0);
+
+	return ret;
+}
+
 /**@}*/