Skip to content

Eye changes #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BenReed161 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Eye changes #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d319445
Add error and timeout polling for eye command
BenReed161 May 29, 2026
7a037c5
Update mask from 4 to 5
BenReed161 May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions cli/diag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include <switchtec/endian.h>
#include <switchtec/errors.h>

#include <errno.h>
#include <limits.h>
#include <locale.h>
#include <math.h>
Expand Down Expand Up @@ -1246,7 +1247,7 @@ static double *eye_observe_dev(struct switchtec_dev *dev, int port_id,
struct switchtec_status status;
int i, ret, first_lane, lane;
size_t lane_cnt[num_lanes];
int lane_mask[4] = {};
int lane_mask[5] = {};
double tmp[500];
double *pixels;

Expand Down Expand Up @@ -1391,7 +1392,7 @@ static double *eye_capture_dev_gen5(struct switchtec_dev *dev,
int vstep)
{
int bin, j, ret, first_lane, num_phases_l, stride;
int lane_mask[4] = {};
int lane_mask[5] = {};
struct switchtec_status sw_status;
double tmp[64];
double* ber_data = NULL;
Expand All @@ -1408,6 +1409,11 @@ static double *eye_capture_dev_gen5(struct switchtec_dev *dev,
data_mode, eye_mode, refclk, vstep);
if (ret) {
switchtec_perror("eye_run");
if (errno == EBUSY ||
ERRNO_MRPC(errno) == ERR_EYE_CAP_STATE_INVAL)
fprintf(stderr,
"Hint: A previous eye capture may still be in progress.\n"
"Wait for it to complete or reset the device.\n");
return NULL;
}

Expand Down Expand Up @@ -1489,7 +1495,7 @@ static int eye(int argc, char **argv)
.hstep = 1,
.sar_sel = 10,
.intleav_sel = 0,
.refclk = 0,
.refclk = 100000,
.data_mode = SWITCHTEC_DIAG_EYE_ADC,
.eye_modes_gen6 = SWITCHTEC_DIAG_EYE_FULL,
};
Expand Down Expand Up @@ -1629,6 +1635,11 @@ static int eye(int argc, char **argv)
return -1;
}

if (cfg.dev && switchtec_is_gen6(cfg.dev) && cfg.refclk == 0) {
fprintf(stderr, "--refclk/-r must be non-zero for Gen6 eye capture\n");
return -1;
}

