Skip to content

Commit 1c0f241

Browse files
henrikbrixandersennashif
authored andcommitted
tests: drivers: can: api: restore default bitrates
Restore the default CAN bitrates after having tested setting bitrate and timing. This ensures the arbitration phase bitrate is proportional to the data phase bitrate, allowing CAN FD transmission tests to complete. Fixes: #73723 Signed-off-by: Henrik Brix Andersen <[email protected]>
1 parent 88f30f3 commit 1c0f241

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

tests/drivers/can/api/src/canfd.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,9 @@ ZTEST_USER(canfd, test_set_timing_data_min)
388388
err = can_set_timing_data(can_dev, can_get_timing_data_min(can_dev));
389389
zassert_equal(err, 0, "failed to set minimum timing data parameters (err %d)", err);
390390

391+
err = can_set_bitrate_data(can_dev, CONFIG_CAN_DEFAULT_BITRATE_DATA);
392+
zassert_equal(err, 0, "failed to restore default data bitrate");
393+
391394
err = can_start(can_dev);
392395
zassert_equal(err, 0, "failed to start CAN controller (err %d)", err);
393396
}
@@ -435,6 +438,9 @@ ZTEST_USER(canfd, test_set_timing_data_max)
435438
err = can_set_timing_data(can_dev, can_get_timing_data_max(can_dev));
436439
zassert_equal(err, 0, "failed to set maximum timing data parameters (err %d)", err);
437440

441+
err = can_set_bitrate_data(can_dev, CONFIG_CAN_DEFAULT_BITRATE_DATA);
442+
zassert_equal(err, 0, "failed to restore default data bitrate");
443+
438444
err = can_start(can_dev);
439445
zassert_equal(err, 0, "failed to start CAN controller (err %d)", err);
440446
}

tests/drivers/can/api/src/classic.c

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,9 @@ ZTEST_USER(can_classic, test_set_bitrate)
529529
err = can_set_bitrate(can_dev, TEST_BITRATE_1);
530530
zassert_equal(err, 0, "failed to set bitrate");
531531

532+
err = can_set_bitrate(can_dev, CONFIG_CAN_DEFAULT_BITRATE);
533+
zassert_equal(err, 0, "failed to restore default bitrate");
534+
532535
err = can_start(can_dev);
533536
zassert_equal(err, 0, "failed to start CAN controller (err %d)", err);
534537
}
@@ -546,6 +549,9 @@ ZTEST_USER(can_classic, test_set_timing_min)
546549
err = can_set_timing(can_dev, can_get_timing_min(can_dev));
547550
zassert_equal(err, 0, "failed to set minimum timing parameters (err %d)", err);
548551

552+
err = can_set_bitrate(can_dev, CONFIG_CAN_DEFAULT_BITRATE);
553+
zassert_equal(err, 0, "failed to restore default bitrate");
554+
549555
err = can_start(can_dev);
550556
zassert_equal(err, 0, "failed to start CAN controller (err %d)", err);
551557
}
@@ -563,6 +569,9 @@ ZTEST_USER(can_classic, test_set_timing_max)
563569
err = can_set_timing(can_dev, can_get_timing_max(can_dev));
564570
zassert_equal(err, 0, "failed to set maximum timing parameters (err %d)", err);
565571

572+
err = can_set_bitrate(can_dev, CONFIG_CAN_DEFAULT_BITRATE);
573+
zassert_equal(err, 0, "failed to restore default bitrate");
574+
566575
err = can_start(can_dev);
567576
zassert_equal(err, 0, "failed to start CAN controller (err %d)", err);
568577
}
@@ -1180,10 +1189,13 @@ ZTEST_USER(can_classic, test_filters_preserved_through_bitrate_change)
11801189
zassert_equal(state, CAN_STATE_STOPPED, "CAN controller not stopped");
11811190

11821191
err = can_set_bitrate(can_dev, TEST_BITRATE_2);
1183-
zassert_equal(err, 0, "failed to set bitrate");
1192+
zassert_equal(err, 0, "failed to set bitrate 2");
11841193

11851194
err = can_set_bitrate(can_dev, TEST_BITRATE_1);
1186-
zassert_equal(err, 0, "failed to set bitrate");
1195+
zassert_equal(err, 0, "failed to set bitrate 1");
1196+
1197+
err = can_set_bitrate(can_dev, CONFIG_CAN_DEFAULT_BITRATE);
1198+
zassert_equal(err, 0, "failed to restore default bitrate");
11871199

11881200
err = can_start(can_dev);
11891201
zassert_equal(err, 0, "failed to start CAN controller (err %d)", err);

0 commit comments

Comments
 (0)