Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 8 Jan 2014 03:40:18 +0000 (UTC)
From:      Ian Lepore <ian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r260440 - head/sys/arm/conf
Message-ID:  <201401080340.s083eIDG054652@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ian
Date: Wed Jan  8 03:40:18 2014
New Revision: 260440
URL: http://svnweb.freebsd.org/changeset/base/260440

Log:
  Add option USB_HOST_ALIGN to configs that contain 'device usb'.  Setting
  this to the cache line size is required to avoid data corruption on armv4
  and armv5, and improves performance on armv6, in both cases by avoiding
  partial cacheline flushes for USB IO.
  
  All these configs already exist in 10-stable.  A few that don't (and
  thus can't be MFC'd yet) will be committed separately.

Modified:
  head/sys/arm/conf/AC100
  head/sys/arm/conf/ARMADAXP
  head/sys/arm/conf/ARNDALE
  head/sys/arm/conf/ATMEL
  head/sys/arm/conf/AVILA
  head/sys/arm/conf/BWCT
  head/sys/arm/conf/CAMBRIA
  head/sys/arm/conf/CNS11XXNAS
  head/sys/arm/conf/CUBIEBOARD
  head/sys/arm/conf/CUBIEBOARD2
  head/sys/arm/conf/DB-78XXX
  head/sys/arm/conf/DB-88F5XXX
  head/sys/arm/conf/DB-88F6XXX
  head/sys/arm/conf/DIGI-CCWMX53
  head/sys/arm/conf/EA3250
  head/sys/arm/conf/EB9200
  head/sys/arm/conf/EFIKA_MX
  head/sys/arm/conf/ETHERNUT5
  head/sys/arm/conf/HL200
  head/sys/arm/conf/HL201
  head/sys/arm/conf/IMX53-QSB
  head/sys/arm/conf/KB920X
  head/sys/arm/conf/LN2410SBC
  head/sys/arm/conf/NSLU
  head/sys/arm/conf/PANDABOARD
  head/sys/arm/conf/QILA9G20
  head/sys/arm/conf/RPI-B
  head/sys/arm/conf/SAM9260EK
  head/sys/arm/conf/SAM9G20EK
  head/sys/arm/conf/SAM9X25EK
  head/sys/arm/conf/SHEEVAPLUG
  head/sys/arm/conf/SN9G45
  head/sys/arm/conf/TS7800
  head/sys/arm/conf/ZEDBOARD

Modified: head/sys/arm/conf/AC100
==============================================================================
--- head/sys/arm/conf/AC100	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/AC100	Wed Jan  8 03:40:18 2014	(r260440)
@@ -66,6 +66,7 @@ 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: head/sys/arm/conf/ARMADAXP
==============================================================================
--- head/sys/arm/conf/ARMADAXP	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/ARMADAXP	Wed Jan  8 03:40:18 2014	(r260440)
@@ -67,6 +67,7 @@ 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: head/sys/arm/conf/ARNDALE
==============================================================================
--- head/sys/arm/conf/ARNDALE	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/ARNDALE	Wed Jan  8 03:40:18 2014	(r260440)
@@ -94,6 +94,7 @@ device		md
 device		gpio
 
 # USB support
+options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 device		usb
 options		USB_DEBUG
 #options	USB_REQ_DEBUG

Modified: head/sys/arm/conf/ATMEL
==============================================================================
--- head/sys/arm/conf/ATMEL	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/ATMEL	Wed Jan  8 03:40:18 2014	(r260440)
@@ -157,6 +157,7 @@ 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: head/sys/arm/conf/AVILA
==============================================================================
--- head/sys/arm/conf/AVILA	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/AVILA	Wed Jan  8 03:40:18 2014	(r260440)
@@ -143,6 +143,7 @@ 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: head/sys/arm/conf/BWCT
==============================================================================
--- head/sys/arm/conf/BWCT	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/BWCT	Wed Jan  8 03:40:18 2014	(r260440)
@@ -104,6 +104,7 @@ 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: head/sys/arm/conf/CAMBRIA
==============================================================================
--- head/sys/arm/conf/CAMBRIA	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/CAMBRIA	Wed Jan  8 03:40:18 2014	(r260440)
@@ -136,6 +136,7 @@ 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: head/sys/arm/conf/CNS11XXNAS
==============================================================================
--- head/sys/arm/conf/CNS11XXNAS	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/CNS11XXNAS	Wed Jan  8 03:40:18 2014	(r260440)
@@ -106,6 +106,7 @@ 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: head/sys/arm/conf/CUBIEBOARD
==============================================================================
--- head/sys/arm/conf/CUBIEBOARD	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/CUBIEBOARD	Wed Jan  8 03:40:18 2014	(r260440)
@@ -106,6 +106,7 @@ device		da			# Direct Access (disks)
 device		pass
 
 # USB support
