Skip to content

testing: Add logs to gppi init #4044

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

Closed
nordic-krch wants to merge 1 commit into from
Closed

testing: Add logs to gppi init #4044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions modules/hal_nordic/nrfx/nrfx_kconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,10 @@
#define NRFX_WDT_CONFIG_LOG_ENABLED 1
#endif

#ifdef CONFIG_NRFX_GPPI_SD2PPI_GLOBAL
#define NRFX_GPPI_CONFIG_DPPI_PPIB_EXT_FUNC 1
#endif

#ifdef CONFIG_NRF52_ANOMALY_109_WORKAROUND
#define NRF52_ERRATA_109_ENABLE_WORKAROUND 1
#define NRFX_PWM_NRF52_ANOMALY_109_EGU_INSTANCE \
Expand Down
5 changes: 3 additions & 2 deletions soc/nordic/common/gppi_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,11 @@
#if defined(CONFIG_NRFX_GPPI) && !defined(CONFIG_NRFX_GPPI_V1)

/* For nrf54h20 GPPI requires that ironside communication is up so delay the initialization. */
#define GPPI_INIT_STATE COND_CODE_1(IS_ENABLED(CONFIG_SOC_NRF54H20_CPUAPP), (POST_KERNEL), (EARLY))
#define GPPI_INIT_STATE \
COND_CODE_1(IS_ENABLED(CONFIG_NRFX_GPPI_SD2PPI_GLOBAL), (POST_KERNEL), (EARLY))

#define GPPI_INIT_PRIO \
COND_CODE_1(IS_ENABLED(CONFIG_SOC_NRF54H20_CPUAPP), \
COND_CODE_1(IS_ENABLED(CONFIG_NRFX_GPPI_SD2PPI_GLOBAL), \

Check notice on line 151 in soc/nordic/common/gppi_init.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

soc/nordic/common/gppi_init.c:151 
-#define GPPI_INIT_STATE \
+#define GPPI_INIT_STATE                                                                            \
 	COND_CODE_1(IS_ENABLED(CONFIG_NRFX_GPPI_SD2PPI_GLOBAL), (POST_KERNEL), (EARLY))
 
-#define GPPI_INIT_PRIO                                                          \
+#define GPPI_INIT_PRIO                                                                             \

See https://docs.zephyrproject.org/latest/contribute/guidelines.html#clang-format for more details.
(UTIL_INC(CONFIG_IRONSIDE_SE_CALL_INIT_PRIORITY)), (0))

SYS_INIT(gppi_init, GPPI_INIT_STATE, GPPI_INIT_PRIO);
Expand Down
13 changes: 11 additions & 2 deletions soc/nordic/common/nrfx_gppi_sd2ppi_global.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/
#include "nrfx_gppi_sd2ppi_global.h"
#include <ironside/se/api.h>
#include <stdio.h>

static nrfx_atomic_t channels[NRFX_GPPI_NODE_COUNT];
static nrfx_atomic_t group_channels[NRFX_GPPI_NODE_DPPI_COUNT];
Expand Down Expand Up @@ -420,11 +421,11 @@
NRF_SPU133,
NRF_SPU134,
NRF_SPU135,
IF_ENABLED(NRFX_INSTANCE_PRESENT(SPU136), (NRF_SPU136,))
IF_ENABLED(NRFX_INSTANCE_PRESENT(SPU137), (NRF_SPU137,))
IF_ENABLED(DT_NODE_EXISTS(DT_NODELABEL(dppic135)), (NRF_SPU136,))
IF_ENABLED(DT_NODE_EXISTS(DT_NODELABEL(dppic136)), (NRF_SPU137,))
NRF_SPU122,
};
uint32_t out_mask = 0;

Check notice on line 428 in soc/nordic/common/nrfx_gppi_sd2ppi_global.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

soc/nordic/common/nrfx_gppi_sd2ppi_global.c:428 
-	static const NRF_SPU_Type * spu_addr[] = {
+	static const NRF_SPU_Type *spu_addr[] = {
 		NRF_SPU131,
 		NRF_SPU132,
 		NRF_SPU133,
 		NRF_SPU134,
 		NRF_SPU135,
-		IF_ENABLED(DT_NODE_EXISTS(DT_NODELABEL(dppic135)), (NRF_SPU136,))
-		IF_ENABLED(DT_NODE_EXISTS(DT_NODELABEL(dppic136)), (NRF_SPU137,))
-		NRF_SPU122,
-	};
+		IF_ENABLED(DT_NODE_EXISTS(DT_NODELABEL(dppic135)), (NRF_SPU136,)) IF_ENABLED(DT_NODE_EXISTS(DT_NODELABEL(dppic136)), (NRF_SPU137,)) NRF_SPU122,
+			};

