* [PATCH v3 01/13] dt-bindings: soc: Add Renesas RZ/T2H (R9A09G077) SoC
2025-02-26 13:09 [PATCH v3 00/13] Add initial support for Renesas RZ/T2H SoC Thierry Bultel
@ 2025-02-26 13:09 ` Thierry Bultel
2025-02-26 14:26 ` Krzysztof Kozlowski
2025-02-26 13:09 ` [PATCH v3 02/13] dt-bindings: clock: Add cpg for the Renesas RZ/T2H SoC Thierry Bultel
` (12 subsequent siblings)
13 siblings, 1 reply; 39+ messages in thread
From: Thierry Bultel @ 2025-02-26 13:09 UTC (permalink / raw)
To: thierry.bultel
Cc: linux-renesas-soc, geert, paul.barker.ct, Thierry Bultel,
Geert Uytterhoeven, devicetree, linux-kernel
Add RZ/T2H (R9A09G077), its variants, and the rt2h-evk evaluation board in
documentation.
Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
---
.../devicetree/bindings/soc/renesas/renesas.yaml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Documentation/devicetree/bindings/soc/renesas/renesas.yaml b/Documentation/devicetree/bindings/soc/renesas/renesas.yaml
index 225c0f07ae94..98563a31b5e1 100644
--- a/Documentation/devicetree/bindings/soc/renesas/renesas.yaml
+++ b/Documentation/devicetree/bindings/soc/renesas/renesas.yaml
@@ -554,6 +554,16 @@ properties:
- renesas,r9a09g057h44 # RZ/V2HP with Mali-G31 + Mali-C55 support
- const: renesas,r9a09g057
+ - description: RZ/T2H (R9A09G077)
+ items:
+ - enum:
+ - renesas,rzt2h-evk # RZ/T2H Evaluation Board
+ - enum:
+ - renesas,r9a09g077m04 # RZ/T2H with Single Cortex-A55 + Dual Cortex-R52 - no security
+ - renesas,r9a09g077m24 # RZ/T2H with Dual Cortex-A55 + Dual Cortex-R52 - no security
+ - renesas,r9a09g077m44 # RZ/T2H with Quad Cortex-A55 + Dual Cortex-R52 - no security
+ - const: renesas,r9a09g077
+
additionalProperties: true
...
--
2.43.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [PATCH v3 01/13] dt-bindings: soc: Add Renesas RZ/T2H (R9A09G077) SoC
2025-02-26 13:09 ` [PATCH v3 01/13] dt-bindings: soc: Add Renesas RZ/T2H (R9A09G077) SoC Thierry Bultel
@ 2025-02-26 14:26 ` Krzysztof Kozlowski
0 siblings, 0 replies; 39+ messages in thread
From: Krzysztof Kozlowski @ 2025-02-26 14:26 UTC (permalink / raw)
To: Thierry Bultel, thierry.bultel
Cc: linux-renesas-soc, geert, paul.barker.ct, Geert Uytterhoeven,
devicetree, linux-kernel
On 26/02/2025 14:09, Thierry Bultel wrote:
> Add RZ/T2H (R9A09G077), its variants, and the rt2h-evk evaluation board in
> documentation.
>
> Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
> Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
Where? That's a v3, previous version did not have it and there was no
tag given on the lists. In the same time this changed from v2, so more
questions - tag which was not given appears on patch which changed
significantly.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH v3 02/13] dt-bindings: clock: Add cpg for the Renesas RZ/T2H SoC
2025-02-26 13:09 [PATCH v3 00/13] Add initial support for Renesas RZ/T2H SoC Thierry Bultel
2025-02-26 13:09 ` [PATCH v3 01/13] dt-bindings: soc: Add Renesas RZ/T2H (R9A09G077) SoC Thierry Bultel
@ 2025-02-26 13:09 ` Thierry Bultel
2025-02-26 14:44 ` Rob Herring (Arm)
2025-02-26 13:09 ` [PATCH v3 03/13] dt-bindings: serial: Add compatible for Renesas RZ/T2H SoC in sci Thierry Bultel
` (11 subsequent siblings)
13 siblings, 1 reply; 39+ messages in thread
From: Thierry Bultel @ 2025-02-26 13:09 UTC (permalink / raw)
To: thierry.bultel
Cc: linux-renesas-soc, geert, paul.barker.ct, Thierry Bultel,
Geert Uytterhoeven, linux-clk, devicetree, linux-kernel
Document RZ/T2H (a.k.a r9a09g077) cpg-mssr (Clock Pulse Generator) binding.
Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
---
.../bindings/clock/renesas,cpg-mssr.yaml | 4 +-
.../clock/renesas,r9a09g077-cpg-mssr.h | 49 +++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
create mode 100644 include/dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h
diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.yaml b/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.yaml
index 77ce3615c65a..be9a0576e1db 100644
--- a/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.yaml
+++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.yaml
@@ -52,9 +52,10 @@ properties:
- renesas,r8a779f0-cpg-mssr # R-Car S4-8
- renesas,r8a779g0-cpg-mssr # R-Car V4H
- renesas,r8a779h0-cpg-mssr # R-Car V4M
+ - renesas,r9a09g077-cpg-mssr # RZ/T2H
reg:
- maxItems: 1
+ maxItems: 2
clocks:
minItems: 1
@@ -68,6 +69,7 @@ properties:
- extal # All
- extalr # Most R-Car Gen3 and RZ/G2
- usb_extal # Most R-Car Gen2 and RZ/G1
+ - loco # RZ/T2H
'#clock-cells':
description: |
diff --git a/include/dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h b/include/dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h
new file mode 100644
index 000000000000..27c9cdcdf7c8
--- /dev/null
+++ b/include/dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h
@@ -0,0 +1,49 @@
+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+ *
+ * Copyright (C) 2025 Renesas Electronics Corp.
+ */
+
+#ifndef __DT_BINDINGS_CLOCK_RENESAS_R9A09G077_CPG_H__
+#define __DT_BINDINGS_CLOCK_RENESAS_R9A09G077_CPG_H__
+
+#include <dt-bindings/clock/renesas-cpg-mssr.h>
+
+/* R9A09G077 CPG Core Clocks */
+#define R9A09G077_CA55C0 0
+#define R9A09G077_CA55C1 1
+#define R9A09G077_CA55C2 2
+#define R9A09G077_CA55C3 3
+#define R9A09G077_SDHIHS 4
+#define R9A09G077_CLK_PLL1_ETH_PHY 5
+#define R9A09G077_CLK_OSC_ETH_PHY 6
+#define R9A09G077_CLK_ETHPHY 7
+#define R9A09G077_PCLKAH 8
+#define R9A09G077_PCLKAM 9
+#define R9A09G077_PCLKAL 10
+#define R9A09G077_CLK_SEL_ETH_PHY 11
+#define R9A09G077_DFI 12
+#define R9A09G077_PCLKH 13
+#define R9A09G077_PCLKM 14
+#define R9A09G077_PCLKL 15
+#define R9A09G077_PCLKGPTL 16
+#define R9A09G077_PCLKSHOST 17
+#define R9A09G077_PCLKRTC 18
+#define R9A09G077_USB 19
+#define R9A09G077_SPI0 20
+#define R9A09G077_SPI1 21
+#define R9A09G077_SPI2 22
+#define R9A09G077_SPI3 23
+#define R9A09G077_ETCLKA 24
+#define R9A09G077_ETCLKB 25
+#define R9A09G077_ETCLKC 26
+#define R9A09G077_ETCLKD 27
+#define R9A09G077_ETCLKE 28
+#define R9A09G077_ETHCLKE 29
+#define R9A09G077_ETHCLK_EXTAL 30
+#define R9A09G077_ETH_REFCLK 31
+#define R9A09G077_LCDC_CLKA 32
+#define R9A09G077_LCDC_CLKP 33
+#define R9A09G077_CA55 34
+#define R9A09G077_LCDC_CLKD 35
+
+#endif /* __DT_BINDINGS_CLOCK_RENESAS_R9A09G077_CPG_H__ */
--
2.43.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [PATCH v3 02/13] dt-bindings: clock: Add cpg for the Renesas RZ/T2H SoC
2025-02-26 13:09 ` [PATCH v3 02/13] dt-bindings: clock: Add cpg for the Renesas RZ/T2H SoC Thierry Bultel
@ 2025-02-26 14:44 ` Rob Herring (Arm)
0 siblings, 0 replies; 39+ messages in thread
From: Rob Herring (Arm) @ 2025-02-26 14:44 UTC (permalink / raw)
To: Thierry Bultel
Cc: paul.barker.ct, linux-renesas-soc, devicetree, thierry.bultel,
Geert Uytterhoeven, linux-kernel, geert, linux-clk
On Wed, 26 Feb 2025 14:09:21 +0100, Thierry Bultel wrote:
> Document RZ/T2H (a.k.a r9a09g077) cpg-mssr (Clock Pulse Generator) binding.
>
> Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
> Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
> ---
> .../bindings/clock/renesas,cpg-mssr.yaml | 4 +-
> .../clock/renesas,r9a09g077-cpg-mssr.h | 49 +++++++++++++++++++
> 2 files changed, 52 insertions(+), 1 deletion(-)
> create mode 100644 include/dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h
>
My bot found errors running 'make dt_binding_check' on your patch:
yamllint warnings/errors:
dtschema/dtc warnings/errors:
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.example.dtb: clock-controller@e6150000: reg: [[3860135936, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20250226130935.3029927-3-thierry.bultel.yh@bp.renesas.com
The base for the series is generally the latest rc1. A different dependency
should be noted in *this* patch.
If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note
that DT_SCHEMA_FILES can be set to your schema file to speed up checking
your schema. However, it must be unset to test all examples with your schema.
^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH v3 03/13] dt-bindings: serial: Add compatible for Renesas RZ/T2H SoC in sci
2025-02-26 13:09 [PATCH v3 00/13] Add initial support for Renesas RZ/T2H SoC Thierry Bultel
2025-02-26 13:09 ` [PATCH v3 01/13] dt-bindings: soc: Add Renesas RZ/T2H (R9A09G077) SoC Thierry Bultel
2025-02-26 13:09 ` [PATCH v3 02/13] dt-bindings: clock: Add cpg for the Renesas RZ/T2H SoC Thierry Bultel
@ 2025-02-26 13:09 ` Thierry Bultel
2025-03-03 13:35 ` Rob Herring
2025-02-26 13:09 ` [PATCH v3 04/13] soc: renesas: Add RZ/T2H (R9A09G077) config option Thierry Bultel
` (10 subsequent siblings)
13 siblings, 1 reply; 39+ messages in thread
From: Thierry Bultel @ 2025-02-26 13:09 UTC (permalink / raw)
To: thierry.bultel
Cc: linux-renesas-soc, geert, paul.barker.ct, Thierry Bultel,
Geert Uytterhoeven, linux-kernel, linux-serial, devicetree
Document RZ/T2H (a.k.a r9a09g077) in SCI binding.
Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
---
.../bindings/serial/renesas,sci.yaml | 64 ++++++++++++-------
1 file changed, 40 insertions(+), 24 deletions(-)
diff --git a/Documentation/devicetree/bindings/serial/renesas,sci.yaml b/Documentation/devicetree/bindings/serial/renesas,sci.yaml
index 64d3db6e54e5..2c4080283963 100644
--- a/Documentation/devicetree/bindings/serial/renesas,sci.yaml
+++ b/Documentation/devicetree/bindings/serial/renesas,sci.yaml
@@ -9,9 +9,6 @@ title: Renesas Serial Communication Interface
maintainers:
- Geert Uytterhoeven <geert+renesas@glider.be>
-allOf:
- - $ref: serial.yaml#
-
properties:
compatible:
oneOf:
@@ -22,6 +19,8 @@ properties:
- renesas,r9a07g054-sci # RZ/V2L
- const: renesas,sci # generic SCI compatible UART
+ - const: renesas,r9a09g077-sci # RZ/T2H
+
- items:
- const: renesas,sci # generic SCI compatible UART
@@ -54,8 +53,6 @@ properties:
- fck # UART functional clock
- sck # optional external clock input
- uart-has-rtscts: false
-
required:
- compatible
- reg
@@ -63,25 +60,44 @@ required:
- clocks
- clock-names
-if:
- properties:
- compatible:
- contains:
- enum:
- - renesas,r9a07g043-sci
- - renesas,r9a07g044-sci
- - renesas,r9a07g054-sci
-then:
- properties:
- resets:
- maxItems: 1
-
- power-domains:
- maxItems: 1
-
- required:
- - resets
- - power-domains
+allOf:
+ - $ref: serial.yaml#
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: renesas,r9a09g077-sci
+ then:
+ properties:
+ uart-has-rtscts: true
+ power-domains:
+ maxItems: 1
+ required:
+ - power-domains
+
+ else:
+ properties:
+ uart-has-rtscts: false
+
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - renesas,r9a07g043-sci
+ - renesas,r9a07g044-sci
+ - renesas,r9a07g054-sci
+ then:
+ properties:
+ resets:
+ maxItems: 1
+
+ power-domains:
+ maxItems: 1
+
+ required:
+ - resets
+ - power-domains
unevaluatedProperties: false
--
2.43.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [PATCH v3 03/13] dt-bindings: serial: Add compatible for Renesas RZ/T2H SoC in sci
2025-02-26 13:09 ` [PATCH v3 03/13] dt-bindings: serial: Add compatible for Renesas RZ/T2H SoC in sci Thierry Bultel
@ 2025-03-03 13:35 ` Rob Herring
2025-03-03 15:10 ` Thierry Bultel
0 siblings, 1 reply; 39+ messages in thread
From: Rob Herring @ 2025-03-03 13:35 UTC (permalink / raw)
To: Thierry Bultel
Cc: thierry.bultel, linux-renesas-soc, geert, paul.barker.ct,
Geert Uytterhoeven, linux-kernel, linux-serial, devicetree
On Wed, Feb 26, 2025 at 02:09:22PM +0100, Thierry Bultel wrote:
> Document RZ/T2H (a.k.a r9a09g077) in SCI binding.
>
> Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
> Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
> ---
> .../bindings/serial/renesas,sci.yaml | 64 ++++++++++++-------
> 1 file changed, 40 insertions(+), 24 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/serial/renesas,sci.yaml b/Documentation/devicetree/bindings/serial/renesas,sci.yaml
> index 64d3db6e54e5..2c4080283963 100644
> --- a/Documentation/devicetree/bindings/serial/renesas,sci.yaml
> +++ b/Documentation/devicetree/bindings/serial/renesas,sci.yaml
> @@ -9,9 +9,6 @@ title: Renesas Serial Communication Interface
> maintainers:
> - Geert Uytterhoeven <geert+renesas@glider.be>
>
> -allOf:
> - - $ref: serial.yaml#
> -
> properties:
> compatible:
> oneOf:
> @@ -22,6 +19,8 @@ properties:
> - renesas,r9a07g054-sci # RZ/V2L
> - const: renesas,sci # generic SCI compatible UART
>
> + - const: renesas,r9a09g077-sci # RZ/T2H
> +
Perhaps explain in the commit msg why the 'renesas,sci' is not
applicable for this chip.
> - items:
> - const: renesas,sci # generic SCI compatible UART
>
> @@ -54,8 +53,6 @@ properties:
> - fck # UART functional clock
> - sck # optional external clock input
>
> - uart-has-rtscts: false
> -
> required:
> - compatible
> - reg
> @@ -63,25 +60,44 @@ required:
> - clocks
> - clock-names
>
> -if:
> - properties:
> - compatible:
> - contains:
> - enum:
> - - renesas,r9a07g043-sci
> - - renesas,r9a07g044-sci
> - - renesas,r9a07g054-sci
> -then:
> - properties:
> - resets:
> - maxItems: 1
> -
> - power-domains:
> - maxItems: 1
> -
> - required:
> - - resets
> - - power-domains
> +allOf:
> + - $ref: serial.yaml#
> + - if:
> + properties:
> + compatible:
> + contains:
> + const: renesas,r9a09g077-sci
> + then:
> + properties:
> + uart-has-rtscts: true
Drop. It is already allowed.
> + power-domains:
> + maxItems: 1
> + required:
> + - power-domains
> +
> + else:
> + properties:
> + uart-has-rtscts: false
> +
> + - if:
> + properties:
> + compatible:
> + contains:
> + enum:
> + - renesas,r9a07g043-sci
> + - renesas,r9a07g044-sci
> + - renesas,r9a07g054-sci
> + then:
> + properties:
> + resets:
> + maxItems: 1
> +
> + power-domains:
> + maxItems: 1
> +
> + required:
> + - resets
> + - power-domains
>
> unevaluatedProperties: false
>
> --
> 2.43.0
>
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v3 03/13] dt-bindings: serial: Add compatible for Renesas RZ/T2H SoC in sci
2025-03-03 13:35 ` Rob Herring
@ 2025-03-03 15:10 ` Thierry Bultel
2025-03-03 15:42 ` Geert Uytterhoeven
0 siblings, 1 reply; 39+ messages in thread
From: Thierry Bultel @ 2025-03-03 15:10 UTC (permalink / raw)
To: Rob Herring
Cc: thierry.bultel@linatsea.fr, linux-renesas-soc@vger.kernel.org,
geert@linux-m68k.org, Paul Barker, Geert Uytterhoeven,
linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org,
devicetree@vger.kernel.org
Hi Rob,
thanks for you review
> -----Original Message-----
> From: Rob Herring <robh@kernel.org>
> Sent: lundi 3 mars 2025 14:36
> To: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
> Cc: thierry.bultel@linatsea.fr; linux-renesas-soc@vger.kernel.org;
> geert@linux-m68k.org; Paul Barker <paul.barker.ct@bp.renesas.com>; Geert
> Uytterhoeven <geert+renesas@glider.be>; linux-kernel@vger.kernel.org;
> linux-serial@vger.kernel.org; devicetree@vger.kernel.org
> Subject: Re: [PATCH v3 03/13] dt-bindings: serial: Add compatible for
> Renesas RZ/T2H SoC in sci
>
> On Wed, Feb 26, 2025 at 02:09:22PM +0100, Thierry Bultel wrote:
> > Document RZ/T2H (a.k.a r9a09g077) in SCI binding.
> >
> > Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
> > Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
> > ---
> > .../bindings/serial/renesas,sci.yaml | 64 ++++++++++++-------
> > 1 file changed, 40 insertions(+), 24 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/serial/renesas,sci.yaml
> > b/Documentation/devicetree/bindings/serial/renesas,sci.yaml
> > index 64d3db6e54e5..2c4080283963 100644
> > --- a/Documentation/devicetree/bindings/serial/renesas,sci.yaml
> > +++ b/Documentation/devicetree/bindings/serial/renesas,sci.yaml
> > @@ -9,9 +9,6 @@ title: Renesas Serial Communication Interface
> > maintainers:
> > - Geert Uytterhoeven <geert+renesas@glider.be>
> >
> > -allOf:
> > - - $ref: serial.yaml#
> > -
> > properties:
> > compatible:
> > oneOf:
> > @@ -22,6 +19,8 @@ properties:
> > - renesas,r9a07g054-sci # RZ/V2L
> > - const: renesas,sci # generic SCI compatible UART
> >
> > + - const: renesas,r9a09g077-sci # RZ/T2H
> > +
>
> Perhaps explain in the commit msg why the 'renesas,sci' is not applicable
> for this chip.
Would something like that be explicit enough ?
"The SCI of RZ/T2H SoC (a.k.a r9a09g077), as a lot
of similarities with other Renesas SoCs like G2L, G3S and V2L,
but a different set of registers, that moreover are 32 bits instead
of 16 bits.
This is why the 'renesas,sci' fallback does not apply for it".
Thanks !
Thierry
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v3 03/13] dt-bindings: serial: Add compatible for Renesas RZ/T2H SoC in sci
2025-03-03 15:10 ` Thierry Bultel
@ 2025-03-03 15:42 ` Geert Uytterhoeven
0 siblings, 0 replies; 39+ messages in thread
From: Geert Uytterhoeven @ 2025-03-03 15:42 UTC (permalink / raw)
To: Thierry Bultel
Cc: Rob Herring, thierry.bultel@linatsea.fr,
linux-renesas-soc@vger.kernel.org, Paul Barker,
linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org,
devicetree@vger.kernel.org
Hi Thierry,
On Mon, 3 Mar 2025 at 16:10, Thierry Bultel
<thierry.bultel.yh@bp.renesas.com> wrote:
> > -----Original Message-----
> > From: Rob Herring <robh@kernel.org>
> > Sent: lundi 3 mars 2025 14:36
> > To: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
> > Cc: thierry.bultel@linatsea.fr; linux-renesas-soc@vger.kernel.org;
> > geert@linux-m68k.org; Paul Barker <paul.barker.ct@bp.renesas.com>; Geert
> > Uytterhoeven <geert+renesas@glider.be>; linux-kernel@vger.kernel.org;
> > linux-serial@vger.kernel.org; devicetree@vger.kernel.org
> > Subject: Re: [PATCH v3 03/13] dt-bindings: serial: Add compatible for
> > Renesas RZ/T2H SoC in sci
> >
> > On Wed, Feb 26, 2025 at 02:09:22PM +0100, Thierry Bultel wrote:
> > > Document RZ/T2H (a.k.a r9a09g077) in SCI binding.
> > >
> > > Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
> > > Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
> > > ---
> > > .../bindings/serial/renesas,sci.yaml | 64 ++++++++++++-------
> > > 1 file changed, 40 insertions(+), 24 deletions(-)
> > >
> > > diff --git a/Documentation/devicetree/bindings/serial/renesas,sci.yaml
> > > b/Documentation/devicetree/bindings/serial/renesas,sci.yaml
> > > index 64d3db6e54e5..2c4080283963 100644
> > > --- a/Documentation/devicetree/bindings/serial/renesas,sci.yaml
> > > +++ b/Documentation/devicetree/bindings/serial/renesas,sci.yaml
> > > @@ -9,9 +9,6 @@ title: Renesas Serial Communication Interface
> > > maintainers:
> > > - Geert Uytterhoeven <geert+renesas@glider.be>
> > >
> > > -allOf:
> > > - - $ref: serial.yaml#
> > > -
> > > properties:
> > > compatible:
> > > oneOf:
> > > @@ -22,6 +19,8 @@ properties:
> > > - renesas,r9a07g054-sci # RZ/V2L
> > > - const: renesas,sci # generic SCI compatible UART
> > >
> > > + - const: renesas,r9a09g077-sci # RZ/T2H
> > > +
> >
> > Perhaps explain in the commit msg why the 'renesas,sci' is not applicable
> > for this chip.
>
> Would something like that be explicit enough ?
>
> "The SCI of RZ/T2H SoC (a.k.a r9a09g077), as a lot
> of similarities with other Renesas SoCs like G2L, G3S and V2L,
> but a different set of registers, that moreover are 32 bits instead
> of 16 bits.
> This is why the 'renesas,sci' fallback does not apply for it".
FTR, the registers being 32-bit instead of 8/16-bit wide is the least of
your problems... If it was just a SCI with 32-bit registers, you could
use "reg-io-width = <4>;" and "reg-shift = <2>;", and add support for
the latter to the driver (it already uses regshift on non-DT SuperH).
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH v3 04/13] soc: renesas: Add RZ/T2H (R9A09G077) config option
2025-02-26 13:09 [PATCH v3 00/13] Add initial support for Renesas RZ/T2H SoC Thierry Bultel
` (2 preceding siblings ...)
2025-02-26 13:09 ` [PATCH v3 03/13] dt-bindings: serial: Add compatible for Renesas RZ/T2H SoC in sci Thierry Bultel
@ 2025-02-26 13:09 ` Thierry Bultel
2025-03-06 14:13 ` Geert Uytterhoeven
2025-02-26 13:09 ` [PATCH v3 05/13] clk: renesas: Pass sub struct of cpg_mssr_priv to cpg_clk_register Thierry Bultel
` (9 subsequent siblings)
13 siblings, 1 reply; 39+ messages in thread
From: Thierry Bultel @ 2025-02-26 13:09 UTC (permalink / raw)
To: thierry.bultel
Cc: linux-renesas-soc, geert, paul.barker.ct, Thierry Bultel,
linux-kernel
Add a configuration option for the RZ/T2H SoC.
Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
---
drivers/soc/renesas/Kconfig | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig
index 6d2e135eed89..91a815e0a522 100644
--- a/drivers/soc/renesas/Kconfig
+++ b/drivers/soc/renesas/Kconfig
@@ -356,6 +356,11 @@ config ARCH_R9A09G057
help
This enables support for the Renesas RZ/V2H(P) SoC variants.
+config ARCH_R9A09G077
+ bool "ARM64 Platform support for RZ/T2H"
+ help
+ This enables support for the Renesas RZ/T2H SoC variants.
+
endif # ARM64
if RISCV
--
2.43.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [PATCH v3 04/13] soc: renesas: Add RZ/T2H (R9A09G077) config option
2025-02-26 13:09 ` [PATCH v3 04/13] soc: renesas: Add RZ/T2H (R9A09G077) config option Thierry Bultel
@ 2025-03-06 14:13 ` Geert Uytterhoeven
0 siblings, 0 replies; 39+ messages in thread
From: Geert Uytterhoeven @ 2025-03-06 14:13 UTC (permalink / raw)
To: Thierry Bultel
Cc: thierry.bultel, linux-renesas-soc, paul.barker.ct, linux-kernel
On Wed, 26 Feb 2025 at 14:10, Thierry Bultel
<thierry.bultel.yh@bp.renesas.com> wrote:
> Add a configuration option for the RZ/T2H SoC.
>
> Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
> Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
My
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
is still valid.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH v3 05/13] clk: renesas: Pass sub struct of cpg_mssr_priv to cpg_clk_register
2025-02-26 13:09 [PATCH v3 00/13] Add initial support for Renesas RZ/T2H SoC Thierry Bultel
` (3 preceding siblings ...)
2025-02-26 13:09 ` [PATCH v3 04/13] soc: renesas: Add RZ/T2H (R9A09G077) config option Thierry Bultel
@ 2025-02-26 13:09 ` Thierry Bultel
2025-02-26 13:09 ` [PATCH v3 06/13] clk: renesas: Add support for R9A09G077 SoC Thierry Bultel
` (8 subsequent siblings)
13 siblings, 0 replies; 39+ messages in thread
From: Thierry Bultel @ 2025-02-26 13:09 UTC (permalink / raw)
To: thierry.bultel
Cc: linux-renesas-soc, geert, paul.barker.ct, Thierry Bultel,
linux-clk, linux-kernel
In a subsequent patch, the registration callback will need more parameters
from cpg_mssr_priv (like another base address with clock controllers
with double register block, and also, notifiers and rmw_lock).
Instead of adding more parameters, move the needed parameters to a public
sub-struct.
Instead moving clks to this structure, which would have implied to add
an allocation (and cleanup) for it, keep the way the allocation is done
and just have a copy of the pointer in the public structure.
Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
---
drivers/clk/renesas/r7s9210-cpg-mssr.c | 7 +-
drivers/clk/renesas/r8a77970-cpg-mssr.c | 11 +--
drivers/clk/renesas/rcar-gen2-cpg.c | 5 +-
drivers/clk/renesas/rcar-gen2-cpg.h | 3 +-
drivers/clk/renesas/rcar-gen3-cpg.c | 6 +-
drivers/clk/renesas/rcar-gen3-cpg.h | 6 +-
drivers/clk/renesas/rcar-gen4-cpg.c | 8 +-
drivers/clk/renesas/rcar-gen4-cpg.h | 3 +-
drivers/clk/renesas/renesas-cpg-mssr.c | 97 ++++++++++++-------------
drivers/clk/renesas/renesas-cpg-mssr.h | 20 ++++-
10 files changed, 93 insertions(+), 73 deletions(-)
diff --git a/drivers/clk/renesas/r7s9210-cpg-mssr.c b/drivers/clk/renesas/r7s9210-cpg-mssr.c
index a85227c248f3..733244687daa 100644
--- a/drivers/clk/renesas/r7s9210-cpg-mssr.c
+++ b/drivers/clk/renesas/r7s9210-cpg-mssr.c
@@ -159,12 +159,13 @@ static void __init r7s9210_update_clk_table(struct clk *extal_clk,
static struct clk * __init rza2_cpg_clk_register(struct device *dev,
const struct cpg_core_clk *core, const struct cpg_mssr_info *info,
- struct clk **clks, void __iomem *base,
- struct raw_notifier_head *notifiers)
+ struct cpg_mssr_pub *pub)
{
- struct clk *parent;
+ void __iomem *base = pub->base0;
+ struct clk **clks = pub->clks;
unsigned int mult = 1;
unsigned int div = 1;
+ struct clk *parent;
parent = clks[core->parent];
if (IS_ERR(parent))
diff --git a/drivers/clk/renesas/r8a77970-cpg-mssr.c b/drivers/clk/renesas/r8a77970-cpg-mssr.c
index 3cec0f501b94..c50aa1a49196 100644
--- a/drivers/clk/renesas/r8a77970-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77970-cpg-mssr.c
@@ -218,11 +218,13 @@ static int __init r8a77970_cpg_mssr_init(struct device *dev)
}
static struct clk * __init r8a77970_cpg_clk_register(struct device *dev,
- const struct cpg_core_clk *core, const struct cpg_mssr_info *info,
- struct clk **clks, void __iomem *base,
- struct raw_notifier_head *notifiers)
+ const struct cpg_core_clk *core,
+ const struct cpg_mssr_info *info,
+ struct cpg_mssr_pub *pub)
{
const struct clk_div_table *table;
+ void __iomem *base = pub->base0;
+ struct clk **clks = pub->clks;
const struct clk *parent;
unsigned int shift;
@@ -236,8 +238,7 @@ static struct clk * __init r8a77970_cpg_clk_register(struct device *dev,
shift = 4;
break;
default:
- return rcar_gen3_cpg_clk_register(dev, core, info, clks, base,
- notifiers);
+ return rcar_gen3_cpg_clk_register(dev, core, info, pub);
}
parent = clks[core->parent];
diff --git a/drivers/clk/renesas/rcar-gen2-cpg.c b/drivers/clk/renesas/rcar-gen2-cpg.c
index 4c3764972bad..ab34bb8c3e07 100644
--- a/drivers/clk/renesas/rcar-gen2-cpg.c
+++ b/drivers/clk/renesas/rcar-gen2-cpg.c
@@ -274,10 +274,11 @@ static const struct soc_device_attribute cpg_quirks_match[] __initconst = {
struct clk * __init rcar_gen2_cpg_clk_register(struct device *dev,
const struct cpg_core_clk *core, const struct cpg_mssr_info *info,
- struct clk **clks, void __iomem *base,
- struct raw_notifier_head *notifiers)
+ struct cpg_mssr_pub *pub)
{
const struct clk_div_table *table = NULL;
+ void __iomem *base = pub->base0;
+ struct clk **clks = pub->clks;
const struct clk *parent;
const char *parent_name;
unsigned int mult = 1;
diff --git a/drivers/clk/renesas/rcar-gen2-cpg.h b/drivers/clk/renesas/rcar-gen2-cpg.h
index bdcd4a38d48d..3d4b127fdeaf 100644
--- a/drivers/clk/renesas/rcar-gen2-cpg.h
+++ b/drivers/clk/renesas/rcar-gen2-cpg.h
@@ -32,8 +32,7 @@ struct rcar_gen2_cpg_pll_config {
struct clk *rcar_gen2_cpg_clk_register(struct device *dev,
const struct cpg_core_clk *core, const struct cpg_mssr_info *info,
- struct clk **clks, void __iomem *base,
- struct raw_notifier_head *notifiers);
+ struct cpg_mssr_pub *pub);
int rcar_gen2_cpg_init(const struct rcar_gen2_cpg_pll_config *config,
unsigned int pll0_div, u32 mode);
diff --git a/drivers/clk/renesas/rcar-gen3-cpg.c b/drivers/clk/renesas/rcar-gen3-cpg.c
index 027100e84ee4..10ae20489df9 100644
--- a/drivers/clk/renesas/rcar-gen3-cpg.c
+++ b/drivers/clk/renesas/rcar-gen3-cpg.c
@@ -345,9 +345,11 @@ static const struct soc_device_attribute cpg_quirks_match[] __initconst = {
struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev,
const struct cpg_core_clk *core, const struct cpg_mssr_info *info,
- struct clk **clks, void __iomem *base,
- struct raw_notifier_head *notifiers)
+ struct cpg_mssr_pub *pub)
{
+ struct raw_notifier_head *notifiers = &pub->notifiers;
+ void __iomem *base = pub->base0;
+ struct clk **clks = pub->clks;
const struct clk *parent;
unsigned int mult = 1;
unsigned int div = 1;
diff --git a/drivers/clk/renesas/rcar-gen3-cpg.h b/drivers/clk/renesas/rcar-gen3-cpg.h
index bfdc649bdf12..6ad560fca01b 100644
--- a/drivers/clk/renesas/rcar-gen3-cpg.h
+++ b/drivers/clk/renesas/rcar-gen3-cpg.h
@@ -80,9 +80,9 @@ struct rcar_gen3_cpg_pll_config {
#define CPG_RCKCR 0x240
struct clk *rcar_gen3_cpg_clk_register(struct device *dev,
- const struct cpg_core_clk *core, const struct cpg_mssr_info *info,
- struct clk **clks, void __iomem *base,
- struct raw_notifier_head *notifiers);
+ const struct cpg_core_clk *core,
+ const struct cpg_mssr_info *info,
+ struct cpg_mssr_pub *pub);
int rcar_gen3_cpg_init(const struct rcar_gen3_cpg_pll_config *config,
unsigned int clk_extalr, u32 mode);
diff --git a/drivers/clk/renesas/rcar-gen4-cpg.c b/drivers/clk/renesas/rcar-gen4-cpg.c
index 31aa790fd003..877626bbe7e1 100644
--- a/drivers/clk/renesas/rcar-gen4-cpg.c
+++ b/drivers/clk/renesas/rcar-gen4-cpg.c
@@ -418,9 +418,11 @@ static const struct clk_div_table cpg_rpcsrc_div_table[] = {
struct clk * __init rcar_gen4_cpg_clk_register(struct device *dev,
const struct cpg_core_clk *core, const struct cpg_mssr_info *info,
- struct clk **clks, void __iomem *base,
- struct raw_notifier_head *notifiers)
+ struct cpg_mssr_pub *pub)
{
+ struct raw_notifier_head *notifiers = &pub->notifiers;
+ void __iomem *base = pub->base0;
+ struct clk **clks = pub->clks;
const struct clk *parent;
unsigned int mult = 1;
unsigned int div = 1;
@@ -517,7 +519,7 @@ struct clk * __init rcar_gen4_cpg_clk_register(struct device *dev,
case CLK_TYPE_GEN4_RPC:
return cpg_rpc_clk_register(core->name, base + CPG_RPCCKCR,
- __clk_get_name(parent), notifiers);
+ __clk_get_name(parent), &pub->notifiers);
case CLK_TYPE_GEN4_RPCD2:
return cpg_rpcd2_clk_register(core->name, base + CPG_RPCCKCR,
diff --git a/drivers/clk/renesas/rcar-gen4-cpg.h b/drivers/clk/renesas/rcar-gen4-cpg.h
index 717fd148464f..6c8280b37c37 100644
--- a/drivers/clk/renesas/rcar-gen4-cpg.h
+++ b/drivers/clk/renesas/rcar-gen4-cpg.h
@@ -78,8 +78,7 @@ struct rcar_gen4_cpg_pll_config {
struct clk *rcar_gen4_cpg_clk_register(struct device *dev,
const struct cpg_core_clk *core, const struct cpg_mssr_info *info,
- struct clk **clks, void __iomem *base,
- struct raw_notifier_head *notifiers);
+ struct cpg_mssr_pub *pub);
int rcar_gen4_cpg_init(const struct rcar_gen4_cpg_pll_config *config,
unsigned int clk_extalr, u32 mode);
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c
index bf85501709f0..b78992217e58 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.c
+++ b/drivers/clk/renesas/renesas-cpg-mssr.c
@@ -127,14 +127,12 @@ static const u16 srstclr_for_gen4[] = {
*
* @rcdev: Optional reset controller entity
* @dev: CPG/MSSR device
- * @base: CPG/MSSR register block base address
* @reg_layout: CPG/MSSR register layout
* @rmw_lock: protects RMW register accesses
* @np: Device node in DT for this CPG/MSSR module
* @num_core_clks: Number of Core Clocks in clks[]
* @num_mod_clks: Number of Module Clocks in clks[]
* @last_dt_core_clk: ID of the last Core Clock exported to DT
- * @notifiers: Notifier chain to save/restore clock state for system resume
* @status_regs: Pointer to status registers array
* @control_regs: Pointer to control registers array
* @reset_regs: Pointer to reset registers array
@@ -143,6 +141,7 @@ static const u16 srstclr_for_gen4[] = {
* [].val: Saved values of SMSTPCR[]
* @reserved_ids: Temporary used, reserved id list
* @num_reserved_ids: Temporary used, number of reserved id list
+ * @pub: Data passed to clock registration callback
* @clks: Array containing all Core and Module Clocks
*/
struct cpg_mssr_priv {
@@ -150,16 +149,13 @@ struct cpg_mssr_priv {
struct reset_controller_dev rcdev;
#endif
struct device *dev;
- void __iomem *base;
enum clk_reg_layout reg_layout;
- spinlock_t rmw_lock;
struct device_node *np;
unsigned int num_core_clks;
unsigned int num_mod_clks;
unsigned int last_dt_core_clk;
- struct raw_notifier_head notifiers;
const u16 *status_regs;
const u16 *control_regs;
const u16 *reset_regs;
@@ -172,6 +168,7 @@ struct cpg_mssr_priv {
unsigned int *reserved_ids;
unsigned int num_reserved_ids;
+ struct cpg_mssr_pub pub;
struct clk *clks[];
};
@@ -205,38 +202,39 @@ static int cpg_mstp_clock_endisable(struct clk_hw *hw, bool enable)
dev_dbg(dev, "MSTP %u%02u/%pC %s\n", reg, bit, hw->clk,
enable ? "ON" : "OFF");
- spin_lock_irqsave(&priv->rmw_lock, flags);
+ spin_lock_irqsave(&priv->pub.rmw_lock, flags);
if (priv->reg_layout == CLK_REG_LAYOUT_RZ_A) {
- value = readb(priv->base + priv->control_regs[reg]);
+ value = readb(priv->pub.base0 + priv->control_regs[reg]);
if (enable)
value &= ~bitmask;
else
value |= bitmask;
- writeb(value, priv->base + priv->control_regs[reg]);
+ writeb(value, priv->pub.base0 + priv->control_regs[reg]);
/* dummy read to ensure write has completed */
- readb(priv->base + priv->control_regs[reg]);
- barrier_data(priv->base + priv->control_regs[reg]);
+ readb(priv->pub.base0 + priv->control_regs[reg]);
+ barrier_data(priv->pub.base0 + priv->control_regs[reg]);
+
} else {
- value = readl(priv->base + priv->control_regs[reg]);
+ value = readl(priv->pub.base0 + priv->control_regs[reg]);
if (enable)
value &= ~bitmask;
else
value |= bitmask;
- writel(value, priv->base + priv->control_regs[reg]);
+ writel(value, priv->pub.base0 + priv->control_regs[reg]);
}
- spin_unlock_irqrestore(&priv->rmw_lock, flags);
+ spin_unlock_irqrestore(&priv->pub.rmw_lock, flags);
if (!enable || priv->reg_layout == CLK_REG_LAYOUT_RZ_A)
return 0;
- error = readl_poll_timeout_atomic(priv->base + priv->status_regs[reg],
+ error = readl_poll_timeout_atomic(priv->pub.base0 + priv->status_regs[reg],
value, !(value & bitmask), 0, 10);
if (error)
dev_err(dev, "Failed to enable SMSTP %p[%d]\n",
- priv->base + priv->control_regs[reg], bit);
+ priv->pub.base0 + priv->control_regs[reg], bit);
return error;
}
@@ -255,12 +253,13 @@ static int cpg_mstp_clock_is_enabled(struct clk_hw *hw)
{
struct mstp_clock *clock = to_mstp_clock(hw);
struct cpg_mssr_priv *priv = clock->priv;
+ unsigned int reg = clock->index / 32;
u32 value;
if (priv->reg_layout == CLK_REG_LAYOUT_RZ_A)
- value = readb(priv->base + priv->control_regs[clock->index / 32]);
+ value = readb(priv->pub.base0 + priv->control_regs[reg]);
else
- value = readl(priv->base + priv->status_regs[clock->index / 32]);
+ value = readl(priv->pub.base0 + priv->status_regs[reg]);
return !(value & BIT(clock->index % 32));
}
@@ -352,7 +351,7 @@ static void __init cpg_mssr_register_core_clk(const struct cpg_core_clk *core,
case CLK_TYPE_DIV6P1:
case CLK_TYPE_DIV6_RO:
WARN_DEBUG(core->parent >= priv->num_core_clks);
- parent = priv->clks[core->parent];
+ parent = priv->pub.clks[core->parent];
if (IS_ERR(parent)) {
clk = parent;
goto fail;
@@ -362,12 +361,12 @@ static void __init cpg_mssr_register_core_clk(const struct cpg_core_clk *core,
if (core->type == CLK_TYPE_DIV6_RO)
/* Multiply with the DIV6 register value */
- div *= (readl(priv->base + core->offset) & 0x3f) + 1;
+ div *= (readl(priv->pub.base0 + core->offset) & 0x3f) + 1;
if (core->type == CLK_TYPE_DIV6P1) {
clk = cpg_div6_register(core->name, 1, &parent_name,
- priv->base + core->offset,
- &priv->notifiers);
+ priv->pub.base0 + core->offset,
+ &priv->pub.notifiers);
} else {
clk = clk_register_fixed_factor(NULL, core->name,
parent_name, 0,
@@ -383,8 +382,7 @@ static void __init cpg_mssr_register_core_clk(const struct cpg_core_clk *core,
default:
if (info->cpg_clk_register)
clk = info->cpg_clk_register(dev, core, info,
- priv->clks, priv->base,
- &priv->notifiers);
+ &priv->pub);
else
dev_err(dev, "%s has unsupported core clock type %u\n",
core->name, core->type);
@@ -395,7 +393,7 @@ static void __init cpg_mssr_register_core_clk(const struct cpg_core_clk *core,
goto fail;
dev_dbg(dev, "Core clock %pC at %lu Hz\n", clk, clk_get_rate(clk));
- priv->clks[id] = clk;
+ priv->pub.clks[id] = clk;
return;
fail:
@@ -418,14 +416,14 @@ static void __init cpg_mssr_register_mod_clk(const struct mssr_mod_clk *mod,
WARN_DEBUG(id < priv->num_core_clks);
WARN_DEBUG(id >= priv->num_core_clks + priv->num_mod_clks);
WARN_DEBUG(mod->parent >= priv->num_core_clks + priv->num_mod_clks);
- WARN_DEBUG(PTR_ERR(priv->clks[id]) != -ENOENT);
+ WARN_DEBUG(PTR_ERR(priv->pub.clks[id]) != -ENOENT);
if (!mod->name) {
/* Skip NULLified clock */
return;
}
- parent = priv->clks[mod->parent];
+ parent = priv->pub.clks[mod->parent];
if (IS_ERR(parent)) {
clk = parent;
goto fail;
@@ -627,13 +625,13 @@ static int cpg_mssr_reset(struct reset_controller_dev *rcdev,
dev_dbg(priv->dev, "reset %u%02u\n", reg, bit);
/* Reset module */
- writel(bitmask, priv->base + priv->reset_regs[reg]);
+ writel(bitmask, priv->pub.base0 + priv->reset_regs[reg]);
/* Wait for at least one cycle of the RCLK clock (@ ca. 32 kHz) */
udelay(35);
/* Release module from reset state */
- writel(bitmask, priv->base + priv->reset_clear_regs[reg]);
+ writel(bitmask, priv->pub.base0 + priv->reset_clear_regs[reg]);
return 0;
}
@@ -647,7 +645,7 @@ static int cpg_mssr_assert(struct reset_controller_dev *rcdev, unsigned long id)
dev_dbg(priv->dev, "assert %u%02u\n", reg, bit);
- writel(bitmask, priv->base + priv->reset_regs[reg]);
+ writel(bitmask, priv->pub.base0 + priv->reset_regs[reg]);
return 0;
}
@@ -661,7 +659,7 @@ static int cpg_mssr_deassert(struct reset_controller_dev *rcdev,
dev_dbg(priv->dev, "deassert %u%02u\n", reg, bit);
- writel(bitmask, priv->base + priv->reset_clear_regs[reg]);
+ writel(bitmask, priv->pub.base0 + priv->reset_clear_regs[reg]);
return 0;
}
@@ -673,7 +671,7 @@ static int cpg_mssr_status(struct reset_controller_dev *rcdev,
unsigned int bit = id % 32;
u32 bitmask = BIT(bit);
- return !!(readl(priv->base + priv->reset_regs[reg]) & bitmask);
+ return !!(readl(priv->pub.base0 + priv->reset_regs[reg]) & bitmask);
}
static const struct reset_control_ops cpg_mssr_reset_ops = {
@@ -899,12 +897,12 @@ static int cpg_mssr_suspend_noirq(struct device *dev)
if (priv->smstpcr_saved[reg].mask)
priv->smstpcr_saved[reg].val =
priv->reg_layout == CLK_REG_LAYOUT_RZ_A ?
- readb(priv->base + priv->control_regs[reg]) :
- readl(priv->base + priv->control_regs[reg]);
+ readb(priv->pub.base0 + priv->control_regs[reg]) :
+ readl(priv->pub.base0 + priv->control_regs[reg]);
}
/* Save core clocks */
- raw_notifier_call_chain(&priv->notifiers, PM_EVENT_SUSPEND, NULL);
+ raw_notifier_call_chain(&priv->pub.notifiers, PM_EVENT_SUSPEND, NULL);
return 0;
}
@@ -921,7 +919,7 @@ static int cpg_mssr_resume_noirq(struct device *dev)
return 0;
/* Restore core clocks */
- raw_notifier_call_chain(&priv->notifiers, PM_EVENT_RESUME, NULL);
+ raw_notifier_call_chain(&priv->pub.notifiers, PM_EVENT_RESUME, NULL);
/* Restore module clocks */
for (reg = 0; reg < ARRAY_SIZE(priv->smstpcr_saved); reg++) {
@@ -930,29 +928,29 @@ static int cpg_mssr_resume_noirq(struct device *dev)
continue;
if (priv->reg_layout == CLK_REG_LAYOUT_RZ_A)
- oldval = readb(priv->base + priv->control_regs[reg]);
+ oldval = readb(priv->pub.base0 + priv->control_regs[reg]);
else
- oldval = readl(priv->base + priv->control_regs[reg]);
+ oldval = readl(priv->pub.base0 + priv->control_regs[reg]);
newval = oldval & ~mask;
newval |= priv->smstpcr_saved[reg].val & mask;
if (newval == oldval)
continue;
if (priv->reg_layout == CLK_REG_LAYOUT_RZ_A) {
- writeb(newval, priv->base + priv->control_regs[reg]);
+ writeb(newval, priv->pub.base0 + priv->control_regs[reg]);
/* dummy read to ensure write has completed */
- readb(priv->base + priv->control_regs[reg]);
- barrier_data(priv->base + priv->control_regs[reg]);
+ readb(priv->pub.base0 + priv->control_regs[reg]);
+ barrier_data(priv->pub.base0 + priv->control_regs[reg]);
continue;
} else
- writel(newval, priv->base + priv->control_regs[reg]);
+ writel(newval, priv->pub.base0 + priv->control_regs[reg]);
/* Wait until enabled clocks are really enabled */
mask &= ~priv->smstpcr_saved[reg].val;
if (!mask)
continue;
- error = readl_poll_timeout_atomic(priv->base + priv->status_regs[reg],
+ error = readl_poll_timeout_atomic(priv->pub.base0 + priv->status_regs[reg],
oldval, !(oldval & mask), 0, 10);
if (error)
dev_warn(dev, "Failed to enable SMSTP%u[0x%x]\n", reg,
@@ -1062,12 +1060,13 @@ static int __init cpg_mssr_common_init(struct device *dev,
if (!priv)
return -ENOMEM;
+ priv->pub.clks = priv->clks;
priv->np = np;
priv->dev = dev;
- spin_lock_init(&priv->rmw_lock);
+ spin_lock_init(&priv->pub.rmw_lock);
- priv->base = of_iomap(np, 0);
- if (!priv->base) {
+ priv->pub.base0 = of_iomap(np, 0);
+ if (!priv->pub.base0) {
error = -ENOMEM;
goto out_err;
}
@@ -1075,7 +1074,7 @@ static int __init cpg_mssr_common_init(struct device *dev,
priv->num_core_clks = info->num_total_core_clks;
priv->num_mod_clks = info->num_hw_mod_clks;
priv->last_dt_core_clk = info->last_dt_core_clk;
- RAW_INIT_NOTIFIER_HEAD(&priv->notifiers);
+ RAW_INIT_NOTIFIER_HEAD(&priv->pub.notifiers);
priv->reg_layout = info->reg_layout;
if (priv->reg_layout == CLK_REG_LAYOUT_RCAR_GEN2_AND_GEN3) {
priv->status_regs = mstpsr;
@@ -1095,7 +1094,7 @@ static int __init cpg_mssr_common_init(struct device *dev,
}
for (i = 0; i < nclks; i++)
- priv->clks[i] = ERR_PTR(-ENOENT);
+ priv->pub.clks[i] = ERR_PTR(-ENOENT);
error = cpg_mssr_reserved_init(priv, info);
if (error)
@@ -1112,8 +1111,8 @@ static int __init cpg_mssr_common_init(struct device *dev,
reserve_err:
cpg_mssr_reserved_exit(priv);
out_err:
- if (priv->base)
- iounmap(priv->base);
+ if (priv->pub.base0)
+ iounmap(priv->pub.base0);
kfree(priv);
return error;
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.h b/drivers/clk/renesas/renesas-cpg-mssr.h
index a1d6e0cbcff9..16337c5ed23e 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.h
+++ b/drivers/clk/renesas/renesas-cpg-mssr.h
@@ -8,6 +8,8 @@
#ifndef __CLK_RENESAS_CPG_MSSR_H__
#define __CLK_RENESAS_CPG_MSSR_H__
+#include <linux/notifier.h>
+
/*
* Definitions of CPG Core Clocks
*
@@ -27,6 +29,21 @@ struct cpg_core_clk {
unsigned int div;
unsigned int mult;
unsigned int offset;
+
+/**
+ * struct cpg_mssr_pub - Private data shared with
+ * device-specific clk registration code
+ *
+ * @base0: CPG/MSSR register block base0 address
+ * @rmw_lock: protects RMW register accesses
+ * @notifiers: Notifier chain to save/restore clock state for system resume
+ * @clks: pointer to clocks
+ */
+struct cpg_mssr_pub {
+ void __iomem *base0;
+ struct raw_notifier_head notifiers;
+ spinlock_t rmw_lock;
+ struct clk **clks;
};
enum clk_types {
@@ -153,8 +170,7 @@ struct cpg_mssr_info {
struct clk *(*cpg_clk_register)(struct device *dev,
const struct cpg_core_clk *core,
const struct cpg_mssr_info *info,
- struct clk **clks, void __iomem *base,
- struct raw_notifier_head *notifiers);
+ struct cpg_mssr_pub *pub);
};
extern const struct cpg_mssr_info r7s9210_cpg_mssr_info;
--
2.43.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 06/13] clk: renesas: Add support for R9A09G077 SoC
2025-02-26 13:09 [PATCH v3 00/13] Add initial support for Renesas RZ/T2H SoC Thierry Bultel
` (4 preceding siblings ...)
2025-02-26 13:09 ` [PATCH v3 05/13] clk: renesas: Pass sub struct of cpg_mssr_priv to cpg_clk_register Thierry Bultel
@ 2025-02-26 13:09 ` Thierry Bultel
2025-02-27 14:55 ` kernel test robot
2025-02-27 16:32 ` kernel test robot
2025-02-26 13:09 ` [PATCH v3 07/13] serial: sh-sci: Fix a comment about SCIFA Thierry Bultel
` (7 subsequent siblings)
13 siblings, 2 replies; 39+ messages in thread
From: Thierry Bultel @ 2025-02-26 13:09 UTC (permalink / raw)
To: thierry.bultel
Cc: linux-renesas-soc, geert, paul.barker.ct, Thierry Bultel,
linux-kernel, linux-clk
RZ/T2H has 2 registers blocks at different addresses.
The clock tree has configurable dividers and mux selectors.
Add these new clock types, new register layout type, and
registration code for mux and div in registration callback.
Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
---
drivers/clk/renesas/Kconfig | 5 +
drivers/clk/renesas/Makefile | 1 +
drivers/clk/renesas/r9a09g077-cpg-mssr.c | 237 +++++++++++++++++++++++
drivers/clk/renesas/renesas-cpg-mssr.c | 56 +++++-
drivers/clk/renesas/renesas-cpg-mssr.h | 23 +++
5 files changed, 321 insertions(+), 1 deletion(-)
create mode 100644 drivers/clk/renesas/r9a09g077-cpg-mssr.c
diff --git a/drivers/clk/renesas/Kconfig b/drivers/clk/renesas/Kconfig
index 5a4bc3f94d49..3f9c4deb4c25 100644
--- a/drivers/clk/renesas/Kconfig
+++ b/drivers/clk/renesas/Kconfig
@@ -42,6 +42,7 @@ config CLK_RENESAS
select CLK_R9A09G011 if ARCH_R9A09G011
select CLK_R9A09G047 if ARCH_R9A09G047
select CLK_R9A09G057 if ARCH_R9A09G057
+ select CLK_R9A09G077 if ARCH_R9A09G077
select CLK_SH73A0 if ARCH_SH73A0
if CLK_RENESAS
@@ -203,6 +204,10 @@ config CLK_R9A09G057
bool "RZ/V2H(P) clock support" if COMPILE_TEST
select CLK_RZV2H
+config CLK_R9A09G077
+ bool "RZ/T2H clock support" if COMPILE_TEST
+ select CLK_RENESAS_CPG_MSSR
+
config CLK_SH73A0
bool "SH-Mobile AG5 clock support" if COMPILE_TEST
select CLK_RENESAS_CPG_MSTP
diff --git a/drivers/clk/renesas/Makefile b/drivers/clk/renesas/Makefile
index 2d6e746939c4..3989515dfec3 100644
--- a/drivers/clk/renesas/Makefile
+++ b/drivers/clk/renesas/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_CLK_R8A779A0) += r8a779a0-cpg-mssr.o
obj-$(CONFIG_CLK_R8A779F0) += r8a779f0-cpg-mssr.o
obj-$(CONFIG_CLK_R8A779G0) += r8a779g0-cpg-mssr.o
obj-$(CONFIG_CLK_R8A779H0) += r8a779h0-cpg-mssr.o
+obj-$(CONFIG_CLK_R9A09G077) += r9a09g077-cpg-mssr.o
obj-$(CONFIG_CLK_R9A06G032) += r9a06g032-clocks.o
obj-$(CONFIG_CLK_R9A07G043) += r9a07g043-cpg.o
obj-$(CONFIG_CLK_R9A07G044) += r9a07g044-cpg.o
diff --git a/drivers/clk/renesas/r9a09g077-cpg-mssr.c b/drivers/clk/renesas/r9a09g077-cpg-mssr.c
new file mode 100644
index 000000000000..91521b1fc62e
--- /dev/null
+++ b/drivers/clk/renesas/r9a09g077-cpg-mssr.c
@@ -0,0 +1,237 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * r9a09g077 Clock Pulse Generator / Module Standby and Software Reset
+ *
+ * Copyright (C) 2025 Renesas Electronics Corp.
+ *
+ */
+
+#include <linux/clk-provider.h>
+#include <linux/device.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+
+#include <dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h>
+#include "renesas-cpg-mssr.h"
+
+#define SCKCR 0x00
+#define SCKCR2 0x04
+#define SCKCR3 0x08
+#define SCKCR4 0x0C
+#define PMSEL 0x10
+#define PMSEL_PLL0 BIT(0)
+#define PMSEL_PLL2 BIT(2)
+#define PMSEL_PLL3 BIT(3)
+#define PLL0EN BIT(0)
+#define PLL2EN BIT(0)
+#define PLL3EN BIT(0)
+#define PLL0MON 0x20
+#define PLL0EN_REG 0x30
+#define PLL0_SSC_CTR 0x34
+#define PLL1MON 0x40
+#define LOCOCR 0x70
+#define HIZCTRLEN 0x80
+#define PLL2MON 0x90
+#define PLL2EN_REG 0xA0
+#define PLL2_SSC_CTR 0xAC
+#define PLL3MON 0xB0
+#define PLL3EN_REG 0xC0
+#define PLL3_VCO_CTR0 0xC4
+#define PLL3_VCO_CTR1 0xC8
+#define PLL4MON 0xD0
+#define PHYSEL BIT(21)
+
+#define MRCTLA 0x240
+#define MRCTLE 0x250
+#define MRCTLI 0x260
+#define MRCTLM 0x270
+
+#define DDIV_PACK(offset, bitpos, size) \
+ (((offset) << 20) | ((bitpos) << 12) | ((size) << 8))
+
+#define DIVCA55 DDIV_PACK(SCKCR2, 8, 4)
+#define DIVCA55S DDIV_PACK(SCKCR2, 12, 1)
+#define DIVCR520 DDIV_PACK(SCKCR2, 2, 2)
+#define DIVCR521 DDIV_PACK(SCKCR2, 0, 2)
+#define DIVLCDC DDIV_PACK(SCKCR3, 20, 3)
+#define DIVCKIO DDIV_PACK(SCKCR, 16, 3)
+#define DIVETHPHY DDIV_PACK(SCKCR, 21, 1)
+#define DIVCANFD DDIV_PACK(SCKCR, 20, 1)
+#define DIVSPI0 DDIV_PACK(SCKCR3, 0, 2)
+#define DIVSPI1 DDIV_PACK(SCKCR3, 2, 2)
+#define DIVSPI2 DDIV_PACK(SCKCR3, 4, 2)
+#define DIVSPI3 DDIV_PACK(SCKCR2, 16, 2)
+
+#define SEL_PLL_PACK(offset, bitpos, size) \
+ (((offset) << 20) | ((bitpos) << 12) | ((size) << 8))
+
+#define SEL_PLL SEL_PLL_PACK(SCKCR, 22, 1)
+
+#define GET_SHIFT(val) FIELD_GET(GENMASK(19, 12), val)
+#define GET_WIDTH(val) FIELD_GET(GENMASK(11, 8), val)
+#define GET_REG_OFFSET(val) FIELD_GET(GENMASK(31, 20), val)
+
+enum clk_ids {
+ /* Core Clock Outputs exported to DT */
+ LAST_DT_CORE_CLK = R9A09G077_LCDC_CLKD,
+
+ /* External Input Clocks */
+ CLK_EXTAL,
+ CLK_LOCO,
+
+ /* Internal Core Clocks */
+ CLK_PLL0,
+ CLK_PLL1,
+ CLK_PLL2,
+ CLK_PLL3,
+ CLK_PLL4,
+ CLK_SEL_PLL0,
+ CLK_SEL_CLK_PLL0,
+ CLK_SEL_PLL1,
+ CLK_SEL_CLK_PLL1,
+ CLK_SEL_PLL2,
+ CLK_SEL_CLK_PLL2,
+ CLK_SEL_PLL4,
+ CLK_SEL_CLK_PLL4,
+ CLK_SEL_CLK_SRC,
+ CLK_SEL_EXTAL,
+ CLK_SEL_LOCO,
+ CLK_PLL3_INPUT,
+
+ /* Module Clocks */
+ MOD_CLK_BASE,
+};
+
+static const struct clk_div_table dtable_1_2[] = {
+ {0, 2},
+ {15, 1},
+ {0, 0},
+};
+
+/* Mux clock tables */
+static const char * const sel_clk_pll0[] = { ".sel_loco", ".sel_pll0" };
+static const char * const sel_clk_pll1[] = { ".sel_loco", ".sel_pll1" };
+static const char * const sel_clk_pll4[] = { ".sel_loco", ".sel_pll4" };
+
+static const struct cpg_core_clk r9a09g077_core_clks[] __initconst = {
+ /* External Clock Inputs */
+ DEF_INPUT("extal", CLK_EXTAL),
+ DEF_INPUT("loco", CLK_LOCO),
+
+ /* Internal Core Clocks */
+ DEF_FIXED(".pll0", CLK_PLL0, CLK_EXTAL, 48, 1),
+ DEF_FIXED(".pll1", CLK_PLL1, CLK_EXTAL, 40, 1),
+ DEF_FIXED(".pll4", CLK_PLL4, CLK_EXTAL, 96, 1),
+ DEF_FIXED(".sel_pll0", CLK_SEL_PLL0, CLK_PLL0, 1, 1),
+ DEF_MUX(".sel_clk_pll0", CLK_SEL_CLK_PLL0, SEL_PLL,
+ sel_clk_pll0, ARRAY_SIZE(sel_clk_pll0), 0, CLK_MUX_READ_ONLY),
+ DEF_FIXED(".sel_pll1", CLK_SEL_PLL1, CLK_PLL1, 1, 1),
+ DEF_MUX(".sel_clk_pll1", CLK_SEL_CLK_PLL1, SEL_PLL,
+ sel_clk_pll1, ARRAY_SIZE(sel_clk_pll1), 0, CLK_MUX_READ_ONLY),
+ DEF_FIXED(".sel_pll4", CLK_SEL_PLL4, CLK_PLL4, 1, 1),
+ DEF_MUX(".sel_clk_pll4", CLK_SEL_CLK_PLL4, SEL_PLL,
+ sel_clk_pll4, ARRAY_SIZE(sel_clk_pll4), 0, CLK_MUX_READ_ONLY),
+
+ /* Core output clk */
+ DEF_DIV("CA55", R9A09G077_CA55, CLK_SEL_CLK_PLL0, DIVCA55,
+ dtable_1_2, CLK_DIVIDER_HIWORD_MASK, 1),
+ DEF_FIXED("PCLKM", R9A09G077_PCLKM, CLK_SEL_CLK_PLL1, 1, 8),
+ DEF_FIXED("PCLKGPTL", R9A09G077_PCLKGPTL, CLK_SEL_CLK_PLL1, 1, 2),
+};
+
+static const struct mssr_mod_clk r9a09g077_mod_clks[] __initconst = {
+ DEF_MOD("sci0", 108, R9A09G077_PCLKM),
+};
+
+static struct clk * __init
+r9a09g077_cpg_div_clk_register(struct device *dev,
+ const struct cpg_core_clk *core,
+ void __iomem *base,
+ struct cpg_mssr_pub *pub)
+{
+ const struct clk *parent;
+ const char *parent_name;
+ struct clk_hw *clk_hw;
+
+ parent = pub->clks[core->parent];
+
+ if (IS_ERR(parent))
+ return ERR_CAST(parent);
+
+ parent_name = __clk_get_name(parent);
+
+ if (core->dtable)
+ clk_hw = clk_hw_register_divider_table(dev, core->name,
+ parent_name, 0,
+ base + GET_REG_OFFSET(core->conf),
+ GET_SHIFT(core->conf),
+ GET_WIDTH(core->conf),
+ core->flag,
+ core->dtable,
+ &pub->rmw_lock);
+ else
+ clk_hw = clk_hw_register_divider(dev, core->name,
+ parent_name, 0,
+ base + GET_REG_OFFSET(core->conf),
+ GET_SHIFT(core->conf),
+ GET_WIDTH(core->conf),
+ core->flag, &pub->rmw_lock);
+
+ if (IS_ERR(clk_hw))
+ return ERR_CAST(clk_hw);
+
+ return clk_hw->clk;
+
+}
+
+static struct clk * __init
+r9a09g077_cpg_mux_clk_register(struct device *dev,
+ const struct cpg_core_clk *core,
+ void __iomem *base,
+ struct cpg_mssr_pub *pub)
+{
+ struct clk_hw *clk_hw;
+
+ clk_hw = devm_clk_hw_register_mux(dev, core->name,
+ core->parent_names, core->num_parents,
+ core->flag,
+ base + GET_REG_OFFSET(core->conf),
+ GET_SHIFT(core->conf),
+ GET_WIDTH(core->conf),
+ core->mux_flags, &pub->rmw_lock);
+ return clk_hw->clk;
+}
+
+static struct clk * __init
+r9a09g077_cpg_clk_register(struct device *dev,
+ const struct cpg_core_clk *core,
+ const struct cpg_mssr_info *info,
+ struct cpg_mssr_pub *pub)
+{
+ void __iomem *base = core->sel_base ? pub->base1 : pub->base0;
+
+ switch (core->type) {
+ case CLK_TYPE_DIV:
+ return r9a09g077_cpg_div_clk_register(dev, core, base, pub);
+ case CLK_TYPE_MUX:
+ return r9a09g077_cpg_mux_clk_register(dev, core, base, pub);
+ default:
+ return ERR_PTR(-EINVAL);
+ }
+}
+
+const struct cpg_mssr_info r9a09g077_cpg_mssr_info = {
+ /* Core Clocks */
+ .core_clks = r9a09g077_core_clks,
+ .num_core_clks = ARRAY_SIZE(r9a09g077_core_clks),
+ .last_dt_core_clk = LAST_DT_CORE_CLK,
+ .num_total_core_clks = MOD_CLK_BASE,
+
+ /* Module Clocks */
+ .mod_clks = r9a09g077_mod_clks,
+ .num_mod_clks = ARRAY_SIZE(r9a09g077_mod_clks),
+ .num_hw_mod_clks = 12 * 32,
+
+ .reg_layout = CLK_REG_LAYOUT_RZ_T2H,
+ .cpg_clk_register = r9a09g077_cpg_clk_register,
+};
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c
index b78992217e58..397a301f7656 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.c
+++ b/drivers/clk/renesas/renesas-cpg-mssr.c
@@ -79,6 +79,27 @@ static const u16 mstpcr_for_gen4[] = {
0x2D60, 0x2D64, 0x2D68, 0x2D6C, 0x2D70, 0x2D74,
};
+/*
+ * Module Stop Control Register (RZ/T2H)
+ * RZ/T2H has 2 registers blocks,
+ * Bit 12 is used to differentiate them
+ */
+
+#define RZT2H_MSTPCR_BLOCK_SHIFT 12
+#define RZT2H_MSTPCR_OFFSET_MASK GENMASK(11, 0)
+#define RZT2H_MSTPCR(block, offset) (((block) << RZT2H_MSTPCR_BLOCK_SHIFT) & \
+ ((offset) & RZT2H_MSTPCR_OFFSET_MASK))
+
+#define RZT2H_MSTPCR_BLOCK(x) ((x) >> RZT2H_MSTPCR_BLOCK_SHIFT)
+#define RZT2H_MSTPCR_OFFSET(x) ((x) & RZT2H_MSTPCR_OFFSET_MASK)
+
+static const u16 mstpcr_for_rzt2h[] = {
+ RZT2H_MSTPCR(0, 0x300), RZT2H_MSTPCR(0, 0x304), RZT2H_MSTPCR(0, 0x308),
+ RZT2H_MSTPCR(0, 0x30c), RZT2H_MSTPCR(0, 0x310), RZT2H_MSTPCR(1, 0x318),
+ RZT2H_MSTPCR(1, 0x320), RZT2H_MSTPCR(0, 0x324), RZT2H_MSTPCR(0, 0x328),
+ RZT2H_MSTPCR(0, 0x32c), RZT2H_MSTPCR(0, 0x330), RZT2H_MSTPCR(1, 0x334),
+};
+
/*
* Standby Control Register offsets (RZ/A)
* Base address is FRQCR register
@@ -188,6 +209,15 @@ struct mstp_clock {
#define to_mstp_clock(_hw) container_of(_hw, struct mstp_clock, hw)
+static void *cpg_rzt2h_addr_from_offset(struct clk_hw *hw, u16 offset)
+{
+ struct mstp_clock *clock = to_mstp_clock(hw);
+ struct cpg_mssr_priv *priv = clock->priv;
+ void *base = RZT2H_MSTPCR_BLOCK(offset) ? priv->pub.base1 : priv->pub.base0;
+
+ return base + RZT2H_MSTPCR_OFFSET(offset);
+}
+
static int cpg_mstp_clock_endisable(struct clk_hw *hw, bool enable)
{
struct mstp_clock *clock = to_mstp_clock(hw);
@@ -227,7 +257,8 @@ static int cpg_mstp_clock_endisable(struct clk_hw *hw, bool enable)
spin_unlock_irqrestore(&priv->pub.rmw_lock, flags);
- if (!enable || priv->reg_layout == CLK_REG_LAYOUT_RZ_A)
+ if (!enable || priv->reg_layout == CLK_REG_LAYOUT_RZ_A ||
+ priv->reg_layout == CLK_REG_LAYOUT_RZ_T2H)
return 0;
error = readl_poll_timeout_atomic(priv->pub.base0 + priv->status_regs[reg],
@@ -258,6 +289,12 @@ static int cpg_mstp_clock_is_enabled(struct clk_hw *hw)
if (priv->reg_layout == CLK_REG_LAYOUT_RZ_A)
value = readb(priv->pub.base0 + priv->control_regs[reg]);
+ else if (priv->reg_layout == CLK_REG_LAYOUT_RZ_T2H) {
+ void __iomem *addr =
+ cpg_rzt2h_addr_from_offset(hw,
+ priv->control_regs[reg]);
+ value = readw(addr);
+ }
else
value = readl(priv->pub.base0 + priv->status_regs[reg]);
@@ -873,6 +910,12 @@ static const struct of_device_id cpg_mssr_match[] = {
.compatible = "renesas,r8a779h0-cpg-mssr",
.data = &r8a779h0_cpg_mssr_info,
},
+#endif
+#ifdef CONFIG_CLK_R9A09G077
+ {
+ .compatible = "renesas,r9a09g077-cpg-mssr",
+ .data = &r9a09g077_cpg_mssr_info,
+ },
#endif
{ /* sentinel */ }
};
@@ -1070,6 +1113,13 @@ static int __init cpg_mssr_common_init(struct device *dev,
error = -ENOMEM;
goto out_err;
}
+ if (info->reg_layout == CLK_REG_LAYOUT_RZ_T2H) {
+ priv->pub.base1 = of_iomap(np, 1);
+ if (!priv->pub.base1) {
+ error = -ENOMEM;
+ goto out_err;
+ }
+ }
priv->num_core_clks = info->num_total_core_clks;
priv->num_mod_clks = info->num_hw_mod_clks;
@@ -1083,6 +1133,8 @@ static int __init cpg_mssr_common_init(struct device *dev,
priv->reset_clear_regs = srstclr;
} else if (priv->reg_layout == CLK_REG_LAYOUT_RZ_A) {
priv->control_regs = stbcr;
+ } else if (priv->reg_layout == CLK_REG_LAYOUT_RZ_T2H) {
+ priv->control_regs = mstpcr_for_rzt2h;
} else if (priv->reg_layout == CLK_REG_LAYOUT_RCAR_GEN4) {
priv->status_regs = mstpsr_for_gen4;
priv->control_regs = mstpcr_for_gen4;
@@ -1113,6 +1165,8 @@ static int __init cpg_mssr_common_init(struct device *dev,
out_err:
if (priv->pub.base0)
iounmap(priv->pub.base0);
+ if (priv->pub.base1)
+ iounmap(priv->pub.base1);
kfree(priv);
return error;
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.h b/drivers/clk/renesas/renesas-cpg-mssr.h
index 16337c5ed23e..ccab4c1b216a 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.h
+++ b/drivers/clk/renesas/renesas-cpg-mssr.h
@@ -22,6 +22,8 @@
struct cpg_core_clk {
/* Common */
const char *name;
+ const char * const *parent_names;
+ const struct clk_div_table *dtable;
unsigned int id;
unsigned int type;
/* Depending on type */
@@ -29,18 +31,26 @@ struct cpg_core_clk {
unsigned int div;
unsigned int mult;
unsigned int offset;
+ unsigned int conf;
+ int flag;
+ int mux_flags;
+ int num_parents;
+ int sel_base;
+};
/**
* struct cpg_mssr_pub - Private data shared with
* device-specific clk registration code
*
* @base0: CPG/MSSR register block base0 address
+ * @base1: CPG/MSSR register block base1 address
* @rmw_lock: protects RMW register accesses
* @notifiers: Notifier chain to save/restore clock state for system resume
* @clks: pointer to clocks
*/
struct cpg_mssr_pub {
void __iomem *base0;
+ void __iomem *base1;
struct raw_notifier_head notifiers;
spinlock_t rmw_lock;
struct clk **clks;
@@ -53,6 +63,8 @@ enum clk_types {
CLK_TYPE_DIV6P1, /* DIV6 Clock with 1 parent clock */
CLK_TYPE_DIV6_RO, /* DIV6 Clock read only with extra divisor */
CLK_TYPE_FR, /* Fixed Rate Clock */
+ CLK_TYPE_DIV, /* Clock with divider */
+ CLK_TYPE_MUX, /* Clock with clock source selector */
/* Custom definitions start here */
CLK_TYPE_CUSTOM,
@@ -73,6 +85,15 @@ enum clk_types {
DEF_BASE(_name, _id, CLK_TYPE_DIV6_RO, _parent, .offset = _offset, .div = _div, .mult = 1)
#define DEF_RATE(_name, _id, _rate) \
DEF_TYPE(_name, _id, CLK_TYPE_FR, .mult = _rate)
+#define DEF_DIV(_name, _id, _parent, _conf, _dtable, _flag, _sel_base) \
+ DEF_TYPE(_name, _id, CLK_TYPE_DIV, .conf = _conf, \
+ .parent = _parent, .dtable = _dtable, .flag = _flag, .sel_base = _sel_base)
+#define DEF_MUX(_name, _id, _conf, _parent_names, _num_parents, _flag, \
+ _mux_flags) \
+ DEF_TYPE(_name, _id, CLK_TYPE_MUX, .conf = _conf, \
+ .parent_names = _parent_names, .num_parents = _num_parents, \
+ .flag = _flag, .mux_flags = _mux_flags)
+
/*
* Definitions of Module Clocks
@@ -106,6 +127,7 @@ enum clk_reg_layout {
CLK_REG_LAYOUT_RCAR_GEN2_AND_GEN3 = 0,
CLK_REG_LAYOUT_RZ_A,
CLK_REG_LAYOUT_RCAR_GEN4,
+ CLK_REG_LAYOUT_RZ_T2H,
};
/**
@@ -197,6 +219,7 @@ extern const struct cpg_mssr_info r8a779a0_cpg_mssr_info;
extern const struct cpg_mssr_info r8a779f0_cpg_mssr_info;
extern const struct cpg_mssr_info r8a779g0_cpg_mssr_info;
extern const struct cpg_mssr_info r8a779h0_cpg_mssr_info;
+extern const struct cpg_mssr_info r9a09g077_cpg_mssr_info;
void __init cpg_mssr_early_init(struct device_node *np,
const struct cpg_mssr_info *info);
--
2.43.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [PATCH v3 06/13] clk: renesas: Add support for R9A09G077 SoC
2025-02-26 13:09 ` [PATCH v3 06/13] clk: renesas: Add support for R9A09G077 SoC Thierry Bultel
@ 2025-02-27 14:55 ` kernel test robot
2025-02-27 16:32 ` kernel test robot
1 sibling, 0 replies; 39+ messages in thread
From: kernel test robot @ 2025-02-27 14:55 UTC (permalink / raw)
To: Thierry Bultel, thierry.bultel
Cc: oe-kbuild-all, linux-renesas-soc, geert, paul.barker.ct,
Thierry Bultel, linux-kernel, linux-clk
Hi Thierry,
kernel test robot noticed the following build errors:
[auto build test ERROR on tty/tty-testing]
[also build test ERROR on tty/tty-next tty/tty-linus geert-renesas-devel/next linus/master v6.14-rc4 next-20250227]
[cannot apply to geert-renesas-drivers/renesas-clk]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Thierry-Bultel/dt-bindings-clock-Add-cpg-for-the-Renesas-RZ-T2H-SoC/20250226-221033
base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty-testing
patch link: https://lore.kernel.org/r/20250226130935.3029927-7-thierry.bultel.yh%40bp.renesas.com
patch subject: [PATCH v3 06/13] clk: renesas: Add support for R9A09G077 SoC
config: sparc-allmodconfig (https://download.01.org/0day-ci/archive/20250227/202502272238.ZwLcNFEr-lkp@intel.com/config)
compiler: sparc64-linux-gcc (GCC) 14.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250227/202502272238.ZwLcNFEr-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202502272238.ZwLcNFEr-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from drivers/clk/renesas/r9a09g077-cpg-mssr.c:9:
drivers/clk/renesas/r9a09g077-cpg-mssr.c: In function 'r9a09g077_cpg_div_clk_register':
>> drivers/clk/renesas/r9a09g077-cpg-mssr.c:72:33: error: implicit declaration of function 'FIELD_GET' [-Wimplicit-function-declaration]
72 | #define GET_REG_OFFSET(val) FIELD_GET(GENMASK(31, 20), val)
| ^~~~~~~~~
include/linux/clk-provider.h:869:51: note: in definition of macro 'clk_hw_register_divider_table'
869 | NULL, (flags), (reg), (shift), (width), \
| ^~~
drivers/clk/renesas/r9a09g077-cpg-mssr.c:166:63: note: in expansion of macro 'GET_REG_OFFSET'
166 | base + GET_REG_OFFSET(core->conf),
| ^~~~~~~~~~~~~~
vim +/FIELD_GET +72 drivers/clk/renesas/r9a09g077-cpg-mssr.c
69
70 #define GET_SHIFT(val) FIELD_GET(GENMASK(19, 12), val)
71 #define GET_WIDTH(val) FIELD_GET(GENMASK(11, 8), val)
> 72 #define GET_REG_OFFSET(val) FIELD_GET(GENMASK(31, 20), val)
73
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v3 06/13] clk: renesas: Add support for R9A09G077 SoC
2025-02-26 13:09 ` [PATCH v3 06/13] clk: renesas: Add support for R9A09G077 SoC Thierry Bultel
2025-02-27 14:55 ` kernel test robot
@ 2025-02-27 16:32 ` kernel test robot
1 sibling, 0 replies; 39+ messages in thread
From: kernel test robot @ 2025-02-27 16:32 UTC (permalink / raw)
To: Thierry Bultel, thierry.bultel
Cc: oe-kbuild-all, linux-renesas-soc, geert, paul.barker.ct,
Thierry Bultel, linux-kernel, linux-clk
Hi Thierry,
kernel test robot noticed the following build warnings:
[auto build test WARNING on tty/tty-testing]
[also build test WARNING on tty/tty-next tty/tty-linus geert-renesas-devel/next linus/master v6.14-rc4 next-20250227]
[cannot apply to geert-renesas-drivers/renesas-clk]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Thierry-Bultel/dt-bindings-clock-Add-cpg-for-the-Renesas-RZ-T2H-SoC/20250226-221033
base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty-testing
patch link: https://lore.kernel.org/r/20250226130935.3029927-7-thierry.bultel.yh%40bp.renesas.com
patch subject: [PATCH v3 06/13] clk: renesas: Add support for R9A09G077 SoC
config: arc-randconfig-r122-20250227 (https://download.01.org/0day-ci/archive/20250228/202502280006.8lJfdpzm-lkp@intel.com/config)
compiler: arceb-elf-gcc (GCC) 13.2.0
reproduce: (https://download.01.org/0day-ci/archive/20250228/202502280006.8lJfdpzm-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202502280006.8lJfdpzm-lkp@intel.com/
sparse warnings: (new ones prefixed by >>)
>> drivers/clk/renesas/renesas-cpg-mssr.c:216:49: sparse: sparse: incorrect type in initializer (different address spaces) @@ expected void *base @@ got void [noderef] __iomem * @@
drivers/clk/renesas/renesas-cpg-mssr.c:216:49: sparse: expected void *base
drivers/clk/renesas/renesas-cpg-mssr.c:216:49: sparse: got void [noderef] __iomem *
>> drivers/clk/renesas/renesas-cpg-mssr.c:294:51: sparse: sparse: incorrect type in initializer (different address spaces) @@ expected void [noderef] __iomem *addr @@ got void * @@
drivers/clk/renesas/renesas-cpg-mssr.c:294:51: sparse: expected void [noderef] __iomem *addr
drivers/clk/renesas/renesas-cpg-mssr.c:294:51: sparse: got void *
vim +216 drivers/clk/renesas/renesas-cpg-mssr.c
211
212 static void *cpg_rzt2h_addr_from_offset(struct clk_hw *hw, u16 offset)
213 {
214 struct mstp_clock *clock = to_mstp_clock(hw);
215 struct cpg_mssr_priv *priv = clock->priv;
> 216 void *base = RZT2H_MSTPCR_BLOCK(offset) ? priv->pub.base1 : priv->pub.base0;
217
218 return base + RZT2H_MSTPCR_OFFSET(offset);
219 }
220
221 static int cpg_mstp_clock_endisable(struct clk_hw *hw, bool enable)
222 {
223 struct mstp_clock *clock = to_mstp_clock(hw);
224 struct cpg_mssr_priv *priv = clock->priv;
225 unsigned int reg = clock->index / 32;
226 unsigned int bit = clock->index % 32;
227 struct device *dev = priv->dev;
228 u32 bitmask = BIT(bit);
229 unsigned long flags;
230 u32 value;
231 int error;
232
233 dev_dbg(dev, "MSTP %u%02u/%pC %s\n", reg, bit, hw->clk,
234 enable ? "ON" : "OFF");
235 spin_lock_irqsave(&priv->pub.rmw_lock, flags);
236
237 if (priv->reg_layout == CLK_REG_LAYOUT_RZ_A) {
238 value = readb(priv->pub.base0 + priv->control_regs[reg]);
239 if (enable)
240 value &= ~bitmask;
241 else
242 value |= bitmask;
243 writeb(value, priv->pub.base0 + priv->control_regs[reg]);
244
245 /* dummy read to ensure write has completed */
246 readb(priv->pub.base0 + priv->control_regs[reg]);
247 barrier_data(priv->pub.base0 + priv->control_regs[reg]);
248
249 } else {
250 value = readl(priv->pub.base0 + priv->control_regs[reg]);
251 if (enable)
252 value &= ~bitmask;
253 else
254 value |= bitmask;
255 writel(value, priv->pub.base0 + priv->control_regs[reg]);
256 }
257
258 spin_unlock_irqrestore(&priv->pub.rmw_lock, flags);
259
260 if (!enable || priv->reg_layout == CLK_REG_LAYOUT_RZ_A ||
261 priv->reg_layout == CLK_REG_LAYOUT_RZ_T2H)
262 return 0;
263
264 error = readl_poll_timeout_atomic(priv->pub.base0 + priv->status_regs[reg],
265 value, !(value & bitmask), 0, 10);
266 if (error)
267 dev_err(dev, "Failed to enable SMSTP %p[%d]\n",
268 priv->pub.base0 + priv->control_regs[reg], bit);
269
270 return error;
271 }
272
273 static int cpg_mstp_clock_enable(struct clk_hw *hw)
274 {
275 return cpg_mstp_clock_endisable(hw, true);
276 }
277
278 static void cpg_mstp_clock_disable(struct clk_hw *hw)
279 {
280 cpg_mstp_clock_endisable(hw, false);
281 }
282
283 static int cpg_mstp_clock_is_enabled(struct clk_hw *hw)
284 {
285 struct mstp_clock *clock = to_mstp_clock(hw);
286 struct cpg_mssr_priv *priv = clock->priv;
287 unsigned int reg = clock->index / 32;
288 u32 value;
289
290 if (priv->reg_layout == CLK_REG_LAYOUT_RZ_A)
291 value = readb(priv->pub.base0 + priv->control_regs[reg]);
292 else if (priv->reg_layout == CLK_REG_LAYOUT_RZ_T2H) {
293 void __iomem *addr =
> 294 cpg_rzt2h_addr_from_offset(hw,
295 priv->control_regs[reg]);
296 value = readw(addr);
297 }
298 else
299 value = readl(priv->pub.base0 + priv->status_regs[reg]);
300
301 return !(value & BIT(clock->index % 32));
302 }
303
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH v3 07/13] serial: sh-sci: Fix a comment about SCIFA
2025-02-26 13:09 [PATCH v3 00/13] Add initial support for Renesas RZ/T2H SoC Thierry Bultel
` (5 preceding siblings ...)
2025-02-26 13:09 ` [PATCH v3 06/13] clk: renesas: Add support for R9A09G077 SoC Thierry Bultel
@ 2025-02-26 13:09 ` Thierry Bultel
2025-02-26 13:09 ` [PATCH v3 08/13] serial: sh-sci: Introduced function pointers Thierry Bultel
` (6 subsequent siblings)
13 siblings, 0 replies; 39+ messages in thread
From: Thierry Bultel @ 2025-02-26 13:09 UTC (permalink / raw)
To: thierry.bultel
Cc: linux-renesas-soc, geert, paul.barker.ct, Thierry Bultel,
linux-kernel, linux-serial
The comment was correct when it was added, at that time RZ/T1 was
the only SoC in the RZ/T line. Since then, further SoCs have been
added with RZ/T names which do not use the same SCIFA register
layout and so the comment is now misleading.
So we update the comment to explicitly reference only RZ/T1 SoCs.
Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
---
drivers/tty/serial/sh-sci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 4bc637f9d649..b591f3573337 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -305,7 +305,7 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = {
},
/*
- * The "SCIFA" that is in RZ/A2, RZ/G2L and RZ/T.
+ * The "SCIFA" that is in RZ/A2, RZ/G2L and RZ/T1.
* It looks like a normal SCIF with FIFO data, but with a
* compressed address space. Also, the break out of interrupts
* are different: ERI/BRI, RXI, TXI, TEI, DRI.
--
2.43.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 08/13] serial: sh-sci: Introduced function pointers
2025-02-26 13:09 [PATCH v3 00/13] Add initial support for Renesas RZ/T2H SoC Thierry Bultel
` (6 preceding siblings ...)
2025-02-26 13:09 ` [PATCH v3 07/13] serial: sh-sci: Fix a comment about SCIFA Thierry Bultel
@ 2025-02-26 13:09 ` Thierry Bultel
2025-02-27 14:15 ` kernel test robot
2025-02-26 13:09 ` [PATCH v3 09/13] serial: sh-sci: Introduced sci_of_data Thierry Bultel
` (5 subsequent siblings)
13 siblings, 1 reply; 39+ messages in thread
From: Thierry Bultel @ 2025-02-26 13:09 UTC (permalink / raw)
To: thierry.bultel
Cc: linux-renesas-soc, geert, paul.barker.ct, Thierry Bultel,
linux-kernel, linux-serial
The aim here is to prepare support for new sci controllers like
the T2H/RSCI whose registers are too much different for being
handled in common code.
This named serial controller also has 32 bits register,
so some return types had to be changed.
The needed generic functions are no longer static, with prototypes
defined in sh-sci-common.h so that they can be used from specific
implementation in a separate file, to keep this driver as little
changed as possible.
For doing so, a set of 'ops' is added to struct sci_port.
Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
---
drivers/tty/serial/sh-sci-common.h | 163 +++++++++++
drivers/tty/serial/sh-sci.c | 439 +++++++++++++++--------------
drivers/tty/serial/sh-sci.h | 2 -
3 files changed, 387 insertions(+), 217 deletions(-)
create mode 100644 drivers/tty/serial/sh-sci-common.h
diff --git a/drivers/tty/serial/sh-sci-common.h b/drivers/tty/serial/sh-sci-common.h
new file mode 100644
index 000000000000..7c3ae52bbd8a
--- /dev/null
+++ b/drivers/tty/serial/sh-sci-common.h
@@ -0,0 +1,163 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef __SH_SCI_COMMON_H__
+#define __SH_SCI_COMMON_H__
+
+#include <linux/serial_core.h>
+
+enum SCI_CLKS {
+ SCI_FCK, /* Functional Clock */
+ SCI_SCK, /* Optional External Clock */
+ SCI_BRG_INT, /* Optional BRG Internal Clock Source */
+ SCI_SCIF_CLK, /* Optional BRG External Clock Source */
+ SCI_NUM_CLKS
+};
+
+/* Offsets into the sci_port->irqs array */
+enum {
+ SCIx_ERI_IRQ,
+ SCIx_RXI_IRQ,
+ SCIx_TXI_IRQ,
+ SCIx_BRI_IRQ,
+ SCIx_DRI_IRQ,
+ SCIx_TEI_IRQ,
+ SCIx_NR_IRQS,
+
+ SCIx_MUX_IRQ = SCIx_NR_IRQS, /* special case */
+};
+
+/* Bit x set means sampling rate x + 1 is supported */
+#define SCI_SR(x) BIT((x) - 1)
+#define SCI_SR_RANGE(x, y) GENMASK((y) - 1, (x) - 1)
+
+void sci_release_port(struct uart_port *port);
+int sci_request_port(struct uart_port *port);
+void sci_config_port(struct uart_port *port, int flags);
+int sci_verify_port(struct uart_port *port, struct serial_struct *ser);
+void sci_pm(struct uart_port *port, unsigned int state,
+ unsigned int oldstate);
+
+#ifdef CONFIG_CONSOLE_POLL
+int sci_poll_get_char(struct uart_port *port);
+void sci_poll_put_char(struct uart_port *port, unsigned char c);
+#endif /* CONFIG_CONSOLE_POLL */
+
+struct plat_sci_reg {
+ u8 offset;
+ u8 size;
+};
+
+struct sci_port_params_bits {
+ unsigned int rxtx_enable;
+ unsigned int te_clear;
+ unsigned int poll_sent_bits;
+};
+
+struct sci_common_regs {
+ unsigned int status;
+ unsigned int control;
+};
+
+/* The actual number of needed registers. This is used by sci only */
+#define SCI_NR_REGS 20
+
+struct sci_port_params {
+ const struct plat_sci_reg regs[SCI_NR_REGS];
+ const struct sci_common_regs *common_regs;
+ const struct sci_port_params_bits *param_bits;
+ unsigned int fifosize;
+ unsigned int overrun_reg;
+ unsigned int overrun_mask;
+ unsigned int sampling_rate_mask;
+ unsigned int error_mask;
+ unsigned int error_clear;
+};
+
+struct sci_port_ops {
+ u32 (*read_reg)(struct uart_port *port, int reg);
+ void (*write_reg)(struct uart_port *port, int reg, int value);
+ void (*clear_SCxSR)(struct uart_port *port, unsigned int mask);
+
+ void (*transmit_chars)(struct uart_port *port);
+ void (*receive_chars)(struct uart_port *port);
+
+ void (*poll_put_char)(struct uart_port *port, unsigned char c);
+
+ int (*set_rtrg)(struct uart_port *port, int rx_trig);
+ int (*rtrg_enabled)(struct uart_port *port);
+
+ void (*shutdown_complete)(struct uart_port *port);
+
+ void (*prepare_console_write)(struct uart_port *port, u32 ctrl);
+ void (*console_save)(struct uart_port *port);
+ void (*console_restore)(struct uart_port *port);
+ size_t (*suspend_regs_size)(void);
+};
+
+struct sci_port {
+ struct uart_port port;
+
+ /* Platform configuration */
+ const struct sci_port_params *params;
+ const struct plat_sci_port *cfg;
+
+ unsigned int sampling_rate_mask;
+ resource_size_t reg_size;
+ struct mctrl_gpios *gpios;
+
+ /* Clocks */
+ struct clk *clks[SCI_NUM_CLKS];
+ unsigned long clk_rates[SCI_NUM_CLKS];
+
+ int irqs[SCIx_NR_IRQS];
+ char *irqstr[SCIx_NR_IRQS];
+
+ struct dma_chan *chan_tx;
+ struct dma_chan *chan_rx;
+
+ struct reset_control *rstc;
+ struct sci_suspend_regs *suspend_regs;
+
+#ifdef CONFIG_SERIAL_SH_SCI_DMA
+ struct dma_chan *chan_tx_saved;
+ struct dma_chan *chan_rx_saved;
+ dma_cookie_t cookie_tx;
+ dma_cookie_t cookie_rx[2];
+ dma_cookie_t active_rx;
+ dma_addr_t tx_dma_addr;
+ unsigned int tx_dma_len;
+ struct scatterlist sg_rx[2];
+ void *rx_buf[2];
+ size_t buf_len_rx;
+ struct work_struct work_tx;
+ struct hrtimer rx_timer;
+ unsigned int rx_timeout; /* microseconds */
+#endif
+ unsigned int rx_frame;
+ int rx_trigger;
+ struct timer_list rx_fifo_timer;
+ int rx_fifo_timeout;
+ u16 hscif_tot;
+
+ const struct sci_port_ops *ops;
+
+ bool has_rtscts;
+ bool autorts;
+ bool tx_occurred;
+};
+
+#define to_sci_port(uart) container_of((uart), struct sci_port, port)
+
+void sci_port_disable(struct sci_port *sci_port);
+void sci_port_enable(struct sci_port *sci_port);
+
+int sci_startup(struct uart_port *port);
+
+#define min_sr(_port) ffs((_port)->sampling_rate_mask)
+#define max_sr(_port) fls((_port)->sampling_rate_mask)
+
+#ifdef CONFIG_SERIAL_SH_SCI_EARLYCON
+int __init scix_early_console_setup(struct earlycon_device *device, int);
+#endif
+
+#endif /* __SH_SCI_COMMON_H__ */
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index b591f3573337..664446ea151c 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -56,19 +56,7 @@
#include "serial_mctrl_gpio.h"
#include "sh-sci.h"
-
-/* Offsets into the sci_port->irqs array */
-enum {
- SCIx_ERI_IRQ,
- SCIx_RXI_IRQ,
- SCIx_TXI_IRQ,
- SCIx_BRI_IRQ,
- SCIx_DRI_IRQ,
- SCIx_TEI_IRQ,
- SCIx_NR_IRQS,
-
- SCIx_MUX_IRQ = SCIx_NR_IRQS, /* special case */
-};
+#include "sh-sci-common.h"
#define SCIx_IRQ_IS_MUXED(port) \
((port)->irqs[SCIx_ERI_IRQ] == \
@@ -76,32 +64,38 @@ enum {
((port)->irqs[SCIx_ERI_IRQ] && \
((port)->irqs[SCIx_RXI_IRQ] < 0))
-enum SCI_CLKS {
- SCI_FCK, /* Functional Clock */
- SCI_SCK, /* Optional External Clock */
- SCI_BRG_INT, /* Optional BRG Internal Clock Source */
- SCI_SCIF_CLK, /* Optional BRG External Clock Source */
- SCI_NUM_CLKS
-};
-
-/* Bit x set means sampling rate x + 1 is supported */
-#define SCI_SR(x) BIT((x) - 1)
-#define SCI_SR_RANGE(x, y) GENMASK((y) - 1, (x) - 1)
-
#define SCI_SR_SCIFAB SCI_SR(5) | SCI_SR(7) | SCI_SR(11) | \
SCI_SR(13) | SCI_SR(16) | SCI_SR(17) | \
SCI_SR(19) | SCI_SR(27)
-#define min_sr(_port) ffs((_port)->sampling_rate_mask)
-#define max_sr(_port) fls((_port)->sampling_rate_mask)
-
/* Iterate over all supported sampling rates, from high to low */
#define for_each_sr(_sr, _port) \
for ((_sr) = max_sr(_port); (_sr) >= min_sr(_port); (_sr)--) \
if ((_port)->sampling_rate_mask & SCI_SR((_sr)))
-struct plat_sci_reg {
- u8 offset, size;
+#define SCI_NPORTS CONFIG_SERIAL_SH_SCI_NR_UARTS
+
+static struct sci_port sci_ports[SCI_NPORTS];
+static unsigned long sci_ports_in_use;
+static struct uart_driver sci_uart_driver;
+static bool sci_uart_earlycon;
+static bool sci_uart_earlycon_dev_probing;
+
+static const struct sci_port_params_bits sci_sci_port_params_bits = {
+ .rxtx_enable = SCSCR_RE | SCSCR_TE,
+ .te_clear = SCSCR_TE | SCSCR_TEIE,
+ .poll_sent_bits = SCI_TDRE | SCI_TEND
+};
+
+static const struct sci_port_params_bits sci_scif_port_params_bits = {
+ .rxtx_enable = SCSCR_RE | SCSCR_TE,
+ .te_clear = SCSCR_TE | SCSCR_TEIE,
+ .poll_sent_bits = SCIF_TDFE | SCIF_TEND
+};
+
+static const struct sci_common_regs sci_common_regs = {
+ .status = SCxSR,
+ .control = SCSCR,
};
struct sci_suspend_regs {
@@ -113,77 +107,9 @@ struct sci_suspend_regs {
u8 semr;
};
-struct sci_port_params {
- const struct plat_sci_reg regs[SCIx_NR_REGS];
- unsigned int fifosize;
- unsigned int overrun_reg;
- unsigned int overrun_mask;
- unsigned int sampling_rate_mask;
- unsigned int error_mask;
- unsigned int error_clear;
-};
-
-struct sci_port {
- struct uart_port port;
-
- /* Platform configuration */
- const struct sci_port_params *params;
- const struct plat_sci_port *cfg;
- unsigned int sampling_rate_mask;
- resource_size_t reg_size;
- struct mctrl_gpios *gpios;
-
- /* Clocks */
- struct clk *clks[SCI_NUM_CLKS];
- unsigned long clk_rates[SCI_NUM_CLKS];
-
- int irqs[SCIx_NR_IRQS];
- char *irqstr[SCIx_NR_IRQS];
-
- struct dma_chan *chan_tx;
- struct dma_chan *chan_rx;
-
- struct reset_control *rstc;
-
-#ifdef CONFIG_SERIAL_SH_SCI_DMA
- struct dma_chan *chan_tx_saved;
- struct dma_chan *chan_rx_saved;
- dma_cookie_t cookie_tx;
- dma_cookie_t cookie_rx[2];
- dma_cookie_t active_rx;
- dma_addr_t tx_dma_addr;
- unsigned int tx_dma_len;
- struct scatterlist sg_rx[2];
- void *rx_buf[2];
- size_t buf_len_rx;
- struct work_struct work_tx;
- struct hrtimer rx_timer;
- unsigned int rx_timeout; /* microseconds */
-#endif
- unsigned int rx_frame;
- int rx_trigger;
- struct timer_list rx_fifo_timer;
- int rx_fifo_timeout;
- struct sci_suspend_regs suspend_regs;
- u16 hscif_tot;
-
- bool has_rtscts;
- bool autorts;
- bool tx_occurred;
-};
-
-#define SCI_NPORTS CONFIG_SERIAL_SH_SCI_NR_UARTS
-
-static struct sci_port sci_ports[SCI_NPORTS];
-static unsigned long sci_ports_in_use;
-static struct uart_driver sci_uart_driver;
-static bool sci_uart_earlycon;
-static bool sci_uart_earlycon_dev_probing;
-
-static inline struct sci_port *
-to_sci_port(struct uart_port *uart)
+static size_t sci_suspend_regs_size(void)
{
- return container_of(uart, struct sci_port, port);
+ return sizeof(struct sci_suspend_regs);
}
static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = {
@@ -206,6 +132,8 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = {
.sampling_rate_mask = SCI_SR(32),
.error_mask = SCI_DEFAULT_ERROR_MASK | SCI_ORER,
.error_clear = SCI_ERROR_CLEAR & ~SCI_ORER,
+ .param_bits = &sci_sci_port_params_bits,
+ .common_regs = &sci_common_regs,
},
/*
@@ -228,6 +156,8 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = {
.sampling_rate_mask = SCI_SR(32),
.error_mask = SCI_DEFAULT_ERROR_MASK | SCI_ORER,
.error_clear = SCI_ERROR_CLEAR & ~SCI_ORER,
+ .param_bits = &sci_scif_port_params_bits,
+ .common_regs = &sci_common_regs,
},
/*
@@ -252,6 +182,8 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = {
.sampling_rate_mask = SCI_SR_SCIFAB,
.error_mask = SCIF_DEFAULT_ERROR_MASK | SCIFA_ORER,
.error_clear = SCIF_ERROR_CLEAR & ~SCIFA_ORER,
+ .param_bits = &sci_scif_port_params_bits,
+ .common_regs = &sci_common_regs,
},
/*
@@ -277,6 +209,8 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = {
.sampling_rate_mask = SCI_SR_SCIFAB,
.error_mask = SCIF_DEFAULT_ERROR_MASK | SCIFA_ORER,
.error_clear = SCIF_ERROR_CLEAR & ~SCIFA_ORER,
+ .param_bits = &sci_scif_port_params_bits,
+ .common_regs = &sci_common_regs,
},
/*
@@ -302,6 +236,8 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = {
.sampling_rate_mask = SCI_SR(32),
.error_mask = SCIF_DEFAULT_ERROR_MASK,
.error_clear = SCIF_ERROR_CLEAR,
+ .param_bits = &sci_scif_port_params_bits,
+ .common_regs = &sci_common_regs,
},
/*
@@ -330,6 +266,8 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = {
.sampling_rate_mask = SCI_SR(32),
.error_mask = SCIF_DEFAULT_ERROR_MASK,
.error_clear = SCIF_ERROR_CLEAR,
+ .param_bits = &sci_scif_port_params_bits,
+ .common_regs = &sci_common_regs,
},
/*
@@ -361,6 +299,8 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = {
.sampling_rate_mask = SCI_SR(32),
.error_mask = SCIF_DEFAULT_ERROR_MASK,
.error_clear = SCIF_ERROR_CLEAR,
+ .param_bits = &sci_scif_port_params_bits,
+ .common_regs = &sci_common_regs,
},
/*
@@ -383,6 +323,8 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = {
.sampling_rate_mask = SCI_SR(32),
.error_mask = SCIF_DEFAULT_ERROR_MASK,
.error_clear = SCIF_ERROR_CLEAR,
+ .param_bits = &sci_scif_port_params_bits,
+ .common_regs = &sci_common_regs,
},
/*
@@ -407,6 +349,8 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = {
.sampling_rate_mask = SCI_SR(32),
.error_mask = SCIF_DEFAULT_ERROR_MASK,
.error_clear = SCIF_ERROR_CLEAR,
+ .param_bits = &sci_scif_port_params_bits,
+ .common_regs = &sci_common_regs,
},
/*
@@ -434,6 +378,8 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = {
.sampling_rate_mask = SCI_SR(32),
.error_mask = SCIF_DEFAULT_ERROR_MASK,
.error_clear = SCIF_ERROR_CLEAR,
+ .param_bits = &sci_scif_port_params_bits,
+ .common_regs = &sci_common_regs,
},
/*
@@ -463,6 +409,8 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = {
.sampling_rate_mask = SCI_SR_RANGE(8, 32),
.error_mask = SCIF_DEFAULT_ERROR_MASK,
.error_clear = SCIF_ERROR_CLEAR,
+ .param_bits = &sci_scif_port_params_bits,
+ .common_regs = &sci_common_regs,
},
/*
@@ -487,6 +435,8 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = {
.sampling_rate_mask = SCI_SR(32),
.error_mask = SCIF_DEFAULT_ERROR_MASK,
.error_clear = SCIF_ERROR_CLEAR,
+ .param_bits = &sci_scif_port_params_bits,
+ .common_regs = &sci_common_regs,
},
/*
@@ -514,6 +464,8 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = {
.sampling_rate_mask = SCI_SR(32),
.error_mask = SCIF_DEFAULT_ERROR_MASK,
.error_clear = SCIF_ERROR_CLEAR,
+ .param_bits = &sci_scif_port_params_bits,
+ .common_regs = &sci_common_regs,
},
/*
@@ -537,6 +489,8 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = {
.sampling_rate_mask = SCI_SR(16),
.error_mask = SCIF_DEFAULT_ERROR_MASK | SCIFA_ORER,
.error_clear = SCIF_ERROR_CLEAR & ~SCIFA_ORER,
+ .param_bits = &sci_scif_port_params_bits,
+ .common_regs = &sci_common_regs,
},
};
@@ -574,7 +528,7 @@ static void sci_serial_out(struct uart_port *p, int offset, int value)
WARN(1, "Invalid register access\n");
}
-static void sci_port_enable(struct sci_port *sci_port)
+void sci_port_enable(struct sci_port *sci_port)
{
unsigned int i;
@@ -590,7 +544,7 @@ static void sci_port_enable(struct sci_port *sci_port)
sci_port->port.uartclk = sci_port->clk_rates[SCI_FCK];
}
-static void sci_port_disable(struct sci_port *sci_port)
+void sci_port_disable(struct sci_port *sci_port)
{
unsigned int i;
@@ -730,12 +684,13 @@ static void sci_clear_SCxSR(struct uart_port *port, unsigned int mask)
static int sci_poll_get_char(struct uart_port *port)
{
unsigned short status;
+ struct sci_port *s = to_sci_port(port);
int c;
do {
status = sci_serial_in(port, SCxSR);
if (status & SCxSR_ERRORS(port)) {
- sci_clear_SCxSR(port, SCxSR_ERROR_CLEAR(port));
+ s->ops->clear_SCxSR(port, SCxSR_ERROR_CLEAR(port));
continue;
}
break;
@@ -748,7 +703,7 @@ static int sci_poll_get_char(struct uart_port *port)
/* Dummy read */
sci_serial_in(port, SCxSR);
- sci_clear_SCxSR(port, SCxSR_RDxF_CLEAR(port));
+ s->ops->clear_SCxSR(port, SCxSR_RDxF_CLEAR(port));
return c;
}
@@ -756,14 +711,16 @@ static int sci_poll_get_char(struct uart_port *port)
static void sci_poll_put_char(struct uart_port *port, unsigned char c)
{
- unsigned short status;
+ struct sci_port *s = to_sci_port(port);
+ const struct sci_common_regs *regs = s->params->common_regs;
+ unsigned int status;
do {
- status = sci_serial_in(port, SCxSR);
+ status = s->ops->read_reg(port, regs->status);
} while (!(status & SCxSR_TDxE(port)));
sci_serial_out(port, SCxTDR, c);
- sci_clear_SCxSR(port, SCxSR_TDxE_CLEAR(port) & ~SCxSR_TEND(port));
+ s->ops->clear_SCxSR(port, SCxSR_TDxE_CLEAR(port) & ~SCxSR_TEND(port));
}
#endif /* CONFIG_CONSOLE_POLL || CONFIG_SERIAL_SH_SCI_CONSOLE ||
CONFIG_SERIAL_SH_SCI_EARLYCON */
@@ -906,7 +863,7 @@ static void sci_transmit_chars(struct uart_port *port)
port->icount.tx++;
} while (--count > 0);
- sci_clear_SCxSR(port, SCxSR_TDxE_CLEAR(port));
+ s->ops->clear_SCxSR(port, SCxSR_TDxE_CLEAR(port));
if (kfifo_len(&tport->xmit_fifo) < WAKEUP_CHARS)
uart_write_wakeup(port);
@@ -925,6 +882,7 @@ static void sci_transmit_chars(struct uart_port *port)
static void sci_receive_chars(struct uart_port *port)
{
struct tty_port *tport = &port->state->port;
+ struct sci_port *s = to_sci_port(port);
int i, count, copied = 0;
unsigned short status;
unsigned char flag;
@@ -979,7 +937,7 @@ static void sci_receive_chars(struct uart_port *port)
}
sci_serial_in(port, SCxSR); /* dummy read */
- sci_clear_SCxSR(port, SCxSR_RDxF_CLEAR(port));
+ s->ops->clear_SCxSR(port, SCxSR_RDxF_CLEAR(port));
copied += count;
port->icount.rx += count;
@@ -992,16 +950,17 @@ static void sci_receive_chars(struct uart_port *port)
/* TTY buffers full; read from RX reg to prevent lockup */
sci_serial_in(port, SCxRDR);
sci_serial_in(port, SCxSR); /* dummy read */
- sci_clear_SCxSR(port, SCxSR_RDxF_CLEAR(port));
+ s->ops->clear_SCxSR(port, SCxSR_RDxF_CLEAR(port));
}
}
static int sci_handle_errors(struct uart_port *port)
{
int copied = 0;
- unsigned short status = sci_serial_in(port, SCxSR);
- struct tty_port *tport = &port->state->port;
struct sci_port *s = to_sci_port(port);
+ const struct sci_common_regs *regs = s->params->common_regs;
+ unsigned int status = s->ops->read_reg(port, regs->status);
+ struct tty_port *tport = &port->state->port;
/* Handle overruns */
if (status & s->params->overrun_mask) {
@@ -1160,7 +1119,7 @@ static void rx_fifo_timer_fn(struct timer_list *t)
struct uart_port *port = &s->port;
dev_dbg(port->dev, "Rx timed out\n");
- scif_set_rtrg(port, 1);
+ s->ops->set_rtrg(port, 1);
}
static ssize_t rx_fifo_trigger_show(struct device *dev,
@@ -1185,9 +1144,9 @@ static ssize_t rx_fifo_trigger_store(struct device *dev,
if (ret)
return ret;
- sci->rx_trigger = scif_set_rtrg(port, r);
+ sci->rx_trigger = sci->ops->set_rtrg(port, r);
if (port->type == PORT_SCIFA || port->type == PORT_SCIFB)
- scif_set_rtrg(port, 1);
+ sci->ops->set_rtrg(port, 1);
return count;
}
@@ -1230,7 +1189,7 @@ static ssize_t rx_fifo_timeout_store(struct device *dev,
sci->hscif_tot = r << HSSCR_TOT_SHIFT;
} else {
sci->rx_fifo_timeout = r;
- scif_set_rtrg(port, 1);
+ sci->ops->set_rtrg(port, 1);
if (r > 0)
timer_setup(&sci->rx_fifo_timer, rx_fifo_timer_fn, 0);
}
@@ -1355,7 +1314,7 @@ static void sci_dma_rx_reenable_irq(struct sci_port *s)
s->cfg->regtype == SCIx_RZ_SCIFA_REGTYPE) {
enable_irq(s->irqs[SCIx_RXI_IRQ]);
if (s->cfg->regtype == SCIx_RZ_SCIFA_REGTYPE)
- scif_set_rtrg(port, s->rx_trigger);
+ s->ops->set_rtrg(port, s->rx_trigger);
else
scr &= ~SCSCR_RDRQE;
}
@@ -1794,7 +1753,7 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr)
s->cfg->regtype == SCIx_RZ_SCIFA_REGTYPE) {
disable_irq_nosync(s->irqs[SCIx_RXI_IRQ]);
if (s->cfg->regtype == SCIx_RZ_SCIFA_REGTYPE) {
- scif_set_rtrg(port, 1);
+ s->ops->set_rtrg(port, 1);
scr |= SCSCR_RIE;
} else {
scr |= SCSCR_RDRQE;
@@ -1820,8 +1779,8 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr)
#endif
if (s->rx_trigger > 1 && s->rx_fifo_timeout > 0) {
- if (!scif_rtrg_enabled(port))
- scif_set_rtrg(port, s->rx_trigger);
+ if (!s->ops->rtrg_enabled(port))
+ s->ops->set_rtrg(port, s->rx_trigger);
mod_timer(&s->rx_fifo_timer, jiffies + DIV_ROUND_UP(
s->rx_frame * HZ * s->rx_fifo_timeout, 1000000));
@@ -1831,7 +1790,7 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr)
* of whether the I_IXOFF is set, otherwise, how is the interrupt
* to be disabled?
*/
- sci_receive_chars(port);
+ s->ops->receive_chars(port);
return IRQ_HANDLED;
}
@@ -1840,9 +1799,10 @@ static irqreturn_t sci_tx_interrupt(int irq, void *ptr)
{
struct uart_port *port = ptr;
unsigned long flags;
+ struct sci_port *s = to_sci_port(port);
uart_port_lock_irqsave(port, &flags);
- sci_transmit_chars(port);
+ s->ops->transmit_chars(port);
uart_port_unlock_irqrestore(port, flags);
return IRQ_HANDLED;
@@ -1851,16 +1811,18 @@ static irqreturn_t sci_tx_interrupt(int irq, void *ptr)
static irqreturn_t sci_tx_end_interrupt(int irq, void *ptr)
{
struct uart_port *port = ptr;
+ struct sci_port *s = to_sci_port(port);
+ const struct sci_common_regs *regs = s->params->common_regs;
unsigned long flags;
- unsigned short ctrl;
+ u32 ctrl;
if (port->type != PORT_SCI)
return sci_tx_interrupt(irq, ptr);
uart_port_lock_irqsave(port, &flags);
- ctrl = sci_serial_in(port, SCSCR);
- ctrl &= ~(SCSCR_TE | SCSCR_TEIE);
- sci_serial_out(port, SCSCR, ctrl);
+ ctrl = s->ops->read_reg(port, regs->control) &
+ ~(s->params->param_bits->te_clear);
+ s->ops->write_reg(port, regs->control, ctrl);
uart_port_unlock_irqrestore(port, flags);
return IRQ_HANDLED;
@@ -1869,6 +1831,7 @@ static irqreturn_t sci_tx_end_interrupt(int irq, void *ptr)
static irqreturn_t sci_br_interrupt(int irq, void *ptr)
{
struct uart_port *port = ptr;
+ struct sci_port *s = to_sci_port(port);
/* Handle BREAKs */
sci_handle_breaks(port);
@@ -1876,7 +1839,7 @@ static irqreturn_t sci_br_interrupt(int irq, void *ptr)
/* drop invalid character received before break was detected */
sci_serial_in(port, SCxRDR);
- sci_clear_SCxSR(port, SCxSR_BREAK_CLEAR(port));
+ s->ops->clear_SCxSR(port, SCxSR_BREAK_CLEAR(port));
return IRQ_HANDLED;
}
@@ -1904,15 +1867,15 @@ static irqreturn_t sci_er_interrupt(int irq, void *ptr)
if (sci_handle_errors(port)) {
/* discard character in rx buffer */
sci_serial_in(port, SCxSR);
- sci_clear_SCxSR(port, SCxSR_RDxF_CLEAR(port));
+ s->ops->clear_SCxSR(port, SCxSR_RDxF_CLEAR(port));
}
} else {
sci_handle_fifo_overrun(port);
if (!s->chan_rx)
- sci_receive_chars(port);
+ s->ops->receive_chars(port);
}
- sci_clear_SCxSR(port, SCxSR_ERROR_CLEAR(port));
+ s->ops->clear_SCxSR(port, SCxSR_ERROR_CLEAR(port));
/* Kick the transmission */
if (!s->chan_tx)
@@ -2282,7 +2245,17 @@ static void sci_break_ctl(struct uart_port *port, int break_state)
uart_port_unlock_irqrestore(port, flags);
}
-static int sci_startup(struct uart_port *port)
+static void sci_shutdown_complete(struct uart_port *port)
+{
+ struct sci_port *s = to_sci_port(port);
+ u16 scr;
+
+ scr = sci_serial_in(port, SCSCR);
+ sci_serial_out(port, SCSCR,
+ scr & (SCSCR_CKE1 | SCSCR_CKE0 | s->hscif_tot));
+}
+
+int sci_startup(struct uart_port *port)
{
struct sci_port *s = to_sci_port(port);
int ret;
@@ -2305,7 +2278,6 @@ static void sci_shutdown(struct uart_port *port)
{
struct sci_port *s = to_sci_port(port);
unsigned long flags;
- u16 scr;
dev_dbg(port->dev, "%s(%d)\n", __func__, port->line);
@@ -2315,13 +2287,7 @@ static void sci_shutdown(struct uart_port *port)
uart_port_lock_irqsave(port, &flags);
sci_stop_rx(port);
sci_stop_tx(port);
- /*
- * Stop RX and TX, disable related interrupts, keep clock source
- * and HSCIF TOT bits
- */
- scr = sci_serial_in(port, SCSCR);
- sci_serial_out(port, SCSCR,
- scr & (SCSCR_CKE1 | SCSCR_CKE0 | s->hscif_tot));
+ s->ops->shutdown_complete(port);
uart_port_unlock_irqrestore(port, flags);
#ifdef CONFIG_SERIAL_SH_SCI_DMA
@@ -2398,8 +2364,8 @@ static int sci_brg_calc(struct sci_port *s, unsigned int bps,
/* calculate sample rate, BRR, and clock select */
static int sci_scbrr_calc(struct sci_port *s, unsigned int bps,
- unsigned int *brr, unsigned int *srr,
- unsigned int *cks)
+ unsigned int *brr, unsigned int *srr,
+ unsigned int *cks)
{
unsigned long freq = s->clk_rates[SCI_FCK];
unsigned int sr, br, prediv, scrate, c;
@@ -2476,9 +2442,9 @@ static void sci_reset(struct uart_port *port)
if (reg->size)
sci_serial_out(port, SCFCR, SCFCR_RFRST | SCFCR_TFRST);
- sci_clear_SCxSR(port,
- SCxSR_RDxF_CLEAR(port) & SCxSR_ERROR_CLEAR(port) &
- SCxSR_BREAK_CLEAR(port));
+ s->ops->clear_SCxSR(port,
+ SCxSR_RDxF_CLEAR(port) & SCxSR_ERROR_CLEAR(port) &
+ SCxSR_BREAK_CLEAR(port));
if (sci_getreg(port, SCLSR)->size) {
status = sci_serial_in(port, SCLSR);
status &= ~(SCLSR_TO | SCLSR_ORER);
@@ -2487,14 +2453,14 @@ static void sci_reset(struct uart_port *port)
if (s->rx_trigger > 1) {
if (s->rx_fifo_timeout) {
- scif_set_rtrg(port, 1);
+ s->ops->set_rtrg(port, 1);
timer_setup(&s->rx_fifo_timer, rx_fifo_timer_fn, 0);
} else {
if (port->type == PORT_SCIFA ||
port->type == PORT_SCIFB)
- scif_set_rtrg(port, 1);
+ s->ops->set_rtrg(port, 1);
else
- scif_set_rtrg(port, s->rx_trigger);
+ s->ops->set_rtrg(port, s->rx_trigger);
}
}
}
@@ -2754,7 +2720,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
sci_enable_ms(port);
}
-static void sci_pm(struct uart_port *port, unsigned int state,
+void sci_pm(struct uart_port *port, unsigned int state,
unsigned int oldstate)
{
struct sci_port *sci_port = to_sci_port(port);
@@ -2817,7 +2783,7 @@ static int sci_remap_port(struct uart_port *port)
return 0;
}
-static void sci_release_port(struct uart_port *port)
+void sci_release_port(struct uart_port *port)
{
struct sci_port *sport = to_sci_port(port);
@@ -2829,7 +2795,7 @@ static void sci_release_port(struct uart_port *port)
release_mem_region(port->mapbase, sport->reg_size);
}
-static int sci_request_port(struct uart_port *port)
+int sci_request_port(struct uart_port *port)
{
struct resource *res;
struct sci_port *sport = to_sci_port(port);
@@ -2851,7 +2817,7 @@ static int sci_request_port(struct uart_port *port)
return 0;
}
-static void sci_config_port(struct uart_port *port, int flags)
+void sci_config_port(struct uart_port *port, int flags)
{
if (flags & UART_CONFIG_TYPE) {
struct sci_port *sport = to_sci_port(port);
@@ -2861,7 +2827,7 @@ static void sci_config_port(struct uart_port *port, int flags)
}
}
-static int sci_verify_port(struct uart_port *port, struct serial_struct *ser)
+int sci_verify_port(struct uart_port *port, struct serial_struct *ser)
{
if (ser->baud_base < 2400)
/* No paper tape reader for Mitch.. */
@@ -2870,6 +2836,55 @@ static int sci_verify_port(struct uart_port *port, struct serial_struct *ser)
return 0;
}
+static void sci_prepare_console_write(struct uart_port *port, u32 ctrl)
+{
+ struct sci_port *s = to_sci_port(port);
+ u32 ctrl_temp =
+ s->params->param_bits->rxtx_enable |
+ (s->cfg->scscr & ~(SCSCR_CKE1 | SCSCR_CKE0)) |
+ (ctrl & (SCSCR_CKE1 | SCSCR_CKE0)) |
+ s->hscif_tot;
+ sci_serial_out(port, SCSCR, ctrl_temp);
+}
+
+static void sci_console_save(struct uart_port *port)
+{
+ struct sci_port *s = to_sci_port(port);
+ struct sci_suspend_regs *regs = s->suspend_regs;
+
+ if (sci_getreg(port, SCSMR)->size)
+ regs->scsmr = sci_serial_in(port, SCSMR);
+ if (sci_getreg(port, SCSCR)->size)
+ regs->scscr = sci_serial_in(port, SCSCR);
+ if (sci_getreg(port, SCFCR)->size)
+ regs->scfcr = sci_serial_in(port, SCFCR);
+ if (sci_getreg(port, SCSPTR)->size)
+ regs->scsptr = sci_serial_in(port, SCSPTR);
+ if (sci_getreg(port, SCBRR)->size)
+ regs->scbrr = sci_serial_in(port, SCBRR);
+ if (sci_getreg(port, SEMR)->size)
+ regs->semr = sci_serial_in(port, SEMR);
+}
+
+static void sci_console_restore(struct uart_port *port)
+{
+ struct sci_port *s = to_sci_port(port);
+ struct sci_suspend_regs *regs = s->suspend_regs;
+
+ if (sci_getreg(port, SCSMR)->size)
+ sci_serial_out(port, SCSMR, regs->scsmr);
+ if (sci_getreg(port, SCSCR)->size)
+ sci_serial_out(port, SCSCR, regs->scscr);
+ if (sci_getreg(port, SCFCR)->size)
+ sci_serial_out(port, SCFCR, regs->scfcr);
+ if (sci_getreg(port, SCSPTR)->size)
+ sci_serial_out(port, SCSPTR, regs->scsptr);
+ if (sci_getreg(port, SCBRR)->size)
+ sci_serial_out(port, SCBRR, regs->scbrr);
+ if (sci_getreg(port, SEMR)->size)
+ sci_serial_out(port, SEMR, regs->semr);
+}
+
static const struct uart_ops sci_uart_ops = {
.tx_empty = sci_tx_empty,
.set_mctrl = sci_set_mctrl,
@@ -2895,6 +2910,22 @@ static const struct uart_ops sci_uart_ops = {
#endif
};
+static const struct sci_port_ops sci_port_ops = {
+ .read_reg = sci_serial_in,
+ .write_reg = sci_serial_out,
+ .clear_SCxSR = sci_clear_SCxSR,
+ .transmit_chars = sci_transmit_chars,
+ .receive_chars = sci_receive_chars,
+ .poll_put_char = sci_poll_put_char,
+ .set_rtrg = scif_set_rtrg,
+ .rtrg_enabled = scif_rtrg_enabled,
+ .shutdown_complete = sci_shutdown_complete,
+ .prepare_console_write = sci_prepare_console_write,
+ .console_save = sci_console_save,
+ .console_restore = sci_console_restore,
+ .suspend_regs_size = sci_suspend_regs_size,
+};
+
static int sci_init_clocks(struct sci_port *sci_port, struct device *dev)
{
const char *clk_names[] = {
@@ -2988,6 +3019,7 @@ static int sci_init_single(struct platform_device *dev,
int ret;
sci_port->cfg = p;
+ sci_port->ops = &sci_port_ops;
port->ops = &sci_uart_ops;
port->iotype = UPIO_MEM;
@@ -3100,7 +3132,7 @@ static int sci_init_single(struct platform_device *dev,
defined(CONFIG_SERIAL_SH_SCI_EARLYCON)
static void serial_console_putchar(struct uart_port *port, unsigned char ch)
{
- sci_poll_put_char(port, ch);
+ to_sci_port(port)->ops->poll_put_char(port, ch);
}
/*
@@ -3112,7 +3144,9 @@ static void serial_console_write(struct console *co, const char *s,
{
struct sci_port *sci_port = &sci_ports[co->index];
struct uart_port *port = &sci_port->port;
- unsigned short bits, ctrl, ctrl_temp;
+ const struct sci_common_regs *regs = sci_port->params->common_regs;
+ unsigned int bits;
+ u32 ctrl;
unsigned long flags;
int locked = 1;
@@ -3124,21 +3158,21 @@ static void serial_console_write(struct console *co, const char *s,
uart_port_lock_irqsave(port, &flags);
/* first save SCSCR then disable interrupts, keep clock source */
- ctrl = sci_serial_in(port, SCSCR);
- ctrl_temp = SCSCR_RE | SCSCR_TE |
- (sci_port->cfg->scscr & ~(SCSCR_CKE1 | SCSCR_CKE0)) |
- (ctrl & (SCSCR_CKE1 | SCSCR_CKE0));
- sci_serial_out(port, SCSCR, ctrl_temp | sci_port->hscif_tot);
+
+ ctrl = sci_port->ops->read_reg(port, regs->control);
+ sci_port->ops->prepare_console_write(port, ctrl);
uart_console_write(port, s, count, serial_console_putchar);
/* wait until fifo is empty and last bit has been transmitted */
- bits = SCxSR_TDxE(port) | SCxSR_TEND(port);
- while ((sci_serial_in(port, SCxSR) & bits) != bits)
+
+ bits = sci_port->params->param_bits->poll_sent_bits;
+
+ while ((sci_port->ops->read_reg(port, regs->status) & bits) != bits)
cpu_relax();
/* restore the SCSCR */
- sci_serial_out(port, SCSCR, ctrl);
+ sci_port->ops->write_reg(port, regs->control, ctrl);
if (locked)
uart_port_unlock_irqrestore(port, flags);
@@ -3271,7 +3305,6 @@ static void sci_remove(struct platform_device *dev)
device_remove_file(&dev->dev, &dev_attr_rx_fifo_timeout);
}
-
#define SCI_OF_DATA(type, regtype) (void *)((type) << 16 | (regtype))
#define SCI_OF_TYPE(data) ((unsigned long)(data) >> 16)
#define SCI_OF_REGTYPE(data) ((unsigned long)(data) & 0xffff)
@@ -3508,6 +3541,11 @@ static int sci_probe(struct platform_device *dev)
}
sp = &sci_ports[dev_id];
+ sp->suspend_regs = devm_kzalloc(&dev->dev,
+ sp->ops->suspend_regs_size(),
+ GFP_KERNEL);
+ if (!sp->suspend_regs)
+ return -ENOMEM;
/*
* In case:
@@ -3559,44 +3597,6 @@ static int sci_probe(struct platform_device *dev)
return 0;
}
-static void sci_console_save(struct sci_port *s)
-{
- struct sci_suspend_regs *regs = &s->suspend_regs;
- struct uart_port *port = &s->port;
-
- if (sci_getreg(port, SCSMR)->size)
- regs->scsmr = sci_serial_in(port, SCSMR);
- if (sci_getreg(port, SCSCR)->size)
- regs->scscr = sci_serial_in(port, SCSCR);
- if (sci_getreg(port, SCFCR)->size)
- regs->scfcr = sci_serial_in(port, SCFCR);
- if (sci_getreg(port, SCSPTR)->size)
- regs->scsptr = sci_serial_in(port, SCSPTR);
- if (sci_getreg(port, SCBRR)->size)
- regs->scbrr = sci_serial_in(port, SCBRR);
- if (sci_getreg(port, SEMR)->size)
- regs->semr = sci_serial_in(port, SEMR);
-}
-
-static void sci_console_restore(struct sci_port *s)
-{
- struct sci_suspend_regs *regs = &s->suspend_regs;
- struct uart_port *port = &s->port;
-
- if (sci_getreg(port, SCSMR)->size)
- sci_serial_out(port, SCSMR, regs->scsmr);
- if (sci_getreg(port, SCSCR)->size)
- sci_serial_out(port, SCSCR, regs->scscr);
- if (sci_getreg(port, SCFCR)->size)
- sci_serial_out(port, SCFCR, regs->scfcr);
- if (sci_getreg(port, SCSPTR)->size)
- sci_serial_out(port, SCSPTR, regs->scsptr);
- if (sci_getreg(port, SCBRR)->size)
- sci_serial_out(port, SCBRR, regs->scbrr);
- if (sci_getreg(port, SEMR)->size)
- sci_serial_out(port, SEMR, regs->semr);
-}
-
static __maybe_unused int sci_suspend(struct device *dev)
{
struct sci_port *sport = dev_get_drvdata(dev);
@@ -3604,8 +3604,10 @@ static __maybe_unused int sci_suspend(struct device *dev)
if (sport) {
uart_suspend_port(&sci_uart_driver, &sport->port);
- if (!console_suspend_enabled && uart_console(&sport->port))
- sci_console_save(sport);
+ if (!console_suspend_enabled && uart_console(&sport->port)) {
+ if (sport->ops->console_save)
+ sport->ops->console_save(&sport->port);
+ }
else
return reset_control_assert(sport->rstc);
}
@@ -3619,7 +3621,8 @@ static __maybe_unused int sci_resume(struct device *dev)
if (sport) {
if (!console_suspend_enabled && uart_console(&sport->port)) {
- sci_console_restore(sport);
+ if (sport->ops->console_restore)
+ sport->ops->console_restore(&sport->port);
} else {
int ret = reset_control_deassert(sport->rstc);
@@ -3683,9 +3686,11 @@ static int early_console_exit(struct console *co)
return 0;
}
-static int __init early_console_setup(struct earlycon_device *device,
+int __init scix_early_console_setup(struct earlycon_device *device,
int type)
{
+ const struct sci_common_regs *regs;
+
if (!device->port.membase)
return -ENODEV;
@@ -3693,11 +3698,15 @@ static int __init early_console_setup(struct earlycon_device *device,
sci_ports[0].port = device->port;
port_cfg.type = type;
sci_ports[0].cfg = &port_cfg;
+ sci_ports[0].ops = &sci_port_ops;
sci_ports[0].params = sci_probe_regmap(&port_cfg);
sci_uart_earlycon = true;
- port_cfg.scscr = sci_serial_in(&sci_ports[0].port, SCSCR);
- sci_serial_out(&sci_ports[0].port, SCSCR,
- SCSCR_RE | SCSCR_TE | port_cfg.scscr);
+ regs = sci_ports[0].params->common_regs;
+
+ port_cfg.scscr = sci_ports[0].ops->read_reg(&sci_ports[0].port, regs->control);
+ sci_ports[0].ops->write_reg(&sci_ports[0].port,
+ regs->control,
+ sci_ports[0].params->param_bits->rxtx_enable | port_cfg.scscr);
device->con->write = serial_console_write;
device->con->exit = early_console_exit;
@@ -3707,41 +3716,41 @@ static int __init early_console_setup(struct earlycon_device *device,
static int __init sci_early_console_setup(struct earlycon_device *device,
const char *opt)
{
- return early_console_setup(device, PORT_SCI);
+ return scix_early_console_setup(device, PORT_SCI);
}
static int __init scif_early_console_setup(struct earlycon_device *device,
const char *opt)
{
- return early_console_setup(device, PORT_SCIF);
+ return scix_early_console_setup(device, PORT_SCIF);
}
static int __init rzscifa_early_console_setup(struct earlycon_device *device,
const char *opt)
{
port_cfg.regtype = SCIx_RZ_SCIFA_REGTYPE;
- return early_console_setup(device, PORT_SCIF);
+ return scix_early_console_setup(device, PORT_SCIF);
}
static int __init rzv2hscif_early_console_setup(struct earlycon_device *device,
const char *opt)
{
port_cfg.regtype = SCIx_RZV2H_SCIF_REGTYPE;
- return early_console_setup(device, PORT_SCIF);
+ return scix_early_console_setup(device, PORT_SCIF);
}
static int __init scifa_early_console_setup(struct earlycon_device *device,
const char *opt)
{
- return early_console_setup(device, PORT_SCIFA);
+ return scix_early_console_setup(device, PORT_SCIFA);
}
static int __init scifb_early_console_setup(struct earlycon_device *device,
const char *opt)
{
- return early_console_setup(device, PORT_SCIFB);
+ return scix_early_console_setup(device, PORT_SCIFB);
}
static int __init hscif_early_console_setup(struct earlycon_device *device,
const char *opt)
{
- return early_console_setup(device, PORT_HSCIF);
+ return scix_early_console_setup(device, PORT_HSCIF);
}
OF_EARLYCON_DECLARE(sci, "renesas,sci", sci_early_console_setup);
diff --git a/drivers/tty/serial/sh-sci.h b/drivers/tty/serial/sh-sci.h
index 0b65563c4e9e..951681aba586 100644
--- a/drivers/tty/serial/sh-sci.h
+++ b/drivers/tty/serial/sh-sci.h
@@ -32,8 +32,6 @@ enum {
HSRTRGR, /* Rx FIFO Data Count Trigger Register */
HSTTRGR, /* Tx FIFO Data Count Trigger Register */
SEMR, /* Serial extended mode register */
-
- SCIx_NR_REGS,
};
--
2.43.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [PATCH v3 08/13] serial: sh-sci: Introduced function pointers
2025-02-26 13:09 ` [PATCH v3 08/13] serial: sh-sci: Introduced function pointers Thierry Bultel
@ 2025-02-27 14:15 ` kernel test robot
0 siblings, 0 replies; 39+ messages in thread
From: kernel test robot @ 2025-02-27 14:15 UTC (permalink / raw)
To: Thierry Bultel, thierry.bultel
Cc: oe-kbuild-all, linux-renesas-soc, geert, paul.barker.ct,
Thierry Bultel, linux-kernel, linux-serial
Hi Thierry,
kernel test robot noticed the following build errors:
[auto build test ERROR on tty/tty-testing]
[also build test ERROR on tty/tty-next next-20250227]
[cannot apply to geert-renesas-drivers/renesas-clk tty/tty-linus geert-renesas-devel/next linus/master v6.14-rc4]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Thierry-Bultel/dt-bindings-clock-Add-cpg-for-the-Renesas-RZ-T2H-SoC/20250226-221033
base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty-testing
patch link: https://lore.kernel.org/r/20250226130935.3029927-9-thierry.bultel.yh%40bp.renesas.com
patch subject: [PATCH v3 08/13] serial: sh-sci: Introduced function pointers
config: sh-randconfig-001-20250227 (https://download.01.org/0day-ci/archive/20250227/202502272135.CkFShaQV-lkp@intel.com/config)
compiler: sh4-linux-gcc (GCC) 14.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250227/202502272135.CkFShaQV-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202502272135.CkFShaQV-lkp@intel.com/
All errors (new ones prefixed by >>):
>> drivers/tty/serial/sh-sci.c:2918:35: error: 'sci_poll_put_char' undeclared here (not in a function)
2918 | .poll_put_char = sci_poll_put_char,
| ^~~~~~~~~~~~~~~~~
vim +/sci_poll_put_char +2918 drivers/tty/serial/sh-sci.c
2911
2912 static const struct sci_port_ops sci_port_ops = {
2913 .read_reg = sci_serial_in,
2914 .write_reg = sci_serial_out,
2915 .clear_SCxSR = sci_clear_SCxSR,
2916 .transmit_chars = sci_transmit_chars,
2917 .receive_chars = sci_receive_chars,
> 2918 .poll_put_char = sci_poll_put_char,
2919 .set_rtrg = scif_set_rtrg,
2920 .rtrg_enabled = scif_rtrg_enabled,
2921 .shutdown_complete = sci_shutdown_complete,
2922 .prepare_console_write = sci_prepare_console_write,
2923 .console_save = sci_console_save,
2924 .console_restore = sci_console_restore,
2925 .suspend_regs_size = sci_suspend_regs_size,
2926 };
2927
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH v3 09/13] serial: sh-sci: Introduced sci_of_data
2025-02-26 13:09 [PATCH v3 00/13] Add initial support for Renesas RZ/T2H SoC Thierry Bultel
` (7 preceding siblings ...)
2025-02-26 13:09 ` [PATCH v3 08/13] serial: sh-sci: Introduced function pointers Thierry Bultel
@ 2025-02-26 13:09 ` Thierry Bultel
2025-02-27 13:23 ` kernel test robot
2025-03-06 10:17 ` Geert Uytterhoeven
2025-02-26 13:09 ` [PATCH v3 10/13] serial: sh-sci: Add support for RZ/T2H SCI Thierry Bultel
` (4 subsequent siblings)
13 siblings, 2 replies; 39+ messages in thread
From: Thierry Bultel @ 2025-02-26 13:09 UTC (permalink / raw)
To: thierry.bultel
Cc: linux-renesas-soc, geert, paul.barker.ct, Thierry Bultel,
linux-kernel, linux-serial
The aim here is to provide an easier support to more different SCI
controllers, like the RZ/T2H one.
The existing .data field of_sci_match is changed to a structure containing
all what that can be statically initialized, and avoid a call to
'sci_probe_regmap', in both 'sci_init_single', and 'early_console_setup'.
'sci_probe_regmap' is now assumed to be called in the only case where the
device description is from a board file instead of a dts.
In this way, there is no need to patch 'sci_probe_regmap' for adding new
SCI type, and also, the specific sci_port_params for a new SCI type can be
provided by an external file.
Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
---
drivers/tty/serial/sh-sci-common.h | 10 +-
drivers/tty/serial/sh-sci.c | 162 +++++++++++++++++++++--------
2 files changed, 130 insertions(+), 42 deletions(-)
diff --git a/drivers/tty/serial/sh-sci-common.h b/drivers/tty/serial/sh-sci-common.h
index 7c3ae52bbd8a..17d0eda0a2ed 100644
--- a/drivers/tty/serial/sh-sci-common.h
+++ b/drivers/tty/serial/sh-sci-common.h
@@ -94,6 +94,14 @@ struct sci_port_ops {
size_t (*suspend_regs_size)(void);
};
+struct sci_of_data {
+ const struct sci_port_params *params;
+ const struct uart_ops *uart_ops;
+ const struct sci_port_ops *ops;
+ unsigned short regtype;
+ unsigned short type;
+};
+
struct sci_port {
struct uart_port port;
@@ -157,7 +165,7 @@ int sci_startup(struct uart_port *port);
#define max_sr(_port) fls((_port)->sampling_rate_mask)
#ifdef CONFIG_SERIAL_SH_SCI_EARLYCON
-int __init scix_early_console_setup(struct earlycon_device *device, int);
+int __init scix_early_console_setup(struct earlycon_device *device, const struct sci_of_data *data);
#endif
#endif /* __SH_SCI_COMMON_H__ */
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 664446ea151c..827b10793b97 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -2969,10 +2969,13 @@ static int sci_init_clocks(struct sci_port *sci_port, struct device *dev)
}
static const struct sci_port_params *
-sci_probe_regmap(const struct plat_sci_port *cfg)
+sci_probe_regmap(const struct plat_sci_port *cfg, struct sci_port *sci_port)
{
unsigned int regtype;
+ sci_port->ops = &sci_port_ops;
+ sci_port->port.ops = &sci_uart_ops;
+
if (cfg->regtype != SCIx_PROBE_REGTYPE)
return &sci_port_params[cfg->regtype];
@@ -3019,9 +3022,7 @@ static int sci_init_single(struct platform_device *dev,
int ret;
sci_port->cfg = p;
- sci_port->ops = &sci_port_ops;
- port->ops = &sci_uart_ops;
port->iotype = UPIO_MEM;
port->line = index;
port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_SH_SCI_CONSOLE);
@@ -3061,10 +3062,6 @@ static int sci_init_single(struct platform_device *dev,
for (i = 1; i < ARRAY_SIZE(sci_port->irqs); i++)
sci_port->irqs[i] = sci_port->irqs[0];
- sci_port->params = sci_probe_regmap(p);
- if (unlikely(sci_port->params == NULL))
- return -EINVAL;
-
switch (p->type) {
case PORT_SCIFB:
sci_port->rx_trigger = 48;
@@ -3250,12 +3247,17 @@ static struct console early_serial_console = {
static int sci_probe_earlyprintk(struct platform_device *pdev)
{
const struct plat_sci_port *cfg = dev_get_platdata(&pdev->dev);
+ struct sci_port *sp = pdev->id;
if (early_serial_console.data)
return -EEXIST;
early_serial_console.index = pdev->id;
+ sp->params = sci_probe_regmap(cfg, sp);
+ if (!sp->params)
+ return -ENODEV;
+
sci_init_single(pdev, &sci_ports[pdev->id], pdev->id, cfg, true);
if (!strstr(early_serial_buf, "keep"))
@@ -3305,58 +3307,126 @@ static void sci_remove(struct platform_device *dev)
device_remove_file(&dev->dev, &dev_attr_rx_fifo_timeout);
}
-#define SCI_OF_DATA(type, regtype) (void *)((type) << 16 | (regtype))
-#define SCI_OF_TYPE(data) ((unsigned long)(data) >> 16)
-#define SCI_OF_REGTYPE(data) ((unsigned long)(data) & 0xffff)
+static const struct sci_of_data of_sci_scif_sh2 = {
+ .type = PORT_SCIF,
+ .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
+ .ops = &sci_port_ops,
+ .uart_ops = &sci_uart_ops,
+ .params = &sci_port_params[SCIx_SH2_SCIF_FIFODATA_REGTYPE],
+};
+
+static const struct sci_of_data of_sci_scif_rz_scifa = {
+ .type = PORT_SCIF,
+ .regtype = SCIx_RZ_SCIFA_REGTYPE,
+ .ops = &sci_port_ops,
+ .uart_ops = &sci_uart_ops,
+ .params = &sci_port_params[SCIx_RZ_SCIFA_REGTYPE],
+};
+
+static const struct sci_of_data of_sci_scif_rzv2h = {
+ .type = PORT_SCIF,
+ .regtype = SCIx_RZV2H_SCIF_REGTYPE,
+ .ops = &sci_port_ops,
+ .uart_ops = &sci_uart_ops,
+ .params = &sci_port_params[SCIx_RZV2H_SCIF_REGTYPE],
+};
+
+static const struct sci_of_data of_sci_rcar_scif = {
+ .type = PORT_SCIF,
+ .regtype = SCIx_SH4_SCIF_BRG_REGTYPE,
+ .ops = &sci_port_ops,
+ .uart_ops = &sci_uart_ops,
+ .params = &sci_port_params[SCIx_SH4_SCIF_BRG_REGTYPE],
+};
+
+static const struct sci_of_data of_sci_scif_sh4 = {
+ .type = PORT_SCIF,
+ .regtype = SCIx_SH4_SCIF_REGTYPE,
+ .ops = &sci_port_ops,
+ .uart_ops = &sci_uart_ops,
+ .params = &sci_port_params[SCIx_SH4_SCIF_REGTYPE],
+};
+
+static const struct sci_of_data of_sci_scifa = {
+ .type = PORT_SCIFA,
+ .regtype = SCIx_SCIFA_REGTYPE,
+ .ops = &sci_port_ops,
+ .uart_ops = &sci_uart_ops,
+ .params = &sci_port_params[SCIx_SCIFA_REGTYPE],
+};
+
+static const struct sci_of_data of_sci_scifb = {
+ .type = PORT_SCIFB,
+ .regtype = SCIx_SCIFB_REGTYPE,
+ .ops = &sci_port_ops,
+ .uart_ops = &sci_uart_ops,
+ .params = &sci_port_params[SCIx_SCIFB_REGTYPE],
+};
+
+static const struct sci_of_data of_sci_hscif = {
+ .type = PORT_HSCIF,
+ .regtype = SCIx_HSCIF_REGTYPE,
+ .ops = &sci_port_ops,
+ .uart_ops = &sci_uart_ops,
+ .params = &sci_port_params[SCIx_HSCIF_REGTYPE],
+};
+
+static const struct sci_of_data of_sci_sci = {
+ .type = PORT_SCI,
+ .regtype = SCIx_SCI_REGTYPE,
+ .ops = &sci_port_ops,
+ .uart_ops = &sci_uart_ops,
+ .params = &sci_port_params[SCIx_SCI_REGTYPE],
+};
static const struct of_device_id of_sci_match[] __maybe_unused = {
/* SoC-specific types */
{
.compatible = "renesas,scif-r7s72100",
- .data = SCI_OF_DATA(PORT_SCIF, SCIx_SH2_SCIF_FIFODATA_REGTYPE),
+ .data = &of_sci_scif_sh2,
},
{
.compatible = "renesas,scif-r7s9210",
- .data = SCI_OF_DATA(PORT_SCIF, SCIx_RZ_SCIFA_REGTYPE),
+ .data = &of_sci_scif_rz_scifa,
},
{
.compatible = "renesas,scif-r9a07g044",
- .data = SCI_OF_DATA(PORT_SCIF, SCIx_RZ_SCIFA_REGTYPE),
+ .data = &of_sci_scif_rz_scifa,
},
{
.compatible = "renesas,scif-r9a09g057",
- .data = SCI_OF_DATA(PORT_SCIF, SCIx_RZV2H_SCIF_REGTYPE),
+ .data = &of_sci_scif_rzv2h,
},
/* Family-specific types */
{
.compatible = "renesas,rcar-gen1-scif",
- .data = SCI_OF_DATA(PORT_SCIF, SCIx_SH4_SCIF_BRG_REGTYPE),
+ .data = &of_sci_rcar_scif,
}, {
.compatible = "renesas,rcar-gen2-scif",
- .data = SCI_OF_DATA(PORT_SCIF, SCIx_SH4_SCIF_BRG_REGTYPE),
+ .data = &of_sci_rcar_scif,
}, {
.compatible = "renesas,rcar-gen3-scif",
- .data = SCI_OF_DATA(PORT_SCIF, SCIx_SH4_SCIF_BRG_REGTYPE),
+ .data = &of_sci_rcar_scif
}, {
.compatible = "renesas,rcar-gen4-scif",
- .data = SCI_OF_DATA(PORT_SCIF, SCIx_SH4_SCIF_BRG_REGTYPE),
+ .data = &of_sci_rcar_scif
},
/* Generic types */
{
.compatible = "renesas,scif",
- .data = SCI_OF_DATA(PORT_SCIF, SCIx_SH4_SCIF_REGTYPE),
+ .data = &of_sci_scif_sh4,
}, {
.compatible = "renesas,scifa",
- .data = SCI_OF_DATA(PORT_SCIFA, SCIx_SCIFA_REGTYPE),
+ .data = &of_sci_scifa,
}, {
.compatible = "renesas,scifb",
- .data = SCI_OF_DATA(PORT_SCIFB, SCIx_SCIFB_REGTYPE),
+ .data = &of_sci_scifb,
}, {
.compatible = "renesas,hscif",
- .data = SCI_OF_DATA(PORT_HSCIF, SCIx_HSCIF_REGTYPE),
+ .data = &of_sci_hscif,
}, {
.compatible = "renesas,sci",
- .data = SCI_OF_DATA(PORT_SCI, SCIx_SCI_REGTYPE),
+ .data = &of_sci_sci,
}, {
/* Terminator */
},
@@ -3375,7 +3445,7 @@ static struct plat_sci_port *sci_parse_dt(struct platform_device *pdev,
struct reset_control *rstc;
struct plat_sci_port *p;
struct sci_port *sp;
- const void *data;
+ const struct sci_of_data *data;
int id, ret;
if (!IS_ENABLED(CONFIG_OF) || !np)
@@ -3422,8 +3492,12 @@ static struct plat_sci_port *sci_parse_dt(struct platform_device *pdev,
sp->rstc = rstc;
*dev_id = id;
- p->type = SCI_OF_TYPE(data);
- p->regtype = SCI_OF_REGTYPE(data);
+ p->type = data->type;
+ p->regtype = data->regtype;
+
+ sp->ops = data->ops;
+ sp->port.ops = data->uart_ops;
+ sp->params = data->params;
sp->has_rtscts = of_property_read_bool(np, "uart-has-rtscts");
@@ -3530,6 +3604,7 @@ static int sci_probe(struct platform_device *dev)
p = sci_parse_dt(dev, &dev_id);
if (IS_ERR(p))
return PTR_ERR(p);
+ sp = &sci_ports[dev_id];
} else {
p = dev->dev.platform_data;
if (p == NULL) {
@@ -3538,9 +3613,12 @@ static int sci_probe(struct platform_device *dev)
}
dev_id = dev->id;
+ sp = &sci_ports[dev_id];
+ sp->params = sci_probe_regmap(p, sp);
+ if (!sp->params)
+ return -ENODEV;
}
- sp = &sci_ports[dev_id];
sp->suspend_regs = devm_kzalloc(&dev->dev,
sp->ops->suspend_regs_size(),
GFP_KERNEL);
@@ -3687,19 +3765,23 @@ static int early_console_exit(struct console *co)
}
int __init scix_early_console_setup(struct earlycon_device *device,
- int type)
+ const struct sci_of_data *data)
{
const struct sci_common_regs *regs;
if (!device->port.membase)
return -ENODEV;
- device->port.type = type;
+ device->port.type = data->type;
sci_ports[0].port = device->port;
- port_cfg.type = type;
+
+ port_cfg.type = data->type;
+ port_cfg.regtype = data->regtype;
+
sci_ports[0].cfg = &port_cfg;
- sci_ports[0].ops = &sci_port_ops;
- sci_ports[0].params = sci_probe_regmap(&port_cfg);
+ sci_ports[0].params = data->params;
+ sci_ports[0].ops = data->ops;
+ sci_ports[0].port.ops = data->uart_ops;
sci_uart_earlycon = true;
regs = sci_ports[0].params->common_regs;
@@ -3716,41 +3798,39 @@ int __init scix_early_console_setup(struct earlycon_device *device,
static int __init sci_early_console_setup(struct earlycon_device *device,
const char *opt)
{
- return scix_early_console_setup(device, PORT_SCI);
+ return scix_early_console_setup(device, &of_sci_sci);
}
static int __init scif_early_console_setup(struct earlycon_device *device,
const char *opt)
{
- return scix_early_console_setup(device, PORT_SCIF);
+ return scix_early_console_setup(device, &of_sci_scif_sh4);
}
static int __init rzscifa_early_console_setup(struct earlycon_device *device,
const char *opt)
{
- port_cfg.regtype = SCIx_RZ_SCIFA_REGTYPE;
- return scix_early_console_setup(device, PORT_SCIF);
+ return scix_early_console_setup(device, &of_sci_scif_rz_scifa);
}
static int __init rzv2hscif_early_console_setup(struct earlycon_device *device,
const char *opt)
{
- port_cfg.regtype = SCIx_RZV2H_SCIF_REGTYPE;
- return scix_early_console_setup(device, PORT_SCIF);
+ return scix_early_console_setup(device, &of_sci_scif_rzv2h);
}
static int __init scifa_early_console_setup(struct earlycon_device *device,
const char *opt)
{
- return scix_early_console_setup(device, PORT_SCIFA);
+ return scix_early_console_setup(device, &of_sci_scifa);
}
static int __init scifb_early_console_setup(struct earlycon_device *device,
const char *opt)
{
- return scix_early_console_setup(device, PORT_SCIFB);
+ return scix_early_console_setup(device, &of_sci_scifb);
}
static int __init hscif_early_console_setup(struct earlycon_device *device,
const char *opt)
{
- return scix_early_console_setup(device, PORT_HSCIF);
+ return scix_early_console_setup(device, &of_sci_hscif);
}
OF_EARLYCON_DECLARE(sci, "renesas,sci", sci_early_console_setup);
--
2.43.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [PATCH v3 09/13] serial: sh-sci: Introduced sci_of_data
2025-02-26 13:09 ` [PATCH v3 09/13] serial: sh-sci: Introduced sci_of_data Thierry Bultel
@ 2025-02-27 13:23 ` kernel test robot
2025-03-06 10:17 ` Geert Uytterhoeven
1 sibling, 0 replies; 39+ messages in thread
From: kernel test robot @ 2025-02-27 13:23 UTC (permalink / raw)
To: Thierry Bultel, thierry.bultel
Cc: oe-kbuild-all, linux-renesas-soc, geert, paul.barker.ct,
Thierry Bultel, linux-kernel, linux-serial
Hi Thierry,
kernel test robot noticed the following build errors:
[auto build test ERROR on tty/tty-testing]
[also build test ERROR on tty/tty-next next-20250227]
[cannot apply to geert-renesas-drivers/renesas-clk tty/tty-linus geert-renesas-devel/next linus/master v6.14-rc4]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Thierry-Bultel/dt-bindings-clock-Add-cpg-for-the-Renesas-RZ-T2H-SoC/20250226-221033
base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty-testing
patch link: https://lore.kernel.org/r/20250226130935.3029927-10-thierry.bultel.yh%40bp.renesas.com
patch subject: [PATCH v3 09/13] serial: sh-sci: Introduced sci_of_data
config: sh-randconfig-002-20250227 (https://download.01.org/0day-ci/archive/20250227/202502272137.JyS2vQml-lkp@intel.com/config)
compiler: sh4-linux-gcc (GCC) 14.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250227/202502272137.JyS2vQml-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202502272137.JyS2vQml-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/tty/serial/sh-sci.c: In function 'sci_probe_earlyprintk':
>> drivers/tty/serial/sh-sci.c:3249:31: error: initialization of 'struct sci_port *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
3249 | struct sci_port *sp = pdev->id;
| ^~~~
vim +3249 drivers/tty/serial/sh-sci.c
3245
3246 static int sci_probe_earlyprintk(struct platform_device *pdev)
3247 {
3248 const struct plat_sci_port *cfg = dev_get_platdata(&pdev->dev);
> 3249 struct sci_port *sp = pdev->id;
3250
3251 if (early_serial_console.data)
3252 return -EEXIST;
3253
3254 early_serial_console.index = pdev->id;
3255
3256 sp->params = sci_probe_regmap(cfg, sp);
3257 if (!sp->params)
3258 return -ENODEV;
3259
3260 sci_init_single(pdev, &sci_ports[pdev->id], pdev->id, cfg, true);
3261
3262 if (!strstr(early_serial_buf, "keep"))
3263 early_serial_console.flags |= CON_BOOT;
3264
3265 register_console(&early_serial_console);
3266 return 0;
3267 }
3268 #endif
3269
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v3 09/13] serial: sh-sci: Introduced sci_of_data
2025-02-26 13:09 ` [PATCH v3 09/13] serial: sh-sci: Introduced sci_of_data Thierry Bultel
2025-02-27 13:23 ` kernel test robot
@ 2025-03-06 10:17 ` Geert Uytterhoeven
1 sibling, 0 replies; 39+ messages in thread
From: Geert Uytterhoeven @ 2025-03-06 10:17 UTC (permalink / raw)
To: Thierry Bultel
Cc: thierry.bultel, linux-renesas-soc, paul.barker.ct, linux-kernel,
linux-serial
Hi Thierry,
On Wed, 26 Feb 2025 at 14:10, Thierry Bultel
<thierry.bultel.yh@bp.renesas.com> wrote:
> The aim here is to provide an easier support to more different SCI
> controllers, like the RZ/T2H one.
>
> The existing .data field of_sci_match is changed to a structure containing
> all what that can be statically initialized, and avoid a call to
> 'sci_probe_regmap', in both 'sci_init_single', and 'early_console_setup'.
>
> 'sci_probe_regmap' is now assumed to be called in the only case where the
> device description is from a board file instead of a dts.
>
> In this way, there is no need to patch 'sci_probe_regmap' for adding new
> SCI type, and also, the specific sci_port_params for a new SCI type can be
> provided by an external file.
>
> Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
> Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
Thanks for your patch!
> --- a/drivers/tty/serial/sh-sci.c
> +++ b/drivers/tty/serial/sh-sci.c
> @@ -3250,12 +3247,17 @@ static struct console early_serial_console = {
> static int sci_probe_earlyprintk(struct platform_device *pdev)
> {
> const struct plat_sci_port *cfg = dev_get_platdata(&pdev->dev);
> + struct sci_port *sp = pdev->id;
"sp = &sci_ports[pdev->id]" makes it going again on QEMU RTS7751R2D.
>
> if (early_serial_console.data)
> return -EEXIST;
>
> early_serial_console.index = pdev->id;
>
> + sp->params = sci_probe_regmap(cfg, sp);
> + if (!sp->params)
> + return -ENODEV;
> +
> sci_init_single(pdev, &sci_ports[pdev->id], pdev->id, cfg, true);
Here you can reuse sp.
>
> if (!strstr(early_serial_buf, "keep"))
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH v3 10/13] serial: sh-sci: Add support for RZ/T2H SCI
2025-02-26 13:09 [PATCH v3 00/13] Add initial support for Renesas RZ/T2H SoC Thierry Bultel
` (8 preceding siblings ...)
2025-02-26 13:09 ` [PATCH v3 09/13] serial: sh-sci: Introduced sci_of_data Thierry Bultel
@ 2025-02-26 13:09 ` Thierry Bultel
2025-02-26 13:09 ` [PATCH v3 11/13] arm64: dts: renesas: Add initial support for renesas RZ/T2H SoC Thierry Bultel
` (3 subsequent siblings)
13 siblings, 0 replies; 39+ messages in thread
From: Thierry Bultel @ 2025-02-26 13:09 UTC (permalink / raw)
To: thierry.bultel
Cc: linux-renesas-soc, geert, paul.barker.ct, Thierry Bultel,
linux-kernel, linux-serial
Define a new RZSCI port type, and the RSCI 32 bits registers set.
The RZ/T2H SCI has a a fifo, and a quite different set of registers
from the orginal SH SCI ones.
DMA is not supported yet.
Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
---
drivers/tty/serial/Kconfig | 7 +
drivers/tty/serial/Makefile | 1 +
drivers/tty/serial/rzsci.c | 465 +++++++++++++++++++++++++++++++
drivers/tty/serial/rzsci.h | 12 +
drivers/tty/serial/sh-sci.c | 20 +-
include/linux/serial_sci.h | 3 +-
include/uapi/linux/serial_core.h | 3 +
7 files changed, 505 insertions(+), 6 deletions(-)
create mode 100644 drivers/tty/serial/rzsci.c
create mode 100644 drivers/tty/serial/rzsci.h
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 79a8186d3361..40114ae48677 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -675,6 +675,13 @@ config SERIAL_SH_SCI_DMA
depends on SERIAL_SH_SCI && DMA_ENGINE
default ARCH_RENESAS
+config SERIAL_RZ_SCI
+ tristate "Support for Renesas RZ/T2H SCI variant"
+ depends on SERIAL_SH_SCI
+ help
+ Support for the RZ/T2H SCI variant with fifo.
+ Say Y if you want to be able to use the RZ/T2H SCI serial port.
+
config SERIAL_HS_LPC32XX
tristate "LPC32XX high speed serial port support"
depends on ARCH_LPC32XX || COMPILE_TEST
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index d58d9f719889..28f00ac64bcb 100644
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -71,6 +71,7 @@ obj-$(CONFIG_SERIAL_QCOM_GENI) += qcom_geni_serial.o
obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
obj-$(CONFIG_SERIAL_RDA) += rda-uart.o
obj-$(CONFIG_SERIAL_RP2) += rp2.o
+obj-$(CONFIG_SERIAL_RZ_SCI) += rzsci.o
obj-$(CONFIG_SERIAL_SA1100) += sa1100.o
obj-$(CONFIG_SERIAL_SAMSUNG) += samsung_tty.o
obj-$(CONFIG_SERIAL_SB1250_DUART) += sb1250-duart.o
diff --git a/drivers/tty/serial/rzsci.c b/drivers/tty/serial/rzsci.c
new file mode 100644
index 000000000000..baf61e8a4a2a
--- /dev/null
+++ b/drivers/tty/serial/rzsci.c
@@ -0,0 +1,465 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2025 Renesas Electronics Corp.
+ */
+
+#include <linux/bitops.h>
+#include <linux/io.h>
+#include <linux/iopoll.h>
+#include <linux/serial_core.h>
+#include <linux/serial_sci.h>
+#include <linux/tty_flip.h>
+#include "rzsci.h"
+
+/* RSCI registers */
+#define RDR 0x00
+#define TDR 0x04
+#define CCR0 0x08
+#define CCR1 0x0C
+#define CCR2 0x10
+#define CCR3 0x14
+#define CCR4 0x18
+#define FCR 0x24
+#define DCR 0x30
+#define CSR 0x48
+#define FRSR 0x50
+#define FTSR 0x54
+#define CFCLR 0x68
+#define FFCLR 0x70
+
+/* RDR (Receive Data Register) */
+#define RDR_FFER BIT(12) /* FIFO Framing Error */
+#define RDR_FPER BIT(11) /* FIFO Parity Error */
+#define RDR_RDAT_MSK GENMASK(8, 0)
+
+/* TDR (Transmit Data Register) */
+#define TDR_MPBT BIT(9) /* Multiprocessor Transfer */
+#define TDR_TDAT_9BIT_LSHIFT 0
+#define TDR_TDAT_9BIT_VAL 0x1FF
+#define TDR_TDAT_9BIT_MSK (TDR_TDAT_9BIT_VAL << TDR_TDAT_9BIT_LSHIFT)
+
+/* CCR0 (Common Control Register 0) */
+#define CCR0_SSE BIT(24) /* SSn# Pin Function Enable */
+#define CCR0_TEIE BIT(21) /* Transmit End Interrupt Enable */
+#define CCR0_TIE BIT(20) /* Transmit Interrupt Enable */
+#define CCR0_RIE BIT(16) /* Receive Interrupt Enable */
+#define CCR0_IDSEL BIT(10) /* ID Frame Select */
+#define CCR0_DCME BIT(9) /* Data Compare Match Enable */
+#define CCR0_MPIE BIT(8) /* Multiprocessor Interrupt Enable */
+#define CCR0_TE BIT(4) /* Transmit Enable */
+#define CCR0_RE BIT(0) /* Receive Enable */
+
+/* CCR1 (Common Control Register 1) */
+#define CCR1_NFEN BIT(28) /* Digital Noise Filter Function */
+#define CCR1_SHARPS BIT(20) /* Half -duplex Communication Select */
+#define CCR1_SPLP BIT(16) /* Loopback Control */
+#define CCR1_RINV BIT(13) /* RxD invert */
+#define CCR1_TINV BIT(12) /* TxD invert */
+#define CCR1_PM BIT(9) /* Parity Mode */
+#define CCR1_PE BIT(8) /* Parity Enable */
+#define CCR1_SPB2IO BIT(5) /* Serial Port Break I/O */
+#define CCR1_SPB2DT BIT(4) /* Serial Port Break Data Select */
+#define CCR1_CTSPEN BIT(1) /* CTS External Pin Enable */
+#define CCR1_CTSE BIT(0) /* CTS Enable */
+
+/* FCR (FIFO Control Register) */
+#define FCR_RFRST BIT(23) /* Receive FIFO Data Register Reset */
+#define FCR_TFRST BIT(15) /* Transmit FIFO Data Register Reset */
+#define FCR_DRES BIT(0) /* Incoming Data Ready Error Select */
+#define FCR_RTRG4_0 GENMASK(20, 16)
+#define FCR_TTRG GENMASK(12, 8)
+
+/* CSR (Common Status Register) */
+#define CSR_RDRF BIT(31) /* Receive Data Full */
+#define CSR_TEND BIT(30) /* Transmit End Flag */
+#define CSR_TDRE BIT(29) /* Transmit Data Empty */
+#define CSR_FER BIT(28) /* Framing Error */
+#define CSR_PER BIT(27) /* Parity Error */
+#define CSR_MFF BIT(26) /* Mode Fault Error */
+#define CSR_ORER BIT(24) /* Overrun Error */
+#define CSR_DFER BIT(18) /* Data Compare Match Framing Error */
+#define CSR_DPER BIT(17) /* Data Compare Match Parity Error */
+#define CSR_DCMF BIT(16) /* Data Compare Match */
+#define CSR_RXDMON BIT(15) /* Serial Input Data Monitor */
+#define CSR_ERS BIT(4) /* Error Signal Status */
+
+#define SCxSR_ERRORS(port) (to_sci_port(port)->params->error_mask)
+#define SCxSR_ERROR_CLEAR(port) (to_sci_port(port)->params->error_clear)
+
+#define RSCI_DEFAULT_ERROR_MASK (CSR_PER | CSR_FER)
+
+#define RSCI_RDxF_CLEAR (CFCLR_RDRFC)
+#define RSCI_ERROR_CLEAR (CFCLR_PERC | CFCLR_FERC)
+#define RSCI_TDxE_CLEAR (CFCLR_TDREC)
+#define RSCI_BREAK_CLEAR (CFCLR_PERC | CFCLR_FERC | CFCLR_ORERC)
+
+/* FRSR (FIFO Receive Status Register) */
+#define FRSR_R5_0 GENMASK(13, 8) /* Receive FIFO Data Count */
+#define FRSR_DR BIT(0) /* Receive Data Ready */
+
+/* CFCLR (Common Flag CLear Register) */
+#define CFCLR_RDRFC BIT(31) /* RDRF Clear */
+#define CFCLR_TDREC BIT(29) /* TDRE Clear */
+#define CFCLR_FERC BIT(28) /* FER Clear */
+#define CFCLR_PERC BIT(27) /* PER Clear */
+#define CFCLR_MFFC BIT(26) /* MFF Clear */
+#define CFCLR_ORERC BIT(24) /* ORER Clear */
+#define CFCLR_DFERC BIT(18) /* DFER Clear */
+#define CFCLR_DPERC BIT(17) /* DPER Clear */
+#define CFCLR_DCMFC BIT(16) /* DCMF Clear */
+#define CFCLR_ERSC BIT(4) /* ERS Clear */
+#define CFCLR_CLRFLAG (CFCLR_RDRFC | CFCLR_FERC | CFCLR_PERC | \
+ CFCLR_MFFC | CFCLR_ORERC | CFCLR_DFERC | \
+ CFCLR_DPERC | CFCLR_DCMFC | CFCLR_ERSC)
+
+/* FFCLR (FIFO Flag CLear Register) */
+#define FFCLR_DRC BIT(0) /* DR Clear */
+
+#define DCR_DEPOL BIT(0)
+
+static u32 rzsci_serial_in(struct uart_port *p, int offset)
+{
+ return readl(p->membase + offset);
+}
+
+static void rzsci_serial_out(struct uart_port *p, int offset, int value)
+{
+ writel(value, p->membase + offset);
+}
+
+static void rzsci_clear_DRxC(struct uart_port *port)
+{
+ rzsci_serial_out(port, CFCLR, CFCLR_RDRFC);
+ rzsci_serial_out(port, FFCLR, FFCLR_DRC);
+}
+
+static void rzsci_clear_SCxSR(struct uart_port *port, unsigned int mask)
+{
+ rzsci_serial_out(port, CFCLR, mask);
+}
+
+static void rzsci_start_rx(struct uart_port *port)
+{
+ unsigned int ctrl;
+
+ ctrl = rzsci_serial_in(port, CCR0);
+ ctrl |= CCR0_RIE;
+ rzsci_serial_out(port, CCR0, ctrl);
+}
+
+static void rzsci_set_termios(struct uart_port *port, struct ktermios *termios,
+ const struct ktermios *old)
+{
+ struct sci_port *s = to_sci_port(port);
+ unsigned long flags;
+
+ sci_port_enable(s);
+ uart_port_lock_irqsave(port, &flags);
+
+ /* For now, only RX enabling is supported */
+ if (termios->c_cflag & CREAD)
+ rzsci_start_rx(port);
+
+ uart_port_unlock_irqrestore(port, flags);
+ sci_port_disable(s);
+}
+
+static int rzsci_txfill(struct uart_port *port)
+{
+ return rzsci_serial_in(port, FTSR);
+}
+
+static int rzsci_rxfill(struct uart_port *port)
+{
+ u32 val = rzsci_serial_in(port, FRSR);
+
+ return FIELD_GET(FRSR_R5_0, val);
+}
+
+static unsigned int rzsci_tx_empty(struct uart_port *port)
+{
+ unsigned int status = rzsci_serial_in(port, CSR);
+ unsigned int in_tx_fifo = rzsci_txfill(port);
+
+ return (status & CSR_TEND) && !in_tx_fifo ? TIOCSER_TEMT : 0;
+}
+
+static void rzsci_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+ /* Not supported yet */
+}
+
+static unsigned int rzsci_get_mctrl(struct uart_port *port)
+{
+ /* Not supported yet */
+ return 0;
+}
+
+static void rzsci_clear_CFC(struct uart_port *port, unsigned int mask)
+{
+ rzsci_serial_out(port, CFCLR, mask);
+}
+
+static void rzsci_start_tx(struct uart_port *port)
+{
+ struct sci_port *sp = to_sci_port(port);
+ u32 ctrl;
+
+ if (sp->chan_tx)
+ return;
+
+ /*
+ * TE (Transmit Enable) must be set after setting TIE
+ * (Transmit Interrupt Enable) or in the same instruction
+ * to start the transmit process.
+ */
+ ctrl = rzsci_serial_in(port, CCR0);
+ ctrl |= CCR0_TIE | CCR0_TE;
+ rzsci_serial_out(port, CCR0, ctrl);
+}
+
+static void rzsci_stop_tx(struct uart_port *port)
+{
+ u32 ctrl;
+
+ ctrl = rzsci_serial_in(port, CCR0);
+ ctrl &= ~CCR0_TIE;
+ rzsci_serial_out(port, CCR0, ctrl);
+}
+
+static void rzsci_stop_rx(struct uart_port *port)
+{
+ u32 ctrl;
+
+ ctrl = rzsci_serial_in(port, CCR0);
+ ctrl &= ~CCR0_RIE;
+ rzsci_serial_out(port, CCR0, ctrl);
+}
+
+static int rzsci_txroom(struct uart_port *port)
+{
+ return port->fifosize - rzsci_txfill(port);
+}
+
+static void rzsci_transmit_chars(struct uart_port *port)
+{
+ struct tty_port *tport = &port->state->port;
+ unsigned int stopped = uart_tx_stopped(port);
+ u32 status, ctrl;
+ int count;
+
+ status = rzsci_serial_in(port, CSR);
+ if (!(status & CSR_TDRE)) {
+ ctrl = rzsci_serial_in(port, CCR0);
+ if (kfifo_is_empty(&tport->xmit_fifo))
+ ctrl &= ~CCR0_TIE;
+ else
+ ctrl |= CCR0_TIE;
+ rzsci_serial_out(port, CCR0, ctrl);
+ return;
+ }
+
+ count = rzsci_txroom(port);
+
+ do {
+ unsigned char c;
+
+ if (port->x_char) {
+ c = port->x_char;
+ port->x_char = 0;
+ } else if (stopped || !kfifo_get(&tport->xmit_fifo, &c)) {
+ break;
+ }
+
+ rzsci_clear_CFC(port, CFCLR_TDREC);
+ rzsci_serial_out(port, TDR, c);
+
+ port->icount.tx++;
+ } while (--count > 0);
+
+ if (kfifo_len(&tport->xmit_fifo) < WAKEUP_CHARS)
+ uart_write_wakeup(port);
+
+ if (kfifo_is_empty(&tport->xmit_fifo)) {
+ ctrl = rzsci_serial_in(port, CCR0);
+ ctrl &= ~CCR0_TIE;
+ ctrl |= CCR0_TEIE;
+ rzsci_serial_out(port, CCR0, ctrl);
+ }
+}
+
+static void rzsci_receive_chars(struct uart_port *port)
+{
+ struct tty_port *tport = &port->state->port;
+ u32 rdat, status, frsr_status = 0;
+ int i, count, copied = 0;
+ unsigned char flag;
+
+ status = rzsci_serial_in(port, CSR);
+ frsr_status = rzsci_serial_in(port, FRSR);
+
+ if (!(status & CSR_RDRF) && !(frsr_status & FRSR_DR))
+ return;
+
+ while (1) {
+ /* Don't copy more bytes than there is room for in the buffer */
+ count = tty_buffer_request_room(tport, rzsci_rxfill(port));
+
+ /* If for any reason we can't copy more data, we're done! */
+ if (count == 0)
+ break;
+
+ for (i = 0; i < count; i++) {
+ char c;
+
+ rdat = rzsci_serial_in(port, RDR);
+ /* 9-bits data is not supported yet */
+ c = rdat & RDR_RDAT_MSK;
+
+ if (uart_handle_sysrq_char(port, c)) {
+ count--;
+ i--;
+ continue;
+ }
+
+ /* Store data and status.
+ * Non FIFO mode is not supported
+ */
+ if (rdat & RDR_FFER) {
+ flag = TTY_FRAME;
+ port->icount.frame++;
+ } else if (rdat & RDR_FPER) {
+ flag = TTY_PARITY;
+ port->icount.parity++;
+ } else {
+ flag = TTY_NORMAL;
+ }
+
+ tty_insert_flip_char(tport, c, flag);
+ }
+
+ rzsci_serial_in(port, CSR); /* dummy read */
+ rzsci_clear_DRxC(port);
+
+ copied += count;
+ port->icount.rx += count;
+ }
+
+ if (copied) {
+ /* Tell the rest of the system the news. New characters! */
+ tty_flip_buffer_push(tport);
+ } else {
+ /* TTY buffers full; read from RX reg to prevent lockup */
+ rzsci_serial_in(port, RDR);
+ rzsci_serial_in(port, CSR); /* dummy read */
+ rzsci_clear_DRxC(port);
+ }
+}
+
+static void rzsci_poll_put_char(struct uart_port *port, unsigned char c)
+{
+ u32 status;
+ int ret;
+
+ ret = readl_relaxed_poll_timeout_atomic(port->membase + CSR, status,
+ (status & CSR_TDRE), 100,
+ USEC_PER_SEC);
+ if (ret != 0) {
+ dev_err(port->dev,
+ "Error while sending data in UART TX : %d\n", ret);
+ goto done;
+ }
+ rzsci_serial_out(port, TDR, c);
+done:
+ rzsci_clear_SCxSR(port, CFCLR_TDREC);
+}
+
+static void rzsci_prepare_console_write(struct uart_port *port, u32 ctrl)
+{
+ struct sci_port *s = to_sci_port(port);
+ u32 ctrl_temp =
+ s->params->param_bits->rxtx_enable |
+ CCR0_TIE |
+ s->hscif_tot;
+ rzsci_serial_out(port, CCR0, ctrl_temp);
+}
+
+static const char *rzsci_type(struct uart_port *port)
+{
+ return "rzsci";
+}
+
+static size_t rzsci_suspend_regs_size(void)
+{
+ return 0;
+}
+
+static const struct sci_common_regs rzsci_common_regs = {
+ .status = CSR,
+ .control = CCR0,
+};
+
+static const struct sci_port_params_bits rzsci_port_param_bits = {
+ .rxtx_enable = CCR0_RE | CCR0_TE,
+ .te_clear = CCR0_TE | CCR0_TEIE,
+ .poll_sent_bits = CSR_TDRE | CSR_TEND,
+};
+
+static const struct sci_port_params rzsci_port_params = {
+ .fifosize = 16,
+ .overrun_reg = CSR,
+ .overrun_mask = CSR_ORER,
+ .sampling_rate_mask = SCI_SR(32),
+ .error_mask = RSCI_DEFAULT_ERROR_MASK,
+ .error_clear = RSCI_ERROR_CLEAR,
+ .param_bits = &rzsci_port_param_bits,
+ .common_regs = &rzsci_common_regs,
+};
+
+static const struct uart_ops rzt2_sci_uart_ops = {
+ .tx_empty = rzsci_tx_empty,
+ .set_mctrl = rzsci_set_mctrl,
+ .get_mctrl = rzsci_get_mctrl,
+ .start_tx = rzsci_start_tx,
+ .stop_tx = rzsci_stop_tx,
+ .stop_rx = rzsci_stop_rx,
+ .startup = sci_startup,
+ .set_termios = rzsci_set_termios,
+ .pm = sci_pm,
+ .type = rzsci_type,
+ .release_port = sci_release_port,
+ .request_port = sci_request_port,
+ .config_port = sci_config_port,
+ .verify_port = sci_verify_port,
+};
+
+static const struct sci_port_ops rzsci_port_ops = {
+ .read_reg = rzsci_serial_in,
+ .write_reg = rzsci_serial_out,
+ .clear_SCxSR = rzsci_clear_SCxSR,
+ .transmit_chars = rzsci_transmit_chars,
+ .receive_chars = rzsci_receive_chars,
+ .poll_put_char = rzsci_poll_put_char,
+ .prepare_console_write = rzsci_prepare_console_write,
+ .suspend_regs_size = rzsci_suspend_regs_size,
+};
+
+struct sci_of_data sci_r9a09g077_data = {
+ .type = PORT_RZSCI,
+ .regtype = SCIx_RZT2H_SCI_REGTYPE,
+ .ops = &rzsci_port_ops,
+ .uart_ops = &rzt2_sci_uart_ops,
+ .params = &rzsci_port_params,
+};
+
+#ifdef CONFIG_SERIAL_SH_SCI_EARLYCON
+
+static int __init rzt2hsci_early_console_setup(struct earlycon_device *device,
+ const char *opt)
+{
+ return scix_early_console_setup(device, &sci_r9a09g077_data);
+}
+
+OF_EARLYCON_DECLARE(rzsci, "renesas,r9a09g077-sci", rzt2hsci_early_console_setup);
+
+#endif /* CONFIG_SERIAL_SH_SCI_EARLYCON */
diff --git a/drivers/tty/serial/rzsci.h b/drivers/tty/serial/rzsci.h
new file mode 100644
index 000000000000..e0edc8fb6fd2
--- /dev/null
+++ b/drivers/tty/serial/rzsci.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef __RZT2_SCI_H__
+#define __RZT2_SCI_H__
+
+#include "sh-sci-common.h"
+
+#ifdef CONFIG_SERIAL_RZ_SCI
+extern struct sci_of_data sci_r9a09g077_data;
+#endif
+
+#endif /* __RZT2_SCI_H__ */
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 827b10793b97..fe9deeed799f 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -54,6 +54,7 @@
#include <asm/platform_early.h>
#endif
+#include "rzsci.h"
#include "serial_mctrl_gpio.h"
#include "sh-sci.h"
#include "sh-sci-common.h"
@@ -1816,7 +1817,7 @@ static irqreturn_t sci_tx_end_interrupt(int irq, void *ptr)
unsigned long flags;
u32 ctrl;
- if (port->type != PORT_SCI)
+ if (port->type != PORT_SCI && port->type != PORT_RZSCI)
return sci_tx_interrupt(irq, ptr);
uart_port_lock_irqsave(port, &flags);
@@ -3042,10 +3043,10 @@ static int sci_init_single(struct platform_device *dev,
}
/*
- * The fourth interrupt on SCI port is transmit end interrupt, so
+ * The fourth interrupt on SCI and RZSCI port is transmit end interrupt, so
* shuffle the interrupts.
*/
- if (p->type == PORT_SCI)
+ if (p->type == PORT_SCI || p->type == PORT_RZSCI)
swap(sci_port->irqs[SCIx_BRI_IRQ], sci_port->irqs[SCIx_TEI_IRQ]);
/* The SCI generates several interrupts. They can be muxed together or
@@ -3079,6 +3080,9 @@ static int sci_init_single(struct platform_device *dev,
else
sci_port->rx_trigger = 8;
break;
+ case PORT_RZSCI:
+ sci_port->rx_trigger = 15;
+ break;
default:
sci_port->rx_trigger = 1;
break;
@@ -3303,7 +3307,7 @@ static void sci_remove(struct platform_device *dev)
if (port->port.fifosize > 1)
device_remove_file(&dev->dev, &dev_attr_rx_fifo_trigger);
- if (type == PORT_SCIFA || type == PORT_SCIFB || type == PORT_HSCIF)
+ if (type == PORT_SCIFA || type == PORT_SCIFB || type == PORT_HSCIF || type == PORT_RZSCI)
device_remove_file(&dev->dev, &dev_attr_rx_fifo_timeout);
}
@@ -3397,6 +3401,12 @@ static const struct of_device_id of_sci_match[] __maybe_unused = {
.compatible = "renesas,scif-r9a09g057",
.data = &of_sci_scif_rzv2h,
},
+#ifdef CONFIG_SERIAL_RZ_SCI
+ {
+ .compatible = "renesas,r9a09g077-sci",
+ .data = &sci_r9a09g077_data,
+ },
+#endif /* CONFIG_SERIAL_RZ_SCI */
/* Family-specific types */
{
.compatible = "renesas,rcar-gen1-scif",
@@ -3656,7 +3666,7 @@ static int sci_probe(struct platform_device *dev)
return ret;
}
if (sp->port.type == PORT_SCIFA || sp->port.type == PORT_SCIFB ||
- sp->port.type == PORT_HSCIF) {
+ sp->port.type == PORT_HSCIF || sp->port.type == PORT_RZSCI) {
ret = device_create_file(&dev->dev, &dev_attr_rx_fifo_timeout);
if (ret) {
if (sp->port.fifosize > 1) {
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
index 0f2f50b8d28e..787fd9a96711 100644
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@ -38,6 +38,7 @@ enum {
SCIx_HSCIF_REGTYPE,
SCIx_RZ_SCIFA_REGTYPE,
SCIx_RZV2H_SCIF_REGTYPE,
+ SCIx_RZT2H_SCI_REGTYPE,
SCIx_NR_REGTYPES,
};
@@ -50,7 +51,7 @@ struct plat_sci_port_ops {
* Platform device specific platform_data struct
*/
struct plat_sci_port {
- unsigned int type; /* SCI / SCIF / IRDA / HSCIF */
+ unsigned int type; /* SCI / SCIF / IRDA / HSCIF / RZSCI */
upf_t flags; /* UPF_* flags */
unsigned int sampling_rate;
diff --git a/include/uapi/linux/serial_core.h b/include/uapi/linux/serial_core.h
index 9c007a106330..30fbbef599f4 100644
--- a/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@ -231,6 +231,9 @@
/* Sunplus UART */
#define PORT_SUNPLUS 123
+/* SH-SCI */
+#define PORT_RZSCI 124
+
/* Generic type identifier for ports which type is not important to userspace. */
#define PORT_GENERIC (-1)
--
2.43.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 11/13] arm64: dts: renesas: Add initial support for renesas RZ/T2H SoC
2025-02-26 13:09 [PATCH v3 00/13] Add initial support for Renesas RZ/T2H SoC Thierry Bultel
` (9 preceding siblings ...)
2025-02-26 13:09 ` [PATCH v3 10/13] serial: sh-sci: Add support for RZ/T2H SCI Thierry Bultel
@ 2025-02-26 13:09 ` Thierry Bultel
2025-02-26 13:09 ` [PATCH v3 12/13] arm64: dts: renesas: Add initial support for renesas RZ/T2H eval board Thierry Bultel
` (2 subsequent siblings)
13 siblings, 0 replies; 39+ messages in thread
From: Thierry Bultel @ 2025-02-26 13:09 UTC (permalink / raw)
To: thierry.bultel
Cc: linux-renesas-soc, geert, paul.barker.ct, Thierry Bultel,
devicetree, linux-kernel
Add the initial dtsi for the RZ/T2H Soc:
- gic
- armv8-timer
- cpg clock
- sci0 uart
also add arch/arm64/boot/dts/renesas/r9a09g077m44.dtsi, that keeps
all 4 CPUs enabled, for consistency with later support of -m24
and -m04 SoC revisions, that only have 2 and 1 Cortex-A55, respectively,
and that will use /delete-node/ to disable the missing CPUs.
Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
---
arch/arm64/boot/dts/renesas/r9a09g077.dtsi | 129 ++++++++++++++++++
arch/arm64/boot/dts/renesas/r9a09g077m44.dtsi | 13 ++
2 files changed, 142 insertions(+)
create mode 100644 arch/arm64/boot/dts/renesas/r9a09g077.dtsi
create mode 100644 arch/arm64/boot/dts/renesas/r9a09g077m44.dtsi
diff --git a/arch/arm64/boot/dts/renesas/r9a09g077.dtsi b/arch/arm64/boot/dts/renesas/r9a09g077.dtsi
new file mode 100644
index 000000000000..80e7805f2561
--- /dev/null
+++ b/arch/arm64/boot/dts/renesas/r9a09g077.dtsi
@@ -0,0 +1,129 @@
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+/*
+ * Device Tree Source for the RZ/T2H SoC
+ *
+ * Copyright (C) 2025 Renesas Electronics Corp.
+ */
+
+#include <dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+ compatible = "renesas,r9a09g077";
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ extal_clk: extal {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ /* This value must be overridden by the board */
+ clock-frequency = <0>;
+ };
+
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ l3_ca55: cache-controller-0 {
+ compatible = "cache";
+ cache-unified;
+ cache-size = <0x100000>;
+ cache-level = <3>;
+ };
+
+ cpu0: cpu@0 {
+ compatible = "arm,cortex-a55";
+ reg = <0>;
+ device_type = "cpu";
+ next-level-cache = <&l3_ca55>;
+ enable-method = "psci";
+ };
+
+ cpu1: cpu@100 {
+ compatible = "arm,cortex-a55";
+ reg = <0x100>;
+ device_type = "cpu";
+ next-level-cache = <&l3_ca55>;
+ enable-method = "psci";
+ };
+
+ cpu2: cpu@200 {
+ compatible = "arm,cortex-a55";
+ reg = <0x200>;
+ device_type = "cpu";
+ next-level-cache = <&l3_ca55>;
+ enable-method = "psci";
+ };
+
+ cpu3: cpu@300 {
+ compatible = "arm,cortex-a55";
+ reg = <0x300>;
+ device_type = "cpu";
+ next-level-cache = <&l3_ca55>;
+ enable-method = "psci";
+ };
+ };
+
+ loco_clk: loco {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ /* This value must be overridden by the board */
+ clock-frequency = <0>;
+ };
+
+ psci {
+ compatible = "arm,psci-1.0", "arm,psci-0.2";
+ method = "smc";
+ };
+
+ soc: soc {
+ compatible = "simple-bus";
+ interrupt-parent = <&gic>;
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+
+ sci0: serial@80005000 {
+ compatible = "renesas,r9a09g077-sci";
+ reg = <0 0x80005000 0 0x400>;
+ interrupts = <GIC_SPI 590 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 591 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 592 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 593 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "eri", "rxi", "txi", "tei";
+ clocks = <&cpg CPG_MOD 108>;
+ clock-names = "fck";
+ power-domains = <&cpg>;
+ status = "disabled";
+ };
+
+ cpg: clock-controller@80280000 {
+ compatible = "renesas,r9a09g077-cpg-mssr";
+ reg = <0 0x80280000 0 0x1000>,
+ <0 0x81280000 0 0x9000>;
+ clocks = <&extal_clk>, <&loco_clk>;
+ clock-names = "extal", "loco";
+ #clock-cells = <2>;
+ #reset-cells = <1>;
+ #power-domain-cells = <0>;
+ };
+
+ gic: interrupt-controller@83000000 {
+ compatible = "arm,gic-v3";
+ reg = <0x0 0x83000000 0 0x40000>,
+ <0x0 0x83040000 0 0x160000>;
+ #interrupt-cells = <3>;
+ #address-cells = <0>;
+ interrupt-controller;
+ interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_LOW>;
+ };
+ };
+
+ timer {
+ compatible = "arm,armv8-timer";
+ interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+ <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+ <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+ <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
+ };
+};
diff --git a/arch/arm64/boot/dts/renesas/r9a09g077m44.dtsi b/arch/arm64/boot/dts/renesas/r9a09g077m44.dtsi
new file mode 100644
index 000000000000..6f4a11b39d12
--- /dev/null
+++ b/arch/arm64/boot/dts/renesas/r9a09g077m44.dtsi
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+/*
+ * Device Tree Source for the RZ/T2H 4-core SoC
+ *
+ * Copyright (C) 2025 Renesas Electronics Corp.
+ */
+
+/dts-v1/;
+#include "r9a09g077.dtsi"
+
+/ {
+ compatible = "renesas,r9a09g077m44", "renesas,r9a09g077";
+};
--
2.43.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 12/13] arm64: dts: renesas: Add initial support for renesas RZ/T2H eval board
2025-02-26 13:09 [PATCH v3 00/13] Add initial support for Renesas RZ/T2H SoC Thierry Bultel
` (10 preceding siblings ...)
2025-02-26 13:09 ` [PATCH v3 11/13] arm64: dts: renesas: Add initial support for renesas RZ/T2H SoC Thierry Bultel
@ 2025-02-26 13:09 ` Thierry Bultel
2025-02-26 14:23 ` Krzysztof Kozlowski
2025-02-26 13:09 ` [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC option Thierry Bultel
2025-02-26 22:27 ` [PATCH v3 00/13] Add initial support for Renesas RZ/T2H SoC Rob Herring (Arm)
13 siblings, 1 reply; 39+ messages in thread
From: Thierry Bultel @ 2025-02-26 13:09 UTC (permalink / raw)
To: thierry.bultel
Cc: linux-renesas-soc, geert, paul.barker.ct, Thierry Bultel,
devicetree, linux-kernel
Add the initial device tree for the RZ/T2H evaluation board.
Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
---
arch/arm64/boot/dts/renesas/Makefile | 1 +
.../dts/renesas/r9a09g077m44-rzt2h-evk.dts | 35 +++++++++++++++++++
2 files changed, 36 insertions(+)
create mode 100644 arch/arm64/boot/dts/renesas/r9a09g077m44-rzt2h-evk.dts
diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile
index 928635f2e76b..ee1af560f5e6 100644
--- a/arch/arm64/boot/dts/renesas/Makefile
+++ b/arch/arm64/boot/dts/renesas/Makefile
@@ -148,6 +148,7 @@ dtb-$(CONFIG_ARCH_R9A09G011) += r9a09g011-v2mevk2.dtb
dtb-$(CONFIG_ARCH_R9A09G047) += r9a09g047e57-smarc.dtb
+dtb-$(CONFIG_ARCH_R9A09G077) += r9a09g077m44-rzt2h-evk.dtb
dtb-$(CONFIG_ARCH_R9A09G057) += r9a09g057h44-rzv2h-evk.dtb
dtb-$(CONFIG_ARCH_RCAR_GEN3) += draak-ebisu-panel-aa104xd12.dtbo
diff --git a/arch/arm64/boot/dts/renesas/r9a09g077m44-rzt2h-evk.dts b/arch/arm64/boot/dts/renesas/r9a09g077m44-rzt2h-evk.dts
new file mode 100644
index 000000000000..0fe3a08ca9c3
--- /dev/null
+++ b/arch/arm64/boot/dts/renesas/r9a09g077m44-rzt2h-evk.dts
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+/*
+ * Device Tree Source for the RZ/T2H Development EVK board
+ *
+ * Copyright (C) 2025 Renesas Electronics Corp.
+ */
+
+/dts-v1/;
+
+#include "r9a09g077m44.dtsi"
+
+/ {
+ model = "Renesas Development EVK based on r9a09g077m44";
+ compatible = "renesas,rzt2h-evk", "renesas,r9a09g077m44", "renesas,r9a09g077";
+
+ aliases {
+ serial0 = &sci0;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+};
+
+&extal_clk {
+ clock-frequency = <25000000>;
+};
+
+&loco_clk {
+ clock-frequency = <1000000>;
+};
+
+&sci0 {
+ status = "okay";
+};
--
2.43.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [PATCH v3 12/13] arm64: dts: renesas: Add initial support for renesas RZ/T2H eval board
2025-02-26 13:09 ` [PATCH v3 12/13] arm64: dts: renesas: Add initial support for renesas RZ/T2H eval board Thierry Bultel
@ 2025-02-26 14:23 ` Krzysztof Kozlowski
2025-02-26 14:46 ` Paul Barker
0 siblings, 1 reply; 39+ messages in thread
From: Krzysztof Kozlowski @ 2025-02-26 14:23 UTC (permalink / raw)
To: Thierry Bultel, thierry.bultel
Cc: linux-renesas-soc, geert, paul.barker.ct, devicetree,
linux-kernel
On 26/02/2025 14:09, Thierry Bultel wrote:
> Add the initial device tree for the RZ/T2H evaluation board.
>
> Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
> Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
Where did this happen? I see tags only to few patches, not all of them.
Same questions for all other places.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v3 12/13] arm64: dts: renesas: Add initial support for renesas RZ/T2H eval board
2025-02-26 14:23 ` Krzysztof Kozlowski
@ 2025-02-26 14:46 ` Paul Barker
2025-02-26 15:13 ` Krzysztof Kozlowski
0 siblings, 1 reply; 39+ messages in thread
From: Paul Barker @ 2025-02-26 14:46 UTC (permalink / raw)
To: Krzysztof Kozlowski, Thierry Bultel, thierry.bultel
Cc: linux-renesas-soc, geert, devicetree, linux-kernel
[-- Attachment #1.1.1: Type: text/plain, Size: 914 bytes --]
On 26/02/2025 14:23, Krzysztof Kozlowski wrote:
> On 26/02/2025 14:09, Thierry Bultel wrote:
>> Add the initial device tree for the RZ/T2H evaluation board.
>>
>> Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
>> Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
>
> Where did this happen? I see tags only to few patches, not all of them.
>
> Same questions for all other places.
>
> Best regards,
> Krzysztof
Hi Krzysztof,
We've recently switched to a patchwork instance and internal mailing
list for review within our team before sending things to the mailing
list. We did a round of internal review and the Reviewed-by tags from
this have accidentally been included here. It can easily be fixed.
Thierry, could you re-send a v4 series keeping my Reviewed-by tag only
on patch 7/13, as that was added on the public mailing list.
Thanks,
--
Paul Barker
[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 3577 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v3 12/13] arm64: dts: renesas: Add initial support for renesas RZ/T2H eval board
2025-02-26 14:46 ` Paul Barker
@ 2025-02-26 15:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 39+ messages in thread
From: Krzysztof Kozlowski @ 2025-02-26 15:13 UTC (permalink / raw)
To: Paul Barker, Thierry Bultel, thierry.bultel
Cc: linux-renesas-soc, geert, devicetree, linux-kernel
On 26/02/2025 15:46, Paul Barker wrote:
> On 26/02/2025 14:23, Krzysztof Kozlowski wrote:
>> On 26/02/2025 14:09, Thierry Bultel wrote:
>>> Add the initial device tree for the RZ/T2H evaluation board.
>>>
>>> Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
>>> Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
>>
>> Where did this happen? I see tags only to few patches, not all of them.
>>
>> Same questions for all other places.
>>
>> Best regards,
>> Krzysztof
>
> Hi Krzysztof,
>
> We've recently switched to a patchwork instance and internal mailing
> list for review within our team before sending things to the mailing
> list. We did a round of internal review and the Reviewed-by tags from
> this have accidentally been included here. It can easily be fixed.
>
> Thierry, could you re-send a v4 series keeping my Reviewed-by tag only
> on patch 7/13, as that was added on the public mailing list.
Thanks for clarification. It is unusual to see internal review resulting
in tags between already publicly discussed versions. Why it cannot be
done in public where everything is both archived and visible to entire
community?
BTW, sometimes b4 makes mistakes and we already have at least two cases
tag from one patch was applied for entire set, so your case is
indistinguishable from such b4 issue.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC option
2025-02-26 13:09 [PATCH v3 00/13] Add initial support for Renesas RZ/T2H SoC Thierry Bultel
` (11 preceding siblings ...)
2025-02-26 13:09 ` [PATCH v3 12/13] arm64: dts: renesas: Add initial support for renesas RZ/T2H eval board Thierry Bultel
@ 2025-02-26 13:09 ` Thierry Bultel
2025-02-26 14:22 ` Krzysztof Kozlowski
2025-02-26 22:27 ` [PATCH v3 00/13] Add initial support for Renesas RZ/T2H SoC Rob Herring (Arm)
13 siblings, 1 reply; 39+ messages in thread
From: Thierry Bultel @ 2025-02-26 13:09 UTC (permalink / raw)
To: thierry.bultel
Cc: linux-renesas-soc, geert, paul.barker.ct, Thierry Bultel,
linux-arm-kernel, linux-kernel
Selects support for RZ/T2H (aka r9a09g077), and
SCI (serial) specific code for it.
Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
---
arch/arm64/configs/defconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index cb7da4415599..f7be1bbc5661 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -492,6 +492,7 @@ CONFIG_SERIAL_TEGRA_TCU=y
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_RZ_SCI=y
CONFIG_SERIAL_MSM=y
CONFIG_SERIAL_MSM_CONSOLE=y
CONFIG_SERIAL_QCOM_GENI=y
@@ -1484,6 +1485,7 @@ CONFIG_ARCH_R9A08G045=y
CONFIG_ARCH_R9A09G011=y
CONFIG_ARCH_R9A09G047=y
CONFIG_ARCH_R9A09G057=y
+CONFIG_ARCH_R9A09G077=y
CONFIG_ROCKCHIP_IODOMAIN=y
CONFIG_ARCH_TEGRA_132_SOC=y
CONFIG_ARCH_TEGRA_210_SOC=y
--
2.43.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC option
2025-02-26 13:09 ` [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC option Thierry Bultel
@ 2025-02-26 14:22 ` Krzysztof Kozlowski
2025-02-26 14:32 ` Thierry Bultel
0 siblings, 1 reply; 39+ messages in thread
From: Krzysztof Kozlowski @ 2025-02-26 14:22 UTC (permalink / raw)
To: Thierry Bultel, thierry.bultel
Cc: linux-renesas-soc, geert, paul.barker.ct, linux-arm-kernel,
linux-kernel
On 26/02/2025 14:09, Thierry Bultel wrote:
> Selects support for RZ/T2H (aka r9a09g077), and
> SCI (serial) specific code for it.
>
> Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
> Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
> ---
You never responded to my comments at v1. So I asked at v2. Still no answer.
That's v3 and still silence from your side.
NAK
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC option
2025-02-26 14:22 ` Krzysztof Kozlowski
@ 2025-02-26 14:32 ` Thierry Bultel
2025-02-26 14:39 ` Krzysztof Kozlowski
0 siblings, 1 reply; 39+ messages in thread
From: Thierry Bultel @ 2025-02-26 14:32 UTC (permalink / raw)
To: Krzysztof Kozlowski, thierry.bultel@linatsea.fr
Cc: linux-renesas-soc@vger.kernel.org, geert@linux-m68k.org,
Paul Barker, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Hi Krysztof,
>-----Original Message-----
>From: Krzysztof Kozlowski <krzk@kernel.org>
>Sent: mercredi 26 février 2025 15:22
>To: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>; thierry.bultel@linatsea.fr
>Cc: linux-renesas-soc@vger.kernel.org; geert@linux-m68k.org; Paul Barker <paul.barker.ct@bp.renesas.com>; linux-arm->kernel@lists.infradead.org; linux-kernel@vger.kernel.org
>Subject: Re: [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC option
>
>On 26/02/2025 14:09, Thierry Bultel wrote:
>> Selects support for RZ/T2H (aka r9a09g077), and SCI (serial) specific
>> code for it.
>>
>> Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
>> Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
>> ---
>
>You never responded to my comments at v1. So I asked at v2. Still no answer.
>
>That's v3 and still silence from your side.
Yes, I understand your position and have added a paragraph
at the end of the cover letter about this point.
Best regards
Thierry
>
>NAK
>
>Best regards,
>Krzysztof
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC option
2025-02-26 14:32 ` Thierry Bultel
@ 2025-02-26 14:39 ` Krzysztof Kozlowski
2025-02-26 15:44 ` Thierry Bultel
2025-02-27 9:24 ` Geert Uytterhoeven
0 siblings, 2 replies; 39+ messages in thread
From: Krzysztof Kozlowski @ 2025-02-26 14:39 UTC (permalink / raw)
To: Thierry Bultel, thierry.bultel@linatsea.fr
Cc: linux-renesas-soc@vger.kernel.org, geert@linux-m68k.org,
Paul Barker, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
On 26/02/2025 15:32, Thierry Bultel wrote:
> Hi Krysztof,
>
>> -----Original Message-----
>> From: Krzysztof Kozlowski <krzk@kernel.org>
>> Sent: mercredi 26 février 2025 15:22
>> To: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>; thierry.bultel@linatsea.fr
>> Cc: linux-renesas-soc@vger.kernel.org; geert@linux-m68k.org; Paul Barker <paul.barker.ct@bp.renesas.com>; linux-arm->kernel@lists.infradead.org; linux-kernel@vger.kernel.org
>> Subject: Re: [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC option
>>
>> On 26/02/2025 14:09, Thierry Bultel wrote:
>>> Selects support for RZ/T2H (aka r9a09g077), and SCI (serial) specific
>>> code for it.
>>>
>>> Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
>>> Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
>>> ---
>>
>> You never responded to my comments at v1. So I asked at v2. Still no answer.
>>
>> That's v3 and still silence from your side.
>
> Yes, I understand your position and have added a paragraph
> at the end of the cover letter about this point.
We do no read cover letters, unless look for dependencies, so if you
disagree with someone you ought to respond to the email directly. Not
silently discard.
You keep adding more and more symbols, so your "out of scope of this
patchset" is no true. Otherwise every contributor will use exactly the
same arguments - "not my problem".
So again NAK because it is something ought to be finally fixed (and is
not even tricky to, so I don't ask for impossible).
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC option
2025-02-26 14:39 ` Krzysztof Kozlowski
@ 2025-02-26 15:44 ` Thierry Bultel
2025-02-27 9:24 ` Geert Uytterhoeven
1 sibling, 0 replies; 39+ messages in thread
From: Thierry Bultel @ 2025-02-26 15:44 UTC (permalink / raw)
To: Krzysztof Kozlowski, thierry.bultel@linatsea.fr,
Geert Uytterhoeven
Cc: linux-renesas-soc@vger.kernel.org, geert@linux-m68k.org,
Paul Barker, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Hi Geert,
Could you provide some input here on how you'd like these config options
to be handled please ?
Thanks !
Thierry
> -----Original Message-----
> From: Krzysztof Kozlowski <krzk@kernel.org>
> Sent: mercredi 26 février 2025 15:40
> To: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>;
> thierry.bultel@linatsea.fr
> Cc: linux-renesas-soc@vger.kernel.org; geert@linux-m68k.org; Paul Barker
> <paul.barker.ct@bp.renesas.com>; linux-arm-kernel@lists.infradead.org;
> linux-kernel@vger.kernel.org
> Subject: Re: [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC
> option
>
> On 26/02/2025 15:32, Thierry Bultel wrote:
> > Hi Krysztof,
> >
> >> -----Original Message-----
> >> From: Krzysztof Kozlowski <krzk@kernel.org>
> >> Sent: mercredi 26 février 2025 15:22
> >> To: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>;
> >> thierry.bultel@linatsea.fr
> >> Cc: linux-renesas-soc@vger.kernel.org; geert@linux-m68k.org; Paul
> >> Barker <paul.barker.ct@bp.renesas.com>;
> >> linux-arm->kernel@lists.infradead.org; linux-kernel@vger.kernel.org
> >> Subject: Re: [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H
> >> SoC option
> >>
> >> On 26/02/2025 14:09, Thierry Bultel wrote:
> >>> Selects support for RZ/T2H (aka r9a09g077), and SCI (serial)
> >>> specific code for it.
> >>>
> >>> Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
> >>> Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
> >>> ---
> >>
> >> You never responded to my comments at v1. So I asked at v2. Still no
> answer.
> >>
> >> That's v3 and still silence from your side.
> >
> > Yes, I understand your position and have added a paragraph at the end
> > of the cover letter about this point.
>
> We do no read cover letters, unless look for dependencies, so if you
> disagree with someone you ought to respond to the email directly. Not
> silently discard.
>
> You keep adding more and more symbols, so your "out of scope of this
> patchset" is no true. Otherwise every contributor will use exactly the
> same arguments - "not my problem".
>
> So again NAK because it is something ought to be finally fixed (and is not
> even tricky to, so I don't ask for impossible).
>
>
> Best regards,
> Krzysztof
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC option
2025-02-26 14:39 ` Krzysztof Kozlowski
2025-02-26 15:44 ` Thierry Bultel
@ 2025-02-27 9:24 ` Geert Uytterhoeven
2025-02-27 9:43 ` Krzysztof Kozlowski
1 sibling, 1 reply; 39+ messages in thread
From: Geert Uytterhoeven @ 2025-02-27 9:24 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Thierry Bultel, thierry.bultel@linatsea.fr,
linux-renesas-soc@vger.kernel.org, Paul Barker,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Hi Krzysztof,
On Wed, 26 Feb 2025 at 15:40, Krzysztof Kozlowski <krzk@kernel.org> wrote:
> On 26/02/2025 15:32, Thierry Bultel wrote:
> >> -----Original Message-----
> >> From: Krzysztof Kozlowski <krzk@kernel.org>
> >> Sent: mercredi 26 février 2025 15:22
> >> To: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>; thierry.bultel@linatsea.fr
> >> Cc: linux-renesas-soc@vger.kernel.org; geert@linux-m68k.org; Paul Barker <paul.barker.ct@bp.renesas.com>; linux-arm->kernel@lists.infradead.org; linux-kernel@vger.kernel.org
> >> Subject: Re: [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC option
> >>
> >> On 26/02/2025 14:09, Thierry Bultel wrote:
> >>> Selects support for RZ/T2H (aka r9a09g077), and SCI (serial) specific
> >>> code for it.
> >>>
> >>> Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
> >>> Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
> >>> ---
> >>
> >> You never responded to my comments at v1. So I asked at v2. Still no answer.
> >>
> >> That's v3 and still silence from your side.
> >
> > Yes, I understand your position and have added a paragraph
> > at the end of the cover letter about this point.
>
> We do no read cover letters, unless look for dependencies, so if you
> disagree with someone you ought to respond to the email directly. Not
> silently discard.
>
> You keep adding more and more symbols, so your "out of scope of this
> patchset" is no true. Otherwise every contributor will use exactly the
> same arguments - "not my problem".
>
> So again NAK because it is something ought to be finally fixed (and is
> not even tricky to, so I don't ask for impossible).
Adding RAM to existing systems is usually quite hard ;-)
Not all Renesas SoCs are used in systems with multi-GiBs of RAM, so
IMHO it is still valuable to have fine control over which SoCs are
supported by your kernel (and e.g. which large pin control tables are
included in your kernel image).
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC option
2025-02-27 9:24 ` Geert Uytterhoeven
@ 2025-02-27 9:43 ` Krzysztof Kozlowski
2025-02-27 10:48 ` Thierry Bultel
0 siblings, 1 reply; 39+ messages in thread
From: Krzysztof Kozlowski @ 2025-02-27 9:43 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Thierry Bultel, thierry.bultel@linatsea.fr,
linux-renesas-soc@vger.kernel.org, Paul Barker,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
On 27/02/2025 10:24, Geert Uytterhoeven wrote:
> Hi Krzysztof,
>
> On Wed, 26 Feb 2025 at 15:40, Krzysztof Kozlowski <krzk@kernel.org> wrote:
>> On 26/02/2025 15:32, Thierry Bultel wrote:
>>>> -----Original Message-----
>>>> From: Krzysztof Kozlowski <krzk@kernel.org>
>>>> Sent: mercredi 26 février 2025 15:22
>>>> To: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>; thierry.bultel@linatsea.fr
>>>> Cc: linux-renesas-soc@vger.kernel.org; geert@linux-m68k.org; Paul Barker <paul.barker.ct@bp.renesas.com>; linux-arm->kernel@lists.infradead.org; linux-kernel@vger.kernel.org
>>>> Subject: Re: [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC option
>>>>
>>>> On 26/02/2025 14:09, Thierry Bultel wrote:
>>>>> Selects support for RZ/T2H (aka r9a09g077), and SCI (serial) specific
>>>>> code for it.
>>>>>
>>>>> Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
>>>>> Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
>>>>> ---
>>>>
>>>> You never responded to my comments at v1. So I asked at v2. Still no answer.
>>>>
>>>> That's v3 and still silence from your side.
>>>
>>> Yes, I understand your position and have added a paragraph
>>> at the end of the cover letter about this point.
>>
>> We do no read cover letters, unless look for dependencies, so if you
>> disagree with someone you ought to respond to the email directly. Not
>> silently discard.
>>
>> You keep adding more and more symbols, so your "out of scope of this
>> patchset" is no true. Otherwise every contributor will use exactly the
>> same arguments - "not my problem".
>>
>> So again NAK because it is something ought to be finally fixed (and is
>> not even tricky to, so I don't ask for impossible).
>
> Adding RAM to existing systems is usually quite hard ;-)
>
> Not all Renesas SoCs are used in systems with multi-GiBs of RAM, so
> IMHO it is still valuable to have fine control over which SoCs are
> supported by your kernel (and e.g. which large pin control tables are
> included in your kernel image).
This is fine, I am not against fine-grained SoC-enable options. However
all your SoCs should be enabled by default (default y if ARCH_RENESAS or
any other option which works for you) thus you won't be growing
user-selectable choices.
Strictly speaking this still will be choice, because you need to trim
config, but all people and all distros will just ignore it and don't
see it in defconfig.
>
> Gr{oetje,eeting}s,
>
> Geert
>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 39+ messages in thread* RE: [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC option
2025-02-27 9:43 ` Krzysztof Kozlowski
@ 2025-02-27 10:48 ` Thierry Bultel
2025-02-27 11:48 ` Krzysztof Kozlowski
0 siblings, 1 reply; 39+ messages in thread
From: Thierry Bultel @ 2025-02-27 10:48 UTC (permalink / raw)
To: Krzysztof Kozlowski, Geert Uytterhoeven
Cc: thierry.bultel@linatsea.fr, linux-renesas-soc@vger.kernel.org,
Paul Barker, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Thanks Krzysztof,
> -----Original Message-----
> From: Krzysztof Kozlowski <krzk@kernel.org>
> Sent: jeudi 27 février 2025 10:43
> To: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>;
> thierry.bultel@linatsea.fr; linux-renesas-soc@vger.kernel.org; Paul Barker
> <paul.barker.ct@bp.renesas.com>; linux-arm-kernel@lists.infradead.org;
> linux-kernel@vger.kernel.org
> Subject: Re: [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC
> option
>
> On 27/02/2025 10:24, Geert Uytterhoeven wrote:
> > Hi Krzysztof,
> >
> > On Wed, 26 Feb 2025 at 15:40, Krzysztof Kozlowski <krzk@kernel.org>
> wrote:
> >> On 26/02/2025 15:32, Thierry Bultel wrote:
> >>>> -----Original Message-----
> >>>> From: Krzysztof Kozlowski <krzk@kernel.org>
> >>>> Sent: mercredi 26 février 2025 15:22
> >>>> To: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>;
> >>>> thierry.bultel@linatsea.fr
> >>>> Cc: linux-renesas-soc@vger.kernel.org; geert@linux-m68k.org; Paul
> >>>> Barker <paul.barker.ct@bp.renesas.com>;
> >>>> linux-arm->kernel@lists.infradead.org; linux-kernel@vger.kernel.org
> >>>> Subject: Re: [PATCH v3 13/13] arm64: defconfig: Enable Renesas
> >>>> RZ/T2H SoC option
> >>>>
> >>>> On 26/02/2025 14:09, Thierry Bultel wrote:
> >>>>> Selects support for RZ/T2H (aka r9a09g077), and SCI (serial)
> >>>>> specific code for it.
> >>>>>
> >>>>> Signed-off-by: Thierry Bultel <thierry.bultel.yh@bp.renesas.com>
> >>>>> Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
> >>>>> ---
> >>>>
> >>>> You never responded to my comments at v1. So I asked at v2. Still no
> answer.
> >>>>
> >>>> That's v3 and still silence from your side.
> >>>
> >>> Yes, I understand your position and have added a paragraph at the
> >>> end of the cover letter about this point.
> >>
> >> We do no read cover letters, unless look for dependencies, so if you
> >> disagree with someone you ought to respond to the email directly. Not
> >> silently discard.
> >>
> >> You keep adding more and more symbols, so your "out of scope of this
> >> patchset" is no true. Otherwise every contributor will use exactly
> >> the same arguments - "not my problem".
> >>
> >> So again NAK because it is something ought to be finally fixed (and
> >> is not even tricky to, so I don't ask for impossible).
> >
> > Adding RAM to existing systems is usually quite hard ;-)
> >
> > Not all Renesas SoCs are used in systems with multi-GiBs of RAM, so
> > IMHO it is still valuable to have fine control over which SoCs are
> > supported by your kernel (and e.g. which large pin control tables are
> > included in your kernel image).
>
>
> This is fine, I am not against fine-grained SoC-enable options. However
> all your SoCs should be enabled by default (default y if ARCH_RENESAS or
> any other option which works for you) thus you won't be growing user-
> selectable choices.
>
> Strictly speaking this still will be choice, because you need to trim
> config, but all people and all distros will just ignore it and don't see
> it in defconfig.
>
I understand.
All the ARCH_XXX SoC options are already under a menuconfig section, which
is defaulted to 'y' if ARCH_RENESAS.
So I guess that this simple additional change would make it:
diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig
index 91a815e0a522..231880c21aa7 100644
--- a/drivers/soc/renesas/Kconfig
+++ b/drivers/soc/renesas/Kconfig
@@ -358,6 +358,7 @@ config ARCH_R9A09G057
config ARCH_R9A09G077
bool "ARM64 Platform support for RZ/T2H"
+ default y
help
This enables support for the Renesas RZ/T2H SoC variants.
Regards
Thierry
> >
> > Gr{oetje,eeting}s,
> >
> > Geert
> >
>
>
> Best regards,
> Krzysztof
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC option
2025-02-27 10:48 ` Thierry Bultel
@ 2025-02-27 11:48 ` Krzysztof Kozlowski
2025-02-27 13:25 ` Geert Uytterhoeven
0 siblings, 1 reply; 39+ messages in thread
From: Krzysztof Kozlowski @ 2025-02-27 11:48 UTC (permalink / raw)
To: Thierry Bultel, Geert Uytterhoeven
Cc: thierry.bultel@linatsea.fr, linux-renesas-soc@vger.kernel.org,
Paul Barker, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
On 27/02/2025 11:48, Thierry Bultel wrote:
>>
>> This is fine, I am not against fine-grained SoC-enable options. However
>> all your SoCs should be enabled by default (default y if ARCH_RENESAS or
>> any other option which works for you) thus you won't be growing user-
>> selectable choices.
>>
>> Strictly speaking this still will be choice, because you need to trim
>> config, but all people and all distros will just ignore it and don't see
>> it in defconfig.
>>
>
> I understand.
>
> All the ARCH_XXX SoC options are already under a menuconfig section, which
> is defaulted to 'y' if ARCH_RENESAS.
Indeed and it actually cannot have "if ARCH_RENESAS" due to how compile
test is enabled there.
>
> So I guess that this simple additional change would make it:
>
> diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig
> index 91a815e0a522..231880c21aa7 100644
> --- a/drivers/soc/renesas/Kconfig
> +++ b/drivers/soc/renesas/Kconfig
> @@ -358,6 +358,7 @@ config ARCH_R9A09G057
>
> config ARCH_R9A09G077
> bool "ARM64 Platform support for RZ/T2H"
> + default y
> help
> This enables support for the Renesas RZ/T2H SoC variants.
Yes and then run savedefconfig and check if defconfig needs this symbol.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC option
2025-02-27 11:48 ` Krzysztof Kozlowski
@ 2025-02-27 13:25 ` Geert Uytterhoeven
2025-02-27 13:34 ` Krzysztof Kozlowski
0 siblings, 1 reply; 39+ messages in thread
From: Geert Uytterhoeven @ 2025-02-27 13:25 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Thierry Bultel, thierry.bultel@linatsea.fr,
linux-renesas-soc@vger.kernel.org, Paul Barker,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Hi Krzysztof,
On Thu, 27 Feb 2025 at 12:48, Krzysztof Kozlowski <krzk@kernel.org> wrote:
> On 27/02/2025 11:48, Thierry Bultel wrote:
> >> This is fine, I am not against fine-grained SoC-enable options. However
> >> all your SoCs should be enabled by default (default y if ARCH_RENESAS or
> >> any other option which works for you) thus you won't be growing user-
> >> selectable choices.
> >>
> >> Strictly speaking this still will be choice, because you need to trim
> >> config, but all people and all distros will just ignore it and don't see
> >> it in defconfig.
> >>
> >
> > I understand.
> >
> > All the ARCH_XXX SoC options are already under a menuconfig section, which
> > is defaulted to 'y' if ARCH_RENESAS.
>
> Indeed and it actually cannot have "if ARCH_RENESAS" due to how compile
> test is enabled there.
Sorry, I don't get what you mean here...
> > So I guess that this simple additional change would make it:
> >
> > diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig
> > index 91a815e0a522..231880c21aa7 100644
> > --- a/drivers/soc/renesas/Kconfig
> > +++ b/drivers/soc/renesas/Kconfig
> > @@ -358,6 +358,7 @@ config ARCH_R9A09G057
> >
> > config ARCH_R9A09G077
> > bool "ARM64 Platform support for RZ/T2H"
> > + default y
Please add "if ARCH_RENESAS" iff we decide to go this route...
> > help
> > This enables support for the Renesas RZ/T2H SoC variants.
>
> Yes and then run savedefconfig and check if defconfig needs this symbol.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC option
2025-02-27 13:25 ` Geert Uytterhoeven
@ 2025-02-27 13:34 ` Krzysztof Kozlowski
0 siblings, 0 replies; 39+ messages in thread
From: Krzysztof Kozlowski @ 2025-02-27 13:34 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Thierry Bultel, thierry.bultel@linatsea.fr,
linux-renesas-soc@vger.kernel.org, Paul Barker,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
On 27/02/2025 14:25, Geert Uytterhoeven wrote:
> Hi Krzysztof,
>
> On Thu, 27 Feb 2025 at 12:48, Krzysztof Kozlowski <krzk@kernel.org> wrote:
>> On 27/02/2025 11:48, Thierry Bultel wrote:
>>>> This is fine, I am not against fine-grained SoC-enable options. However
>>>> all your SoCs should be enabled by default (default y if ARCH_RENESAS or
>>>> any other option which works for you) thus you won't be growing user-
>>>> selectable choices.
>>>>
>>>> Strictly speaking this still will be choice, because you need to trim
>>>> config, but all people and all distros will just ignore it and don't see
>>>> it in defconfig.
>>>>
>>>
>>> I understand.
>>>
>>> All the ARCH_XXX SoC options are already under a menuconfig section, which
>>> is defaulted to 'y' if ARCH_RENESAS.
>>
>> Indeed and it actually cannot have "if ARCH_RENESAS" due to how compile
>> test is enabled there.
>
> Sorry, I don't get what you mean here...
Probably I got top-level COMPILE_TEST opposite and it actually should be
"if ARCH_RENESAS" as I suggested. Otherwise it would be enabled by
default for compile tests.
>
>>> So I guess that this simple additional change would make it:
>>>
>>> diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig
>>> index 91a815e0a522..231880c21aa7 100644
>>> --- a/drivers/soc/renesas/Kconfig
>>> +++ b/drivers/soc/renesas/Kconfig
>>> @@ -358,6 +358,7 @@ config ARCH_R9A09G057
>>>
>>> config ARCH_R9A09G077
>>> bool "ARM64 Platform support for RZ/T2H"
>>> + default y
>
> Please add "if ARCH_RENESAS" iff we decide to go this route...
Yeah, like I suggested earlier.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v3 00/13] Add initial support for Renesas RZ/T2H SoC
2025-02-26 13:09 [PATCH v3 00/13] Add initial support for Renesas RZ/T2H SoC Thierry Bultel
` (12 preceding siblings ...)
2025-02-26 13:09 ` [PATCH v3 13/13] arm64: defconfig: Enable Renesas RZ/T2H SoC option Thierry Bultel
@ 2025-02-26 22:27 ` Rob Herring (Arm)
13 siblings, 0 replies; 39+ messages in thread
From: Rob Herring (Arm) @ 2025-02-26 22:27 UTC (permalink / raw)
To: Thierry Bultel; +Cc: geert, thierry.bultel, linux-renesas-soc, paul.barker.ct
On Wed, 26 Feb 2025 14:09:19 +0100, Thierry Bultel wrote:
>
> This patchset brings basic support for Renesas RZ/T2H SoC and
> its evaluation board. The 4 CPUs are enabled, only the serial
> console is available and the board must boot on a ramdisk.
> earlycon is supported, though.
>
> The RZ/T2H serial controller (SCI) is quite different from the
> other RZ SoCs, one of the big differences (but not the only) being
> the 32 bits registers. In order to not modify the existing sh-sci
> driver too much, a new set of 'ops' function pointer is introduced,
> allowing to code the specifics of RZ/T2H in a separate file.
> Termios setting is not supported yet, the default 115200 baudrate
> being kept by default.
>
> Clock support for RZ/T2H is added to the existing renesas-cpg-mssr
> driver, with some little modifications so that more parameters are
> passed to the device-specific registration callback.
> At this stage, the assumption is made that most of the initialization
> is done earlier by the bootloader. Module clock enable/disable is
> not supported, because quite hard to test when the only available
> peripheral is the serial console, and will come in a future patchset.
>
> There is an underway discussion on how to group the user selectable
> Renesas SoC option into bigger families, but such a change is out of
> scope for this patchset.
>
> This patch series is based on master + patch [1]
>
> [1]: https://lore.kernel.org/all/20250207113313.545432-1-claudiu.beznea.uj@bp.renesas.com/
>
> Thierry Bultel (13):
> dt-bindings: soc: Add Renesas RZ/T2H (R9A09G077) SoC
> dt-bindings: clock: Add cpg for the Renesas RZ/T2H SoC
> dt-bindings: serial: Add compatible for Renesas RZ/T2H SoC in sci
> soc: renesas: Add RZ/T2H (R9A09G077) config option
> clk: renesas: Pass sub struct of cpg_mssr_priv to cpg_clk_register
> clk: renesas: Add support for R9A09G077 SoC
> serial: sh-sci: Fix a comment about SCIFA
> serial: sh-sci: Introduced function pointers
> serial: sh-sci: Introduced sci_of_data
> serial: sh-sci: Add support for RZ/T2H SCI
> arm64: dts: renesas: Add initial support for renesas RZ/T2H SoC
> arm64: dts: renesas: Add initial support for renesas RZ/T2H eval board
> arm64: defconfig: Enable Renesas RZ/T2H SoC option
>
> .../bindings/clock/renesas,cpg-mssr.yaml | 4 +-
> .../bindings/serial/renesas,sci.yaml | 64 +-
> .../bindings/soc/renesas/renesas.yaml | 10 +
> arch/arm64/boot/dts/renesas/Makefile | 1 +
> arch/arm64/boot/dts/renesas/r9a09g077.dtsi | 129 ++++
> .../dts/renesas/r9a09g077m44-rzt2h-evk.dts | 35 +
> arch/arm64/boot/dts/renesas/r9a09g077m44.dtsi | 13 +
> arch/arm64/configs/defconfig | 2 +
> drivers/clk/renesas/Kconfig | 5 +
> drivers/clk/renesas/Makefile | 1 +
> drivers/clk/renesas/r7s9210-cpg-mssr.c | 7 +-
> drivers/clk/renesas/r8a77970-cpg-mssr.c | 11 +-
> drivers/clk/renesas/r9a09g077-cpg-mssr.c | 237 +++++++
> drivers/clk/renesas/rcar-gen2-cpg.c | 5 +-
> drivers/clk/renesas/rcar-gen2-cpg.h | 3 +-
> drivers/clk/renesas/rcar-gen3-cpg.c | 6 +-
> drivers/clk/renesas/rcar-gen3-cpg.h | 6 +-
> drivers/clk/renesas/rcar-gen4-cpg.c | 8 +-
> drivers/clk/renesas/rcar-gen4-cpg.h | 3 +-
> drivers/clk/renesas/renesas-cpg-mssr.c | 153 +++--
> drivers/clk/renesas/renesas-cpg-mssr.h | 43 +-
> drivers/soc/renesas/Kconfig | 5 +
> drivers/tty/serial/Kconfig | 7 +
> drivers/tty/serial/Makefile | 1 +
> drivers/tty/serial/rzsci.c | 465 ++++++++++++++
> drivers/tty/serial/rzsci.h | 12 +
> drivers/tty/serial/sh-sci-common.h | 171 +++++
> drivers/tty/serial/sh-sci.c | 603 ++++++++++--------
> drivers/tty/serial/sh-sci.h | 2 -
> .../clock/renesas,r9a09g077-cpg-mssr.h | 49 ++
> include/linux/serial_sci.h | 3 +-
> include/uapi/linux/serial_core.h | 3 +
> 32 files changed, 1713 insertions(+), 354 deletions(-)
> create mode 100644 arch/arm64/boot/dts/renesas/r9a09g077.dtsi
> create mode 100644 arch/arm64/boot/dts/renesas/r9a09g077m44-rzt2h-evk.dts
> create mode 100644 arch/arm64/boot/dts/renesas/r9a09g077m44.dtsi
> create mode 100644 drivers/clk/renesas/r9a09g077-cpg-mssr.c
> create mode 100644 drivers/tty/serial/rzsci.c
> create mode 100644 drivers/tty/serial/rzsci.h
> create mode 100644 drivers/tty/serial/sh-sci-common.h
> create mode 100644 include/dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h
>
> --
> 2.43.0
>
>
>
My bot found new DTB warnings on the .dts files added or changed in this
series.
Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings
are fixed by another series. Ultimately, it is up to the platform
maintainer whether these warnings are acceptable or not. No need to reply
unless the platform maintainer has comments.
If you already ran DT checks and didn't see these error(s), then
make sure dt-schema is up to date:
pip3 install dtschema --upgrade
New warnings running 'make CHECK_DTBS=y for arch/arm64/boot/dts/renesas/' for 20250226130935.3029927-1-thierry.bultel.yh@bp.renesas.com:
arch/arm64/boot/dts/renesas/r8a77980a-condor-i.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774c0-ek874-idk-2121wr.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77965-ulcb.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a779m1-ulcb.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77961-ulcb-kf.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77960-ulcb-kf.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77965-ulcb-kf.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774c0-ek874.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 2992]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-rev2-ex.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 16384]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a779g2-white-hawk-single.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 16384]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h-ex-idk-1110wr.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774c0-ek874-mipi-2.1.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-rev2-ex-idk-1110wr.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h-ex-mipi-2.1.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77970-eagle.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex-mipi-2.1.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 2992]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a779m5-salvator-xs.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77951-salvator-xs.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77965-salvator-xs.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a779f4-s4sk.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 16384]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex-mipi-2.1.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774c0-cat874.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77951-ulcb-kf.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77960-ulcb.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a779h0-gray-hawk-single.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 16384]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77951-ulcb.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex-idk-1110wr.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 2992]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-rev2.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77970-v3msk.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a779m1-ulcb-kf.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a779m1-salvator-xs.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a779m3-ulcb-kf.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774e1-beacon-rzg2h-kit.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77990-ebisu.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex-idk-1110wr.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77960-salvator-x.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77980-condor.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77960-salvator-xs.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a779g3-white-hawk-single.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 16384]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h-ex.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a779a0-falcon.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 16384]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77965-salvator-x.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a779f0-spider.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 16384]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77951-salvator-x.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77961-ulcb.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 2992]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a77995-draak.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774b1-beacon-rzg2n-kit.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 2992]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a779m3-ulcb.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex-idk-1110wr.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 2992]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a779m3-salvator-xs.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 4096]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 16384]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 2992]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
arch/arm64/boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dtb: clock-controller@e6150000: reg: [[0, 3860135936, 0, 2992]] is too short
from schema $id: http://devicetree.org/schemas/clock/renesas,cpg-mssr.yaml#
^ permalink raw reply [flat|nested] 39+ messages in thread