[05/11] media: renesas: fdp1: remove R-Car H3 ES1.* handling

Message ID 20230307163041.3815-6-wsa+renesas@sang-engineering.com (mailing list archive)
State Accepted
Delegated to: Sakari Ailus
Headers
Series tree-wide: remove support for Renesas R-Car H3 ES1 |

Commit Message

Wolfram Sang March 7, 2023, 4:30 p.m. UTC
  R-Car H3 ES1.* was only available to an internal development group and
needed a lot of quirks and workarounds. These become a maintenance
burden now, so our development group decided to remove upstream support
and disable booting for this SoC. Public users only have ES2 onwards.

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
Please apply individually per subsystem. There are no dependencies and the SoC
doesn't boot anymore since v6.3-rc1.

 drivers/media/platform/renesas/rcar_fdp1.c | 4 ----
 1 file changed, 4 deletions(-)
  

Comments

Kieran Bingham March 8, 2023, 12:36 a.m. UTC | #1
Quoting Wolfram Sang (2023-03-07 16:30:33)
> R-Car H3 ES1.* was only available to an internal development group and
> needed a lot of quirks and workarounds. These become a maintenance
> burden now, so our development group decided to remove upstream support
> and disable booting for this SoC. Public users only have ES2 onwards.
> 
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

> ---
> Please apply individually per subsystem. There are no dependencies and the SoC
> doesn't boot anymore since v6.3-rc1.
> 
>  drivers/media/platform/renesas/rcar_fdp1.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/drivers/media/platform/renesas/rcar_fdp1.c b/drivers/media/platform/renesas/rcar_fdp1.c
> index 37ecf489d112..f4a1fc8ce595 100644
> --- a/drivers/media/platform/renesas/rcar_fdp1.c
> +++ b/drivers/media/platform/renesas/rcar_fdp1.c
> @@ -254,7 +254,6 @@ MODULE_PARM_DESC(debug, "activate debug info");
>  
>  /* Internal Data (HW Version) */
>  #define FD1_IP_INTDATA                 0x0800
> -#define FD1_IP_H3_ES1                  0x02010101
>  #define FD1_IP_M3W                     0x02010202
>  #define FD1_IP_H3                      0x02010203
>  #define FD1_IP_M3N                     0x02010204
> @@ -2359,9 +2358,6 @@ static int fdp1_probe(struct platform_device *pdev)
>  
>         hw_version = fdp1_read(fdp1, FD1_IP_INTDATA);
>         switch (hw_version) {
> -       case FD1_IP_H3_ES1:
> -               dprintk(fdp1, "FDP1 Version R-Car H3 ES1\n");
> -               break;
>         case FD1_IP_M3W:
>                 dprintk(fdp1, "FDP1 Version R-Car M3-W\n");
>                 break;
> -- 
> 2.35.1
>
  
Geert Uytterhoeven April 24, 2023, 5:37 p.m. UTC | #2
Hi Wolfram,

On Tue, Mar 7, 2023 at 5:31 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> R-Car H3 ES1.* was only available to an internal development group and
> needed a lot of quirks and workarounds. These become a maintenance
> burden now, so our development group decided to remove upstream support
> and disable booting for this SoC. Public users only have ES2 onwards.
>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Thanks for your patch, which is now commit af4273b43f2bd9ee ("media:
renesas: fdp1: remove R-Car H3 ES1.* handling") in media/master
(next-20230417 and later).

> --- a/drivers/media/platform/renesas/rcar_fdp1.c
> +++ b/drivers/media/platform/renesas/rcar_fdp1.c
> @@ -254,7 +254,6 @@ MODULE_PARM_DESC(debug, "activate debug info");
>
>  /* Internal Data (HW Version) */
>  #define FD1_IP_INTDATA                 0x0800
> -#define FD1_IP_H3_ES1                  0x02010101
>  #define FD1_IP_M3W                     0x02010202
>  #define FD1_IP_H3                      0x02010203
>  #define FD1_IP_M3N                     0x02010204
> @@ -2359,9 +2358,6 @@ static int fdp1_probe(struct platform_device *pdev)
>
>         hw_version = fdp1_read(fdp1, FD1_IP_INTDATA);
>         switch (hw_version) {
> -       case FD1_IP_H3_ES1:
> -               dprintk(fdp1, "FDP1 Version R-Car H3 ES1\n");
> -               break;
>         case FD1_IP_M3W:
>                 dprintk(fdp1, "FDP1 Version R-Car M3-W\n");
>                 break;

Apparently 0x02010101 is also used on (at least) R-Car M2-W ES1.0,
causing the following annoying (but further harmless?) messages
during boot:

    rcar_fdp1 fe940000.fdp1: FDP1 Unidentifiable (0x02010101)
    rcar_fdp1 fe944000.fdp1: FDP1 Unidentifiable (0x02010101)

Note that the R-Car Gen2 documentation states the register's contents
are all zeroes.  But that value would trigger the error message, too.

Sorry for not noticing before. Apparently I never booted a kernel
with this patch on koelsch...

Gr{oetje,eeting}s,

                        Geert
  
Wolfram Sang April 24, 2023, 7:17 p.m. UTC | #3
Hi Geert,

thanks for reporting!

> > -#define FD1_IP_H3_ES1                  0x02010101

...

> Apparently 0x02010101 is also used on (at least) R-Car M2-W ES1.0,
> causing the following annoying (but further harmless?) messages
> during boot:
> 
>     rcar_fdp1 fe940000.fdp1: FDP1 Unidentifiable (0x02010101)
>     rcar_fdp1 fe944000.fdp1: FDP1 Unidentifiable (0x02010101)

Hmm, that means before my removal patch, Gen2 has been incorrectly
defined as H3 ES1?

> Note that the R-Car Gen2 documentation states the register's contents
> are all zeroes.  But that value would trigger the error message, too.

Bad, but well...

> Sorry for not noticing before. Apparently I never booted a kernel
> with this patch on koelsch...

We could re-add this version and just let it print "FDP1 Initial
Version" or something? I could test this on my Lager board.

All the best,

   Wolfram
  
Geert Uytterhoeven April 24, 2023, 7:37 p.m. UTC | #4
Hi Wolfram,

On Mon, Apr 24, 2023 at 9:17 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> > > -#define FD1_IP_H3_ES1                  0x02010101
>
> ...
>
> > Apparently 0x02010101 is also used on (at least) R-Car M2-W ES1.0,
> > causing the following annoying (but further harmless?) messages
> > during boot:
> >
> >     rcar_fdp1 fe940000.fdp1: FDP1 Unidentifiable (0x02010101)
> >     rcar_fdp1 fe944000.fdp1: FDP1 Unidentifiable (0x02010101)
>
> Hmm, that means before my removal patch, Gen2 has been incorrectly
> defined as H3 ES1?

Indeed, but the driver doesn't seem to do anything with the detected
version, except for printing a debug or error message.

> > Note that the R-Car Gen2 documentation states the register's contents
> > are all zeroes.  But that value would trigger the error message, too.
>
> Bad, but well...
>
> > Sorry for not noticing before. Apparently I never booted a kernel
> > with this patch on koelsch...
>
> We could re-add this version and just let it print "FDP1 Initial
> Version" or something? I could test this on my Lager board.

I plan to test it on a few other boards, too...
Just wanted to let you know ASAP...

Gr{oetje,eeting}s,

                        Geert
  
Laurent Pinchart April 24, 2023, 11:52 p.m. UTC | #5
On Mon, Apr 24, 2023 at 09:37:00PM +0200, Geert Uytterhoeven wrote:
> On Mon, Apr 24, 2023 at 9:17 PM Wolfram Sang wrote:
> > > > -#define FD1_IP_H3_ES1                  0x02010101
> >
> > ...
> >
> > > Apparently 0x02010101 is also used on (at least) R-Car M2-W ES1.0,
> > > causing the following annoying (but further harmless?) messages
> > > during boot:
> > >
> > >     rcar_fdp1 fe940000.fdp1: FDP1 Unidentifiable (0x02010101)
> > >     rcar_fdp1 fe944000.fdp1: FDP1 Unidentifiable (0x02010101)
> >
> > Hmm, that means before my removal patch, Gen2 has been incorrectly
> > defined as H3 ES1?
> 
> Indeed, but the driver doesn't seem to do anything with the detected
> version, except for printing a debug or error message.

It may not now, but I'd rather get this fixes nonetheless to avoid
forgetting about the issue and wondering later once we take the version
into account why M2-W doesn't work.

> > > Note that the R-Car Gen2 documentation states the register's contents
> > > are all zeroes.  But that value would trigger the error message, too.
> >
> > Bad, but well...
> >
> > > Sorry for not noticing before. Apparently I never booted a kernel
> > > with this patch on koelsch...
> >
> > We could re-add this version and just let it print "FDP1 Initial
> > Version" or something? I could test this on my Lager board.
> 
> I plan to test it on a few other boards, too...
> Just wanted to let you know ASAP...
  

Patch

diff --git a/drivers/media/platform/renesas/rcar_fdp1.c b/drivers/media/platform/renesas/rcar_fdp1.c
index 37ecf489d112..f4a1fc8ce595 100644
--- a/drivers/media/platform/renesas/rcar_fdp1.c
+++ b/drivers/media/platform/renesas/rcar_fdp1.c
@@ -254,7 +254,6 @@  MODULE_PARM_DESC(debug, "activate debug info");
 
 /* Internal Data (HW Version) */
 #define FD1_IP_INTDATA			0x0800
-#define FD1_IP_H3_ES1			0x02010101
 #define FD1_IP_M3W			0x02010202
 #define FD1_IP_H3			0x02010203
 #define FD1_IP_M3N			0x02010204
@@ -2359,9 +2358,6 @@  static int fdp1_probe(struct platform_device *pdev)
 
 	hw_version = fdp1_read(fdp1, FD1_IP_INTDATA);
 	switch (hw_version) {
-	case FD1_IP_H3_ES1:
-		dprintk(fdp1, "FDP1 Version R-Car H3 ES1\n");
-		break;
 	case FD1_IP_M3W:
 		dprintk(fdp1, "FDP1 Version R-Car M3-W\n");
 		break;