Skip to content

Commit

Permalink
Added support to Coresight components in Baremetal
Browse files Browse the repository at this point in the history 
 - Included a new structure for coresight components
 - pal_get_device_path API is implemented for baremetal
 - Named components device_name parameter moved to
   platform_override_fvp.h
 - Minor bug fixes for PMCG nodes parsing code.

Signed-off-by: Srikar Josyula <srikar.josyula@arm.com>
  • Loading branch information
@SrikarJosyula
SrikarJosyula committed Jun 30, 2023
1 parent f961112 commit b5acf0e
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 29 deletions.
15 changes: 12 additions & 3 deletions platform/pal_baremetal/FVP/RDN2/include/platform_override_fvp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -478,14 +478,17 @@ extern uint32_t g_num_modules;
#define NAMED_COMP1_MAP8_OUTPUT_BASE 0x30008
#define NAMED_COMP1_MAP8_OUTPUT_REF 0xA54

#define IOVIRT_PMCG_BASE_ADDRESS 0x0
#define IOVIRT_PMCG_OVERFLOW_GSIV 0x0
#define IOVIRT_PMCG_NODE_REFERENCE 0x0
#define IOVIRT_PMCG_0_BASE_ADDRESS 0x0
#define IOVIRT_PMCG_0_OVERFLOW_GSIV 0x0
#define IOVIRT_PMCG_0_NODE_REFERENCE 0x0
#define IOVIRT_PMCG_0_SMMU_BASE 0x0

#define IOVIRT_NAMED_0_SMMU_BASE 0x48000000
#define IOVIRT_NAMED_0_MEM_PROP 0x1
#define IOVIRT_NAMED_0_DEVICE_NAME "\\_SB_.ETR0"
#define IOVIRT_NAMED_1_SMMU_BASE 0x48000000
#define IOVIRT_NAMED_1_MEM_PROP 0x1
#define IOVIRT_NAMED_1_DEVICE_NAME "\\_SB_.DMA0"

#define IOVIRT_RC_NUM_MAP 4
#define IOVIRT_SMMUV3_0_NUM_MAP 2
Expand All @@ -497,6 +500,12 @@ extern uint32_t g_num_modules;
#define IOVIRT_NAMED_COMP1_NUM_MAP 9
#define IOVIRT_MAX_NUM_MAP 33

/* Coresight components config parameters*/
#define CS_COMPONENT_COUNT 1

#define CS_COMPONENT_0_IDENTIFIER "ARMHC97C"
#define CS_COMPONENT_0_DEVICE_NAME "\\_SB_.ETR0"

/* DMA platform config parameters */
#define PLATFORM_OVERRIDE_DMA_CNT 0

Expand Down
11 changes: 11 additions & 0 deletions platform/pal_baremetal/FVP/RDN2/include/platform_override_struct.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,17 @@ typedef struct {
uint32_t output_ref[IOVIRT_MAX_NUM_MAP];
} PLATFORM_OVERRIDE_NODE_DATA_MAP;

#define MAX_CS_COMP_LENGTH 256

typedef struct {
char identifier[MAX_CS_COMP_LENGTH]; // Hardware ID for Coresight ARM implementations
char dev_name[MAX_CS_COMP_LENGTH]; // Device name of the Coresight components
} PLATFORM_OVERRIDE_CORESIGHT_COMP_INFO_BLOCK;

typedef struct {
PLATFORM_OVERRIDE_CORESIGHT_COMP_INFO_BLOCK component[CS_COMPONENT_COUNT];
} PLATFORM_OVERRIDE_CS_COMP_NODE_DATA;

