Skip to content

Add error for hwmc response len 0 + replace hard-coded addresses #285

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

Merged
ejgoldik merged 3 commits into from
Jul 16, 2025
Merged

Add error for hwmc response len 0 + replace hard-coded addresses #285

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0344c10
Added err and dmesg in ds5_get_hwmc if response length is 0
ejgoldik Jul 15, 2025
8453294
Added comments and replaced hard coded HWMC addresses
ejgoldik Jul 15, 2025
913c79c
Fixed print
ejgoldik Jul 16, 2025
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
58 changes: 32 additions & 26 deletions kernel/realsense/d4xx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1833,18 +1833,24 @@ static int ds5_get_hwmc(struct ds5 *state, unsigned char *data,
}

ret = regmap_raw_read(state->regmap, DS5_HWMC_RESP_LEN,
&tmp_len, sizeof(tmp_len));
&tmp_len, sizeof(tmp_len)); /* Read response length */
if (ret)
return -EBADMSG;

if (tmp_len > cmdDataLen)
return -ENOBUFS;

if (tmp_len == 0) {
dev_err(&state->client->dev,

Copilot AI Jul 16, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment on line 1827 contains a typo: "ccompletion" should be "completion".

Copilot uses AI. Check for mistakes.

@ymodlin ymodlin Jul 16, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is a mistake... I don't see this work

"%s(): HWMC response length is 0\n", __func__);
return -ENODATA;
}

dev_dbg(&state->client->dev,
"%s(): HWMC read len: %d, lrs_len: %d\n",
__func__, tmp_len, tmp_len - 4);

ds5_raw_read_with_check(state, DS5_HWMC_DATA, data, tmp_len);
ds5_raw_read_with_check(state, DS5_HWMC_DATA, data, tmp_len); /* Read response data */
if (dataLen)
*dataLen = tmp_len;
return ret;
Expand All @@ -1860,8 +1866,8 @@ static int ds5_send_hwmc(struct ds5 *state,
__func__, cmd->header, cmd->magic_word, cmd->opcode,
cmdLen, cmd->param1, cmd->param2, cmd->param3, cmd->param4);

ds5_raw_write_with_check(state, DS5_HWMC_DATA, cmd, cmdLen);
ds5_raw_write_with_check(state, DS5_HWMC_DATA, cmd, cmdLen); /* Write command data */

ds5_write_with_check(state, DS5_HWMC_EXEC, 0x01); /* execute cmd */

