Module Name: src
Committed By: matt
Date: Sat Feb 2 14:15:56 UTC 2013
Modified Files:
src/sys/dev/usb: ehcivar.h
Log Message:
Use CACHE_LINE_SIZE for EHCI_SQTD_ALIGN to make sure the sqtd fully consume
a cacheline.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/usb/ehcivar.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/usb/ehcivar.h
diff -u src/sys/dev/usb/ehcivar.h:1.41 src/sys/dev/usb/ehcivar.h:1.42
--- src/sys/dev/usb/ehcivar.h:1.41 Tue Jan 29 00:00:15 2013
+++ src/sys/dev/usb/ehcivar.h Sat Feb 2 14:15:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ehcivar.h,v 1.41 2013/01/29 00:00:15 christos Exp $ */
+/* $NetBSD: ehcivar.h,v 1.42 2013/02/02 14:15:55 matt Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -44,7 +44,8 @@ typedef struct ehci_soft_qtd {
LIST_ENTRY(ehci_soft_qtd) hnext;
u_int16_t len;
} ehci_soft_qtd_t;
-#define EHCI_SQTD_SIZE ((sizeof (struct ehci_soft_qtd) + EHCI_QTD_ALIGN - 1) / EHCI_QTD_ALIGN * EHCI_QTD_ALIGN)
+#define EHCI_SQTD_ALIGN MAX(EHCI_QTD_ALIGN, CACHE_LINE_SIZE)
+#define EHCI_SQTD_SIZE ((sizeof (struct ehci_soft_qtd) + EHCI_SQTD_ALIGN - 1) & -EHCI_SQTD_ALIGN)
#define EHCI_SQTD_CHUNK (EHCI_PAGE_SIZE / EHCI_SQTD_SIZE)
typedef struct ehci_soft_qh {
