summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2014-05-15 17:53:42 +0000
committerian <ian@FreeBSD.org>2014-05-15 17:53:42 +0000
commit0f6be171edef1bd1d1195d8b67f9aa56934ed446 (patch)
tree4871bf261abd8e10d6b6fa58a3cd16aa4b6674f6 /sys
parent1e3130abad8238f721742fec6f1344d69dfc799a (diff)
downloadFreeBSD-src-0f6be171edef1bd1d1195d8b67f9aa56934ed446.zip
FreeBSD-src-0f6be171edef1bd1d1195d8b67f9aa56934ed446.tar.gz
MFC r261570, r261572
Revert r260440 (add USB_HOST_ALIGN to all configs, it's only needed for platforms with a 64-byte cacheline size). Add option USB_HOST_ALIGN=64 for all SoCs that have 64 byte cache lines.
Diffstat (limited to 'sys')
-rw-r--r--sys/arm/conf/AC1001
-rw-r--r--sys/arm/conf/ARMADAXP1
-rw-r--r--sys/arm/conf/ATMEL1
-rw-r--r--sys/arm/conf/AVILA1
-rw-r--r--sys/arm/conf/BWCT1
-rw-r--r--sys/arm/conf/CAMBRIA1
-rw-r--r--sys/arm/conf/CNS11XXNAS1
-rw-r--r--sys/arm/conf/DB-78XXX1
-rw-r--r--sys/arm/conf/DB-88F5XXX1
-rw-r--r--sys/arm/conf/DB-88F6XXX1
-rw-r--r--sys/arm/conf/DIGI-CCWMX532
-rw-r--r--sys/arm/conf/EA32501
-rw-r--r--sys/arm/conf/EB92001
-rw-r--r--sys/arm/conf/EFIKA_MX2
-rw-r--r--sys/arm/conf/ETHERNUT51
-rw-r--r--sys/arm/conf/HL2001
-rw-r--r--sys/arm/conf/HL2011
-rw-r--r--sys/arm/conf/IMX53-QSB2
-rw-r--r--sys/arm/conf/KB920X1
-rw-r--r--sys/arm/conf/LN2410SBC1
-rw-r--r--sys/arm/conf/NSLU1
-rw-r--r--sys/arm/conf/QILA9G201
-rw-r--r--sys/arm/conf/RPI-B1
-rw-r--r--sys/arm/conf/SAM9260EK1
-rw-r--r--sys/arm/conf/SAM9G20EK1
-rw-r--r--sys/arm/conf/SAM9X25EK1
-rw-r--r--sys/arm/conf/SHEEVAPLUG1
-rw-r--r--sys/arm/conf/SN9G451
-rw-r--r--sys/arm/conf/TS78001
-rw-r--r--sys/arm/conf/ZEDBOARD1
30 files changed, 3 insertions, 30 deletions
diff --git a/sys/arm/conf/AC100 b/sys/arm/conf/AC100
index f1141d5..d368bdf 100644
--- a/sys/arm/conf/AC100
+++ b/sys/arm/conf/AC100
@@ -66,7 +66,6 @@ device loop
device md
# USB
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
#options USB_DEBUG # enable debug msgs
#device usb
#device ehci
diff --git a/sys/arm/conf/ARMADAXP b/sys/arm/conf/ARMADAXP
index 82041a2..2b49459 100644
--- a/sys/arm/conf/ARMADAXP
+++ b/sys/arm/conf/ARMADAXP
@@ -67,7 +67,6 @@ device loop
device md
# USB
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
options USB_DEBUG # enable debug msgs
device usb
device ehci
diff --git a/sys/arm/conf/ATMEL b/sys/arm/conf/ATMEL
index 93d124d..28c4bec 100644
--- a/sys/arm/conf/ATMEL
+++ b/sys/arm/conf/ATMEL
@@ -156,7 +156,6 @@ device uart # Multi-uart driver
options ALT_BREAK_TO_DEBUGGER
# USB support
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
options USB_DEBUG # enable debug msgs
device ohci # OHCI USB interface
device usb # USB Bus (required)
diff --git a/sys/arm/conf/AVILA b/sys/arm/conf/AVILA
index 7189e31..4246462 100644
--- a/sys/arm/conf/AVILA
+++ b/sys/arm/conf/AVILA
@@ -143,7 +143,6 @@ device ath_ar9160
device ath_ar9280
device usb
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
#options USB_DEBUG
device ohci
device ehci
diff --git a/sys/arm/conf/BWCT b/sys/arm/conf/BWCT
index f23e189..28c724f 100644
--- a/sys/arm/conf/BWCT
+++ b/sys/arm/conf/BWCT
@@ -104,7 +104,6 @@ device spibus
device bpf # Berkeley packet filter
#options USB_DEBUG
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
#device ohci
#device usb
#device umass # Disks/Mass storage - Requires scbus and da
diff --git a/sys/arm/conf/CAMBRIA b/sys/arm/conf/CAMBRIA
index 6c89dac..377f45d 100644
--- a/sys/arm/conf/CAMBRIA
+++ b/sys/arm/conf/CAMBRIA
@@ -136,7 +136,6 @@ options AH_SUPPORT_AR5416 # NB: for 11n descriptor format
device ath_hal
# NB: 2 USB 2.0 ports standard
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
device usb
options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
#options USB_DEBUG
diff --git a/sys/arm/conf/CNS11XXNAS b/sys/arm/conf/CNS11XXNAS
index 159bbdf..18d84e5 100644
--- a/sys/arm/conf/CNS11XXNAS
+++ b/sys/arm/conf/CNS11XXNAS
@@ -105,7 +105,6 @@ device random # Entropy device
#options ARM_USE_SMALL_ALLOC
device usb
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
#options USB_DEBUG
device ohci
device ehci
diff --git a/sys/arm/conf/DB-78XXX b/sys/arm/conf/DB-78XXX
index 00ebdcb..f3e62f5 100644
--- a/sys/arm/conf/DB-78XXX
+++ b/sys/arm/conf/DB-78XXX
@@ -67,7 +67,6 @@ device e1000phy
device bpf
# USB
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
options USB_DEBUG # enable debug msgs
device usb
device ehci
diff --git a/sys/arm/conf/DB-88F5XXX b/sys/arm/conf/DB-88F5XXX
index 704feb7..50ca24e 100644
--- a/sys/arm/conf/DB-88F5XXX
+++ b/sys/arm/conf/DB-88F5XXX
@@ -73,7 +73,6 @@ device iicbus
device ds133x
# USB
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
options USB_DEBUG # enable debug msgs
device usb
device ehci
diff --git a/sys/arm/conf/DB-88F6XXX b/sys/arm/conf/DB-88F6XXX
index f446b24..cf508ad 100644
--- a/sys/arm/conf/DB-88F6XXX
+++ b/sys/arm/conf/DB-88F6XXX
@@ -71,7 +71,6 @@ device crypto
device cryptodev
# USB
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
options USB_DEBUG # enable debug msgs
device usb
device ehci
diff --git a/sys/arm/conf/DIGI-CCWMX53 b/sys/arm/conf/DIGI-CCWMX53
index aa76903..bb2a951 100644
--- a/sys/arm/conf/DIGI-CCWMX53
+++ b/sys/arm/conf/DIGI-CCWMX53
@@ -134,7 +134,7 @@ device cd # CD
device pass # Passthrough device (direct SCSI access)
# USB support
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
+options USB_HOST_ALIGN=64 # Align usb buffers to cache line size.
options USB_DEBUG # enable debug msgs
device ehci # OHCI USB interface
device usb # USB Bus (required)
diff --git a/sys/arm/conf/EA3250 b/sys/arm/conf/EA3250
index 7b65435..89d9fa4 100644
--- a/sys/arm/conf/EA3250
+++ b/sys/arm/conf/EA3250
@@ -65,7 +65,6 @@ device bpf
device lpe
# USB
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
options USB_DEBUG
device usb
device ohci
diff --git a/sys/arm/conf/EB9200 b/sys/arm/conf/EB9200
index 724910d..0570699 100644
--- a/sys/arm/conf/EB9200
+++ b/sys/arm/conf/EB9200
@@ -92,7 +92,6 @@ device icee
device bpf
# USB support
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
options USB_DEBUG # enable debug msgs
device ohci # OHCI localbus->USB interface
device usb # USB Bus (required)
diff --git a/sys/arm/conf/EFIKA_MX b/sys/arm/conf/EFIKA_MX
index d0b8cdd..e2b6693 100644
--- a/sys/arm/conf/EFIKA_MX
+++ b/sys/arm/conf/EFIKA_MX
@@ -130,7 +130,7 @@ device cd # CD
device pass # Passthrough device (direct SCSI access)
# USB support
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
+options USB_HOST_ALIGN=64 # Align usb buffers to cache line size.
#options USB_DEBUG # enable debug msgs
device ehci # OHCI USB interface
device usb # USB Bus (required)
diff --git a/sys/arm/conf/ETHERNUT5 b/sys/arm/conf/ETHERNUT5
index 0c76a59..ef52bc6 100644
--- a/sys/arm/conf/ETHERNUT5
+++ b/sys/arm/conf/ETHERNUT5
@@ -149,7 +149,6 @@ device uart # Multi-uart driver
options ALT_BREAK_TO_DEBUGGER
# USB support
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
#options USB_DEBUG # enable debug msgs
device ohci # OHCI USB interface
device usb # USB Bus (required)
diff --git a/sys/arm/conf/HL200 b/sys/arm/conf/HL200
index db59b87..8df55cd 100644
--- a/sys/arm/conf/HL200
+++ b/sys/arm/conf/HL200
@@ -94,7 +94,6 @@ device icee
device bpf
# USB support
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
options USB_DEBUG # enable debug msgs
device ohci # OHCI localbus->USB interface
device usb # USB Bus (required)
diff --git a/sys/arm/conf/HL201 b/sys/arm/conf/HL201
index 7f6ea72..8178e3b 100644
--- a/sys/arm/conf/HL201
+++ b/sys/arm/conf/HL201
@@ -85,7 +85,6 @@ device md
device bpf
# USB support
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
device ohci # OHCI localbus->USB interface
device usb # USB Bus (required)
#device udbp # USB Double Bulk Pipe devices
diff --git a/sys/arm/conf/IMX53-QSB b/sys/arm/conf/IMX53-QSB
index cbe17e0..ff293db 100644
--- a/sys/arm/conf/IMX53-QSB
+++ b/sys/arm/conf/IMX53-QSB
@@ -133,7 +133,7 @@ device cd # CD
device pass # Passthrough device (direct SCSI access)
# USB support
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
+options USB_HOST_ALIGN=64 # Align usb buffers to cache line size.
#options USB_DEBUG # enable debug msgs
device ehci # OHCI USB interface
device usb # USB Bus (required)
diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X
index 0cdf9c3..7cf56d8 100644
--- a/sys/arm/conf/KB920X
+++ b/sys/arm/conf/KB920X
@@ -95,7 +95,6 @@ device icee
device bpf
# USB support
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
options USB_DEBUG # enable debug msgs
device ohci # OHCI localbus->USB interface
device usb # USB Bus (required)
diff --git a/sys/arm/conf/LN2410SBC b/sys/arm/conf/LN2410SBC
index ce02d46..8d2a585 100644
--- a/sys/arm/conf/LN2410SBC
+++ b/sys/arm/conf/LN2410SBC
@@ -77,7 +77,6 @@ options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
device md
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
options USB_DEBUG # enable debug msgs
device usb
device ohci
diff --git a/sys/arm/conf/NSLU b/sys/arm/conf/NSLU
index 0b23ee2..efbdbd1 100644
--- a/sys/arm/conf/NSLU
+++ b/sys/arm/conf/NSLU
@@ -108,7 +108,6 @@ device random # Entropy device
#options ARM_USE_SMALL_ALLOC
device usb
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
options USB_DEBUG
device ohci
device ehci
diff --git a/sys/arm/conf/QILA9G20 b/sys/arm/conf/QILA9G20
index adb1355..e3cc914 100644
--- a/sys/arm/conf/QILA9G20
+++ b/sys/arm/conf/QILA9G20
@@ -118,7 +118,6 @@ device cd # CD
device pass # Passthrough device (direct SCSI access)
# USB support
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
device ohci # OHCI localbus->USB interface
device usb # USB Bus (required)
device umass # Disks/Mass storage - Requires scbus and da
diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B
index 9dce858..5fe031b 100644
--- a/sys/arm/conf/RPI-B
+++ b/sys/arm/conf/RPI-B
@@ -93,7 +93,6 @@ device md
device random # Entropy device
# USB support
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
device usb
options USB_DEBUG
device dwcotg #DWC OTG controller
diff --git a/sys/arm/conf/SAM9260EK b/sys/arm/conf/SAM9260EK
index 9d6962d..8f137e0 100644
--- a/sys/arm/conf/SAM9260EK
+++ b/sys/arm/conf/SAM9260EK
@@ -158,7 +158,6 @@ device uart # Multi-uart driver
options ALT_BREAK_TO_DEBUGGER
# USB support
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
#options USB_DEBUG # enable debug msgs
device ohci # OHCI USB interface
device usb # USB Bus (required)
diff --git a/sys/arm/conf/SAM9G20EK b/sys/arm/conf/SAM9G20EK
index 628c007..faa325a 100644
--- a/sys/arm/conf/SAM9G20EK
+++ b/sys/arm/conf/SAM9G20EK
@@ -122,7 +122,6 @@ device cd # CD
device pass # Passthrough device (direct SCSI access)
# USB support
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
device ohci # OHCI localbus->USB interface
device usb # USB Bus (required)
device umass # Disks/Mass storage - Requires scbus and da
diff --git a/sys/arm/conf/SAM9X25EK b/sys/arm/conf/SAM9X25EK
index 5c9245a..9363fb9 100644
--- a/sys/arm/conf/SAM9X25EK
+++ b/sys/arm/conf/SAM9X25EK
@@ -120,7 +120,6 @@ device cd # CD
device pass # Passthrough device (direct SCSI access)
# USB support
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
#device ohci # OHCI localbus->USB interface
#device usb # USB Bus (required)
#device umass # Disks/Mass storage - Requires scbus and da
diff --git a/sys/arm/conf/SHEEVAPLUG b/sys/arm/conf/SHEEVAPLUG
index 7fe0b11..c6bd901 100644
--- a/sys/arm/conf/SHEEVAPLUG
+++ b/sys/arm/conf/SHEEVAPLUG
@@ -65,7 +65,6 @@ device crypto
device cryptodev
# USB
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
options USB_DEBUG # enable debug msgs
device usb
device ehci
diff --git a/sys/arm/conf/SN9G45 b/sys/arm/conf/SN9G45
index 60c4ae5..05c9062 100644
--- a/sys/arm/conf/SN9G45
+++ b/sys/arm/conf/SN9G45
@@ -96,7 +96,6 @@ device cd # CD
device pass # Passthrough device (direct SCSI access)
# USB support
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
device ohci # OHCI localbus->USB interface
device usb # USB Bus (required)
device umass # Disks/Mass storage - Requires scbus and da
diff --git a/sys/arm/conf/TS7800 b/sys/arm/conf/TS7800
index d9b614f..79e9dba 100644
--- a/sys/arm/conf/TS7800
+++ b/sys/arm/conf/TS7800
@@ -61,7 +61,6 @@ device bpf
options HZ=1000
# USB
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
device usb
device ehci
device umass
diff --git a/sys/arm/conf/ZEDBOARD b/sys/arm/conf/ZEDBOARD
index 05ea07b..464850a 100644
--- a/sys/arm/conf/ZEDBOARD
+++ b/sys/arm/conf/ZEDBOARD
@@ -81,7 +81,6 @@ device sdhci # generic sdhci
device bpf # Berkeley packet filter
# USB support
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
device usb
options USB_DEBUG
#options USB_REQ_DEBUG
OpenPOWER on IntegriCloud