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

feat(rcar): test only for SCIF TX FIFO empty before writing the FIFO

Currently, the code tests both whether the SCIF TX FIFO is empty using
TDFE bit and whether the current byte transfer ended using

feat(rcar): test only for SCIF TX FIFO empty before writing the FIFO

Currently, the code tests both whether the SCIF TX FIFO is empty using
TDFE bit and whether the current byte transfer ended using TEND bit,
both before and after writing the TX FIFO. Starting with Renesas RZ/A2
platform, the TEND bit is not set after the SCIF IP is reset, it is set
only after the TX FIFO was written for the first time.

Relax the first test before TX FIFO is written such, that it only uses
the TDFE bit to verify that the TX FIFO is empty and safe to be written,
but keep both TDFE and TEND check in the second test to assure that the
character was properly transmitted after it was written into the TX FIFO.
This allows both current platforms and RZ/A2 and newer to share the same
code.

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

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 ...

Merge "refactor(rcar): rename console_rcar_ to console_renesas_ prefix for Renesas platform" into integration

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 ...

fix(rcar3): disable stack protector for functions in SRAM

Disable the BL31 stack protector for all functions placed in SRAM,
because the canary value in __stack_chk_guard in DRAM can not be
read whe

fix(rcar3): disable stack protector for functions in SRAM

Disable the BL31 stack protector for all functions placed in SRAM,
because the canary value in __stack_chk_guard in DRAM can not be
read when running Suspend To RAM code from SRAM. The SSP functions
in DRAM can also not be called from that code. Make sure the code
in SRAM is self-contained by marking rcar_pwrc_go_suspend_to_ram()
as noinline. To assure the stack protector is active otherwise,
use no_stack_protector function attribute for the select functions
which are placed in SRAM.

Change-Id: Idc43e70fd5217ea130a48c46f227a37c568dc8bd
Fixes: cfa466ab733f ("feat(rcar3): enable the stack protection")
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 ...

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 ...

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 ...

fix(rcar): use platform_def

The definitions are duplicate and cause compilation errors when includes
change.

Change-Id: Iadc45e053918b5e13fa12f0b371e5e77b56aef22
Signed-off-by: Boyan Karatotev <boy

fix(rcar): use platform_def

The definitions are duplicate and cause compilation errors when includes
change.

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

show more ...

fix(rcar3-drivers): disable A/B loader support by default

The A/B loader [1] meant to be used for convenient CI testing.
The tool is installed into the same location as SA0, where it
conveniently fi

fix(rcar3-drivers): disable A/B loader support by default

The A/B loader [1] meant to be used for convenient CI testing.
The tool is installed into the same location as SA0, where it
conveniently fits due to its size, and where it makes use of
non-volatile PMIC registers to alternate between loading and
starting A or B copy of the BL2. The PMIC registers are used
because CPU registers are lost across reset.

In case the B copy is loaded, it is loaded from 8 MiB offset
from start of HF. In case the B copy fails to boot, a simple
reset of the system will switch back to booting previously
known working A copy and allow recovery.

The A/B loader sets MFIS bit MFISBTSTSR_BOOT_PARTITION to
pass the information which A/B copy is currently booting on
to TFA, which then loads the follow up components from 0 MiB
or 8 MiB offset, depending on whether the A or B copy is being
booted.

The MFISBTSTSR_BOOT_PARTITION interferes with regular A/B
switching during boot from eMMC as the boot media, where
the BootROM also sets MFISBTSTSR_BOOT_PARTITION bit in case
the system boots from SECOND eMMC HW BOOT partition.

Since the A/B loader is meant as a development and CI tool,
isolate the A/B loader use to RPC HF only and furthermore
isolate it behind new RCAR_RPC_HYPERFLASH_ABLOADER option
which is disabled by default.

[1] https://github.com/marex/abloader

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

show more ...