2016-03-11 16:13:15

by Nishanth Menon

[permalink] [raw]
Subject: [PATCH] ARM: OMAP2: Fix up interconnect barrier initialization for DRA7

The following commits:
commit 3fa609755c11 ("ARM: omap2: restore OMAP4 barrier behaviour")
commit f746929ffdc8 ("Revert "ARM: OMAP4: remove dead kconfig option OMAP4_ERRATA_I688"")
and
commit ea827ad5ffbb ("ARM: DRA7: Provide proper IO map table")
came in around the same time, unfortunately this seem to have missed
initializing the barrier for DRA7 platforms - omap5_map_io was reused
for dra7 till it was split out by the last patch. barrier_init
needs to be hence carried forward as it is valid for DRA7 family of
processors as they are for OMAP5.

Fixes: ea827ad5ffbb7 ("ARM: DRA7: Provide proper IO map table")
Reported-by: Laurent Pinchart <[email protected]>
Reported-by: Tomi Valkeinen <[email protected]>
Cc: Russell King <[email protected]>
Signed-off-by: Nishanth Menon <[email protected]>
---

Original thread of report: http://www.spinics.net/lists/dri-devel/msg101246.html

arch/arm/mach-omap2/io.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 3c87e40650cf..9821be6dfd5e 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -368,6 +368,7 @@ void __init omap5_map_io(void)
void __init dra7xx_map_io(void)
{
iotable_init(dra7xx_io_desc, ARRAY_SIZE(dra7xx_io_desc));
+ omap_barriers_init();
}
#endif
/*
--
2.7.0


2016-03-11 16:46:11

by Laurent Pinchart

[permalink] [raw]
Subject: Re: [PATCH] ARM: OMAP2: Fix up interconnect barrier initialization for DRA7

Hi Nishanth,

Thank you for the patch.

On Friday 11 March 2016 10:12:28 Nishanth Menon wrote:
> The following commits:
> commit 3fa609755c11 ("ARM: omap2: restore OMAP4 barrier behaviour")
> commit f746929ffdc8 ("Revert "ARM: OMAP4: remove dead kconfig option
> OMAP4_ERRATA_I688"") and
> commit ea827ad5ffbb ("ARM: DRA7: Provide proper IO map table")
> came in around the same time, unfortunately this seem to have missed
> initializing the barrier for DRA7 platforms - omap5_map_io was reused
> for dra7 till it was split out by the last patch. barrier_init
> needs to be hence carried forward as it is valid for DRA7 family of
> processors as they are for OMAP5.
>
> Fixes: ea827ad5ffbb7 ("ARM: DRA7: Provide proper IO map table")
> Reported-by: Laurent Pinchart <[email protected]>
> Reported-by: Tomi Valkeinen <[email protected]>
> Cc: Russell King <[email protected]>
> Signed-off-by: Nishanth Menon <[email protected]>

Reviewed-by: Laurent Pinchart <[email protected]>

> ---
>
> Original thread of report:
> http://www.spinics.net/lists/dri-devel/msg101246.html
>
> arch/arm/mach-omap2/io.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
> index 3c87e40650cf..9821be6dfd5e 100644
> --- a/arch/arm/mach-omap2/io.c
> +++ b/arch/arm/mach-omap2/io.c
> @@ -368,6 +368,7 @@ void __init omap5_map_io(void)
> void __init dra7xx_map_io(void)
> {
> iotable_init(dra7xx_io_desc, ARRAY_SIZE(dra7xx_io_desc));
> + omap_barriers_init();
> }
> #endif
> /*

--
Regards,

Laurent Pinchart

2016-03-30 21:11:20

by Tony Lindgren

[permalink] [raw]
Subject: Re: [PATCH] ARM: OMAP2: Fix up interconnect barrier initialization for DRA7

* Laurent Pinchart <[email protected]> [160311 08:46]:
> Hi Nishanth,
>
> Thank you for the patch.
>
> On Friday 11 March 2016 10:12:28 Nishanth Menon wrote:
> > The following commits:
> > commit 3fa609755c11 ("ARM: omap2: restore OMAP4 barrier behaviour")
> > commit f746929ffdc8 ("Revert "ARM: OMAP4: remove dead kconfig option
> > OMAP4_ERRATA_I688"") and
> > commit ea827ad5ffbb ("ARM: DRA7: Provide proper IO map table")
> > came in around the same time, unfortunately this seem to have missed
> > initializing the barrier for DRA7 platforms - omap5_map_io was reused
> > for dra7 till it was split out by the last patch. barrier_init
> > needs to be hence carried forward as it is valid for DRA7 family of
> > processors as they are for OMAP5.
> >
> > Fixes: ea827ad5ffbb7 ("ARM: DRA7: Provide proper IO map table")
> > Reported-by: Laurent Pinchart <[email protected]>
> > Reported-by: Tomi Valkeinen <[email protected]>
> > Cc: Russell King <[email protected]>
> > Signed-off-by: Nishanth Menon <[email protected]>
>
> Reviewed-by: Laurent Pinchart <[email protected]>

Applying into omap-for-v4.6/fixes with Cc stable thanks.

Tony