svn commit: r266162 - stable/10/sys/arm/conf
Ian Lepore
ian at FreeBSD.org
Thu May 15 17:53:49 UTC 2014
Author: ian
Date: Thu May 15 17:53:42 2014
New Revision: 266162
URL: http://svnweb.freebsd.org/changeset/base/266162
Log:
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.
Modified:
stable/10/sys/arm/conf/AC100
stable/10/sys/arm/conf/ARMADAXP
stable/10/sys/arm/conf/ATMEL
stable/10/sys/arm/conf/AVILA
stable/10/sys/arm/conf/BWCT
stable/10/sys/arm/conf/CAMBRIA
stable/10/sys/arm/conf/CNS11XXNAS
stable/10/sys/arm/conf/DB-78XXX
stable/10/sys/arm/conf/DB-88F5XXX
stable/10/sys/arm/conf/DB-88F6XXX
stable/10/sys/arm/conf/DIGI-CCWMX53
stable/10/sys/arm/conf/EA3250
stable/10/sys/arm/conf/EB9200
stable/10/sys/arm/conf/EFIKA_MX
stable/10/sys/arm/conf/ETHERNUT5
stable/10/sys/arm/conf/HL200
stable/10/sys/arm/conf/HL201
stable/10/sys/arm/conf/IMX53-QSB
stable/10/sys/arm/conf/KB920X
stable/10/sys/arm/conf/LN2410SBC
stable/10/sys/arm/conf/NSLU
stable/10/sys/arm/conf/QILA9G20
stable/10/sys/arm/conf/RPI-B
stable/10/sys/arm/conf/SAM9260EK
stable/10/sys/arm/conf/SAM9G20EK
stable/10/sys/arm/conf/SAM9X25EK
stable/10/sys/arm/conf/SHEEVAPLUG
stable/10/sys/arm/conf/SN9G45
stable/10/sys/arm/conf/TS7800
stable/10/sys/arm/conf/ZEDBOARD
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/arm/conf/AC100
==============================================================================
--- stable/10/sys/arm/conf/AC100 Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/AC100 Thu May 15 17:53:42 2014 (r266162)
@@ -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
Modified: stable/10/sys/arm/conf/ARMADAXP
==============================================================================
--- stable/10/sys/arm/conf/ARMADAXP Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/ARMADAXP Thu May 15 17:53:42 2014 (r266162)
@@ -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
Modified: stable/10/sys/arm/conf/ATMEL
==============================================================================
--- stable/10/sys/arm/conf/ATMEL Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/ATMEL Thu May 15 17:53:42 2014 (r266162)
@@ -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)
Modified: stable/10/sys/arm/conf/AVILA
==============================================================================
--- stable/10/sys/arm/conf/AVILA Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/AVILA Thu May 15 17:53:42 2014 (r266162)
@@ -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
Modified: stable/10/sys/arm/conf/BWCT
==============================================================================
--- stable/10/sys/arm/conf/BWCT Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/BWCT Thu May 15 17:53:42 2014 (r266162)
@@ -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
Modified: stable/10/sys/arm/conf/CAMBRIA
==============================================================================
--- stable/10/sys/arm/conf/CAMBRIA Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/CAMBRIA Thu May 15 17:53:42 2014 (r266162)
@@ -136,7 +136,6 @@ options AH_SUPPORT_AR5416 # NB: for 11n
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
Modified: stable/10/sys/arm/conf/CNS11XXNAS
==============================================================================
--- stable/10/sys/arm/conf/CNS11XXNAS Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/CNS11XXNAS Thu May 15 17:53:42 2014 (r266162)
@@ -105,7 +105,6 @@ device random # Entrop
#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
Modified: stable/10/sys/arm/conf/DB-78XXX
==============================================================================
--- stable/10/sys/arm/conf/DB-78XXX Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/DB-78XXX Thu May 15 17:53:42 2014 (r266162)
@@ -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
Modified: stable/10/sys/arm/conf/DB-88F5XXX
==============================================================================
--- stable/10/sys/arm/conf/DB-88F5XXX Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/DB-88F5XXX Thu May 15 17:53:42 2014 (r266162)
@@ -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
Modified: stable/10/sys/arm/conf/DB-88F6XXX
==============================================================================
--- stable/10/sys/arm/conf/DB-88F6XXX Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/DB-88F6XXX Thu May 15 17:53:42 2014 (r266162)
@@ -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
Modified: stable/10/sys/arm/conf/DIGI-CCWMX53
==============================================================================
--- stable/10/sys/arm/conf/DIGI-CCWMX53 Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/DIGI-CCWMX53 Thu May 15 17:53:42 2014 (r266162)
@@ -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)
Modified: stable/10/sys/arm/conf/EA3250
==============================================================================
--- stable/10/sys/arm/conf/EA3250 Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/EA3250 Thu May 15 17:53:42 2014 (r266162)
@@ -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
Modified: stable/10/sys/arm/conf/EB9200
==============================================================================
--- stable/10/sys/arm/conf/EB9200 Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/EB9200 Thu May 15 17:53:42 2014 (r266162)
@@ -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)
Modified: stable/10/sys/arm/conf/EFIKA_MX
==============================================================================
--- stable/10/sys/arm/conf/EFIKA_MX Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/EFIKA_MX Thu May 15 17:53:42 2014 (r266162)
@@ -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)
Modified: stable/10/sys/arm/conf/ETHERNUT5
==============================================================================
--- stable/10/sys/arm/conf/ETHERNUT5 Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/ETHERNUT5 Thu May 15 17:53:42 2014 (r266162)
@@ -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)
Modified: stable/10/sys/arm/conf/HL200
==============================================================================
--- stable/10/sys/arm/conf/HL200 Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/HL200 Thu May 15 17:53:42 2014 (r266162)
@@ -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)
Modified: stable/10/sys/arm/conf/HL201
==============================================================================
--- stable/10/sys/arm/conf/HL201 Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/HL201 Thu May 15 17:53:42 2014 (r266162)
@@ -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
Modified: stable/10/sys/arm/conf/IMX53-QSB
==============================================================================
--- stable/10/sys/arm/conf/IMX53-QSB Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/IMX53-QSB Thu May 15 17:53:42 2014 (r266162)
@@ -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)
Modified: stable/10/sys/arm/conf/KB920X
==============================================================================
--- stable/10/sys/arm/conf/KB920X Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/KB920X Thu May 15 17:53:42 2014 (r266162)
@@ -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)
Modified: stable/10/sys/arm/conf/LN2410SBC
==============================================================================
--- stable/10/sys/arm/conf/LN2410SBC Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/LN2410SBC Thu May 15 17:53:42 2014 (r266162)
@@ -77,7 +77,6 @@ options WITNESS_SKIPSPIN #Don't run wit
device md
-options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
options USB_DEBUG # enable debug msgs
device usb
device ohci
Modified: stable/10/sys/arm/conf/NSLU
==============================================================================
--- stable/10/sys/arm/conf/NSLU Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/NSLU Thu May 15 17:53:42 2014 (r266162)
@@ -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
Modified: stable/10/sys/arm/conf/QILA9G20
==============================================================================
--- stable/10/sys/arm/conf/QILA9G20 Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/QILA9G20 Thu May 15 17:53:42 2014 (r266162)
@@ -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
Modified: stable/10/sys/arm/conf/RPI-B
==============================================================================
--- stable/10/sys/arm/conf/RPI-B Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/RPI-B Thu May 15 17:53:42 2014 (r266162)
@@ -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
Modified: stable/10/sys/arm/conf/SAM9260EK
==============================================================================
--- stable/10/sys/arm/conf/SAM9260EK Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/SAM9260EK Thu May 15 17:53:42 2014 (r266162)
@@ -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)
Modified: stable/10/sys/arm/conf/SAM9G20EK
==============================================================================
--- stable/10/sys/arm/conf/SAM9G20EK Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/SAM9G20EK Thu May 15 17:53:42 2014 (r266162)
@@ -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
Modified: stable/10/sys/arm/conf/SAM9X25EK
==============================================================================
--- stable/10/sys/arm/conf/SAM9X25EK Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/SAM9X25EK Thu May 15 17:53:42 2014 (r266162)
@@ -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
Modified: stable/10/sys/arm/conf/SHEEVAPLUG
==============================================================================
--- stable/10/sys/arm/conf/SHEEVAPLUG Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/SHEEVAPLUG Thu May 15 17:53:42 2014 (r266162)
@@ -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
Modified: stable/10/sys/arm/conf/SN9G45
==============================================================================
--- stable/10/sys/arm/conf/SN9G45 Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/SN9G45 Thu May 15 17:53:42 2014 (r266162)
@@ -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
Modified: stable/10/sys/arm/conf/TS7800
==============================================================================
--- stable/10/sys/arm/conf/TS7800 Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/TS7800 Thu May 15 17:53:42 2014 (r266162)
@@ -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
Modified: stable/10/sys/arm/conf/ZEDBOARD
==============================================================================
--- stable/10/sys/arm/conf/ZEDBOARD Thu May 15 17:52:28 2014 (r266161)
+++ stable/10/sys/arm/conf/ZEDBOARD Thu May 15 17:53:42 2014 (r266162)
@@ -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
More information about the svn-src-stable
mailing list