Skip to content
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.

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

Mpfs IHC bugfixes and perf enhancements #10484

Merged
merged 6 commits into from Sep 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 37 additions & 0 deletions arch/risc-v/src/mpfs/Kconfig
Expand Up @@ -451,6 +451,43 @@ config MPFS_IHC_RPMSG_CH2
Use this only if using 2 x RPMSG channels. This makes the NuttX work as the
RPMSG channel 2 client.

config MPFS_IHC_WITH_HSS
bool "IHC with HSS"
depends on MPFS_IHC_CLIENT
default n
---help---
Set this to true if using IHC with HSS bootloader

config MPFS_CH1_VRING_SHMEM_ADDR
hex "Channel 1 Vring shared memory start"
default 0xA2410000
depends on MPFS_IHC_CLIENT

config MPFS_CH1_VRING0_DESC_ADDR
hex "Channel 1 Vring0 descriptor area"
default 0xA2400000
depends on MPFS_IHC_CLIENT

config MPFS_CH1_VRING1_DESC_ADDR
hex "Channel 1 Vring1 descriptor area"
default 0xA2408000
depends on MPFS_IHC_CLIENT

config MPFS_CH2_VRING_SHMEM_ADDR
hex "Channel 2 Vring shared memory start"
default 0xA2460000
depends on MPFS_IHC_CLIENT && MPFS_IHC_RPMSG_CH2

config MPFS_CH2_VRING0_DESC_ADDR
hex "Channel 2 Vring0 descriptor area"
default 0xA2450000
depends on MPFS_IHC_CLIENT && MPFS_IHC_RPMSG_CH2

config MPFS_CH2_VRING1_DESC_ADDR
hex "Channel 2 Vring1 descriptor area"
default 0xA2458000
depends on MPFS_IHC_CLIENT && MPFS_IHC_RPMSG_CH2

config MPFS_ETHMAC
bool
default n
Expand Down
1 change: 1 addition & 0 deletions arch/risc-v/src/mpfs/Make.defs
Expand Up @@ -84,6 +84,7 @@ endif

ifeq (${CONFIG_MPFS_OPENSBI},y)
CHIP_ASRCS += mpfs_opensbi_utils.S
CHIP_ASRCS += mpfs_opensbi_trap.S
CHIP_CSRCS += mpfs_opensbi.c
endif

Expand Down
4 changes: 2 additions & 2 deletions arch/risc-v/src/mpfs/hardware/mpfs_ihc.h
Expand Up @@ -27,8 +27,8 @@

enum mpfs_irq_type_e
{
MP_IRQ = 0x0,
ACK_IRQ = 0x1,
MP_IRQ = 0x1,
ACK_IRQ = 0x2,
};

#define IHC_MAX_MESSAGE_SIZE 2
Expand Down