From 082660c8e1ac9020f58e67f995be272e8db529e2 Mon Sep 17 00:00:00 2001 From: Ian Lepore Date: Fri, 7 Feb 2014 03:30:16 +0000 Subject: [PATCH] Revert r260440. I didn't realize that most of this change was already in effect due to r250753. That is sufficient for all SoCs with a 32 byte cache line size. Systems with 64 byte cache lines will need the option; that will be done in a separate commit. Thanks to loos@ for pointing out r250753. --- sys/arm/conf/AC100 | 1 - sys/arm/conf/ARMADAXP | 1 - sys/arm/conf/ARNDALE | 1 - sys/arm/conf/ATMEL | 1 - sys/arm/conf/AVILA | 1 - sys/arm/conf/BWCT | 1 - sys/arm/conf/CAMBRIA | 1 - sys/arm/conf/CNS11XXNAS | 1 - sys/arm/conf/CUBIEBOARD | 1 - sys/arm/conf/CUBIEBOARD2 | 1 - sys/arm/conf/DB-78XXX | 1 - sys/arm/conf/DB-88F5XXX | 1 - sys/arm/conf/DB-88F6XXX | 1 - sys/arm/conf/DIGI-CCWMX53 | 1 - sys/arm/conf/EA3250 | 1 - sys/arm/conf/EB9200 | 1 - sys/arm/conf/EFIKA_MX | 1 - sys/arm/conf/ETHERNUT5 | 1 - sys/arm/conf/HL200 | 1 - sys/arm/conf/HL201 | 1 - sys/arm/conf/IMX53-QSB | 1 - sys/arm/conf/KB920X | 1 - sys/arm/conf/LN2410SBC | 1 - sys/arm/conf/NSLU | 1 - sys/arm/conf/PANDABOARD | 1 - sys/arm/conf/QILA9G20 | 1 - sys/arm/conf/RPI-B | 1 - sys/arm/conf/SAM9260EK | 1 - sys/arm/conf/SAM9G20EK | 1 - sys/arm/conf/SAM9X25EK | 1 - sys/arm/conf/SHEEVAPLUG | 1 - sys/arm/conf/SN9G45 | 1 - sys/arm/conf/TS7800 | 1 - sys/arm/conf/ZEDBOARD | 1 - 34 files changed, 34 deletions(-) diff --git a/sys/arm/conf/AC100 b/sys/arm/conf/AC100 index f1141d5247a..d368bdf6536 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 82041a2e998..2b4945971e2 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/ARNDALE b/sys/arm/conf/ARNDALE index 06af3678f5a..f56d4de8166 100644 --- a/sys/arm/conf/ARNDALE +++ b/sys/arm/conf/ARNDALE @@ -94,7 +94,6 @@ 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 diff --git a/sys/arm/conf/ATMEL b/sys/arm/conf/ATMEL index 93d124dee8d..28c4bec448e 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 7189e314f4c..42464624fce 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 f23e1895db0..28c724ff760 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 6c89dacc021..377f45d223a 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 159bbdf1164..18d84e57223 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/CUBIEBOARD b/sys/arm/conf/CUBIEBOARD index b3fe7c48f57..b2b486c49b5 100644 --- a/sys/arm/conf/CUBIEBOARD +++ b/sys/arm/conf/CUBIEBOARD @@ -106,7 +106,6 @@ 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 diff --git a/sys/arm/conf/CUBIEBOARD2 b/sys/arm/conf/CUBIEBOARD2 index 1104f55b1bf..43167282b73 100644 --- a/sys/arm/conf/CUBIEBOARD2 +++ b/sys/arm/conf/CUBIEBOARD2 @@ -106,7 +106,6 @@ 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 diff --git a/sys/arm/conf/DB-78XXX b/sys/arm/conf/DB-78XXX index 00ebdcb44f2..f3e62f5b61a 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 704feb72bc6..50ca24e57ea 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 f446b24e20a..cf508ad7725 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 aa76903d52a..8a44844e39f 100644 --- a/sys/arm/conf/DIGI-CCWMX53 +++ b/sys/arm/conf/DIGI-CCWMX53 @@ -134,7 +134,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. 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 7b65435f75e..89d9fa418c3 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 724910d2f3e..0570699ef80 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 d0b8cdd52f3..fdfcb819e64 100644 --- a/sys/arm/conf/EFIKA_MX +++ b/sys/arm/conf/EFIKA_MX @@ -130,7 +130,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. #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 0c76a59ab3f..ef52bc68434 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 db59b8796aa..8df55cd5357 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 7f6ea72d0e3..8178e3bc164 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 cbe17e03384..ab226e83b20 100644 --- a/sys/arm/conf/IMX53-QSB +++ b/sys/arm/conf/IMX53-QSB @@ -133,7 +133,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. #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 0cdf9c3c582..7cf56d82912 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 ce02d463eec..8d2a585899b 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 0b23ee281b2..efbdbd16028 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/PANDABOARD b/sys/arm/conf/PANDABOARD index 3c613292090..0ebcf52352a 100644 --- a/sys/arm/conf/PANDABOARD +++ b/sys/arm/conf/PANDABOARD @@ -112,7 +112,6 @@ 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 diff --git a/sys/arm/conf/QILA9G20 b/sys/arm/conf/QILA9G20 index adb1355bdf7..e3cc9146639 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 9dce85802f1..5fe031b9f54 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 9d6962d13da..8f137e0896b 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 628c007d64c..faa325ac188 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 5c9245af101..9363fb94c76 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 7fe0b11d84f..c6bd901cb80 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 60c4ae5e840..05c9062548c 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 d9b614f08d4..79e9dbae4de 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 05ea07bd4a5..464850aed72 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