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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxx>
---
  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);
  }




[Index of Archives]     [Linux MIPS Home]     [LKML Archive]     [Linux ARM Kernel]     [Linux ARM]     [Linux]     [Git]     [Yosemite News]     [Linux SCSI]     [Linux Hams]

  Powered by Linux