Merge "fix(rcar5): prevent boot CPU hot unplug" into integration

Merge "feat(rcar): rewrite console_renesas_register() in C" into integration

feat(bl2): support RESET_TO_BL2 and ENABLE_RME

When RSE is used as the root of trust along with CPU that supports RME
there is a need to enable both RESET_TO_BL2 and ENABLE_RME.

In current bl2_main

feat(bl2): support RESET_TO_BL2 and ENABLE_RME

When RSE is used as the root of trust along with CPU that supports RME
there is a need to enable both RESET_TO_BL2 and ENABLE_RME.

In current bl2_main there are two different code paths for RESET_BL2,
one handles BL2 running in EL1 and other for BL2 running in EL3.

When RME is enabled, BL2 always runs at EL3 but the current flow calls
bl2_early_platform_setup2, bl2_plat_arch_setup instead of
bl2_el3_early_platform_setup, bl2_el3_plat_arch_setup. Adding RME,
TRANSFER_LIST, ROMLIB support in bl2_el3_* helpers makes
arm_bl2_el3_setup.c almost identical to arm_bl2_setup.c.

This patch removes bl2_el3_plat helpers and related files. Now different
combinations of RESET_TO_BL2, ENABLE_RME are handled in common bl2_setup
routines in arm_bl2_setup.c. This helps to have common place to support
new features and build flags for BL2 irrespective of which EL the BL2
runs.

BREAKING-CHANGE: This patch also changes all existing platform files and
functions that use format bl2_el3_* to bl2_plat helpers. If any platform
or out-of-tree platforms that need to support running BL2 in EL1 or EL3
must now handle it in bl2_early_platform_setup2 and bl2_plat_arch_setup.

Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
Change-Id: I8d332dbe2de1db3b69319496c8d04626cdcf4140

show more ...

fix(rcar5): prevent boot CPU hot unplug

The boot CPU runs both TFA and later also Trusted OS, which is
UP and can not be migrated to another CPU. Report MIGRATE_INFO_TYPE
"Uniprocessor (UP) not migr

fix(rcar5): prevent boot CPU hot unplug

The boot CPU runs both TFA and later also Trusted OS, which is
UP and can not be migrated to another CPU. Report MIGRATE_INFO_TYPE
"Uniprocessor (UP) not migrate capable 1" to the OS, so any attempts
at CPU_OFF and MIGRATE of the boot CPU would be DENIED. This has an
effect also e.g. on the Linux kernel, where it prevents stopping
boot CPU (CPU0) using CPU hotplug, which must not be allowed,
as it would interfere with the Trusted OS.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Change-Id: I9265115fc721e813d51f9c14e8ebe0471b12928c

show more ...

feat(rcar): rewrite console_renesas_register() in C

Replace assembler implementation of console_renesas_register() with
matching C implementation. Since it is now easily possible to pass
flags into

feat(rcar): rewrite console_renesas_register() in C

Replace assembler implementation of console_renesas_register() with
matching C implementation. Since it is now easily possible to pass
flags into console_renesas_register() and then onward to the console
initialization, adjust the signature of console_renesas_register()
and include the flags in it. Adjust both rcar_console_boot_init()
and rcar_console_runtime_init() to call console_renesas_register()
with its new combined set of parameters and drop console_set_scope()
invocation which is no longer needed, because the flags are passed
directly into console_renesas_register().

Drop console_renesas_flush() which is always a noop. Drop return
value from console_renesas_init() which is always 1.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Change-Id: I1c7d1a81b6922138b6e2e80f2635fcc8558685c7

show more ...

refactor(rcar): rename console_rcar_ to console_renesas_ prefix for Renesas platform

Rename console_rcar_ to console_renesas_ prefix for SCIF-based console
driver to make it reusable by other Renesa

refactor(rcar): rename console_rcar_ to console_renesas_ prefix for Renesas platform

