Skip to content

Commit 7da7818

Browse files
committed
Revert "soc: nxp: imxrt: imxrt118x: change trdc permission getting strategy"
This reverts commit e3538a3 as it's causing CI failures in main. Signed-off-by: Benjamin Cabé <[email protected]>
1 parent a0fde2e commit 7da7818

File tree

1 file changed

+16
-21
lines changed
  • soc/nxp/imxrt/imxrt118x

1 file changed

+16
-21
lines changed

soc/nxp/imxrt/imxrt118x/soc.c

+16-21
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
/*
2-
* Copyright 2024-2025 NXP
2+
* Copyright 2024 NXP
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

77
#include <zephyr/kernel.h>
88
#include <zephyr/device.h>
99
#include <zephyr/init.h>
10-
#include <zephyr/logging/log.h>
1110
#include <soc.h>
1211
#include <zephyr/linker/sections.h>
1312
#include <zephyr/linker/linker-defs.h>
@@ -24,8 +23,6 @@
2423
#include <zephyr/dt-bindings/clock/imx_ccm_rev2.h>
2524
#include <cmsis_core.h>
2625

27-
LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
28-
2926
/*
3027
* Set ELE_STICK_FAILED_STS to 0 when ELE status check is not required,
3128
* which is useful when debug reset, where the core has already get the
@@ -524,36 +521,34 @@ static ALWAYS_INLINE void trdc_enable_all_access(void)
524521
status_t sts;
525522
uint8_t i, j;
526523

527-
/* Get ELE FW status */
524+
/* Get ELE FW status */
528525
do {
529526
uint32_t ele_fw_sts;
530527

531528
sts = ELE_BaseAPI_GetFwStatus(MU_RT_S3MUA, &ele_fw_sts);
532529
} while (sts != kStatus_Success);
533530

531+
do {
534532
#if defined(CONFIG_SOC_MIMXRT1189_CM33)
535-
/* Release TRDC AON to CM33 core */
536-
sts = ELE_BaseAPI_ReleaseRDC(MU_RT_S3MUA, ELE_TRDC_AON_ID, ELE_CORE_CM33_ID);
533+
/* Release TRDC A to CM33 core */
534+
sts = ELE_BaseAPI_ReleaseRDC(MU_RT_S3MUA, ELE_TRDC_AON_ID, ELE_CORE_CM33_ID);
537535
#elif defined(CONFIG_SOC_MIMXRT1189_CM7)
538-
/* Release TRDC AON to CM7 core */
539-
sts = ELE_BaseAPI_ReleaseRDC(MU_RT_S3MUA, ELE_TRDC_AON_ID, ELE_CORE_CM7_ID);
536+
/* Release TRDC A to CM7 core */
537+
sts = ELE_BaseAPI_ReleaseRDC(MU_RT_S3MUA, ELE_TRDC_AON_ID, ELE_CORE_CM7_ID);
540538
#endif
541-
if (sts != kStatus_Success) {
542-
LOG_WRN("warning: TRDC AON permission get failed. If core don't get TRDC "
543-
"AON permission, AON domain permission can't be configured.");
544-
}
539+
} while (ELE_IS_FAILED(sts));
545540

541+
/* Release TRDC W to CM33 core */
542+
do {
546543
#if defined(CONFIG_SOC_MIMXRT1189_CM33)
547-
/* Release TRDC Wakeup to CM33 core */
548-
sts = ELE_BaseAPI_ReleaseRDC(MU_RT_S3MUA, ELE_TRDC_WAKEUP_ID, ELE_CORE_CM33_ID);
544+
/* Release TRDC A to CM33 core */
545+
sts = ELE_BaseAPI_ReleaseRDC(MU_RT_S3MUA, ELE_TRDC_WAKEUP_ID, ELE_CORE_CM33_ID);
549546
#elif defined(CONFIG_SOC_MIMXRT1189_CM7)
550-
/* Release TRDC Wakeup to CM7 core */
551-
sts = ELE_BaseAPI_ReleaseRDC(MU_RT_S3MUA, ELE_TRDC_WAKEUP_ID, ELE_CORE_CM7_ID);
547+
/* Release TRDC A to CM7 core */
548+
sts = ELE_BaseAPI_ReleaseRDC(MU_RT_S3MUA, ELE_TRDC_WAKEUP_ID, ELE_CORE_CM7_ID);
552549
#endif
553-
if (sts != kStatus_Success) {
554-
LOG_WRN("warning: TRDC Wakeup permission get failed. If core don't get TRDC "
555-
"Wakeup permission, Wakeup domain permission can't be configured.");
556-
}
550+
} while (ELE_IS_FAILED(sts));
551+
557552

558553
/* Set the master domain access configuration for eDMA3/eDMA4 */
559554
trdc_non_processor_domain_assignment_t edmaAssignment;

0 commit comments

Comments
 (0)