+options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 device		usb
 options 	USB_DEBUG
 #options 	USB_REQ_DEBUG

Modified: head/sys/arm/conf/CUBIEBOARD2
==============================================================================
--- head/sys/arm/conf/CUBIEBOARD2	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/CUBIEBOARD2	Wed Jan  8 03:40:18 2014	(r260440)
@@ -106,6 +106,7 @@ device		da			# Direct Access (disks)
 device		pass
 
 # USB support
+options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 device		usb
 options 	USB_DEBUG
 #options 	USB_REQ_DEBUG

Modified: head/sys/arm/conf/DB-78XXX
==============================================================================
--- head/sys/arm/conf/DB-78XXX	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/DB-78XXX	Wed Jan  8 03:40:18 2014	(r260440)
@@ -67,6 +67,7 @@ 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: head/sys/arm/conf/DB-88F5XXX
==============================================================================
--- head/sys/arm/conf/DB-88F5XXX	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/DB-88F5XXX	Wed Jan  8 03:40:18 2014	(r260440)
@@ -73,6 +73,7 @@ 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: head/sys/arm/conf/DB-88F6XXX
==============================================================================
--- head/sys/arm/conf/DB-88F6XXX	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/DB-88F6XXX	Wed Jan  8 03:40:18 2014	(r260440)
@@ -71,6 +71,7 @@ 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: head/sys/arm/conf/DIGI-CCWMX53
==============================================================================
--- head/sys/arm/conf/DIGI-CCWMX53	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/DIGI-CCWMX53	Wed Jan  8 03:40:18 2014	(r260440)
@@ -134,6 +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_DEBUG	# enable debug msgs
 device		ehci		# OHCI USB interface
 device		usb		# USB Bus (required)

Modified: head/sys/arm/conf/EA3250
==============================================================================
--- head/sys/arm/conf/EA3250	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/EA3250	Wed Jan  8 03:40:18 2014	(r260440)
@@ -65,6 +65,7 @@ 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: head/sys/arm/conf/EB9200
==============================================================================
--- head/sys/arm/conf/EB9200	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/EB9200	Wed Jan  8 03:40:18 2014	(r260440)
@@ -92,6 +92,7 @@ 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: head/sys/arm/conf/EFIKA_MX
==============================================================================
--- head/sys/arm/conf/EFIKA_MX	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/EFIKA_MX	Wed Jan  8 03:40:18 2014	(r260440)
@@ -130,6 +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_DEBUG	# enable debug msgs
 device		ehci		# OHCI USB interface
 device		usb		# USB Bus (required)

Modified: head/sys/arm/conf/ETHERNUT5
==============================================================================
--- head/sys/arm/conf/ETHERNUT5	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/ETHERNUT5	Wed Jan  8 03:40:18 2014	(r260440)
@@ -149,6 +149,7 @@ 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: head/sys/arm/conf/HL200
==============================================================================
--- head/sys/arm/conf/HL200	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/HL200	Wed Jan  8 03:40:18 2014	(r260440)
@@ -94,6 +94,7 @@ 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: head/sys/arm/conf/HL201
==============================================================================
--- head/sys/arm/conf/HL201	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/HL201	Wed Jan  8 03:40:18 2014	(r260440)
@@ -96,6 +96,7 @@ device		icee
 
 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: head/sys/arm/conf/IMX53-QSB
==============================================================================
--- head/sys/arm/conf/IMX53-QSB	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/IMX53-QSB	Wed Jan  8 03:40:18 2014	(r260440)
@@ -133,6 +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_DEBUG	# enable debug msgs
 device		ehci		# OHCI USB interface
 device		usb		# USB Bus (required)