Rename console_rcar_ to console_renesas_ prefix for SCIF-based console
driver to make it reusable by other Renesas platforms.

Due to the above renaming, function console_renesas_register is duplicated
in both scif.h and console.h, so it should be removed from scif.h

Change-Id: I42b44d1786578f7ed8db34e7da421836ea60b5e2
Signed-off-by: Nhut Nguyen <nhut.nguyen.kc@renesas.com>

show more ...

feat(rcar): fold console_rcar_* functions into rcar_printf.c

The three console_rcar_{init,putc,flush}() no-op functions can
easily be C functions, they do not need assembler wrappers. Move
the funct

feat(rcar): fold console_rcar_* functions into rcar_printf.c

The three console_rcar_{init,putc,flush}() no-op functions can
easily be C functions, they do not need assembler wrappers. Move
the functions into rcar_printf.c which is part of the custom
R-Car Gen3 memory logging console. Remove rcar_printf.c from
BL2 builds, as it is not useful there. Rename rcar_set_log_data()
to console_rcar_putc() and update its signature, it is no longer
necessary to have such a wrapper around C function.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Change-Id: Ia7a1c37b2151f6217cde70ffd2b367643d3184e4

show more ...

feat(rcar): rewrite SCIF driver from assembler to C

Rewrite the SCIF driver from difficult to read assembler to plain C.
Use scif-common.c which contains putc() and flush() helper functions
to avoid

feat(rcar): rewrite SCIF driver from assembler to C

Rewrite the SCIF driver from difficult to read assembler to plain C.
Use scif-common.c which contains putc() and flush() helper functions
to avoid duplication, so only fill in the initialization code. Drop
support for external clock, which is unused. Clean up macros and drop
ones which are not referenced.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Change-Id: Ia933c505c33e133e45448c82776a17629f3df1eb

show more ...

fix(rcar3): prevent boot CPU hot unplug

The boot CPU runs both TFA and later also Trusted OS, which is UP and can
not be migrated to another CPU. Report MIGRATE_INFO_TYPE "Uniprocessor (UP)
not migr

fix(rcar3): prevent boot CPU hot unplug

The boot CPU runs both TFA and later also Trusted OS, which is UP and can
not be migrated to another CPU. Report MIGRATE_INFO_TYPE "Uniprocessor (UP)
not migrate capable 1" to the OS, so any attempts at CPU_OFF and MIGRATE
of the boot CPU would be DENIED. This has an effect also e.g. on the Linux
kernel, where it prevents stopping boot CPU (CPU0) using CPU hotplug, which
must not be allowed, as it would interfere with the Trusted OS.

Change-Id: I0f38e64711c13ae48e819fb33939451720749c68
Signed-off-by: Toshiyuki Ogasahara <toshiyuki.ogasahara.bo@hitachi.com>
Signed-off-by: Yoshifumi Hosoya <yoshifumi.hosoya.wj@renesas.com>
Signed-off-by: Dien Pham <dien.pham.ry@renesas.com>
Signed-off-by: Hieu Nguyen <hieu.nguyen.dn@renesas.com>
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>

show more ...

Merge "feat(rcar3): rephrase RCAR_BL31_CRASH_BASE definition" into integration

feat(rcar3): rephrase RCAR_BL31_CRASH_BASE definition

Since RCAR_BL31_CRASH_BASE depends on the RCAR_TRUSTED_SRAM_BASE,
use it for the RCAR_BL31_CRASH_BASE calculation.

Change-Id: Ibf3b4747a8dbd8fb

feat(rcar3): rephrase RCAR_BL31_CRASH_BASE definition

Since RCAR_BL31_CRASH_BASE depends on the RCAR_TRUSTED_SRAM_BASE,
use it for the RCAR_BL31_CRASH_BASE calculation.

Change-Id: Ibf3b4747a8dbd8fbbff793387d841e615788a003
Signed-off-by: Vincent Bryce <vincent.bryce@cogentembedded.com>
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>

