Skip to content

Commit f7a284b

Browse files
author
Oren Cohen
committed
stupid warnings
1 parent 615ff62 commit f7a284b

File tree

1 file changed

+1
-36
lines changed

1 file changed

+1
-36
lines changed

core/vmpu/src/mpu_armv8m/vmpu_armv8m_unpriv_access.c

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -55,46 +55,11 @@
5555
#define TT_RESP_MREGION_Pos 0U
5656
#define TT_RESP_MREGION_Msk (0xFFUL << TT_RESP_MREGION_Pos)
5757

58-
59-
static uint32_t vmpu_unpriv_test_range(uint32_t addr, uint32_t size)
60-
{
61-
if (!size) size = 1;
62-
uint32_t response_lower, response_upper;
63-
uint32_t test_addr_lower = addr & ~31UL;
64-
uint32_t test_addr_upper = (addr + size - 1) & ~31UL;
65-
66-
/* Test lower address. */
67-
asm volatile (
68-
"tta %[response], %[addr]"
69-
: [response] "=r" (response_lower)
70-
: [addr] "r" (test_addr_lower)
71-
);
72-
if (test_addr_lower != test_addr_upper) {
73-
/* Test upper address. */
74-
asm volatile (
75-
"tta %[response], %[addr]"
76-
: [response] "=r" (response_upper)
77-
: [addr] "r" (test_addr_upper)
78-
);
79-
/* If lower and upper do not have the same S|SRVALID|SREGION, then it's definitely not the same region. */
80-
if (((response_lower ^ response_upper) & (TT_RESP_S_Msk | TT_RESP_SRVALID_Msk | TT_RESP_SREGION_Msk))) {
81-
/* Upper memory region has different SAU region than lower memory region! */
82-
return 0;
83-
}
84-
/* Both memory locations have the same non-secure SAU region and therefore same properties.
85-
* No Secure SAU region can be inbetween due to SAU region overlap rules. */
86-
response_lower &= response_upper;
87-
}
88-
89-
return response_lower & (TT_RESP_NSRW_Msk | TT_RESP_NSR_Msk | TT_RESP_RW_Msk | TT_RESP_R_Msk |
90-
TT_RESP_S_Msk | TT_RESP_SRVALID_Msk | TT_RESP_SREGION_Msk);
91-
}
92-
9358
uint32_t vmpu_unpriv_access(uint32_t addr, uint32_t size, uint32_t data)
9459
{
9560
//if ((vmpu_unpriv_test_range(addr, UVISOR_UNPRIV_ACCESS_SIZE(size)) & (TT_RESP_NSRW_Msk | TT_RESP_SRVALID_Msk)) == (TT_RESP_NSRW_Msk | TT_RESP_SRVALID_Msk)) {
9661
//this should be slower substantualy
97-
if (vmpu_buffer_access_is_ok(g_active_box, addr, UVISOR_UNPRIV_ACCESS_SIZE(size))){
62+
if (vmpu_buffer_access_is_ok(g_active_box, (const void *) addr, UVISOR_UNPRIV_ACCESS_SIZE(size))){
9863
switch(size) {
9964
case UVISOR_UNPRIV_ACCESS_READ(1):
10065
return *((uint8_t *) addr);

0 commit comments

Comments
 (0)