typedef struct {
uint64_t Address;
uint32_t node_count;
Expand Down
15 changes: 11 additions & 4 deletions platform/pal_baremetal/FVP/RDN2/src/platform_cfg_fvp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -427,17 +427,24 @@ PLATFORM_OVERRIDE_SMMU_NODE_DATA platform_smmu_node_data = {

PLATFORM_OVERRIDE_PMCG_NODE_DATA platform_pmcg_node_data = {
/* Place holder Fill this as below if PMCG is present
.pmcg[0].base = IOVIRT_PMCG_BASE_ADDRESS,
.pmcg[0].overflow_gsiv = IOVIRT_PMCG_OVERFLOW_GSIV,
.pmcg[0].node_ref = IOVIRT_PMCG_NODE_REFERENCE,
.pmcg[0].smmu_base = IOVIRT_PMCG_SMMU_BASE,*/
.pmcg[0].base = IOVIRT_PMCG_0_BASE_ADDRESS,
.pmcg[0].overflow_gsiv = IOVIRT_PMCG_0_OVERFLOW_GSIV,
.pmcg[0].node_ref = IOVIRT_PMCG_0_NODE_REFERENCE,
.pmcg[0].smmu_base = IOVIRT_PMCG_0_SMMU_BASE,*/
};

PLATFORM_OVERRIDE_NAMED_NODE_DATA platform_named_node_data = {
.named[0].smmu_base = IOVIRT_NAMED_0_SMMU_BASE,
.named[0].memory_properties = IOVIRT_NAMED_0_MEM_PROP,
.named[0].name = IOVIRT_NAMED_0_DEVICE_NAME,
.named[1].smmu_base = IOVIRT_NAMED_1_SMMU_BASE,
.named[1].memory_properties = IOVIRT_NAMED_1_MEM_PROP,
.named[1].name = IOVIRT_NAMED_1_DEVICE_NAME,
};

PLATFORM_OVERRIDE_CS_COMP_NODE_DATA platform_cs_comp_node_data = {
.component[0].identifier = CS_COMPONENT_0_IDENTIFIER,
.component[0].dev_name = CS_COMPONENT_0_DEVICE_NAME,
};

PLATFORM_OVERRIDE_UART_INFO_TABLE platform_uart_cfg = {
Expand Down
14 changes: 0 additions & 14 deletions platform/pal_baremetal/FVP/src/pal_bm_iovirt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,6 @@

#include "include/pal_common_support.h"

/**
@brief Check the hid and copy the full path of hid
@param hid hardware ID to get the path for
@param hid_path 2D array in which the path is copied
@return 1 if test fails, 0 if test passes
**/
uint32_t
pal_get_device_path(const char *hid, char hid_path[][MAX_NAMED_COMP_LENGTH])
{
return 1;
}

/**
@brief Platform defined method to check if CATU is behind an ETR device
Expand Down
51 changes: 43 additions & 8 deletions platform/pal_baremetal/src/pal_iovirt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ extern PLATFORM_OVERRIDE_NODE_DATA platform_node_type;
extern PLATFORM_OVERRIDE_SMMU_NODE_DATA platform_smmu_node_data;
extern PLATFORM_OVERRIDE_PMCG_NODE_DATA platform_pmcg_node_data;
extern PLATFORM_OVERRIDE_NAMED_NODE_DATA platform_named_node_data;
extern PLATFORM_OVERRIDE_CS_COMP_NODE_DATA platform_cs_comp_node_data;

uint64_t
pal_iovirt_get_rc_smmu_base (
Expand Down Expand Up @@ -128,7 +129,7 @@ dump_block(IOVIRT_BLOCK *block) {
return;
case IOVIRT_NODE_NAMED_COMPONENT:
print(AVS_PRINT_INFO,
" Named Component:\n Device Name:%a", block->data.named_comp.name);
" Named Component:\n Device Name:%s", block->data.named_comp.name);
print(AVS_PRINT_INFO, "\n CCA Attribute: 0x%lx\n", block->data.named_comp.cca);
break;
case IOVIRT_NODE_PCI_ROOT_COMPLEX:
Expand Down Expand Up @@ -167,8 +168,7 @@ pal_iovirt_create_info_table(IOVIRT_INFO_TABLE *IoVirtTable)
NODE_DATA_MAP *data_map;
uint32_t node[IORT_NODE_COUNT];
uint32_t identifier[5][1] ={{0}, {1}, {2}, {3}, {4}};
char device_name[1][5] = {"DMA"};
uint32_t j, k = 0, m = 0, i = 0, z = 0, n = 0;
uint32_t j, k = 0, m = 0, i = 0, z = 0, n = 0, p = 0;

if (IoVirtTable == NULL)
return;
Expand Down Expand Up @@ -201,11 +201,14 @@ pal_iovirt_create_info_table(IOVIRT_INFO_TABLE *IoVirtTable)
IoVirtTable->num_its_groups++;
break;
case IOVIRT_NODE_NAMED_COMPONENT:
strncpy(block->data.named_comp.name, device_name[0], MAX_NAMED_COMP_LENGTH);
block->data.named_comp.cca = (platform_named_node_data.named[n].memory_properties) & IOVIRT_CCA_MASK;
strncpy(block->data.named_comp.name, platform_named_node_data.named[n].name,
MAX_NAMED_COMP_LENGTH);
block->data.named_comp.cca =
(platform_named_node_data.named[n].memory_properties) & IOVIRT_CCA_MASK;
block->data.named_comp.smmu_base = platform_named_node_data.named[n].smmu_base;
block->num_data_map = platform_iovirt_cfg.num_map[i];
IoVirtTable->num_named_components++;
n++;
break;
case IOVIRT_NODE_PCI_ROOT_COMPLEX:
block->data.rc.segment = platform_node_type.rc.segment;
Expand Down Expand Up @@ -234,12 +237,13 @@ pal_iovirt_create_info_table(IOVIRT_INFO_TABLE *IoVirtTable)
k++;
break;
case IOVIRT_NODE_PMCG:
block->data.pmcg.base = platform_pmcg_node_data.pmcg[i].base;
block->data.pmcg.overflow_gsiv = platform_pmcg_node_data.pmcg[i].overflow_gsiv;
block->data.pmcg.base = platform_pmcg_node_data.pmcg[p].base;
block->data.pmcg.overflow_gsiv = platform_pmcg_node_data.pmcg[p].overflow_gsiv;
/* if the PMCG node is associated with a SMMU, store SMMU base */
block->data.pmcg.smmu_base = platform_pmcg_node_data.pmcg[i].smmu_base;
block->data.pmcg.smmu_base = platform_pmcg_node_data.pmcg[p].smmu_base;
block->num_data_map = platform_iovirt_cfg.num_map[i];
IoVirtTable->num_pmcgs++;
p++;
break;
default:
print(AVS_PRINT_ERR, "Invalid IORT node type\n");
Expand Down Expand Up @@ -316,3 +320,34 @@ pal_iovirt_unique_rid_strid_map(uint64_t rc_block)
return 0;
return 1;
}

/**
@brief Check the hid and copy the full path of hid
@param hid hardware ID to get the path for
@param hid_path 2D array in which the path is copied
@return 1 if test fails, 0 if test passes
**/
uint32_t
pal_get_device_path(const char *hid, char hid_path[][MAX_NAMED_COMP_LENGTH])
{
uint32_t i, cmp;
uint32_t status = 1;

/* Iterate through components and add device name of the component to the array
if hid of the component is matched */
for (i = 0; i < CS_COMPONENT_COUNT; i++) {
cmp = strncmp(hid, platform_cs_comp_node_data.component[i].identifier, MAX_CS_COMP_LENGTH);
if (!cmp) {
status = 0;
strncpy(hid_path[i],
platform_cs_comp_node_data.component[i].dev_name, MAX_CS_COMP_LENGTH);
}
}

if (status)
return 1; // return 1 if there's no entry in hid_path

return 0;
}

0 comments on commit b5acf0e

Please sign in to comment.