diff mbox series

[4.19.y-cip,01/12] arm64: dts: renesas: r8a774a1-hihope-rzg2m[-ex/-ex-idk-1110wr]: Rename HiHope RZ/G2M boards

Message ID 20200819163634.5430-2-biju.das.jz@bp.renesas.com
State Accepted
Headers show
Series Support RZ/G2[MN] rev4 board | expand

Commit Message

Biju Das Aug. 19, 2020, 4:36 p.m. UTC
From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>

commit a80f301ea69e76f10099626986b4674c6f990a15 upstream.

The existing DTS files for HiHope RZ/G2M boards are for Rev.2.0 version
so reflect the same for the DTS file names so that the existing naming
convention can be used for Rev.3.0/4.0 boards.

While at it also added a comment about switch SW43 to be OFF for pciec1
to be activated.

Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: Marian-Cristian Rotariu <marian-cristian.rotariu.rb@bp.renesas.com>
Link: https://lore.kernel.org/r/1593004330-5039-2-git-send-email-prabhakar.mahadev-lad.rj@bp.renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
 arch/arm64/boot/dts/renesas/Makefile                       | 6 +++---
 ...wr.dts => r8a774a1-hihope-rzg2m-rev2-ex-idk-1110wr.dts} | 4 ++--
 ...hope-rzg2m-ex.dts => r8a774a1-hihope-rzg2m-rev2-ex.dts} | 7 ++++---
 ...4a1-hihope-rzg2m.dts => r8a774a1-hihope-rzg2m-rev2.dts} | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)
 rename arch/arm64/boot/dts/renesas/{r8a774a1-hihope-rzg2m-ex-idk-1110wr.dts => r8a774a1-hihope-rzg2m-rev2-ex-idk-1110wr.dts} (86%)
 rename arch/arm64/boot/dts/renesas/{r8a774a1-hihope-rzg2m-ex.dts => r8a774a1-hihope-rzg2m-rev2-ex.dts} (51%)
 rename arch/arm64/boot/dts/renesas/{r8a774a1-hihope-rzg2m.dts => r8a774a1-hihope-rzg2m-rev2.dts} (83%)

Comments

Pavel Machek Aug. 19, 2020, 6:05 p.m. UTC | #1
Hi!

Ok, so this is anti-social:

> -dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m.dtb
> +dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-rev2.dtb

This renames dts away, but at the end of series, new dts is created
with the r8a774a1-hihope-rzg2m.dts name, but this time it is for rev4
(not rev2) board.

So... people with rev2 boards and existing build script will get rev4
dts.. without any error.

Would it be better to always require explicit revision in dts/dtb
name?

Tests are running at
https://gitlab.com/cip-project/cip-kernel/linux-cip/tree/ci/pavel/linux-test
.

Best regards,

								Pavel
Biju Das Aug. 20, 2020, 6:54 a.m. UTC | #2
Hi Pavel,

Thanks for the feedback.

> Subject: Re: [PATCH 4.19.y-cip 01/12] arm64: dts: renesas: r8a774a1-hihope-
> rzg2m[-ex/-ex-idk-1110wr]: Rename HiHope RZ/G2M boards
>
> Hi!
>
> Ok, so this is anti-social:
>
> > -dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m.dtb
> > +dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-rev2.dtb
>
> This renames dts away, but at the end of series, new dts is created with the
> r8a774a1-hihope-rzg2m.dts name, but this time it is for rev4 (not rev2) board.
>
> So... people with rev2 boards and existing build script will get rev4 dts..
> without any error.

Yes, that is true. But if you agree, We need to use our latest/greatest SoC/board as the main SoC/Board and rest are with explicit revision in dts/dtb .

The existing users can read gpio values to differentiate rev2.0/rev4.0 boards and load the appropriate dtb/execute the test script accordingly.

>
> Would it be better to always require explicit revision in dts/dtb name?

This is our thoughts on this.  We need to use our latest/greatest SoC/board as the main SoC/Board and rest are with explicit revision in dts/dtb .
So this is inline with your suggested comment.

Please share your comments, I may be wrong.

Cheers,
Biju


