From owner-svn-src-head@FreeBSD.ORG  Sat Aug 18 11:40:56 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 896A61065672;
	Sat, 18 Aug 2012 11:40:56 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 75BE98FC0A;
	Sat, 18 Aug 2012 11:40:56 +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 q7IBeu9T019115;
	Sat, 18 Aug 2012 11:40:56 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7IBeuGR019113;
	Sat, 18 Aug 2012 11:40:56 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201208181140.q7IBeuGR019113@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sat, 18 Aug 2012 11:40:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239368 - head/sys/arm/mv
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2012 11:40:56 -0000

Author: hrs
Date: Sat Aug 18 11:40:55 2012
New Revision: 239368
URL: http://svn.freebsd.org/changeset/base/239368

Log:
  - MV_DEV_88F6282 has 256KB 4-way L2 cache.
  - Sort IDs in win_cpu_can_remap() and remove MV_DEV_MV78100 because it is
    included in MV_DEV_DISCOVERY.
  - Add MV_DEV_MV78XXX to xor_max_eng().

Modified:
  head/sys/arm/mv/common.c

Modified: head/sys/arm/mv/common.c
==============================================================================
--- head/sys/arm/mv/common.c	Sat Aug 18 11:33:21 2012	(r239367)
+++ head/sys/arm/mv/common.c	Sat Aug 18 11:40:55 2012	(r239368)
@@ -428,6 +428,7 @@ soc_identify(void)
 
 	switch (d) {
 	case MV_DEV_88F6281:
+	case MV_DEV_88F6282:
 		mode = read_cpu_ctrl(CPU_L2_CONFIG) & CPU_L2_CONFIG_MODE;
 		printf("  256KB 4-way set-associative %s unified L2 cache\n",
 		    mode ? "write-through" : "write-back");
@@ -669,10 +670,9 @@ win_cpu_can_remap(int i)
 	if ((dev == MV_DEV_88F5182 && i < 2) ||
 	    (dev == MV_DEV_88F5281 && i < 4) ||
 	    (dev == MV_DEV_88F6281 && i < 4) ||
+	    (dev == MV_DEV_88F6282 && i < 4) ||
 	    (dev == MV_DEV_88RC8180 && i < 2) ||
 	    (dev == MV_DEV_88F6781 && i < 4) ||
-	    (dev == MV_DEV_88F6282 && i < 4) ||
-	    (dev == MV_DEV_MV78100 && i < 8) ||
 	    (dev == MV_DEV_MV78100_Z0 && i < 8) ||
 	    ((dev & MV_DEV_FAMILY_MASK) == MV_DEV_DISCOVERY && i < 8))
 		return (1);
@@ -1525,13 +1525,21 @@ xor_max_eng(void)
 	uint32_t dev, rev;
 
 	soc_id(&dev, &rev);
-	if (dev == MV_DEV_88F6281 ||
-	    dev == MV_DEV_88F6282)
+	switch (dev) {
+	case MV_DEV_88F6281:
+	case MV_DEV_88F6282:
+	case MV_DEV_MV78130:
+	case MV_DEV_MV78160:
+	case MV_DEV_MV78230:
+	case MV_DEV_MV78260:
+	case MV_DEV_MV78460:
 		return (2);
-	else if ((dev == MV_DEV_MV78100) || (dev == MV_DEV_MV78100_Z0))
+	case MV_DEV_MV78100:
+	case MV_DEV_MV78100_Z0:
 		return (1);
-	else
+	default:
 		return (0);
+	}
 }
 
 static void