patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

drivers: can_mcp251xfd: Fix setting data phase parameters

Browse source 
Commit eeec09eb9a unintentionally modified
can_calc_timing_data() to be called with the nominal phase parameters
instead of the data phase parameters.

Before the change, the parameters were properly initialized in the macro
MCP251XFD_SET_TIMING_MACRO(inst, _data).
After the commit, can_calc_timing_data() gets called with the parameters
pointing to dev_cfg->common.sample_point instead of
dev_cfg->commom.sample_point_data.

This PR creates a separate function mcp251xfd_set_timing_data()
which calls can_calc_timing_data with the correct data parameters.

Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
This commit is contained in:
Andriy Gelman 2024-01-22 11:41:30 -05:00 committed by Carles Cufí
parent 938d3547d0
commit 12bc02031e
1 changed files with 38 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
drivers/can/can_mcp251xfd.c
View file

@ -1290,22 +1290,48 @@ static void mcp251xfd_tef_fifo_handler(const struct device *dev, void *data)
k_sem_give(&dev_data->tx_sem);
}
#if defined(CONFIG_CAN_FD_MODE)
static int mcp251xfd_init_timing_struct_data(struct can_timing *timing,
const struct device *dev,
const struct mcp251xfd_timing_params *timing_params)
{
const struct mcp251xfd_config *dev_cfg = dev->config;
int ret;
if (USE_SP_ALGO && dev_cfg->common.sample_point_data > 0) {
ret = can_calc_timing_data(dev, timing, dev_cfg->common.bus_speed_data,
dev_cfg->common.sample_point_data);
if (ret < 0) {
return ret;
}
LOG_DBG("Data phase Presc: %d, BS1: %d, BS2: %d", timing->prescaler,
timing->phase_seg1, timing->phase_seg2);
LOG_DBG("Data phase Sample-point err : %d", ret);
} else {
timing->sjw = timing_params->sjw;
timing->prop_seg = timing_params->prop_seg;
timing->phase_seg1 = timing_params->phase_seg1;
timing->phase_seg2 = timing_params->phase_seg2;
ret = can_calc_prescaler(dev, timing, dev_cfg->common.bus_speed_data);
if (ret > 0) {
LOG_WRN("Data phase Bitrate error: %d", ret);
}
}
return ret;
}
#endif
static int mcp251xfd_init_timing_struct(struct can_timing *timing,
const struct device *dev,
const struct mcp251xfd_timing_params *timing_params,
bool is_nominal)
const struct mcp251xfd_timing_params *timing_params)
{
const struct mcp251xfd_config *dev_cfg = dev->config;
int ret;
if (USE_SP_ALGO && dev_cfg->common.sample_point > 0) {
if (is_nominal) {
ret = can_calc_timing(dev, timing, dev_cfg->common.bus_speed,
dev_cfg->common.sample_point);
} else {
ret = can_calc_timing_data(dev, timing, dev_cfg->common.bus_speed,
dev_cfg->common.sample_point);
}
ret = can_calc_timing(dev, timing, dev_cfg->common.bus_speed,
dev_cfg->common.sample_point);
if (ret < 0) {
return ret;
}
@ -1552,16 +1578,16 @@ static int mcp251xfd_init(const struct device *dev)
goto done;
}
ret = mcp251xfd_init_timing_struct(&timing, dev, &dev_cfg->timing_params, true);
ret = mcp251xfd_init_timing_struct(&timing, dev, &dev_cfg->timing_params);
if (ret < 0) {
LOG_ERR("Can't find timing for given param");
goto done;
}
#if defined(CONFIG_CAN_FD_MODE)
ret = mcp251xfd_init_timing_struct(&timing_data, dev, &dev_cfg->timing_params_data, false);
ret = mcp251xfd_init_timing_struct_data(&timing_data, dev, &dev_cfg->timing_params_data);
if (ret < 0) {
LOG_ERR("Can't find timing for given param");
LOG_ERR("Can't find data timing for given param");
goto done;
}
#endif