From owner-svn-src-projects@FreeBSD.ORG  Tue Jan 31 15:25:00 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E5F31106564A;
	Tue, 31 Jan 2012 15:25:00 +0000 (UTC)
	(envelope-from gber@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D22C08FC0A;
	Tue, 31 Jan 2012 15:25:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0VFP0v1041845;
	Tue, 31 Jan 2012 15:25:00 GMT (envelope-from gber@svn.freebsd.org)
Received: (from gber@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0VFP0xa041843;
	Tue, 31 Jan 2012 15:25:00 GMT (envelope-from gber@svn.freebsd.org)
Message-Id: <201201311525.q0VFP0xa041843@svn.freebsd.org>
From: Grzegorz Bernacki <gber@FreeBSD.org>
Date: Tue, 31 Jan 2012 15:25:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230811 - projects/armv6/sys/arm/mv/armadaxp
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Jan 2012 15:25:01 -0000

Author: gber
Date: Tue Jan 31 15:25:00 2012
New Revision: 230811
URL: http://svn.freebsd.org/changeset/base/230811

Log:
  armadaxp: Fix generation of mask for coherency fabric initialization
  
  Mask was set for wrong number of cores (one less than real number),
  thus causing problems with proper initialization.
  
  Submitted by: Lukasz Plachno
  Obtained from: Marvell, Semihalf

Modified:
  projects/armv6/sys/arm/mv/armadaxp/armadaxp_mp.c

Modified: projects/armv6/sys/arm/mv/armadaxp/armadaxp_mp.c
==============================================================================
--- projects/armv6/sys/arm/mv/armadaxp/armadaxp_mp.c	Tue Jan 31 15:23:45 2012	(r230810)
+++ projects/armv6/sys/arm/mv/armadaxp/armadaxp_mp.c	Tue Jan 31 15:25:00 2012	(r230811)
@@ -109,7 +109,7 @@ initialize_coherency_fabric(void)
 {
 	uint32_t val, cpus, mask;
 
-	cpus = platform_get_ncpus() - 1;
+	cpus = platform_get_ncpus();
 	mask = (1 << cpus) - 1;
 	val = read_coher_fabric(COHER_FABRIC_CTRL);
 	val |= (mask << 24);