if (!pixels) {
if (switchtec_is_gen5(cfg.dev) || switchtec_is_gen6(cfg.dev)) {
pixels = eye_capture_dev_gen5(cfg.dev, cfg.port_id,
Expand Down
2 changes: 1 addition & 1 deletion inc/switchtec/diag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ struct switchtec_gen6_diag_eye_run_in {
uint8_t resvd1;
uint8_t timeout_disable;
uint8_t resvd2;
uint32_t lane_mask[4];
uint32_t lane_mask[5];
uint8_t sar_sel;
uint8_t intleav_sel;
uint8_t vstep;
Expand Down
11 changes: 11 additions & 0 deletions inc/switchtec/errors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,17 @@ enum {
ERR_ACCESS_REFUSED = 0xFFFF0001,

ERR_PAT_MON_IS_DISABLED = 0x70b02,

ERR_EYE_CAP_LANE_MASK_INVAL = 0x70a02,
ERR_EYE_CAP_DEPTH_INVAL = 0x70a03,
ERR_EYE_CAP_TOO_MANY_LANES = 0x70a04,
ERR_EYE_CAP_ERROR = 0x70a05,
ERR_EYE_CAP_TIMEOUT = 0x70a06,
ERR_EYE_CAP_STATE_INVAL = 0x70a07,
ERR_EYE_CAP_LANE_ID_INVAL = 0x70a08,
ERR_EYE_CAP_BIN_NUM_INVAL = 0x70a09,
ERR_EYE_CAP_SUBCMD_INVAL = 0x70a0a,
ERR_EYE_CAP_HW_ALLOC_FAIL = 0x70a0f,
};

#endif
2 changes: 1 addition & 1 deletion inc/switchtec/switchtec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1791,7 +1791,7 @@ int switchtec_diag_eye_set_mode(struct switchtec_dev *dev,
enum switchtec_diag_eye_data_mode mode);
int switchtec_diag_eye_read(struct switchtec_dev *dev, int lane_id, int bin,
int* num_phases, double* ber_data);
int switchtec_diag_eye_start(struct switchtec_dev *dev, int lane_mask[4],
int switchtec_diag_eye_start(struct switchtec_dev *dev, int lane_mask[5],
struct range *x_range, struct range *y_range,
int step_interval, int capture_depth, int sar_sel,
int intleav_sel, int hstep, int data_mode,
Expand Down
41 changes: 38 additions & 3 deletions lib/diag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@

#define SWITCHTEC_LIB_CORE
#define SWITCHTEC_LTSSM_MAX_LOGS 61
#define EYE_CAP_STATUS_TIMEOUT_MS (5 * 60 * 1000)
#define EYE_CAP_STATUS_POLL_MS 200
#define EYE_CAP_PROGRESS_INTERVAL 25

#include "switchtec_priv.h"
#include "switchtec/diag.h"
Expand Down Expand Up @@ -132,6 +135,8 @@ static int switchtec_diag_eye_status_gen5(struct switchtec_dev *dev)
{
int ret;
int eye_status;
int elapsed_ms = 0;
int poll_count = 0;

struct switchtec_gen5_diag_eye_status_in in = {
.sub_cmd = MRPC_EYE_CAP_STATUS_GEN5,
Expand All @@ -146,10 +151,25 @@ static int switchtec_diag_eye_status_gen5(struct switchtec_dev *dev)
return -1;
}
eye_status = out.status;
usleep(200000);
usleep(EYE_CAP_STATUS_POLL_MS * 1000);
elapsed_ms += EYE_CAP_STATUS_POLL_MS;
poll_count++;

if (poll_count % EYE_CAP_PROGRESS_INTERVAL == 0)
fprintf(stderr, ".");

if (elapsed_ms >= EYE_CAP_STATUS_TIMEOUT_MS) {
fprintf(stderr, "\n");
errno = ETIMEDOUT;
switchtec_perror("Eye capture timed out waiting for completion");
return -1;
}
} while (eye_status == SWITCHTEC_GEN5_DIAG_EYE_STATUS_IN_PROGRESS ||
eye_status == SWITCHTEC_GEN5_DIAG_EYE_STATUS_PENDING);

if (poll_count >= EYE_CAP_PROGRESS_INTERVAL)
fprintf(stderr, "\n");

switch (eye_status) {
case SWITCHTEC_GEN5_DIAG_EYE_STATUS_DONE:
return 0;
Expand All @@ -159,7 +179,7 @@ static int switchtec_diag_eye_status_gen5(struct switchtec_dev *dev)
return -1;
case SWITCHTEC_GEN5_DIAG_EYE_STATUS_TIMEOUT:
errno = ETIMEDOUT;
switchtec_perror("Eye capture timeout");
switchtec_perror("Eye capture firmware timeout");
return -1;
case SWITCHTEC_GEN5_DIAG_EYE_STATUS_ERROR:
errno = EIO;
Expand Down Expand Up @@ -191,6 +211,20 @@ static int switchtec_diag_eye_cmd_gen5(struct switchtec_dev *dev, void *in,
size_t size)
{
int ret;
struct switchtec_gen5_diag_eye_status_in status_in = {
.sub_cmd = MRPC_EYE_CAP_STATUS_GEN5,
};
struct switchtec_gen5_diag_eye_status_out status_out;

ret = switchtec_cmd(dev, MRPC_GEN5_EYE_CAPTURE, &status_in,
sizeof(status_in), &status_out,
sizeof(status_out));
if (ret == 0 &&
(status_out.status == SWITCHTEC_GEN5_DIAG_EYE_STATUS_IN_PROGRESS ||
status_out.status == SWITCHTEC_GEN5_DIAG_EYE_STATUS_PENDING)) {
errno = EBUSY;
return -1;
}

ret = switchtec_cmd(dev, MRPC_GEN5_EYE_CAPTURE, in, size,
NULL, 0);
Expand Down Expand Up @@ -306,7 +340,7 @@ int switchtec_diag_eye_read(struct switchtec_dev *dev, int lane_id,
*
* @return 0 on success, error code on failure
*/
int switchtec_diag_eye_start(struct switchtec_dev *dev, int lane_mask[4],
int switchtec_diag_eye_start(struct switchtec_dev *dev, int lane_mask[5],
struct range *x_range, struct range *y_range,
int step_interval, int capture_depth, int sar_sel,
int intleav_sel, int hstep, int data_mode,
Expand Down Expand Up @@ -336,6 +370,7 @@ int switchtec_diag_eye_start(struct switchtec_dev *dev, int lane_mask[4],
.lane_mask[1] = lane_mask[1],
.lane_mask[2] = lane_mask[2],
.lane_mask[3] = lane_mask[3],
.lane_mask[4] = lane_mask[4],
.sar_sel = sar_sel,
.intleav_sel = intleav_sel,
.vstep = vstep,
Expand Down
25 changes: 25 additions & 0 deletions lib/switchtec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,6 +855,31 @@ const char *switchtec_strerror(void)
default: break;
}
break;
case MRPC_GEN5_EYE_CAPTURE:
switch (err) {
case ERR_EYE_CAP_LANE_MASK_INVAL:
msg = "Eye capture lane mask invalid"; break;
case ERR_EYE_CAP_DEPTH_INVAL:
msg = "Eye capture depth invalid"; break;
case ERR_EYE_CAP_TOO_MANY_LANES:
msg = "Eye capture too many lanes"; break;
case ERR_EYE_CAP_ERROR:
msg = "Eye capture error"; break;
case ERR_EYE_CAP_TIMEOUT:
msg = "Eye capture firmware timeout"; break;
case ERR_EYE_CAP_STATE_INVAL:
msg = "Eye capture state invalid (capture already in progress)"; break;
case ERR_EYE_CAP_LANE_ID_INVAL:
msg = "Eye capture lane ID invalid or inactive"; break;
case ERR_EYE_CAP_BIN_NUM_INVAL:
msg = "Eye capture bin number invalid"; break;
case ERR_EYE_CAP_SUBCMD_INVAL:
msg = "Eye capture sub-command invalid"; break;
case ERR_EYE_CAP_HW_ALLOC_FAIL:
msg = "Eye capture hardware resource allocation failed"; break;
default: break;
}
break;
default: break;
}

Expand Down