|
55 | 55 | #define TT_RESP_MREGION_Pos 0U |
56 | 56 | #define TT_RESP_MREGION_Msk (0xFFUL << TT_RESP_MREGION_Pos) |
57 | 57 |
|
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 | | - |
93 | 58 | uint32_t vmpu_unpriv_access(uint32_t addr, uint32_t size, uint32_t data) |
94 | 59 | { |
95 | 60 | //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)) { |
96 | 61 | //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))){ |
98 | 63 | switch(size) { |
99 | 64 | case UVISOR_UNPRIV_ACCESS_READ(1): |
100 | 65 | return *((uint8_t *) addr); |
|
0 commit comments