return 0;
Expand All @@ -1874,7 +1880,7 @@ static int ds5_set_calibration_data(struct ds5 *state,
int retries = 10;
u16 status = 2;

ds5_raw_write_with_check(state, DS5_HWMC_DATA, cmd, length);
ds5_raw_write_with_check(state, DS5_HWMC_DATA, cmd, length); /* Write command data */

ds5_write_with_check(state, DS5_HWMC_EXEC, 0x01); /* execute cmd */
do {
Expand Down Expand Up @@ -2248,12 +2254,12 @@ static int ds5_get_calibration_data(struct ds5 *state, enum table_id id,

memcpy(cmd, &get_calib_data, sizeof(get_calib_data));
cmd->param1 = id;
ds5_raw_write_with_check(state, 0x4900, cmd, sizeof(struct hwm_cmd));
ds5_write_with_check(state, 0x490c, 0x01); /* execute cmd */
ds5_raw_write_with_check(state, DS5_HWMC_DATA, cmd, sizeof(struct hwm_cmd)); /* Write command data */
ds5_write_with_check(state, DS5_HWMC_EXEC, 0x01); /* execute cmd */
do {
if (retries != 3)
msleep_range(10);
ret = ds5_read(state, 0x4904, &status);
ret = ds5_read(state, DS5_HWMC_STATUS, &status);
} while (ret && retries-- && status != 0);

if (ret || status != 0) {
Expand All @@ -2265,11 +2271,11 @@ static int ds5_get_calibration_data(struct ds5 *state, enum table_id id,
}

// get table length from fw
ret = regmap_raw_read(state->regmap, 0x4908,
&table_length, sizeof(table_length));
ret = regmap_raw_read(state->regmap, DS5_HWMC_RESP_LEN,
&table_length, sizeof(table_length)); /* Read response length */

// read table
ds5_raw_read_with_check(state, 0x4900, cmd->Data, table_length);
ds5_raw_read_with_check(state, DS5_HWMC_DATA, cmd->Data, table_length); /* Read table data */

// first 4 bytes are opcode HWM, not part of calibration table
memcpy(table, cmd->Data + 4, length);
Expand All @@ -2286,13 +2292,13 @@ static int ds5_gvd(struct ds5 *state, unsigned char *data)
u8 retries = 3;

memcpy(&cmd, &gvd, sizeof(gvd));
ds5_raw_write_with_check(state, 0x4900, &cmd, sizeof(cmd));
ds5_write_with_check(state, 0x490c, 0x01); /* execute cmd */
ds5_raw_write_with_check(state, DS5_HWMC_DATA, &cmd, sizeof(cmd)); /* Write command data */
ds5_write_with_check(state, DS5_HWMC_EXEC, 0x01); /* execute cmd */
do {
if (retries != 3)
msleep_range(10);

ret = ds5_read(state, 0x4904, &status);
ret = ds5_read(state, DS5_HWMC_STATUS, &status);
} while (ret && retries-- && status != 0);

if (ret || status != 0) {
Expand All @@ -2302,8 +2308,8 @@ static int ds5_gvd(struct ds5 *state, unsigned char *data)
return status;
}

ret = regmap_raw_read(state->regmap, 0x4908, &length, sizeof(length));
ds5_raw_read_with_check(state, 0x4900, data, length);
ret = regmap_raw_read(state->regmap, DS5_HWMC_RESP_LEN, &length, sizeof(length)); /* Read response length */
ds5_raw_read_with_check(state, DS5_HWMC_DATA, data, length); /* Read response data */

return ret;
}
Expand Down Expand Up @@ -2418,19 +2424,19 @@ static int ds5_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
// 1. prepare and send command
// 2. send command
// 3. execute command
// 4. wait for ccompletion
ret = regmap_raw_write(state->regmap, 0x4900,
// 4. wait for completion
ret = regmap_raw_write(state->regmap, DS5_HWMC_DATA, /* Write command data */
log_prepare, sizeof(log_prepare));
if (ret < 0)
return ret;

ret = regmap_raw_write(state->regmap, 0x490C,
&execute_cmd, sizeof(execute_cmd));
ret = regmap_raw_write(state->regmap, DS5_HWMC_EXEC,
&execute_cmd, sizeof(execute_cmd)); /* execute cmd */
if (ret < 0)
return ret;

for (i = 0; i < DS5_MAX_LOG_POLL; i++) {
ret = regmap_raw_read(state->regmap, 0x4904,
ret = regmap_raw_read(state->regmap, DS5_HWMC_STATUS,
&data, sizeof(data));
dev_dbg(&state->client->dev, "%s(): log ready 0x%x\n",
__func__, data);
Expand All @@ -2444,15 +2450,15 @@ static int ds5_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
// if (i == DS5_MAX_LOG_POLL)
// return -ETIMEDOUT;

ret = regmap_raw_read(state->regmap, 0x4908, &data, sizeof(data));
ret = regmap_raw_read(state->regmap, DS5_HWMC_RESP_LEN, &data, sizeof(data)); /* Read response length */
dev_dbg(&state->client->dev, "%s(): log size 0x%x\n", __func__, data);
if (ret < 0)
return ret;
if (!data)
return 0;
if (data > 1024)
return -ENOBUFS;
ret = regmap_raw_read(state->regmap, 0x4900,
ret = regmap_raw_read(state->regmap, DS5_HWMC_DATA,
ctrl->p_new.p_u8, data);
break;
case DS5_CAMERA_DEPTH_CALIBRATION_TABLE_GET:
Expand Down Expand Up @@ -4731,9 +4737,9 @@ static int ds5_dfu_switch_to_dfu(struct ds5 *state)
int i = DS5_START_MAX_COUNT;
u16 status;

ds5_raw_write_with_check(state, 0x4900,
&cmd_switch_to_dfu, sizeof(cmd_switch_to_dfu));
ds5_write_with_check(state, 0x490c, 0x01); /* execute cmd */
ds5_raw_write_with_check(state, DS5_HWMC_DATA,
&cmd_switch_to_dfu, sizeof(cmd_switch_to_dfu)); /* Write command data */
ds5_write_with_check(state, DS5_HWMC_EXEC, 0x01); /* execute cmd */
/*Wait for DFU fw to boot*/
do {
msleep_range(DS5_START_POLL_TIME*10);
Expand Down