From owner-svn-src-head@freebsd.org  Fri May 19 08:26:42 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 95897D73081;
 Fri, 19 May 2017 08:26:42 +0000 (UTC) (envelope-from wma@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 62A6AA6A;
 Fri, 19 May 2017 08:26:42 +0000 (UTC) (envelope-from wma@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4J8Qfe3007441;
 Fri, 19 May 2017 08:26:41 GMT (envelope-from wma@FreeBSD.org)
Received: (from wma@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4J8QfT9007440;
 Fri, 19 May 2017 08:26:41 GMT (envelope-from wma@FreeBSD.org)
Message-Id: <201705190826.v4J8QfT9007440@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wma set sender to wma@FreeBSD.org
 using -f
From: Wojciech Macek <wma@FreeBSD.org>
Date: Fri, 19 May 2017 08:26:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r318526 - head/sys/arm/mv/armada38x
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 May 2017 08:26:42 -0000

Author: wma
Date: Fri May 19 08:26:41 2017
New Revision: 318526
URL: https://svnweb.freebsd.org/changeset/base/318526

Log:
  Fix boot up on ARMADA38X uniprocessor variant
  
  Marvell Armada 380 is a uni-processor variant of the 38x SoC
  family. A function platform_mp_setmaxid() was setting a hardcoded
  value, which caused boot fail on A380. Fix this by relying on
  the CPU count obtained from device tree nodes.
  
  Submitted by:  Marcin Wojtas <mw@semihalf.com
  Obtained from: Semihalf
  Sponsored by:  Netgate
  Reviewed by:   loos
  Differential revision: https://reviews.freebsd.org/D10783

Modified:
  head/sys/arm/mv/armada38x/armada38x_mp.c

Modified: head/sys/arm/mv/armada38x/armada38x_mp.c
==============================================================================
--- head/sys/arm/mv/armada38x/armada38x_mp.c	Fri May 19 08:25:40 2017	(r318525)
+++ head/sys/arm/mv/armada38x/armada38x_mp.c	Fri May 19 08:26:41 2017	(r318526)
@@ -127,7 +127,7 @@ platform_mp_setmaxid(void)
 
 	/* Armada38x family supports maximum 2 cores */
 	mp_ncpus = platform_cnt_cpus();
-	mp_maxid = 1;
+	mp_maxid = mp_ncpus - 1;
 }
 
 void