[PATCH] MIPS: cavium-octeon: fix early boot hang on EBH5600 board

[PATCH] MIPS: cavium-octeon: fix early boot hang on EBH5600 board

[Aaro Koskinen]

The boot hangs early on EBH5600 board when octeon_fdt_pip_iface() is
trying enumerate a non-existant interface. We can avoid this situation
by first checking that the interface exists in the DTB.

Signed-off-by: Aaro Koskinen <aaro.koskinen@nsn.com>
---
 arch/mips/cavium-octeon/octeon-platform.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c
index 1830874..f68c75a 100644
--- a/arch/mips/cavium-octeon/octeon-platform.c
+++ b/arch/mips/cavium-octeon/octeon-platform.c
@@ -336,14 +336,14 @@ static void __init octeon_fdt_pip_iface(int pip, int idx, u64 *pmac)
 	int p;
 	int count = 0;
 
-	if (cvmx_helper_interface_enumerate(idx) == 0)
-		count = cvmx_helper_ports_on_interface(idx);
-
 	snprintf(name_buffer, sizeof(name_buffer), "interface@%d", idx);
 	iface = fdt_subnode_offset(initial_boot_params, pip, name_buffer);
 	if (iface < 0)
 		return;
 
+	if (cvmx_helper_interface_enumerate(idx) == 0)
+		count = cvmx_helper_ports_on_interface(idx);
+
 	for (p = 0; p < 16; p++)
 		octeon_fdt_pip_port(iface, idx, p, count - 1, pmac);
 }
-- 
1.8.4.rc3

Re: [PATCH] MIPS: cavium-octeon: fix early boot hang on EBH5600 board

[David Daney]

I am looking at this, but it could be a few days before I can render an 
opinion about it.


On 10/30/2013 07:08 AM, Aaro Koskinen wrote:
> The boot hangs early on EBH5600 board when octeon_fdt_pip_iface() is
> trying enumerate a non-existant interface. We can avoid this situation
> by first checking that the interface exists in the DTB.
>
> Signed-off-by: Aaro Koskinen <aaro.koskinen@nsn.com>
> ---
>   arch/mips/cavium-octeon/octeon-platform.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c
> index 1830874..f68c75a 100644
> --- a/arch/mips/cavium-octeon/octeon-platform.c
> +++ b/arch/mips/cavium-octeon/octeon-platform.c
> @@ -336,14 +336,14 @@ static void __init octeon_fdt_pip_iface(int pip, int idx, u64 *pmac)
>   	int p;
>   	int count = 0;
>
> -	if (cvmx_helper_interface_enumerate(idx) == 0)
> -		count = cvmx_helper_ports_on_interface(idx);
> -
>   	snprintf(name_buffer, sizeof(name_buffer), "interface@%d", idx);
>   	iface = fdt_subnode_offset(initial_boot_params, pip, name_buffer);
>   	if (iface < 0)
>   		return;
>
> +	if (cvmx_helper_interface_enumerate(idx) == 0)
> +		count = cvmx_helper_ports_on_interface(idx);
> +
>   	for (p = 0; p < 16; p++)
>   		octeon_fdt_pip_port(iface, idx, p, count - 1, pmac);
>   }
>

Re: [PATCH] MIPS: cavium-octeon: fix early boot hang on EBH5600 board

[Ralf Baechle]

On Thu, Oct 31, 2013 at 10:27:30AM -0700, David Daney wrote:

> I am looking at this, but it could be a few days before I can render an
> opinion about it.

This is still pending in http://patchwork.linux-mips.org/patch/6090/.

Drop?  Apply?  Apply carbon dating first?

  Ralf

Re: [PATCH] MIPS: cavium-octeon: fix early boot hang on EBH5600 board

[Aaro Koskinen]

Hi,

On Tue, Nov 11, 2014 at 05:19:10PM +0100, Ralf Baechle wrote:
> On Thu, Oct 31, 2013 at 10:27:30AM -0700, David Daney wrote:
> > I am looking at this, but it could be a few days before I can render an
> > opinion about it.
> 
> This is still pending in http://patchwork.linux-mips.org/patch/6090/.
> 
> Drop?  Apply?  Apply carbon dating first?

This one is already applied to mainline
(b2e4f1560f7388f8157dd2c828211abbfad0e806).

A.

Re: [PATCH] MIPS: cavium-octeon: fix early boot hang on EBH5600 board

[Ralf Baechle]

On Tue, Nov 11, 2014 at 06:24:12PM +0200, Aaro Koskinen wrote:

> > Drop?  Apply?  Apply carbon dating first?
> 
> This one is already applied to mainline
> (b2e4f1560f7388f8157dd2c828211abbfad0e806).

Ah, great thanks.  I dropped it then.

We have a bunch more patches that are pending for very long time; I'm
going to post them in the next days.  Not 377 days though :)

  Ralf