* [cip-dev] [PATCH 4.19.y-cip 1/4] dt-bindings: ata: sata_rcar: Add r8a774b1 support
2020-10-29 11:45 [cip-dev] [PATCH 4.19.y-cip 0/4] Add SATA support to RZ/G2N Lad Prabhakar
@ 2020-10-29 11:45 ` Lad Prabhakar
2020-10-29 11:46 ` [cip-dev] [PATCH 4.19.y-cip 2/4] arm64: dts: renesas: r8a774b1: Add SATA controller node Lad Prabhakar
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Lad Prabhakar @ 2020-10-29 11:45 UTC (permalink / raw)
To: cip-dev, Nobuhiro Iwamatsu, Pavel Machek; +Cc: Biju Das
[-- Attachment #1: Type: text/plain, Size: 1729 bytes --]
From: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
commit b00e14c536574fb3e45aa0cf899e67fc3ac51d06 upstream.
Document SATA support for the RZ/G2N, no driver change required.
Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
Documentation/devicetree/bindings/ata/sata_rcar.txt | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/ata/sata_rcar.txt b/Documentation/devicetree/bindings/ata/sata_rcar.txt
index 4268e17d2411..a2fbdc91570d 100644
--- a/Documentation/devicetree/bindings/ata/sata_rcar.txt
+++ b/Documentation/devicetree/bindings/ata/sata_rcar.txt
@@ -2,6 +2,7 @@
Required properties:
- compatible : should contain one or more of the following:
+ - "renesas,sata-r8a774b1" for RZ/G2N
- "renesas,sata-r8a7779" for R-Car H1
- "renesas,sata-r8a7790-es1" for R-Car H2 ES1
- "renesas,sata-r8a7790" for R-Car H2 other than ES1
@@ -9,8 +10,10 @@ Required properties:
- "renesas,sata-r8a7793" for R-Car M2-N
- "renesas,sata-r8a7795" for R-Car H3
- "renesas,sata-r8a77965" for R-Car M3-N
- - "renesas,rcar-gen2-sata" for a generic R-Car Gen2 compatible device
- - "renesas,rcar-gen3-sata" for a generic R-Car Gen3 compatible device
+ - "renesas,rcar-gen2-sata" for a generic R-Car Gen2
+ compatible device
+ - "renesas,rcar-gen3-sata" for a generic R-Car Gen3 or
+ RZ/G2 compatible device
- "renesas,rcar-sata" is deprecated
When compatible with the generic version nodes
--
2.17.1
[-- Attachment #2: Type: text/plain, Size: 420 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5690): https://lists.cip-project.org/g/cip-dev/message/5690
Mute This Topic: https://lists.cip-project.org/mt/77885349/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 9+ messages in thread* [cip-dev] [PATCH 4.19.y-cip 2/4] arm64: dts: renesas: r8a774b1: Add SATA controller node
2020-10-29 11:45 [cip-dev] [PATCH 4.19.y-cip 0/4] Add SATA support to RZ/G2N Lad Prabhakar
2020-10-29 11:45 ` [cip-dev] [PATCH 4.19.y-cip 1/4] dt-bindings: ata: sata_rcar: Add r8a774b1 support Lad Prabhakar
@ 2020-10-29 11:46 ` Lad Prabhakar
2020-10-29 11:46 ` [cip-dev] [PATCH 4.19.y-cip 3/4] arm64: dts: renesas: r8a774b1-hihope-rzg2n-ex: Enable sata Lad Prabhakar
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Lad Prabhakar @ 2020-10-29 11:46 UTC (permalink / raw)
To: cip-dev, Nobuhiro Iwamatsu, Pavel Machek; +Cc: Biju Das
[-- Attachment #1: Type: text/plain, Size: 1306 bytes --]
From: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
commit 1510faee309010194ebb6ad3068cc9c0f7bc761b upstream.
Add the SATA controller node to the RZ/G2N SoC specific
dtsi.
Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Link: https://lore.kernel.org/r/1571761279-17347-3-git-send-email-fabrizio.castro@bp.renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a774b1.dtsi b/arch/arm64/boot/dts/renesas/r8a774b1.dtsi
index 62d011107cc5..11cc0f274ef3 100644
--- a/arch/arm64/boot/dts/renesas/r8a774b1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a774b1.dtsi
@@ -1902,6 +1902,17 @@
status = "disabled";
};
+ sata: sata@ee300000 {
+ compatible = "renesas,sata-r8a774b1",
+ "renesas,rcar-gen3-sata";
+ reg = <0 0xee300000 0 0x200000>;
+ interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg CPG_MOD 815>;
+ power-domains = <&sysc R8A774B1_PD_ALWAYS_ON>;
+ resets = <&cpg 815>;
+ status = "disabled";
+ };
+
gic: interrupt-controller@f1010000 {
compatible = "arm,gic-400";
#interrupt-cells = <3>;
--
2.17.1
[-- Attachment #2: Type: text/plain, Size: 420 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5691): https://lists.cip-project.org/g/cip-dev/message/5691
Mute This Topic: https://lists.cip-project.org/mt/77885350/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 9+ messages in thread* [cip-dev] [PATCH 4.19.y-cip 3/4] arm64: dts: renesas: r8a774b1-hihope-rzg2n-ex: Enable sata
2020-10-29 11:45 [cip-dev] [PATCH 4.19.y-cip 0/4] Add SATA support to RZ/G2N Lad Prabhakar
2020-10-29 11:45 ` [cip-dev] [PATCH 4.19.y-cip 1/4] dt-bindings: ata: sata_rcar: Add r8a774b1 support Lad Prabhakar
2020-10-29 11:46 ` [cip-dev] [PATCH 4.19.y-cip 2/4] arm64: dts: renesas: r8a774b1: Add SATA controller node Lad Prabhakar
@ 2020-10-29 11:46 ` Lad Prabhakar
2020-10-29 11:46 ` [cip-dev] [PATCH 4.19.y-cip 4/4] ata: sata_rcar: Fix DMA boundary mask Lad Prabhakar
2020-10-29 13:04 ` [cip-dev] [PATCH 4.19.y-cip 0/4] Add SATA support to RZ/G2N Pavel Machek
4 siblings, 0 replies; 9+ messages in thread
From: Lad Prabhakar @ 2020-10-29 11:46 UTC (permalink / raw)
To: cip-dev, Nobuhiro Iwamatsu, Pavel Machek; +Cc: Biju Das
[-- Attachment #1: Type: text/plain, Size: 1087 bytes --]
commit e7cc614be7886b464a429f83162171128c205b2e upstream.
Enable sata interface on HiHope RZ/G2N board.
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20200810171239.30401-1-prabhakar.mahadev-lad.rj@bp.renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex.dts | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex.dts b/arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex.dts
index a3edd55113df..60d7c8adea02 100644
--- a/arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex.dts
+++ b/arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex.dts
@@ -14,3 +14,8 @@
compatible = "hoperun,hihope-rzg2-ex", "hoperun,hihope-rzg2n",
"renesas,r8a774b1";
};
+
+/* Set SW43 = ON and SW1001[7] = OFF for SATA port to be activated */
+&sata {
+ status = "okay";
+};
--
2.17.1
[-- Attachment #2: Type: text/plain, Size: 420 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5692): https://lists.cip-project.org/g/cip-dev/message/5692
Mute This Topic: https://lists.cip-project.org/mt/77885351/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 9+ messages in thread* [cip-dev] [PATCH 4.19.y-cip 4/4] ata: sata_rcar: Fix DMA boundary mask
2020-10-29 11:45 [cip-dev] [PATCH 4.19.y-cip 0/4] Add SATA support to RZ/G2N Lad Prabhakar
` (2 preceding siblings ...)
2020-10-29 11:46 ` [cip-dev] [PATCH 4.19.y-cip 3/4] arm64: dts: renesas: r8a774b1-hihope-rzg2n-ex: Enable sata Lad Prabhakar
@ 2020-10-29 11:46 ` Lad Prabhakar
2020-10-29 13:04 ` [cip-dev] [PATCH 4.19.y-cip 0/4] Add SATA support to RZ/G2N Pavel Machek
4 siblings, 0 replies; 9+ messages in thread
From: Lad Prabhakar @ 2020-10-29 11:46 UTC (permalink / raw)
To: cip-dev, Nobuhiro Iwamatsu, Pavel Machek; +Cc: Biju Das
[-- Attachment #1: Type: text/plain, Size: 2964 bytes --]
From: Geert Uytterhoeven <geert+renesas@glider.be>
commit df9c590986fdb6db9d5636d6cd93bc919c01b451 upstream.
Before commit 9495b7e92f716ab2 ("driver core: platform: Initialize
dma_parms for platform devices"), the R-Car SATA device didn't have DMA
parameters. Hence the DMA boundary mask supplied by its driver was
silently ignored, as __scsi_init_queue() doesn't check the return value
of dma_set_seg_boundary(), and the default value of 0xffffffff was used.
Now the device has gained DMA parameters, the driver-supplied value is
used, and the following warning is printed on Salvator-XS:
DMA-API: sata_rcar ee300000.sata: mapping sg segment across boundary [start=0x00000000ffffe000] [end=0x00000000ffffefff] [boundary=0x000000001ffffffe]
WARNING: CPU: 5 PID: 38 at kernel/dma/debug.c:1233 debug_dma_map_sg+0x298/0x300
(the range of start/end values depend on whether IOMMU support is
enabled or not)
The issue here is that SATA_RCAR_DMA_BOUNDARY doesn't have bit 0 set, so
any typical end value, which is odd, will trigger the check.
Fix this by increasing the DMA boundary value by 1.
This also fixes the following WRITE DMA EXT timeout issue:
# dd if=/dev/urandom of=/mnt/de1/file1-1024M bs=1M count=1024
ata1.00: exception Emask 0x0 SAct 0x0 SErr 0x0 action 0x6 frozen
ata1.00: failed command: WRITE DMA EXT
ata1.00: cmd 35/00:00:00:e6:0c/00:0a:00:00:00/e0 tag 0 dma 1310720 out
res 40/00:01:00:00:00/00:00:00:00:00/00 Emask 0x4 (timeout)
ata1.00: status: { DRDY }
as seen by Shimoda-san since commit 429120f3df2dba2b ("block: fix
splitting segments on boundary masks").
Fixes: 8bfbeed58665dbbf ("sata_rcar: correct 'sata_rcar_sht'")
Fixes: 9495b7e92f716ab2 ("driver core: platform: Initialize dma_parms for platform devices")
Fixes: 429120f3df2dba2b ("block: fix splitting segments on boundary masks")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
drivers/ata/sata_rcar.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c
index 8323f88d17a5..4dcdf8ee0055 100644
--- a/drivers/ata/sata_rcar.c
+++ b/drivers/ata/sata_rcar.c
@@ -124,7 +124,7 @@
/* Descriptor table word 0 bit (when DTA32M = 1) */
#define SATA_RCAR_DTEND BIT(0)
-#define SATA_RCAR_DMA_BOUNDARY 0x1FFFFFFEUL
+#define SATA_RCAR_DMA_BOUNDARY 0x1FFFFFFFUL
/* Gen2 Physical Layer Control Registers */
#define RCAR_GEN2_PHY_CTL1_REG 0x1704
--
2.17.1
[-- Attachment #2: Type: text/plain, Size: 420 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5693): https://lists.cip-project.org/g/cip-dev/message/5693
Mute This Topic: https://lists.cip-project.org/mt/77885352/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [cip-dev] [PATCH 4.19.y-cip 0/4] Add SATA support to RZ/G2N
2020-10-29 11:45 [cip-dev] [PATCH 4.19.y-cip 0/4] Add SATA support to RZ/G2N Lad Prabhakar
` (3 preceding siblings ...)
2020-10-29 11:46 ` [cip-dev] [PATCH 4.19.y-cip 4/4] ata: sata_rcar: Fix DMA boundary mask Lad Prabhakar
@ 2020-10-29 13:04 ` Pavel Machek
2020-10-30 10:25 ` Pavel Machek
4 siblings, 1 reply; 9+ messages in thread
From: Pavel Machek @ 2020-10-29 13:04 UTC (permalink / raw)
To: Lad Prabhakar; +Cc: cip-dev, Nobuhiro Iwamatsu, Pavel Machek, Biju Das
[-- Attachment #1.1: Type: text/plain, Size: 431 bytes --]
Hi!
> This patch series adds SATA support to RZ/G2N SoC and enables
> sata node in Hihope RZ/G2N board, alongside a fix to sata driver.
Series looks okay to me, it is currently being tested. I can
apply/push it if there are no other comments.
Best regards,
Pavel
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 420 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5695): https://lists.cip-project.org/g/cip-dev/message/5695
Mute This Topic: https://lists.cip-project.org/mt/77885348/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [cip-dev] [PATCH 4.19.y-cip 0/4] Add SATA support to RZ/G2N
2020-10-29 13:04 ` [cip-dev] [PATCH 4.19.y-cip 0/4] Add SATA support to RZ/G2N Pavel Machek
@ 2020-10-30 10:25 ` Pavel Machek
2020-10-30 18:08 ` Lad Prabhakar
0 siblings, 1 reply; 9+ messages in thread
From: Pavel Machek @ 2020-10-30 10:25 UTC (permalink / raw)
To: Pavel Machek; +Cc: Lad Prabhakar, cip-dev, Nobuhiro Iwamatsu, Biju Das
[-- Attachment #1.1: Type: text/plain, Size: 489 bytes --]
Hi!
> > This patch series adds SATA support to RZ/G2N SoC and enables
> > sata node in Hihope RZ/G2N board, alongside a fix to sata driver.
>
> Series looks okay to me, it is currently being tested. I can
> apply/push it if there are no other comments.
Thanks for patches, I pushed out the series.
Best regards,
Pavel
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 420 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5696): https://lists.cip-project.org/g/cip-dev/message/5696
Mute This Topic: https://lists.cip-project.org/mt/77885348/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [cip-dev] [PATCH 4.19.y-cip 0/4] Add SATA support to RZ/G2N
2020-10-30 10:25 ` Pavel Machek
@ 2020-10-30 18:08 ` Lad Prabhakar
0 siblings, 0 replies; 9+ messages in thread
From: Lad Prabhakar @ 2020-10-30 18:08 UTC (permalink / raw)
To: Pavel Machek; +Cc: cip-dev@lists.cip-project.org, Nobuhiro Iwamatsu, Biju Das
[-- Attachment #1: Type: text/plain, Size: 781 bytes --]
Hi Pavel,
> -----Original Message-----
> From: Pavel Machek <pavel@denx.de>
> Sent: 30 October 2020 10:26
> To: Pavel Machek <pavel@denx.de>
> Cc: Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com>; cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu
> <nobuhiro1.iwamatsu@toshiba.co.jp>; Biju Das <biju.das.jz@bp.renesas.com>
> Subject: Re: [PATCH 4.19.y-cip 0/4] Add SATA support to RZ/G2N
>
> Hi!
>
> > > This patch series adds SATA support to RZ/G2N SoC and enables
> > > sata node in Hihope RZ/G2N board, alongside a fix to sata driver.
> >
> > Series looks okay to me, it is currently being tested. I can
> > apply/push it if there are no other comments.
>
> Thanks for patches, I pushed out the series.
>
Thank you.
Cheers,
Prabhakar
[-- Attachment #2: Type: text/plain, Size: 420 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5699): https://lists.cip-project.org/g/cip-dev/message/5699
Mute This Topic: https://lists.cip-project.org/mt/77885348/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 9+ messages in thread