Renesas Electronics Europe GmbH, Geschaeftsfuehrer/President: Carsten Jauch, Sitz der Gesellschaft/Registered office: Duesseldorf, Arcadiastrasse 10, 40472 Duesseldorf, Germany, Handelsregister/Commercial Register: Duesseldorf, HRB 3708 USt-IDNr./Tax identification no.: DE 119353406 WEEE-Reg.-Nr./WEEE reg. no.: DE 14978647
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#5164): https://lists.cip-project.org/g/cip-dev/message/5164
Mute This Topic: https://lists.cip-project.org/mt/76290781/4520428
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129116/1171672734/xyzzy  [patchwork-cip-dev@patchwork.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
Pavel Machek Aug. 23, 2020, 7:35 p.m. UTC | #3
Hi!

> > Ok, so this is anti-social:
> >
> > > -dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m.dtb
> > > +dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-rev2.dtb
> >
> > This renames dts away, but at the end of series, new dts is created with the
> > r8a774a1-hihope-rzg2m.dts name, but this time it is for rev4 (not rev2) board.
> >
> > So... people with rev2 boards and existing build script will get rev4 dts..
> > without any error.
> 
> Yes, that is true. But if you agree, We need to use our latest/greatest SoC/board as the main SoC/Board and rest are with explicit revision in dts/dtb .
>

I believe it would be better to always use explicit revision in these
cases; anything else is fairly confusing, as kernel update breaks your
setup (aka a regresssion).

Now, if -rev2 had few copies, and people really have -rev4, there will
not be much breakage. But imagine if rare -rev5 is released in future...

But mainline already made the choice. I'd just prefer not making same
choice in future.

Now, what to do here? One way would be to apply a series, but add a
README.cip file explaining incompatible change (and any future stuff
people need to know).

Best regards,

								Pavel
Biju Das Aug. 24, 2020, 6:46 a.m. UTC | #4
Hi Pavel,

Thanks for the feedback.

> Subject: Re: [PATCH 4.19.y-cip 01/12] arm64: dts: renesas: r8a774a1-hihope-
> rzg2m[-ex/-ex-idk-1110wr]: Rename HiHope RZ/G2M boards
>
> Hi!
>
> > > Ok, so this is anti-social:
> > >
> > > > -dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m.dtb
> > > > +dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-rev2.dtb
> > >
> > > This renames dts away, but at the end of series, new dts is created
> > > with the r8a774a1-hihope-rzg2m.dts name, but this time it is for rev4 (not
> rev2) board.
> > >
> > > So... people with rev2 boards and existing build script will get rev4 dts..
> > > without any error.
> >
> > Yes, that is true. But if you agree, We need to use our latest/greatest
> SoC/board as the main SoC/Board and rest are with explicit revision in
> dts/dtb .
> >
>
> I believe it would be better to always use explicit revision in these cases;
> anything else is fairly confusing, as kernel update breaks your setup (aka a
> regresssion).
>
> Now, if -rev2 had few copies, and people really have -rev4, there will not be
> much breakage. But imagine if rare -rev5 is released in future...
>
> But mainline already made the choice. I'd just prefer not making same choice
> in future.
>
> Now, what to do here? One way would be to apply a series, but add a
> README.cip file explaining incompatible change (and any future stuff people
> need to know).

OK. Either README.cip or " by including more information on the reference hardware and test information on CIP wiki." as suggested by Nobuhiro.
Please let us know, How do we want to proceed?

Cheers,
Biju


Renesas Electronics Europe GmbH, Geschaeftsfuehrer/President: Carsten Jauch, Sitz der Gesellschaft/Registered office: Duesseldorf, Arcadiastrasse 10, 40472 Duesseldorf, Germany, Handelsregister/Commercial Register: Duesseldorf, HRB 3708 USt-IDNr./Tax identification no.: DE 119353406 WEEE-Reg.-Nr./WEEE reg. no.: DE 14978647
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#5236): https://lists.cip-project.org/g/cip-dev/message/5236
Mute This Topic: https://lists.cip-project.org/mt/76290781/4520428
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129116/1171672734/xyzzy  [patchwork-cip-dev@patchwork.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
Pavel Machek Aug. 25, 2020, 9:51 p.m. UTC | #5
Hi!

> > I believe it would be better to always use explicit revision in these cases;
> > anything else is fairly confusing, as kernel update breaks your setup (aka a
> > regresssion).
> >
> > Now, if -rev2 had few copies, and people really have -rev4, there will not be
> > much breakage. But imagine if rare -rev5 is released in future...
> >
> > But mainline already made the choice. I'd just prefer not making same choice
> > in future.
> >
> > Now, what to do here? One way would be to apply a series, but add a
> > README.cip file explaining incompatible change (and any future stuff people
> > need to know).
> 
> OK. Either README.cip or " by including more information on the reference hardware and test information on CIP wiki." as suggested by Nobuhiro.
> Please let us know, How do we want to proceed?
>

I guess we should really have README file in the tree, explaining
potential compatibility issues and anything unusual happening in the
tree. I went through old changelogs, and collected these for 4.19
tree:

* -cip3: MDS sampling vulnerability fixes

This release includes many CVE fixes including MDS (Microarchitectural
Data Sampling: CVE-2018-12130, CVE-2018-12126, CVE-2018-12127,
CVE-2019-11091). These fixes were more extensive and harder to review
than usual for -stable tree.

* -cip9: m57621-mmc driver was removed

m57621-mmc driver was removed due to uncertainty about its licensing.

* -cip34: Support for Renesas RZ/G2[MN] revision 4 board

In -cip34, support for revision 4 of the board was merged. After the
merge, r8a774a1-hihope-rzg2m*.dtb files are suitable for revision 4 of
the board; if you want to produce dtb files for revision 2 of the
board, append -rev2 to the file names.

---

Does that sound ok?

Best regards,
								Pavel
Biju Das Aug. 26, 2020, 6:32 a.m. UTC | #6
Hi Pavel,

Thanks for the feedback.

> Subject: Re: [PATCH 4.19.y-cip 01/12] arm64: dts: renesas: r8a774a1-hihope-
> rzg2m[-ex/-ex-idk-1110wr]: Rename HiHope RZ/G2M boards
>
> Hi!
>
> > > I believe it would be better to always use explicit revision in
> > > these cases; anything else is fairly confusing, as kernel update
> > > breaks your setup (aka a regresssion).
> > >
> > > Now, if -rev2 had few copies, and people really have -rev4, there
> > > will not be much breakage. But imagine if rare -rev5 is released in
> future...
> > >
> > > But mainline already made the choice. I'd just prefer not making
> > > same choice in future.
> > >
> > > Now, what to do here? One way would be to apply a series, but add a
> > > README.cip file explaining incompatible change (and any future stuff
> > > people need to know).
> >
> > OK. Either README.cip or " by including more information on the reference
> hardware and test information on CIP wiki." as suggested by Nobuhiro.
> > Please let us know, How do we want to proceed?
> >
>
> I guess we should really have README file in the tree, explaining potential
> compatibility issues and anything unusual happening in the tree. I went
> through old changelogs, and collected these for 4.19
> tree:
>
> * -cip3: MDS sampling vulnerability fixes
>
> This release includes many CVE fixes including MDS (Microarchitectural Data
> Sampling: CVE-2018-12130, CVE-2018-12126, CVE-2018-12127, CVE-2019-
> 11091). These fixes were more extensive and harder to review than usual for
> -stable tree.
>
> * -cip9: m57621-mmc driver was removed
>
> m57621-mmc driver was removed due to uncertainty about its licensing.
>
> * -cip34: Support for Renesas RZ/G2[MN] revision 4 board
>
> In -cip34, support for revision 4 of the board was merged. After the merge,
> r8a774a1-hihope-rzg2m*.dtb files are suitable for revision 4 of the board; if
> you want to produce dtb files for revision 2 of the board, append -rev2 to the
> file names.
>
> ---
>
> Does that sound ok?

Yes, It looks good to me.

Cheers,
Biju


Renesas Electronics Europe GmbH, Geschaeftsfuehrer/President: Carsten Jauch, Sitz der Gesellschaft/Registered office: Duesseldorf, Arcadiastrasse 10, 40472 Duesseldorf, Germany, Handelsregister/Commercial Register: Duesseldorf, HRB 3708 USt-IDNr./Tax identification no.: DE 119353406 WEEE-Reg.-Nr./WEEE reg. no.: DE 14978647
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#5257): https://lists.cip-project.org/g/cip-dev/message/5257
Mute This Topic: https://lists.cip-project.org/mt/76290781/4520428
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129116/1171672734/xyzzy  [patchwork-cip-dev@patchwork.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile
index d22ede9e3ee4..5230e1ebdfd3 100644
--- a/arch/arm64/boot/dts/renesas/Makefile
+++ b/arch/arm64/boot/dts/renesas/Makefile
@@ -1,7 +1,7 @@ 
 # SPDX-License-Identifier: GPL-2.0
-dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m.dtb
-dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-ex.dtb
-dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-ex-idk-1110wr.dtb
+dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-rev2.dtb
+dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-rev2-ex.dtb
+dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-rev2-ex-idk-1110wr.dtb
 dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n.dtb
 dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-ex.dtb
 dtb-$(CONFIG_ARCH_R8A774C0) += r8a774c0-cat874.dtb r8a774c0-ek874.dtb \
diff --git a/arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex-idk-1110wr.dts b/arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex-idk-1110wr.dts
similarity index 86%
rename from arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex-idk-1110wr.dts
rename to arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex-idk-1110wr.dts
index 2ab5edd84e9b..3a1dcc914985 100644
--- a/arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex-idk-1110wr.dts
+++ b/arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex-idk-1110wr.dts
@@ -1,12 +1,12 @@ 
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Device Tree Source for the HiHope RZ/G2M sub board connected to an
+ * Device Tree Source for the HiHope RZ/G2M Rev.2.0 sub board connected to an
  * Advantech IDK-1110WR 10.1" LVDS panel
  *
  * Copyright (C) 2020 Renesas Electronics Corp.
  */
 
-#include "r8a774a1-hihope-rzg2m-ex.dts"
+#include "r8a774a1-hihope-rzg2m-rev2-ex.dts"
 #include "rzg2-advantech-idk-1110wr-panel.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dts b/arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex.dts
similarity index 51%
rename from arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dts
rename to arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex.dts
index c754fca239d9..2221cf6aed21 100644
--- a/arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dts
+++ b/arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex.dts
@@ -1,19 +1,20 @@ 
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Device Tree Source for the HiHope RZ/G2M sub board
+ * Device Tree Source for the HiHope RZ/G2M Rev.2.0 connected to sub board
  *
  * Copyright (C) 2019 Renesas Electronics Corp.
  */
 
-#include "r8a774a1-hihope-rzg2m.dts"
+#include "r8a774a1-hihope-rzg2m-rev2.dts"
 #include "hihope-rzg2-ex.dtsi"
 
 / {
-	model = "HopeRun HiHope RZ/G2M with sub board";
+	model = "HopeRun HiHope RZ/G2M (Rev.2.0) with sub board";
 	compatible = "hoperun,hihope-rzg2-ex", "hoperun,hihope-rzg2m",
 		     "renesas,r8a774a1";
 };
 
+/* SW43 should be OFF, if in ON state SATA port will be activated */
 &pciec1 {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m.dts b/arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2.dts
similarity index 83%
rename from arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m.dts
rename to arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2.dts
index 96f2fb080a1a..276f449ad14e 100644
--- a/arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m.dts
+++ b/arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2.dts
@@ -1,6 +1,6 @@ 
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Device Tree Source for the HiHope RZ/G2M main board
+ * Device Tree Source for the HiHope RZ/G2M Rev.2.0 main board
  *
  * Copyright (C) 2019 Renesas Electronics Corp.
  */
@@ -10,7 +10,7 @@ 
 #include "hihope-common.dtsi"
 
 / {
-	model = "HopeRun HiHope RZ/G2M main board based on r8a774a1";
+	model = "HopeRun HiHope RZ/G2M main board (Rev.2.0) based on r8a774a1";
 	compatible = "hoperun,hihope-rzg2m", "renesas,r8a774a1";
 
 	memory@48000000 {