Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
6cbf17d1
Unverified
Commit
6cbf17d1
authored
6 years ago
by
Dimitris Papastamos
Committed by
GitHub
6 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #1473 from robertovargas-arm/misra
Misra
parents
9a93d8cc
311a1a8e
master
v2.5
v2.5-rc1
v2.5-rc0
v2.4
v2.4-rc2
v2.4-rc1
v2.4-rc0
v2.3
v2.3-rc2
v2.3-rc1
v2.3-rc0
v2.2
v2.2-rc2
v2.2-rc1
v2.2-rc0
v2.1
v2.1-rc1
v2.1-rc0
v2.0
v2.0-rc0
v1.6
v1.6-rc1
v1.6-rc0
arm_cca_v0.2
arm_cca_v0.1
No related merge requests found
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
bl32/sp_min/sp_min_main.c
+1
-0
bl32/sp_min/sp_min_main.c
include/lib/utils.h
+2
-2
include/lib/utils.h
lib/utils/mem_region.c
+1
-1
lib/utils/mem_region.c
plat/arm/css/drivers/mhu/css_mhu_doorbell.c
+2
-2
plat/arm/css/drivers/mhu/css_mhu_doorbell.c
plat/arm/css/drivers/scp/css_pm_scmi.c
+2
-2
plat/arm/css/drivers/scp/css_pm_scmi.c
plat/arm/css/drivers/scp/css_pm_scpi.c
+1
-1
plat/arm/css/drivers/scp/css_pm_scpi.c
plat/arm/css/drivers/scp/css_sds.c
+1
-0
plat/arm/css/drivers/scp/css_sds.c
plat/arm/css/drivers/sds/sds.h
+1
-1
plat/arm/css/drivers/sds/sds.h
with
11 additions
and
9 deletions
+11
-9
bl32/sp_min/sp_min_main.c
View file @
6cbf17d1
...
...
@@ -20,6 +20,7 @@
#include <smccc_helpers.h>
#include <stddef.h>
#include <stdint.h>
#include <std_svc.h>
#include <string.h>
#include <types.h>
#include <utils.h>
...
...
This diff is collapsed.
Click to expand it.
include/lib/utils.h
View file @
6cbf17d1
...
...
@@ -37,10 +37,10 @@ void clear_mem_regions(mem_region_t *tbl, size_t nregions);
* in a way that they minimize the number of entries used in the
* translation tables.
*/
void
clear_map_dyn_mem_regions
(
mem_region
_t
*
region
,
void
clear_map_dyn_mem_regions
(
struct
mem_region
*
region
s
,
size_t
nregions
,
uintptr_t
va
,
size_t
chunk
_size
);
size_t
chunk
);
/*
* checks that a region (addr + nbytes-1) of memory is totally covered by
...
...
This diff is collapsed.
Click to expand it.
lib/utils/mem_region.c
View file @
6cbf17d1
...
...
@@ -50,7 +50,7 @@ void clear_mem_regions(mem_region_t *tbl, size_t nregions)
* be cleared, and chunk is the amount of memory mapped and
* cleared in every iteration.
*/
void
clear_map_dyn_mem_regions
(
mem_region
_t
*
regions
,
void
clear_map_dyn_mem_regions
(
struct
mem_region
*
regions
,
size_t
nregions
,
uintptr_t
va
,
size_t
chunk
)
...
...
This diff is collapsed.
Click to expand it.
plat/arm/css/drivers/mhu/css_mhu_doorbell.c
View file @
6cbf17d1
...
...
@@ -9,7 +9,7 @@
#include "css_mhu_doorbell.h"
#include "../scmi/scmi.h"
void
mhu_ring_doorbell
(
scmi_channel_plat_info
_t
*
plat_info
)
void
mhu_ring_doorbell
(
struct
scmi_channel_plat_info
*
plat_info
)
{
MHU_RING_DOORBELL
(
plat_info
->
db_reg_addr
,
plat_info
->
db_modify_mask
,
...
...
@@ -17,7 +17,7 @@ void mhu_ring_doorbell(scmi_channel_plat_info_t *plat_info)
return
;
}
void
mhuv2_ring_doorbell
(
scmi_channel_plat_info
_t
*
plat_info
)
void
mhuv2_ring_doorbell
(
struct
scmi_channel_plat_info
*
plat_info
)
{
/* wake receiver */
MHU_V2_ACCESS_REQUEST
(
MHUV2_BASE_ADDR
);
...
...
This diff is collapsed.
Click to expand it.
plat/arm/css/drivers/scp/css_pm_scmi.c
View file @
6cbf17d1
...
...
@@ -142,7 +142,7 @@ void css_scp_suspend(const struct psci_power_state *target_state)
* Helper function to turn off a CPU power domain and its parent power domains
* if applicable.
*/
void
css_scp_off
(
const
psci_power_state
_t
*
target_state
)
void
css_scp_off
(
const
struct
psci_power_state
*
target_state
)
{
int
lvl
=
0
,
ret
;
uint32_t
scmi_pwr_state
=
0
;
...
...
@@ -298,7 +298,7 @@ void __dead2 css_scp_sys_reboot(void)
css_scp_system_off
(
SCMI_SYS_PWR_COLD_RESET
);
}
scmi_channel_plat_info_t
plat_css_scmi_plat_info
=
{
static
scmi_channel_plat_info_t
plat_css_scmi_plat_info
=
{
.
scmi_mbx_mem
=
CSS_SCMI_PAYLOAD_BASE
,
.
db_reg_addr
=
PLAT_CSS_MHU_BASE
+
CSS_SCMI_MHU_DB_REG_OFF
,
.
db_preserve_mask
=
0xfffffffe
,
...
...
This diff is collapsed.
Click to expand it.
plat/arm/css/drivers/scp/css_pm_scpi.c
View file @
6cbf17d1
...
...
@@ -47,7 +47,7 @@ void css_scp_suspend(const struct psci_power_state *target_state)
* if applicable. Since SCPI doesn't differentiate between OFF and suspend, we
* call the suspend helper here.
*/
void
css_scp_off
(
const
psci_power_state
_t
*
target_state
)
void
css_scp_off
(
const
struct
psci_power_state
*
target_state
)
{
css_scp_suspend
(
target_state
);
}
...
...
This diff is collapsed.
Click to expand it.
plat/arm/css/drivers/scp/css_sds.c
View file @
6cbf17d1
...
...
@@ -11,6 +11,7 @@
#include <delay_timer.h>
#include <platform.h>
#include <stdint.h>
#include "css_scp.h"
#include "../sds/sds.h"
int
css_scp_boot_image_xfer
(
void
*
image
,
unsigned
int
image_size
)
...
...
This diff is collapsed.
Click to expand it.
plat/arm/css/drivers/sds/sds.h
View file @
6cbf17d1
...
...
@@ -80,7 +80,7 @@ typedef enum {
}
sds_access_mode_t
;
int
sds_init
(
void
);
int
sds_struct_exists
(
u
int32_
t
structure_id
);
int
sds_struct_exists
(
u
nsigned
in
t
structure_id
);
int
sds_struct_read
(
uint32_t
structure_id
,
unsigned
int
fld_off
,
void
*
data
,
size_t
size
,
sds_access_mode_t
mode
);
int
sds_struct_write
(
uint32_t
structure_id
,
unsigned
int
fld_off
,
void
*
data
,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help