See https://docs.zephyrproject.org/latest/contribute/guidelines.html#clang-format for more details.
uint32_t in_mask = *ch_mask;
struct periphconf_entry entries[IRONSIDE_SE_PERIPHCONF_INLINE_READ_MAX_COUNT];
uint8_t entries_idx[IRONSIDE_SE_PERIPHCONF_INLINE_READ_MAX_COUNT];
Expand Down Expand Up @@ -513,6 +514,14 @@
}

status = ironside_se_periphconf_write(write_entries, write_entries_count);
if (status.status < 0) {

Check warning on line 517 in soc/nordic/common/nrfx_gppi_sd2ppi_global.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

LEADING_SPACE 

soc/nordic/common/nrfx_gppi_sd2ppi_global.c:517  please, no spaces at the start of a line
See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details.
printf("write failed: %d\n", status.status);

Check warning on line 518 in soc/nordic/common/nrfx_gppi_sd2ppi_global.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

LEADING_SPACE 

soc/nordic/common/nrfx_gppi_sd2ppi_global.c:518  please, no spaces at the start of a line
See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details.

Check failure on line 518 in soc/nordic/common/nrfx_gppi_sd2ppi_global.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

CODE_INDENT 

soc/nordic/common/nrfx_gppi_sd2ppi_global.c:518  code indent should use tabs where possible
See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details.
for (int i = 0; i < write_entries_count; i++) {

Check warning on line 519 in soc/nordic/common/nrfx_gppi_sd2ppi_global.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

SUSPECT_CODE_INDENT 

soc/nordic/common/nrfx_gppi_sd2ppi_global.c:519  suspect code indent for conditional statements (8, 12)
See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details.

Check warning on line 519 in soc/nordic/common/nrfx_gppi_sd2ppi_global.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

LEADING_SPACE 

soc/nordic/common/nrfx_gppi_sd2ppi_global.c:519  please, no spaces at the start of a line
See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details.

Check failure on line 519 in soc/nordic/common/nrfx_gppi_sd2ppi_global.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

CODE_INDENT 

soc/nordic/common/nrfx_gppi_sd2ppi_global.c:519  code indent should use tabs where possible
See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details.
printf("%d entry reg:%08x, val:%08x\n", i, (uint32_t)write_entries[i].regptr,

Check warning on line 520 in soc/nordic/common/nrfx_gppi_sd2ppi_global.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

LEADING_SPACE 

soc/nordic/common/nrfx_gppi_sd2ppi_global.c:520  please, no spaces at the start of a line
See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details.

Check failure on line 520 in soc/nordic/common/nrfx_gppi_sd2ppi_global.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

CODE_INDENT 

soc/nordic/common/nrfx_gppi_sd2ppi_global.c:520  code indent should use tabs where possible
See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details.
(uint32_t)write_entries[i].value);

Check warning on line 521 in soc/nordic/common/nrfx_gppi_sd2ppi_global.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

LEADING_SPACE 

soc/nordic/common/nrfx_gppi_sd2ppi_global.c:521  please, no spaces at the start of a line
See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details.

Check failure on line 521 in soc/nordic/common/nrfx_gppi_sd2ppi_global.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

CODE_INDENT 

soc/nordic/common/nrfx_gppi_sd2ppi_global.c:521  code indent should use tabs where possible
See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details.
}

Check warning on line 522 in soc/nordic/common/nrfx_gppi_sd2ppi_global.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

LEADING_SPACE 

soc/nordic/common/nrfx_gppi_sd2ppi_global.c:522  please, no spaces at the start of a line
See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details.

Check failure on line 522 in soc/nordic/common/nrfx_gppi_sd2ppi_global.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

CODE_INDENT 

soc/nordic/common/nrfx_gppi_sd2ppi_global.c:522  code indent should use tabs where possible
See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details.
}

Check warning on line 523 in soc/nordic/common/nrfx_gppi_sd2ppi_global.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

LEADING_SPACE 

soc/nordic/common/nrfx_gppi_sd2ppi_global.c:523  please, no spaces at the start of a line
See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details.

Check notice on line 524 in soc/nordic/common/nrfx_gppi_sd2ppi_global.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

soc/nordic/common/nrfx_gppi_sd2ppi_global.c:524 
-    if (status.status < 0) {
-        printf("write failed: %d\n", status.status);
-        for (int i = 0; i < write_entries_count; i++) {
-            printf("%d entry reg:%08x, val:%08x\n", i, (uint32_t)write_entries[i].regptr,
-                    (uint32_t)write_entries[i].value);
-        }
-    }
+	if (status.status < 0) {
+		printf("write failed: %d\n", status.status);
+		for (int i = 0; i < write_entries_count; i++) {
+			printf("%d entry reg:%08x, val:%08x\n", i,
+			       (uint32_t)write_entries[i].regptr, (uint32_t)write_entries[i].value);
+		}
+	}

See https://docs.zephyrproject.org/latest/contribute/guidelines.html#clang-format for more details.
write_entries_count = 0;

return (status.status < 0) ? -EIO : 0;
Expand Down
Loading