Skip to content
GitLab
Menu
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
eda9eade
Unverified
Commit
eda9eade
authored
May 17, 2018
by
Dimitris Papastamos
Committed by
GitHub
May 17, 2018
Browse files
Merge pull request #1340 from Andre-ARM/sec-irqs-fixes
Fix support for systems without secure interrupts
parents
a54616a6
205cf6e7
Changes
3
Hide whitespace changes
Inline
Side-by-side
drivers/arm/gic/v2/gicv2_main.c
View file @
eda9eade
...
...
@@ -178,9 +178,6 @@ void gicv2_driver_init(const gicv2_driver_data_t *plat_driver_data)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
/* The platform should provide a list of secure interrupts */
assert
(
plat_driver_data
->
g0_interrupt_array
);
/*
* If there are no interrupts of a particular type, then the
* number of interrupts of that type should be 0 and vice-versa.
...
...
@@ -195,8 +192,8 @@ void gicv2_driver_init(const gicv2_driver_data_t *plat_driver_data)
WARN
(
"Please migrate to using an interrupt_prop_t array
\n
"
);
}
#else
assert
(
plat_driver_data
->
interrupt_props
!=
NULL
);
assert
(
plat_driver_data
->
interrupt_props
_num
>
0
);
assert
(
plat_driver_data
->
interrupt_props
_num
>
0
?
plat_driver_data
->
interrupt_props
!=
NULL
:
1
);
#endif
/* Ensure that this is a GICv2 system */
...
...
drivers/arm/gic/v3/gicv3_helpers.c
View file @
eda9eade
...
...
@@ -433,8 +433,7 @@ unsigned int gicv3_secure_spis_configure_props(uintptr_t gicd_base,
unsigned
int
ctlr_enable
=
0
;
/* Make sure there's a valid property array */
assert
(
interrupt_props
!=
NULL
);
assert
(
interrupt_props_num
>
0
);
assert
(
interrupt_props_num
>
0
?
interrupt_props
!=
NULL
:
1
);
for
(
i
=
0
;
i
<
interrupt_props_num
;
i
++
)
{
current_prop
=
&
interrupt_props
[
i
];
...
...
@@ -556,8 +555,7 @@ unsigned int gicv3_secure_ppi_sgi_configure_props(uintptr_t gicr_base,
unsigned
int
ctlr_enable
=
0
;
/* Make sure there's a valid property array */
assert
(
interrupt_props
!=
NULL
);
assert
(
interrupt_props_num
>
0
);
assert
(
interrupt_props_num
>
0
?
interrupt_props
!=
NULL
:
1
);
for
(
i
=
0
;
i
<
interrupt_props_num
;
i
++
)
{
current_prop
=
&
interrupt_props
[
i
];
...
...
drivers/arm/gic/v3/gicv3_main.c
View file @
eda9eade
...
...
@@ -103,8 +103,8 @@ void gicv3_driver_init(const gicv3_driver_data_t *plat_driver_data)
WARN
(
"Please migrate to using interrupt_prop_t arrays
\n
"
);
}
#else
assert
(
plat_driver_data
->
interrupt_props
!=
NULL
);
assert
(
plat_driver_data
->
interrupt_props
_num
>
0
);
assert
(
plat_driver_data
->
interrupt_props
_num
>
0
?
plat_driver_data
->
interrupt_props
!=
NULL
:
1
);
#endif
/* Check for system register support */
...
...
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