Comment updates

- Update user help format insert macro

Added additional message in help text to let user know each
dword must start with a 0x. Added a macro to handle the max
amount of dwords per TLP request.

- Added check for dwords

Added an additional check and error message to
ensure that nothing greater than a dword is sent
in each section of the tlp.

Convert host byte order to le byte order

- Add macro in header + minor formatting

Added TLP_MAX_DWS in the diag header to be used in the structure
defining the maximum in the dword data.

Fixed some small issues with format.

- add max dword macro to switchtec.h

Removed refences to max tlp dword macro from the cli/diag.c and diag.h
to add the macro in switchtec header and include in diag.h.

Reformatted the name to be more inline with the current naming scheme of
the switchtec macros.

Author: BenReed161

cli/diag.c

@@ -2030,13 +2030,21 @@ static int convert_str_to_dwords(char *str, uint32_t **dwords, int *num_dwords)
 {
 	*num_dwords = 0;
 	const char *ptr = str;
+	int dword_len = 0;
 	while (*ptr != '\0') {
 		if (*ptr == '0' && *(ptr + 1) == 'x') {
 			(*num_dwords)++;
 			ptr += 2;
+			dword_len = 0;
 		}
-		while (*ptr != ' ' && *ptr != '\0')
+		while (*ptr != ' ' && *ptr != '\0') {
 			ptr++;
+			dword_len++;
+		}
+		if (dword_len > 8) {
+			printf("Entered dword longer than allowed\n");
+			return -1;
+		}
 		if (*ptr == ' ')
 			ptr++;
 	}
@@ -2088,7 +2096,7 @@ static int tlp_inject (int argc, char **argv)
 			"Enable the ecrc to be included at the end of the input data (Default: disabled)"},
 		{"tlp_data", 'd', "\"DW0 DW1 ... DW131\"", CFG_STRING, 
 			&cfg.raw_tlp_data, required_argument, 
-			"DWs to be sent as part of the raw TLP (Maximum 132 DWs)"},
+			"DWs to be sent as part of the raw TLP (Maximum 132 DWs). Every DW must start with \'0x\'"},
 		{NULL}
 	};
 
@@ -2104,8 +2112,9 @@ static int tlp_inject (int argc, char **argv)
 		fprintf(stderr, "Error with tlp data provided \n");
 		return -1;
 	}
-	if (num_dwords > 132) {
-		fprintf(stderr, "TLP data cannot exceed 132 dwords \n");
+	if (num_dwords > SWITCHTEC_DIAG_MAX_TLP_DWORDS) {
+		fprintf(stderr, "TLP data cannot exceed %d dwords \n", 
+			SWITCHTEC_DIAG_MAX_TLP_DWORDS);
 		free(raw_tlp_dwords);
 		return -1;
 	}

inc/switchtec/diag.h

@@ -25,6 +25,8 @@
 #ifndef LIBSWITCHTEC_DIAG_H
 #define LIBSWITCHTEC_DIAG_H
 
+#include "switchtec.h"
+
 #include <stdint.h>
 
 /**
@@ -284,7 +286,7 @@ struct switchtec_tlp_inject_in {
 	uint32_t tlp_type;
 	uint32_t tlp_length;
 	uint32_t ecrc;
-	uint32_t raw_tlp_data[132];
+	uint32_t raw_tlp_data[SWITCHTEC_DIAG_MAX_TLP_DWORDS];
 };
 
 #endif

inc/switchtec/switchtec.h

@@ -66,6 +66,8 @@ struct switchtec_dev;
 #define SWITCHTEC_PAX_ID_MASK 0x1f
 #define SWITCHTEC_PAX_ID_LOCAL SWITCHTEC_PAX_ID_MASK
 
+#define SWITCHTEC_DIAG_MAX_TLP_DWORDS 132
+
 #ifdef __CHECKER__
 #define __gas __attribute__((noderef, address_space(1)))
 #else

lib/diag.c

@@ -1225,9 +1225,8 @@ int switchtec_tlp_inject(struct switchtec_dev * dev, int port_id, int tlp_type,
 		.tlp_length = tlp_length,
 		.ecrc = ecrc
 	};
-	for (int i = 0; i < tlp_in.tlp_length; i++)
-	{
-		tlp_in.raw_tlp_data[i] = *(raw_tlp_data + i);
+	for (int i = 0; i < tlp_in.tlp_length; i++) {
+		tlp_in.raw_tlp_data[i] = htole32(*(raw_tlp_data + i));
 	}
 	free(raw_tlp_data);