diff --git a/arch/risc-v/Kconfig b/arch/risc-v/Kconfig index 495316bee4..50e3091ba4 100644 --- a/arch/risc-v/Kconfig +++ b/arch/risc-v/Kconfig @@ -308,11 +308,12 @@ config ARCH_CHIP_K230 select ARCH_HAVE_DPFPU select ARCH_HAVE_MISALIGN_EXCEPTION select ARCH_HAVE_MPU - select ARCH_MMU_TYPE_SV39 select ARCH_HAVE_ADDRENV - select ARCH_NEED_ADDRENV_MAPPING + select ARCH_HAVE_RESET select ARCH_HAVE_S_MODE select ARCH_HAVE_ELF_EXECUTABLE + select ARCH_MMU_TYPE_SV39 + select ARCH_NEED_ADDRENV_MAPPING select NUTTSBI_LATE_INIT if NUTTSBI select ONESHOT select ALARM_ARCH diff --git a/arch/risc-v/src/k230/k230_mm_init.c b/arch/risc-v/src/k230/k230_mm_init.c index 7ebe1ad3d8..721d8e0b72 100644 --- a/arch/risc-v/src/k230/k230_mm_init.c +++ b/arch/risc-v/src/k230/k230_mm_init.c @@ -229,11 +229,15 @@ void k230_kernel_mappings(void) /* dump page tables */ +#ifdef DEBUG_MM dump_pgtable(m_l1_pgtable, PGT_L1_SIZE, "L1"); dump_pgtable(m_l2_pgt_dev, PGT_L2_SIZE, "L2_DEV"); dump_pgtable(m_l2_pgt_int, PGT_L2_SIZE, "L2_INT"); dump_pgtable(m_l2_pgt_ddr, PGT_L2_SIZE, "L2_DDR"); dump_pgtable(m_l3_pgt_ddr, PGT_L3_SIZE, "L3_DDR"); +#else + UNUSED(dump_pgtable); +#endif } /**************************************************************************** diff --git a/arch/risc-v/src/k230/k230_rptun.c b/arch/risc-v/src/k230/k230_rptun.c index 453d8c4d26..f511d0d4a2 100644 --- a/arch/risc-v/src/k230/k230_rptun.c +++ b/arch/risc-v/src/k230/k230_rptun.c @@ -228,7 +228,7 @@ static struct rptun_rsc_s *rp_get_resource(struct rptun_dev_s *dev) nxsig_usleep(100); } - rpinfo("ready to go!\n"); + rpinfo("shmem:%lx, dev:%p\n", priv->shmem->base, dev); } return &priv->shmem->rsc; @@ -297,6 +297,8 @@ int k230_rptun_init(const char *peername) struct k230_rptun_dev_s *dev = &g_rptun_dev; int ret = OK; + memset(dev, 0, sizeof(*dev)); + #ifdef CONFIG_K230_RPTUN_MASTER /* master is responsible for initializing shmem */ @@ -308,7 +310,7 @@ int k230_rptun_init(const char *peername) #endif ret = k230_ipi_init(RPTUN_IPI_DEVN, RPTUN_IPI_LINE_MASK, RPTUN_IPI_ROLE, - k230_rptun_callback, dev); + k230_rptun_callback, dev); if (ret < 0) { rperr("k230_ipi_init failed %d\n", ret);