Module Name: src
Committed By: msaitoh
Date: Thu Nov 8 15:39:30 UTC 2012
Modified Files:
src/sys/dev/marvell: if_mvgbe.c mvgbereg.h
Log Message:
Fix a bug that MVGBE_JLEN is miscalculated.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/marvell/if_mvgbe.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/marvell/mvgbereg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/marvell/if_mvgbe.c
diff -u src/sys/dev/marvell/if_mvgbe.c:1.30 src/sys/dev/marvell/if_mvgbe.c:1.31
--- src/sys/dev/marvell/if_mvgbe.c:1.30 Thu Nov 8 14:37:47 2012
+++ src/sys/dev/marvell/if_mvgbe.c Thu Nov 8 15:39:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mvgbe.c,v 1.30 2012/11/08 14:37:47 msaitoh Exp $ */
+/* $NetBSD: if_mvgbe.c,v 1.31 2012/11/08 15:39:29 msaitoh Exp $ */
/*
* Copyright (c) 2007, 2008 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.30 2012/11/08 14:37:47 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.31 2012/11/08 15:39:29 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -93,7 +93,8 @@ CTASSERT(MVGBE_RX_RING_CNT > 1 && MVGBE_
#define MVGBE_JSLOTS 384 /* XXXX */
#define MVGBE_JLEN \
- ((MVGBE_MRU + MVGBE_RXBUF_ALIGN) & ~MVGBE_RXBUF_MASK)
+ ((MVGBE_MRU + MVGBE_HWHEADER_SIZE + MVGBE_RXBUF_ALIGN - 1) & \
+ ~MVGBE_RXBUF_MASK)
#define MVGBE_NTXSEG 30
#define MVGBE_JPAGESZ PAGE_SIZE
#define MVGBE_RESID \
Index: src/sys/dev/marvell/mvgbereg.h
diff -u src/sys/dev/marvell/mvgbereg.h:1.6 src/sys/dev/marvell/mvgbereg.h:1.7
--- src/sys/dev/marvell/mvgbereg.h:1.6 Tue Oct 16 19:49:41 2012
+++ src/sys/dev/marvell/mvgbereg.h Thu Nov 8 15:39:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mvgbereg.h,v 1.6 2012/10/16 19:49:41 msaitoh Exp $ */
+/* $NetBSD: mvgbereg.h,v 1.7 2012/11/08 15:39:30 msaitoh Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -348,7 +348,7 @@
*/
#define MVGBE_MRU 9022
-#define MVGBE_RXBUF_ALIGN 8
+#define MVGBE_RXBUF_ALIGN 32 /* Cache line size */
#define MVGBE_RXBUF_MASK (MVGBE_RXBUF_ALIGN - 1)
#define MVGBE_HWHEADER_SIZE 2
