michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Revert "drivers: can: mcux: Persuade the driver to send in chronological order"

Browse source 
This reverts commit ec0e199206.

Fixes: #26541

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
This commit is contained in:
Henrik Brix Andersen 2022-01-18 14:55:55 +01:00 • committed by Anas Nashif
commit 9c768d83bf
1 changed files with 7 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

59
drivers/can/can_mcux_flexcan.c
View file

@ -52,8 +52,6 @@ LOG_MODULE_REGISTER(can_mcux_flexcan);
(FSL_FEATURE_FLEXCAN_HAS_MESSAGE_BUFFER_MAX_NUMBERn(0) \ (FSL_FEATURE_FLEXCAN_HAS_MESSAGE_BUFFER_MAX_NUMBERn(0) \
- MCUX_FLEXCAN_MAX_RX) - MCUX_FLEXCAN_MAX_RX)
#define MCUX_N_TX_ALLOC_ELEM (1 + (MCUX_FLEXCAN_MAX_TX - 1) / ATOMIC_BITS)
/* /*
* Convert from RX message buffer index to allocated filter ID and * Convert from RX message buffer index to allocated filter ID and
* vice versa. * vice versa.
@ -277,45 +275,6 @@ static void mcux_flexcan_copy_zfilter_to_mbconfig(const struct zcan_filter *src,
} }
} }
/* mcux_get_tx_alloc is a linear on array, and binary on atomic_val_t search
* for the highest bit set in data->tx_allocs. 0 is returned in case of an empty
* tx_alloc, the next free bit otherwise.
* The reason to always use a higher buffer number than the current in use is
* that a FIFO manner is kept. The Controller would otherwise send the frame
* that is in the lowest buffer number first.
*/
static int mcux_get_tx_alloc(struct mcux_flexcan_data *data)
{
atomic_val_t *allocs = data->tx_allocs;
atomic_val_t pivot = ATOMIC_BITS / 2;
atomic_val_t alloc, mask;
int i;
for (i = MCUX_N_TX_ALLOC_ELEM - 1; i >= 0; i--) {
alloc = allocs[i];
if (alloc) {
for (atomic_val_t bits = ATOMIC_BITS / 2U;
bits; bits >>= 1) {
mask = GENMASK(pivot + bits - 1, pivot);
if (alloc & mask) {
pivot += bits / 2U;
} else {
pivot -= bits / 2U;
}
}
if (!(alloc & mask)) {
pivot--;
}
break;
}
}
alloc = alloc ? (pivot + 1 + i * ATOMIC_BITS) : 0;
return alloc >= MCUX_FLEXCAN_MAX_TX ? -1 : alloc;
}
static int mcux_flexcan_get_state(const struct device *dev, enum can_state *state, static int mcux_flexcan_get_state(const struct device *dev, enum can_state *state,
struct can_bus_err_cnt *err_cnt) struct can_bus_err_cnt *err_cnt)
{ {
@ -368,19 +327,14 @@ static int mcux_flexcan_send(const struct device *dev,
return -ENETDOWN; return -ENETDOWN;
} }
while (true) { if (k_sem_take(&data->tx_allocs_sem, timeout) != 0) {
alloc = mcux_get_tx_alloc(data); return -EAGAIN;
if (alloc >= 0) { }
if (atomic_test_and_set_bit(data->tx_allocs, alloc)) {
continue;
}
for (alloc = 0; alloc < MCUX_FLEXCAN_MAX_TX; alloc++) {
if (!atomic_test_and_set_bit(data->tx_allocs, alloc)) {
break; break;
} }
if (k_sem_take(&data->tx_allocs_sem, timeout) != 0) {
return -EAGAIN;
}
} }
mcux_flexcan_copy_zframe_to_frame(frame, &data->tx_cbs[alloc].frame); mcux_flexcan_copy_zframe_to_frame(frame, &data->tx_cbs[alloc].frame);
@ -711,7 +665,8 @@ static int mcux_flexcan_init(const struct device *dev)
int i; int i;
k_mutex_init(&data->rx_mutex); k_mutex_init(&data->rx_mutex);
k_sem_init(&data->tx_allocs_sem, 0, 1); k_sem_init(&data->tx_allocs_sem, MCUX_FLEXCAN_MAX_TX,
MCUX_FLEXCAN_MAX_TX);
for (i = 0; i < ARRAY_SIZE(data->tx_cbs); i++) { for (i = 0; i < ARRAY_SIZE(data->tx_cbs); i++) {
k_sem_init(&data->tx_cbs[i].done, 0, 1); k_sem_init(&data->tx_cbs[i].done, 0, 1);