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
88b88228
Commit
88b88228
authored
Jul 16, 2020
by
Madhukar Pappireddy
Committed by
TrustedFirmware Code Review
Jul 16, 2020
Browse files
Merge "stm32mp1: register shared resource per GPIO bank/pin" into integration
parents
62cd4a19
ec8f4212
Changes
2
Hide whitespace changes
Inline
Side-by-side
plat/st/common/include/stm32mp_shared_resources.h
View file @
88b88228
...
@@ -29,6 +29,10 @@ void stm32mp_register_non_secure_periph(enum stm32mp_shres id);
...
@@ -29,6 +29,10 @@ void stm32mp_register_non_secure_periph(enum stm32mp_shres id);
void
stm32mp_register_secure_periph_iomem
(
uintptr_t
base
);
void
stm32mp_register_secure_periph_iomem
(
uintptr_t
base
);
void
stm32mp_register_non_secure_periph_iomem
(
uintptr_t
base
);
void
stm32mp_register_non_secure_periph_iomem
(
uintptr_t
base
);
/* Register a GPIO as secure or non-secure based on its bank and pin numbers */
void
stm32mp_register_secure_gpio
(
unsigned
int
bank
,
unsigned
int
pin
);
void
stm32mp_register_non_secure_gpio
(
unsigned
int
bank
,
unsigned
int
pin
);
/* Consolidate peripheral states and lock against new peripheral registering */
/* Consolidate peripheral states and lock against new peripheral registering */
void
stm32mp_lock_periph_registering
(
void
);
void
stm32mp_lock_periph_registering
(
void
);
#else
#else
...
@@ -40,5 +44,15 @@ static inline
...
@@ -40,5 +44,15 @@ static inline
void
stm32mp_register_non_secure_periph_iomem
(
uintptr_t
base
__unused
)
void
stm32mp_register_non_secure_periph_iomem
(
uintptr_t
base
__unused
)
{
{
}
}
static
inline
void
stm32mp_register_secure_gpio
(
unsigned
int
bank
__unused
,
unsigned
int
pin
__unused
)
{
}
static
inline
void
stm32mp_register_non_secure_gpio
(
unsigned
int
bank
__unused
,
unsigned
int
pin
__unused
)
{
}
#endif
/* STM32MP_SHARED_RESOURCES */
#endif
/* STM32MP_SHARED_RESOURCES */
#endif
/* STM32MP_SHARED_RESOURCES_H */
#endif
/* STM32MP_SHARED_RESOURCES_H */
plat/st/stm32mp1/stm32mp1_shared_resources.c
View file @
88b88228
...
@@ -311,6 +311,29 @@ void stm32mp_register_non_secure_periph_iomem(uintptr_t base)
...
@@ -311,6 +311,29 @@ void stm32mp_register_non_secure_periph_iomem(uintptr_t base)
register_periph_iomem
(
base
,
SHRES_NON_SECURE
);
register_periph_iomem
(
base
,
SHRES_NON_SECURE
);
}
}
void
stm32mp_register_secure_gpio
(
unsigned
int
bank
,
unsigned
int
pin
)
{
switch
(
bank
)
{
case
GPIO_BANK_Z
:
register_periph
(
STM32MP1_SHRES_GPIOZ
(
pin
),
SHRES_SECURE
);
break
;
default:
ERROR
(
"GPIO bank %u cannot be secured
\n
"
,
bank
);
panic
();
}
}
void
stm32mp_register_non_secure_gpio
(
unsigned
int
bank
,
unsigned
int
pin
)
{
switch
(
bank
)
{
case
GPIO_BANK_Z
:
register_periph
(
STM32MP1_SHRES_GPIOZ
(
pin
),
SHRES_NON_SECURE
);
break
;
default:
break
;
}
}
static
bool
stm32mp_gpio_bank_is_non_secure
(
unsigned
int
bank
)
static
bool
stm32mp_gpio_bank_is_non_secure
(
unsigned
int
bank
)
{
{
unsigned
int
non_secure
=
0U
;
unsigned
int
non_secure
=
0U
;
...
...
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