[v2] ARM: bcm: Fix support for BCM2711 SoC which breaks other ARM platforms
diff mbox series

Message ID 0d7bef0622d69bd4f1129afe26b358669e639ae8.1576361067.git.hns@goldelico.com
State Mainlined
Commit 59034b9d6af8ccc1de0a265ca90b3aa967bae19f
Headers show
Series
  • [v2] ARM: bcm: Fix support for BCM2711 SoC which breaks other ARM platforms
Related show

Commit Message

H. Nikolaus Schaller Dec. 14, 2019, 10:04 p.m. UTC
commit 781fa0a95424 ("ARM: bcm: Add support for BCM2711 SoC")

breaks boot of many other platforms (e.g. OMAP or i.MX6) if
CONFIG_ARCH_BCM2835 is enabled in addition to some multiplatform
config (e.g. omap2plus_defconfig). The symptom is that the OMAP
based board does not show any activity beyond "Starting Kernel ..."
even with earlycon.

Reverting the mentioned commit makes it work again.

The real fix is to add the missing NULL sentinel to the
bcm2711_compat[] variable-length array.

Fixes: 781fa0a95424 ("ARM: bcm: Add support for BCM2711 SoC")
Acked-by: Stefan Wahren <wahrenst@gmx.net>
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
 arch/arm/mach-bcm/bcm2711.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Florian Fainelli Dec. 14, 2019, 10:49 p.m. UTC | #1
On 12/14/2019 2:04 PM, H. Nikolaus Schaller wrote:
> commit 781fa0a95424 ("ARM: bcm: Add support for BCM2711 SoC")
> 
> breaks boot of many other platforms (e.g. OMAP or i.MX6) if
> CONFIG_ARCH_BCM2835 is enabled in addition to some multiplatform
> config (e.g. omap2plus_defconfig). The symptom is that the OMAP
> based board does not show any activity beyond "Starting Kernel ..."
> even with earlycon.
> 
> Reverting the mentioned commit makes it work again.
> 
> The real fix is to add the missing NULL sentinel to the
> bcm2711_compat[] variable-length array.
> 
> Fixes: 781fa0a95424 ("ARM: bcm: Add support for BCM2711 SoC")
> Acked-by: Stefan Wahren <wahrenst@gmx.net>
> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>


This looks fine, I would just rephrase the commit subject as:

ARM: bcm: Add missing sentinel to bcm2711_compat[]

instead of indicating the breakage but not so much the fix, if that is
okay with you. And good catch, I will augment my local tests with a
basic multiplatform boot on several QEMU supported platforms.

> ---
>  arch/arm/mach-bcm/bcm2711.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/mach-bcm/bcm2711.c b/arch/arm/mach-bcm/bcm2711.c
> index dbe296798647..fa0300d8c79d 100644
> --- a/arch/arm/mach-bcm/bcm2711.c
> +++ b/arch/arm/mach-bcm/bcm2711.c
> @@ -13,6 +13,7 @@ static const char * const bcm2711_compat[] = {
>  #ifdef CONFIG_ARCH_MULTI_V7
>  	"brcm,bcm2711",
>  #endif
> +	NULL
>  };
>  
>  DT_MACHINE_START(BCM2711, "BCM2711")
>
H. Nikolaus Schaller Dec. 15, 2019, 7:48 a.m. UTC | #2
Hi Florian,

> Am 14.12.2019 um 23:49 schrieb Florian Fainelli <f.fainelli@gmail.com>:
> 
> This looks fine, I would just rephrase the commit subject as:
> 
> ARM: bcm: Add missing sentinel to bcm2711_compat[]
> 
> instead of indicating the breakage but not so much the fix, if that is
> okay with you. 

Yes, is okay and indeed better.

> -- 
> Florian


BR and thanks,
Nikolaus

Patch
diff mbox series

diff --git a/arch/arm/mach-bcm/bcm2711.c b/arch/arm/mach-bcm/bcm2711.c
index dbe296798647..fa0300d8c79d 100644
--- a/arch/arm/mach-bcm/bcm2711.c
+++ b/arch/arm/mach-bcm/bcm2711.c
@@ -13,6 +13,7 @@  static const char * const bcm2711_compat[] = {
 #ifdef CONFIG_ARCH_MULTI_V7
 	"brcm,bcm2711",
 #endif
+	NULL
 };
 
 DT_MACHINE_START(BCM2711, "BCM2711")