Modified: head/sys/arm/conf/KB920X
==============================================================================
--- head/sys/arm/conf/KB920X	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/KB920X	Wed Jan  8 03:40:18 2014	(r260440)
@@ -95,6 +95,7 @@ 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: head/sys/arm/conf/LN2410SBC
==============================================================================
--- head/sys/arm/conf/LN2410SBC	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/LN2410SBC	Wed Jan  8 03:40:18 2014	(r260440)
@@ -77,6 +77,7 @@ 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: head/sys/arm/conf/NSLU
==============================================================================
--- head/sys/arm/conf/NSLU	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/NSLU	Wed Jan  8 03:40:18 2014	(r260440)
@@ -109,6 +109,7 @@ 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: head/sys/arm/conf/PANDABOARD
==============================================================================
--- head/sys/arm/conf/PANDABOARD	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/PANDABOARD	Wed Jan  8 03:40:18 2014	(r260440)
@@ -112,6 +112,7 @@ device		md
 device		random		# Entropy device
 
 # USB support
+options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 device		usb
 options 	USB_DEBUG
 #options 	USB_REQ_DEBUG

Modified: head/sys/arm/conf/QILA9G20
==============================================================================
--- head/sys/arm/conf/QILA9G20	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/QILA9G20	Wed Jan  8 03:40:18 2014	(r260440)
@@ -119,6 +119,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.
 device		ohci		# OHCI localbus->USB interface
 device		usb		# USB Bus (required)
 device		umass		# Disks/Mass storage - Requires scbus and da

Modified: head/sys/arm/conf/RPI-B
==============================================================================
--- head/sys/arm/conf/RPI-B	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/RPI-B	Wed Jan  8 03:40:18 2014	(r260440)
@@ -93,6 +93,7 @@ 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: head/sys/arm/conf/SAM9260EK
==============================================================================
--- head/sys/arm/conf/SAM9260EK	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/SAM9260EK	Wed Jan  8 03:40:18 2014	(r260440)
@@ -157,6 +157,7 @@ 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: head/sys/arm/conf/SAM9G20EK
==============================================================================
--- head/sys/arm/conf/SAM9G20EK	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/SAM9G20EK	Wed Jan  8 03:40:18 2014	(r260440)
@@ -119,6 +119,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.
 device		ohci		# OHCI localbus->USB interface
 device		usb		# USB Bus (required)
 device		umass		# Disks/Mass storage - Requires scbus and da

Modified: head/sys/arm/conf/SAM9X25EK
==============================================================================
--- head/sys/arm/conf/SAM9X25EK	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/SAM9X25EK	Wed Jan  8 03:40:18 2014	(r260440)
@@ -121,6 +121,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.
 #device		ohci		# OHCI localbus->USB interface
 #device		usb		# USB Bus (required)
 #device		umass		# Disks/Mass storage - Requires scbus and da

Modified: head/sys/arm/conf/SHEEVAPLUG
==============================================================================
--- head/sys/arm/conf/SHEEVAPLUG	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/SHEEVAPLUG	Wed Jan  8 03:40:18 2014	(r260440)
@@ -65,6 +65,7 @@ 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: head/sys/arm/conf/SN9G45
==============================================================================
--- head/sys/arm/conf/SN9G45	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/SN9G45	Wed Jan  8 03:40:18 2014	(r260440)
@@ -97,6 +97,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.
 device		ohci		# OHCI localbus->USB interface
 device		usb		# USB Bus (required)
 device		umass		# Disks/Mass storage - Requires scbus and da

Modified: head/sys/arm/conf/TS7800
==============================================================================
--- head/sys/arm/conf/TS7800	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/TS7800	Wed Jan  8 03:40:18 2014	(r260440)
@@ -61,6 +61,7 @@ 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: head/sys/arm/conf/ZEDBOARD
==============================================================================
--- head/sys/arm/conf/ZEDBOARD	Wed Jan  8 03:22:42 2014	(r260439)
+++ head/sys/arm/conf/ZEDBOARD	Wed Jan  8 03:40:18 2014	(r260440)
@@ -81,6 +81,7 @@ 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401080340.s083eIDG054652>