Add support for Renesas RZ/Five SoC
v2 cover Add support for Renesas RZ/Five SoC
From: Lad Prabhakar <[email protected]>
Hi All,
This patch series adds initial support to RZ/Five (R9A07G043F) SoC (which is equipped with AX45MP AndesCore). Platform supports DT based probing.
Linux support is currently being upstreamed the latest patchset can be found at [0](currently in linux-next, DT bindings can be seen here)
[0] https://patchwork.kernel.org/project/linux-renesas-soc/cover/20221028165921.94487-1-prabhakar.mahadev-lad.rj at bp.renesas.com/
- PLIC binding - https://elixir.bootlin.com/linux/latest/source/Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml#L57
- PLMT and PLICSW are not used by any driver in kernel hence DT bindings for it
and is used in a similar manner as compared Andes AE350 [1]
[1] https://github.com/andestech/linux/commits/v6.0.y_ae350-ax45mp/Documentation/devicetree/bindings
- SCIF binding - https://elixir.bootlin.com/linux/latest/source/Documentation/devicetree/bindings/serial/renesas,scif.yaml#L79
RFC->v2
* Fixed comments pointed by Xiang W
* Included RB tag from Yu Chien Peter Lin for patch #3
RFC: https://patchwork.ozlabs.org/project/opensbi/cover/20221028004042.135549-1-prabhakar.mahadev-lad.rj at bp.renesas.com/
Note, in below the log "Platform Name" -> "smarc-rzfZ/Five" in platform.c we are parsing the DT and updating plat->name which is 64bytes only but in the DT the string is quite big enough. Should we better of change the name in sbi_platform to pointer instead?
Below are the logs for U-Boot (2022.10) and OpenSBI:
--------------------------------------------------
U-Boot SPL 2022.10-00192-gbc7f070181-dirty (Nov 11 2022 - 16:31:17 +0000) Trying to boot from NOR
OpenSBI v1.1-87-g888468d
____ _____ ____ _____
/ __ \ / ____| _ \_ _|
| | | |_ __ ___ _ __ | (___ | |_) || |
| | | | '_ \ / _ \ '_ \ \___ \| _ < | |
| |__| | |_) | __/ | | |____) | |_) || |_
\____/| .__/ \___|_| |_|_____/|____/_____|
| |
|_|Platform Name : Rmarc-rzfZ/Five
Platform Features : medeleg
Platform HART Count : 1
Platform IPI Device : andes_plicsw
Platform Timer Device : andes_plmt @ 12000000Hz
Platform Console Device : renesas_scif
Platform HSM Device : ---
Platform PMU Device : ---
Platform Reboot Device : ---
Platform Shutdown Device : ---
Firmware Base : 0x44000000
Firmware Size : 152 KB
Runtime SBI Version : 1.0
Domain0 Name : root
Domain0 Boot HART : 0
Domain0 HARTs : 0*
Domain0 Region00 : 0x00000000110c0000-0x00000000110fffff (I,R)
Domain0 Region01 : 0x0000000011180000-0x00000000111bffff (I,R)
Domain0 Region02 : 0x0000000044000000-0x000000004403ffff ()
Domain0 Region03 : 0x0000000011100000-0x000000001117ffff (I,R)
Domain0 Region04 : 0x0000000013000000-0x00000000133fffff (I)
Domain0 Region05 : 0x0000000000000000-0xffffffffffffffff (R,W,X)
Domain0 Next Address : 0x0000000050000000
Domain0 Next Arg1 : 0x00000000500be568
Domain0 Next Mode : S-mode
Domain0 SysReset : yes
Boot HART ID : 0
Boot HART Domain : root
Boot HART Priv Version : v1.11
Boot HART Base ISA : rv64imafdcnx
Boot HART ISA Extensions : none
Boot HART PMP Count : 16
Boot HART PMP Granularity : 8
Boot HART PMP Address Bits: 36
Boot HART MHPM Count : 4
Boot HART MIDELEG : 0x0000000000000222
Boot HART MEDELEG : 0x000000000000b109
U-Boot 2022.10-00192-gbc7f070181-dirty (Nov 11 2022 - 16:31:17 +0000)
CPU: rv64imafdc Model: smarc-rzf DRAM: 896 MiB SW_ET0_EN: OFFCore: 30 devices, 18 uclasses, devicetree: separate MMC: sd at 11c00000: 0, sd at 11c10000: 1 Loading Environment from MMC... OK In: serial at 1004b800 Out: serial at 1004b800 Err: serial at 1004b800 Net: eth0: ethernet@11c30000 Hit any key to stop autoboot: 0
=> sbi
SBI 1.0
OpenSBI 1.1
Machine:
Vendor ID 31e
Architecture ID 8000000000008a45
Implementation ID 500
Extensions:
sbi_set_timer
sbi_console_putchar
sbi_console_getchar
sbi_clear_ipi
sbi_send_ipi
sbi_remote_fence_i
sbi_remote_sfence_vma
sbi_remote_sfence_vma_asid
sbi_shutdown
SBI Base Functionality
Timer Extension
IPI Extension
RFENCE Extension
Hart State Management Extension
Performance Monitoring Unit Extension
=>
Cheers,
Prabhakar
Lad Prabhakar (7):
lib: utils: serial: Add Renesas SCIF driver
lib: utils: serial: Add FDT driver for Renesas SCIF
platform: andes/ae350: Split platform.h header file
lib: utils/irqchip: Add compatible string for Andestech NCEPLIC100
platform: Add Renesas RZ/Five initial support
scripts: Add Renesas RZ/Five to platform list in the binary archive
script
docs: platform: Add documentation for Renesas RZ/Five SoC
docs/platform/platform.md | 5 + docs/platform/renesas-rzfive.md | 143 ++++++++++++++++++ include/sbi_utils/fdt/fdt_helper.h | 3 + include/sbi_utils/serial/renesas-scif.h | 11 ++ lib/utils/fdt/fdt_helper.c | 11 ++ lib/utils/irqchip/fdt_irqchip_plic.c | 3 +- lib/utils/serial/Kconfig | 9 ++ lib/utils/serial/fdt_serial_renesas_scif.c | 31 ++++ lib/utils/serial/objects.mk | 4 + lib/utils/serial/renesas_scif.c | 139 ++++++++++++++++++ platform/andes/ae350/common-platform.h | 94 ++++++++++++ platform/andes/ae350/platform.h | 82 +---------- platform/renesas/rzfive/Kconfig | 32 ++++ platform/renesas/rzfive/configs/defconfig | 0 platform/renesas/rzfive/objects.mk | 18 +++ platform/renesas/rzfive/platform.c | 161 +++++++++++++++++++++ platform/renesas/rzfive/platform.h | 24 +++ scripts/create-binary-archive.sh | 1 + 18 files changed, 690 insertions(+), 81 deletions(-) create mode 100644 docs/platform/renesas-rzfive.md create mode 100644 include/sbi_utils/serial/renesas-scif.h create mode 100644 lib/utils/serial/fdt_serial_renesas_scif.c create mode 100644 lib/utils/serial/renesas_scif.c create mode 100644 platform/andes/ae350/common-platform.h create mode 100644 platform/renesas/rzfive/Kconfig create mode 100644 platform/renesas/rzfive/configs/defconfig create mode 100644 platform/renesas/rzfive/objects.mk create mode 100644 platform/renesas/rzfive/platform.c create mode 100644 platform/renesas/rzfive/platform.h
Signature · 1 line
2.17.1
PATCH v2 1/7 lib: utils: serial: Add Renesas SCIF driver
From: Lad Prabhakar <[email protected]>
Add Renesas SCIF driver.
Based on a patch in the BSP by Takeki Hamada
<[email protected]>
---RFC->v2
* Fixed comments pointed by Xiang W
--- include/sbi_utils/serial/renesas-scif.h | 11 ++ lib/utils/serial/Kconfig | 4 + lib/utils/serial/objects.mk | 1 + lib/utils/serial/renesas_scif.c | 139 ++++++++++++++++++++++++ 4 files changed, 155 insertions(+) create mode 100644 include/sbi_utils/serial/renesas-scif.h create mode 100644 lib/utils/serial/renesas_scif.c
include/sbi_utils/serial/renesas-scif.h new file +11 -0
@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* +* Copyright (C) 2022 Renesas Electronics Corporation +*/ + +#ifndef __SERIAL_RENESAS_SCIF_H__ +#define __SERIAL_RENESAS_SCIF_H__ + +int renesas_scif_init (unsigned long base,u32 in_freq,u32 baudrate); + +#endif /* __SERIAL_RENESAS_SCIF_H__ */
lib/utils/serial/Kconfig +4 -0
@@ -59,6 +59,10 @@ config SERIAL_GAISLER bool "Gaisler UART support" default n +config SERIAL_RENESAS_SCIF + bool "Renesas SCIF support" + default n + config SERIAL_SHAKTI bool "Shakti UART support" default n
lib/utils/serial/objects.mk +1 -0
@@ -36,6 +36,7 @@ libsbiutils-objs-$(CONFIG_FDT_SERIAL_XILINX_UARTLITE) += serial/fdt_serial_xlnx_ libsbiutils-objs-$(CONFIG_SERIAL_CADENCE) += serial/cadence-uart.o libsbiutils-objs-$(CONFIG_SERIAL_GAISLER) += serial/gaisler-uart.o +libsbiutils-objs-$(CONFIG_SERIAL_RENESAS_SCIF) += serial/renesas_scif.o libsbiutils-objs-$(CONFIG_SERIAL_SHAKTI) += serial/shakti-uart.o libsbiutils-objs-$(CONFIG_SERIAL_SIFIVE) += serial/sifive-uart.o libsbiutils-objs-$(CONFIG_SERIAL_LITEX) += serial/litex-uart.o
lib/utils/serial/renesas_scif.c new file +139 -0
139 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 1/7 lib: utils: serial: Add Renesas SCIF driver
Quoted 7 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
Add Renesas SCIF driver.
Based on a patch in the BSP by Takeki Hamada
<[email protected]>
If there is a public URL for the BSP you mentioned, better put that in the commit here for future reference.
Quoted 72 lines
Signed-off-by Lad Prabhakar <[email protected]>---
RFC->v2
* Fixed comments pointed by Xiang W--- include/sbi_utils/serial/renesas-scif.h | 11 ++ lib/utils/serial/Kconfig | 4 + lib/utils/serial/objects.mk | 1 + lib/utils/serial/renesas_scif.c | 139 ++++++++++++++++++++++++ 4 files changed, 155 insertions(+) create mode 100644 include/sbi_utils/serial/renesas-scif.h create mode 100644 lib/utils/serial/renesas_scif.cinclude/sbi_utils/serial/renesas-scif.h new file +11
-0@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* +* Copyright (C) 2022 Renesas Electronics Corporation +*/ + +#ifndef __SERIAL_RENESAS_SCIF_H__ +#define __SERIAL_RENESAS_SCIF_H__ + +int renesas_scif_init (unsigned long base,u32 in_freq,u32 baudrate); + +#endif /* __SERIAL_RENESAS_SCIF_H__ */ lib/utils/serial/Kconfig +4
-0@@ -59,6 +59,10 @@ config SERIAL_GAISLER bool "Gaisler UART support" default n +config SERIAL_RENESAS_SCIF + bool "Renesas SCIF support" + default n + config SERIAL_SHAKTI bool "Shakti UART support" default nlib/utils/serial/objects.mk +1
-0@@ -36,6 +36,7 @@ libsbiutils-objs-$(CONFIG_FDT_SERIAL_XILINX_UARTLITE) += serial/fdt_serial_xlnx_ libsbiutils-objs-$(CONFIG_SERIAL_CADENCE) += serial/cadence-uart.o libsbiutils-objs-$(CONFIG_SERIAL_GAISLER) += serial/gaisler-uart.o +libsbiutils-objs-$(CONFIG_SERIAL_RENESAS_SCIF) += serial/renesas_scif.o libsbiutils-objs-$(CONFIG_SERIAL_SHAKTI) += serial/shakti-uart.o libsbiutils-objs-$(CONFIG_SERIAL_SIFIVE) += serial/sifive-uart.o libsbiutils-objs-$(CONFIG_SERIAL_LITEX) += serial/litex-uart.olib/utils/serial/renesas_scif.c new file +8
-0@@ -0,0 +1,139 @@ +// SPDX-License-Identifier: BSD-2-Clause +/* +* Copyright (C) 2022 Renesas Electronics Corporation +*/ + +#include <sbi/riscv_io.h> +#include <sbi/sbi_console.h> +#include <sbi/sbi_timer.h>
lib/utils/serial/renesas_scif.c line 18
Quoted 10 lines
lib/utils/serial/renesas_scif.c new file +10
-0+#include <sbi_utils/serial/renesas-scif.h> + +/* clang-format off */ + +#define SCIF_REG_SMR 0x0 +#define SCIF_REG_BRR 0x2 +#define SCIF_REG_SCR 0x4 +#define SCIF_REG_FTDR 0x6 +#define SCIF_REG_FSR 0x8 +#define SCIF_REG_FRDR 0xa
This register is not used by the driver. Drop it.
lib/utils/serial/renesas_scif.c line 24
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_REG_FCR 0xc +#define SCIF_REG_LSR 0x12 +#define SCIF_REG_SEMR 0x14 + +#define SCIF_RFRST 0x2/* Reset assert receive-FIFO (bit[1]) */ +#define SCIF_TFRST 0x4/* Reset assert transmit-FIFO(bit[2]) */
The above 2 macros should probably be named as SCIF_FCR_* as they only apply to the FCR register.
lib/utils/serial/renesas_scif.c line 26
Quoted 2 lines
lib/utils/serial/renesas_scif.c new file +2
-0+ +#define SCIF_FCR_RST_ASSRT_TFRF (SCIF_RFRST | SCIF_TFRST)/* Reset assert tx-FIFO & rx-FIFO */
The macro name should probably be named to have RF come before TF, like SCIF_FCR_RST_ASSRT_RFTF, to keep in consistency with the rest, and the codes.
#define SCIF_FCR_RST_ASSRT_RFTF (SCIF_RFRST | SCIF_TFRST) /*
Reset assert rx-FIFO & tx-FIFO */
lib/utils/serial/renesas_scif.c line 27
Quoted 1 line
lib/utils/serial/renesas_scif.c new file +1
-0+#define SCIF_FCR_RST_NGATE_TFRF 0x0/* Reset negate tx-FIFO & rx-FIFO*/
ditto
need a space before */
lib/utils/serial/renesas_scif.c line 30
Quoted 3 lines
lib/utils/serial/renesas_scif.c new file +3
-0+ +#define SCIF_RE 0x10/* Enable receive (bit[4]) */ +#define SCIF_TE 0x20/* Enable transmit(bit[5]) */
The above 2 macros should probably be named as SCIF_SCR_* as they only apply to the SCR register.
nits: only need one space fore */
lib/utils/serial/renesas_scif.c line 36
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_SCR_RCV_TRN_EN (SCIF_RE | SCIF_TE)/* Enable receive & transmit */ +#define SCIF_SCR_RCV_TRN_DIS 0x0/* Disable receive & transmit */ + +#define SCIF_FSR_ER 0x80/* Receive error flag */ +#define SCIF_FSR_TEND 0x40/* Detect break flag */ +#define SCIF_FSR_TDFE 0x20/* Detect break flag */
The comments of the above 2 bit fields are wrong
lib/utils/serial/renesas_scif.c line 38
Quoted 2 lines
lib/utils/serial/renesas_scif.c new file +2
-0+#define SCIF_FSR_BRK 0x10/* Detect break flag */ +#define SCIF_FSR_RDF 0x2/* Receive FIFO data full flag */
This bit field seems not to be used anywhere. Drop it?
lib/utils/serial/renesas_scif.c line 44
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_FSR_DR 0x1/* Receive data ready flag */ + +#define SCIF_FSR_RXD_CHK (SCIF_FSR_ER | SCIF_FSR_BRK | SCIF_FSR_DR) +#define SCIF_FSR_TXD_CHK (SCIF_FSR_TEND | SCIF_FSR_TDFE) + +#define SCIF_LSR_ORER 0x1/* Overrun error flag */
This macro is not used anywhere. Drop it.
lib/utils/serial/renesas_scif.c line 47
Quoted 3 lines
lib/utils/serial/renesas_scif.c new file +3
-0+ +#define SCIF_SPTR_SPB2DT 0x1/* if SCR.TE setting, don't care */ +#define SCIF_SPTR_SPB2IO 0x2/* if SCR.TE setting, don't care */
The above 2 macros are not used anywhere. Drop them.
lib/utils/serial/renesas_scif.c line 49
Quoted 2 lines
lib/utils/serial/renesas_scif.c new file +2
-0+ +#define SCIF_SEMR_BRME 0x20/* bit-rate modulation enable */
This macro is not used anywhere. Drop it.
lib/utils/serial/renesas_scif.c line 54
Quoted 5 lines
lib/utils/serial/renesas_scif.c new file +5
-0+#define SCIF_SEMR_MDDRS 0x10/* MDDR access enable */ + +#define SCIF_SIZE (reg) ((reg == SCIF_REG_BRR) || \ + (reg == SCIF_REG_FTDR) || \ + (reg == SCIF_REG_FRDR) || \
I don't see the driver programs SCIF_REG_FRDR register. We can just remove it to save some cycles.
lib/utils/serial/renesas_scif.c line 55
Quoted 1 line
lib/utils/serial/renesas_scif.c new file +1
-0+ (reg == SCIF_REG_SEMR))
The name of this macro is not meaningful. It looks like it's the size of a register at the first glance but it's actually returning logical true or false.
Better rename it to something like SCIF_REG_8BIT(reg).
Quoted 18 lines
lib/utils/serial/renesas_scif.c new file +18
-0+ +#define SCBRR_VALUE (clk, baudrate) ((clk) / (32 * (baudrate)) - 1) + +/* clang-format on */ + +static volatile char *scif_base; + +static u32 get_reg (u32 offset) +{ +if (SCIF_SIZE (offset)) +return readb (scif_base + offset); + +return readw (scif_base + offset); +} + +static void set_reg (u32 offset,u32 val) +{ +if (SCIF_SIZE (offset))
lib/utils/serial/renesas_scif.c line 83
Quoted 10 lines
lib/utils/serial/renesas_scif.c new file +10
-0+return writeb (val, scif_base + offset); + +return writew (val, scif_base + offset); +} + +static void scif_wait (unsigned long baudrate) +{ +unsigned long utime; + + utime =1000000 / baudrate +1 ;
What is this?
Quoted 5 lines
lib/utils/serial/renesas_scif.c new file +5
-0+ +sbi_timer_udelay (utime); +} + +static void renesas_scif_putc (char ch)
lib/utils/serial/renesas_scif.c line 98
Quoted 10 lines
lib/utils/serial/renesas_scif.c new file +10
-0+{ +uint16_t reg; + +while (!(SCIF_FSR_TXD_CHK &get_reg (SCIF_REG_FSR ))) + ; + +set_reg (SCIF_REG_FTDR , ch); + reg =get_reg (SCIF_REG_FSR ); + reg &= ~SCIF_FSR_TXD_CHK ; +set_reg (SCIF_REG_FSR , reg);
The FSR Tx status bits clear should happen before writing a new char to the Tx fifo, no?
Quoted 21 lines
lib/utils/serial/renesas_scif.c new file +21
-0+} + +static struct sbi_console_device renesas_scif_console = { + .name ="renesas_scif" , + .console_putc = renesas_scif_putc, +}; + +int renesas_scif_init (unsigned long base,u32 in_freq,u32 baudrate) +{ +volatile uint16_t data16; + + scif_base = (volatile char *)base; + +set_reg (SCIF_REG_SCR ,SCIF_SCR_RCV_TRN_DIS );/* Disable receive & transmit */ +set_reg (SCIF_REG_FCR ,SCIF_FCR_RST_ASSRT_TFRF );/* Reset assert tx-FIFO & rx-FIFO */ + + data16 =get_reg (SCIF_REG_FSR );/* Dummy read */ +set_reg (SCIF_REG_FSR ,0x0 );/* Clear all error bit */ + + data16 =get_reg (SCIF_REG_LSR );/* Dummy read */ +set_reg (SCIF_REG_LSR ,0x0 );/* Clear ORER bit */
lib/utils/serial/renesas_scif.c line 129
Quoted 10 lines
lib/utils/serial/renesas_scif.c new file +10
-0+ +set_reg (SCIF_REG_SCR ,0x0 );/* Select internal clock, SC_CLK pin unused for output pin */ + +set_reg (SCIF_REG_SMR ,0x0 );/* Set asynchronous, 8bit data, no-parity, 1 stop and Po/1 */ + + data16 =get_reg (SCIF_REG_SEMR ); +set_reg (SCIF_REG_SEMR , data16 & (~SCIF_SEMR_MDDRS ));/* Select to access BRR */ +set_reg (SCIF_REG_BRR ,SCBRR_VALUE (in_freq, baudrate)); + +scif_wait (baudrate);
What is this?
lib/utils/serial/renesas_scif.c line 131
Quoted 2 lines
lib/utils/serial/renesas_scif.c new file +2
-0+ +/* FTCR is left at initial value, because this interrupt isn't used. */
What is FTCR? There is no such register in your defines.
lib/utils/serial/renesas_scif.c line 139
Quoted 8 lines
lib/utils/serial/renesas_scif.c new file +8
-0+set_reg (SCIF_REG_FCR ,SCIF_FCR_RST_NGATE_TFRF );/* Reset negate tx-FIFO, rx-FIFO. */ + +set_reg (SCIF_REG_SCR ,SCIF_SCR_RCV_TRN_EN );/* Enable receive & transmit w/SC_CLK=no output */ + +sbi_console_set_device (&renesas_scif_console); + +return 0 ; +}
Regards,
Bin
Lad
PATCH v2 1/7 lib: utils: serial: Add Renesas SCIF driver
Hi Bin,
Thank you for the review.
Quoted 5 lines · Bin Meng
Quoted 3 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
Quoted 8 lines
Quoted 4 lines
Add Renesas SCIF driver.
Based on a patch in the BSP by Takeki Hamada
<[email protected]>If there is a public URL for the BSP you mentioned, better put that in the commit here for future reference.
you mean link for the BSP/File/Commit. Ive followed the same approach that we follow on Linux.
Quoted 76 lines
Quoted 76 lines
Signed-off-by Lad Prabhakar <[email protected]>---
RFC->v2
* Fixed comments pointed by Xiang W--- include/sbi_utils/serial/renesas-scif.h | 11 ++ lib/utils/serial/Kconfig | 4 + lib/utils/serial/objects.mk | 1 + lib/utils/serial/renesas_scif.c | 139 ++++++++++++++++++++++++ 4 files changed, 155 insertions(+) create mode 100644 include/sbi_utils/serial/renesas-scif.h create mode 100644 lib/utils/serial/renesas_scif.cinclude/sbi_utils/serial/renesas-scif.h new file +11
-0@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* +* Copyright (C) 2022 Renesas Electronics Corporation +*/ + +#ifndef __SERIAL_RENESAS_SCIF_H__ +#define __SERIAL_RENESAS_SCIF_H__ + +int renesas_scif_init (unsigned long base,u32 in_freq,u32 baudrate); + +#endif /* __SERIAL_RENESAS_SCIF_H__ */ lib/utils/serial/Kconfig +4
-0@@ -59,6 +59,10 @@ config SERIAL_GAISLER bool "Gaisler UART support" default n +config SERIAL_RENESAS_SCIF + bool "Renesas SCIF support" + default n + config SERIAL_SHAKTI bool "Shakti UART support" default nlib/utils/serial/objects.mk +1
-0@@ -36,6 +36,7 @@ libsbiutils-objs-$(CONFIG_FDT_SERIAL_XILINX_UARTLITE) += serial/fdt_serial_xlnx_ libsbiutils-objs-$(CONFIG_SERIAL_CADENCE) += serial/cadence-uart.o libsbiutils-objs-$(CONFIG_SERIAL_GAISLER) += serial/gaisler-uart.o +libsbiutils-objs-$(CONFIG_SERIAL_RENESAS_SCIF) += serial/renesas_scif.o libsbiutils-objs-$(CONFIG_SERIAL_SHAKTI) += serial/shakti-uart.o libsbiutils-objs-$(CONFIG_SERIAL_SIFIVE) += serial/sifive-uart.o libsbiutils-objs-$(CONFIG_SERIAL_LITEX) += serial/litex-uart.olib/utils/serial/renesas_scif.c new file +12
-0@@ -0,0 +1,139 @@ +// SPDX-License-Identifier: BSD-2-Clause +/* +* Copyright (C) 2022 Renesas Electronics Corporation +*/ + +#include <sbi/riscv_io.h> +#include <sbi/sbi_console.h> +#include <sbi/sbi_timer.h> +#include <sbi_utils/serial/renesas-scif.h> + +/* clang-format off */ +
Quoted 9 lines
lib/utils/serial/renesas_scif.c line 18
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_REG_SMR 0x0 +#define SCIF_REG_BRR 0x2 +#define SCIF_REG_SCR 0x4 +#define SCIF_REG_FTDR 0x6 +#define SCIF_REG_FSR 0x8 +#define SCIF_REG_FRDR 0xaThis register is not used by the driver. Drop it.
OK, I will drop it.
Quoted 10 lines
lib/utils/serial/renesas_scif.c line 24
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_REG_FCR 0xc +#define SCIF_REG_LSR 0x12 +#define SCIF_REG_SEMR 0x14 + +#define SCIF_RFRST 0x2/* Reset assert receive-FIFO (bit[1]) */ +#define SCIF_TFRST 0x4/* Reset assert transmit-FIFO(bit[2]) */ The above 2 macros should probably be named as SCIF_FCR_* as they only apply to the FCR register.
Agreed.
Quoted 7 lines
lib/utils/serial/renesas_scif.c line 26
Quoted 2 lines
lib/utils/serial/renesas_scif.c new file +2
-0+ +#define SCIF_FCR_RST_ASSRT_TFRF (SCIF_RFRST | SCIF_TFRST)/* Reset assert tx-FIFO & rx-FIFO */ The macro name should probably be named to have RF come before TF, like
SCIF_FCR_RST_ASSRT_RFTF, to keep in consistency with the rest, and the codes.
Agreed.
Quoted 9 lines
#define
SCIF_FCR_RST_ASSRT_RFTF(SCIF_RFRST|SCIF_TFRST) /*
Reset assert rx-FIFO & tx-FIFO */lib/utils/serial/renesas_scif.c line 27
Quoted 1 line
lib/utils/serial/renesas_scif.c new file +1
-0+#define SCIF_FCR_RST_NGATE_TFRF 0x0/* Reset negate tx-FIFO & rx-FIFO*/ ditto
need a space before */
OK, I will fix it.
Quoted 7 lines
lib/utils/serial/renesas_scif.c line 30
Quoted 3 lines
lib/utils/serial/renesas_scif.c new file +3
-0+ +#define SCIF_RE 0x10/* Enable receive (bit[4]) */ +#define SCIF_TE 0x20/* Enable transmit(bit[5]) */ The above 2 macros should probably be named as SCIF_SCR_* as they only apply to the SCR register.
Agreed.
Quoted 11 lines
nits: only need one space fore */
lib/utils/serial/renesas_scif.c line 36
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_SCR_RCV_TRN_EN (SCIF_RE | SCIF_TE)/* Enable receive & transmit */ +#define SCIF_SCR_RCV_TRN_DIS 0x0/* Disable receive & transmit */ + +#define SCIF_FSR_ER 0x80/* Receive error flag */ +#define SCIF_FSR_TEND 0x40/* Detect break flag */ +#define SCIF_FSR_TDFE 0x20/* Detect break flag */ The comments of the above 2 bit fields are wrong
Ouch will fix that.
Quoted 5 lines
lib/utils/serial/renesas_scif.c line 38
Quoted 2 lines
lib/utils/serial/renesas_scif.c new file +2
-0+#define SCIF_FSR_BRK 0x10/* Detect break flag */ +#define SCIF_FSR_RDF 0x2/* Receive FIFO data full flag */ This bit field seems not to be used anywhere. Drop it?
Sure, I will drop it.
Quoted 9 lines
lib/utils/serial/renesas_scif.c line 44
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_FSR_DR 0x1/* Receive data ready flag */ + +#define SCIF_FSR_RXD_CHK (SCIF_FSR_ER | SCIF_FSR_BRK | SCIF_FSR_DR) +#define SCIF_FSR_TXD_CHK (SCIF_FSR_TEND | SCIF_FSR_TDFE) + +#define SCIF_LSR_ORER 0x1/* Overrun error flag */ This macro is not used anywhere. Drop it.
ditto.
Quoted 6 lines
lib/utils/serial/renesas_scif.c line 47
Quoted 3 lines
lib/utils/serial/renesas_scif.c new file +3
-0+ +#define SCIF_SPTR_SPB2DT 0x1/* if SCR.TE setting, don't care */ +#define SCIF_SPTR_SPB2IO 0x2/* if SCR.TE setting, don't care */ The above 2 macros are not used anywhere. Drop them.
ditto.
Quoted 5 lines
lib/utils/serial/renesas_scif.c line 49
Quoted 2 lines
lib/utils/serial/renesas_scif.c new file +2
-0+ +#define SCIF_SEMR_BRME 0x20/* bit-rate modulation enable */ This macro is not used anywhere. Drop it.
ditto.
Quoted 9 lines
lib/utils/serial/renesas_scif.c line 54
Quoted 5 lines
lib/utils/serial/renesas_scif.c new file +5
-0+#define SCIF_SEMR_MDDRS 0x10/* MDDR access enable */ + +#define SCIF_SIZE (reg) ((reg == SCIF_REG_BRR) || \ + (reg == SCIF_REG_FTDR) || \ + (reg == SCIF_REG_FRDR) || \I don't see the driver programs
SCIF_REG_FRDRregister. We can just remove it to save some cycles.
Quoted 7 lines
lib/utils/serial/renesas_scif.c line 55
Quoted 1 line
lib/utils/serial/renesas_scif.c new file +1
-0+ (reg == SCIF_REG_SEMR))The name of this macro is not meaningful. It looks like it's the size of a register at the first glance but it's actually returning logical true or false.
Better rename it to something likeSCIF_REG_8BIT(reg).
Good point, I'll rename it.
Quoted 22 lines
Quoted 22 lines
lib/utils/serial/renesas_scif.c new file +22
-0+ +#define SCBRR_VALUE (clk, baudrate) ((clk) / (32 * (baudrate)) - 1) + +/* clang-format on */ + +static volatile char *scif_base; + +static u32 get_reg (u32 offset) +{ +if (SCIF_SIZE (offset)) +return readb (scif_base + offset); + +return readw (scif_base + offset); +} + +static void set_reg (u32 offset,u32 val) +{ +if (SCIF_SIZE (offset)) +return writeb (val, scif_base + offset); + +return writew (val, scif_base + offset); +}
Quoted 9 lines
lib/utils/serial/renesas_scif.c line 83
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+ +static void scif_wait (unsigned long baudrate) +{ +unsigned long utime; + + utime =1000000 / baudrate +1 ;What is this?
It's the delay required when using the external clock. But as we arent using it on RZ/Five SMARC we can get rid of it for now.
Quoted 10 lines
Quoted 10 lines
lib/utils/serial/renesas_scif.c new file +10
-0+ +sbi_timer_udelay (utime); +} + +static void renesas_scif_putc (char ch) +{ +uint16_t reg; + +while (!(SCIF_FSR_TXD_CHK &get_reg (SCIF_REG_FSR ))) + ;
Quoted 9 lines
lib/utils/serial/renesas_scif.c line 98
Quoted 5 lines
lib/utils/serial/renesas_scif.c new file +5
-0+ +set_reg (SCIF_REG_FTDR , ch); + reg =get_reg (SCIF_REG_FSR ); + reg &= ~SCIF_FSR_TXD_CHK ; +set_reg (SCIF_REG_FSR , reg);The FSR Tx status bits clear should happen before writing a new char to the Tx fifo, no?
No, this has to be cleared only after char write.
Quoted 25 lines
Quoted 25 lines
lib/utils/serial/renesas_scif.c new file +25
-0+} + +static struct sbi_console_device renesas_scif_console = { + .name ="renesas_scif" , + .console_putc = renesas_scif_putc, +}; + +int renesas_scif_init (unsigned long base,u32 in_freq,u32 baudrate) +{ +volatile uint16_t data16; + + scif_base = (volatile char *)base; + +set_reg (SCIF_REG_SCR ,SCIF_SCR_RCV_TRN_DIS );/* Disable receive & transmit */ +set_reg (SCIF_REG_FCR ,SCIF_FCR_RST_ASSRT_TFRF );/* Reset assert tx-FIFO & rx-FIFO */ + + data16 =get_reg (SCIF_REG_FSR );/* Dummy read */ +set_reg (SCIF_REG_FSR ,0x0 );/* Clear all error bit */ + + data16 =get_reg (SCIF_REG_LSR );/* Dummy read */ +set_reg (SCIF_REG_LSR ,0x0 );/* Clear ORER bit */ + +set_reg (SCIF_REG_SCR ,0x0 );/* Select internal clock, SC_CLK pin unused for output pin */ + +set_reg (SCIF_REG_SMR ,0x0 );/* Set asynchronous, 8bit data, no-parity, 1 stop and Po/1 */
Quoted 9 lines
lib/utils/serial/renesas_scif.c line 129
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+ + data16 =get_reg (SCIF_REG_SEMR ); +set_reg (SCIF_REG_SEMR , data16 & (~SCIF_SEMR_MDDRS ));/* Select to access BRR */ +set_reg (SCIF_REG_BRR ,SCBRR_VALUE (in_freq, baudrate)); + +scif_wait (baudrate);What is this?
As mentioned above I'll get rid of it.
Quoted 5 lines
lib/utils/serial/renesas_scif.c line 131
Quoted 2 lines
lib/utils/serial/renesas_scif.c new file +2
-0+ +/* FTCR is left at initial value, because this interrupt isn't used. */ What is FTCR? There is no such register in your defines.
It's the "FIFO Trigger Control Register". I'll drop the comment.
Cheers,
Prabhakar
PATCH v2 1/7 lib: utils: serial: Add Renesas SCIF driver
Hi Prabhakar,
Quoted 13 lines · Prabhakar
Hi Bin,
Thank you for the review.
Quoted 7 lines · Bin Meng
Quoted 5 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
Add Renesas SCIF driver.
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
Based on a patch in the BSP by Takeki Hamada
<[email protected]>If there is a public URL for the BSP you mentioned, better put that in the commit here for future reference.
you mean link for the BSP/File/Commit. Ive followed the same approach that we follow on Linux.
Do you have any link for the BSP files, ie: on Renesas website?
Quoted 224 lines
Quoted 77 lines
Quoted 77 lines
Signed-off-by Lad Prabhakar <[email protected]>---
RFC->v2
* Fixed comments pointed by Xiang W--- include/sbi_utils/serial/renesas-scif.h | 11 ++ lib/utils/serial/Kconfig | 4 + lib/utils/serial/objects.mk | 1 + lib/utils/serial/renesas_scif.c | 139 ++++++++++++++++++++++++ 4 files changed, 155 insertions(+) create mode 100644 include/sbi_utils/serial/renesas-scif.h create mode 100644 lib/utils/serial/renesas_scif.cinclude/sbi_utils/serial/renesas-scif.h new file +11
-0@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* +* Copyright (C) 2022 Renesas Electronics Corporation +*/ + +#ifndef __SERIAL_RENESAS_SCIF_H__ +#define __SERIAL_RENESAS_SCIF_H__ + +int renesas_scif_init (unsigned long base,u32 in_freq,u32 baudrate); + +#endif /* __SERIAL_RENESAS_SCIF_H__ */ lib/utils/serial/Kconfig +4
-0@@ -59,6 +59,10 @@ config SERIAL_GAISLER bool "Gaisler UART support" default n +config SERIAL_RENESAS_SCIF + bool "Renesas SCIF support" + default n + config SERIAL_SHAKTI bool "Shakti UART support" default nlib/utils/serial/objects.mk +1
-0@@ -36,6 +36,7 @@ libsbiutils-objs-$(CONFIG_FDT_SERIAL_XILINX_UARTLITE) += serial/fdt_serial_xlnx_ libsbiutils-objs-$(CONFIG_SERIAL_CADENCE) += serial/cadence-uart.o libsbiutils-objs-$(CONFIG_SERIAL_GAISLER) += serial/gaisler-uart.o +libsbiutils-objs-$(CONFIG_SERIAL_RENESAS_SCIF) += serial/renesas_scif.o libsbiutils-objs-$(CONFIG_SERIAL_SHAKTI) += serial/shakti-uart.o libsbiutils-objs-$(CONFIG_SERIAL_SIFIVE) += serial/sifive-uart.o libsbiutils-objs-$(CONFIG_SERIAL_LITEX) += serial/litex-uart.olib/utils/serial/renesas_scif.c new file +12
-0@@ -0,0 +1,139 @@ +// SPDX-License-Identifier: BSD-2-Clause +/* +* Copyright (C) 2022 Renesas Electronics Corporation +*/ + +#include <sbi/riscv_io.h> +#include <sbi/sbi_console.h> +#include <sbi/sbi_timer.h> +#include <sbi_utils/serial/renesas-scif.h> + +/* clang-format off */ +Quoted 9 lines
lib/utils/serial/renesas_scif.c line 18
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_REG_SMR 0x0 +#define SCIF_REG_BRR 0x2 +#define SCIF_REG_SCR 0x4 +#define SCIF_REG_FTDR 0x6 +#define SCIF_REG_FSR 0x8 +#define SCIF_REG_FRDR 0xaThis register is not used by the driver. Drop it.
OK, I will drop it.
Quoted 10 lines
lib/utils/serial/renesas_scif.c line 24
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_REG_FCR 0xc +#define SCIF_REG_LSR 0x12 +#define SCIF_REG_SEMR 0x14 + +#define SCIF_RFRST 0x2/* Reset assert receive-FIFO (bit[1]) */ +#define SCIF_TFRST 0x4/* Reset assert transmit-FIFO(bit[2]) */ The above 2 macros should probably be named as SCIF_FCR_* as they only apply to the FCR register.
Agreed.
Quoted 7 lines
lib/utils/serial/renesas_scif.c line 26
Quoted 2 lines
lib/utils/serial/renesas_scif.c new file +2
-0+ +#define SCIF_FCR_RST_ASSRT_TFRF (SCIF_RFRST | SCIF_TFRST)/* Reset assert tx-FIFO & rx-FIFO */ The macro name should probably be named to have RF come before TF, like
SCIF_FCR_RST_ASSRT_RFTF, to keep in consistency with the rest, and the codes.Agreed.
Quoted 9 lines
#define
SCIF_FCR_RST_ASSRT_RFTF(SCIF_RFRST|SCIF_TFRST) /*
Reset assert rx-FIFO & tx-FIFO */lib/utils/serial/renesas_scif.c line 27
Quoted 1 line
lib/utils/serial/renesas_scif.c new file +1
-0+#define SCIF_FCR_RST_NGATE_TFRF 0x0/* Reset negate tx-FIFO & rx-FIFO*/ ditto
need a space before */
OK, I will fix it.
Quoted 7 lines
lib/utils/serial/renesas_scif.c line 30
Quoted 3 lines
lib/utils/serial/renesas_scif.c new file +3
-0+ +#define SCIF_RE 0x10/* Enable receive (bit[4]) */ +#define SCIF_TE 0x20/* Enable transmit(bit[5]) */ The above 2 macros should probably be named as SCIF_SCR_* as they only apply to the SCR register.
Agreed.
Quoted 11 lines
nits: only need one space fore */
lib/utils/serial/renesas_scif.c line 36
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_SCR_RCV_TRN_EN (SCIF_RE | SCIF_TE)/* Enable receive & transmit */ +#define SCIF_SCR_RCV_TRN_DIS 0x0/* Disable receive & transmit */ + +#define SCIF_FSR_ER 0x80/* Receive error flag */ +#define SCIF_FSR_TEND 0x40/* Detect break flag */ +#define SCIF_FSR_TDFE 0x20/* Detect break flag */ The comments of the above 2 bit fields are wrong
Ouch will fix that.
Quoted 5 lines
lib/utils/serial/renesas_scif.c line 38
Quoted 2 lines
lib/utils/serial/renesas_scif.c new file +2
-0+#define SCIF_FSR_BRK 0x10/* Detect break flag */ +#define SCIF_FSR_RDF 0x2/* Receive FIFO data full flag */ This bit field seems not to be used anywhere. Drop it?
Sure, I will drop it.
Quoted 9 lines
lib/utils/serial/renesas_scif.c line 44
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_FSR_DR 0x1/* Receive data ready flag */ + +#define SCIF_FSR_RXD_CHK (SCIF_FSR_ER | SCIF_FSR_BRK | SCIF_FSR_DR) +#define SCIF_FSR_TXD_CHK (SCIF_FSR_TEND | SCIF_FSR_TDFE) + +#define SCIF_LSR_ORER 0x1/* Overrun error flag */ This macro is not used anywhere. Drop it.
ditto.
Quoted 6 lines
lib/utils/serial/renesas_scif.c line 47
Quoted 3 lines
lib/utils/serial/renesas_scif.c new file +3
-0+ +#define SCIF_SPTR_SPB2DT 0x1/* if SCR.TE setting, don't care */ +#define SCIF_SPTR_SPB2IO 0x2/* if SCR.TE setting, don't care */ The above 2 macros are not used anywhere. Drop them.
ditto.
Quoted 5 lines
lib/utils/serial/renesas_scif.c line 49
Quoted 2 lines
lib/utils/serial/renesas_scif.c new file +2
-0+ +#define SCIF_SEMR_BRME 0x20/* bit-rate modulation enable */ This macro is not used anywhere. Drop it.
ditto.
Quoted 9 lines
lib/utils/serial/renesas_scif.c line 54
Quoted 5 lines
lib/utils/serial/renesas_scif.c new file +5
-0+#define SCIF_SEMR_MDDRS 0x10/* MDDR access enable */ + +#define SCIF_SIZE (reg) ((reg == SCIF_REG_BRR) || \ + (reg == SCIF_REG_FTDR) || \ + (reg == SCIF_REG_FRDR) || \I don't see the driver programs
SCIF_REG_FRDRregister. We can just remove it to save some cycles.Quoted 7 lines
lib/utils/serial/renesas_scif.c line 55
Quoted 1 line
lib/utils/serial/renesas_scif.c new file +1
-0+ (reg == SCIF_REG_SEMR))The name of this macro is not meaningful. It looks like it's the size of a register at the first glance but it's actually returning logical true or false.
Better rename it to something likeSCIF_REG_8BIT(reg).Good point, I'll rename it.
Quoted 22 lines
Quoted 22 lines
lib/utils/serial/renesas_scif.c new file +22
-0+ +#define SCBRR_VALUE (clk, baudrate) ((clk) / (32 * (baudrate)) - 1) + +/* clang-format on */ + +static volatile char *scif_base; + +static u32 get_reg (u32 offset) +{ +if (SCIF_SIZE (offset)) +return readb (scif_base + offset); + +return readw (scif_base + offset); +} + +static void set_reg (u32 offset,u32 val) +{ +if (SCIF_SIZE (offset)) +return writeb (val, scif_base + offset); + +return writew (val, scif_base + offset); +}Quoted 9 lines
lib/utils/serial/renesas_scif.c line 83
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+ +static void scif_wait (unsigned long baudrate) +{ +unsigned long utime; + + utime =1000000 / baudrate +1 ;What is this?
Quoted 2 lines
It's the delay required when using the external clock. But as we arent using it on RZ/Five SMARC we can get rid of it for now.
Could we make such logic be based on DTS settings, instead of hardcoding?
This driver should be able to support both internal and external clocks, right?
Quoted 20 lines
Quoted 11 lines
Quoted 11 lines
lib/utils/serial/renesas_scif.c new file +10
-0+ +sbi_timer_udelay (utime); +} + +static void renesas_scif_putc (char ch) +{ +uint16_t reg; + +while (!(SCIF_FSR_TXD_CHK &get_reg (SCIF_REG_FSR ))) + ;Quoted 9 lines
lib/utils/serial/renesas_scif.c line 98
Quoted 5 lines
lib/utils/serial/renesas_scif.c new file +5
-0+ +set_reg (SCIF_REG_FTDR , ch); + reg =get_reg (SCIF_REG_FSR ); + reg &= ~SCIF_FSR_TXD_CHK ; +set_reg (SCIF_REG_FSR , reg);The FSR Tx status bits clear should happen before writing a new char to the Tx fifo, no?
Quoted 1 line
No, this has to be cleared only after char write.
Based on my read of the user manual, after the while () check, we can clear the status bits. After you write a new char to the FIFO, the status bits might be triggered by the new char write, instead of the previous one. Hence clearing status bits after writing char will cause the status bits check next time fail.
Quoted 35 lines
Quoted 26 lines
Quoted 26 lines
lib/utils/serial/renesas_scif.c new file +25
-0+} + +static struct sbi_console_device renesas_scif_console = { + .name ="renesas_scif" , + .console_putc = renesas_scif_putc, +}; + +int renesas_scif_init (unsigned long base,u32 in_freq,u32 baudrate) +{ +volatile uint16_t data16; + + scif_base = (volatile char *)base; + +set_reg (SCIF_REG_SCR ,SCIF_SCR_RCV_TRN_DIS );/* Disable receive & transmit */ +set_reg (SCIF_REG_FCR ,SCIF_FCR_RST_ASSRT_TFRF );/* Reset assert tx-FIFO & rx-FIFO */ + + data16 =get_reg (SCIF_REG_FSR );/* Dummy read */ +set_reg (SCIF_REG_FSR ,0x0 );/* Clear all error bit */ + + data16 =get_reg (SCIF_REG_LSR );/* Dummy read */ +set_reg (SCIF_REG_LSR ,0x0 );/* Clear ORER bit */ + +set_reg (SCIF_REG_SCR ,0x0 );/* Select internal clock, SC_CLK pin unused for output pin */ + +set_reg (SCIF_REG_SMR ,0x0 );/* Set asynchronous, 8bit data, no-parity, 1 stop and Po/1 */ Quoted 9 lines
lib/utils/serial/renesas_scif.c line 129
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+ + data16 =get_reg (SCIF_REG_SEMR ); +set_reg (SCIF_REG_SEMR , data16 & (~SCIF_SEMR_MDDRS ));/* Select to access BRR */ +set_reg (SCIF_REG_BRR ,SCBRR_VALUE (in_freq, baudrate)); + +scif_wait (baudrate);What is this?
Quoted 9 lines
As mentioned above I'll get rid of it.
Quoted 5 lines
lib/utils/serial/renesas_scif.c line 131
Quoted 2 lines
lib/utils/serial/renesas_scif.c new file +2
-0+ +/* FTCR is left at initial value, because this interrupt isn't used. */ What is FTCR? There is no such register in your defines.
It's the "FIFO Trigger Control Register". I'll drop the comment.
Regards,
Bin
Lad
PATCH v2 1/7 lib: utils: serial: Add Renesas SCIF driver
Hi Bin,
Quoted 21 lines · Bin Meng
Hi Prabhakar,
Quoted 16 lines · Prabhakar
Hi Bin,
Thank you for the review.
Quoted 10 lines · Bin Meng
Quoted 7 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
Add Renesas SCIF driver.
Based on a patch in the BSP by Takeki Hamada
<[email protected]>
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
If there is a public URL for the BSP you mentioned, better put that in the commit here for future reference.
you mean link for the BSP/File/Commit. Ive followed the same approach that we follow on Linux.
Do you have any link for the BSP files, ie: on Renesas website?
We have a meta layer link [1] on the website but we got github links to the files/commit-id too if this is needed.
Quoted 224 lines
Quoted 224 lines
Quoted 77 lines
Quoted 77 lines
Signed-off-by Lad Prabhakar <[email protected]>---
RFC->v2
* Fixed comments pointed by Xiang W--- include/sbi_utils/serial/renesas-scif.h | 11 ++ lib/utils/serial/Kconfig | 4 + lib/utils/serial/objects.mk | 1 + lib/utils/serial/renesas_scif.c | 139 ++++++++++++++++++++++++ 4 files changed, 155 insertions(+) create mode 100644 include/sbi_utils/serial/renesas-scif.h create mode 100644 lib/utils/serial/renesas_scif.cinclude/sbi_utils/serial/renesas-scif.h new file +11
-0@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* +* Copyright (C) 2022 Renesas Electronics Corporation +*/ + +#ifndef __SERIAL_RENESAS_SCIF_H__ +#define __SERIAL_RENESAS_SCIF_H__ + +int renesas_scif_init (unsigned long base,u32 in_freq,u32 baudrate); + +#endif /* __SERIAL_RENESAS_SCIF_H__ */ lib/utils/serial/Kconfig +4
-0@@ -59,6 +59,10 @@ config SERIAL_GAISLER bool "Gaisler UART support" default n +config SERIAL_RENESAS_SCIF + bool "Renesas SCIF support" + default n + config SERIAL_SHAKTI bool "Shakti UART support" default nlib/utils/serial/objects.mk +1
-0@@ -36,6 +36,7 @@ libsbiutils-objs-$(CONFIG_FDT_SERIAL_XILINX_UARTLITE) += serial/fdt_serial_xlnx_ libsbiutils-objs-$(CONFIG_SERIAL_CADENCE) += serial/cadence-uart.o libsbiutils-objs-$(CONFIG_SERIAL_GAISLER) += serial/gaisler-uart.o +libsbiutils-objs-$(CONFIG_SERIAL_RENESAS_SCIF) += serial/renesas_scif.o libsbiutils-objs-$(CONFIG_SERIAL_SHAKTI) += serial/shakti-uart.o libsbiutils-objs-$(CONFIG_SERIAL_SIFIVE) += serial/sifive-uart.o libsbiutils-objs-$(CONFIG_SERIAL_LITEX) += serial/litex-uart.olib/utils/serial/renesas_scif.c new file +12
-0@@ -0,0 +1,139 @@ +// SPDX-License-Identifier: BSD-2-Clause +/* +* Copyright (C) 2022 Renesas Electronics Corporation +*/ + +#include <sbi/riscv_io.h> +#include <sbi/sbi_console.h> +#include <sbi/sbi_timer.h> +#include <sbi_utils/serial/renesas-scif.h> + +/* clang-format off */ +Quoted 9 lines
lib/utils/serial/renesas_scif.c line 18
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_REG_SMR 0x0 +#define SCIF_REG_BRR 0x2 +#define SCIF_REG_SCR 0x4 +#define SCIF_REG_FTDR 0x6 +#define SCIF_REG_FSR 0x8 +#define SCIF_REG_FRDR 0xaThis register is not used by the driver. Drop it.
OK, I will drop it.
Quoted 10 lines
lib/utils/serial/renesas_scif.c line 24
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_REG_FCR 0xc +#define SCIF_REG_LSR 0x12 +#define SCIF_REG_SEMR 0x14 + +#define SCIF_RFRST 0x2/* Reset assert receive-FIFO (bit[1]) */ +#define SCIF_TFRST 0x4/* Reset assert transmit-FIFO(bit[2]) */ The above 2 macros should probably be named as SCIF_FCR_* as they only apply to the FCR register.
Agreed.
Quoted 7 lines
lib/utils/serial/renesas_scif.c line 26
Quoted 2 lines
lib/utils/serial/renesas_scif.c new file +2
-0+ +#define SCIF_FCR_RST_ASSRT_TFRF (SCIF_RFRST | SCIF_TFRST)/* Reset assert tx-FIFO & rx-FIFO */ The macro name should probably be named to have RF come before TF, like
SCIF_FCR_RST_ASSRT_RFTF, to keep in consistency with the rest, and the codes.Agreed.
Quoted 9 lines
#define
SCIF_FCR_RST_ASSRT_RFTF(SCIF_RFRST|SCIF_TFRST) /*
Reset assert rx-FIFO & tx-FIFO */lib/utils/serial/renesas_scif.c line 27
Quoted 1 line
lib/utils/serial/renesas_scif.c new file +1
-0+#define SCIF_FCR_RST_NGATE_TFRF 0x0/* Reset negate tx-FIFO & rx-FIFO*/ ditto
need a space before */
OK, I will fix it.
Quoted 7 lines
lib/utils/serial/renesas_scif.c line 30
Quoted 3 lines
lib/utils/serial/renesas_scif.c new file +3
-0+ +#define SCIF_RE 0x10/* Enable receive (bit[4]) */ +#define SCIF_TE 0x20/* Enable transmit(bit[5]) */ The above 2 macros should probably be named as SCIF_SCR_* as they only apply to the SCR register.
Agreed.
Quoted 11 lines
nits: only need one space fore */
lib/utils/serial/renesas_scif.c line 36
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_SCR_RCV_TRN_EN (SCIF_RE | SCIF_TE)/* Enable receive & transmit */ +#define SCIF_SCR_RCV_TRN_DIS 0x0/* Disable receive & transmit */ + +#define SCIF_FSR_ER 0x80/* Receive error flag */ +#define SCIF_FSR_TEND 0x40/* Detect break flag */ +#define SCIF_FSR_TDFE 0x20/* Detect break flag */ The comments of the above 2 bit fields are wrong
Ouch will fix that.
Quoted 5 lines
lib/utils/serial/renesas_scif.c line 38
Quoted 2 lines
lib/utils/serial/renesas_scif.c new file +2
-0+#define SCIF_FSR_BRK 0x10/* Detect break flag */ +#define SCIF_FSR_RDF 0x2/* Receive FIFO data full flag */ This bit field seems not to be used anywhere. Drop it?
Sure, I will drop it.
Quoted 9 lines
lib/utils/serial/renesas_scif.c line 44
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_FSR_DR 0x1/* Receive data ready flag */ + +#define SCIF_FSR_RXD_CHK (SCIF_FSR_ER | SCIF_FSR_BRK | SCIF_FSR_DR) +#define SCIF_FSR_TXD_CHK (SCIF_FSR_TEND | SCIF_FSR_TDFE) + +#define SCIF_LSR_ORER 0x1/* Overrun error flag */ This macro is not used anywhere. Drop it.
ditto.
Quoted 6 lines
lib/utils/serial/renesas_scif.c line 47
Quoted 3 lines
lib/utils/serial/renesas_scif.c new file +3
-0+ +#define SCIF_SPTR_SPB2DT 0x1/* if SCR.TE setting, don't care */ +#define SCIF_SPTR_SPB2IO 0x2/* if SCR.TE setting, don't care */ The above 2 macros are not used anywhere. Drop them.
ditto.
Quoted 5 lines
lib/utils/serial/renesas_scif.c line 49
Quoted 2 lines
lib/utils/serial/renesas_scif.c new file +2
-0+ +#define SCIF_SEMR_BRME 0x20/* bit-rate modulation enable */ This macro is not used anywhere. Drop it.
ditto.
Quoted 9 lines
lib/utils/serial/renesas_scif.c line 54
Quoted 5 lines
lib/utils/serial/renesas_scif.c new file +5
-0+#define SCIF_SEMR_MDDRS 0x10/* MDDR access enable */ + +#define SCIF_SIZE (reg) ((reg == SCIF_REG_BRR) || \ + (reg == SCIF_REG_FTDR) || \ + (reg == SCIF_REG_FRDR) || \I don't see the driver programs
SCIF_REG_FRDRregister. We can just remove it to save some cycles.Quoted 7 lines
lib/utils/serial/renesas_scif.c line 55
Quoted 1 line
lib/utils/serial/renesas_scif.c new file +1
-0+ (reg == SCIF_REG_SEMR))The name of this macro is not meaningful. It looks like it's the size of a register at the first glance but it's actually returning logical true or false.
Better rename it to something likeSCIF_REG_8BIT(reg).Good point, I'll rename it.
Quoted 31 lines
Quoted 18 lines
lib/utils/serial/renesas_scif.c new file +18
-0+ +#define SCBRR_VALUE (clk, baudrate) ((clk) / (32 * (baudrate)) - 1) + +/* clang-format on */ + +static volatile char *scif_base; + +static u32 get_reg (u32 offset) +{ +if (SCIF_SIZE (offset)) +return readb (scif_base + offset); + +return readw (scif_base + offset); +} + +static void set_reg (u32 offset,u32 val) +{ +if (SCIF_SIZE (offset))lib/utils/serial/renesas_scif.c line 83
Quoted 10 lines
lib/utils/serial/renesas_scif.c new file +10
-0+return writeb (val, scif_base + offset); + +return writew (val, scif_base + offset); +} + +static void scif_wait (unsigned long baudrate) +{ +unsigned long utime; + + utime =1000000 / baudrate +1 ;What is this?
Quoted 7 lines
Quoted 2 lines
It's the delay required when using the external clock. But as we arent using it on RZ/Five SMARC we can get rid of it for now.
Could we make such logic be based on DTS settings, instead of hardcoding?
This driver should be able to support both internal and external clocks, right?
Agreed it can be checked by DTS. For now I will drop this until I have the HW to test this with EXT clock.
Quoted 20 lines
Quoted 20 lines
Quoted 20 lines
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +5
-0+ +sbi_timer_udelay (utime); +} + +static void renesas_scif_putc (char ch)lib/utils/serial/renesas_scif.c line 98
Quoted 10 lines
lib/utils/serial/renesas_scif.c new file +10
-0+{ +uint16_t reg; + +while (!(SCIF_FSR_TXD_CHK &get_reg (SCIF_REG_FSR ))) + ; + +set_reg (SCIF_REG_FTDR , ch); + reg =get_reg (SCIF_REG_FSR ); + reg &= ~SCIF_FSR_TXD_CHK ; +set_reg (SCIF_REG_FSR , reg);The FSR Tx status bits clear should happen before writing a new char to the Tx fifo, no?
Quoted 8 lines
Quoted 1 line
No, this has to be cleared only after char write.
Based on my read of the user manual, after the while () check, we can clear the status bits. After you write a new char to the FIFO, the status bits might be triggered by the new char write, instead of the previous one. Hence clearing status bits after writing char will cause the status bits check next time fail.
From the HW manual..
[Clearing conditions]
? TDFE is cleared to 0 when 0 is written in the TDFE bit after reading TDFE = 1. ? When transmit data is written to the FTDR register
^^ hence its cleared after the write here.
In Linux and u-boot too we follow the same approach with the existing SCI/F driver.
Cheers,
Prabhakar
PATCH v2 1/7 lib: utils: serial: Add Renesas SCIF driver
Hi Prabhakar,
Quoted 300 lines · Prabhakar
Hi Bin,
Quoted 21 lines · Bin Meng
Hi Prabhakar,
Quoted 16 lines · Prabhakar
Hi Bin,
Thank you for the review.
Quoted 10 lines · Bin Meng
Quoted 7 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
Add Renesas SCIF driver.
Based on a patch in the BSP by Takeki Hamada
<[email protected]>Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
If there is a public URL for the BSP you mentioned, better put that in the commit here for future reference.
you mean link for the BSP/File/Commit. Ive followed the same approach that we follow on Linux.
Do you have any link for the BSP files, ie: on Renesas website?
We have a meta layer link [1] on the website but we got github links to the files/commit-id too if this is needed.
Quoted 224 lines
Quoted 224 lines
Quoted 77 lines
Quoted 77 lines
Signed-off-by Lad Prabhakar <[email protected]>---
RFC->v2
* Fixed comments pointed by Xiang W--- include/sbi_utils/serial/renesas-scif.h | 11 ++ lib/utils/serial/Kconfig | 4 + lib/utils/serial/objects.mk | 1 + lib/utils/serial/renesas_scif.c | 139 ++++++++++++++++++++++++ 4 files changed, 155 insertions(+) create mode 100644 include/sbi_utils/serial/renesas-scif.h create mode 100644 lib/utils/serial/renesas_scif.cinclude/sbi_utils/serial/renesas-scif.h new file +11
-0@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* +* Copyright (C) 2022 Renesas Electronics Corporation +*/ + +#ifndef __SERIAL_RENESAS_SCIF_H__ +#define __SERIAL_RENESAS_SCIF_H__ + +int renesas_scif_init (unsigned long base,u32 in_freq,u32 baudrate); + +#endif /* __SERIAL_RENESAS_SCIF_H__ */ lib/utils/serial/Kconfig +4
-0@@ -59,6 +59,10 @@ config SERIAL_GAISLER bool "Gaisler UART support" default n +config SERIAL_RENESAS_SCIF + bool "Renesas SCIF support" + default n + config SERIAL_SHAKTI bool "Shakti UART support" default nlib/utils/serial/objects.mk +1
-0@@ -36,6 +36,7 @@ libsbiutils-objs-$(CONFIG_FDT_SERIAL_XILINX_UARTLITE) += serial/fdt_serial_xlnx_ libsbiutils-objs-$(CONFIG_SERIAL_CADENCE) += serial/cadence-uart.o libsbiutils-objs-$(CONFIG_SERIAL_GAISLER) += serial/gaisler-uart.o +libsbiutils-objs-$(CONFIG_SERIAL_RENESAS_SCIF) += serial/renesas_scif.o libsbiutils-objs-$(CONFIG_SERIAL_SHAKTI) += serial/shakti-uart.o libsbiutils-objs-$(CONFIG_SERIAL_SIFIVE) += serial/sifive-uart.o libsbiutils-objs-$(CONFIG_SERIAL_LITEX) += serial/litex-uart.olib/utils/serial/renesas_scif.c new file +12
-0@@ -0,0 +1,139 @@ +// SPDX-License-Identifier: BSD-2-Clause +/* +* Copyright (C) 2022 Renesas Electronics Corporation +*/ + +#include <sbi/riscv_io.h> +#include <sbi/sbi_console.h> +#include <sbi/sbi_timer.h> +#include <sbi_utils/serial/renesas-scif.h> + +/* clang-format off */ +Quoted 9 lines
lib/utils/serial/renesas_scif.c line 18
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_REG_SMR 0x0 +#define SCIF_REG_BRR 0x2 +#define SCIF_REG_SCR 0x4 +#define SCIF_REG_FTDR 0x6 +#define SCIF_REG_FSR 0x8 +#define SCIF_REG_FRDR 0xaThis register is not used by the driver. Drop it.
OK, I will drop it.
Quoted 10 lines
lib/utils/serial/renesas_scif.c line 24
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_REG_FCR 0xc +#define SCIF_REG_LSR 0x12 +#define SCIF_REG_SEMR 0x14 + +#define SCIF_RFRST 0x2/* Reset assert receive-FIFO (bit[1]) */ +#define SCIF_TFRST 0x4/* Reset assert transmit-FIFO(bit[2]) */ The above 2 macros should probably be named as SCIF_FCR_* as they only apply to the FCR register.
Agreed.
Quoted 7 lines
lib/utils/serial/renesas_scif.c line 26
Quoted 2 lines
lib/utils/serial/renesas_scif.c new file +2
-0+ +#define SCIF_FCR_RST_ASSRT_TFRF (SCIF_RFRST | SCIF_TFRST)/* Reset assert tx-FIFO & rx-FIFO */ The macro name should probably be named to have RF come before TF, like
SCIF_FCR_RST_ASSRT_RFTF, to keep in consistency with the rest, and the codes.Agreed.
Quoted 9 lines
#define
SCIF_FCR_RST_ASSRT_RFTF(SCIF_RFRST|SCIF_TFRST) /*
Reset assert rx-FIFO & tx-FIFO */lib/utils/serial/renesas_scif.c line 27
Quoted 1 line
lib/utils/serial/renesas_scif.c new file +1
-0+#define SCIF_FCR_RST_NGATE_TFRF 0x0/* Reset negate tx-FIFO & rx-FIFO*/ ditto
need a space before */
OK, I will fix it.
Quoted 7 lines
lib/utils/serial/renesas_scif.c line 30
Quoted 3 lines
lib/utils/serial/renesas_scif.c new file +3
-0+ +#define SCIF_RE 0x10/* Enable receive (bit[4]) */ +#define SCIF_TE 0x20/* Enable transmit(bit[5]) */ The above 2 macros should probably be named as SCIF_SCR_* as they only apply to the SCR register.
Agreed.
Quoted 11 lines
nits: only need one space fore */
lib/utils/serial/renesas_scif.c line 36
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_SCR_RCV_TRN_EN (SCIF_RE | SCIF_TE)/* Enable receive & transmit */ +#define SCIF_SCR_RCV_TRN_DIS 0x0/* Disable receive & transmit */ + +#define SCIF_FSR_ER 0x80/* Receive error flag */ +#define SCIF_FSR_TEND 0x40/* Detect break flag */ +#define SCIF_FSR_TDFE 0x20/* Detect break flag */ The comments of the above 2 bit fields are wrong
Ouch will fix that.
Quoted 5 lines
lib/utils/serial/renesas_scif.c line 38
Quoted 2 lines
lib/utils/serial/renesas_scif.c new file +2
-0+#define SCIF_FSR_BRK 0x10/* Detect break flag */ +#define SCIF_FSR_RDF 0x2/* Receive FIFO data full flag */ This bit field seems not to be used anywhere. Drop it?
Sure, I will drop it.
Quoted 9 lines
lib/utils/serial/renesas_scif.c line 44
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +6
-0+#define SCIF_FSR_DR 0x1/* Receive data ready flag */ + +#define SCIF_FSR_RXD_CHK (SCIF_FSR_ER | SCIF_FSR_BRK | SCIF_FSR_DR) +#define SCIF_FSR_TXD_CHK (SCIF_FSR_TEND | SCIF_FSR_TDFE) + +#define SCIF_LSR_ORER 0x1/* Overrun error flag */ This macro is not used anywhere. Drop it.
ditto.
Quoted 6 lines
lib/utils/serial/renesas_scif.c line 47
Quoted 3 lines
lib/utils/serial/renesas_scif.c new file +3
-0+ +#define SCIF_SPTR_SPB2DT 0x1/* if SCR.TE setting, don't care */ +#define SCIF_SPTR_SPB2IO 0x2/* if SCR.TE setting, don't care */ The above 2 macros are not used anywhere. Drop them.
ditto.
Quoted 5 lines
lib/utils/serial/renesas_scif.c line 49
Quoted 2 lines
lib/utils/serial/renesas_scif.c new file +2
-0+ +#define SCIF_SEMR_BRME 0x20/* bit-rate modulation enable */ This macro is not used anywhere. Drop it.
ditto.
Quoted 9 lines
lib/utils/serial/renesas_scif.c line 54
Quoted 5 lines
lib/utils/serial/renesas_scif.c new file +5
-0+#define SCIF_SEMR_MDDRS 0x10/* MDDR access enable */ + +#define SCIF_SIZE (reg) ((reg == SCIF_REG_BRR) || \ + (reg == SCIF_REG_FTDR) || \ + (reg == SCIF_REG_FRDR) || \I don't see the driver programs
SCIF_REG_FRDRregister. We can just remove it to save some cycles.Quoted 7 lines
lib/utils/serial/renesas_scif.c line 55
Quoted 1 line
lib/utils/serial/renesas_scif.c new file +1
-0+ (reg == SCIF_REG_SEMR))The name of this macro is not meaningful. It looks like it's the size of a register at the first glance but it's actually returning logical true or false.
Better rename it to something likeSCIF_REG_8BIT(reg).Good point, I'll rename it.
Quoted 31 lines
Quoted 18 lines
lib/utils/serial/renesas_scif.c new file +18
-0+ +#define SCBRR_VALUE (clk, baudrate) ((clk) / (32 * (baudrate)) - 1) + +/* clang-format on */ + +static volatile char *scif_base; + +static u32 get_reg (u32 offset) +{ +if (SCIF_SIZE (offset)) +return readb (scif_base + offset); + +return readw (scif_base + offset); +} + +static void set_reg (u32 offset,u32 val) +{ +if (SCIF_SIZE (offset))lib/utils/serial/renesas_scif.c line 83
Quoted 10 lines
lib/utils/serial/renesas_scif.c new file +10
-0+return writeb (val, scif_base + offset); + +return writew (val, scif_base + offset); +} + +static void scif_wait (unsigned long baudrate) +{ +unsigned long utime; + + utime =1000000 / baudrate +1 ;What is this?
Quoted 7 lines
Quoted 2 lines
It's the delay required when using the external clock. But as we arent using it on RZ/Five SMARC we can get rid of it for now.
Could we make such logic be based on DTS settings, instead of hardcoding?
This driver should be able to support both internal and external clocks, right?
Agreed it can be checked by DTS. For now I will drop this until I have the HW to test this with EXT clock.
Quoted 20 lines
Quoted 20 lines
Quoted 20 lines
Quoted 6 lines
lib/utils/serial/renesas_scif.c new file +5
-0+ +sbi_timer_udelay (utime); +} + +static void renesas_scif_putc (char ch)lib/utils/serial/renesas_scif.c line 98
Quoted 10 lines
lib/utils/serial/renesas_scif.c new file +10
-0+{ +uint16_t reg; + +while (!(SCIF_FSR_TXD_CHK &get_reg (SCIF_REG_FSR ))) + ; + +set_reg (SCIF_REG_FTDR , ch); + reg =get_reg (SCIF_REG_FSR ); + reg &= ~SCIF_FSR_TXD_CHK ; +set_reg (SCIF_REG_FSR , reg);The FSR Tx status bits clear should happen before writing a new char to the Tx fifo, no?
Quoted 8 lines
Quoted 1 line
No, this has to be cleared only after char write.
Based on my read of the user manual, after the while () check, we can clear the status bits. After you write a new char to the FIFO, the status bits might be triggered by the new char write, instead of the previous one. Hence clearing status bits after writing char will cause the status bits check next time fail.
Quoted 5 lines
From the HW manual..
[Clearing conditions]
? TDFE is cleared to 0 when 0 is written in the TDFE bit after reading TDFE = 1. ? When transmit data is written to the FTDR register
^^ hence its cleared after the write here.
These 2 conditions are OR, not AND, right?
So when the while loop breaks, it satisfies the first condition, and we can clear the TDFE bit by writing zero to FSR.
But if you write the tx data to the FTDR register, after you do
set_reg(SCIF_REG_FTDR, ch);
There is a possibility that the TDFE bit is generated before before you do
reg = get_reg(SCIF_REG_FSR);
reg &= ~SCIF_FSR_TXD_CHK;set_reg(SCIF_REG_FSR, reg);
then the TDFE bit gets cleared unexpectedly.
Next time when you want to write another char to the serial port the while loop will never break.
Quoted 3 lines
In Linux and u-boot too we follow the same approach with the existing SCI/F driver.
Regards,
Bin
Lad
PATCH v2 1/7 lib: utils: serial: Add Renesas SCIF driver
Hi Bin,
Quoted 16 lines · Bin Meng
Hi Prabhakar,
Quoted 11 lines · Prabhakar
Hi Bin,
Quoted 7 lines · Bin Meng
Hi Prabhakar,
Quoted 2 lines · Prabhakar
Hi Bin,
<snip>
Quoted 40 lines
Quoted 23 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
lib/utils/serial/renesas_scif.c line 98
Quoted 11 lines
lib/utils/serial/renesas_scif.c new file +11
-0+static void renesas_scif_putc (char ch) +{ +uint16_t reg; + +while (!(SCIF_FSR_TXD_CHK &get_reg (SCIF_REG_FSR ))) + ; + +set_reg (SCIF_REG_FTDR , ch); + reg =get_reg (SCIF_REG_FSR ); + reg &= ~SCIF_FSR_TXD_CHK ; +set_reg (SCIF_REG_FSR , reg);The FSR Tx status bits clear should happen before writing a new char to the Tx fifo, no?
Quoted 8 lines
Quoted 1 line
No, this has to be cleared only after char write.
Based on my read of the user manual, after the while () check, we can clear the status bits. After you write a new char to the FIFO, the status bits might be triggered by the new char write, instead of the previous one. Hence clearing status bits after writing char will cause the status bits check next time fail.
Quoted 5 lines
From the HW manual..
[Clearing conditions]
? TDFE is cleared to 0 when 0 is written in the TDFE bit after reading TDFE = 1. ? When transmit data is written to the FTDR register
^^ hence its cleared after the write here.These 2 conditions are OR, not AND, right?
So when the while loop breaks, it satisfies the first condition, and we can clear the TDFE bit by writing zero to FSR.
But if you write the tx data to the FTDR register, after you do
set_reg(SCIF_REG_FTDR, ch);There is a possibility that the TDFE bit is generated before before you do
Quoted 9 lines
reg =
get_reg(SCIF_REG_FSR);
reg &= ~SCIF_FSR_TXD_CHK;set_reg(SCIF_REG_FSR, reg);then the TDFE bit gets cleared unexpectedly.
Next time when you want to write another char to the serial port the while loop will never break.
I altered the code sequence as per your suggestion and haven't seen any issue with some limited testing.
Here are references [0]/[1] for why the sequence should be as in the current patch. Looking at [1] I'm not seeing the issue mentioned there if I re-order the code sequence.
(I am awaiting a response from the HW team yet.)
As the current code sequence has been there in Linux/u-boot ([2]/[3] and our flashwriter code too) for many years and haven't seen an issue of infinite looping I would like to stick with the current code sequence. And if in future if we see any issue we can provide a patch to fix this.
I hope this is OK with you.
[0] https://pasteboard.co/fXHV51yQD8zU.png
[1] https://patchwork.kernel.org/project/linux-sh/patch/4.2.0.58.J.20090601123439.00b52740 at router.itonet.co.jp/#63581
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/tty/serial/sh-sci.c?h=v6.1-rc7#n698
[3] https://source.denx.de/u-boot/u-boot/-/blob/master/drivers/serial/serial_sh.c#L83
Cheers,
Prabhakar
PATCH v2 2/7 lib: utils: serial: Add FDT driver for Renesas SCIF
In reply to PrabhakarFrom: Lad Prabhakar <[email protected]>
Add FDT driver for Renesas SCIF.
dts example:
soc: soc {
....
scif0: serial at 1004b800 {
compatible = "renesas,scif-r9a07g043",
"renesas,scif-r9a07g044";
reg = <0 0x1004b800 0 0x400>;
interrupts = <412 IRQ_TYPE_LEVEL_HIGH>,
<414 IRQ_TYPE_LEVEL_HIGH>,
<415 IRQ_TYPE_LEVEL_HIGH>,
<413 IRQ_TYPE_LEVEL_HIGH>,
<416 IRQ_TYPE_LEVEL_HIGH>,
<416 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "eri", "rxi", "txi",
"bri", "dri", "tei";
clocks = <&cpg CPG_MOD R9A07G043_SCIF0_CLK_PCK>;
clock-names = "fck";
power-domains = <&cpg>;
resets = <&cpg R9A07G043_SCIF0_RST_SYSTEM_N>;
status = "disabled";
};
....
};---RFC->v2
* Dropped DEFAULT_RENESAS_SCIF_REG_SHIFT and
DEFAULT_RENESAS_SCIF_REG_IO_WIDTH macros.
DT binding [0].
--- include/sbi_utils/fdt/fdt_helper.h | 3 +++ lib/utils/fdt/fdt_helper.c | 11 ++++++++ lib/utils/serial/Kconfig | 5 ++++ lib/utils/serial/fdt_serial_renesas_scif.c | 31 ++++++++++++++++++++++ lib/utils/serial/objects.mk | 3 +++ 5 files changed, 53 insertions(+) create mode 100644 lib/utils/serial/fdt_serial_renesas_scif.c
include/sbi_utils/fdt/fdt_helper.h +3 -0
@@ -59,6 +59,9 @@ int fdt_parse_timebase_frequency(void *fdt, unsigned long *freq);int fdt_parse_gaisler_uart_node (void *fdt,int nodeoffset,struct platform_uart_data *uart); +int fdt_parse_renesas_scif_node (void *fdt,int nodeoffset, +struct platform_uart_data *uart); +int fdt_parse_shakti_uart_node (void *fdt,int nodeoffset,struct platform_uart_data *uart);
lib/utils/fdt/fdt_helper.c +11 -0
@@ -23,6 +23,9 @@#define DEFAULT_UART_REG_IO_WIDTH 1#define DEFAULT_UART_REG_OFFSET 0 +#define DEFAULT_RENESAS_SCIF_FREQ 100000000 +#define DEFAULT_RENESAS_SCIF_BAUD 115200 +#define DEFAULT_SIFIVE_UART_FREQ 0#define DEFAULT_SIFIVE_UART_BAUD 115200#define DEFAULT_SIFIVE_UART_REG_SHIFT 0
@@ -370,6 +373,14 @@ int fdt_parse_gaisler_uart_node(void *fdt, int nodeoffset,return 0 ; } +int fdt_parse_renesas_scif_node (void *fdt,int nodeoffset, +struct platform_uart_data *uart) +{ +return fdt_parse_uart_node_common (fdt, nodeoffset, uart, +DEFAULT_RENESAS_SCIF_FREQ , +DEFAULT_RENESAS_SCIF_BAUD ); +} +int fdt_parse_shakti_uart_node (void *fdt,int nodeoffset,struct platform_uart_data *uart) {
lib/utils/serial/Kconfig +5 -0
@@ -24,6 +24,11 @@ config FDT_SERIAL_HTIF select SYS_HTIF default n +config FDT_SERIAL_RENESAS_SCIF + bool "Renesas SCIF FDT driver" + select SERIAL_RENESAS_SCIF + default n + config FDT_SERIAL_SHAKTI bool "Shakti UART FDT driver" select SERIAL_SHAKTI
lib/utils/serial/fdt_serial_renesas_scif.c new file +31 -0
@@ -0,0 +1,31 @@ +// SPDX-License-Identifier: BSD-2-Clause +/* +* Copyright (C) 2022 Renesas Electronics Corporation +*/ + +#include <sbi_utils/fdt/fdt_helper.h> +#include <sbi_utils/serial/fdt_serial.h> +#include <sbi_utils/serial/renesas-scif.h> + +static int serial_renesas_scif_init (void *fdt,int nodeoff, +const struct fdt_match *match) +{ +struct platform_uart_data uart = {0 }; +int ret; + + ret =fdt_parse_renesas_scif_node (fdt, nodeoff, &uart); +if (ret) +return ret; + +return renesas_scif_init (uart.addr, uart.freq, uart.baud); +} + +static const struct fdt_match serial_renesas_scif_match[] = { + { .compatible ="renesas,scif-r9a07g043" }, + {/* sentinel */ } +}; + +struct fdt_serial fdt_serial_renesas_scif = { + .match_table = serial_renesas_scif_match, + .init = serial_renesas_scif_init +};
lib/utils/serial/objects.mk +3 -0
@@ -19,6 +19,9 @@ libsbiutils-objs-$(CONFIG_FDT_SERIAL_GAISLER) += serial/fdt_serial_gaisler.o carray-fdt_serial_drivers-$(CONFIG_FDT_SERIAL_HTIF) += fdt_serial_htif libsbiutils-objs-$(CONFIG_FDT_SERIAL_HTIF) += serial/fdt_serial_htif.o +carray-fdt_serial_drivers-$(CONFIG_FDT_SERIAL_RENESAS_SCIF) += fdt_serial_renesas_scif +libsbiutils-objs-$(CONFIG_FDT_SERIAL_RENESAS_SCIF) += serial/fdt_serial_renesas_scif.o + carray-fdt_serial_drivers-$(CONFIG_FDT_SERIAL_SHAKTI) += fdt_serial_shakti libsbiutils-objs-$(CONFIG_FDT_SERIAL_SHAKTI) += serial/fdt_serial_shakti.o
Signature · 1 line
2.17.1
PATCH v2 3/7 platform: andes/ae350: Split platform.h header file
In reply to PrabhakarFrom: Lad Prabhakar <[email protected]>
Split up the platform.h header file into
- platform.h #Contains platform specific macros
- common-platform.h #contains macros common across Andes platforms
This is in preparation for adding the Renesas RZ/Five SoC which is based on Andes AX45MP core.
---RFC->v2
* Updated patch subject
* Included RB tag from Yu Chien Peter Lin
--- platform/andes/ae350/common-platform.h | 94 ++++++++++++++++++++++++++ platform/andes/ae350/platform.h | 82 +--------------------- 2 files changed, 96 insertions(+), 80 deletions(-) create mode 100644 platform/andes/ae350/common-platform.h
platform/andes/ae350/common-platform.h new file +94 -0
@@ -0,0 +1,94 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* +* Copyright (c) 2019 Andes Technology Corporation +* +* Authors: +* Zong Li <[email protected]> +* Nylon Chen <[email protected]> +*/ + +#ifndef _AE350_COMMON_PLATFORM_H_ +#define _AE350_COMMON_PLATFORM_H_ + +/* Memory and Miscellaneous Registers */ +#define CSR_MILMB 0x7c0 +#define CSR_MDLMB 0x7c1 +#define CSR_MECC_CDOE 0x7c2 +#define CSR_MNVEC 0x7c3 +#define CSR_MPFTCTL 0x7c5 +#define CSR_MCACHECTL 0x7ca +#define CSR_MCCTLBEGINADDR 0x7cb +#define CSR_MCCTLCOMMAND 0x7cc +#define CSR_MCCTLDATA 0x7cc +#define CSR_SCCTLDATA 0x9cd +#define CSR_UCCTLBEGINADDR 0x80c +#define CSR_MMISCCTL 0x7d0 + +/* nds v5 mmisc_ctl register*/ +#define V5_MMISC_CTL_VEC_PLIC_OFFSET 1 +#define V5_MMISC_CTL_RVCOMPM_OFFSET 2 +#define V5_MMISC_CTL_BRPE_OFFSET 3 +#define V5_MMISC_CTL_MSA_OR_UNA_OFFSET 6 +#define V5_MMISC_CTL_NON_BLOCKING_OFFSET 8 +#define V5_MCACHE_CTL_L1I_PREFETCH_OFFSET 9 +#define V5_MCACHE_CTL_L1D_PREFETCH_OFFSET 10 +#define V5_MCACHE_CTL_DC_WAROUND_OFFSET_1 13 +#define V5_MCACHE_CTL_DC_WAROUND_OFFSET_2 14 + +#define V5_MMISC_CTL_VEC_PLIC_EN (1UL << V5_MMISC_CTL_VEC_PLIC_OFFSET) +#define V5_MMISC_CTL_RVCOMPM_EN (1UL << V5_MMISC_CTL_RVCOMPM_OFFSET) +#define V5_MMISC_CTL_BRPE_EN (1UL << V5_MMISC_CTL_BRPE_OFFSET) +#define V5_MMISC_CTL_MSA_OR_UNA_EN (1UL << V5_MMISC_CTL_MSA_OR_UNA_OFFSET) +#define V5_MMISC_CTL_NON_BLOCKING_EN (1UL << V5_MMISC_CTL_NON_BLOCKING_OFFSET) +#define V5_MCACHE_CTL_L1I_PREFETCH_EN (1UL << V5_MCACHE_CTL_L1I_PREFETCH_OFFSET) +#define V5_MCACHE_CTL_L1D_PREFETCH_EN (1UL << V5_MCACHE_CTL_L1D_PREFETCH_OFFSET) +#define V5_MCACHE_CTL_DC_WAROUND_1_EN (1UL << V5_MCACHE_CTL_DC_WAROUND_OFFSET_1) +#define V5_MCACHE_CTL_DC_WAROUND_2_EN (1UL << V5_MCACHE_CTL_DC_WAROUND_OFFSET_2) + +#define V5_MMISC_CTL_MASK (V5_MMISC_CTL_VEC_PLIC_EN | V5_MMISC_CTL_RVCOMPM_EN | \ + V5_MMISC_CTL_BRPE_EN | V5_MMISC_CTL_MSA_OR_UNA_EN | \ + V5_MMISC_CTL_NON_BLOCKING_EN) + +/* nds mcache_ctl register */ +#define V5_MCACHE_CTL_IC_EN_OFFSET 0 +#define V5_MCACHE_CTL_DC_EN_OFFSET 1 +#define V5_MCACHE_CTL_IC_ECCEN_OFFSET 2 +#define V5_MCACHE_CTL_DC_ECCEN_OFFSET 4 +#define V5_MCACHE_CTL_IC_RWECC_OFFSET 6 +#define V5_MCACHE_CTL_DC_RWECC_OFFSET 7 +#define V5_MCACHE_CTL_CCTL_SUEN_OFFSET 8 + +/* nds cctl command */ +#define V5_UCCTL_L1D_WBINVAL_ALL 6 +#define V5_UCCTL_L1D_WB_ALL 7 + +#define V5_MCACHE_CTL_IC_EN (1UL << V5_MCACHE_CTL_IC_EN_OFFSET) +#define V5_MCACHE_CTL_DC_EN (1UL << V5_MCACHE_CTL_DC_EN_OFFSET) +#define V5_MCACHE_CTL_IC_RWECC (1UL << V5_MCACHE_CTL_IC_RWECC_OFFSET) +#define V5_MCACHE_CTL_DC_RWECC (1UL << V5_MCACHE_CTL_DC_RWECC_OFFSET) +#define V5_MCACHE_CTL_CCTL_SUEN (1UL << V5_MCACHE_CTL_CCTL_SUEN_OFFSET) + +#define V5_MCACHE_CTL_MASK (V5_MCACHE_CTL_IC_EN | V5_MCACHE_CTL_DC_EN | \ + V5_MCACHE_CTL_IC_RWECC | V5_MCACHE_CTL_DC_RWECC | \ + V5_MCACHE_CTL_CCTL_SUEN | V5_MCACHE_CTL_L1I_PREFETCH_EN | \ + V5_MCACHE_CTL_L1D_PREFETCH_EN | V5_MCACHE_CTL_DC_WAROUND_1_EN | \ + V5_MCACHE_CTL_DC_WAROUND_2_EN) + +#define V5_L2C_CTL_OFFSET 0x8 +#define V5_L2C_CTL_ENABLE_OFFSET 0 +#define V5_L2C_CTL_IPFDPT_OFFSET 3 +#define V5_L2C_CTL_DPFDPT_OFFSET 5 +#define V5_L2C_CTL_TRAMOCTL_OFFSET 8 +#define V5_L2C_CTL_TRAMICTL_OFFSET 10 +#define V5_L2C_CTL_DRAMOCTL_OFFSET 11 +#define V5_L2C_CTL_DRAMICTL_OFFSET 13 + +#define V5_L2C_CTL_ENABLE_MASK (1UL << V5_L2C_CTL_ENABLE_OFFSET) +#define V5_L2C_CTL_IPFDPT_MASK (3UL << V5_L2C_CTL_IPFDPT_OFFSET) +#define V5_L2C_CTL_DPFDPT_MASK (3UL << V5_L2C_CTL_DPFDPT_OFFSET) +#define V5_L2C_CTL_TRAMOCTL_MASK (3UL << V5_L2C_CTL_TRAMOCTL_OFFSET) +#define V5_L2C_CTL_TRAMICTL_MASK (1UL << V5_L2C_CTL_TRAMICTL_OFFSET) +#define V5_L2C_CTL_DRAMOCTL_MASK (3UL << V5_L2C_CTL_DRAMOCTL_OFFSET) +#define V5_L2C_CTL_DRAMICTL_MASK (1UL << V5_L2C_CTL_DRAMICTL_OFFSET) + +#endif /* _AE350_COMMON_PLATFORM_H_ */
platform/andes/ae350/platform.h +2 -80
93 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 4/7 lib: utils/irqchip: Add compatible string for Andestech NCEPLIC100
In reply to PrabhakarFrom: Lad Prabhakar <[email protected]>
Add compatible string for Andestech NCEPLIC100 found on Renesas RZ/Five SoC which is equipped with AX45MP AndesCore.
While at it drop the comma after the sentinel as it does not make sense to have a comma after a sentinel, as any new elements must be added before the sentinel.
dts example (Single-core AX45MP):
soc: soc {
....
plic: interrupt-controller at 12c00000 {
compatible = "renesas,r9a07g043-plic", "andestech,nceplic100";
#interrupt-cells = <2>;
#address-cells = <0>;
riscv,ndev = <511>;
interrupt-controller;
reg = <0x0 0x12c00000 0 0x400000>;
clocks = <&cpg CPG_MOD R9A07G043_NCEPLIC_ACLK>;
power-domains = <&cpg>;
resets = <&cpg R9A07G043_NCEPLIC_ARESETN>;
interrupts-extended = <&cpu0_intc 11 &cpu0_intc 9>;
};
....
};---RFC->v2
* No change
--- lib/utils/irqchip/fdt_irqchip_plic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/utils/irqchip/fdt_irqchip_plic.c +2 -1
@@ -163,7 +163,8 @@ static const struct fdt_match irqchip_plic_match[] = { { .compatible = "sifive,plic-1.0.0" }, { .compatible = "thead,c900-plic", .data = thead_plic_plat_init }, - { }, + { .compatible = "andestech,nceplic100" }, + {/* sentinel */ } };struct fdt_irqchip fdt_irqchip_plic = {
Signature · 1 line
2.17.1
PATCH v2 4/7 lib: utils/irqchip: Add compatible string for Andestech NCEPLIC100
Quoted 29 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
Add compatible string for Andestech NCEPLIC100 found on Renesas RZ/Five SoC which is equipped with AX45MP AndesCore.
While at it drop the comma after the sentinel as it does not make sense to have a comma after a sentinel, as any new elements must be added before the sentinel.
dts example (Single-core AX45MP):
soc: soc { .... plic: interrupt-controller at 12c00000 { compatible = "renesas,r9a07g043-plic", "andestech,nceplic100"; #interrupt-cells = <2>; #address-cells = <0>; riscv,ndev = <511>; interrupt-controller; reg = <0x0 0x12c00000 0 0x400000>; clocks = <&cpg CPG_MOD R9A07G043_NCEPLIC_ACLK>; power-domains = <&cpg>; resets = <&cpg R9A07G043_NCEPLIC_ARESETN>; interrupts-extended = <&cpu0_intc 11 &cpu0_intc 9>; }; .... };
Quoted 1 line
Signed-off-by Lad Prabhakar <[email protected]>
Looks good to me.
Regards,
Anup
Quoted 27 lines
---
RFC->v2
* No change--- lib/utils/irqchip/fdt_irqchip_plic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)lib/utils/irqchip/fdt_irqchip_plic.c +2
-2@@ -163,7 +163,8 @@ static const struct fdt_match irqchip_plic_match[] = { { .compatible = "sifive,plic-1.0.0" }, { .compatible = "thead,c900-plic", .data = thead_plic_plat_init }, - { }, + { .compatible = "andestech,nceplic100" }, + {/* sentinel */ } };struct fdt_irqchip fdt_irqchip_plic = { --2.17.1
PATCH v2 4/7 lib: utils/irqchip: Add compatible string for Andestech NCEPLIC100
In reply to PrabhakarQuoted 34 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
Add compatible string for Andestech NCEPLIC100 found on Renesas RZ/Five SoC which is equipped with AX45MP AndesCore.
While at it drop the comma after the sentinel as it does not make sense to have a comma after a sentinel, as any new elements must be added before the sentinel.
dts example (Single-core AX45MP):
soc: soc { .... plic: interrupt-controller at 12c00000 { compatible = "renesas,r9a07g043-plic", "andestech,nceplic100"; #interrupt-cells = <2>; #address-cells = <0>; riscv,ndev = <511>; interrupt-controller; reg = <0x0 0x12c00000 0 0x400000>; clocks = <&cpg CPG_MOD R9A07G043_NCEPLIC_ACLK>; power-domains = <&cpg>; resets = <&cpg R9A07G043_NCEPLIC_ARESETN>; interrupts-extended = <&cpu0_intc 11 &cpu0_intc 9>; }; .... };Signed-off-by Lad Prabhakar <[email protected]>---
RFC->v2
* No change
Quoted 6 lines
--- lib/utils/irqchip/fdt_irqchip_plic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
PATCH v2 5/7 platform: Add Renesas RZ/Five initial support
In reply to PrabhakarFrom: Lad Prabhakar <[email protected]>
This commit provides basic support for the Renesas RZ/Five (R9A07G043F) SoC.
The RZ/Five microprocessor includes a single RISC-V CPU Core (Andes AX45MP) 1.0 GHz, 16-bit DDR3L/DDR4 interface. Supported interfaces include:
- Gigabit Ethernet 2ch
- CAN interface (CAN-FD) 2ch
- USB 2.0 interface 2ch
- SD interface 2ch
- AD converter 2ch
Useful links:
-------------
[0] https://www.renesas.com/us/en/products/microcontrollers-microprocessors/rz-mpus/rzfive-risc-v-general-purpose-microprocessors-risc-v-cpu-core-andes-ax45mp-single-10-ghz-2ch-gigabit-ethernet
[1] http://www.andestech.com/en/products-solutions/andescore-processors/riscv-ax45mp/
---RFC->v2
* Updated commit description
--- platform/renesas/rzfive/Kconfig | 32 +++++ platform/renesas/rzfive/configs/defconfig | 0 platform/renesas/rzfive/objects.mk | 18 +++ platform/renesas/rzfive/platform.c | 161 ++++++++++++++++++++++ platform/renesas/rzfive/platform.h | 24 ++++ 5 files changed, 235 insertions(+) create mode 100644 platform/renesas/rzfive/Kconfig create mode 100644 platform/renesas/rzfive/configs/defconfig create mode 100644 platform/renesas/rzfive/objects.mk create mode 100644 platform/renesas/rzfive/platform.c create mode 100644 platform/renesas/rzfive/platform.h
platform/renesas/rzfive/Kconfig new file +32 -0
@@ -0,0 +1,32 @@ +# SPDX-License-Identifier: BSD-2-Clause + +config PLATFORM_RENESAS_RZFIVE + bool + select FDT + select FDT_SERIAL + select FDT_SERIAL_RENESAS_SCIF + select FDT_TIMER + select FDT_TIMER_PLMT + select FDT_IRQCHIP + select FDT_IRQCHIP_PLIC + select FDT_IPI + select FDT_IPI_PLICSW + default y + +if PLATFORM_RENESAS_RZFIVE + +config PLATFORM_RENESAS_RZFIVE_NAME + string "Platform default name" + default "Renesas RZ/Five" + +config PLATFORM_RENESAS_RZFIVE_MAJOR_VER + int "Platform major version" + range 0 65535 + default 0 + +config PLATFORM_RENESAS_RZFIVE_MINOR_VER + int "Platform minor version" + range 0 65535 + default 1 + +endif
platform/renesas/rzfive/configs/defconfig new file +0 -0
platform/renesas/rzfive/objects.mk new file +18 -0
@@ -0,0 +1,18 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (C) 2022 Renesas Electronics Corp. +# + +# Compiler flags +platform-cppflags-y = +platform-cflags-y = +platform-asflags-y = +platform-ldflags-y = + +# Objects to build +platform-objs-y += ../../andes/ae350/cache.o platform.o + +# Blobs to build +FW_TEXT_START=0x00000000 +FW_DYNAMIC=y
platform/renesas/rzfive/platform.c new file +161 -0
161 lines not on this page · raw message
platform/renesas/rzfive/platform.h new file +24 -0
@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: BSD-2-Clause +* +* Copyright (C) 2022 Renesas Electronics Corp. +*/ + +#ifndef _RZFIVE_PLATFORM_H_ +#define _RZFIVE_PLATFORM_H_ + +#include "../../andes/ae350/common-platform.h" + +enum sbi_ext_andes_fid { +SBI_EXT_RENESAS_RZFIVE_GET_MCACHE_CTL_STATUS =0 , +SBI_EXT_RENESAS_RZFIVE_GET_MMISC_CTL_STATUS , +SBI_EXT_RENESAS_RZFIVE_SET_MCACHE_CTL , +SBI_EXT_RENESAS_RZFIVE_SET_MMISC_CTL , +SBI_EXT_RENESAS_RZFIVE_ICACHE_OP , +SBI_EXT_RENESAS_RZFIVE_DCACHE_OP , +SBI_EXT_RENESAS_RZFIVE_L1CACHE_I_PREFETCH , +SBI_EXT_RENESAS_RZFIVE_L1CACHE_D_PREFETCH , +SBI_EXT_RENESAS_RZFIVE_NON_BLOCKING_LOAD_STORE , +SBI_EXT_RENESAS_RZFIVE_WRITE_AROUND , +}; + +#endif /* _RZFIVE_PLATFORM_H_ */
Signature · 1 line
2.17.1
PATCH v2 5/7 platform: Add Renesas RZ/Five initial support
Quoted 87 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
This commit provides basic support for the Renesas RZ/Five (R9A07G043F) SoC.
The RZ/Five microprocessor includes a single RISC-V CPU Core (Andes AX45MP) 1.0 GHz, 16-bit DDR3L/DDR4 interface. Supported interfaces include:
- Gigabit Ethernet 2ch
- CAN interface (CAN-FD) 2ch
- USB 2.0 interface 2ch
- SD interface 2ch
- AD converter 2chUseful links:
-------------
[0] https://www.renesas.com/us/en/products/microcontrollers-microprocessors/rz-mpus/rzfive-risc-v-general-purpose-microprocessors-risc-v-cpu-core-andes-ax45mp-single-10-ghz-2ch-gigabit-ethernet
[1] http://www.andestech.com/en/products-solutions/andescore-processors/riscv-ax45mp/Signed-off-by Lad Prabhakar <[email protected]>---
RFC->v2
* Updated commit description--- platform/renesas/rzfive/Kconfig | 32 +++++ platform/renesas/rzfive/configs/defconfig | 0 platform/renesas/rzfive/objects.mk | 18 +++ platform/renesas/rzfive/platform.c | 161 ++++++++++++++++++++++ platform/renesas/rzfive/platform.h | 24 ++++ 5 files changed, 235 insertions(+) create mode 100644 platform/renesas/rzfive/Kconfig create mode 100644 platform/renesas/rzfive/configs/defconfig create mode 100644 platform/renesas/rzfive/objects.mk create mode 100644 platform/renesas/rzfive/platform.c create mode 100644 platform/renesas/rzfive/platform.hplatform/renesas/rzfive/Kconfig new file +32
-0@@ -0,0 +1,32 @@ +# SPDX-License-Identifier: BSD-2-Clause + +config PLATFORM_RENESAS_RZFIVE + bool + select FDT + select FDT_SERIAL + select FDT_SERIAL_RENESAS_SCIF + select FDT_TIMER + select FDT_TIMER_PLMT + select FDT_IRQCHIP + select FDT_IRQCHIP_PLIC + select FDT_IPI + select FDT_IPI_PLICSW + default y + +if PLATFORM_RENESAS_RZFIVE + +config PLATFORM_RENESAS_RZFIVE_NAME + string "Platform default name" + default "Renesas RZ/Five" + +config PLATFORM_RENESAS_RZFIVE_MAJOR_VER + int "Platform major version" + range 0 65535 + default 0 + +config PLATFORM_RENESAS_RZFIVE_MINOR_VER + int "Platform minor version" + range 0 65535 + default 1 + +endifplatform/renesas/rzfive/configs/defconfig new file +0
-0platform/renesas/rzfive/objects.mk new file +4
-0@@ -0,0 +1,18 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (C) 2022 Renesas Electronics Corp.
platform/renesas/rzfive/objects.mk line 14
Quoted 10 lines
platform/renesas/rzfive/objects.mk new file +10
-0+# + +# Compiler flags +platform-cppflags-y = +platform-cflags-y = +platform-asflags-y = +platform-ldflags-y = + +# Objects to build +platform-objs-y += ../../andes/ae350/cache.o platform.o
The fact that you have to compile ae350/cache.c as part of this platform shows we need to improve code re-use.
Further, the platform.c added by this patch is very similar to platform.c of andes/ae350. Both platform.c files are subset of what is already there in generic/platform.c.
I suggest you do the following:
1) Move andes/ae350 as a platform override under generic/platform/andes/ae350
2) Add rzfive as platform override under generic/platform/renesas/rzfive
3) The common Andes cache operations will be a library under generic/platform/andes/ae350 which can be selected by renesas/rzfive
4) The common Andes header can be under generic/include/andes/ae350
5) Enable drivers required by andes/ae350 and renesas/rzfive platform overrides in generic/configs/defconfig
Regards,
Anup
Quoted 204 lines
platform/renesas/rzfive/objects.mk new file +4
-0+ +# Blobs to build +FW_TEXT_START=0x00000000 +FW_DYNAMIC=yplatform/renesas/rzfive/platform.c new file +161
-0@@ -0,0 +1,161 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2022 Renesas Electronics Corp. +* +* Based on platform/andes/ae350/platform.c +* Copyright (c) 2019 Andes Technology Corporation +*/ + +#include <libfdt.h> +#include <sbi/riscv_asm.h> +#include <sbi/riscv_encoding.h> +#include <sbi/sbi_console.h> +#include <sbi/sbi_const.h> +#include <sbi/sbi_hartmask.h> +#include <sbi/sbi_ipi.h> +#include <sbi/sbi_platform.h> +#include <sbi/sbi_trap.h> +#include <sbi_utils/fdt/fdt_domain.h> +#include <sbi_utils/fdt/fdt_fixup.h> +#include <sbi_utils/fdt/fdt_helper.h> +#include <sbi_utils/ipi/fdt_ipi.h> +#include <sbi_utils/irqchip/fdt_irqchip.h> +#include <sbi_utils/serial/fdt_serial.h> +#include <sbi_utils/timer/fdt_timer.h> + +#include "../../andes/ae350/cache.h" + +#include "platform.h" + +struct sbi_platform platform; +unsigned long fw_platform_init (unsigned long arg0,unsigned long arg1, +unsigned long arg2,unsigned long arg3, +unsigned long arg4) +{ +const char *model; +void *fdt = (void *)arg1; +u32 hartid, hart_count =0 ; +int rc, root_offset, cpus_offset, cpu_offset, len; + + root_offset =fdt_path_offset (fdt,"/" ); +if (root_offset <0 ) + goto fail; + + model =fdt_getprop (fdt, root_offset,"model" , &len); +if (model) +sbi_strncpy (platform.name, model,sizeof (platform.name) -1 ); + + cpus_offset =fdt_path_offset (fdt,"/cpus" ); +if (cpus_offset <0 ) + goto fail; + +fdt_for_each_subnode (cpu_offset, fdt, cpus_offset) { + rc =fdt_parse_hart_id (fdt, cpu_offset, &hartid); +if (rc) +continue ; + +if (SBI_HARTMASK_MAX_BITS <= hartid) +continue ; + + hart_count++; + } + + platform.hart_count = hart_count; + +/* Return original FDT pointer */ +return arg1; + +fail: +while (1 ) +wfi (); +} + +/* Platform final initialization. */ +static int rzfive_final_init (bool cold_boot) +{ +void *fdt; + +if (!cold_boot) +return 0 ; + + fdt =fdt_get_address (); +fdt_fixups (fdt); +fdt_domain_fixup (fdt); + +return 0 ; +} + +/* Vendor-Specific SBI handler */ +static int rzfive_vendor_ext_provider (long extid,long funcid, +const struct sbi_trap_regs *regs, +unsigned long *out_value, +struct sbi_trap_info *out_trap) +{ +int ret =0 ; + +switch (funcid) { +case SBI_EXT_RENESAS_RZFIVE_GET_MCACHE_CTL_STATUS : + *out_value =csr_read (CSR_MCACHECTL ); +break ; +case SBI_EXT_RENESAS_RZFIVE_GET_MMISC_CTL_STATUS : + *out_value =csr_read (CSR_MMISCCTL ); +break ; +case SBI_EXT_RENESAS_RZFIVE_SET_MCACHE_CTL : + ret =mcall_set_mcache_ctl (regs->a0); +break ; +case SBI_EXT_RENESAS_RZFIVE_SET_MMISC_CTL : + ret =mcall_set_mmisc_ctl (regs->a0); +break ; +case SBI_EXT_RENESAS_RZFIVE_ICACHE_OP : + ret =mcall_icache_op (regs->a0); +break ; +case SBI_EXT_RENESAS_RZFIVE_DCACHE_OP : + ret =mcall_dcache_op (regs->a0); +break ; +case SBI_EXT_RENESAS_RZFIVE_L1CACHE_I_PREFETCH : + ret =mcall_l1_cache_i_prefetch_op (regs->a0); +break ; +case SBI_EXT_RENESAS_RZFIVE_L1CACHE_D_PREFETCH : + ret =mcall_l1_cache_d_prefetch_op (regs->a0); +break ; +case SBI_EXT_RENESAS_RZFIVE_NON_BLOCKING_LOAD_STORE : + ret =mcall_non_blocking_load_store (regs->a0); +break ; +case SBI_EXT_RENESAS_RZFIVE_WRITE_AROUND : + ret =mcall_write_around (regs->a0); +break ; +default : +sbi_printf ("Unsupported vendor sbi call : %ld\n" , funcid); + asmvolatile ("ebreak" ); + } + +return ret; +} + +static int rzfive_domains_init (void ) +{ +return fdt_domains_populate (fdt_get_address ()); +} + +/* Platform descriptor. */ +static const struct sbi_platform_operations platform_ops = { + .final_init = rzfive_final_init, + .domains_init = rzfive_domains_init, + .console_init = fdt_serial_init, + .irqchip_init = fdt_irqchip_init, + .ipi_init = fdt_ipi_init, + .timer_init = fdt_timer_init, + .vendor_ext_provider = rzfive_vendor_ext_provider +}; + +struct sbi_platform platform = { + .opensbi_version =OPENSBI_VERSION , + .platform_version = +SBI_PLATFORM_VERSION (CONFIG_PLATFORM_RENESAS_RZFIVE_MAJOR_VER , +CONFIG_PLATFORM_RENESAS_RZFIVE_MINOR_VER ), + .name =CONFIG_PLATFORM_RENESAS_RZFIVE_NAME , + .features =SBI_PLATFORM_DEFAULT_FEATURES , + .hart_count =SBI_HARTMASK_MAX_BITS , + .hart_stack_size =SBI_PLATFORM_DEFAULT_HART_STACK_SIZE , + .platform_ops_addr = (unsigned long )&platform_ops +};platform/renesas/rzfive/platform.h new file +24
-1@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: BSD-2-Clause +* +* Copyright (C) 2022 Renesas Electronics Corp. +*/ + +#ifndef _RZFIVE_PLATFORM_H_ +#define _RZFIVE_PLATFORM_H_ + +#include "../../andes/ae350/common-platform.h" + +enum sbi_ext_andes_fid { +SBI_EXT_RENESAS_RZFIVE_GET_MCACHE_CTL_STATUS =0 , +SBI_EXT_RENESAS_RZFIVE_GET_MMISC_CTL_STATUS , +SBI_EXT_RENESAS_RZFIVE_SET_MCACHE_CTL , +SBI_EXT_RENESAS_RZFIVE_SET_MMISC_CTL , +SBI_EXT_RENESAS_RZFIVE_ICACHE_OP , +SBI_EXT_RENESAS_RZFIVE_DCACHE_OP , +SBI_EXT_RENESAS_RZFIVE_L1CACHE_I_PREFETCH , +SBI_EXT_RENESAS_RZFIVE_L1CACHE_D_PREFETCH , +SBI_EXT_RENESAS_RZFIVE_NON_BLOCKING_LOAD_STORE , +SBI_EXT_RENESAS_RZFIVE_WRITE_AROUND , +}; + +#endif /* _RZFIVE_PLATFORM_H_ */ --2.17.1
Lad
PATCH v2 5/7 platform: Add Renesas RZ/Five initial support
Hi Anup,
Thank you for the review.
Quoted 107 lines · Anup Patel
Quoted 87 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
This commit provides basic support for the Renesas RZ/Five (R9A07G043F) SoC.
The RZ/Five microprocessor includes a single RISC-V CPU Core (Andes AX45MP) 1.0 GHz, 16-bit DDR3L/DDR4 interface. Supported interfaces include:
- Gigabit Ethernet 2ch
- CAN interface (CAN-FD) 2ch
- USB 2.0 interface 2ch
- SD interface 2ch
- AD converter 2chUseful links:
-------------
[0] https://www.renesas.com/us/en/products/microcontrollers-microprocessors/rz-mpus/rzfive-risc-v-general-purpose-microprocessors-risc-v-cpu-core-andes-ax45mp-single-10-ghz-2ch-gigabit-ethernet
[1] http://www.andestech.com/en/products-solutions/andescore-processors/riscv-ax45mp/Signed-off-by Lad Prabhakar <[email protected]>---
RFC->v2
* Updated commit description--- platform/renesas/rzfive/Kconfig | 32 +++++ platform/renesas/rzfive/configs/defconfig | 0 platform/renesas/rzfive/objects.mk | 18 +++ platform/renesas/rzfive/platform.c | 161 ++++++++++++++++++++++ platform/renesas/rzfive/platform.h | 24 ++++ 5 files changed, 235 insertions(+) create mode 100644 platform/renesas/rzfive/Kconfig create mode 100644 platform/renesas/rzfive/configs/defconfig create mode 100644 platform/renesas/rzfive/objects.mk create mode 100644 platform/renesas/rzfive/platform.c create mode 100644 platform/renesas/rzfive/platform.hplatform/renesas/rzfive/Kconfig new file +32
-0@@ -0,0 +1,32 @@ +# SPDX-License-Identifier: BSD-2-Clause + +config PLATFORM_RENESAS_RZFIVE + bool + select FDT + select FDT_SERIAL + select FDT_SERIAL_RENESAS_SCIF + select FDT_TIMER + select FDT_TIMER_PLMT + select FDT_IRQCHIP + select FDT_IRQCHIP_PLIC + select FDT_IPI + select FDT_IPI_PLICSW + default y + +if PLATFORM_RENESAS_RZFIVE + +config PLATFORM_RENESAS_RZFIVE_NAME + string "Platform default name" + default "Renesas RZ/Five" + +config PLATFORM_RENESAS_RZFIVE_MAJOR_VER + int "Platform major version" + range 0 65535 + default 0 + +config PLATFORM_RENESAS_RZFIVE_MINOR_VER + int "Platform minor version" + range 0 65535 + default 1 + +endifplatform/renesas/rzfive/configs/defconfig new file +0
-0platform/renesas/rzfive/objects.mk new file +4
-0@@ -0,0 +1,18 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (C) 2022 Renesas Electronics Corp.platform/renesas/rzfive/objects.mk line 14
Quoted 10 lines
platform/renesas/rzfive/objects.mk new file +10
-0+# + +# Compiler flags +platform-cppflags-y = +platform-cflags-y = +platform-asflags-y = +platform-ldflags-y = + +# Objects to build +platform-objs-y += ../../andes/ae350/cache.o platform.oThe fact that you have to compile
ae350/cache.cas part of this platform shows we need to improve code re-use.Further, the
platform.cadded by this patch is very similar toplatform.cof andes/ae350. Bothplatform.cfiles are subset of what is already there ingeneric/platform.c.
Quoted 9 lines
I suggest you do the following:
1) Move andes/ae350 as a platform override under generic/platform/andes/ae350
2) Add rzfive as platform override under generic/platform/renesas/rzfive
3) The common Andes cache operations will be a library under generic/platform/andes/ae350 which can be selected by renesas/rzfive
4) The common Andes header can be under generic/include/andes/ae350
5) Enable drivers required by andes/ae350 and renesas/rzfive platform overrides in generic/configs/defconfig
- The reason for not using generic is because the FW_TEXT_START is different.
- I came across the thread where because the generic FW uses FW_PIC it doesn matter about the FW_TEXT_START, is this correct?
- Moving forward I built rz/five as part of generic override successfully
- But when I try and build the u-boot with fw_dynamic.bin I get the below errors:
- Image 'main-section' is missing external blobs and is
non-functional: opensbi
- Image 'main-section' has faked external blobs and is
non-functional: fw_dynamic.bin
- Ignoring the warning and still flashing the image I dont get any output from opensbi.
Am I missing something here?
Cheers,
Prabhakar
PATCH v2 5/7 platform: Add Renesas RZ/Five initial support
In reply to PrabhakarHi Prabhakar,
Quoted 16 lines
Quoted 7 lines
The fact that you have to compile
ae350/cache.cas part of this platform shows we need to improve code re-use.Further, the
platform.cadded by this patch is very similar toplatform.cof andes/ae350. Bothplatform.cfiles are subset of what is already there ingeneric/platform.c.Quoted 9 lines
I suggest you do the following:
1) Move andes/ae350 as a platform override under generic/platform/andes/ae350
2) Add rzfive as platform override under generic/platform/renesas/rzfive
3) The common Andes cache operations will be a library under generic/platform/andes/ae350 which can be selected by renesas/rzfive
4) The common Andes header can be under generic/include/andes/ae350
5) Enable drivers required by andes/ae350 and renesas/rzfive platform overrides in generic/configs/defconfig
Quoted 3 lines
- The reason for not using generic is because the
FW_TEXT_STARTis different.
- I came across the thread where because the generic FW usesFW_PICit doesn matter about theFW_TEXT_START, is this correct?
We will use generic platform as Anup suggested. I'll send our patch soon. When FW_PIC=y (default), set CONFIG_SPL_OPENSBI_LOAD_ADDR to 0x44000000 in U-boot should be able to run OpenSBI.
Quoted 9 lines
- Moving forward I built rz/five as part of generic override successfully
- But when I try and build the u-boot with fw_dynamic.bin I get the below errors:
- Image 'main-section' is missing external blobs and is
non-functional: opensbi
- Image 'main-section' has faked external blobs and is
non-functional: fw_dynamic.bin
- Ignoring the warning and still flashing the image I dont get any output from opensbi.
The error message looks like the fw_dynamic.bin is not copied to top directory of U-boot, so a dummy one is created.
The load/entry addresses and binary of OpenSBI can be observed by using dtc u-boot.itb.
Quoted 5 lines
Am I missing something here?
Cheers,
Prabhakar
Best regards,
Peter Lin
PATCH v2 5/7 platform: Add Renesas RZ/Five initial support
Quoted 19 lines · Yu-Chien Peter Lin
Hi Prabhakar,
Quoted 16 lines
Quoted 16 lines
The fact that you have to compile
ae350/cache.cas part of this platform shows we need to improve code re-use.Further, the
platform.cadded by this patch is very similar toplatform.cof andes/ae350. Bothplatform.cfiles are subset of what is already there ingeneric/platform.c.I suggest you do the following:
1) Move andes/ae350 as a platform override under generic/platform/andes/ae350
2) Add rzfive as platform override under generic/platform/renesas/rzfive
3) The common Andes cache operations will be a library under generic/platform/andes/ae350 which can be selected by renesas/rzfive
4) The common Andes header can be under generic/include/andes/ae350
5) Enable drivers required by andes/ae350 and renesas/rzfive platform overrides in generic/configs/defconfig
Quoted 7 lines
Quoted 3 lines
- The reason for not using generic is because the
FW_TEXT_STARTis different.
- I came across the thread where because the generic FW usesFW_PICit doesn matter about theFW_TEXT_START, is this correct?We will use generic platform as Anup suggested. I'll send our patch soon. When FW_PIC=y (default), set
CONFIG_SPL_OPENSBI_LOAD_ADDRto0x44000000in U-boot should be able to run OpenSBI.
Thanks for taking this up.
Please keep in mind that OpenSBI v1.2 release will be towards the end of Dec 2022. It will be nice to support both andes/ae350 and RZ/Five in this upcoming release.
Quoted 16 lines
Quoted 10 lines
- Moving forward I built rz/five as part of generic override successfully
- But when I try and build the u-boot with fw_dynamic.bin I get the below errors:
- Image 'main-section' is missing external blobs and is
non-functional: opensbi
- Image 'main-section' has faked external blobs and is
non-functional: fw_dynamic.bin
- Ignoring the warning and still flashing the image I dont get any output from opensbi.The error message looks like the fw_dynamic.bin is not copied to top directory of U-boot, so a dummy one is created.
The load/entry addresses and binary of OpenSBI can be observed by usingdtc u-boot.itb.
Quoted 8 lines
Quoted 5 lines
Am I missing something here?
Cheers,
PrabhakarBest regards,
Peter Lin
Regards,
Anup
PATCH v2 6/7 scripts: Add Renesas RZ/Five to platform list in the binary archive script
In reply to PrabhakarFrom: Lad Prabhakar <[email protected]>
This patch adds Renesas RZ/Five (R9A07G043F) SoC to RV64 platform list in the binary archive script.
---RFC->v2
* No change
--- scripts/create-binary-archive.sh | 1 + 1 file changed, 1 insertion(+)
scripts/create-binary-archive.sh +1 -0
@@ -104,6 +104,7 @@ build_opensbi() { BUILD_PLATFORM_SUBDIR+=("fpga/ariane") BUILD_PLATFORM_SUBDIR+=("fpga/openpiton") BUILD_PLATFORM_SUBDIR+=("andes/ae350") + BUILD_PLATFORM_SUBDIR+=("renesas/rzfive") BUILD_PLATFORM_SUBDIR+=("generic") ;; *)
Signature · 1 line
2.17.1
PATCH v2 7/7 docs: platform: Add documentation for Renesas RZ/Five SoC
In reply to PrabhakarFrom: Lad Prabhakar <[email protected]>
This patch adds documentation to build Renesas RZ/Five (R9A07G043F) SoC.
---RFC->v2
* Updated doc
--- docs/platform/platform.md | 5 ++ docs/platform/renesas-rzfive.md | 143 ++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+) create mode 100644 docs/platform/renesas-rzfive.md
docs/platform/platform.md +5 -0
@@ -39,6 +39,10 @@ OpenSBI currently supports the following virtual and hardware platforms: processor based SOCs. More details on this platform can be found in the file *[shakti_cclass.md]*. +* **Renesas RZ/Five SoC**: Platform support for Renesas RZ/Five (R9A07G043F) SoC + used on the Renesas RZ/Five SMARC EVK board. More details on this platform can + be found in the file *[renesas-rzfive.md]*. + The code for these supported platforms can be used as example to implement support for other platforms. The *platform/template* directory also provides template files for implementing support for a new platform. The *objects.mk*,
@@ -54,3 +58,4 @@ comments to facilitate the implementation. [spike.md]: spike.md [fpga-openpiton.md]: fpga-openpiton.md [shakti_cclass.md]: shakti_cclass.md +[renesas-rzfive.md]: renesas-rzfive.md
docs/platform/renesas-rzfive.md new file +143 -0
143 lines not on this page · raw message
Signature · 1 line
2.17.1