andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #590 from yatharth-arm/yk/tzc400 

Use unsigned long long instead of uintptr_t in TZC400/DMC500 drivers
This commit is contained in:
danh-arm 2016-04-13 10:03:00 +01:00
parent 72c1dc149c 9fbdb80209
commit 43b97eda25
5 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/arm/tzc/tzc400.c
View File

@ -191,8 +191,8 @@ void tzc400_configure_region0(tzc_region_attributes_t sec_attr,
*/
void tzc400_configure_region(unsigned int filters,
int region,
uintptr_t region_base,
uintptr_t region_top,
unsigned long long region_base,
unsigned long long region_top,
tzc_region_attributes_t sec_attr,
unsigned int nsaid_permissions)
{

30
drivers/arm/tzc/tzc_common_private.c
View File

@ -42,42 +42,42 @@
#define DEFINE_TZC_COMMON_WRITE_REGION_BASE(fn_name, macro_name) \
static inline void _tzc##fn_name##_write_region_base( \
uintptr_t base, \
int region_no, \
uintptr_t region_base) \
uintptr_t base, \
int region_no, \
unsigned long long region_base) \
{ \
mmio_write_32(base + \
TZC_REGION_OFFSET( \
TZC_##macro_name##_REGION_SIZE, \
region_no) + \
TZC_##macro_name##_REGION_BASE_LOW_0_OFFSET, \
(unsigned int)region_base); \
TZC_##macro_name##_REGION_BASE_LOW_0_OFFSET, \
(uint32_t)region_base); \
mmio_write_32(base + \
TZC_REGION_OFFSET( \
TZC_##macro_name##_REGION_SIZE, \
region_no) + \
TZC_##macro_name##_REGION_BASE_HIGH_0_OFFSET, \
(unsigned int)(region_base >> 32)); \
(uint32_t)(region_base >> 32)); \
}
#define DEFINE_TZC_COMMON_WRITE_REGION_TOP(fn_name, macro_name) \
static inline void _tzc##fn_name##_write_region_top( \
uintptr_t base, \
int region_no, \
uintptr_t region_top) \
uintptr_t base, \
int region_no, \
unsigned long long region_top) \
{ \
mmio_write_32(base + \
TZC_REGION_OFFSET \
(TZC_##macro_name##_REGION_SIZE, \
region_no) + \
TZC_##macro_name##_REGION_TOP_LOW_0_OFFSET, \
(unsigned int)region_top); \
(uint32_t)region_top); \
mmio_write_32(base + \
TZC_REGION_OFFSET( \
TZC_##macro_name##_REGION_SIZE, \
region_no) + \
TZC_##macro_name##_REGION_TOP_HIGH_0_OFFSET, \
(unsigned int)(region_top >> 32)); \
(uint32_t)(region_top >> 32)); \
}
#define DEFINE_TZC_COMMON_WRITE_REGION_ATTRIBUTES(fn_name, macro_name) \
@ -146,8 +146,8 @@
void _tzc##fn_name##_configure_region(uintptr_t base, \
unsigned int filters, \
int region_no, \
uintptr_t region_base, \
uintptr_t region_top, \
unsigned long long region_base, \
unsigned long long region_top, \
tzc_region_attributes_t sec_attr, \
unsigned int nsaid_permissions) \
{ \
@ -155,8 +155,8 @@
VERBOSE("TrustZone : Configuring region " \
"(TZC Interface Base: %p, region_no = %d)" \
"...\n", (void *)base, region_no); \
VERBOSE("TrustZone : ... base = %p, top = %p," \
"\n", (void *)region_base, (void *)region_top);\
VERBOSE("TrustZone : ... base = %llx, top = %llx," \
"\n", region_base, region_top);\
VERBOSE("TrustZone : ... sec_attr = 0x%x," \
" ns_devs = 0x%x)\n", \
sec_attr, nsaid_permissions); \

4
drivers/arm/tzc/tzc_dmc500.c
View File

@ -196,8 +196,8 @@ void tzc_dmc500_configure_region0(tzc_region_attributes_t sec_attr,
* for this region (see comment for that function).
*/
void tzc_dmc500_configure_region(int region_no,
uintptr_t region_base,
uintptr_t region_top,
unsigned long long region_base,
unsigned long long region_top,
tzc_region_attributes_t sec_attr,
unsigned int nsaid_permissions)
{

12
include/drivers/arm/tzc400.h
View File

@ -139,8 +139,8 @@ void tzc400_configure_region0(tzc_region_attributes_t sec_attr,
unsigned int ns_device_access);
void tzc400_configure_region(unsigned int filters,
int region,
uintptr_t region_base,
uintptr_t region_top,
unsigned long long region_base,
unsigned long long region_top,
tzc_region_attributes_t sec_attr,
unsigned int ns_device_access);
void tzc400_set_action(tzc_action_t action);
@ -157,8 +157,8 @@ static inline void tzc_configure_region0(
static inline void tzc_configure_region(
unsigned int filters,
int region,
uintptr_t region_base,
uintptr_t region_top,
unsigned long long region_base,
unsigned long long region_top,
tzc_region_attributes_t sec_attr,
unsigned int ns_device_access) __deprecated;
static inline void tzc_set_action(tzc_action_t action) __deprecated;
@ -180,8 +180,8 @@ static inline void tzc_configure_region0(
static inline void tzc_configure_region(
unsigned int filters,
int region,
uintptr_t region_base,
uintptr_t region_top,
unsigned long long region_base,
unsigned long long region_top,
tzc_region_attributes_t sec_attr,
unsigned int ns_device_access)
{

4
include/drivers/arm/tzc_dmc500.h
View File

@ -160,8 +160,8 @@ void tzc_dmc500_driver_init(const tzc_dmc500_driver_data_t *plat_driver_data);
void tzc_dmc500_configure_region0(tzc_region_attributes_t sec_attr,
unsigned int nsaid_permissions);
void tzc_dmc500_configure_region(int region_no,
uintptr_t region_base,
uintptr_t region_top,
unsigned long long region_base,
unsigned long long region_top,
tzc_region_attributes_t sec_attr,
unsigned int nsaid_permissions);
void tzc_dmc500_set_action(tzc_action_t action);