From owner-svn-src-all@FreeBSD.ORG  Sun Jan  9 23:05:46 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C1DFF1065696;
	Sun,  9 Jan 2011 23:05:46 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 96A3A8FC08;
	Sun,  9 Jan 2011 23:05:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p09N5kuS059877;
	Sun, 9 Jan 2011 23:05:46 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p09N5ktu059874;
	Sun, 9 Jan 2011 23:05:46 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201101092305.p09N5ktu059874@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Sun, 9 Jan 2011 23:05:46 +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: r217210 - head/sys/mips/cavium/octe
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Jan 2011 23:05:46 -0000

Author: jmallett
Date: Sun Jan  9 23:05:46 2011
New Revision: 217210
URL: http://svn.freebsd.org/changeset/base/217210

Log:
  o) Remove some unused local definitions of IP protocol numbers.
  o) Use CPU_FOREACH rather than a miscrafted for loop with an off-by-one to
     enable workq interrupts on all cores.

Modified:
  head/sys/mips/cavium/octe/ethernet-defines.h
  head/sys/mips/cavium/octe/ethernet.c

Modified: head/sys/mips/cavium/octe/ethernet-defines.h
==============================================================================
--- head/sys/mips/cavium/octe/ethernet-defines.h	Sun Jan  9 22:47:58 2011	(r217209)
+++ head/sys/mips/cavium/octe/ethernet-defines.h	Sun Jan  9 23:05:46 2011	(r217210)
@@ -79,8 +79,6 @@ AND WITH ALL FAULTS AND CAVIUM  NETWORKS
 #define USE_MULTICORE_RECEIVE 0
 #endif
 
-#define IP_PROTOCOL_TCP             6
-#define IP_PROTOCOL_UDP             0x11
 #define FAU_NUM_PACKET_BUFFERS_TO_FREE (CVMX_FAU_REG_END - sizeof(uint32_t))
 #define TOTAL_NUMBER_OF_PORTS       (CVMX_PIP_NUM_INPUT_PORTS+1)
 

Modified: head/sys/mips/cavium/octe/ethernet.c
==============================================================================
--- head/sys/mips/cavium/octe/ethernet.c	Sun Jan  9 22:47:58 2011	(r217209)
+++ head/sys/mips/cavium/octe/ethernet.c	Sun Jan  9 23:05:46 2011	(r217210)
@@ -235,15 +235,16 @@ static void cvm_oct_configure_common_hw(
 	if (USE_MULTICORE_RECEIVE) {
 		critical_enter();
 		{
-			int cpu;
-			for (cpu = 0; cpu < mp_maxid; cpu++) {
-				if (!CPU_ABSENT(cpu) &&
-				   (cpu != PCPU_GET(cpuid))) {
-					cvmx_ciu_intx0_t en;
-					en.u64 = cvmx_read_csr(CVMX_CIU_INTX_EN0(cpu*2));
-					en.s.workq |= (1<<pow_receive_group);
-					cvmx_write_csr(CVMX_CIU_INTX_EN0(cpu*2), en.u64);
-				}
+			cvmx_ciu_intx0_t en;
+			int core;
+
+			CPU_FOREACH(core) {
+				if (core == PCPU_GET(cpuid))
+					continue;
+
+				en.u64 = cvmx_read_csr(CVMX_CIU_INTX_EN0(core*2));
+				en.s.workq |= (1<<pow_receive_group);
+				cvmx_write_csr(CVMX_CIU_INTX_EN0(core*2), en.u64);
 			}
 		}
 		critical_exit();