Module Name: src
Committed By: nisimura
Date: Tue Jan 11 10:10:48 UTC 2011
Modified Files:
src/sys/arch/sandpoint/stand/netboot: kse.c nvt.c pcn.c sip.c sme.c
wm.c
Log Message:
make sure to have 32B aligned descriptor array.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sandpoint/stand/netboot/kse.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sandpoint/stand/netboot/nvt.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sandpoint/stand/netboot/pcn.c \
src/sys/arch/sandpoint/stand/netboot/sip.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sandpoint/stand/netboot/sme.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sandpoint/stand/netboot/wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sandpoint/stand/netboot/kse.c
diff -u src/sys/arch/sandpoint/stand/netboot/kse.c:1.5 src/sys/arch/sandpoint/stand/netboot/kse.c:1.6
--- src/sys/arch/sandpoint/stand/netboot/kse.c:1.5 Tue Jan 11 09:45:25 2011
+++ src/sys/arch/sandpoint/stand/netboot/kse.c Tue Jan 11 10:10:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kse.c,v 1.5 2011/01/11 09:45:25 nisimura Exp $ */
+/* $NetBSD: kse.c,v 1.6 2011/01/11 10:10:48 nisimura Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
unsigned i, val, fdx;
uint8_t *en;
- l = ALLOC(struct local, sizeof(struct desc)); /* desc alignment */
+ l = ALLOC(struct local, 32); /* desc alignment */
memset(l, 0, sizeof(struct local));
l->csr = DEVTOV(pcicfgread(tag, 0x10));
Index: src/sys/arch/sandpoint/stand/netboot/nvt.c
diff -u src/sys/arch/sandpoint/stand/netboot/nvt.c:1.19 src/sys/arch/sandpoint/stand/netboot/nvt.c:1.20
--- src/sys/arch/sandpoint/stand/netboot/nvt.c:1.19 Tue Jan 11 09:45:25 2011
+++ src/sys/arch/sandpoint/stand/netboot/nvt.c Tue Jan 11 10:10:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nvt.c,v 1.19 2011/01/11 09:45:25 nisimura Exp $ */
+/* $NetBSD: nvt.c,v 1.20 2011/01/11 10:10:48 nisimura Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -175,7 +175,7 @@
struct desc *txd, *rxd;
uint8_t *en;
- l = ALLOC(struct local, sizeof(struct desc)); /* desc alignment */
+ l = ALLOC(struct local, 32); /* desc alignment */
memset(l, 0, sizeof(struct local));
l->csr = ~01 & DEVTOV(pcicfgread(tag, 0x10)); /* use IO space */
Index: src/sys/arch/sandpoint/stand/netboot/pcn.c
diff -u src/sys/arch/sandpoint/stand/netboot/pcn.c:1.18 src/sys/arch/sandpoint/stand/netboot/pcn.c:1.19
--- src/sys/arch/sandpoint/stand/netboot/pcn.c:1.18 Tue Jan 11 09:45:25 2011
+++ src/sys/arch/sandpoint/stand/netboot/pcn.c Tue Jan 11 10:10:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcn.c,v 1.18 2011/01/11 09:45:25 nisimura Exp $ */
+/* $NetBSD: pcn.c,v 1.19 2011/01/11 10:10:48 nisimura Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -149,7 +149,7 @@
uint8_t *en;
struct pcninit initblock, *ib;
- l = ALLOC(struct local, sizeof(struct desc)); /* desc alignment */
+ l = ALLOC(struct local, 32); /* desc alignment */
memset(l, 0, sizeof(struct local));
l->csr = DEVTOV(pcicfgread(tag, 0x14)); /* use mem space */
Index: src/sys/arch/sandpoint/stand/netboot/sip.c
diff -u src/sys/arch/sandpoint/stand/netboot/sip.c:1.18 src/sys/arch/sandpoint/stand/netboot/sip.c:1.19
--- src/sys/arch/sandpoint/stand/netboot/sip.c:1.18 Tue Jan 11 09:45:25 2011
+++ src/sys/arch/sandpoint/stand/netboot/sip.c Tue Jan 11 10:10:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sip.c,v 1.18 2011/01/11 09:45:25 nisimura Exp $ */
+/* $NetBSD: sip.c,v 1.19 2011/01/11 10:10:48 nisimura Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -142,7 +142,7 @@
if (PCI_DEVICE(0x100b, 0x0020) != val)
return NULL;
- l = ALLOC(struct local, sizeof(struct desc)); /* desc alignment */
+ l = ALLOC(struct local, 32); /* desc alignment */
memset(l, 0, sizeof(struct local));
l->csr = DEVTOV(pcicfgread(tag, 0x14)); /* use mem space */
Index: src/sys/arch/sandpoint/stand/netboot/sme.c
diff -u src/sys/arch/sandpoint/stand/netboot/sme.c:1.4 src/sys/arch/sandpoint/stand/netboot/sme.c:1.5
--- src/sys/arch/sandpoint/stand/netboot/sme.c:1.4 Tue Jan 11 09:45:25 2011
+++ src/sys/arch/sandpoint/stand/netboot/sme.c Tue Jan 11 10:10:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sme.c,v 1.4 2011/01/11 09:45:25 nisimura Exp $ */
+/* $NetBSD: sme.c,v 1.5 2011/01/11 10:10:48 nisimura Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -123,7 +123,7 @@
unsigned mac32, mac16, val, fdx;
uint8_t *en;
- l = ALLOC(struct local, sizeof(struct desc)); /* desc alignment */
+ l = ALLOC(struct local, 32); /* desc alignment */
memset(l, 0, sizeof(struct local));
l->csr = DEVTOV(pcicfgread(tag, 0x1c)); /* BAR3 mem space, LE */
l->phy = 1; /* 9420 internal PHY */
Index: src/sys/arch/sandpoint/stand/netboot/wm.c
diff -u src/sys/arch/sandpoint/stand/netboot/wm.c:1.12 src/sys/arch/sandpoint/stand/netboot/wm.c:1.13
--- src/sys/arch/sandpoint/stand/netboot/wm.c:1.12 Tue Jan 11 09:45:25 2011
+++ src/sys/arch/sandpoint/stand/netboot/wm.c Tue Jan 11 10:10:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wm.c,v 1.12 2011/01/11 09:45:25 nisimura Exp $ */
+/* $NetBSD: wm.c,v 1.13 2011/01/11 10:10:48 nisimura Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -141,7 +141,7 @@
struct rdesc *rxd;
uint8_t *en;
- l = ALLOC(struct local, sizeof(struct tdesc)); /* desc alignment */
+ l = ALLOC(struct local, 32); /* desc alignment */
memset(l, 0, sizeof(struct local));
l->csr = pcicfgread(tag, 0x10); /* use mem space */
