Skip to content

Commit

Permalink
openamp: Load the resource table manually in resource_table_init.
Browse files Browse the repository at this point in the history 
This patch allows removing the Open-AMP section used for the resource table
by loading it manually. The Open-AMP ELF loader would attempt to load this
section if the firmware is built for SDRAM.
Note that since we're not using copy tables or ARM CC, the resource table
has always been copied manually.

Signed-off-by: iabdalkader <[email protected]>
  • Loading branch information
@iabdalkader
iabdalkader committed Aug 1, 2024
1 parent 96ccceb commit a208513
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 123 deletions.
3 changes: 3 additions & 0 deletions libraries/openamp_arduino/src/openamp_conf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,9 @@ extern int __OPENAMP_region_end__[];
#define SHM_START_ADDRESS ((metal_phys_addr_t)__OPENAMP_region_start__)
#define SHM_SIZE (size_t)((void *)__OPENAMP_region_end__ - (void *) __OPENAMP_region_start__)

#define SHM_RSC_SIZE (1024)
#define SHM_RSC_ADDR ((void *)__OPENAMP_region_start__ - SHM_RSC_SIZE)

#endif

#define VRING_RX_ADDRESS SHM_START_ADDRESS
Expand Down
167 changes: 44 additions & 123 deletions libraries/openamp_arduino/src/rsc_table.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,137 +21,58 @@
******************************************************************************
*/

/** @addtogroup RSC_TABLE
* @{
*/

/** @addtogroup resource_table
* @{
*/

/** @addtogroup resource_table_Private_Includes
* @{
*/


#if defined(__ICCARM__) || defined (__CC_ARM)
#include <stddef.h> /* needed for offsetof definition*/
#endif
#include "rsc_table.h"
#include "openamp/open_amp.h"

/**
* @}
*/

/** @addtogroup resource_table_Private_TypesDefinitions
* @{
*/

/**
* @}
*/

/** @addtogroup resource_table_Private_Defines
* @{
*/

/* Place resource table in special ELF section */
#if defined(__GNUC__)
#define __section_t(S) __attribute__((__section__(#S)))
#define __resource __section_t(.resource_table)
#endif

#define RPMSG_IPU_C0_FEATURES 1
#define VRING_COUNT 2

/* VirtIO rpmsg device id */
#define VIRTIO_ID_RPMSG_ 7

#if defined (__LOG_TRACE_IO_)
extern char system_log_buf[];
#endif

#if defined(__GNUC__)
#if !defined (__CC_ARM)
/* Since GCC is not initializing the resource_table at startup, it is declared as volatile to avoid compiler optimization
* for the CM4 (see resource_table_init() below)
*/
volatile struct shared_resource_table __resource __attribute__((used)) resource_table;
#else
struct shared_resource_table __resource __attribute__((used)) resource_table = {
#endif
#elif defined(__ICCARM__)
__root struct shared_resource_table resource_table @ ".resource_table" = {
#endif

#if defined(__ICCARM__) || defined (__CC_ARM)
.version = 1,
.num = 2,
.reserved = {0, 0},
.offset = {
offsetof(struct shared_resource_table, vdev),
offsetof(struct shared_resource_table, cm_trace),
},

/* Virtio device entry */
.vdev= {
RSC_VDEV, VIRTIO_ID_RPMSG_, 0, RPMSG_IPU_C0_FEATURES, 0, 0, 0,
VRING_COUNT, {0, 0},
},

/* Vring rsc entry - part of vdev rsc entry */
.vring0 = {VRING_TX_ADDRESS, VRING_ALIGNMENT, VRING_NUM_BUFFS, VRING0_ID, 0},
.vring1 = {VRING_RX_ADDRESS, VRING_ALIGNMENT, VRING_NUM_BUFFS, VRING1_ID, 0},

#if defined (__LOG_TRACE_IO_)
.cm_trace = {
RSC_TRACE,
(uint32_t)system_log_buf, SYSTEM_TRACE_BUF_SZ, 0, "cm4_log",
},
#endif
} ;
#endif

void resource_table_init(int RPMsgRole, void **table_ptr, int *length)
{

#if defined (__GNUC__) && ! defined (__CC_ARM)
#ifdef CORE_CM7
/*
* Currently the GCC linker doesn't initialize the resource_table global variable at startup
* it is done here by the CM7 application.
*/
memset(&resource_table, '\0', sizeof(struct shared_resource_table));
resource_table.num = 1;
resource_table.version = 1;
resource_table.offset[0] = offsetof(struct shared_resource_table, vdev);

resource_table.vring0.da = VRING_TX_ADDRESS;
resource_table.vring0.align = VRING_ALIGNMENT;
resource_table.vring0.num = VRING_NUM_BUFFS;
resource_table.vring0.notifyid = VRING0_ID;

resource_table.vring1.da = VRING_RX_ADDRESS;
resource_table.vring1.align = VRING_ALIGNMENT;
resource_table.vring1.num = VRING_NUM_BUFFS;
resource_table.vring1.notifyid = VRING1_ID;


resource_table.vdev.type = RSC_VDEV;
resource_table.vdev.id = VIRTIO_ID_RPMSG_;
resource_table.vdev.num_of_vrings=VRING_COUNT;
resource_table.vdev.dfeatures = RPMSG_IPU_C0_FEATURES;
#else
/* For CM4 let's wait until the resource_table is correctly initialized */
while(resource_table.vring1.da != VRING_RX_ADDRESS)
{

}
#endif
#endif

(void)RPMsgRole;
*length = sizeof(resource_table);
*table_ptr = &resource_table;
void resource_table_init(int RPMsgRole, void **table_ptr, int *length) {
(void)RPMsgRole;
volatile struct shared_resource_table *resource_table = SHM_RSC_ADDR;

#ifdef CORE_CM7
memset(resource_table, 0, SHM_RSC_SIZE);
resource_table->num = 1;
resource_table->version = 1;
resource_table->offset[0] = offsetof(struct shared_resource_table, vdev);
#if defined (__LOG_TRACE_IO_)
resource_table->offset[1] = offsetof(struct shared_resource_table, cm_trace);
#endif

resource_table->vring0.da = VRING_TX_ADDRESS;
resource_table->vring0.align = VRING_ALIGNMENT;
resource_table->vring0.num = VRING_NUM_BUFFS;
resource_table->vring0.notifyid = VRING0_ID;

resource_table->vring1.da = VRING_RX_ADDRESS;
resource_table->vring1.align = VRING_ALIGNMENT;
resource_table->vring1.num = VRING_NUM_BUFFS;
resource_table->vring1.notifyid = VRING1_ID;

#if defined (__LOG_TRACE_IO_)
resource_table->cm_trace.type;
resource_table->cm_trace.da;
resource_table->cm_trace.len;
resource_table->cm_trace.reserved = 0;
resource_table->cm_trace.name = (uint8_t[]){"cm_trace"};
#endif

resource_table->vdev.type = RSC_VDEV;
resource_table->vdev.id = VIRTIO_ID_RPMSG;
resource_table->vdev.num_of_vrings=VRING_COUNT;
resource_table->vdev.dfeatures = (1 << VIRTIO_RPMSG_F_NS);
#else
// For CM4, wait until the resource_table is initialized by the host
while(resource_table->vring1.da != VRING_RX_ADDRESS) {

}
#endif

*length = SHM_RSC_SIZE;
*table_ptr = resource_table;
}

0 comments on commit a208513

Please sign in to comment.