show more ...

fix(rcar): enable intialisation code for EL3 to NS-EL1 handoff

Enable initialisation code for handoff from EL3 to NS-EL1 using the
INIT_UNUSED_NS_EL2 flag on both R-Car Gen3 and Gen4 SoCs. This is
u

fix(rcar): enable intialisation code for EL3 to NS-EL1 handoff

Enable initialisation code for handoff from EL3 to NS-EL1 using the
INIT_UNUSED_NS_EL2 flag on both R-Car Gen3 and Gen4 SoCs. This is
used by cores which proceed directly from EL3 to NS-ES1 and have no
code in NS-EL2.

Change-Id: I4d2441e23a0020fe98298c7f329514686ca62fe4
Signed-off-by: Hieu Nguyen <hieu.nguyen.dn@renesas.com>
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
---
Marek: update commit message, combined for Gen3 and Gen4

show more ...

fix(rcar5): enable missing FEAT_AMUv1p1 on R-Car Gen5 to fix the build

Since commit 6edbd2d6a8ae ("fix(cpufeat): require FEAT_AMUv1p1 to
enable the auxiliary counters") the ENABLE_AMU_AUXILIARY_COUN

fix(rcar5): enable missing FEAT_AMUv1p1 on R-Car Gen5 to fix the build

Since commit 6edbd2d6a8ae ("fix(cpufeat): require FEAT_AMUv1p1 to
enable the auxiliary counters") the ENABLE_AMU_AUXILIARY_COUNTERS
requires ENABLE_FEAT_AMUv1p1 to be enabled as well. Enable missing
ENABLE_FEAT_AMUv1p1 to fix the build, which was broken because the
R-Car Gen5 and FEAT_AMUv1p1 commits landed in reverse order.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Change-Id: I834aff7798d7a5e10014fbd9f1ac8a97908b9aab

show more ...

feat(rcar): add initial BL31 support for Renesas R-Car X5H

This patch introduces initial BL31 (EL3 firmware) support for the
Renesas R-Car Gen5 (X5H) platform.

Key features and changes include:
- P

feat(rcar): add initial BL31 support for Renesas R-Car X5H

This patch introduces initial BL31 (EL3 firmware) support for the
Renesas R-Car Gen5 (X5H) platform.

Key features and changes include:
- Platform definitions and memory map for R-Car X5H
(Cortex-A720AE, 8 clusters x 4 cores)
- Platform-specific PSCI power management and topology
- SCMI-based power domain and system power management
- GICv4/Fainlight-AE interrupt controller initialization and support
- Trusted SRAM, shared memory, and crash log region setup
- SCIF console support
- Stack protector implementation for enhanced security
- Platform-specific linker script and build integration
- Various helper and initialization routines for MMU, GIC, and SCMI
- Platform-specific mailbox and boot flow handling
- Basic suspend implementation via SCP-FW
- AMU counters, SVE, PAUTH accessible to EL1

Signed-off-by: Hieu Nguyen <hieu.nguyen.dn@renesas.com>
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Change-Id: I04be48a55a618fe952b28283d2f85f48f7761c9a

show more ...

Merge changes I82beb663,Ie970984e,Ia13f8e09,Ib498832d into integration

* changes:
feat(rcar): deduplicate plat_crash_print_regs
feat(rcar): split common SCIF code
feat(rcar): replace static rc

Merge changes I82beb663,Ie970984e,Ia13f8e09,Ib498832d into integration

* changes:
feat(rcar): deduplicate plat_crash_print_regs
feat(rcar): split common SCIF code
feat(rcar): replace static rcar_putc pointer with static register offsets
feat(rcar): deduplicate SCIF console_rcar_register

show more ...

Merge "feat(rcar): deduplicate PWRC timer" into integration

Merge changes I24209ac0,I1caf6cc6 into integration

* changes:
feat(rcar): deduplicate PWRC SRAM trampoline
feat(rcar): deduplicate stack protector

Merge "fix(rcar3): clear TCR_EL1 at the BL2 entry point" into integration

feat(rcar): deduplicate plat_crash_print_regs

The plat_crash_print_regs code is functionally identical between
Renesas R-Car Gen3 and R-Car Gen4, deduplicate the code. Split
plat_crash_print_regs in

feat(rcar): deduplicate plat_crash_print_regs

The plat_crash_print_regs code is functionally identical between
Renesas R-Car Gen3 and R-Car Gen4, deduplicate the code. Split
plat_crash_print_regs into plat_macros_cci.S and move the Gen3
specific plat_print_gic_regs macro into plat_macros_gic.S so it
can be pulled in only on R-Car Gen3.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Change-Id: I82beb663e769e7b33a79b992da9f70db7bad2d51

show more ...

refactor(build): make it standard to request a custom linker script

Hoist the add_define to a global location so that platforms only have to
declare its usage. Fix up #ifdef to #if since we will now

refactor(build): make it standard to request a custom linker script

Hoist the add_define to a global location so that platforms only have to
declare its usage. Fix up #ifdef to #if since we will now always pass a
definition.

Change-Id: Ia52ad5ed4dcbd157d139c8ca2fb3d35b32343b93
Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>

show more ...

feat(rcar): split common SCIF code

Move common SCIF code into drivers/renesas/common/scif/scif-common.c
and retain only SoC-specific console_rcar_init() in
drivers/renesas/rcar_gen4/scif/scif.c. Thi

feat(rcar): split common SCIF code

Move common SCIF code into drivers/renesas/common/scif/scif-common.c
and retain only SoC-specific console_rcar_init() in
drivers/renesas/rcar_gen4/scif/scif.c. This allows other SoCs to
reuse the common code and add only SoC specific glue code.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Change-Id: Ie970984ea551e482479af91524974b281923f813

show more ...

feat(rcar): deduplicate SCIF console_rcar_register

The console_rcar_register assembler macro is functionally identical
between Renesas R-Car Gen3 and R-Car Gen4, deduplicate the code.

Signed-off-by

feat(rcar): deduplicate SCIF console_rcar_register

The console_rcar_register assembler macro is functionally identical
between Renesas R-Car Gen3 and R-Car Gen4, deduplicate the code.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Change-Id: Ib498832dbed9063efdb9979e89e53d119303d9df

show more ...

feat(rcar): deduplicate PWRC timer

The PWRC timer code is functionally identical between
Renesas R-Car Gen3 and R-Car Gen4, deduplicate the code.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mai

feat(rcar): deduplicate PWRC timer

The PWRC timer code is functionally identical between
Renesas R-Car Gen3 and R-Car Gen4, deduplicate the code.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Change-Id: Id50a730ea58faedaa24380fd3171be171ecd7269

show more ...

feat(rcar): deduplicate PWRC SRAM trampoline

The PWRC SRAM trampoline code is functionally identical between
Renesas R-Car Gen3 and R-Car Gen4, deduplicate the code.

Signed-off-by: Marek Vasut <mar

feat(rcar): deduplicate PWRC SRAM trampoline

The PWRC SRAM trampoline code is functionally identical between
Renesas R-Car Gen3 and R-Car Gen4, deduplicate the code.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Change-Id: I24209ac0277fa12898bbeea69d93a8f057e76ed4

show more ...

feat(rcar): deduplicate stack protector

The stack protector code is functionally identical between
Renesas R-Car Gen3 and R-Car Gen4, deduplicate the code.

Signed-off-by: Marek Vasut <marek.vasut+r

feat(rcar): deduplicate stack protector

The stack protector code is functionally identical between
Renesas R-Car Gen3 and R-Car Gen4, deduplicate the code.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Change-Id: I1caf6cc6a9ace678b50013eee1a5506fba9acccc

show more ...