Merge branch 'topic/asoc' into to-push

author Takashi Iwai <tiwai@suse.de>

Thu, 25 Dec 2008 10:40:25 +0000 (11:40 +0100)

committer Takashi Iwai <tiwai@suse.de>

Thu, 25 Dec 2008 10:40:25 +0000 (11:40 +0100)
author Takashi Iwai <tiwai@suse.de>
Thu, 25 Dec 2008 10:40:25 +0000 (11:40 +0100)
committer Takashi Iwai <tiwai@suse.de>
Thu, 25 Dec 2008 10:40:25 +0000 (11:40 +0100)
diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt

index b8e86460046e7ee3dba003c12de57ae2d6f7fb36..b462bb1495438b4854564151cdddb9b3c98e91a2 100644 (file)
--- a/Documentation/DMA-API.txt
+++ b/Documentation/DMA-API.txt
@@ -316,12 +316,10 @@ reduce current DMA mapping usage or delay and try again later).
         pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg,
                 int nents, int direction)
  
-Maps a scatter gather list from the block layer.
-
  Returns: the number of physical segments mapped (this may be shorter
-than <nents> passed in if the block layer determines that some
-elements of the scatter/gather list are physically adjacent and thus
-may be mapped with a single entry).
+than <nents> passed in if some elements of the scatter/gather list are
+physically or virtually adjacent and an IOMMU maps them with a single
+entry).
  
  Please note that the sg cannot be mapped again if it has been mapped once.
  The mapping process is allowed to destroy information in the sg.
diff --git a/Documentation/arm/mem_alignment b/Documentation/arm/mem_alignment

index d145ccca169a37aa3ff42b06c734d9068525d9d7..c7c7a114c78c795c702f8543c57c7558466a9a4b 100644 (file)
--- a/Documentation/arm/mem_alignment
+++ b/Documentation/arm/mem_alignment
@@ -24,7 +24,7 @@ real bad - it changes the behaviour of all unaligned instructions in user
  space, and might cause programs to fail unexpectedly.
  
  To change the alignment trap behavior, simply echo a number into
-/proc/sys/debug/alignment.  The number is made up from various bits:
+/proc/cpu/alignment.  The number is made up from various bits:
  
  bit            behavior when set
  ---            -----------------
diff --git a/Documentation/filesystems/ocfs2.txt b/Documentation/filesystems/ocfs2.txt

index 4340cc825796e87d0af97df690ef4ae13fd4e320..67310fbbb7dfe86e62f9ae28ebf1b188b4c1d4e2 100644 (file)
--- a/Documentation/filesystems/ocfs2.txt
+++ b/Documentation/filesystems/ocfs2.txt
@@ -28,10 +28,7 @@ Manish Singh  <manish.singh@oracle.com>
  Caveats
  =======
  Features which OCFS2 does not support yet:
-       - extended attributes
         - quotas
-       - cluster aware flock
-       - cluster aware lockf
         - Directory change notification (F_NOTIFY)
         - Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease)
         - POSIX ACLs
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt

index bcceb99b81dd8038130fd9b1032b3e4ba80dc113..bb1b0dd3bfcbcc919bea2fbdf706607608f915c5 100644 (file)
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -44,6 +44,7 @@ Table of Contents
    2.14 /proc/<pid>/io - Display the IO accounting fields
    2.15 /proc/<pid>/coredump_filter - Core dump filtering settings
    2.16 /proc/<pid>/mountinfo - Information about mounts
+  2.17 /proc/sys/fs/epoll - Configuration options for the epoll interface
  
  ------------------------------------------------------------------------------
  Preface
@@ -2483,4 +2484,30 @@ For more information on mount propagation see:
  
    Documentation/filesystems/sharedsubtree.txt
  
+2.17   /proc/sys/fs/epoll - Configuration options for the epoll interface
+--------------------------------------------------------
+
+This directory contains configuration options for the epoll(7) interface.
+
+max_user_instances
+------------------
+
+This is the maximum number of epoll file descriptors that a single user can
+have open at a given time. The default value is 128, and should be enough
+for normal users.
+
+max_user_watches
+----------------
+
+Every epoll file descriptor can store a number of files to be monitored
+for event readiness. Each one of these monitored files constitutes a "watch".
+This configuration option sets the maximum number of "watches" that are
+allowed for each user.
+Each "watch" costs roughly 90 bytes on a 32bit kernel, and roughly 160 bytes
+on a 64bit one.
+The current default value for  max_user_watches  is the 1/32 of the available
+low memory, divided for the "watch" cost in bytes.
+
+
  ------------------------------------------------------------------------------
+
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt

index e0f346d201edb70fae654c55f6be842c4465a5ff..c9115c1b672c6e9eadb9ce59c2c198fea024823c 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -220,14 +220,17 @@ and is between 256 and 4096 characters. It is defined in the file
                         Bits in debug_level correspond to a level in
                         ACPI_DEBUG_PRINT statements, e.g.,
                             ACPI_DEBUG_PRINT((ACPI_DB_INFO, ...
-                       See Documentation/acpi/debug.txt for more information
-                       about debug layers and levels.
+                       The debug_level mask defaults to "info".  See
+                       Documentation/acpi/debug.txt for more information about
+                       debug layers and levels.
  
+                       Enable processor driver info messages:
+                           acpi.debug_layer=0x20000000
+                       Enable PCI/PCI interrupt routing info messages:
+                           acpi.debug_layer=0x400000
                         Enable AML "Debug" output, i.e., stores to the Debug
                         object while interpreting AML:
                             acpi.debug_layer=0xffffffff acpi.debug_level=0x2
-                       Enable PCI/PCI interrupt routing info messages:
-                           acpi.debug_layer=0x400000 acpi.debug_level=0x4
                         Enable all messages related to ACPI hardware:
                             acpi.debug_layer=0x2 acpi.debug_level=0xffffffff
  
diff --git a/Documentation/local_ops.txt b/Documentation/local_ops.txt

index f4f8b1c6c8ba45ba6ec351aa92c40e798024983c..23045b8b50f090ff806624c763fb2313c1ad9494 100644 (file)
--- a/Documentation/local_ops.txt
+++ b/Documentation/local_ops.txt
@@ -149,7 +149,7 @@ static void do_test_timer(unsigned long data)
         int cpu;
  
         /* Increment the counters */
-       on_each_cpu(test_each, NULL, 0, 1);
+       on_each_cpu(test_each, NULL, 1);
         /* Read all the counters */
         printk("Counters read from CPU %d\n", smp_processor_id());
         for_each_online_cpu(cpu) {
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt

index 3cd2ad958176c9e4f4969de00597ea55633d0c2c..394d7d378dc74daf6899621d2bca0c37cdd598cf 100644 (file)
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1063,6 +1063,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
  
         STAC9227/9228/9229/927x
           ref           Reference board
+         ref-no-jd     Reference board without HP/Mic jack detection
           3stack        D965 3stack
           5stack        D965 5stack + SPDIF
           dell-3stack   Dell Dimension E520
@@ -1076,6 +1077,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
  
         STAC92HD73*
           ref           Reference board
+         no-jd         BIOS setup but without jack-detection
           dell-m6-amic  Dell desktops/laptops with analog mics
           dell-m6-dmic  Dell desktops/laptops with digital mics
           dell-m6       Dell desktops/laptops with both type of mics
diff --git a/Documentation/spi/spi-summary b/Documentation/spi/spi-summary

index 8bae2f018d342cf6f027ec5a2dc3ace9ad709bb8..0f5122eb282bad1616b4bff089af95ac35e33a1f 100644 (file)
--- a/Documentation/spi/spi-summary
+++ b/Documentation/spi/spi-summary
@@ -215,7 +215,7 @@ So for example arch/.../mach-*/board-*.c files might have code like:
         /* if your mach-* infrastructure doesn't support kernels that can
          * run on multiple boards, pdata wouldn't benefit from "__init".
          */
-       static struct mysoc_spi_data __init pdata = { ... };
+       static struct mysoc_spi_data __initdata pdata = { ... };
  
         static __init board_init(void)
         {
diff --git a/Documentation/usb/gadget_serial.txt b/Documentation/usb/gadget_serial.txt

index 9b22bd14c3481789ac126c34842002ef7093a72a..eac7df94d8e3b7a9367e47f0c74e690502969be7 100644 (file)
--- a/Documentation/usb/gadget_serial.txt
+++ b/Documentation/usb/gadget_serial.txt
@@ -114,11 +114,11 @@ modules.
  Then you must load the gadget serial driver.  To load it as an
  ACM device (recommended for interoperability), do this:
  
-  modprobe g_serial use_acm=1
+  modprobe g_serial
  
  To load it as a vendor specific bulk in/out device, do this:
  
-  modprobe g_serial
+  modprobe g_serial use_acm=0
  
  This will also automatically load the underlying gadget peripheral
  controller driver.  This must be done each time you reboot the gadget
diff --git a/Documentation/usb/proc_usb_info.txt b/Documentation/usb/proc_usb_info.txt

index 077e9032d0cda17b08be1e8f85b496f37cef6b85..fafcd47232600a1a80351fcd5dfc79492e6ce8e9 100644 (file)
--- a/Documentation/usb/proc_usb_info.txt
+++ b/Documentation/usb/proc_usb_info.txt
@@ -49,8 +49,10 @@ it and 002/048 sometime later.
  
  These files can be read as binary data.  The binary data consists
  of first the device descriptor, then the descriptors for each
-configuration of the device.  That information is also shown in
-text form by the /proc/bus/usb/devices file, described later.
+configuration of the device.  Multi-byte fields in the device and
+configuration descriptors, but not other descriptors, are converted
+to host endianness by the kernel.  This information is also shown
+in text form by the /proc/bus/usb/devices file, described later.
  
  These files may also be used to write user-level drivers for the USB
  devices.  You would open the /proc/bus/usb/BBB/DDD file read/write,
diff --git a/Documentation/usb/usbmon.txt b/Documentation/usb/usbmon.txt

index 2917ce4ffdc4f5df267bdc9b5f239a9679c2e6d4..270481906dc80d1b25a0c29f607ef55e83ae16be 100644 (file)
--- a/Documentation/usb/usbmon.txt
+++ b/Documentation/usb/usbmon.txt
@@ -34,11 +34,12 @@ if usbmon is built into the kernel.
  Verify that bus sockets are present.
  
  # ls /sys/kernel/debug/usbmon
-0s  0t  0u  1s  1t  1u  2s  2t  2u  3s  3t  3u  4s  4t  4u
+0s  0u  1s  1t  1u  2s  2t  2u  3s  3t  3u  4s  4t  4u
  #
  
-Now you can choose to either use the sockets numbered '0' (to capture packets on
-all buses), and skip to step #3, or find the bus used by your device with step #2.
+Now you can choose to either use the socket '0u' (to capture packets on all
+buses), and skip to step #3, or find the bus used by your device with step #2.
+This allows to filter away annoying devices that talk continuously.
  
  2. Find which bus connects to the desired device
  
@@ -99,8 +100,9 @@ on the event type, but there is a set of words, common for all types.
  
  Here is the list of words, from left to right:
  
-- URB Tag. This is used to identify URBs is normally a kernel mode address
- of the URB structure in hexadecimal.
+- URB Tag. This is used to identify URBs, and is normally an in-kernel address
+  of the URB structure in hexadecimal, but can be a sequence number or any
+  other unique string, within reason.
  
  - Timestamp in microseconds, a decimal number. The timestamp's resolution
    depends on available clock, and so it can be much worse than a microsecond
diff --git a/MAINTAINERS b/MAINTAINERS

index 6df20eaf041866e8f305faad6c462893522d52fd..701025701514db7f85478f8711285d8d1768dce3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -779,6 +779,7 @@ ATM
  P:     Chas Williams
  M:     chas@cmf.nrl.navy.mil
  L:     linux-atm-general@lists.sourceforge.net (subscribers-only)
+L:     netdev@vger.kernel.org
  W:     http://linux-atm.sourceforge.net
  S:     Maintained
  
@@ -1526,10 +1527,10 @@ W:      http://ebtables.sourceforge.net/
  S:     Maintained
  
  ECRYPT FILE SYSTEM
-P:     Mike Halcrow, Phillip Hellewell
-M:     mhalcrow@us.ibm.com, phillip@hellewell.homeip.net
-L:     ecryptfs-devel@lists.sourceforge.net
-W:     http://ecryptfs.sourceforge.net/
+P:     Tyler Hicks, Dustin Kirkland
+M:     tyhicks@linux.vnet.ibm.com, kirkland@canonical.com
+L:     ecryptfs-devel@lists.launchpad.net
+W:     https://launchpad.net/ecryptfs
  S:     Supported
  
  EDAC-CORE
@@ -2190,9 +2191,9 @@ S:        Supported
  
  INOTIFY
  P:     John McCutchan
-M:     ttb@tentacle.dhs.org
+M:     john@johnmccutchan.com
  P:     Robert Love
-M:     rml@novell.com
+M:     rlove@rlove.org
  L:     linux-kernel@vger.kernel.org
  S:     Maintained
  
@@ -3758,6 +3759,15 @@ M:       drzeus-sdhci@drzeus.cx
  L:     sdhci-devel@list.drzeus.cx
  S:     Maintained
  
+SECURITY SUBSYSTEM
+F:     security/
+P:     James Morris
+M:     jmorris@namei.org
+L:     linux-kernel@vger.kernel.org
+L:     linux-security-module@vger.kernel.org (suggested Cc:)
+T:     git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
+S:     Supported
+
  SECURITY CONTACT
  P:     Security Officers
  M:     security@kernel.org
@@ -4235,7 +4245,7 @@ M:        dedekind@infradead.org
  P:     Adrian Hunter
  M:     ext-adrian.hunter@nokia.com
  L:     linux-mtd@lists.infradead.org
-T:     git git://git.infradead.org/~dedekind/ubifs-2.6.git
+T:     git git://git.infradead.org/ubifs-2.6.git
  W:     http://www.linux-mtd.infradead.org/doc/ubifs.html
  S:     Maintained
  
@@ -4289,7 +4299,7 @@ P:        Artem Bityutskiy
  M:     dedekind@infradead.org
  W:     http://www.linux-mtd.infradead.org/
  L:     linux-mtd@lists.infradead.org
-T:     git git://git.infradead.org/~dedekind/ubi-2.6.git
+T:     git git://git.infradead.org/ubi-2.6.git
  S:     Maintained
  
  USB ACM DRIVER
@@ -4519,7 +4529,7 @@ S:        Maintained
  USB VIDEO CLASS
  P:     Laurent Pinchart
  M:     laurent.pinchart@skynet.be
-L:     linux-uvc-devel@lists.berlios.de
+L:     linux-uvc-devel@lists.berlios.de (subscribers-only)
  L:     video4linux-list@redhat.com
  W:     http://linux-uvc.berlios.de
  S:     Maintained
diff --git a/Makefile b/Makefile

index 7b1f2384094f84cb8d9473f17a184aefbae5fcac..71e98e9e6acd3fd69d868843a000e7d8fc0363f2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 28
-EXTRAVERSION = -rc6
-NAME = Killer Bat of Doom
+EXTRAVERSION =
+NAME = Erotic Pickled Herring
  
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c

index 47ccec95f3e867ce5141f7e0db7bdb7f2e57667d..ef12794c3c68f7f2d6be4ec3dcda643540ed091d 100644 (file)
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -630,7 +630,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
                 return -ENOMEM;
  
         sachip->clk = clk_get(me, "SA1111_CLK");
-       if (!sachip->clk) {
+       if (IS_ERR(sachip->clk)) {
                 ret = PTR_ERR(sachip->clk);
                 goto err_free;
         }
diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h

index 9a1db20e032a07eb744aba50c1c60a28d0a0b381..63a481fbbed43ed12ecc9802ffc729a06e8d23c6 100644 (file)
--- a/arch/arm/include/asm/bitops.h
+++ b/arch/arm/include/asm/bitops.h
@@ -237,6 +237,7 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset);
  #if __LINUX_ARM_ARCH__ < 5
  
  #include <asm-generic/bitops/ffz.h>
+#include <asm-generic/bitops/__fls.h>
  #include <asm-generic/bitops/__ffs.h>
  #include <asm-generic/bitops/fls.h>
  #include <asm-generic/bitops/ffs.h>
@@ -277,16 +278,19 @@ static inline int constant_fls(int x)
   * the clz instruction for much better code efficiency.
   */
  
-#define __fls(x) \
-       ( __builtin_constant_p(x) ? constant_fls(x) : \
-         ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) )
-
-/* Implement fls() in C so that 64-bit args are suitably truncated */
  static inline int fls(int x)
  {
-       return __fls(x);
+       int ret;
+
+       if (__builtin_constant_p(x))
+              return constant_fls(x);
+
+       asm("clz\t%0, %1" : "=r" (ret) : "r" (x) : "cc");
+               ret = 32 - ret;
+       return ret;
  }
  
+#define __fls(x) (fls(x) - 1)
  #define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); })
  #define __ffs(x) (ffs(x) - 1)
  #define ffz(x) __ffs( ~(x) )
diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h

index 517a4d6ffc74b791691a3a2f65099bb6352e5e64..6ff33790f47b16d91054c4907edb09616a21f5d8 100644 (file)
--- a/arch/arm/include/asm/processor.h
+++ b/arch/arm/include/asm/processor.h
@@ -23,7 +23,7 @@
  #include <asm/types.h>
  
  #ifdef __KERNEL__
-#define STACK_TOP      ((current->personality == PER_LINUX_32BIT) ? \
+#define STACK_TOP      ((current->personality & ADDR_LIMIT_32BIT) ? \
                          TASK_SIZE : TASK_SIZE_26)
  #define STACK_TOP_MAX  TASK_SIZE
  #endif
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c

index c74f766ffc124406e56ab76918db8bdf4c1e30ec..23af3c972c9a7d202c0a71a340e29067d4ac8d74 100644 (file)
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
@@ -115,6 +115,8 @@ EXPORT_SYMBOL(__strnlen_user);
  EXPORT_SYMBOL(__strncpy_from_user);
  
  #ifdef CONFIG_MMU
+EXPORT_SYMBOL(copy_page);
+
  EXPORT_SYMBOL(__copy_from_user);
  EXPORT_SYMBOL(__copy_to_user);
  EXPORT_SYMBOL(__clear_user);
@@ -181,8 +183,6 @@ EXPORT_SYMBOL(_find_first_bit_be);
  EXPORT_SYMBOL(_find_next_bit_be);
  #endif
  
-EXPORT_SYMBOL(copy_page);
-
  #ifdef CONFIG_FUNCTION_TRACER
  EXPORT_SYMBOL(mcount);
  #endif
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c

index 57e6874d0b809a21a27afe21d436fa8dca9046e9..79abc4ddc0cf602cf8ae77728fefd8d2080ea826 100644 (file)
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -18,6 +18,7 @@
  #include <linux/personality.h>
  #include <linux/kallsyms.h>
  #include <linux/delay.h>
+#include <linux/hardirq.h>
  #include <linux/init.h>
  #include <linux/uaccess.h>
  
diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c

index b3bd8ca85118babd632c353c20cfec92fa811108..4c3e582f3d3cc37e7d4db3338d62828f84e10d93 100644 (file)
--- a/arch/arm/mach-omap1/io.c
+++ b/arch/arm/mach-omap1/io.c
@@ -128,7 +128,7 @@ void __init omap1_map_common_io(void)
   * Common low-level hardware init for omap1. This should only get called from
   * board specific init.
   */
-void __init omap1_init_common_hw()
+void __init omap1_init_common_hw(void)
  {
         /* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort
          * on a Posted Write in the TIPB Bridge".
diff --git a/arch/arm/mach-pxa/include/mach/reset.h b/arch/arm/mach-pxa/include/mach/reset.h

index 7b8842cfa5fce30753914f538a0d125d2d1a349d..31e6a7b6ad80d27f055b9ce49da0b7e036e06755 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/reset.h
+++ b/arch/arm/mach-pxa/include/mach/reset.h
@@ -12,9 +12,8 @@ extern void clear_reset_status(unsigned int mask);
  
  /**
   * init_gpio_reset() - register GPIO as reset generator
- *
- * @gpio - gpio nr
- * @output - set gpio as out/low instead of input during normal work
+ * @gpio: gpio nr
+ * @output: set gpio as out/low instead of input during normal work
   */
  extern int init_gpio_reset(int gpio, int output);
  
diff --git a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h

index 3fe8be9ca110e8bf40bf486a2e196b1e70ce869d..980a099e209cf26840724828d90c3b68eff7123c 100644 (file)
--- a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
+++ b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
@@ -18,6 +18,7 @@ struct s3c2410_spigpio_info {
         unsigned long            pin_mosi;
         unsigned long            pin_miso;
  
+       int                      num_chipselect;
         int                      bus_num;
  
         void (*chip_select)(struct s3c2410_spigpio_info *spi, int cs);
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c

index 133e65d166b315b0e54aba959846a162643bc927..2d5884ce0435fb436a57bee6d314284b9101e87e 100644 (file)
--- a/arch/arm/mm/alignment.c
+++ b/arch/arm/mm/alignment.c
@@ -70,6 +70,10 @@ static unsigned long ai_dword;
  static unsigned long ai_multi;
  static int ai_usermode;
  
+#define UM_WARN                (1 << 0)
+#define UM_FIXUP       (1 << 1)
+#define UM_SIGNAL      (1 << 2)
+
  #ifdef CONFIG_PROC_FS
  static const char *usermode_action[] = {
         "ignored",
@@ -754,7 +758,7 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
   user:
         ai_user += 1;
  
-       if (ai_usermode & 1)
+       if (ai_usermode & UM_WARN)
                 printk("Alignment trap: %s (%d) PC=0x%08lx Instr=0x%0*lx "
                        "Address=0x%08lx FSR 0x%03x\n", current->comm,
                         task_pid_nr(current), instrptr,
@@ -762,10 +766,10 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
                         thumb_mode(regs) ? tinstr : instr,
                         addr, fsr);
  
-       if (ai_usermode & 2)
+       if (ai_usermode & UM_FIXUP)
                 goto fixup;
  
-       if (ai_usermode & 4)
+       if (ai_usermode & UM_SIGNAL)
                 force_sig(SIGBUS, current);
         else
                 set_cr(cr_no_alignment);
@@ -796,6 +800,22 @@ static int __init alignment_init(void)
         res->write_proc = proc_alignment_write;
  #endif
  
+       /*
+        * ARMv6 and later CPUs can perform unaligned accesses for
+        * most single load and store instructions up to word size.
+        * LDM, STM, LDRD and STRD still need to be handled.
+        *
+        * Ignoring the alignment fault is not an option on these
+        * CPUs since we spin re-faulting the instruction without
+        * making any progress.
+        */
+       if (cpu_architecture() >= CPU_ARCH_ARMv6 && (cr_alignment & CR_U)) {
+               cr_alignment &= ~CR_A;
+               cr_no_alignment &= ~CR_A;
+               set_cr(cr_alignment);
+               ai_usermode = UM_FIXUP;
+       }
+
         hook_fault_code(1, do_alignment, SIGILL, "alignment exception");
         hook_fault_code(3, do_alignment, SIGILL, "alignment exception");
  
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c

index 2df8d9facf5741c060bb9f028c93b7c3bbe33a6e..22c9530e91e2fd8568fa78e1e5aec95ed7a72a24 100644 (file)
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -11,6 +11,7 @@
  #include <linux/module.h>
  #include <linux/signal.h>
  #include <linux/mm.h>
+#include <linux/hardirq.h>
  #include <linux/init.h>
  #include <linux/kprobes.h>
  #include <linux/uaccess.h>
diff --git a/arch/arm/plat-omap/include/mach/omapfb.h b/arch/arm/plat-omap/include/mach/omapfb.h

index ec67fb428607c55ba7d4e452db241cd048e7028c..7b74d1255e0b93c7531e607a77188a148bda980b 100644 (file)
--- a/arch/arm/plat-omap/include/mach/omapfb.h
+++ b/arch/arm/plat-omap/include/mach/omapfb.h
@@ -353,8 +353,8 @@ struct omapfb_device {
         u32                     pseudo_palette[17];
  
         struct lcd_panel        *panel;                 /* LCD panel */
-       struct lcd_ctrl         *ctrl;                  /* LCD controller */
-       struct lcd_ctrl         *int_ctrl;              /* internal LCD ctrl */
+       const struct lcd_ctrl   *ctrl;                  /* LCD controller */
+       const struct lcd_ctrl   *int_ctrl;              /* internal LCD ctrl */
         struct lcd_ctrl_extif   *ext_if;                /* LCD ctrl external
                                                            interface */
         struct device           *dev;
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c

index 9f9a921829c00686f5b8a658c89bef8e084558d0..dcd9d16da2e9f5f0df6e36484e09edaed84139e9 100644 (file)
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -255,7 +255,7 @@ void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl)
         if (!_omap_sram_reprogram_clock)
                 omap_sram_error();
  
-       return _omap_sram_reprogram_clock(dpllctl, ckctl);
+       _omap_sram_reprogram_clock(dpllctl, ckctl);
  }
  
  int __init omap1_sram_init(void)
@@ -282,8 +282,8 @@ void omap2_sram_ddr_init(u32 *slow_dll_ctrl, u32 fast_dll_ctrl,
         if (!_omap2_sram_ddr_init)
                 omap_sram_error();
  
-       return _omap2_sram_ddr_init(slow_dll_ctrl, fast_dll_ctrl,
-                                   base_cs, force_unlock);
+       _omap2_sram_ddr_init(slow_dll_ctrl, fast_dll_ctrl,
+                            base_cs, force_unlock);
  }
  
  static void (*_omap2_sram_reprogram_sdrc)(u32 perf_level, u32 dll_val,
@@ -294,7 +294,7 @@ void omap2_sram_reprogram_sdrc(u32 perf_level, u32 dll_val, u32 mem_type)
         if (!_omap2_sram_reprogram_sdrc)
                 omap_sram_error();
  
-       return _omap2_sram_reprogram_sdrc(perf_level, dll_val, mem_type);
+       _omap2_sram_reprogram_sdrc(perf_level, dll_val, mem_type);
  }
  
  static u32 (*_omap2_set_prcm)(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass);
diff --git a/arch/arm/plat-orion/pcie.c b/arch/arm/plat-orion/pcie.c

index 883902fead8928f9ff24cdfd781fa28b3013470c..d41d41d78ad98676dea41aeb6466fb1ebf2bb811 100644 (file)
--- a/arch/arm/plat-orion/pcie.c
+++ b/arch/arm/plat-orion/pcie.c
@@ -35,7 +35,7 @@
  #define  PCIE_CONF_REG(r)              ((((r) & 0xf00) << 16) | ((r) & 0xfc))
  #define  PCIE_CONF_BUS(b)              (((b) & 0xff) << 16)
  #define  PCIE_CONF_DEV(d)              (((d) & 0x1f) << 11)
-#define  PCIE_CONF_FUNC(f)             (((f) & 0x3) << 8)
+#define  PCIE_CONF_FUNC(f)             (((f) & 0x7) << 8)
  #define PCIE_CONF_DATA_OFF     0x18fc
  #define PCIE_MASK_OFF          0x1910
  #define PCIE_CTRL_OFF          0x1a00
diff --git a/arch/avr32/boards/favr-32/flash.c b/arch/avr32/boards/favr-32/flash.c

index 5f139b7cb5f7c0aeb22d7b9b2cdba3b3682702f1..604bbd5e41d9b6c6c98dd7ceec835a345e1b22fd 100644 (file)
--- a/arch/avr32/boards/favr-32/flash.c
+++ b/arch/avr32/boards/favr-32/flash.c
@@ -13,7 +13,7 @@
  #include <linux/mtd/partitions.h>
  #include <linux/mtd/physmap.h>
  
-#include <asm/arch/smc.h>
+#include <mach/smc.h>
  
  static struct smc_timing flash_timing __initdata = {
         .ncs_read_setup         = 0,
diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c

index 7538f3d2b9e0742a4a5647cc37a5b1fa7f6e611d..1ee4faf0742dba057a8dd6db0eb589e9758d5936 100644 (file)
--- a/arch/avr32/boards/favr-32/setup.c
+++ b/arch/avr32/boards/favr-32/setup.c
@@ -25,10 +25,10 @@
  
  #include <asm/setup.h>
  
-#include <asm/arch/at32ap700x.h>
-#include <asm/arch/init.h>
-#include <asm/arch/board.h>
-#include <asm/arch/portmux.h>
+#include <mach/at32ap700x.h>
+#include <mach/init.h>
+#include <mach/board.h>
+#include <mach/portmux.h>
  
  /* Oscillator frequencies. These are board-specific */
  unsigned long at32_board_osc_rates[3] = {
diff --git a/arch/avr32/boot/images/Makefile b/arch/avr32/boot/images/Makefile

index 219720a47bf93772c77d8a57787fe46812bbb006..1848bf0d7f62642568356ded4833102e91724216 100644 (file)
--- a/arch/avr32/boot/images/Makefile
+++ b/arch/avr32/boot/images/Makefile
@@ -10,7 +10,7 @@ MKIMAGE               := $(srctree)/scripts/mkuboot.sh
  
  extra-y                := vmlinux.bin vmlinux.gz
  
-OBJCOPYFLAGS_vmlinux.bin := -O binary
+OBJCOPYFLAGS_vmlinux.bin := -O binary -R .note.gnu.build-id
  $(obj)/vmlinux.bin: vmlinux FORCE
         $(call if_changed,objcopy)
  
diff --git a/arch/avr32/configs/atstk1006_defconfig b/arch/avr32/configs/atstk1006_defconfig

index 8b6e54c9946aa835c1afb055350b8c3d166f839c..6c45a3b77aa3a877dc327ae0b978c7b42cae2d07 100644 (file)
--- a/arch/avr32/configs/atstk1006_defconfig
+++ b/arch/avr32/configs/atstk1006_defconfig
@@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-rc1
-# Tue Aug  5 15:40:26 2008
+# Linux kernel version: 2.6.28-rc8
+# Thu Dec 18 11:22:23 2008
  #
  CONFIG_AVR32=y
  CONFIG_GENERIC_GPIO=y
@@ -67,6 +67,7 @@ CONFIG_SIGNALFD=y
  CONFIG_TIMERFD=y
  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
+CONFIG_AIO=y
  CONFIG_VM_EVENT_COUNTERS=y
  CONFIG_SLUB_DEBUG=y
  # CONFIG_SLAB is not set
@@ -77,15 +78,8 @@ CONFIG_PROFILING=y
  CONFIG_OPROFILE=m
  CONFIG_HAVE_OPROFILE=y
  CONFIG_KPROBES=y
-# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
-# CONFIG_HAVE_IOREMAP_PROT is not set
  CONFIG_HAVE_KPROBES=y
-# CONFIG_HAVE_KRETPROBES is not set
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
-# CONFIG_HAVE_DMA_ATTRS is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
  CONFIG_HAVE_CLK=y
-CONFIG_PROC_PAGE_MONITOR=y
  # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
  CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
@@ -118,6 +112,7 @@ CONFIG_DEFAULT_CFQ=y
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="cfq"
  CONFIG_CLASSIC_RCU=y
+CONFIG_FREEZER=y
  
  #
  # System Type and features
@@ -134,6 +129,8 @@ CONFIG_CPU_AT32AP700X=y
  CONFIG_CPU_AT32AP7000=y
  CONFIG_BOARD_ATSTK1000=y
  # CONFIG_BOARD_ATNGW100 is not set
+# CONFIG_BOARD_FAVR_32 is not set
+# CONFIG_BOARD_MIMC200 is not set
  # CONFIG_BOARD_ATSTK1002 is not set
  # CONFIG_BOARD_ATSTK1003 is not set
  # CONFIG_BOARD_ATSTK1004 is not set
@@ -171,14 +168,14 @@ CONFIG_FLATMEM_MANUAL=y
  # CONFIG_SPARSEMEM_MANUAL is not set
  CONFIG_FLATMEM=y
  CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  # CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
  CONFIG_ZONE_DMA_FLAG=0
  CONFIG_NR_QUICK=2
  CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
  # CONFIG_OWNERSHIP_TRACE is not set
  CONFIG_NMI_DEBUGGING=y
  # CONFIG_HZ_100 is not set
@@ -186,7 +183,7 @@ CONFIG_HZ_250=y
  # CONFIG_HZ_300 is not set
  # CONFIG_HZ_1000 is not set
  CONFIG_HZ=250
-# CONFIG_SCHED_HRTICK is not set
+CONFIG_SCHED_HRTICK=y
  CONFIG_CMDLINE=""
  
  #
@@ -228,6 +225,8 @@ CONFIG_CPU_FREQ_AT32AP=y
  # Executable file formats
  #
  CONFIG_BINFMT_ELF=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+# CONFIG_HAVE_AOUT is not set
  # CONFIG_BINFMT_MISC is not set
  CONFIG_NET=y
  
@@ -299,6 +298,7 @@ CONFIG_IPV6_TUNNEL=m
  # CONFIG_ATM is not set
  CONFIG_STP=m
  CONFIG_BRIDGE=m
+# CONFIG_NET_DSA is not set
  # CONFIG_VLAN_8021Q is not set
  # CONFIG_DECNET is not set
  CONFIG_LLC=m
@@ -321,14 +321,8 @@ CONFIG_LLC=m
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
  # CONFIG_AF_RXRPC is not set
-
-#
-# Wireless
-#
-# CONFIG_CFG80211 is not set
-# CONFIG_WIRELESS_EXT is not set
-# CONFIG_MAC80211 is not set
-# CONFIG_IEEE80211 is not set
+# CONFIG_PHONET is not set
+# CONFIG_WIRELESS is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
  
@@ -359,6 +353,7 @@ CONFIG_MTD_CMDLINE_PARTS=y
  # User Modules And Translation Layers
  #
  CONFIG_MTD_CHAR=y
+CONFIG_HAVE_MTD_OTP=y
  CONFIG_MTD_BLKDEVS=y
  CONFIG_MTD_BLOCK=y
  # CONFIG_FTL is not set
@@ -407,6 +402,8 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
  # Self-contained MTD device drivers
  #
  CONFIG_MTD_DATAFLASH=m
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+CONFIG_MTD_DATAFLASH_OTP=y
  CONFIG_MTD_M25P80=m
  CONFIG_M25PXX_USE_FAST_READ=y
  # CONFIG_MTD_SLRAM is not set
@@ -464,9 +461,10 @@ CONFIG_ATMEL_TCLIB=y
  CONFIG_ATMEL_TCB_CLKSRC=y
  CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0
  # CONFIG_EEPROM_93CX6 is not set
+# CONFIG_ICS932S401 is not set
  CONFIG_ATMEL_SSC=m
  # CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_HAVE_IDE is not set
+# CONFIG_C2PORT is not set
  
  #
  # SCSI device support
@@ -548,6 +546,9 @@ CONFIG_MACB=y
  # CONFIG_IBM_NEW_EMAC_RGMII is not set
  # CONFIG_IBM_NEW_EMAC_TAH is not set
  # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  # CONFIG_B44 is not set
  # CONFIG_NETDEV_1000 is not set
  # CONFIG_NETDEV_10000 is not set
@@ -653,6 +654,7 @@ CONFIG_UNIX98_PTYS=y
  CONFIG_I2C=m
  CONFIG_I2C_BOARDINFO=y
  CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_HELPER_AUTO=y
  CONFIG_I2C_ALGOBIT=m
  
  #
@@ -716,6 +718,10 @@ CONFIG_GPIOLIB=y
  # CONFIG_DEBUG_GPIO is not set
  CONFIG_GPIO_SYSFS=y
  
+#
+# Memory mapped GPIO expanders:
+#
+
  #
  # I2C GPIO expanders:
  #
@@ -745,11 +751,11 @@ CONFIG_WATCHDOG=y
  #
  # CONFIG_SOFT_WATCHDOG is not set
  CONFIG_AT32AP700X_WDT=y
+CONFIG_SSB_POSSIBLE=y
  
  #
  # Sonics Silicon Backplane
  #
-CONFIG_SSB_POSSIBLE=y
  # CONFIG_SSB is not set
  
  #
@@ -758,6 +764,10 @@ CONFIG_SSB_POSSIBLE=y
  # CONFIG_MFD_CORE is not set
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
@@ -783,6 +793,7 @@ CONFIG_SSB_POSSIBLE=y
  CONFIG_FB=y
  # CONFIG_FIRMWARE_EDID is not set
  # CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
  CONFIG_FB_CFB_FILLRECT=y
  CONFIG_FB_CFB_COPYAREA=y
  CONFIG_FB_CFB_IMAGEBLIT=y
@@ -804,10 +815,13 @@ CONFIG_FB_CFB_IMAGEBLIT=y
  # CONFIG_FB_S1D13XXX is not set
  CONFIG_FB_ATMEL=y
  # CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
  CONFIG_BACKLIGHT_LCD_SUPPORT=y
  CONFIG_LCD_CLASS_DEVICE=y
  CONFIG_LCD_LTV350QV=y
  # CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
  # CONFIG_LCD_VGG2432A4 is not set
  # CONFIG_LCD_PLATFORM is not set
  # CONFIG_BACKLIGHT_CLASS_DEVICE is not set
@@ -818,6 +832,7 @@ CONFIG_LCD_LTV350QV=y
  # CONFIG_DISPLAY_SUPPORT is not set
  # CONFIG_LOGO is not set
  CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
  CONFIG_SND=m
  CONFIG_SND_TIMER=m
  CONFIG_SND_PCM=m
@@ -848,28 +863,32 @@ CONFIG_USB_SUPPORT=y
  # CONFIG_USB_ARCH_HAS_EHCI is not set
  # CONFIG_USB_OTG_WHITELIST is not set
  # CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_GADGET_MUSB_HDRC is not set
  
  #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
  #
  CONFIG_USB_GADGET=y
  # CONFIG_USB_GADGET_DEBUG is not set
  # CONFIG_USB_GADGET_DEBUG_FILES is not set
  # CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
  CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_AT91 is not set
  CONFIG_USB_GADGET_ATMEL_USBA=y
  CONFIG_USB_ATMEL_USBA=y
  # CONFIG_USB_GADGET_FSL_USB2 is not set
-# CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_PXA25X is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_PXA27X is not set
-# CONFIG_USB_GADGET_GOKU is not set
  # CONFIG_USB_GADGET_LH7A40X is not set
  # CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_PXA25X is not set
+# CONFIG_USB_GADGET_PXA27X is not set
  # CONFIG_USB_GADGET_S3C2410 is not set
-# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_QE is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_GOKU is not set
  # CONFIG_USB_GADGET_DUMMY_HCD is not set
  CONFIG_USB_GADGET_DUALSPEED=y
  CONFIG_USB_ZERO=m
@@ -887,7 +906,7 @@ CONFIG_MMC=y
  # CONFIG_MMC_UNSAFE_RESUME is not set
  
  #
-# MMC/SD Card Drivers
+# MMC/SD/SDIO Card Drivers
  #
  CONFIG_MMC_BLOCK=y
  CONFIG_MMC_BLOCK_BOUNCE=y
@@ -895,10 +914,11 @@ CONFIG_MMC_BLOCK_BOUNCE=y
  # CONFIG_MMC_TEST is not set
  
  #
-# MMC/SD Host Controller Drivers
+# MMC/SD/SDIO Host Controller Drivers
  #
  # CONFIG_MMC_SDHCI is not set
  CONFIG_MMC_ATMELMCI=y
+# CONFIG_MMC_ATMELMCI_DMA is not set
  CONFIG_MMC_SPI=m
  # CONFIG_MEMSTICK is not set
  CONFIG_NEW_LEDS=y
@@ -918,6 +938,7 @@ CONFIG_LEDS_GPIO=m
  CONFIG_LEDS_TRIGGERS=y
  CONFIG_LEDS_TRIGGER_TIMER=m
  CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
  CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
  # CONFIG_ACCESSIBILITY is not set
  CONFIG_RTC_LIB=y
@@ -950,25 +971,31 @@ CONFIG_RTC_INTF_DEV=y
  # CONFIG_RTC_DRV_M41T80 is not set
  # CONFIG_RTC_DRV_S35390A is not set
  # CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
  
  #
  # SPI RTC drivers
  #
  # CONFIG_RTC_DRV_M41T94 is not set
  # CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
  # CONFIG_RTC_DRV_MAX6902 is not set
  # CONFIG_RTC_DRV_R9701 is not set
  # CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
  
  #
  # Platform RTC drivers
  #
+# CONFIG_RTC_DRV_DS1286 is not set
  # CONFIG_RTC_DRV_DS1511 is not set
  # CONFIG_RTC_DRV_DS1553 is not set
  # CONFIG_RTC_DRV_DS1742 is not set
  # CONFIG_RTC_DRV_STK17TA8 is not set
  # CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
  # CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
  # CONFIG_RTC_DRV_V3020 is not set
  
  #
@@ -989,6 +1016,8 @@ CONFIG_DMA_ENGINE=y
  # CONFIG_NET_DMA is not set
  CONFIG_DMATEST=m
  # CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # File systems
@@ -998,12 +1027,17 @@ CONFIG_EXT2_FS=m
  # CONFIG_EXT2_FS_XIP is not set
  CONFIG_EXT3_FS=m
  # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4DEV_COMPAT=y
+# CONFIG_EXT4_FS_XATTR is not set
  CONFIG_JBD=m
  # CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
  # CONFIG_REISERFS_FS is not set
  # CONFIG_JFS_FS is not set
  # CONFIG_FS_POSIX_ACL is not set
+CONFIG_FILE_LOCKING=y
  # CONFIG_XFS_FS is not set
  # CONFIG_OCFS2_FS is not set
  # CONFIG_DNOTIFY is not set
@@ -1036,6 +1070,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
  CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
  CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
  # CONFIG_TMPFS_POSIX_ACL is not set
@@ -1054,7 +1089,8 @@ CONFIG_TMPFS=y
  # CONFIG_EFS_FS is not set
  CONFIG_JFFS2_FS=y
  CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_WRITEBUFFER is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
  # CONFIG_JFFS2_SUMMARY is not set
  # CONFIG_JFFS2_FS_XATTR is not set
  # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
@@ -1088,6 +1124,7 @@ CONFIG_LOCKD=y
  CONFIG_LOCKD_V4=y
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_REGISTER_V4 is not set
  # CONFIG_RPCSEC_GSS_KRB5 is not set
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  # CONFIG_SMB_FS is not set
@@ -1185,10 +1222,21 @@ CONFIG_DEBUG_BUGVERBOSE=y
  CONFIG_FRAME_POINTER=y
  # CONFIG_BOOT_PRINTK_DELAY is not set
  # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
  # CONFIG_KPROBES_SANITY_TEST is not set
  # CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
  # CONFIG_LKDTM is not set
  # CONFIG_FAULT_INJECTION is not set
+
+#
+# Tracers
+#
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_BOOT_TRACER is not set
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  
  #
@@ -1196,17 +1244,26 @@ CONFIG_FRAME_POINTER=y
  #
  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
  CONFIG_CRYPTO=y
  
  #
  # Crypto core or helper
  #
+CONFIG_CRYPTO_FIPS=y
  CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
  CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
  CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
  CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
  CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER2=y
  # CONFIG_CRYPTO_GF128MUL is not set
  # CONFIG_CRYPTO_NULL is not set
  # CONFIG_CRYPTO_CRYPTD is not set
@@ -1257,7 +1314,7 @@ CONFIG_CRYPTO_SHA1=m
  #
  # Ciphers
  #
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
  # CONFIG_CRYPTO_ANUBIS is not set
  # CONFIG_CRYPTO_ARC4 is not set
  # CONFIG_CRYPTO_BLOWFISH is not set
@@ -1278,14 +1335,17 @@ CONFIG_CRYPTO_DES=m
  #
  CONFIG_CRYPTO_DEFLATE=y
  CONFIG_CRYPTO_LZO=y
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
  # CONFIG_CRYPTO_HW is not set
  
  #
  # Library routines
  #
  CONFIG_BITREVERSE=y
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=y
  CONFIG_CRC_T10DIF=m
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c

index 0c6e02f80a31ce6cd562aa2147d0144a3e89b913..066252eebf614e98ffb96c1c58705cbb9e35840b 100644 (file)
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -967,28 +967,28 @@ static inline void configure_usart0_pins(void)
  {
         u32 pin_mask = (1 << 8) | (1 << 9); /* RXD & TXD */
  
-       select_peripheral(PIOA, pin_mask, PERIPH_B, 0);
+       select_peripheral(PIOA, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP);
  }
  
  static inline void configure_usart1_pins(void)
  {
         u32 pin_mask = (1 << 17) | (1 << 18); /* RXD & TXD */
  
-       select_peripheral(PIOA, pin_mask, PERIPH_A, 0);
+       select_peripheral(PIOA, pin_mask, PERIPH_A, AT32_GPIOF_PULLUP);
  }
  
  static inline void configure_usart2_pins(void)
  {
         u32 pin_mask = (1 << 26) | (1 << 27); /* RXD & TXD */
  
-       select_peripheral(PIOB, pin_mask, PERIPH_B, 0);
+       select_peripheral(PIOB, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP);
  }
  
  static inline void configure_usart3_pins(void)
  {
         u32 pin_mask = (1 << 18) | (1 << 17); /* RXD & TXD */
  
-       select_peripheral(PIOB, pin_mask, PERIPH_B, 0);
+       select_peripheral(PIOB, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP);
  }
  
  static struct platform_device *__initdata at32_usarts[4];
diff --git a/arch/frv/kernel/sys_frv.c b/arch/frv/kernel/sys_frv.c

index 49b2cf2c38f3d313e9136dfdeaf84ef675b7b53f..baadc97f86278ff2060f64932d60977c80d04abc 100644 (file)
--- a/arch/frv/kernel/sys_frv.c
+++ b/arch/frv/kernel/sys_frv.c
@@ -35,22 +35,21 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
         int error = -EBADF;
         struct file * file = NULL;
  
-       flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-       if (!(flags & MAP_ANONYMOUS)) {
-               file = fget(fd);
-               if (!file)
-                       goto out;
-       }
-
         /* As with sparc32, make sure the shift for mmap2 is constant
            (12), no matter what PAGE_SIZE we have.... */
  
         /* But unlike sparc32, don't just silently break if we're
            trying to map something we can't */
-       if (pgoff & ((1<<(PAGE_SHIFT-12))-1))
+       if (pgoff & ((1 << (PAGE_SHIFT - 12)) - 1))
                 return -EINVAL;
+       pgoff >>= PAGE_SHIFT - 12;
  
-       pgoff >>= (PAGE_SHIFT - 12);
+       flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
+       if (!(flags & MAP_ANONYMOUS)) {
+               file = fget(fd);
+               if (!file)
+                       goto out;
+       }
  
         down_write(&current->mm->mmap_sem);
         error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig

index e05f9e1d3faaa7d0d1449d60766f4c7efb18f231..27eb67604c53bf2915dd725691a447dcd2f19903 100644 (file)
--- a/arch/ia64/configs/generic_defconfig
+++ b/arch/ia64/configs/generic_defconfig
@@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-rc1
-# Mon Aug  4 15:38:01 2008
+# Linux kernel version: 2.6.28-rc7
+# Mon Dec  8 08:12:07 2008
  #
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
@@ -26,6 +26,7 @@ CONFIG_LOG_BUF_SHIFT=20
  CONFIG_CGROUPS=y
  # CONFIG_CGROUP_DEBUG is not set
  # CONFIG_CGROUP_NS is not set
+# CONFIG_CGROUP_FREEZER is not set
  # CONFIG_CGROUP_DEVICE is not set
  CONFIG_CPUSETS=y
  # CONFIG_GROUP_SCHED is not set
@@ -46,7 +47,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
  CONFIG_SYSCTL=y
  # CONFIG_EMBEDDED is not set
  CONFIG_SYSCTL_SYSCALL=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
  CONFIG_KALLSYMS=y
  CONFIG_KALLSYMS_ALL=y
  # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -63,7 +63,9 @@ CONFIG_SIGNALFD=y
  CONFIG_TIMERFD=y
  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
+CONFIG_AIO=y
  CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
  CONFIG_SLUB_DEBUG=y
  # CONFIG_SLAB is not set
  CONFIG_SLUB=y
@@ -72,15 +74,11 @@ CONFIG_SLUB=y
  # CONFIG_MARKERS is not set
  CONFIG_HAVE_OPROFILE=y
  # CONFIG_KPROBES is not set
-# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
-# CONFIG_HAVE_IOREMAP_PROT is not set
  CONFIG_HAVE_KPROBES=y
  CONFIG_HAVE_KRETPROBES=y
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
+CONFIG_HAVE_ARCH_TRACEHOOK=y
  CONFIG_HAVE_DMA_ATTRS=y
  CONFIG_USE_GENERIC_SMP_HELPERS=y
-# CONFIG_HAVE_CLK is not set
-CONFIG_PROC_PAGE_MONITOR=y
  # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
  CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
@@ -113,6 +111,7 @@ CONFIG_DEFAULT_AS=y
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_CLASSIC_RCU=y
+# CONFIG_FREEZER is not set
  
  #
  # Processor type and features
@@ -125,8 +124,6 @@ CONFIG_MMU=y
  CONFIG_SWIOTLB=y
  CONFIG_IOMMU_HELPER=y
  CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
  CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
  CONFIG_GENERIC_FIND_NEXT_BIT=y
  CONFIG_GENERIC_CALIBRATE_DELAY=y
@@ -139,13 +136,16 @@ CONFIG_GENERIC_IOMAP=y
  CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
  CONFIG_IA64_UNCACHED_ALLOCATOR=y
  CONFIG_AUDIT_ARCH=y
+# CONFIG_PARAVIRT_GUEST is not set
  CONFIG_IA64_GENERIC=y
  # CONFIG_IA64_DIG is not set
+# CONFIG_IA64_DIG_VTD is not set
  # CONFIG_IA64_HP_ZX1 is not set
  # CONFIG_IA64_HP_ZX1_SWIOTLB is not set
  # CONFIG_IA64_SGI_SN2 is not set
  # CONFIG_IA64_SGI_UV is not set
  # CONFIG_IA64_HP_SIM is not set
+# CONFIG_IA64_XEN_GUEST is not set
  # CONFIG_ITANIUM is not set
  CONFIG_MCKINLEY=y
  # CONFIG_IA64_PAGE_SIZE_4KB is not set
@@ -182,16 +182,17 @@ CONFIG_DISCONTIGMEM_MANUAL=y
  CONFIG_DISCONTIGMEM=y
  CONFIG_FLAT_NODE_MEM_MAP=y
  CONFIG_NEED_MULTIPLE_NODES=y
-# CONFIG_SPARSEMEM_STATIC is not set
  CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  CONFIG_MIGRATION=y
  CONFIG_RESOURCES_64BIT=y
+CONFIG_PHYS_ADDR_T_64BIT=y
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_NR_QUICK=1
  CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
  CONFIG_MMU_NOTIFIER=y
  CONFIG_ARCH_SELECT_MEMORY_MODEL=y
  CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
@@ -231,12 +232,12 @@ CONFIG_EFI_VARS=y
  CONFIG_EFI_PCDP=y
  CONFIG_DMIID=y
  CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
  CONFIG_BINFMT_MISC=m
  
-# CONFIG_DMAR is not set
-
  #
-# Power management and ACPI
+# Power management and ACPI options
  #
  CONFIG_PM=y
  # CONFIG_PM_DEBUG is not set
@@ -248,7 +249,6 @@ CONFIG_ACPI_PROC_EVENT=y
  CONFIG_ACPI_BUTTON=m
  CONFIG_ACPI_FAN=m
  CONFIG_ACPI_DOCK=y
-# CONFIG_ACPI_BAY is not set
  CONFIG_ACPI_PROCESSOR=m
  CONFIG_ACPI_HOTPLUG_CPU=y
  CONFIG_ACPI_THERMAL=m
@@ -256,9 +256,7 @@ CONFIG_ACPI_NUMA=y
  # CONFIG_ACPI_CUSTOM_DSDT is not set
  CONFIG_ACPI_BLACKLIST_YEAR=0
  # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_EC=y
  # CONFIG_ACPI_PCI_SLOT is not set
-CONFIG_ACPI_POWER=y
  CONFIG_ACPI_SYSTEM=y
  CONFIG_ACPI_CONTAINER=m
  
@@ -275,7 +273,7 @@ CONFIG_PCI_DOMAINS=y
  CONFIG_PCI_SYSCALL=y
  # CONFIG_PCIEPORTBUS is not set
  CONFIG_ARCH_SUPPORTS_MSI=y
-# CONFIG_PCI_MSI is not set
+CONFIG_PCI_MSI=y
  CONFIG_PCI_LEGACY=y
  # CONFIG_PCI_DEBUG is not set
  CONFIG_HOTPLUG_PCI=m
@@ -286,6 +284,7 @@ CONFIG_HOTPLUG_PCI_ACPI=m
  # CONFIG_HOTPLUG_PCI_SHPC is not set
  # CONFIG_HOTPLUG_PCI_SGI is not set
  # CONFIG_PCCARD is not set
+CONFIG_DMAR=y
  CONFIG_NET=y
  
  #
@@ -333,6 +332,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
  # CONFIG_TIPC is not set
  # CONFIG_ATM is not set
  # CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
  # CONFIG_VLAN_8021Q is not set
  # CONFIG_DECNET is not set
  # CONFIG_LLC2 is not set
@@ -353,11 +353,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
  # CONFIG_AF_RXRPC is not set
-
-#
-# Wireless
-#
+# CONFIG_PHONET is not set
+CONFIG_WIRELESS=y
  # CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_OLD_REGULATORY=y
  # CONFIG_WIRELESS_EXT is not set
  # CONFIG_MAC80211 is not set
  # CONFIG_IEEE80211 is not set
@@ -385,7 +384,7 @@ CONFIG_PROC_EVENTS=y
  # CONFIG_MTD is not set
  # CONFIG_PARPORT is not set
  CONFIG_PNP=y
-# CONFIG_PNP_DEBUG is not set
+# CONFIG_PNP_DEBUG_MESSAGES is not set
  
  #
  # Protocols
@@ -419,10 +418,9 @@ CONFIG_SGI_XP=m
  # CONFIG_HP_ILO is not set
  CONFIG_SGI_GRU=m
  # CONFIG_SGI_GRU_DEBUG is not set
+# CONFIG_C2PORT is not set
  CONFIG_HAVE_IDE=y
  CONFIG_IDE=y
-CONFIG_IDE_MAX_HWIFS=4
-CONFIG_BLK_DEV_IDE=y
  
  #
  # Please see Documentation/ide/ide.txt for help/info on IDE drives
@@ -430,12 +428,12 @@ CONFIG_BLK_DEV_IDE=y
  CONFIG_IDE_TIMINGS=y
  CONFIG_IDE_ATAPI=y
  # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD=y
+CONFIG_IDE_GD_ATA=y
+# CONFIG_IDE_GD_ATAPI is not set
  CONFIG_BLK_DEV_IDECD=y
  CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
  # CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_IDEFLOPPY=y
  CONFIG_BLK_DEV_IDESCSI=m
  # CONFIG_BLK_DEV_IDEACPI is not set
  # CONFIG_IDE_TASK_IOCTL is not set
@@ -705,6 +703,9 @@ CONFIG_TULIP=m
  # CONFIG_IBM_NEW_EMAC_RGMII is not set
  # CONFIG_IBM_NEW_EMAC_TAH is not set
  # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  CONFIG_NET_PCI=y
  # CONFIG_PCNET32 is not set
  # CONFIG_AMD8111_ETH is not set
@@ -725,11 +726,11 @@ CONFIG_E100=m
  # CONFIG_TLAN is not set
  # CONFIG_VIA_RHINE is not set
  # CONFIG_SC92031 is not set
+# CONFIG_ATL2 is not set
  CONFIG_NETDEV_1000=y
  # CONFIG_ACENIC is not set
  # CONFIG_DL2K is not set
  CONFIG_E1000=y
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
  # CONFIG_E1000E is not set
  # CONFIG_IP1000 is not set
  CONFIG_IGB=y
@@ -747,18 +748,22 @@ CONFIG_TIGON3=y
  # CONFIG_QLA3XXX is not set
  # CONFIG_ATL1 is not set
  # CONFIG_ATL1E is not set
+# CONFIG_JME is not set
  CONFIG_NETDEV_10000=y
  # CONFIG_CHELSIO_T1 is not set
  # CONFIG_CHELSIO_T3 is not set
+# CONFIG_ENIC is not set
  # CONFIG_IXGBE is not set
  # CONFIG_IXGB is not set
  # CONFIG_S2IO is not set
  # CONFIG_MYRI10GE is not set
  # CONFIG_NETXEN_NIC is not set
  # CONFIG_NIU is not set
+# CONFIG_MLX4_EN is not set
  # CONFIG_MLX4_CORE is not set
  # CONFIG_TEHUTI is not set
  # CONFIG_BNX2X is not set
+# CONFIG_QLGE is not set
  # CONFIG_SFC is not set
  # CONFIG_TR is not set
  
@@ -826,9 +831,11 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
  CONFIG_MOUSE_PS2_SYNAPTICS=y
  CONFIG_MOUSE_PS2_LIFEBOOK=y
  CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
  # CONFIG_MOUSE_PS2_TOUCHKIT is not set
  # CONFIG_MOUSE_SERIAL is not set
  # CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
  # CONFIG_MOUSE_VSXXXAA is not set
  # CONFIG_INPUT_JOYSTICK is not set
  # CONFIG_INPUT_TABLET is not set
@@ -942,15 +949,16 @@ CONFIG_HWMON=y
  # CONFIG_SENSORS_VT8231 is not set
  # CONFIG_SENSORS_W83627HF is not set
  # CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
  # CONFIG_HWMON_DEBUG_CHIP is not set
  CONFIG_THERMAL=m
  # CONFIG_THERMAL_HWMON is not set
  # CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
  
  #
  # Sonics Silicon Backplane
  #
-CONFIG_SSB_POSSIBLE=y
  # CONFIG_SSB is not set
  
  #
@@ -959,6 +967,8 @@ CONFIG_SSB_POSSIBLE=y
  # CONFIG_MFD_CORE is not set
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
@@ -1009,6 +1019,7 @@ CONFIG_VGA_CONSOLE=y
  # CONFIG_VGACON_SOFT_SCROLLBACK is not set
  CONFIG_DUMMY_CONSOLE=y
  CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
  CONFIG_SND=m
  CONFIG_SND_TIMER=m
  CONFIG_SND_PCM=m
@@ -1113,8 +1124,7 @@ CONFIG_HID=y
  # USB Input Devices
  #
  CONFIG_USB_HID=m
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-# CONFIG_HID_FF is not set
+# CONFIG_HID_PID is not set
  # CONFIG_USB_HIDDEV is not set
  
  #
@@ -1122,6 +1132,34 @@ CONFIG_USB_HID=m
  #
  # CONFIG_USB_KBD is not set
  # CONFIG_USB_MOUSE is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_COMPAT=y
+CONFIG_HID_A4TECH=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BRIGHT=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DELL=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_LOGITECH=m
+# CONFIG_LOGITECH_FF is not set
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_PANTHERLORD=m
+# CONFIG_PANTHERLORD_FF is not set
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_SUNPLUS=m
+# CONFIG_THRUSTMASTER_FF is not set
+# CONFIG_ZEROPLUS_FF is not set
  CONFIG_USB_SUPPORT=y
  CONFIG_USB_ARCH_HAS_HCD=y
  CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1138,6 +1176,9 @@ CONFIG_USB_DEVICE_CLASS=y
  # CONFIG_USB_DYNAMIC_MINORS is not set
  # CONFIG_USB_SUSPEND is not set
  # CONFIG_USB_OTG is not set
+CONFIG_USB_MON=y
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
  
  #
  # USB Host Controller Drivers
@@ -1155,6 +1196,12 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
  CONFIG_USB_UHCI_HCD=m
  # CONFIG_USB_SL811_HCD is not set
  # CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_WHCI_HCD is not set
+# CONFIG_USB_HWA_HCD is not set
+
+#
+# Enable Host or Gadget support to see Inventra options
+#
  
  #
  # USB Device Class drivers
@@ -1162,13 +1209,14 @@ CONFIG_USB_UHCI_HCD=m
  # CONFIG_USB_ACM is not set
  # CONFIG_USB_PRINTER is not set
  # CONFIG_USB_WDM is not set
+# CONFIG_USB_TMC is not set
  
  #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
  #
  
  #
-# may also be needed; see USB_STORAGE Help for more information
+# see USB_STORAGE Help for more information
  #
  CONFIG_USB_STORAGE=m
  # CONFIG_USB_STORAGE_DEBUG is not set
@@ -1191,7 +1239,6 @@ CONFIG_USB_STORAGE=m
  #
  # CONFIG_USB_MDC800 is not set
  # CONFIG_USB_MICROTEK is not set
-CONFIG_USB_MON=y
  
  #
  # USB port drivers
@@ -1204,7 +1251,7 @@ CONFIG_USB_MON=y
  # CONFIG_USB_EMI62 is not set
  # CONFIG_USB_EMI26 is not set
  # CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_SEVSEG is not set
  # CONFIG_USB_RIO500 is not set
  # CONFIG_USB_LEGOTOWER is not set
  # CONFIG_USB_LCD is not set
@@ -1222,7 +1269,9 @@ CONFIG_USB_MON=y
  # CONFIG_USB_IOWARRIOR is not set
  # CONFIG_USB_TEST is not set
  # CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_VST is not set
  # CONFIG_USB_GADGET is not set
+# CONFIG_UWB is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
  # CONFIG_NEW_LEDS is not set
@@ -1246,6 +1295,15 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y
  # CONFIG_RTC_CLASS is not set
  # CONFIG_DMADEVICES is not set
  # CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+CONFIG_STAGING_EXCLUDE_BUILD=y
+
+#
+# HP Simulator drivers
+#
+# CONFIG_HP_SIMETH is not set
+# CONFIG_HP_SIMSERIAL is not set
+# CONFIG_HP_SIMSCSI is not set
  CONFIG_MSPEC=m
  
  #
@@ -1260,7 +1318,7 @@ CONFIG_EXT3_FS=y
  CONFIG_EXT3_FS_XATTR=y
  CONFIG_EXT3_FS_POSIX_ACL=y
  CONFIG_EXT3_FS_SECURITY=y
-# CONFIG_EXT4DEV_FS is not set
+# CONFIG_EXT4_FS is not set
  CONFIG_JBD=y
  CONFIG_FS_MBCACHE=y
  CONFIG_REISERFS_FS=y
@@ -1271,6 +1329,7 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
  CONFIG_REISERFS_FS_SECURITY=y
  # CONFIG_JFS_FS is not set
  CONFIG_FS_POSIX_ACL=y
+CONFIG_FILE_LOCKING=y
  CONFIG_XFS_FS=y
  # CONFIG_XFS_QUOTA is not set
  # CONFIG_XFS_POSIX_ACL is not set
@@ -1282,8 +1341,8 @@ CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
  # CONFIG_QUOTA is not set
-CONFIG_AUTOFS_FS=y
-CONFIG_AUTOFS4_FS=y
+CONFIG_AUTOFS_FS=m
+CONFIG_AUTOFS4_FS=m
  # CONFIG_FUSE_FS is not set
  
  #
@@ -1314,6 +1373,7 @@ CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
  CONFIG_PROC_VMCORE=y
  CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
  # CONFIG_TMPFS_POSIX_ACL is not set
@@ -1356,6 +1416,7 @@ CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=m
  CONFIG_SUNRPC_GSS=m
  CONFIG_SUNRPC_XPRT_RDMA=m
+# CONFIG_SUNRPC_REGISTER_V4 is not set
  CONFIG_RPCSEC_GSS_KRB5=m
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  CONFIG_SMB_FS=m
@@ -1433,38 +1494,6 @@ CONFIG_NLS_KOI8_R=m
  CONFIG_NLS_KOI8_U=m
  CONFIG_NLS_UTF8=m
  # CONFIG_DLM is not set
-CONFIG_HAVE_KVM=y
-CONFIG_VIRTUALIZATION=y
-# CONFIG_KVM is not set
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_PLIST=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_IRQ_PER_CPU=y
-
-#
-# HP Simulator drivers
-#
-# CONFIG_HP_SIMETH is not set
-# CONFIG_HP_SIMSERIAL is not set
-# CONFIG_HP_SIMSCSI is not set
  
  #
  # Kernel hacking
@@ -1503,8 +1532,19 @@ CONFIG_DEBUG_MEMORY_INIT=y
  # CONFIG_DEBUG_SG is not set
  # CONFIG_BOOT_PRINTK_DELAY is not set
  # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
  # CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
  # CONFIG_FAULT_INJECTION is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+
+#
+# Tracers
+#
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_BOOT_TRACER is not set
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  CONFIG_IA64_GRANULE_16MB=y
  # CONFIG_IA64_GRANULE_64MB is not set
@@ -1519,14 +1559,19 @@ CONFIG_SYSVIPC_COMPAT=y
  #
  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
  CONFIG_CRYPTO=y
  
  #
  # Crypto core or helper
  #
+# CONFIG_CRYPTO_FIPS is not set
  CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_AEAD=m
  CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_RNG=m
  CONFIG_CRYPTO_MANAGER=m
  # CONFIG_CRYPTO_GF128MUL is not set
  # CONFIG_CRYPTO_NULL is not set
@@ -1599,5 +1644,36 @@ CONFIG_CRYPTO_DES=m
  #
  # CONFIG_CRYPTO_DEFLATE is not set
  # CONFIG_CRYPTO_LZO is not set
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
  CONFIG_CRYPTO_HW=y
  # CONFIG_CRYPTO_DEV_HIFN_795X is not set
+CONFIG_HAVE_KVM=y
+CONFIG_VIRTUALIZATION=y
+# CONFIG_KVM is not set
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTIO_BALLOON is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_IRQ_PER_CPU=y
diff --git a/arch/ia64/hp/sim/Kconfig b/arch/ia64/hp/sim/Kconfig

index f92306bbedb848eb146ece3afde7729abdddac13..8d513a8c5266b4db31ef1cb6fd6eb75777c7dda3 100644 (file)
--- a/arch/ia64/hp/sim/Kconfig
+++ b/arch/ia64/hp/sim/Kconfig
@@ -4,6 +4,7 @@ menu "HP Simulator drivers"
  
  config HP_SIMETH
         bool "Simulated Ethernet "
+       depends on NET
  
  config HP_SIMSERIAL
         bool "Simulated serial driver support"
diff --git a/arch/ia64/include/asm/paravirt_privop.h b/arch/ia64/include/asm/paravirt_privop.h

index 0b597424fcfcfd825e8f72bde2d3290fd218e75f..33c8e55f5775f7e12330ffe8e37e61568f937f00 100644 (file)
--- a/arch/ia64/include/asm/paravirt_privop.h
+++ b/arch/ia64/include/asm/paravirt_privop.h
@@ -83,7 +83,6 @@ extern unsigned long ia64_native_getreg_func(int regnum);
  #define paravirt_getreg(reg)                                   \
         ({                                                      \
                 unsigned long res;                              \
-               BUILD_BUG_ON(!__builtin_constant_p(reg));       \
                 if ((reg) == _IA64_REG_IP)                      \
                         res = ia64_native_getreg(_IA64_REG_IP); \
                 else                                            \
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c

index 26228e2d01ae472bcab1e5917b0c973d826f6f3a..c75b914f2d6bb587c413990663e864f573c9368a 100644 (file)
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -53,10 +53,12 @@ int __ref arch_register_cpu(int num)
  }
  EXPORT_SYMBOL(arch_register_cpu);
  
-void arch_unregister_cpu(int num)
+void __ref arch_unregister_cpu(int num)
  {
         unregister_cpu(&sysfs_cpus[num].cpu);
+#ifdef CONFIG_ACPI
         unmap_cpu_from_node(num, cpu_to_node(num));
+#endif
  }
  EXPORT_SYMBOL(arch_unregister_cpu);
  #else
diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile

index 3ab4d6d507045379fc139836e2091560e4483a5a..92cef66ca268b8631db5b3b72b9887cb8f7dc446 100644 (file)
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -58,7 +58,7 @@ endif
  kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o
  obj-$(CONFIG_KVM) += kvm.o
  
-EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127
+CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127
  kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \
         vtlb.o process.o
  #Add link memcpy and memset to avoid possible structure assignment error
diff --git a/arch/ia64/kvm/optvfault.S b/arch/ia64/kvm/optvfault.S

index 634abad979b5143953e6eae5191eff3b4a673bc1..32254ce9a1bda61a25f3edce6143206a7d651aa1 100644 (file)
--- a/arch/ia64/kvm/optvfault.S
+++ b/arch/ia64/kvm/optvfault.S
@@ -107,10 +107,10 @@ END(kvm_vps_resume_normal)
  GLOBAL_ENTRY(kvm_vps_resume_handler)
         movl r30 = PAL_VPS_RESUME_HANDLER
         ;;
-       ld8 r27=[r25]
+       ld8 r26=[r25]
         shr r17=r17,IA64_ISR_IR_BIT
         ;;
-       dep r27=r17,r27,63,1   // bit 63 of r27 indicate whether enable CFLE
+       dep r26=r17,r26,63,1   // bit 63 of r26 indicate whether enable CFLE
         mov pr=r23,-2
         br.sptk.many kvm_vps_entry
  END(kvm_vps_resume_handler)
@@ -894,12 +894,15 @@ ENTRY(kvm_resume_to_guest)
         ;;
         ld8 r19=[r19]
         mov b0=r29
-       cmp.ne p6,p7 = r0,r0
+       mov r27=cr.isr
         ;;
-       tbit.z p6,p7 = r19,IA64_PSR_IC_BIT              // p1=vpsr.ic
+       tbit.z p6,p7 = r19,IA64_PSR_IC_BIT              // p7=vpsr.ic
+       shr r27=r27,IA64_ISR_IR_BIT
         ;;
         (p6) ld8 r26=[r25]
         (p7) mov b0=r28
+       ;;
+       (p6) dep r26=r27,r26,63,1
         mov pr=r31,-2
         br.sptk.many b0             // call pal service
         ;;
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c

index 96c31b4180c349b00b400c73daf670227f957051..0c66dbdd1d728d0cd826b865a0d0ffe0cdd8b2cc 100644 (file)
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -5,7 +5,7 @@
   * License.  See the file "COPYING" in the main directory of this archive
   * for more details.
   *
- * Copyright (c) 2000-2007 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2008 Silicon Graphics, Inc.  All Rights Reserved.
   */
  
  #include <linux/irq.h>
@@ -375,6 +375,7 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info)
         int cpu = nasid_slice_to_cpuid(nasid, slice);
  #ifdef CONFIG_SMP
         int cpuphys;
+       irq_desc_t *desc;
  #endif
  
         pci_dev_get(pci_dev);
@@ -391,6 +392,12 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info)
  #ifdef CONFIG_SMP
         cpuphys = cpu_physical_id(cpu);
         set_irq_affinity_info(sn_irq_info->irq_irq, cpuphys, 0);
+       desc = irq_to_desc(sn_irq_info->irq_irq);
+       /*
+        * Affinity was set by the PROM, prevent it from
+        * being reset by the request_irq() path.
+        */
+       desc->status |= IRQ_AFFINITY_SET;
  #endif
  }
  
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c

index bb1d249296408d3def799a759ee48e5b0b415378..02c5b8a9fb6061037e8c35551a4881198cf1d4fc 100644 (file)
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -200,7 +200,7 @@ static int __cpuinitdata shub_1_1_found;
   * Set flag for enabling shub specific wars
   */
  
-static inline int __init is_shub_1_1(int nasid)
+static inline int __cpuinit is_shub_1_1(int nasid)
  {
         unsigned long id;
         int rev;
@@ -212,7 +212,7 @@ static inline int __init is_shub_1_1(int nasid)
         return rev <= 2;
  }
  
-static void __init sn_check_for_wars(void)
+static void __cpuinit sn_check_for_wars(void)
  {
         int cnode;
  
@@ -512,7 +512,6 @@ static void __init sn_init_pdas(char **cmdline_p)
         for_each_online_node(cnode) {
                 nodepdaindr[cnode] =
                     alloc_bootmem_node(NODE_DATA(cnode), sizeof(nodepda_t));
-               memset(nodepdaindr[cnode], 0, sizeof(nodepda_t));
                 memset(nodepdaindr[cnode]->phys_cpuid, -1,
                     sizeof(nodepdaindr[cnode]->phys_cpuid));
                 spin_lock_init(&nodepdaindr[cnode]->ptc_lock);
@@ -521,11 +520,9 @@ static void __init sn_init_pdas(char **cmdline_p)
         /*
          * Allocate & initialize nodepda for TIOs.  For now, put them on node 0.
          */
-       for (cnode = num_online_nodes(); cnode < num_cnodes; cnode++) {
+       for (cnode = num_online_nodes(); cnode < num_cnodes; cnode++)
                 nodepdaindr[cnode] =
                     alloc_bootmem_node(NODE_DATA(0), sizeof(nodepda_t));
-               memset(nodepdaindr[cnode], 0, sizeof(nodepda_t));
-       }
  
         /*
          * Now copy the array of nodepda pointers to each nodepda.
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig

index 8bd61a640fc9dde53b4e92f5e9efe53fbd6d5507..23597beb66c118cc6e569952b605a2e6af3f7825 100644 (file)
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-rc6
-# Wed Sep 10 09:02:00 2008
+# Linux kernel version: 2.6.28-rc7
+# Tue Dec  2 20:27:42 2008
  #
  CONFIG_M68K=y
  CONFIG_MMU=y
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y
  CONFIG_GENERIC_IOMAP=y
  CONFIG_NO_IOPORT=y
  # CONFIG_NO_DMA is not set
-CONFIG_ARCH_SUPPORTS_AOUT=y
  CONFIG_HZ=100
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y
  CONFIG_TIMERFD=y
  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
+CONFIG_AIO=y
  CONFIG_VM_EVENT_COUNTERS=y
  CONFIG_SLAB=y
  # CONFIG_SLUB is not set
  # CONFIG_SLOB is not set
  # CONFIG_PROFILING is not set
  # CONFIG_MARKERS is not set
-# CONFIG_HAVE_OPROFILE is not set
-# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
-# CONFIG_HAVE_IOREMAP_PROT is not set
-# CONFIG_HAVE_KPROBES is not set
-# CONFIG_HAVE_KRETPROBES is not set
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
-# CONFIG_HAVE_DMA_ATTRS is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_HAVE_CLK is not set
-CONFIG_PROC_PAGE_MONITOR=y
  # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
  CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_CLASSIC_RCU=y
+# CONFIG_FREEZER is not set
  
  #
  # Platform dependent setup
  #
-# CONFIG_SUN3 is not set
  CONFIG_AMIGA=y
  # CONFIG_ATARI is not set
  # CONFIG_MAC is not set
@@ -148,19 +138,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y
  CONFIG_DISCONTIGMEM=y
  CONFIG_FLAT_NODE_MEM_MAP=y
  CONFIG_NEED_MULTIPLE_NODES=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  # CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
  
  #
  # General setup
  #
  CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
  CONFIG_BINFMT_AOUT=m
  CONFIG_BINFMT_MISC=m
  CONFIG_ZORRO=y
@@ -212,7 +204,6 @@ CONFIG_INET_TCP_DIAG=m
  CONFIG_TCP_CONG_CUBIC=y
  CONFIG_DEFAULT_TCP_CONG="cubic"
  # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
  CONFIG_IPV6=m
  CONFIG_IPV6_PRIVACY=y
  CONFIG_IPV6_ROUTER_PREF=y
@@ -262,13 +253,14 @@ CONFIG_NF_CONNTRACK_SANE=m
  CONFIG_NF_CONNTRACK_SIP=m
  CONFIG_NF_CONNTRACK_TFTP=m
  # CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NETFILTER_TPROXY is not set
  CONFIG_NETFILTER_XTABLES=m
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
  CONFIG_NETFILTER_XT_TARGET_DSCP=m
  CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
  CONFIG_NETFILTER_XT_TARGET_RATEEST=m
  CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -282,19 +274,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
  CONFIG_NETFILTER_XT_MATCH_DCCP=m
  CONFIG_NETFILTER_XT_MATCH_DSCP=m
  CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
  CONFIG_NETFILTER_XT_MATCH_HELPER=m
  CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
  CONFIG_NETFILTER_XT_MATCH_LENGTH=m
  CONFIG_NETFILTER_XT_MATCH_LIMIT=m
  CONFIG_NETFILTER_XT_MATCH_MAC=m
  CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_OWNER=m
  CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
  CONFIG_NETFILTER_XT_MATCH_QUOTA=m
  CONFIG_NETFILTER_XT_MATCH_RATEEST=m
  CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
  CONFIG_NETFILTER_XT_MATCH_SCTP=m
  CONFIG_NETFILTER_XT_MATCH_STATE=m
  CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -302,20 +297,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
  CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
  CONFIG_NETFILTER_XT_MATCH_TIME=m
  CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+# CONFIG_IP_VS is not set
  
  #
  # IP: Netfilter Configuration
  #
+CONFIG_NF_DEFRAG_IPV4=m
  CONFIG_NF_CONNTRACK_IPV4=m
  CONFIG_NF_CONNTRACK_PROC_COMPAT=y
  CONFIG_IP_NF_QUEUE=m
  CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
  CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_FILTER=m
  CONFIG_IP_NF_TARGET_REJECT=m
  CONFIG_IP_NF_TARGET_LOG=m
@@ -323,8 +318,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
  CONFIG_NF_NAT=m
  CONFIG_NF_NAT_NEEDED=y
  CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_NF_NAT_SNMP_BASIC=m
  CONFIG_NF_NAT_PROTO_GRE=m
  CONFIG_NF_NAT_PROTO_UDPLITE=m
@@ -337,9 +332,9 @@ CONFIG_NF_NAT_PPTP=m
  CONFIG_NF_NAT_H323=m
  CONFIG_NF_NAT_SIP=m
  CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_TARGET_ECN=m
  CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_RAW=m
  CONFIG_IP_NF_ARPTABLES=m
  CONFIG_IP_NF_ARPFILTER=m
@@ -351,16 +346,16 @@ CONFIG_IP_NF_ARP_MANGLE=m
  CONFIG_NF_CONNTRACK_IPV6=m
  CONFIG_IP6_NF_QUEUE=m
  CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
  CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
  CONFIG_IP6_NF_MATCH_HL=m
  CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AH=m
  CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
  CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
  CONFIG_IP6_NF_TARGET_REJECT=m
  CONFIG_IP6_NF_MANGLE=m
  CONFIG_IP6_NF_TARGET_HL=m
@@ -387,6 +382,7 @@ CONFIG_SCTP_HMAC_MD5=y
  # CONFIG_TIPC is not set
  # CONFIG_ATM is not set
  # CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
  # CONFIG_VLAN_8021Q is not set
  # CONFIG_DECNET is not set
  CONFIG_LLC=m
@@ -410,19 +406,8 @@ CONFIG_NET_CLS_ROUTE=y
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
  # CONFIG_AF_RXRPC is not set
-
-#
-# Wireless
-#
-# CONFIG_CFG80211 is not set
-CONFIG_WIRELESS_EXT=y
-# CONFIG_WIRELESS_EXT_SYSFS is not set
-# CONFIG_MAC80211 is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_PHONET is not set
+# CONFIG_WIRELESS is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
  
@@ -470,21 +455,20 @@ CONFIG_ATA_OVER_ETH=m
  CONFIG_MISC_DEVICES=y
  # CONFIG_EEPROM_93CX6 is not set
  # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_C2PORT is not set
  CONFIG_HAVE_IDE=y
  CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
  
  #
  # Please see Documentation/ide/ide.txt for help/info on IDE drives
  #
-CONFIG_IDE_ATAPI=y
  # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD=y
+CONFIG_IDE_GD_ATA=y
+# CONFIG_IDE_GD_ATAPI is not set
  CONFIG_BLK_DEV_IDECD=y
  CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
  # CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_IDEFLOPPY=m
  # CONFIG_BLK_DEV_IDESCSI is not set
  # CONFIG_IDE_TASK_IOCTL is not set
  CONFIG_IDE_PROC_FS=y
@@ -609,8 +593,12 @@ CONFIG_APNE=m
  # CONFIG_IBM_NEW_EMAC_RGMII is not set
  # CONFIG_IBM_NEW_EMAC_TAH is not set
  # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  # CONFIG_NET_PCI is not set
  # CONFIG_B44 is not set
+# CONFIG_CS89x0 is not set
  # CONFIG_NET_POCKET is not set
  # CONFIG_NETDEV_1000 is not set
  # CONFIG_NETDEV_10000 is not set
@@ -763,11 +751,11 @@ CONFIG_GEN_RTC_X=y
  # CONFIG_THERMAL is not set
  # CONFIG_THERMAL_HWMON is not set
  # CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
  
  #
  # Sonics Silicon Backplane
  #
-CONFIG_SSB_POSSIBLE=y
  # CONFIG_SSB is not set
  
  #
@@ -777,6 +765,7 @@ CONFIG_SSB_POSSIBLE=y
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
  # CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
@@ -802,6 +791,7 @@ CONFIG_SSB_POSSIBLE=y
  CONFIG_FB=y
  # CONFIG_FIRMWARE_EDID is not set
  # CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
  CONFIG_FB_CFB_FILLRECT=y
  CONFIG_FB_CFB_COPYAREA=y
  CONFIG_FB_CFB_IMAGEBLIT=y
@@ -829,6 +819,8 @@ CONFIG_FB_FM2=y
  # CONFIG_FB_UVESA is not set
  # CONFIG_FB_S1D13XXX is not set
  # CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
  # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
  
  #
@@ -852,12 +844,19 @@ CONFIG_LOGO_LINUX_MONO=y
  CONFIG_LOGO_LINUX_VGA16=y
  CONFIG_LOGO_LINUX_CLUT224=y
  CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
  CONFIG_DMASOUND_PAULA=m
  CONFIG_DMASOUND=m
  CONFIG_HID_SUPPORT=y
  CONFIG_HID=m
  # CONFIG_HID_DEBUG is not set
  CONFIG_HIDRAW=y
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_COMPAT=y
  # CONFIG_USB_SUPPORT is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
@@ -867,6 +866,8 @@ CONFIG_HIDRAW=y
  # CONFIG_DMADEVICES is not set
  # CONFIG_AUXDISPLAY is not set
  # CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # Character devices
@@ -883,8 +884,9 @@ CONFIG_EXT2_FS=y
  # CONFIG_EXT2_FS_XIP is not set
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
+# CONFIG_EXT4_FS is not set
  CONFIG_JBD=y
+CONFIG_JBD2=m
  CONFIG_REISERFS_FS=m
  # CONFIG_REISERFS_CHECK is not set
  # CONFIG_REISERFS_PROC_INFO is not set
@@ -895,6 +897,7 @@ CONFIG_JFS_FS=m
  # CONFIG_JFS_DEBUG is not set
  # CONFIG_JFS_STATISTICS is not set
  # CONFIG_FS_POSIX_ACL is not set
+CONFIG_FILE_LOCKING=y
  CONFIG_XFS_FS=m
  # CONFIG_XFS_QUOTA is not set
  # CONFIG_XFS_POSIX_ACL is not set
@@ -906,6 +909,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
  # CONFIG_OCFS2_FS_STATS is not set
  # CONFIG_OCFS2_DEBUG_MASKLOG is not set
  # CONFIG_OCFS2_DEBUG_FS is not set
+# CONFIG_OCFS2_COMPAT_JBD is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
@@ -944,6 +948,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
  CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
  CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
  # CONFIG_TMPFS_POSIX_ACL is not set
@@ -986,6 +991,7 @@ CONFIG_EXPORTFS=m
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=m
  CONFIG_SUNRPC_GSS=m
+# CONFIG_SUNRPC_REGISTER_V4 is not set
  CONFIG_RPCSEC_GSS_KRB5=m
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  CONFIG_SMB_FS=m
@@ -1059,7 +1065,13 @@ CONFIG_MAGIC_SYSRQ=y
  # CONFIG_DEBUG_KERNEL is not set
  CONFIG_DEBUG_BUGVERBOSE=y
  CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
  CONFIG_SYSCTL_SYSCALL_CHECK=y
+
+#
+# Tracers
+#
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  
  #
@@ -1067,6 +1079,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
  #
  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
@@ -1077,10 +1090,12 @@ CONFIG_CRYPTO=y
  #
  # Crypto core or helper
  #
+# CONFIG_CRYPTO_FIPS is not set
  CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_BLKCIPHER=y
  CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_RNG=y
  CONFIG_CRYPTO_MANAGER=y
  CONFIG_CRYPTO_GF128MUL=m
  CONFIG_CRYPTO_NULL=m
@@ -1154,14 +1169,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
  #
  CONFIG_CRYPTO_DEFLATE=m
  CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
  # CONFIG_CRYPTO_HW is not set
  
  #
  # Library routines
  #
  CONFIG_BITREVERSE=y
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=m
  CONFIG_CRC_T10DIF=y
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig

index c41b854c028425fda2c4ffda83f892c78038de98..935108d115a05d96210f3e6663426ccc25798034 100644 (file)
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-rc6
-# Wed Sep 10 09:02:01 2008
+# Linux kernel version: 2.6.28-rc7
+# Tue Dec  2 20:27:43 2008
  #
  CONFIG_M68K=y
  CONFIG_MMU=y
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y
  CONFIG_GENERIC_IOMAP=y
  CONFIG_NO_IOPORT=y
  # CONFIG_NO_DMA is not set
-CONFIG_ARCH_SUPPORTS_AOUT=y
  CONFIG_HZ=100
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y
  CONFIG_TIMERFD=y
  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
+CONFIG_AIO=y
  CONFIG_VM_EVENT_COUNTERS=y
  CONFIG_SLAB=y
  # CONFIG_SLUB is not set
  # CONFIG_SLOB is not set
  # CONFIG_PROFILING is not set
  # CONFIG_MARKERS is not set
-# CONFIG_HAVE_OPROFILE is not set
-# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
-# CONFIG_HAVE_IOREMAP_PROT is not set
-# CONFIG_HAVE_KPROBES is not set
-# CONFIG_HAVE_KRETPROBES is not set
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
-# CONFIG_HAVE_DMA_ATTRS is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_HAVE_CLK is not set
-CONFIG_PROC_PAGE_MONITOR=y
  # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
  CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_CLASSIC_RCU=y
+# CONFIG_FREEZER is not set
  
  #
  # Platform dependent setup
  #
-# CONFIG_SUN3 is not set
  # CONFIG_AMIGA is not set
  # CONFIG_ATARI is not set
  # CONFIG_MAC is not set
@@ -148,19 +138,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y
  CONFIG_DISCONTIGMEM=y
  CONFIG_FLAT_NODE_MEM_MAP=y
  CONFIG_NEED_MULTIPLE_NODES=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  # CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
  
  #
  # General setup
  #
  CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
  CONFIG_BINFMT_AOUT=m
  CONFIG_BINFMT_MISC=m
  CONFIG_HEARTBEAT=y
@@ -210,7 +202,6 @@ CONFIG_INET_TCP_DIAG=m
  CONFIG_TCP_CONG_CUBIC=y
  CONFIG_DEFAULT_TCP_CONG="cubic"
  # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
  CONFIG_IPV6=m
  CONFIG_IPV6_PRIVACY=y
  CONFIG_IPV6_ROUTER_PREF=y
@@ -260,13 +251,14 @@ CONFIG_NF_CONNTRACK_SANE=m
  CONFIG_NF_CONNTRACK_SIP=m
  CONFIG_NF_CONNTRACK_TFTP=m
  # CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NETFILTER_TPROXY is not set
  CONFIG_NETFILTER_XTABLES=m
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
  CONFIG_NETFILTER_XT_TARGET_DSCP=m
  CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
  CONFIG_NETFILTER_XT_TARGET_RATEEST=m
  CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -280,19 +272,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
  CONFIG_NETFILTER_XT_MATCH_DCCP=m
  CONFIG_NETFILTER_XT_MATCH_DSCP=m
  CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
  CONFIG_NETFILTER_XT_MATCH_HELPER=m
  CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
  CONFIG_NETFILTER_XT_MATCH_LENGTH=m
  CONFIG_NETFILTER_XT_MATCH_LIMIT=m
  CONFIG_NETFILTER_XT_MATCH_MAC=m
  CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_OWNER=m
  CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
  CONFIG_NETFILTER_XT_MATCH_QUOTA=m
  CONFIG_NETFILTER_XT_MATCH_RATEEST=m
  CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
  CONFIG_NETFILTER_XT_MATCH_SCTP=m
  CONFIG_NETFILTER_XT_MATCH_STATE=m
  CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -300,20 +295,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
  CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
  CONFIG_NETFILTER_XT_MATCH_TIME=m
  CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+# CONFIG_IP_VS is not set
  
  #
  # IP: Netfilter Configuration
  #
+CONFIG_NF_DEFRAG_IPV4=m
  CONFIG_NF_CONNTRACK_IPV4=m
  CONFIG_NF_CONNTRACK_PROC_COMPAT=y
  CONFIG_IP_NF_QUEUE=m
  CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
  CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_FILTER=m
  CONFIG_IP_NF_TARGET_REJECT=m
  CONFIG_IP_NF_TARGET_LOG=m
@@ -321,8 +316,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
  CONFIG_NF_NAT=m
  CONFIG_NF_NAT_NEEDED=y
  CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_NF_NAT_SNMP_BASIC=m
  CONFIG_NF_NAT_PROTO_GRE=m
  CONFIG_NF_NAT_PROTO_UDPLITE=m
@@ -335,9 +330,9 @@ CONFIG_NF_NAT_PPTP=m
  CONFIG_NF_NAT_H323=m
  CONFIG_NF_NAT_SIP=m
  CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_TARGET_ECN=m
  CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_RAW=m
  CONFIG_IP_NF_ARPTABLES=m
  CONFIG_IP_NF_ARPFILTER=m
@@ -349,16 +344,16 @@ CONFIG_IP_NF_ARP_MANGLE=m
  CONFIG_NF_CONNTRACK_IPV6=m
  CONFIG_IP6_NF_QUEUE=m
  CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
  CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
  CONFIG_IP6_NF_MATCH_HL=m
  CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AH=m
  CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
  CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
  CONFIG_IP6_NF_TARGET_REJECT=m
  CONFIG_IP6_NF_MANGLE=m
  CONFIG_IP6_NF_TARGET_HL=m
@@ -385,6 +380,7 @@ CONFIG_SCTP_HMAC_MD5=y
  # CONFIG_TIPC is not set
  # CONFIG_ATM is not set
  # CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
  # CONFIG_VLAN_8021Q is not set
  # CONFIG_DECNET is not set
  CONFIG_LLC=m
@@ -408,19 +404,8 @@ CONFIG_NET_CLS_ROUTE=y
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
  # CONFIG_AF_RXRPC is not set
-
-#
-# Wireless
-#
-# CONFIG_CFG80211 is not set
-CONFIG_WIRELESS_EXT=y
-# CONFIG_WIRELESS_EXT_SYSFS is not set
-# CONFIG_MAC80211 is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_PHONET is not set
+# CONFIG_WIRELESS is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
  
@@ -458,6 +443,7 @@ CONFIG_ATA_OVER_ETH=m
  CONFIG_MISC_DEVICES=y
  # CONFIG_EEPROM_93CX6 is not set
  # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_C2PORT is not set
  CONFIG_HAVE_IDE=y
  # CONFIG_IDE is not set
  
@@ -540,6 +526,9 @@ CONFIG_NET_ETHERNET=y
  # CONFIG_IBM_NEW_EMAC_RGMII is not set
  # CONFIG_IBM_NEW_EMAC_TAH is not set
  # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  # CONFIG_B44 is not set
  # CONFIG_NETDEV_1000 is not set
  # CONFIG_NETDEV_10000 is not set
@@ -609,6 +598,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
  CONFIG_MOUSE_PS2_SYNAPTICS=y
  CONFIG_MOUSE_PS2_LIFEBOOK=y
  CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
  # CONFIG_MOUSE_PS2_TOUCHKIT is not set
  CONFIG_MOUSE_SERIAL=m
  # CONFIG_MOUSE_VSXXXAA is not set
@@ -663,11 +653,11 @@ CONFIG_GEN_RTC_X=y
  # CONFIG_THERMAL is not set
  # CONFIG_THERMAL_HWMON is not set
  # CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
  
  #
  # Sonics Silicon Backplane
  #
-CONFIG_SSB_POSSIBLE=y
  # CONFIG_SSB is not set
  
  #
@@ -677,6 +667,7 @@ CONFIG_SSB_POSSIBLE=y
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
  # CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
@@ -702,6 +693,7 @@ CONFIG_SSB_POSSIBLE=y
  CONFIG_FB=y
  # CONFIG_FIRMWARE_EDID is not set
  # CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
  CONFIG_FB_CFB_FILLRECT=y
  # CONFIG_FB_CFB_COPYAREA is not set
  CONFIG_FB_CFB_IMAGEBLIT=y
@@ -724,6 +716,8 @@ CONFIG_FB_APOLLO=y
  # CONFIG_FB_UVESA is not set
  # CONFIG_FB_S1D13XXX is not set
  # CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
  # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
  
  #
@@ -750,6 +744,12 @@ CONFIG_HID_SUPPORT=y
  CONFIG_HID=m
  # CONFIG_HID_DEBUG is not set
  CONFIG_HIDRAW=y
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_COMPAT=y
  # CONFIG_USB_SUPPORT is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
@@ -758,6 +758,8 @@ CONFIG_HIDRAW=y
  # CONFIG_RTC_CLASS is not set
  # CONFIG_DMADEVICES is not set
  # CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # Character devices
@@ -773,8 +775,9 @@ CONFIG_EXT2_FS=y
  # CONFIG_EXT2_FS_XIP is not set
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
+# CONFIG_EXT4_FS is not set
  CONFIG_JBD=y
+CONFIG_JBD2=m
  CONFIG_REISERFS_FS=m
  # CONFIG_REISERFS_CHECK is not set
  # CONFIG_REISERFS_PROC_INFO is not set
@@ -785,6 +788,7 @@ CONFIG_JFS_FS=m
  # CONFIG_JFS_DEBUG is not set
  # CONFIG_JFS_STATISTICS is not set
  # CONFIG_FS_POSIX_ACL is not set
+CONFIG_FILE_LOCKING=y
  CONFIG_XFS_FS=m
  # CONFIG_XFS_QUOTA is not set
  # CONFIG_XFS_POSIX_ACL is not set
@@ -796,6 +800,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
  # CONFIG_OCFS2_FS_STATS is not set
  # CONFIG_OCFS2_DEBUG_MASKLOG is not set
  # CONFIG_OCFS2_DEBUG_FS is not set
+# CONFIG_OCFS2_COMPAT_JBD is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
@@ -834,6 +839,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
  CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
  CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
  # CONFIG_TMPFS_POSIX_ACL is not set
@@ -877,6 +883,7 @@ CONFIG_EXPORTFS=m
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=y
  CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_REGISTER_V4 is not set
  CONFIG_RPCSEC_GSS_KRB5=y
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  CONFIG_SMB_FS=m
@@ -949,7 +956,13 @@ CONFIG_MAGIC_SYSRQ=y
  # CONFIG_DEBUG_KERNEL is not set
  CONFIG_DEBUG_BUGVERBOSE=y
  CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
  CONFIG_SYSCTL_SYSCALL_CHECK=y
+
+#
+# Tracers
+#
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  
  #
@@ -957,6 +970,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
  #
  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
@@ -967,10 +981,12 @@ CONFIG_CRYPTO=y
  #
  # Crypto core or helper
  #
+# CONFIG_CRYPTO_FIPS is not set
  CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD=y
  CONFIG_CRYPTO_BLKCIPHER=y
  CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_RNG=y
  CONFIG_CRYPTO_MANAGER=y
  CONFIG_CRYPTO_GF128MUL=m
  CONFIG_CRYPTO_NULL=m
@@ -1044,14 +1060,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
  #
  CONFIG_CRYPTO_DEFLATE=m
  CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
  # CONFIG_CRYPTO_HW is not set
  
  #
  # Library routines
  #
  CONFIG_BITREVERSE=y
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=m
  CONFIG_CRC_T10DIF=y
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig

index 654c5acb9e86ea9fc0a2e748e8c4192231eacc1a..a594a1d47b62bc8e7f125a61c7d71faba5cdc245 100644 (file)
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-rc6
-# Wed Sep 10 09:02:02 2008
+# Linux kernel version: 2.6.28-rc7
+# Tue Dec  2 20:27:44 2008
  #
  CONFIG_M68K=y
  CONFIG_MMU=y
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y
  CONFIG_GENERIC_IOMAP=y
  CONFIG_NO_IOPORT=y
  # CONFIG_NO_DMA is not set
-CONFIG_ARCH_SUPPORTS_AOUT=y
  CONFIG_HZ=100
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y
  CONFIG_TIMERFD=y
  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
+CONFIG_AIO=y
  CONFIG_VM_EVENT_COUNTERS=y
  CONFIG_SLAB=y
  # CONFIG_SLUB is not set
  # CONFIG_SLOB is not set
  # CONFIG_PROFILING is not set
  # CONFIG_MARKERS is not set
-# CONFIG_HAVE_OPROFILE is not set
-# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
-# CONFIG_HAVE_IOREMAP_PROT is not set
-# CONFIG_HAVE_KPROBES is not set
-# CONFIG_HAVE_KRETPROBES is not set
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
-# CONFIG_HAVE_DMA_ATTRS is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_HAVE_CLK is not set
-CONFIG_PROC_PAGE_MONITOR=y
  # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
  CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_CLASSIC_RCU=y
+# CONFIG_FREEZER is not set
  
  #
  # Platform dependent setup
  #
-# CONFIG_SUN3 is not set
  # CONFIG_AMIGA is not set
  CONFIG_ATARI=y
  # CONFIG_MAC is not set
@@ -148,19 +138,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y
  CONFIG_DISCONTIGMEM=y
  CONFIG_FLAT_NODE_MEM_MAP=y
  CONFIG_NEED_MULTIPLE_NODES=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  # CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
  
  #
  # General setup
  #
  CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
  CONFIG_BINFMT_AOUT=m
  CONFIG_BINFMT_MISC=m
  CONFIG_STRAM_PROC=y
@@ -208,7 +200,6 @@ CONFIG_INET_TCP_DIAG=m
  CONFIG_TCP_CONG_CUBIC=y
  CONFIG_DEFAULT_TCP_CONG="cubic"
  # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
  CONFIG_IPV6=m
  CONFIG_IPV6_PRIVACY=y
  CONFIG_IPV6_ROUTER_PREF=y
@@ -258,13 +249,14 @@ CONFIG_NF_CONNTRACK_SANE=m
  CONFIG_NF_CONNTRACK_SIP=m
  CONFIG_NF_CONNTRACK_TFTP=m
  # CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NETFILTER_TPROXY is not set
  CONFIG_NETFILTER_XTABLES=m
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
  CONFIG_NETFILTER_XT_TARGET_DSCP=m
  CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
  CONFIG_NETFILTER_XT_TARGET_RATEEST=m
  CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -278,19 +270,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
  CONFIG_NETFILTER_XT_MATCH_DCCP=m
  CONFIG_NETFILTER_XT_MATCH_DSCP=m
  CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
  CONFIG_NETFILTER_XT_MATCH_HELPER=m
  CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
  CONFIG_NETFILTER_XT_MATCH_LENGTH=m
  CONFIG_NETFILTER_XT_MATCH_LIMIT=m
  CONFIG_NETFILTER_XT_MATCH_MAC=m
  CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_OWNER=m
  CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
  CONFIG_NETFILTER_XT_MATCH_QUOTA=m
  CONFIG_NETFILTER_XT_MATCH_RATEEST=m
  CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
  CONFIG_NETFILTER_XT_MATCH_SCTP=m
  CONFIG_NETFILTER_XT_MATCH_STATE=m
  CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -298,20 +293,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
  CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
  CONFIG_NETFILTER_XT_MATCH_TIME=m
  CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+# CONFIG_IP_VS is not set
  
  #
  # IP: Netfilter Configuration
  #
+CONFIG_NF_DEFRAG_IPV4=m
  CONFIG_NF_CONNTRACK_IPV4=m
  CONFIG_NF_CONNTRACK_PROC_COMPAT=y
  CONFIG_IP_NF_QUEUE=m
  CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
  CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_FILTER=m
  CONFIG_IP_NF_TARGET_REJECT=m
  CONFIG_IP_NF_TARGET_LOG=m
@@ -319,8 +314,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
  CONFIG_NF_NAT=m
  CONFIG_NF_NAT_NEEDED=y
  CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_NF_NAT_SNMP_BASIC=m
  CONFIG_NF_NAT_PROTO_GRE=m
  CONFIG_NF_NAT_PROTO_UDPLITE=m
@@ -333,9 +328,9 @@ CONFIG_NF_NAT_PPTP=m
  CONFIG_NF_NAT_H323=m
  CONFIG_NF_NAT_SIP=m
  CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_TARGET_ECN=m
  CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_RAW=m
  CONFIG_IP_NF_ARPTABLES=m
  CONFIG_IP_NF_ARPFILTER=m
@@ -347,16 +342,16 @@ CONFIG_IP_NF_ARP_MANGLE=m
  CONFIG_NF_CONNTRACK_IPV6=m
  CONFIG_IP6_NF_QUEUE=m
  CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
  CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
  CONFIG_IP6_NF_MATCH_HL=m
  CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AH=m
  CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
  CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
  CONFIG_IP6_NF_TARGET_REJECT=m
  CONFIG_IP6_NF_MANGLE=m
  CONFIG_IP6_NF_TARGET_HL=m
@@ -383,6 +378,7 @@ CONFIG_SCTP_HMAC_MD5=y
  # CONFIG_TIPC is not set
  # CONFIG_ATM is not set
  # CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
  # CONFIG_VLAN_8021Q is not set
  # CONFIG_DECNET is not set
  CONFIG_LLC=m
@@ -406,19 +402,8 @@ CONFIG_NET_CLS_ROUTE=y
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
  # CONFIG_AF_RXRPC is not set
-
-#
-# Wireless
-#
-# CONFIG_CFG80211 is not set
-CONFIG_WIRELESS_EXT=y
-# CONFIG_WIRELESS_EXT_SYSFS is not set
-# CONFIG_MAC80211 is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_PHONET is not set
+# CONFIG_WIRELESS is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
  
@@ -462,21 +447,20 @@ CONFIG_ATA_OVER_ETH=m
  CONFIG_MISC_DEVICES=y
  # CONFIG_EEPROM_93CX6 is not set
  # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_C2PORT is not set
  CONFIG_HAVE_IDE=y
  CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
  
  #
  # Please see Documentation/ide/ide.txt for help/info on IDE drives
  #
-CONFIG_IDE_ATAPI=y
  # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD=y
+CONFIG_IDE_GD_ATA=y
+# CONFIG_IDE_GD_ATAPI is not set
  CONFIG_BLK_DEV_IDECD=y
  CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
  # CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_IDEFLOPPY=m
  # CONFIG_BLK_DEV_IDESCSI is not set
  # CONFIG_IDE_TASK_IOCTL is not set
  CONFIG_IDE_PROC_FS=y
@@ -565,12 +549,15 @@ CONFIG_EQUALIZER=m
  CONFIG_VETH=m
  # CONFIG_PHYLIB is not set
  CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
+CONFIG_MII=y
  CONFIG_ATARILANCE=m
  # CONFIG_IBM_NEW_EMAC_ZMII is not set
  # CONFIG_IBM_NEW_EMAC_RGMII is not set
  # CONFIG_IBM_NEW_EMAC_TAH is not set
  # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  # CONFIG_B44 is not set
  # CONFIG_NET_POCKET is not set
  # CONFIG_NETDEV_1000 is not set
@@ -644,6 +631,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
  CONFIG_MOUSE_PS2_SYNAPTICS=y
  CONFIG_MOUSE_PS2_LIFEBOOK=y
  CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
  # CONFIG_MOUSE_PS2_TOUCHKIT is not set
  # CONFIG_MOUSE_SERIAL is not set
  CONFIG_MOUSE_ATARI=m
@@ -706,11 +694,11 @@ CONFIG_GEN_RTC_X=y
  # CONFIG_THERMAL is not set
  # CONFIG_THERMAL_HWMON is not set
  # CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
  
  #
  # Sonics Silicon Backplane
  #
-CONFIG_SSB_POSSIBLE=y
  # CONFIG_SSB is not set
  
  #
@@ -720,6 +708,7 @@ CONFIG_SSB_POSSIBLE=y
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
  # CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
@@ -745,6 +734,7 @@ CONFIG_SSB_POSSIBLE=y
  CONFIG_FB=y
  # CONFIG_FIRMWARE_EDID is not set
  # CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
  CONFIG_FB_CFB_FILLRECT=y
  CONFIG_FB_CFB_COPYAREA=y
  CONFIG_FB_CFB_IMAGEBLIT=y
@@ -768,6 +758,8 @@ CONFIG_FB_ATARI=y
  # CONFIG_FB_S1D13XXX is not set
  # CONFIG_FB_ATY is not set
  # CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
  # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
  
  #
@@ -790,12 +782,19 @@ CONFIG_LOGO_LINUX_MONO=y
  CONFIG_LOGO_LINUX_VGA16=y
  CONFIG_LOGO_LINUX_CLUT224=y
  CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
  CONFIG_DMASOUND_ATARI=m
  CONFIG_DMASOUND=m
  CONFIG_HID_SUPPORT=y
  CONFIG_HID=m
  # CONFIG_HID_DEBUG is not set
  CONFIG_HIDRAW=y
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_COMPAT=y
  # CONFIG_USB_SUPPORT is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
@@ -805,6 +804,8 @@ CONFIG_HIDRAW=y
  # CONFIG_DMADEVICES is not set
  # CONFIG_AUXDISPLAY is not set
  # CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # Character devices
@@ -821,10 +822,9 @@ CONFIG_EXT2_FS=y
  # CONFIG_EXT2_FS_XIP is not set
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4DEV_FS=y
-# CONFIG_EXT4DEV_FS_XATTR is not set
+# CONFIG_EXT4_FS is not set
  CONFIG_JBD=y
-CONFIG_JBD2=y
+CONFIG_JBD2=m
  CONFIG_REISERFS_FS=m
  # CONFIG_REISERFS_CHECK is not set
  # CONFIG_REISERFS_PROC_INFO is not set
@@ -835,6 +835,7 @@ CONFIG_JFS_FS=m
  # CONFIG_JFS_DEBUG is not set
  # CONFIG_JFS_STATISTICS is not set
  # CONFIG_FS_POSIX_ACL is not set
+CONFIG_FILE_LOCKING=y
  CONFIG_XFS_FS=m
  # CONFIG_XFS_QUOTA is not set
  # CONFIG_XFS_POSIX_ACL is not set
@@ -846,6 +847,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
  # CONFIG_OCFS2_FS_STATS is not set
  # CONFIG_OCFS2_DEBUG_MASKLOG is not set
  # CONFIG_OCFS2_DEBUG_FS is not set
+# CONFIG_OCFS2_COMPAT_JBD is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
@@ -884,6 +886,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
  CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
  CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
  # CONFIG_TMPFS_POSIX_ACL is not set
@@ -925,6 +928,7 @@ CONFIG_LOCKD_V4=y
  CONFIG_EXPORTFS=m
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=m
+# CONFIG_SUNRPC_REGISTER_V4 is not set
  # CONFIG_RPCSEC_GSS_KRB5 is not set
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  CONFIG_SMB_FS=m
@@ -998,7 +1002,13 @@ CONFIG_MAGIC_SYSRQ=y
  # CONFIG_DEBUG_KERNEL is not set
  CONFIG_DEBUG_BUGVERBOSE=y
  CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
  CONFIG_SYSCTL_SYSCALL_CHECK=y
+
+#
+# Tracers
+#
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  
  #
@@ -1006,6 +1016,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
  #
  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
@@ -1016,10 +1027,12 @@ CONFIG_CRYPTO=y
  #
  # Crypto core or helper
  #
+# CONFIG_CRYPTO_FIPS is not set
  CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_BLKCIPHER=y
  CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_RNG=y
  CONFIG_CRYPTO_MANAGER=y
  CONFIG_CRYPTO_GF128MUL=m
  CONFIG_CRYPTO_NULL=m
@@ -1093,14 +1106,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
  #
  CONFIG_CRYPTO_DEFLATE=m
  CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
  # CONFIG_CRYPTO_HW is not set
  
  #
  # Library routines
  #
  CONFIG_BITREVERSE=y
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=y
  CONFIG_CRC_T10DIF=y
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig

index 2e44af0fe54a16b59eed806776384f8efbf6f406..d3d9814a91de73d659b8df0fe0d5e8a16cc2c42a 100644 (file)
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-rc6
-# Wed Sep 10 09:02:03 2008
+# Linux kernel version: 2.6.28-rc7
+# Tue Dec  2 20:27:45 2008
  #
  CONFIG_M68K=y
  CONFIG_MMU=y
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y
  CONFIG_GENERIC_IOMAP=y
  CONFIG_NO_IOPORT=y
  # CONFIG_NO_DMA is not set
-CONFIG_ARCH_SUPPORTS_AOUT=y
  CONFIG_HZ=100
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y
  CONFIG_TIMERFD=y
  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
+CONFIG_AIO=y
  CONFIG_VM_EVENT_COUNTERS=y
  CONFIG_SLAB=y
  # CONFIG_SLUB is not set
  # CONFIG_SLOB is not set
  # CONFIG_PROFILING is not set
  # CONFIG_MARKERS is not set
-# CONFIG_HAVE_OPROFILE is not set
-# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
-# CONFIG_HAVE_IOREMAP_PROT is not set
-# CONFIG_HAVE_KPROBES is not set
-# CONFIG_HAVE_KRETPROBES is not set
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
-# CONFIG_HAVE_DMA_ATTRS is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_HAVE_CLK is not set
-CONFIG_PROC_PAGE_MONITOR=y
  # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
  CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_CLASSIC_RCU=y
+# CONFIG_FREEZER is not set
  
  #
  # Platform dependent setup
  #
-# CONFIG_SUN3 is not set
  # CONFIG_AMIGA is not set
  # CONFIG_ATARI is not set
  # CONFIG_MAC is not set
@@ -151,19 +141,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y
  CONFIG_DISCONTIGMEM=y
  CONFIG_FLAT_NODE_MEM_MAP=y
  CONFIG_NEED_MULTIPLE_NODES=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  # CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
  
  #
  # General setup
  #
  CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
  CONFIG_BINFMT_AOUT=m
  CONFIG_BINFMT_MISC=m
  CONFIG_PROC_HARDWARE=y
@@ -212,7 +204,6 @@ CONFIG_INET_TCP_DIAG=m
  CONFIG_TCP_CONG_CUBIC=y
  CONFIG_DEFAULT_TCP_CONG="cubic"
  # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
  CONFIG_IPV6=m
  CONFIG_IPV6_PRIVACY=y
  CONFIG_IPV6_ROUTER_PREF=y
@@ -262,13 +253,14 @@ CONFIG_NF_CONNTRACK_SANE=m
  CONFIG_NF_CONNTRACK_SIP=m
  CONFIG_NF_CONNTRACK_TFTP=m
  # CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NETFILTER_TPROXY is not set
  CONFIG_NETFILTER_XTABLES=m
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
  CONFIG_NETFILTER_XT_TARGET_DSCP=m
  CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
  CONFIG_NETFILTER_XT_TARGET_RATEEST=m
  CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -282,19 +274,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
  CONFIG_NETFILTER_XT_MATCH_DCCP=m
  CONFIG_NETFILTER_XT_MATCH_DSCP=m
  CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
  CONFIG_NETFILTER_XT_MATCH_HELPER=m
  CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
  CONFIG_NETFILTER_XT_MATCH_LENGTH=m
  CONFIG_NETFILTER_XT_MATCH_LIMIT=m
  CONFIG_NETFILTER_XT_MATCH_MAC=m
  CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_OWNER=m
  CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
  CONFIG_NETFILTER_XT_MATCH_QUOTA=m
  CONFIG_NETFILTER_XT_MATCH_RATEEST=m
  CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
  CONFIG_NETFILTER_XT_MATCH_SCTP=m
  CONFIG_NETFILTER_XT_MATCH_STATE=m
  CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -302,20 +297,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
  CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
  CONFIG_NETFILTER_XT_MATCH_TIME=m
  CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+# CONFIG_IP_VS is not set
  
  #
  # IP: Netfilter Configuration
  #
+CONFIG_NF_DEFRAG_IPV4=m
  CONFIG_NF_CONNTRACK_IPV4=m
  CONFIG_NF_CONNTRACK_PROC_COMPAT=y
  CONFIG_IP_NF_QUEUE=m
  CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
  CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_FILTER=m
  CONFIG_IP_NF_TARGET_REJECT=m
  CONFIG_IP_NF_TARGET_LOG=m
@@ -323,8 +318,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
  CONFIG_NF_NAT=m
  CONFIG_NF_NAT_NEEDED=y
  CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_NF_NAT_SNMP_BASIC=m
  CONFIG_NF_NAT_PROTO_GRE=m
  CONFIG_NF_NAT_PROTO_UDPLITE=m
@@ -337,9 +332,9 @@ CONFIG_NF_NAT_PPTP=m
  CONFIG_NF_NAT_H323=m
  CONFIG_NF_NAT_SIP=m
  CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_TARGET_ECN=m
  CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_RAW=m
  CONFIG_IP_NF_ARPTABLES=m
  CONFIG_IP_NF_ARPFILTER=m
@@ -351,16 +346,16 @@ CONFIG_IP_NF_ARP_MANGLE=m
  CONFIG_NF_CONNTRACK_IPV6=m
  CONFIG_IP6_NF_QUEUE=m
  CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
  CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
  CONFIG_IP6_NF_MATCH_HL=m
  CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AH=m
  CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
  CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
  CONFIG_IP6_NF_TARGET_REJECT=m
  CONFIG_IP6_NF_MANGLE=m
  CONFIG_IP6_NF_TARGET_HL=m
@@ -387,6 +382,7 @@ CONFIG_SCTP_HMAC_MD5=y
  # CONFIG_TIPC is not set
  # CONFIG_ATM is not set
  # CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
  # CONFIG_VLAN_8021Q is not set
  # CONFIG_DECNET is not set
  CONFIG_LLC=m
@@ -410,19 +406,8 @@ CONFIG_NET_CLS_ROUTE=y
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
  # CONFIG_AF_RXRPC is not set
-
-#
-# Wireless
-#
-# CONFIG_CFG80211 is not set
-CONFIG_WIRELESS_EXT=y
-# CONFIG_WIRELESS_EXT_SYSFS is not set
-# CONFIG_MAC80211 is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_PHONET is not set
+# CONFIG_WIRELESS is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
  
@@ -460,6 +445,7 @@ CONFIG_ATA_OVER_ETH=m
  CONFIG_MISC_DEVICES=y
  # CONFIG_EEPROM_93CX6 is not set
  # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_C2PORT is not set
  CONFIG_HAVE_IDE=y
  # CONFIG_IDE is not set
  
@@ -545,6 +531,9 @@ CONFIG_BVME6000_NET=y
  # CONFIG_IBM_NEW_EMAC_RGMII is not set
  # CONFIG_IBM_NEW_EMAC_TAH is not set
  # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  # CONFIG_B44 is not set
  # CONFIG_NETDEV_1000 is not set
  # CONFIG_NETDEV_10000 is not set
@@ -614,6 +603,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
  CONFIG_MOUSE_PS2_SYNAPTICS=y
  CONFIG_MOUSE_PS2_LIFEBOOK=y
  CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
  # CONFIG_MOUSE_PS2_TOUCHKIT is not set
  CONFIG_MOUSE_SERIAL=m
  # CONFIG_MOUSE_VSXXXAA is not set
@@ -668,11 +658,11 @@ CONFIG_GEN_RTC_X=y
  # CONFIG_THERMAL is not set
  # CONFIG_THERMAL_HWMON is not set
  # CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
  
  #
  # Sonics Silicon Backplane
  #
-CONFIG_SSB_POSSIBLE=y
  # CONFIG_SSB is not set
  
  #
@@ -682,6 +672,7 @@ CONFIG_SSB_POSSIBLE=y
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
  # CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
@@ -721,6 +712,12 @@ CONFIG_HID_SUPPORT=y
  CONFIG_HID=m
  # CONFIG_HID_DEBUG is not set
  CONFIG_HIDRAW=y
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_COMPAT=y
  # CONFIG_USB_SUPPORT is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
@@ -729,6 +726,8 @@ CONFIG_HIDRAW=y
  # CONFIG_RTC_CLASS is not set
  # CONFIG_DMADEVICES is not set
  # CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # Character devices
@@ -744,8 +743,9 @@ CONFIG_EXT2_FS=y
  # CONFIG_EXT2_FS_XIP is not set
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
+# CONFIG_EXT4_FS is not set
  CONFIG_JBD=y
+CONFIG_JBD2=m
  CONFIG_REISERFS_FS=m
  # CONFIG_REISERFS_CHECK is not set
  # CONFIG_REISERFS_PROC_INFO is not set
@@ -756,6 +756,7 @@ CONFIG_JFS_FS=m
  # CONFIG_JFS_DEBUG is not set
  # CONFIG_JFS_STATISTICS is not set
  # CONFIG_FS_POSIX_ACL is not set
+CONFIG_FILE_LOCKING=y
  CONFIG_XFS_FS=m
  # CONFIG_XFS_QUOTA is not set
  # CONFIG_XFS_POSIX_ACL is not set
@@ -767,6 +768,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
  # CONFIG_OCFS2_FS_STATS is not set
  # CONFIG_OCFS2_DEBUG_MASKLOG is not set
  # CONFIG_OCFS2_DEBUG_FS is not set
+# CONFIG_OCFS2_COMPAT_JBD is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
@@ -805,6 +807,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
  CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
  CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
  # CONFIG_TMPFS_POSIX_ACL is not set
@@ -848,6 +851,7 @@ CONFIG_EXPORTFS=m
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=y
  CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_REGISTER_V4 is not set
  CONFIG_RPCSEC_GSS_KRB5=y
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  CONFIG_SMB_FS=m
@@ -921,7 +925,13 @@ CONFIG_MAGIC_SYSRQ=y
  # CONFIG_DEBUG_KERNEL is not set
  CONFIG_DEBUG_BUGVERBOSE=y
  CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
  CONFIG_SYSCTL_SYSCALL_CHECK=y
+
+#
+# Tracers
+#
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  
  #
@@ -929,6 +939,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
  #
  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
@@ -939,10 +950,12 @@ CONFIG_CRYPTO=y
  #
  # Crypto core or helper
  #
+# CONFIG_CRYPTO_FIPS is not set
  CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD=y
  CONFIG_CRYPTO_BLKCIPHER=y
  CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_RNG=y
  CONFIG_CRYPTO_MANAGER=y
  CONFIG_CRYPTO_GF128MUL=m
  CONFIG_CRYPTO_NULL=m
@@ -1016,14 +1029,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
  #
  CONFIG_CRYPTO_DEFLATE=m
  CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
  # CONFIG_CRYPTO_HW is not set
  
  #
  # Library routines
  #
  CONFIG_BITREVERSE=m
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=m
  CONFIG_CRC_T10DIF=y
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig

index 3570fc89b089f15f157ea4e1b35c90e33614bf40..5556ef088d04051aef7d625ccc5ad590b4916151 100644 (file)
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-rc6
-# Wed Sep 10 09:02:04 2008
+# Linux kernel version: 2.6.28-rc7
+# Tue Dec  2 20:27:46 2008
  #
  CONFIG_M68K=y
  CONFIG_MMU=y
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y
  CONFIG_GENERIC_IOMAP=y
  CONFIG_NO_IOPORT=y
  # CONFIG_NO_DMA is not set
-CONFIG_ARCH_SUPPORTS_AOUT=y
  CONFIG_HZ=100
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y
  CONFIG_TIMERFD=y
  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
+CONFIG_AIO=y
  CONFIG_VM_EVENT_COUNTERS=y
  CONFIG_SLAB=y
  # CONFIG_SLUB is not set
  # CONFIG_SLOB is not set
  # CONFIG_PROFILING is not set
  # CONFIG_MARKERS is not set
-# CONFIG_HAVE_OPROFILE is not set
-# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
-# CONFIG_HAVE_IOREMAP_PROT is not set
-# CONFIG_HAVE_KPROBES is not set
-# CONFIG_HAVE_KRETPROBES is not set
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
-# CONFIG_HAVE_DMA_ATTRS is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_HAVE_CLK is not set
-CONFIG_PROC_PAGE_MONITOR=y
  # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
  CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_CLASSIC_RCU=y
+# CONFIG_FREEZER is not set
  
  #
  # Platform dependent setup
  #
-# CONFIG_SUN3 is not set
  # CONFIG_AMIGA is not set
  # CONFIG_ATARI is not set
  # CONFIG_MAC is not set
@@ -149,19 +139,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y
  CONFIG_DISCONTIGMEM=y
  CONFIG_FLAT_NODE_MEM_MAP=y
  CONFIG_NEED_MULTIPLE_NODES=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  # CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
  
  #
  # General setup
  #
  CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
  CONFIG_BINFMT_AOUT=m
  CONFIG_BINFMT_MISC=m
  CONFIG_HEARTBEAT=y
@@ -211,7 +203,6 @@ CONFIG_INET_TCP_DIAG=m
  CONFIG_TCP_CONG_CUBIC=y
  CONFIG_DEFAULT_TCP_CONG="cubic"
  # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
  CONFIG_IPV6=m
  CONFIG_IPV6_PRIVACY=y
  CONFIG_IPV6_ROUTER_PREF=y
@@ -261,13 +252,14 @@ CONFIG_NF_CONNTRACK_SANE=m
  CONFIG_NF_CONNTRACK_SIP=m
  CONFIG_NF_CONNTRACK_TFTP=m
  # CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NETFILTER_TPROXY is not set
  CONFIG_NETFILTER_XTABLES=m
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
  CONFIG_NETFILTER_XT_TARGET_DSCP=m
  CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
  CONFIG_NETFILTER_XT_TARGET_RATEEST=m
  CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -281,19 +273,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
  CONFIG_NETFILTER_XT_MATCH_DCCP=m
  CONFIG_NETFILTER_XT_MATCH_DSCP=m
  CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
  CONFIG_NETFILTER_XT_MATCH_HELPER=m
  CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
  CONFIG_NETFILTER_XT_MATCH_LENGTH=m
  CONFIG_NETFILTER_XT_MATCH_LIMIT=m
  CONFIG_NETFILTER_XT_MATCH_MAC=m
  CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_OWNER=m
  CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
  CONFIG_NETFILTER_XT_MATCH_QUOTA=m
  CONFIG_NETFILTER_XT_MATCH_RATEEST=m
  CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
  CONFIG_NETFILTER_XT_MATCH_SCTP=m
  CONFIG_NETFILTER_XT_MATCH_STATE=m
  CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -301,20 +296,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
  CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
  CONFIG_NETFILTER_XT_MATCH_TIME=m
  CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+# CONFIG_IP_VS is not set
  
  #
  # IP: Netfilter Configuration
  #
+CONFIG_NF_DEFRAG_IPV4=m
  CONFIG_NF_CONNTRACK_IPV4=m
  CONFIG_NF_CONNTRACK_PROC_COMPAT=y
  CONFIG_IP_NF_QUEUE=m
  CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
  CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_FILTER=m
  CONFIG_IP_NF_TARGET_REJECT=m
  CONFIG_IP_NF_TARGET_LOG=m
@@ -322,8 +317,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
  CONFIG_NF_NAT=m
  CONFIG_NF_NAT_NEEDED=y
  CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_NF_NAT_SNMP_BASIC=m
  CONFIG_NF_NAT_PROTO_GRE=m
  CONFIG_NF_NAT_PROTO_UDPLITE=m
@@ -336,9 +331,9 @@ CONFIG_NF_NAT_PPTP=m
  CONFIG_NF_NAT_H323=m
  CONFIG_NF_NAT_SIP=m
  CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_TARGET_ECN=m
  CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_RAW=m
  CONFIG_IP_NF_ARPTABLES=m
  CONFIG_IP_NF_ARPFILTER=m
@@ -350,16 +345,16 @@ CONFIG_IP_NF_ARP_MANGLE=m
  CONFIG_NF_CONNTRACK_IPV6=m
  CONFIG_IP6_NF_QUEUE=m
  CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
  CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
  CONFIG_IP6_NF_MATCH_HL=m
  CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AH=m
  CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
  CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
  CONFIG_IP6_NF_TARGET_REJECT=m
  CONFIG_IP6_NF_MANGLE=m
  CONFIG_IP6_NF_TARGET_HL=m
@@ -386,6 +381,7 @@ CONFIG_SCTP_HMAC_MD5=y
  # CONFIG_TIPC is not set
  # CONFIG_ATM is not set
  # CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
  # CONFIG_VLAN_8021Q is not set
  # CONFIG_DECNET is not set
  CONFIG_LLC=m
@@ -409,19 +405,8 @@ CONFIG_NET_CLS_ROUTE=y
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
  # CONFIG_AF_RXRPC is not set
-
-#
-# Wireless
-#
-# CONFIG_CFG80211 is not set
-CONFIG_WIRELESS_EXT=y
-# CONFIG_WIRELESS_EXT_SYSFS is not set
-# CONFIG_MAC80211 is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_PHONET is not set
+# CONFIG_WIRELESS is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
  
@@ -459,6 +444,7 @@ CONFIG_ATA_OVER_ETH=m
  CONFIG_MISC_DEVICES=y
  # CONFIG_EEPROM_93CX6 is not set
  # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_C2PORT is not set
  CONFIG_HAVE_IDE=y
  # CONFIG_IDE is not set
  
@@ -542,6 +528,9 @@ CONFIG_HPLANCE=y
  # CONFIG_IBM_NEW_EMAC_RGMII is not set
  # CONFIG_IBM_NEW_EMAC_TAH is not set
  # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  # CONFIG_B44 is not set
  # CONFIG_NETDEV_1000 is not set
  # CONFIG_NETDEV_10000 is not set
@@ -613,6 +602,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
  CONFIG_MOUSE_PS2_SYNAPTICS=y
  CONFIG_MOUSE_PS2_LIFEBOOK=y
  CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
  # CONFIG_MOUSE_PS2_TOUCHKIT is not set
  CONFIG_MOUSE_SERIAL=m
  # CONFIG_MOUSE_VSXXXAA is not set
@@ -673,11 +663,11 @@ CONFIG_GEN_RTC_X=y
  # CONFIG_THERMAL is not set
  # CONFIG_THERMAL_HWMON is not set
  # CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
  
  #
  # Sonics Silicon Backplane
  #
-CONFIG_SSB_POSSIBLE=y
  # CONFIG_SSB is not set
  
  #
@@ -687,6 +677,7 @@ CONFIG_SSB_POSSIBLE=y
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
  # CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
@@ -712,6 +703,7 @@ CONFIG_SSB_POSSIBLE=y
  CONFIG_FB=y
  # CONFIG_FIRMWARE_EDID is not set
  # CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
  # CONFIG_FB_CFB_FILLRECT is not set
  # CONFIG_FB_CFB_COPYAREA is not set
  CONFIG_FB_CFB_IMAGEBLIT=y
@@ -734,6 +726,8 @@ CONFIG_FB_HP300=y
  # CONFIG_FB_UVESA is not set
  # CONFIG_FB_S1D13XXX is not set
  # CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
  # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
  
  #
@@ -760,6 +754,12 @@ CONFIG_HID_SUPPORT=y
  CONFIG_HID=m
  # CONFIG_HID_DEBUG is not set
  CONFIG_HIDRAW=y
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_COMPAT=y
  # CONFIG_USB_SUPPORT is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
@@ -768,6 +768,8 @@ CONFIG_HIDRAW=y
  # CONFIG_RTC_CLASS is not set
  # CONFIG_DMADEVICES is not set
  # CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # Character devices
@@ -781,8 +783,9 @@ CONFIG_EXT2_FS=y
  # CONFIG_EXT2_FS_XIP is not set
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
+# CONFIG_EXT4_FS is not set
  CONFIG_JBD=y
+CONFIG_JBD2=m
  CONFIG_REISERFS_FS=m
  # CONFIG_REISERFS_CHECK is not set
  # CONFIG_REISERFS_PROC_INFO is not set
@@ -793,6 +796,7 @@ CONFIG_JFS_FS=m
  # CONFIG_JFS_DEBUG is not set
  # CONFIG_JFS_STATISTICS is not set
  # CONFIG_FS_POSIX_ACL is not set
+CONFIG_FILE_LOCKING=y
  CONFIG_XFS_FS=m
  # CONFIG_XFS_QUOTA is not set
  # CONFIG_XFS_POSIX_ACL is not set
@@ -804,6 +808,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
  # CONFIG_OCFS2_FS_STATS is not set
  # CONFIG_OCFS2_DEBUG_MASKLOG is not set
  # CONFIG_OCFS2_DEBUG_FS is not set
+# CONFIG_OCFS2_COMPAT_JBD is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
@@ -842,6 +847,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
  CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
  CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
  # CONFIG_TMPFS_POSIX_ACL is not set
@@ -885,6 +891,7 @@ CONFIG_EXPORTFS=m
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=y
  CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_REGISTER_V4 is not set
  CONFIG_RPCSEC_GSS_KRB5=y
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  CONFIG_SMB_FS=m
@@ -957,7 +964,13 @@ CONFIG_MAGIC_SYSRQ=y
  # CONFIG_DEBUG_KERNEL is not set
  CONFIG_DEBUG_BUGVERBOSE=y
  CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
  CONFIG_SYSCTL_SYSCALL_CHECK=y
+
+#
+# Tracers
+#
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  
  #
@@ -965,6 +978,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
  #
  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
@@ -975,10 +989,12 @@ CONFIG_CRYPTO=y
  #
  # Crypto core or helper
  #
+# CONFIG_CRYPTO_FIPS is not set
  CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD=y
  CONFIG_CRYPTO_BLKCIPHER=y
  CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_RNG=y
  CONFIG_CRYPTO_MANAGER=y
  CONFIG_CRYPTO_GF128MUL=m
  CONFIG_CRYPTO_NULL=m
@@ -1052,14 +1068,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
  #
  CONFIG_CRYPTO_DEFLATE=m
  CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
  # CONFIG_CRYPTO_HW is not set
  
  #
  # Library routines
  #
  CONFIG_BITREVERSE=y
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=m
  CONFIG_CRC_T10DIF=y
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig

index db6e8822594a47896154e8ba45b1f2f82f4a57ab..c6de25724a2503e3d7c68512de55ffbd7eb2dfb8 100644 (file)
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-rc6
-# Wed Sep 10 09:02:06 2008
+# Linux kernel version: 2.6.28-rc7
+# Tue Dec  2 20:27:47 2008
  #
  CONFIG_M68K=y
  CONFIG_MMU=y
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y
  CONFIG_GENERIC_IOMAP=y
  CONFIG_NO_IOPORT=y
  # CONFIG_NO_DMA is not set
-CONFIG_ARCH_SUPPORTS_AOUT=y
  CONFIG_HZ=100
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y
  CONFIG_TIMERFD=y
  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
+CONFIG_AIO=y
  CONFIG_VM_EVENT_COUNTERS=y
  CONFIG_SLAB=y
  # CONFIG_SLUB is not set
  # CONFIG_SLOB is not set
  # CONFIG_PROFILING is not set
  # CONFIG_MARKERS is not set
-# CONFIG_HAVE_OPROFILE is not set
-# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
-# CONFIG_HAVE_IOREMAP_PROT is not set
-# CONFIG_HAVE_KPROBES is not set
-# CONFIG_HAVE_KRETPROBES is not set
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
-# CONFIG_HAVE_DMA_ATTRS is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_HAVE_CLK is not set
-CONFIG_PROC_PAGE_MONITOR=y
  # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
  CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_CLASSIC_RCU=y
+# CONFIG_FREEZER is not set
  
  #
  # Platform dependent setup
  #
-# CONFIG_SUN3 is not set
  # CONFIG_AMIGA is not set
  # CONFIG_ATARI is not set
  CONFIG_MAC=y
@@ -150,19 +140,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y
  CONFIG_DISCONTIGMEM=y
  CONFIG_FLAT_NODE_MEM_MAP=y
  CONFIG_NEED_MULTIPLE_NODES=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  # CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
  
  #
  # General setup
  #
  CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
  CONFIG_BINFMT_AOUT=m
  CONFIG_BINFMT_MISC=m
  # CONFIG_HEARTBEAT is not set
@@ -209,7 +201,6 @@ CONFIG_INET_TCP_DIAG=m
  CONFIG_TCP_CONG_CUBIC=y
  CONFIG_DEFAULT_TCP_CONG="cubic"
  # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
  CONFIG_IPV6=m
  CONFIG_IPV6_PRIVACY=y
  CONFIG_IPV6_ROUTER_PREF=y
@@ -259,13 +250,14 @@ CONFIG_NF_CONNTRACK_SANE=m
  CONFIG_NF_CONNTRACK_SIP=m
  CONFIG_NF_CONNTRACK_TFTP=m
  # CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NETFILTER_TPROXY is not set
  CONFIG_NETFILTER_XTABLES=m
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
  CONFIG_NETFILTER_XT_TARGET_DSCP=m
  CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
  CONFIG_NETFILTER_XT_TARGET_RATEEST=m
  CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -279,19 +271,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
  CONFIG_NETFILTER_XT_MATCH_DCCP=m
  CONFIG_NETFILTER_XT_MATCH_DSCP=m
  CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
  CONFIG_NETFILTER_XT_MATCH_HELPER=m
  CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
  CONFIG_NETFILTER_XT_MATCH_LENGTH=m
  CONFIG_NETFILTER_XT_MATCH_LIMIT=m
  CONFIG_NETFILTER_XT_MATCH_MAC=m
  CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_OWNER=m
  CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
  CONFIG_NETFILTER_XT_MATCH_QUOTA=m
  CONFIG_NETFILTER_XT_MATCH_RATEEST=m
  CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
  CONFIG_NETFILTER_XT_MATCH_SCTP=m
  CONFIG_NETFILTER_XT_MATCH_STATE=m
  CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -299,20 +294,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
  CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
  CONFIG_NETFILTER_XT_MATCH_TIME=m
  CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+# CONFIG_IP_VS is not set
  
  #
  # IP: Netfilter Configuration
  #
+CONFIG_NF_DEFRAG_IPV4=m
  CONFIG_NF_CONNTRACK_IPV4=m
  CONFIG_NF_CONNTRACK_PROC_COMPAT=y
  CONFIG_IP_NF_QUEUE=m
  CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
  CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_FILTER=m
  CONFIG_IP_NF_TARGET_REJECT=m
  CONFIG_IP_NF_TARGET_LOG=m
@@ -320,8 +315,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
  CONFIG_NF_NAT=m
  CONFIG_NF_NAT_NEEDED=y
  CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_NF_NAT_SNMP_BASIC=m
  CONFIG_NF_NAT_PROTO_GRE=m
  CONFIG_NF_NAT_PROTO_UDPLITE=m
@@ -334,9 +329,9 @@ CONFIG_NF_NAT_PPTP=m
  CONFIG_NF_NAT_H323=m
  CONFIG_NF_NAT_SIP=m
  CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_TARGET_ECN=m
  CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_RAW=m
  CONFIG_IP_NF_ARPTABLES=m
  CONFIG_IP_NF_ARPFILTER=m
@@ -348,16 +343,16 @@ CONFIG_IP_NF_ARP_MANGLE=m
  CONFIG_NF_CONNTRACK_IPV6=m
  CONFIG_IP6_NF_QUEUE=m
  CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
  CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
  CONFIG_IP6_NF_MATCH_HL=m
  CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AH=m
  CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
  CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
  CONFIG_IP6_NF_TARGET_REJECT=m
  CONFIG_IP6_NF_MANGLE=m
  CONFIG_IP6_NF_TARGET_HL=m
@@ -384,6 +379,7 @@ CONFIG_SCTP_HMAC_MD5=y
  # CONFIG_TIPC is not set
  # CONFIG_ATM is not set
  # CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
  # CONFIG_VLAN_8021Q is not set
  # CONFIG_DECNET is not set
  CONFIG_LLC=m
@@ -410,19 +406,8 @@ CONFIG_NET_CLS_ROUTE=y
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
  # CONFIG_AF_RXRPC is not set
-
-#
-# Wireless
-#
-# CONFIG_CFG80211 is not set
-CONFIG_WIRELESS_EXT=y
-# CONFIG_WIRELESS_EXT_SYSFS is not set
-# CONFIG_MAC80211 is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_PHONET is not set
+# CONFIG_WIRELESS is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
  
@@ -460,21 +445,20 @@ CONFIG_ATA_OVER_ETH=m
  CONFIG_MISC_DEVICES=y
  # CONFIG_EEPROM_93CX6 is not set
  # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_C2PORT is not set
  CONFIG_HAVE_IDE=y
  CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
  
  #
  # Please see Documentation/ide/ide.txt for help/info on IDE drives
  #
-CONFIG_IDE_ATAPI=y
  # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD=y
+CONFIG_IDE_GD_ATA=y
+# CONFIG_IDE_GD_ATAPI is not set
  CONFIG_BLK_DEV_IDECD=y
  CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
  # CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_IDEFLOPPY=m
  # CONFIG_BLK_DEV_IDESCSI is not set
  # CONFIG_IDE_TASK_IOCTL is not set
  CONFIG_IDE_PROC_FS=y
@@ -581,6 +565,9 @@ CONFIG_MACMACE=y
  # CONFIG_IBM_NEW_EMAC_RGMII is not set
  # CONFIG_IBM_NEW_EMAC_TAH is not set
  # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  # CONFIG_B44 is not set
  # CONFIG_NETDEV_1000 is not set
  # CONFIG_NETDEV_10000 is not set
@@ -650,6 +637,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
  CONFIG_MOUSE_PS2_SYNAPTICS=y
  CONFIG_MOUSE_PS2_LIFEBOOK=y
  CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
  # CONFIG_MOUSE_PS2_TOUCHKIT is not set
  CONFIG_MOUSE_SERIAL=m
  # CONFIG_MOUSE_VSXXXAA is not set
@@ -706,11 +694,11 @@ CONFIG_GEN_RTC_X=y
  # CONFIG_THERMAL is not set
  # CONFIG_THERMAL_HWMON is not set
  # CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
  
  #
  # Sonics Silicon Backplane
  #
-CONFIG_SSB_POSSIBLE=y
  # CONFIG_SSB is not set
  
  #
@@ -720,6 +708,7 @@ CONFIG_SSB_POSSIBLE=y
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
  # CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
@@ -745,6 +734,7 @@ CONFIG_SSB_POSSIBLE=y
  CONFIG_FB=y
  # CONFIG_FIRMWARE_EDID is not set
  # CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
  CONFIG_FB_CFB_FILLRECT=y
  CONFIG_FB_CFB_COPYAREA=y
  CONFIG_FB_CFB_IMAGEBLIT=y
@@ -768,6 +758,8 @@ CONFIG_FB_MAC=y
  # CONFIG_FB_UVESA is not set
  # CONFIG_FB_S1D13XXX is not set
  # CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
  # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
  
  #
@@ -796,6 +788,12 @@ CONFIG_HID_SUPPORT=y
  CONFIG_HID=m
  # CONFIG_HID_DEBUG is not set
  CONFIG_HIDRAW=y
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_COMPAT=y
  # CONFIG_USB_SUPPORT is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
@@ -804,6 +802,8 @@ CONFIG_HIDRAW=y
  # CONFIG_RTC_CLASS is not set
  # CONFIG_DMADEVICES is not set
  # CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # Character devices
@@ -820,8 +820,9 @@ CONFIG_EXT2_FS=y
  # CONFIG_EXT2_FS_XIP is not set
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
+# CONFIG_EXT4_FS is not set
  CONFIG_JBD=y
+CONFIG_JBD2=m
  CONFIG_REISERFS_FS=m
  # CONFIG_REISERFS_CHECK is not set
  # CONFIG_REISERFS_PROC_INFO is not set
@@ -832,6 +833,7 @@ CONFIG_JFS_FS=m
  # CONFIG_JFS_DEBUG is not set
  # CONFIG_JFS_STATISTICS is not set
  # CONFIG_FS_POSIX_ACL is not set
+CONFIG_FILE_LOCKING=y
  CONFIG_XFS_FS=m
  # CONFIG_XFS_QUOTA is not set
  # CONFIG_XFS_POSIX_ACL is not set
@@ -843,6 +845,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
  # CONFIG_OCFS2_FS_STATS is not set
  # CONFIG_OCFS2_DEBUG_MASKLOG is not set
  # CONFIG_OCFS2_DEBUG_FS is not set
+# CONFIG_OCFS2_COMPAT_JBD is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
@@ -881,6 +884,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
  CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
  CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
  # CONFIG_TMPFS_POSIX_ACL is not set
@@ -923,6 +927,7 @@ CONFIG_EXPORTFS=m
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=m
  CONFIG_SUNRPC_GSS=m
+# CONFIG_SUNRPC_REGISTER_V4 is not set
  CONFIG_RPCSEC_GSS_KRB5=m
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  CONFIG_SMB_FS=m
@@ -996,7 +1001,13 @@ CONFIG_MAGIC_SYSRQ=y
  # CONFIG_DEBUG_KERNEL is not set
  CONFIG_DEBUG_BUGVERBOSE=y
  CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
  CONFIG_SYSCTL_SYSCALL_CHECK=y
+
+#
+# Tracers
+#
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  
  #
@@ -1004,6 +1015,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
  #
  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
@@ -1014,10 +1026,12 @@ CONFIG_CRYPTO=y
  #
  # Crypto core or helper
  #
+# CONFIG_CRYPTO_FIPS is not set
  CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_BLKCIPHER=y
  CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_RNG=y
  CONFIG_CRYPTO_MANAGER=y
  CONFIG_CRYPTO_GF128MUL=m
  CONFIG_CRYPTO_NULL=m
@@ -1091,14 +1105,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
  #
  CONFIG_CRYPTO_DEFLATE=m
  CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
  # CONFIG_CRYPTO_HW is not set
  
  #
  # Library routines
  #
  CONFIG_BITREVERSE=y
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=m
  CONFIG_CRC_T10DIF=y
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig

index 1a806102b999234a669805e231dccc4d599db5ac..70693588031ea615c99b62042322e1dfdbb10ecf 100644 (file)
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-rc6
-# Wed Sep 10 09:02:07 2008
+# Linux kernel version: 2.6.28-rc7
+# Tue Dec  2 20:27:48 2008
  #
  CONFIG_M68K=y
  CONFIG_MMU=y
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y
  CONFIG_GENERIC_IOMAP=y
  CONFIG_NO_IOPORT=y
  # CONFIG_NO_DMA is not set
-CONFIG_ARCH_SUPPORTS_AOUT=y
  CONFIG_HZ=100
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y
  CONFIG_TIMERFD=y
  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
+CONFIG_AIO=y
  CONFIG_VM_EVENT_COUNTERS=y
  CONFIG_SLAB=y
  # CONFIG_SLUB is not set
  # CONFIG_SLOB is not set
  # CONFIG_PROFILING is not set
  # CONFIG_MARKERS is not set
-# CONFIG_HAVE_OPROFILE is not set
-# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
-# CONFIG_HAVE_IOREMAP_PROT is not set
-# CONFIG_HAVE_KPROBES is not set
-# CONFIG_HAVE_KRETPROBES is not set
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
-# CONFIG_HAVE_DMA_ATTRS is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_HAVE_CLK is not set
-CONFIG_PROC_PAGE_MONITOR=y
  # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
  CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_CLASSIC_RCU=y
+# CONFIG_FREEZER is not set
  
  #
  # Platform dependent setup
  #
-# CONFIG_SUN3 is not set
  CONFIG_AMIGA=y
  CONFIG_ATARI=y
  CONFIG_MAC=y
@@ -154,19 +144,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y
  CONFIG_DISCONTIGMEM=y
  CONFIG_FLAT_NODE_MEM_MAP=y
  CONFIG_NEED_MULTIPLE_NODES=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  # CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
  
  #
  # General setup
  #
  CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
  CONFIG_BINFMT_AOUT=m
  CONFIG_BINFMT_MISC=m
  CONFIG_ZORRO=y
@@ -222,7 +214,6 @@ CONFIG_INET_TCP_DIAG=m
  CONFIG_TCP_CONG_CUBIC=y
  CONFIG_DEFAULT_TCP_CONG="cubic"
  # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
  CONFIG_IPV6=m
  CONFIG_IPV6_PRIVACY=y
  CONFIG_IPV6_ROUTER_PREF=y
@@ -272,13 +263,14 @@ CONFIG_NF_CONNTRACK_SANE=m
  CONFIG_NF_CONNTRACK_SIP=m
  CONFIG_NF_CONNTRACK_TFTP=m
  # CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NETFILTER_TPROXY is not set
  CONFIG_NETFILTER_XTABLES=m
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
  CONFIG_NETFILTER_XT_TARGET_DSCP=m
  CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
  CONFIG_NETFILTER_XT_TARGET_RATEEST=m
  CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -292,19 +284,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
  CONFIG_NETFILTER_XT_MATCH_DCCP=m
  CONFIG_NETFILTER_XT_MATCH_DSCP=m
  CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
  CONFIG_NETFILTER_XT_MATCH_HELPER=m
  CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
  CONFIG_NETFILTER_XT_MATCH_LENGTH=m
  CONFIG_NETFILTER_XT_MATCH_LIMIT=m
  CONFIG_NETFILTER_XT_MATCH_MAC=m
  CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_OWNER=m
  CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
  CONFIG_NETFILTER_XT_MATCH_QUOTA=m
  CONFIG_NETFILTER_XT_MATCH_RATEEST=m
  CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
  CONFIG_NETFILTER_XT_MATCH_SCTP=m
  CONFIG_NETFILTER_XT_MATCH_STATE=m
  CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -312,20 +307,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
  CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
  CONFIG_NETFILTER_XT_MATCH_TIME=m
  CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+# CONFIG_IP_VS is not set
  
  #
  # IP: Netfilter Configuration
  #
+CONFIG_NF_DEFRAG_IPV4=m
  CONFIG_NF_CONNTRACK_IPV4=m
  CONFIG_NF_CONNTRACK_PROC_COMPAT=y
  CONFIG_IP_NF_QUEUE=m
  CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
  CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_FILTER=m
  CONFIG_IP_NF_TARGET_REJECT=m
  CONFIG_IP_NF_TARGET_LOG=m
@@ -333,8 +328,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
  CONFIG_NF_NAT=m
  CONFIG_NF_NAT_NEEDED=y
  CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_NF_NAT_SNMP_BASIC=m
  CONFIG_NF_NAT_PROTO_GRE=m
  CONFIG_NF_NAT_PROTO_UDPLITE=m
@@ -347,9 +342,9 @@ CONFIG_NF_NAT_PPTP=m
  CONFIG_NF_NAT_H323=m
  CONFIG_NF_NAT_SIP=m
  CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_TARGET_ECN=m
  CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_RAW=m
  CONFIG_IP_NF_ARPTABLES=m
  CONFIG_IP_NF_ARPFILTER=m
@@ -361,16 +356,16 @@ CONFIG_IP_NF_ARP_MANGLE=m
  CONFIG_NF_CONNTRACK_IPV6=m
  CONFIG_IP6_NF_QUEUE=m
  CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
  CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
  CONFIG_IP6_NF_MATCH_HL=m
  CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AH=m
  CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
  CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
  CONFIG_IP6_NF_TARGET_REJECT=m
  CONFIG_IP6_NF_MANGLE=m
  CONFIG_IP6_NF_TARGET_HL=m
@@ -397,6 +392,7 @@ CONFIG_SCTP_HMAC_MD5=y
  # CONFIG_TIPC is not set
  # CONFIG_ATM is not set
  # CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
  # CONFIG_VLAN_8021Q is not set
  # CONFIG_DECNET is not set
  CONFIG_LLC=m
@@ -424,19 +420,8 @@ CONFIG_NET_CLS_ROUTE=y
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
  # CONFIG_AF_RXRPC is not set
-
-#
-# Wireless
-#
-# CONFIG_CFG80211 is not set
-CONFIG_WIRELESS_EXT=y
-# CONFIG_WIRELESS_EXT_SYSFS is not set
-# CONFIG_MAC80211 is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_PHONET is not set
+# CONFIG_WIRELESS is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
  
@@ -486,21 +471,20 @@ CONFIG_ATA_OVER_ETH=m
  CONFIG_MISC_DEVICES=y
  # CONFIG_EEPROM_93CX6 is not set
  # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_C2PORT is not set
  CONFIG_HAVE_IDE=y
  CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
  
  #
  # Please see Documentation/ide/ide.txt for help/info on IDE drives
  #
-CONFIG_IDE_ATAPI=y
  # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD=y
+CONFIG_IDE_GD_ATA=y
+# CONFIG_IDE_GD_ATAPI is not set
  CONFIG_BLK_DEV_IDECD=y
  CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
  # CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_IDEFLOPPY=m
  # CONFIG_BLK_DEV_IDESCSI is not set
  # CONFIG_IDE_TASK_IOCTL is not set
  CONFIG_IDE_PROC_FS=y
@@ -629,7 +613,7 @@ CONFIG_VETH=m
  # CONFIG_ARCNET is not set
  # CONFIG_PHYLIB is not set
  CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
+CONFIG_MII=y
  CONFIG_ARIADNE=m
  CONFIG_A2065=m
  CONFIG_HYDRA=m
@@ -657,8 +641,12 @@ CONFIG_NE2000=m
  # CONFIG_IBM_NEW_EMAC_RGMII is not set
  # CONFIG_IBM_NEW_EMAC_TAH is not set
  # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  # CONFIG_NET_PCI is not set
  # CONFIG_B44 is not set
+# CONFIG_CS89x0 is not set
  # CONFIG_NET_POCKET is not set
  # CONFIG_NETDEV_1000 is not set
  # CONFIG_NETDEV_10000 is not set
@@ -735,6 +723,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
  CONFIG_MOUSE_PS2_SYNAPTICS=y
  CONFIG_MOUSE_PS2_LIFEBOOK=y
  CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
  # CONFIG_MOUSE_PS2_TOUCHKIT is not set
  CONFIG_MOUSE_SERIAL=m
  # CONFIG_MOUSE_INPORT is not set
@@ -832,11 +821,11 @@ CONFIG_GEN_RTC_X=y
  # CONFIG_THERMAL is not set
  # CONFIG_THERMAL_HWMON is not set
  # CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
  
  #
  # Sonics Silicon Backplane
  #
-CONFIG_SSB_POSSIBLE=y
  # CONFIG_SSB is not set
  
  #
@@ -846,6 +835,7 @@ CONFIG_SSB_POSSIBLE=y
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
  # CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
@@ -871,6 +861,7 @@ CONFIG_SSB_POSSIBLE=y
  CONFIG_FB=y
  # CONFIG_FIRMWARE_EDID is not set
  # CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
  CONFIG_FB_CFB_FILLRECT=y
  CONFIG_FB_CFB_COPYAREA=y
  CONFIG_FB_CFB_IMAGEBLIT=y
@@ -905,6 +896,8 @@ CONFIG_FB_HP300=y
  # CONFIG_FB_S1D13XXX is not set
  # CONFIG_FB_ATY is not set
  # CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
  # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
  
  #
@@ -930,6 +923,7 @@ CONFIG_LOGO_LINUX_VGA16=y
  CONFIG_LOGO_LINUX_CLUT224=y
  CONFIG_LOGO_MAC_CLUT224=y
  CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
  CONFIG_DMASOUND_ATARI=m
  CONFIG_DMASOUND_PAULA=m
  CONFIG_DMASOUND_Q40=m
@@ -938,6 +932,12 @@ CONFIG_HID_SUPPORT=y
  CONFIG_HID=m
  # CONFIG_HID_DEBUG is not set
  CONFIG_HIDRAW=y
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_COMPAT=y
  # CONFIG_USB_SUPPORT is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
@@ -947,6 +947,8 @@ CONFIG_HIDRAW=y
  # CONFIG_DMADEVICES is not set
  # CONFIG_AUXDISPLAY is not set
  # CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # Character devices
@@ -973,10 +975,9 @@ CONFIG_EXT2_FS=y
  # CONFIG_EXT2_FS_XIP is not set
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4DEV_FS=y
-# CONFIG_EXT4DEV_FS_XATTR is not set
+# CONFIG_EXT4_FS is not set
  CONFIG_JBD=y
-CONFIG_JBD2=y
+CONFIG_JBD2=m
  CONFIG_REISERFS_FS=m
  # CONFIG_REISERFS_CHECK is not set
  # CONFIG_REISERFS_PROC_INFO is not set
@@ -987,6 +988,7 @@ CONFIG_JFS_FS=m
  # CONFIG_JFS_DEBUG is not set
  # CONFIG_JFS_STATISTICS is not set
  # CONFIG_FS_POSIX_ACL is not set
+CONFIG_FILE_LOCKING=y
  CONFIG_XFS_FS=m
  # CONFIG_XFS_QUOTA is not set
  # CONFIG_XFS_POSIX_ACL is not set
@@ -998,6 +1000,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
  # CONFIG_OCFS2_FS_STATS is not set
  # CONFIG_OCFS2_DEBUG_MASKLOG is not set
  # CONFIG_OCFS2_DEBUG_FS is not set
+# CONFIG_OCFS2_COMPAT_JBD is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
@@ -1036,6 +1039,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
  CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
  CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
  # CONFIG_TMPFS_POSIX_ACL is not set
@@ -1079,6 +1083,7 @@ CONFIG_EXPORTFS=m
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=y
  CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_REGISTER_V4 is not set
  CONFIG_RPCSEC_GSS_KRB5=y
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  CONFIG_SMB_FS=m
@@ -1156,7 +1161,13 @@ CONFIG_MAGIC_SYSRQ=y
  # CONFIG_DEBUG_KERNEL is not set
  CONFIG_DEBUG_BUGVERBOSE=y
  CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
  CONFIG_SYSCTL_SYSCALL_CHECK=y
+
+#
+# Tracers
+#
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  
  #
@@ -1164,6 +1175,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
  #
  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
@@ -1174,10 +1186,12 @@ CONFIG_CRYPTO=y
  #
  # Crypto core or helper
  #
+# CONFIG_CRYPTO_FIPS is not set
  CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD=y
  CONFIG_CRYPTO_BLKCIPHER=y
  CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_RNG=y
  CONFIG_CRYPTO_MANAGER=y
  CONFIG_CRYPTO_GF128MUL=m
  CONFIG_CRYPTO_NULL=m
@@ -1251,14 +1265,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
  #
  CONFIG_CRYPTO_DEFLATE=m
  CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
  # CONFIG_CRYPTO_HW is not set
  
  #
  # Library routines
  #
  CONFIG_BITREVERSE=y
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=y
  CONFIG_CRC_T10DIF=y
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig

index cacb5aef6a37e865c76caad27116f08539a30157..52d42715bd0bc5fcbb20fad583227da91547eece 100644 (file)
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-rc6
-# Wed Sep 10 09:02:08 2008
+# Linux kernel version: 2.6.28-rc7
+# Tue Dec  2 20:27:50 2008
  #
  CONFIG_M68K=y
  CONFIG_MMU=y
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y
  CONFIG_GENERIC_IOMAP=y
  CONFIG_NO_IOPORT=y
  # CONFIG_NO_DMA is not set
-CONFIG_ARCH_SUPPORTS_AOUT=y
  CONFIG_HZ=100
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y
  CONFIG_TIMERFD=y
  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
+CONFIG_AIO=y
  CONFIG_VM_EVENT_COUNTERS=y
  CONFIG_SLAB=y
  # CONFIG_SLUB is not set
  # CONFIG_SLOB is not set
  # CONFIG_PROFILING is not set
  # CONFIG_MARKERS is not set
-# CONFIG_HAVE_OPROFILE is not set
-# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
-# CONFIG_HAVE_IOREMAP_PROT is not set
-# CONFIG_HAVE_KPROBES is not set
-# CONFIG_HAVE_KRETPROBES is not set
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
-# CONFIG_HAVE_DMA_ATTRS is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_HAVE_CLK is not set
-CONFIG_PROC_PAGE_MONITOR=y
  # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
  CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_CLASSIC_RCU=y
+# CONFIG_FREEZER is not set
  
  #
  # Platform dependent setup
  #
-# CONFIG_SUN3 is not set
  # CONFIG_AMIGA is not set
  # CONFIG_ATARI is not set
  # CONFIG_MAC is not set
@@ -151,19 +141,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y
  CONFIG_DISCONTIGMEM=y
  CONFIG_FLAT_NODE_MEM_MAP=y
  CONFIG_NEED_MULTIPLE_NODES=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  # CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
  
  #
  # General setup
  #
  CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
  CONFIG_BINFMT_AOUT=m
  CONFIG_BINFMT_MISC=m
  CONFIG_PROC_HARDWARE=y
@@ -212,7 +204,6 @@ CONFIG_INET_TCP_DIAG=m
  CONFIG_TCP_CONG_CUBIC=y
  CONFIG_DEFAULT_TCP_CONG="cubic"
  # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
  CONFIG_IPV6=m
  CONFIG_IPV6_PRIVACY=y
  CONFIG_IPV6_ROUTER_PREF=y
@@ -262,13 +253,14 @@ CONFIG_NF_CONNTRACK_SANE=m
  CONFIG_NF_CONNTRACK_SIP=m
  CONFIG_NF_CONNTRACK_TFTP=m
  # CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NETFILTER_TPROXY is not set
  CONFIG_NETFILTER_XTABLES=m
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
  CONFIG_NETFILTER_XT_TARGET_DSCP=m
  CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
  CONFIG_NETFILTER_XT_TARGET_RATEEST=m
  CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -282,19 +274,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
  CONFIG_NETFILTER_XT_MATCH_DCCP=m
  CONFIG_NETFILTER_XT_MATCH_DSCP=m
  CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
  CONFIG_NETFILTER_XT_MATCH_HELPER=m
  CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
  CONFIG_NETFILTER_XT_MATCH_LENGTH=m
  CONFIG_NETFILTER_XT_MATCH_LIMIT=m
  CONFIG_NETFILTER_XT_MATCH_MAC=m
  CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_OWNER=m
  CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
  CONFIG_NETFILTER_XT_MATCH_QUOTA=m
  CONFIG_NETFILTER_XT_MATCH_RATEEST=m
  CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
  CONFIG_NETFILTER_XT_MATCH_SCTP=m
  CONFIG_NETFILTER_XT_MATCH_STATE=m
  CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -302,20 +297,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
  CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
  CONFIG_NETFILTER_XT_MATCH_TIME=m
  CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+# CONFIG_IP_VS is not set
  
  #
  # IP: Netfilter Configuration
  #
+CONFIG_NF_DEFRAG_IPV4=m
  CONFIG_NF_CONNTRACK_IPV4=m
  CONFIG_NF_CONNTRACK_PROC_COMPAT=y
  CONFIG_IP_NF_QUEUE=m
  CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
  CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_FILTER=m
  CONFIG_IP_NF_TARGET_REJECT=m
  CONFIG_IP_NF_TARGET_LOG=m
@@ -323,8 +318,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
  CONFIG_NF_NAT=m
  CONFIG_NF_NAT_NEEDED=y
  CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_NF_NAT_SNMP_BASIC=m
  CONFIG_NF_NAT_PROTO_GRE=m
  CONFIG_NF_NAT_PROTO_UDPLITE=m
@@ -337,9 +332,9 @@ CONFIG_NF_NAT_PPTP=m
  CONFIG_NF_NAT_H323=m
  CONFIG_NF_NAT_SIP=m
  CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_TARGET_ECN=m
  CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_RAW=m
  CONFIG_IP_NF_ARPTABLES=m
  CONFIG_IP_NF_ARPFILTER=m
@@ -351,16 +346,16 @@ CONFIG_IP_NF_ARP_MANGLE=m
  CONFIG_NF_CONNTRACK_IPV6=m
  CONFIG_IP6_NF_QUEUE=m
  CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
  CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
  CONFIG_IP6_NF_MATCH_HL=m
  CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AH=m
  CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
  CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
  CONFIG_IP6_NF_TARGET_REJECT=m
  CONFIG_IP6_NF_MANGLE=m
  CONFIG_IP6_NF_TARGET_HL=m
@@ -387,6 +382,7 @@ CONFIG_SCTP_HMAC_MD5=y
  # CONFIG_TIPC is not set
  # CONFIG_ATM is not set
  # CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
  # CONFIG_VLAN_8021Q is not set
  # CONFIG_DECNET is not set
  CONFIG_LLC=m
@@ -410,19 +406,8 @@ CONFIG_NET_CLS_ROUTE=y
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
  # CONFIG_AF_RXRPC is not set
-
-#
-# Wireless
-#
-# CONFIG_CFG80211 is not set
-CONFIG_WIRELESS_EXT=y
-# CONFIG_WIRELESS_EXT_SYSFS is not set
-# CONFIG_MAC80211 is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_PHONET is not set
+# CONFIG_WIRELESS is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
  
@@ -460,6 +445,7 @@ CONFIG_ATA_OVER_ETH=m
  CONFIG_MISC_DEVICES=y
  # CONFIG_EEPROM_93CX6 is not set
  # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_C2PORT is not set
  CONFIG_HAVE_IDE=y
  # CONFIG_IDE is not set
  
@@ -544,6 +530,9 @@ CONFIG_MVME147_NET=y
  # CONFIG_IBM_NEW_EMAC_RGMII is not set
  # CONFIG_IBM_NEW_EMAC_TAH is not set
  # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  # CONFIG_B44 is not set
  # CONFIG_NETDEV_1000 is not set
  # CONFIG_NETDEV_10000 is not set
@@ -613,6 +602,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
  CONFIG_MOUSE_PS2_SYNAPTICS=y
  CONFIG_MOUSE_PS2_LIFEBOOK=y
  CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
  # CONFIG_MOUSE_PS2_TOUCHKIT is not set
  CONFIG_MOUSE_SERIAL=m
  # CONFIG_MOUSE_VSXXXAA is not set
@@ -667,11 +657,11 @@ CONFIG_GEN_RTC_X=y
  # CONFIG_THERMAL is not set
  # CONFIG_THERMAL_HWMON is not set
  # CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
  
  #
  # Sonics Silicon Backplane
  #
-CONFIG_SSB_POSSIBLE=y
  # CONFIG_SSB is not set
  
  #
@@ -681,6 +671,7 @@ CONFIG_SSB_POSSIBLE=y
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
  # CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
@@ -720,6 +711,12 @@ CONFIG_HID_SUPPORT=y
  CONFIG_HID=m
  # CONFIG_HID_DEBUG is not set
  CONFIG_HIDRAW=y
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_COMPAT=y
  # CONFIG_USB_SUPPORT is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
@@ -728,6 +725,8 @@ CONFIG_HIDRAW=y
  # CONFIG_RTC_CLASS is not set
  # CONFIG_DMADEVICES is not set
  # CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # Character devices
@@ -743,8 +742,9 @@ CONFIG_EXT2_FS=y
  # CONFIG_EXT2_FS_XIP is not set
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
+# CONFIG_EXT4_FS is not set
  CONFIG_JBD=y
+CONFIG_JBD2=m
  CONFIG_REISERFS_FS=m
  # CONFIG_REISERFS_CHECK is not set
  # CONFIG_REISERFS_PROC_INFO is not set
@@ -755,6 +755,7 @@ CONFIG_JFS_FS=m
  # CONFIG_JFS_DEBUG is not set
  # CONFIG_JFS_STATISTICS is not set
  # CONFIG_FS_POSIX_ACL is not set
+CONFIG_FILE_LOCKING=y
  CONFIG_XFS_FS=m
  # CONFIG_XFS_QUOTA is not set
  # CONFIG_XFS_POSIX_ACL is not set
@@ -766,6 +767,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
  # CONFIG_OCFS2_FS_STATS is not set
  # CONFIG_OCFS2_DEBUG_MASKLOG is not set
  # CONFIG_OCFS2_DEBUG_FS is not set
+# CONFIG_OCFS2_COMPAT_JBD is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
@@ -804,6 +806,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
  CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
  CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
  # CONFIG_TMPFS_POSIX_ACL is not set
@@ -847,6 +850,7 @@ CONFIG_EXPORTFS=m
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=y
  CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_REGISTER_V4 is not set
  CONFIG_RPCSEC_GSS_KRB5=y
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  CONFIG_SMB_FS=m
@@ -920,7 +924,13 @@ CONFIG_MAGIC_SYSRQ=y
  # CONFIG_DEBUG_KERNEL is not set
  CONFIG_DEBUG_BUGVERBOSE=y
  CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
  CONFIG_SYSCTL_SYSCALL_CHECK=y
+
+#
+# Tracers
+#
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  
  #
@@ -928,6 +938,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
  #
  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
@@ -938,10 +949,12 @@ CONFIG_CRYPTO=y
  #
  # Crypto core or helper
  #
+# CONFIG_CRYPTO_FIPS is not set
  CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD=y
  CONFIG_CRYPTO_BLKCIPHER=y
  CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_RNG=y
  CONFIG_CRYPTO_MANAGER=y
  CONFIG_CRYPTO_GF128MUL=m
  CONFIG_CRYPTO_NULL=m
@@ -1015,14 +1028,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
  #
  CONFIG_CRYPTO_DEFLATE=m
  CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
  # CONFIG_CRYPTO_HW is not set
  
  #
  # Library routines
  #
  CONFIG_BITREVERSE=y
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=m
  CONFIG_CRC_T10DIF=y
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig

index a183e25e348d2a93b7b9e0be16f977a64854848a..3403ed2eda796ace98478d3ea55bd981043b02a2 100644 (file)
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-rc6
-# Wed Sep 10 09:02:09 2008
+# Linux kernel version: 2.6.28-rc7
+# Tue Dec  2 20:27:51 2008
  #
  CONFIG_M68K=y
  CONFIG_MMU=y
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y
  CONFIG_GENERIC_IOMAP=y
  CONFIG_NO_IOPORT=y
  # CONFIG_NO_DMA is not set
-CONFIG_ARCH_SUPPORTS_AOUT=y
  CONFIG_HZ=100
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y
  CONFIG_TIMERFD=y
  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
+CONFIG_AIO=y
  CONFIG_VM_EVENT_COUNTERS=y
  CONFIG_SLAB=y
  # CONFIG_SLUB is not set
  # CONFIG_SLOB is not set
  # CONFIG_PROFILING is not set
  # CONFIG_MARKERS is not set
-# CONFIG_HAVE_OPROFILE is not set
-# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
-# CONFIG_HAVE_IOREMAP_PROT is not set
-# CONFIG_HAVE_KPROBES is not set
-# CONFIG_HAVE_KRETPROBES is not set
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
-# CONFIG_HAVE_DMA_ATTRS is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_HAVE_CLK is not set
-CONFIG_PROC_PAGE_MONITOR=y
  # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
  CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_CLASSIC_RCU=y
+# CONFIG_FREEZER is not set
  
  #
  # Platform dependent setup
  #
-# CONFIG_SUN3 is not set
  # CONFIG_AMIGA is not set
  # CONFIG_ATARI is not set
  # CONFIG_MAC is not set
@@ -151,19 +141,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y
  CONFIG_DISCONTIGMEM=y
  CONFIG_FLAT_NODE_MEM_MAP=y
  CONFIG_NEED_MULTIPLE_NODES=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  # CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
  
  #
  # General setup
  #
  CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
  CONFIG_BINFMT_AOUT=m
  CONFIG_BINFMT_MISC=m
  CONFIG_PROC_HARDWARE=y
@@ -212,7 +204,6 @@ CONFIG_INET_TCP_DIAG=m
  CONFIG_TCP_CONG_CUBIC=y
  CONFIG_DEFAULT_TCP_CONG="cubic"
  # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
  CONFIG_IPV6=m
  CONFIG_IPV6_PRIVACY=y
  CONFIG_IPV6_ROUTER_PREF=y
@@ -262,13 +253,14 @@ CONFIG_NF_CONNTRACK_SANE=m
  CONFIG_NF_CONNTRACK_SIP=m
  CONFIG_NF_CONNTRACK_TFTP=m
  # CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NETFILTER_TPROXY is not set
  CONFIG_NETFILTER_XTABLES=m
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
  CONFIG_NETFILTER_XT_TARGET_DSCP=m
  CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
  CONFIG_NETFILTER_XT_TARGET_RATEEST=m
  CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -282,19 +274,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
  CONFIG_NETFILTER_XT_MATCH_DCCP=m
  CONFIG_NETFILTER_XT_MATCH_DSCP=m
  CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
  CONFIG_NETFILTER_XT_MATCH_HELPER=m
  CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
  CONFIG_NETFILTER_XT_MATCH_LENGTH=m
  CONFIG_NETFILTER_XT_MATCH_LIMIT=m
  CONFIG_NETFILTER_XT_MATCH_MAC=m
  CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_OWNER=m
  CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
  CONFIG_NETFILTER_XT_MATCH_QUOTA=m
  CONFIG_NETFILTER_XT_MATCH_RATEEST=m
  CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
  CONFIG_NETFILTER_XT_MATCH_SCTP=m
  CONFIG_NETFILTER_XT_MATCH_STATE=m
  CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -302,20 +297,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
  CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
  CONFIG_NETFILTER_XT_MATCH_TIME=m
  CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+# CONFIG_IP_VS is not set
  
  #
  # IP: Netfilter Configuration
  #
+CONFIG_NF_DEFRAG_IPV4=m
  CONFIG_NF_CONNTRACK_IPV4=m
  CONFIG_NF_CONNTRACK_PROC_COMPAT=y
  CONFIG_IP_NF_QUEUE=m
  CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
  CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_FILTER=m
  CONFIG_IP_NF_TARGET_REJECT=m
  CONFIG_IP_NF_TARGET_LOG=m
@@ -323,8 +318,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
  CONFIG_NF_NAT=m
  CONFIG_NF_NAT_NEEDED=y
  CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_NF_NAT_SNMP_BASIC=m
  CONFIG_NF_NAT_PROTO_GRE=m
  CONFIG_NF_NAT_PROTO_UDPLITE=m
@@ -337,9 +332,9 @@ CONFIG_NF_NAT_PPTP=m
  CONFIG_NF_NAT_H323=m
  CONFIG_NF_NAT_SIP=m
  CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_TARGET_ECN=m
  CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_RAW=m
  CONFIG_IP_NF_ARPTABLES=m
  CONFIG_IP_NF_ARPFILTER=m
@@ -351,16 +346,16 @@ CONFIG_IP_NF_ARP_MANGLE=m
  CONFIG_NF_CONNTRACK_IPV6=m
  CONFIG_IP6_NF_QUEUE=m
  CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
  CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
  CONFIG_IP6_NF_MATCH_HL=m
  CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AH=m
  CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
  CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
  CONFIG_IP6_NF_TARGET_REJECT=m
  CONFIG_IP6_NF_MANGLE=m
  CONFIG_IP6_NF_TARGET_HL=m
@@ -387,6 +382,7 @@ CONFIG_SCTP_HMAC_MD5=y
  # CONFIG_TIPC is not set
  # CONFIG_ATM is not set
  # CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
  # CONFIG_VLAN_8021Q is not set
  # CONFIG_DECNET is not set
  CONFIG_LLC=m
@@ -410,19 +406,8 @@ CONFIG_NET_CLS_ROUTE=y
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
  # CONFIG_AF_RXRPC is not set
-
-#
-# Wireless
-#
-# CONFIG_CFG80211 is not set
-CONFIG_WIRELESS_EXT=y
-# CONFIG_WIRELESS_EXT_SYSFS is not set
-# CONFIG_MAC80211 is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_PHONET is not set
+# CONFIG_WIRELESS is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
  
@@ -460,6 +445,7 @@ CONFIG_ATA_OVER_ETH=m
  CONFIG_MISC_DEVICES=y
  # CONFIG_EEPROM_93CX6 is not set
  # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_C2PORT is not set
  CONFIG_HAVE_IDE=y
  # CONFIG_IDE is not set
  
@@ -545,6 +531,9 @@ CONFIG_MVME16x_NET=y
  # CONFIG_IBM_NEW_EMAC_RGMII is not set
  # CONFIG_IBM_NEW_EMAC_TAH is not set
  # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  # CONFIG_B44 is not set
  # CONFIG_NETDEV_1000 is not set
  # CONFIG_NETDEV_10000 is not set
@@ -614,6 +603,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
  CONFIG_MOUSE_PS2_SYNAPTICS=y
  CONFIG_MOUSE_PS2_LIFEBOOK=y
  CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
  # CONFIG_MOUSE_PS2_TOUCHKIT is not set
  CONFIG_MOUSE_SERIAL=m
  # CONFIG_MOUSE_VSXXXAA is not set
@@ -668,11 +658,11 @@ CONFIG_GEN_RTC_X=y
  # CONFIG_THERMAL is not set
  # CONFIG_THERMAL_HWMON is not set
  # CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
  
  #
  # Sonics Silicon Backplane
  #
-CONFIG_SSB_POSSIBLE=y
  # CONFIG_SSB is not set
  
  #
@@ -682,6 +672,7 @@ CONFIG_SSB_POSSIBLE=y
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
  # CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
@@ -721,6 +712,12 @@ CONFIG_HID_SUPPORT=y
  CONFIG_HID=m
  # CONFIG_HID_DEBUG is not set
  CONFIG_HIDRAW=y
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_COMPAT=y
  # CONFIG_USB_SUPPORT is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
@@ -729,6 +726,8 @@ CONFIG_HIDRAW=y
  # CONFIG_RTC_CLASS is not set
  # CONFIG_DMADEVICES is not set
  # CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # Character devices
@@ -745,8 +744,9 @@ CONFIG_EXT2_FS=y
  # CONFIG_EXT2_FS_XIP is not set
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
+# CONFIG_EXT4_FS is not set
  CONFIG_JBD=y
+CONFIG_JBD2=m
  CONFIG_REISERFS_FS=m
  # CONFIG_REISERFS_CHECK is not set
  # CONFIG_REISERFS_PROC_INFO is not set
@@ -757,6 +757,7 @@ CONFIG_JFS_FS=m
  # CONFIG_JFS_DEBUG is not set
  # CONFIG_JFS_STATISTICS is not set
  # CONFIG_FS_POSIX_ACL is not set
+CONFIG_FILE_LOCKING=y
  CONFIG_XFS_FS=m
  # CONFIG_XFS_QUOTA is not set
  # CONFIG_XFS_POSIX_ACL is not set
@@ -768,6 +769,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
  # CONFIG_OCFS2_FS_STATS is not set
  # CONFIG_OCFS2_DEBUG_MASKLOG is not set
  # CONFIG_OCFS2_DEBUG_FS is not set
+# CONFIG_OCFS2_COMPAT_JBD is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
@@ -806,6 +808,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
  CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
  CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
  # CONFIG_TMPFS_POSIX_ACL is not set
@@ -849,6 +852,7 @@ CONFIG_EXPORTFS=m
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=y
  CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_REGISTER_V4 is not set
  CONFIG_RPCSEC_GSS_KRB5=y
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  CONFIG_SMB_FS=m
@@ -922,7 +926,13 @@ CONFIG_MAGIC_SYSRQ=y
  # CONFIG_DEBUG_KERNEL is not set
  CONFIG_DEBUG_BUGVERBOSE=y
  CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
  CONFIG_SYSCTL_SYSCALL_CHECK=y
+
+#
+# Tracers
+#
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  
  #
@@ -930,6 +940,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
  #
  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
@@ -940,10 +951,12 @@ CONFIG_CRYPTO=y
  #
  # Crypto core or helper
  #
+# CONFIG_CRYPTO_FIPS is not set
  CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD=y
  CONFIG_CRYPTO_BLKCIPHER=y
  CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_RNG=y
  CONFIG_CRYPTO_MANAGER=y
  CONFIG_CRYPTO_GF128MUL=m
  CONFIG_CRYPTO_NULL=m
@@ -1017,14 +1030,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
  #
  CONFIG_CRYPTO_DEFLATE=m
  CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
  # CONFIG_CRYPTO_HW is not set
  
  #
  # Library routines
  #
  CONFIG_BITREVERSE=y
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=m
  CONFIG_CRC_T10DIF=y
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig

index 72eaff0776b80ca5dcea68a7911d62054111f86d..3459c594194bb9070c416b54f413d95f5731c856 100644 (file)
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-rc6
-# Wed Sep 10 09:02:10 2008
+# Linux kernel version: 2.6.28-rc7
+# Tue Dec  2 20:27:52 2008
  #
  CONFIG_M68K=y
  CONFIG_MMU=y
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y
  CONFIG_GENERIC_IOMAP=y
  CONFIG_NO_IOPORT=y
  # CONFIG_NO_DMA is not set
-CONFIG_ARCH_SUPPORTS_AOUT=y
  CONFIG_HZ=100
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y
  CONFIG_TIMERFD=y
  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
+CONFIG_AIO=y
  CONFIG_VM_EVENT_COUNTERS=y
  CONFIG_SLAB=y
  # CONFIG_SLUB is not set
  # CONFIG_SLOB is not set
  # CONFIG_PROFILING is not set
  # CONFIG_MARKERS is not set
-# CONFIG_HAVE_OPROFILE is not set
-# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
-# CONFIG_HAVE_IOREMAP_PROT is not set
-# CONFIG_HAVE_KPROBES is not set
-# CONFIG_HAVE_KRETPROBES is not set
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
-# CONFIG_HAVE_DMA_ATTRS is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_HAVE_CLK is not set
-CONFIG_PROC_PAGE_MONITOR=y
  # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
  CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_CLASSIC_RCU=y
+# CONFIG_FREEZER is not set
  
  #
  # Platform dependent setup
  #
-# CONFIG_SUN3 is not set
  # CONFIG_AMIGA is not set
  # CONFIG_ATARI is not set
  # CONFIG_MAC is not set
@@ -148,19 +138,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y
  CONFIG_DISCONTIGMEM=y
  CONFIG_FLAT_NODE_MEM_MAP=y
  CONFIG_NEED_MULTIPLE_NODES=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  # CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
  
  #
  # General setup
  #
  CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
  CONFIG_BINFMT_AOUT=m
  CONFIG_BINFMT_MISC=m
  CONFIG_HEARTBEAT=y
@@ -209,7 +201,6 @@ CONFIG_INET_TCP_DIAG=m
  CONFIG_TCP_CONG_CUBIC=y
  CONFIG_DEFAULT_TCP_CONG="cubic"
  # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
  CONFIG_IPV6=m
  CONFIG_IPV6_PRIVACY=y
  CONFIG_IPV6_ROUTER_PREF=y
@@ -259,13 +250,14 @@ CONFIG_NF_CONNTRACK_SANE=m
  CONFIG_NF_CONNTRACK_SIP=m
  CONFIG_NF_CONNTRACK_TFTP=m
  # CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NETFILTER_TPROXY is not set
  CONFIG_NETFILTER_XTABLES=m
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
  CONFIG_NETFILTER_XT_TARGET_DSCP=m
  CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
  CONFIG_NETFILTER_XT_TARGET_RATEEST=m
  CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -279,19 +271,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
  CONFIG_NETFILTER_XT_MATCH_DCCP=m
  CONFIG_NETFILTER_XT_MATCH_DSCP=m
  CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
  CONFIG_NETFILTER_XT_MATCH_HELPER=m
  CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
  CONFIG_NETFILTER_XT_MATCH_LENGTH=m
  CONFIG_NETFILTER_XT_MATCH_LIMIT=m
  CONFIG_NETFILTER_XT_MATCH_MAC=m
  CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_OWNER=m
  CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
  CONFIG_NETFILTER_XT_MATCH_QUOTA=m
  CONFIG_NETFILTER_XT_MATCH_RATEEST=m
  CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
  CONFIG_NETFILTER_XT_MATCH_SCTP=m
  CONFIG_NETFILTER_XT_MATCH_STATE=m
  CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -299,20 +294,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
  CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
  CONFIG_NETFILTER_XT_MATCH_TIME=m
  CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+# CONFIG_IP_VS is not set
  
  #
  # IP: Netfilter Configuration
  #
+CONFIG_NF_DEFRAG_IPV4=m
  CONFIG_NF_CONNTRACK_IPV4=m
  CONFIG_NF_CONNTRACK_PROC_COMPAT=y
  CONFIG_IP_NF_QUEUE=m
  CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
  CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_FILTER=m
  CONFIG_IP_NF_TARGET_REJECT=m
  CONFIG_IP_NF_TARGET_LOG=m
@@ -320,8 +315,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
  CONFIG_NF_NAT=m
  CONFIG_NF_NAT_NEEDED=y
  CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_NF_NAT_SNMP_BASIC=m
  CONFIG_NF_NAT_PROTO_GRE=m
  CONFIG_NF_NAT_PROTO_UDPLITE=m
@@ -334,9 +329,9 @@ CONFIG_NF_NAT_PPTP=m
  CONFIG_NF_NAT_H323=m
  CONFIG_NF_NAT_SIP=m
  CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_TARGET_ECN=m
  CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_RAW=m
  CONFIG_IP_NF_ARPTABLES=m
  CONFIG_IP_NF_ARPFILTER=m
@@ -348,16 +343,16 @@ CONFIG_IP_NF_ARP_MANGLE=m
  CONFIG_NF_CONNTRACK_IPV6=m
  CONFIG_IP6_NF_QUEUE=m
  CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
  CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
  CONFIG_IP6_NF_MATCH_HL=m
  CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AH=m
  CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
  CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
  CONFIG_IP6_NF_TARGET_REJECT=m
  CONFIG_IP6_NF_MANGLE=m
  CONFIG_IP6_NF_TARGET_HL=m
@@ -384,6 +379,7 @@ CONFIG_SCTP_HMAC_MD5=y
  # CONFIG_TIPC is not set
  # CONFIG_ATM is not set
  # CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
  # CONFIG_VLAN_8021Q is not set
  # CONFIG_DECNET is not set
  CONFIG_LLC=m
@@ -407,19 +403,8 @@ CONFIG_NET_CLS_ROUTE=y
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
  # CONFIG_AF_RXRPC is not set
-
-#
-# Wireless
-#
-# CONFIG_CFG80211 is not set
-CONFIG_WIRELESS_EXT=y
-# CONFIG_WIRELESS_EXT_SYSFS is not set
-# CONFIG_MAC80211 is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_PHONET is not set
+# CONFIG_WIRELESS is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
  
@@ -458,21 +443,20 @@ CONFIG_ATA_OVER_ETH=m
  CONFIG_MISC_DEVICES=y
  # CONFIG_EEPROM_93CX6 is not set
  # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_C2PORT is not set
  CONFIG_HAVE_IDE=y
  CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
  
  #
  # Please see Documentation/ide/ide.txt for help/info on IDE drives
  #
-CONFIG_IDE_ATAPI=y
  # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD=y
+CONFIG_IDE_GD_ATA=y
+# CONFIG_IDE_GD_ATAPI is not set
  CONFIG_BLK_DEV_IDECD=y
  CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
  # CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_IDEFLOPPY=m
  # CONFIG_BLK_DEV_IDESCSI is not set
  # CONFIG_IDE_TASK_IOCTL is not set
  CONFIG_IDE_PROC_FS=y
@@ -585,8 +569,12 @@ CONFIG_NE2000=m
  # CONFIG_IBM_NEW_EMAC_RGMII is not set
  # CONFIG_IBM_NEW_EMAC_TAH is not set
  # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  # CONFIG_NET_PCI is not set
  # CONFIG_B44 is not set
+# CONFIG_CS89x0 is not set
  # CONFIG_NETDEV_1000 is not set
  # CONFIG_NETDEV_10000 is not set
  # CONFIG_TR is not set
@@ -656,6 +644,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
  CONFIG_MOUSE_PS2_SYNAPTICS=y
  CONFIG_MOUSE_PS2_LIFEBOOK=y
  CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
  # CONFIG_MOUSE_PS2_TOUCHKIT is not set
  CONFIG_MOUSE_SERIAL=m
  # CONFIG_MOUSE_INPORT is not set
@@ -717,11 +706,11 @@ CONFIG_GEN_RTC_X=y
  # CONFIG_THERMAL is not set
  # CONFIG_THERMAL_HWMON is not set
  # CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
  
  #
  # Sonics Silicon Backplane
  #
-CONFIG_SSB_POSSIBLE=y
  # CONFIG_SSB is not set
  
  #
@@ -731,6 +720,7 @@ CONFIG_SSB_POSSIBLE=y
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
  # CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
@@ -756,6 +746,7 @@ CONFIG_SSB_POSSIBLE=y
  CONFIG_FB=y
  # CONFIG_FIRMWARE_EDID is not set
  # CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
  CONFIG_FB_CFB_FILLRECT=y
  CONFIG_FB_CFB_COPYAREA=y
  CONFIG_FB_CFB_IMAGEBLIT=y
@@ -778,6 +769,8 @@ CONFIG_FB_Q40=y
  # CONFIG_FB_UVESA is not set
  # CONFIG_FB_S1D13XXX is not set
  # CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
  # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
  
  #
@@ -800,12 +793,19 @@ CONFIG_LOGO_LINUX_MONO=y
  CONFIG_LOGO_LINUX_VGA16=y
  CONFIG_LOGO_LINUX_CLUT224=y
  CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
  CONFIG_DMASOUND_Q40=m
  CONFIG_DMASOUND=m
  CONFIG_HID_SUPPORT=y
  CONFIG_HID=m
  # CONFIG_HID_DEBUG is not set
  CONFIG_HIDRAW=y
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_COMPAT=y
  # CONFIG_USB_SUPPORT is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
@@ -814,6 +814,8 @@ CONFIG_HIDRAW=y
  # CONFIG_RTC_CLASS is not set
  # CONFIG_DMADEVICES is not set
  # CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # Character devices
@@ -827,8 +829,9 @@ CONFIG_EXT2_FS=y
  # CONFIG_EXT2_FS_XIP is not set
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
+# CONFIG_EXT4_FS is not set
  CONFIG_JBD=y
+CONFIG_JBD2=m
  CONFIG_REISERFS_FS=m
  # CONFIG_REISERFS_CHECK is not set
  # CONFIG_REISERFS_PROC_INFO is not set
@@ -839,6 +842,7 @@ CONFIG_JFS_FS=m
  # CONFIG_JFS_DEBUG is not set
  # CONFIG_JFS_STATISTICS is not set
  # CONFIG_FS_POSIX_ACL is not set
+CONFIG_FILE_LOCKING=y
  CONFIG_XFS_FS=m
  # CONFIG_XFS_QUOTA is not set
  # CONFIG_XFS_POSIX_ACL is not set
@@ -850,6 +854,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
  # CONFIG_OCFS2_FS_STATS is not set
  # CONFIG_OCFS2_DEBUG_MASKLOG is not set
  # CONFIG_OCFS2_DEBUG_FS is not set
+# CONFIG_OCFS2_COMPAT_JBD is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
@@ -888,6 +893,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
  CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
  CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
  # CONFIG_TMPFS_POSIX_ACL is not set
@@ -930,6 +936,7 @@ CONFIG_EXPORTFS=m
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=y
  CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_REGISTER_V4 is not set
  CONFIG_RPCSEC_GSS_KRB5=y
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  CONFIG_SMB_FS=m
@@ -1002,7 +1009,13 @@ CONFIG_MAGIC_SYSRQ=y
  # CONFIG_DEBUG_KERNEL is not set
  CONFIG_DEBUG_BUGVERBOSE=y
  CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
  CONFIG_SYSCTL_SYSCALL_CHECK=y
+
+#
+# Tracers
+#
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  
  #
@@ -1010,6 +1023,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
  #
  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
@@ -1020,10 +1034,12 @@ CONFIG_CRYPTO=y
  #
  # Crypto core or helper
  #
+# CONFIG_CRYPTO_FIPS is not set
  CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD=y
  CONFIG_CRYPTO_BLKCIPHER=y
  CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_RNG=y
  CONFIG_CRYPTO_MANAGER=y
  CONFIG_CRYPTO_GF128MUL=m
  CONFIG_CRYPTO_NULL=m
@@ -1097,14 +1113,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
  #
  CONFIG_CRYPTO_DEFLATE=m
  CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
  # CONFIG_CRYPTO_HW is not set
  
  #
  # Library routines
  #
  CONFIG_BITREVERSE=y
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=m
  CONFIG_CRC_T10DIF=y
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig

index cb62b96d766ed5493b8bfc9806b31227be91b715..f404917429faefef7258b5b309374f4b7f8bf9d9 100644 (file)
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-rc6
-# Wed Sep 10 09:02:11 2008
+# Linux kernel version: 2.6.28-rc7
+# Tue Dec  2 20:27:53 2008
  #
  CONFIG_M68K=y
  CONFIG_MMU=y
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y
  CONFIG_GENERIC_IOMAP=y
  CONFIG_NO_IOPORT=y
  CONFIG_NO_DMA=y
-CONFIG_ARCH_SUPPORTS_AOUT=y
  CONFIG_HZ=100
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y
  CONFIG_TIMERFD=y
  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
+CONFIG_AIO=y
  CONFIG_VM_EVENT_COUNTERS=y
  CONFIG_SLAB=y
  # CONFIG_SLUB is not set
  # CONFIG_SLOB is not set
  # CONFIG_PROFILING is not set
  # CONFIG_MARKERS is not set
-# CONFIG_HAVE_OPROFILE is not set
-# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
-# CONFIG_HAVE_IOREMAP_PROT is not set
-# CONFIG_HAVE_KPROBES is not set
-# CONFIG_HAVE_KRETPROBES is not set
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
-# CONFIG_HAVE_DMA_ATTRS is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_HAVE_CLK is not set
-CONFIG_PROC_PAGE_MONITOR=y
  # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
  CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
@@ -115,10 +105,19 @@ CONFIG_DEFAULT_AS=y
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_CLASSIC_RCU=y
+# CONFIG_FREEZER is not set
  
  #
  # Platform dependent setup
  #
+# CONFIG_AMIGA is not set
+# CONFIG_ATARI is not set
+# CONFIG_MAC is not set
+# CONFIG_APOLLO is not set
+# CONFIG_VME is not set
+# CONFIG_HP300 is not set
+# CONFIG_SUN3X is not set
+# CONFIG_Q40 is not set
  CONFIG_SUN3=y
  
  #
@@ -137,19 +136,21 @@ CONFIG_FLATMEM_MANUAL=y
  CONFIG_FLATMEM=y
  CONFIG_FLAT_NODE_MEM_MAP=y
  CONFIG_NEED_MULTIPLE_NODES=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  # CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
  
  #
  # General setup
  #
  CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
  CONFIG_BINFMT_AOUT=m
  CONFIG_BINFMT_MISC=m
  CONFIG_PROC_HARDWARE=y
@@ -198,7 +199,6 @@ CONFIG_INET_TCP_DIAG=m
  CONFIG_TCP_CONG_CUBIC=y
  CONFIG_DEFAULT_TCP_CONG="cubic"
  # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
  CONFIG_IPV6=m
  CONFIG_IPV6_PRIVACY=y
  CONFIG_IPV6_ROUTER_PREF=y
@@ -248,13 +248,14 @@ CONFIG_NF_CONNTRACK_SANE=m
  CONFIG_NF_CONNTRACK_SIP=m
  CONFIG_NF_CONNTRACK_TFTP=m
  # CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NETFILTER_TPROXY is not set
  CONFIG_NETFILTER_XTABLES=m
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
  CONFIG_NETFILTER_XT_TARGET_DSCP=m
  CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
  CONFIG_NETFILTER_XT_TARGET_RATEEST=m
  CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -268,19 +269,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
  CONFIG_NETFILTER_XT_MATCH_DCCP=m
  CONFIG_NETFILTER_XT_MATCH_DSCP=m
  CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
  CONFIG_NETFILTER_XT_MATCH_HELPER=m
  CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
  CONFIG_NETFILTER_XT_MATCH_LENGTH=m
  CONFIG_NETFILTER_XT_MATCH_LIMIT=m
  CONFIG_NETFILTER_XT_MATCH_MAC=m
  CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_OWNER=m
  CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
  CONFIG_NETFILTER_XT_MATCH_QUOTA=m
  CONFIG_NETFILTER_XT_MATCH_RATEEST=m
  CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
  CONFIG_NETFILTER_XT_MATCH_SCTP=m
  CONFIG_NETFILTER_XT_MATCH_STATE=m
  CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -288,20 +292,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
  CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
  CONFIG_NETFILTER_XT_MATCH_TIME=m
  CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+# CONFIG_IP_VS is not set
  
  #
  # IP: Netfilter Configuration
  #
+CONFIG_NF_DEFRAG_IPV4=m
  CONFIG_NF_CONNTRACK_IPV4=m
  CONFIG_NF_CONNTRACK_PROC_COMPAT=y
  CONFIG_IP_NF_QUEUE=m
  CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
  CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_FILTER=m
  CONFIG_IP_NF_TARGET_REJECT=m
  CONFIG_IP_NF_TARGET_LOG=m
@@ -309,8 +313,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
  CONFIG_NF_NAT=m
  CONFIG_NF_NAT_NEEDED=y
  CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_NF_NAT_SNMP_BASIC=m
  CONFIG_NF_NAT_PROTO_GRE=m
  CONFIG_NF_NAT_PROTO_UDPLITE=m
@@ -323,9 +327,9 @@ CONFIG_NF_NAT_PPTP=m
  CONFIG_NF_NAT_H323=m
  CONFIG_NF_NAT_SIP=m
  CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_TARGET_ECN=m
  CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_RAW=m
  CONFIG_IP_NF_ARPTABLES=m
  CONFIG_IP_NF_ARPFILTER=m
@@ -337,16 +341,16 @@ CONFIG_IP_NF_ARP_MANGLE=m
  CONFIG_NF_CONNTRACK_IPV6=m
  CONFIG_IP6_NF_QUEUE=m
  CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
  CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
  CONFIG_IP6_NF_MATCH_HL=m
  CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AH=m
  CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
  CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
  CONFIG_IP6_NF_TARGET_REJECT=m
  CONFIG_IP6_NF_MANGLE=m
  CONFIG_IP6_NF_TARGET_HL=m
@@ -373,6 +377,7 @@ CONFIG_SCTP_HMAC_MD5=y
  # CONFIG_TIPC is not set
  # CONFIG_ATM is not set
  # CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
  # CONFIG_VLAN_8021Q is not set
  # CONFIG_DECNET is not set
  CONFIG_LLC=m
@@ -396,19 +401,8 @@ CONFIG_NET_CLS_ROUTE=y
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
  # CONFIG_AF_RXRPC is not set
-
-#
-# Wireless
-#
-# CONFIG_CFG80211 is not set
-CONFIG_WIRELESS_EXT=y
-# CONFIG_WIRELESS_EXT_SYSFS is not set
-# CONFIG_MAC80211 is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_PHONET is not set
+# CONFIG_WIRELESS is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
  
@@ -446,6 +440,7 @@ CONFIG_ATA_OVER_ETH=m
  CONFIG_MISC_DEVICES=y
  # CONFIG_EEPROM_93CX6 is not set
  # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_C2PORT is not set
  CONFIG_HAVE_IDE=y
  # CONFIG_IDE is not set
  
@@ -531,6 +526,9 @@ CONFIG_SUN3_82586=y
  # CONFIG_IBM_NEW_EMAC_RGMII is not set
  # CONFIG_IBM_NEW_EMAC_TAH is not set
  # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  # CONFIG_NETDEV_1000 is not set
  # CONFIG_NETDEV_10000 is not set
  
@@ -599,6 +597,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
  CONFIG_MOUSE_PS2_SYNAPTICS=y
  CONFIG_MOUSE_PS2_LIFEBOOK=y
  CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
  # CONFIG_MOUSE_PS2_TOUCHKIT is not set
  CONFIG_MOUSE_SERIAL=m
  # CONFIG_MOUSE_VSXXXAA is not set
@@ -654,10 +653,6 @@ CONFIG_GEN_RTC_X=y
  # CONFIG_THERMAL_HWMON is not set
  # CONFIG_WATCHDOG is not set
  
-#
-# Sonics Silicon Backplane
-#
-
  #
  # Multifunction device drivers
  #
@@ -665,6 +660,7 @@ CONFIG_GEN_RTC_X=y
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
  # CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
@@ -690,6 +686,7 @@ CONFIG_GEN_RTC_X=y
  CONFIG_FB=y
  # CONFIG_FIRMWARE_EDID is not set
  # CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
  # CONFIG_FB_CFB_FILLRECT is not set
  # CONFIG_FB_CFB_COPYAREA is not set
  # CONFIG_FB_CFB_IMAGEBLIT is not set
@@ -711,6 +708,8 @@ CONFIG_FB=y
  # CONFIG_FB_UVESA is not set
  # CONFIG_FB_S1D13XXX is not set
  # CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
  # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
  
  #
@@ -737,6 +736,12 @@ CONFIG_HID_SUPPORT=y
  CONFIG_HID=m
  # CONFIG_HID_DEBUG is not set
  CONFIG_HIDRAW=y
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_COMPAT=y
  # CONFIG_USB_SUPPORT is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
@@ -744,6 +749,8 @@ CONFIG_HIDRAW=y
  # CONFIG_ACCESSIBILITY is not set
  # CONFIG_RTC_CLASS is not set
  # CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # Character devices
@@ -757,8 +764,9 @@ CONFIG_EXT2_FS=y
  # CONFIG_EXT2_FS_XIP is not set
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
+# CONFIG_EXT4_FS is not set
  CONFIG_JBD=y
+CONFIG_JBD2=m
  CONFIG_REISERFS_FS=m
  # CONFIG_REISERFS_CHECK is not set
  # CONFIG_REISERFS_PROC_INFO is not set
@@ -769,6 +777,7 @@ CONFIG_JFS_FS=m
  # CONFIG_JFS_DEBUG is not set
  # CONFIG_JFS_STATISTICS is not set
  # CONFIG_FS_POSIX_ACL is not set
+CONFIG_FILE_LOCKING=y
  CONFIG_XFS_FS=m
  # CONFIG_XFS_QUOTA is not set
  # CONFIG_XFS_POSIX_ACL is not set
@@ -780,6 +789,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
  # CONFIG_OCFS2_FS_STATS is not set
  # CONFIG_OCFS2_DEBUG_MASKLOG is not set
  # CONFIG_OCFS2_DEBUG_FS is not set
+# CONFIG_OCFS2_COMPAT_JBD is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
@@ -818,6 +828,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
  CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
  CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
  # CONFIG_TMPFS_POSIX_ACL is not set
@@ -861,6 +872,7 @@ CONFIG_EXPORTFS=m
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=y
  CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_REGISTER_V4 is not set
  CONFIG_RPCSEC_GSS_KRB5=y
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  CONFIG_SMB_FS=m
@@ -934,7 +946,13 @@ CONFIG_MAGIC_SYSRQ=y
  # CONFIG_DEBUG_KERNEL is not set
  CONFIG_DEBUG_BUGVERBOSE=y
  CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
  CONFIG_SYSCTL_SYSCALL_CHECK=y
+
+#
+# Tracers
+#
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  
  #
@@ -942,6 +960,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
  #
  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
@@ -952,10 +971,12 @@ CONFIG_CRYPTO=y
  #
  # Crypto core or helper
  #
+# CONFIG_CRYPTO_FIPS is not set
  CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD=y
  CONFIG_CRYPTO_BLKCIPHER=y
  CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_RNG=y
  CONFIG_CRYPTO_MANAGER=y
  CONFIG_CRYPTO_GF128MUL=m
  CONFIG_CRYPTO_NULL=m
@@ -1029,14 +1050,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
  #
  CONFIG_CRYPTO_DEFLATE=m
  CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
  # CONFIG_CRYPTO_HW is not set
  
  #
  # Library routines
  #
  CONFIG_BITREVERSE=y
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=m
  CONFIG_CRC_T10DIF=y
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig

index 04b4363a70503d5fa50948cd678ed3d3f56dcaa2..4d8a1e84e39fc930b6235c243751823272ab8fea 100644 (file)
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-rc6
-# Wed Sep 10 09:02:12 2008
+# Linux kernel version: 2.6.28-rc7
+# Tue Dec  2 20:27:54 2008
  #
  CONFIG_M68K=y
  CONFIG_MMU=y
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y
  CONFIG_GENERIC_IOMAP=y
  CONFIG_NO_IOPORT=y
  # CONFIG_NO_DMA is not set
-CONFIG_ARCH_SUPPORTS_AOUT=y
  CONFIG_HZ=100
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y
  CONFIG_TIMERFD=y
  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
+CONFIG_AIO=y
  CONFIG_VM_EVENT_COUNTERS=y
  CONFIG_SLAB=y
  # CONFIG_SLUB is not set
  # CONFIG_SLOB is not set
  # CONFIG_PROFILING is not set
  # CONFIG_MARKERS is not set
-# CONFIG_HAVE_OPROFILE is not set
-# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
-# CONFIG_HAVE_IOREMAP_PROT is not set
-# CONFIG_HAVE_KPROBES is not set
-# CONFIG_HAVE_KRETPROBES is not set
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
-# CONFIG_HAVE_DMA_ATTRS is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_HAVE_CLK is not set
-CONFIG_PROC_PAGE_MONITOR=y
  # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
  CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_CLASSIC_RCU=y
+# CONFIG_FREEZER is not set
  
  #
  # Platform dependent setup
  #
-# CONFIG_SUN3 is not set
  # CONFIG_AMIGA is not set
  # CONFIG_ATARI is not set
  # CONFIG_MAC is not set
@@ -148,19 +138,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y
  CONFIG_DISCONTIGMEM=y
  CONFIG_FLAT_NODE_MEM_MAP=y
  CONFIG_NEED_MULTIPLE_NODES=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  # CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
  
  #
  # General setup
  #
  CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
  CONFIG_BINFMT_AOUT=m
  CONFIG_BINFMT_MISC=m
  CONFIG_PROC_HARDWARE=y
@@ -209,7 +201,6 @@ CONFIG_INET_TCP_DIAG=m
  CONFIG_TCP_CONG_CUBIC=y
  CONFIG_DEFAULT_TCP_CONG="cubic"
  # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
  CONFIG_IPV6=m
  CONFIG_IPV6_PRIVACY=y
  CONFIG_IPV6_ROUTER_PREF=y
@@ -259,13 +250,14 @@ CONFIG_NF_CONNTRACK_SANE=m
  CONFIG_NF_CONNTRACK_SIP=m
  CONFIG_NF_CONNTRACK_TFTP=m
  # CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NETFILTER_TPROXY is not set
  CONFIG_NETFILTER_XTABLES=m
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
  CONFIG_NETFILTER_XT_TARGET_DSCP=m
  CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
  CONFIG_NETFILTER_XT_TARGET_RATEEST=m
  CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -279,19 +271,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
  CONFIG_NETFILTER_XT_MATCH_DCCP=m
  CONFIG_NETFILTER_XT_MATCH_DSCP=m
  CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
  CONFIG_NETFILTER_XT_MATCH_HELPER=m
  CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
  CONFIG_NETFILTER_XT_MATCH_LENGTH=m
  CONFIG_NETFILTER_XT_MATCH_LIMIT=m
  CONFIG_NETFILTER_XT_MATCH_MAC=m
  CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_OWNER=m
  CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
  CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
  CONFIG_NETFILTER_XT_MATCH_QUOTA=m
  CONFIG_NETFILTER_XT_MATCH_RATEEST=m
  CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
  CONFIG_NETFILTER_XT_MATCH_SCTP=m
  CONFIG_NETFILTER_XT_MATCH_STATE=m
  CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -299,20 +294,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
  CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
  CONFIG_NETFILTER_XT_MATCH_TIME=m
  CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+# CONFIG_IP_VS is not set
  
  #
  # IP: Netfilter Configuration
  #
+CONFIG_NF_DEFRAG_IPV4=m
  CONFIG_NF_CONNTRACK_IPV4=m
  CONFIG_NF_CONNTRACK_PROC_COMPAT=y
  CONFIG_IP_NF_QUEUE=m
  CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
  CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_FILTER=m
  CONFIG_IP_NF_TARGET_REJECT=m
  CONFIG_IP_NF_TARGET_LOG=m
@@ -320,8 +315,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
  CONFIG_NF_NAT=m
  CONFIG_NF_NAT_NEEDED=y
  CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_NF_NAT_SNMP_BASIC=m
  CONFIG_NF_NAT_PROTO_GRE=m
  CONFIG_NF_NAT_PROTO_UDPLITE=m
@@ -334,9 +329,9 @@ CONFIG_NF_NAT_PPTP=m
  CONFIG_NF_NAT_H323=m
  CONFIG_NF_NAT_SIP=m
  CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_TARGET_ECN=m
  CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_RAW=m
  CONFIG_IP_NF_ARPTABLES=m
  CONFIG_IP_NF_ARPFILTER=m
@@ -348,16 +343,16 @@ CONFIG_IP_NF_ARP_MANGLE=m
  CONFIG_NF_CONNTRACK_IPV6=m
  CONFIG_IP6_NF_QUEUE=m
  CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
  CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
  CONFIG_IP6_NF_MATCH_HL=m
  CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AH=m
  CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
  CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
  CONFIG_IP6_NF_TARGET_REJECT=m
  CONFIG_IP6_NF_MANGLE=m
  CONFIG_IP6_NF_TARGET_HL=m
@@ -384,6 +379,7 @@ CONFIG_SCTP_HMAC_MD5=y
  # CONFIG_TIPC is not set
  # CONFIG_ATM is not set
  # CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
  # CONFIG_VLAN_8021Q is not set
  # CONFIG_DECNET is not set
  CONFIG_LLC=m
@@ -407,19 +403,8 @@ CONFIG_NET_CLS_ROUTE=y
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
  # CONFIG_AF_RXRPC is not set
-
-#
-# Wireless
-#
-# CONFIG_CFG80211 is not set
-CONFIG_WIRELESS_EXT=y
-# CONFIG_WIRELESS_EXT_SYSFS is not set
-# CONFIG_MAC80211 is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_PHONET is not set
+# CONFIG_WIRELESS is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
  
@@ -457,6 +442,7 @@ CONFIG_ATA_OVER_ETH=m
  CONFIG_MISC_DEVICES=y
  # CONFIG_EEPROM_93CX6 is not set
  # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_C2PORT is not set
  CONFIG_HAVE_IDE=y
  # CONFIG_IDE is not set
  
@@ -541,6 +527,9 @@ CONFIG_SUN3LANCE=y
  # CONFIG_IBM_NEW_EMAC_RGMII is not set
  # CONFIG_IBM_NEW_EMAC_TAH is not set
  # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  # CONFIG_B44 is not set
  # CONFIG_NETDEV_1000 is not set
  # CONFIG_NETDEV_10000 is not set
@@ -610,6 +599,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
  CONFIG_MOUSE_PS2_SYNAPTICS=y
  CONFIG_MOUSE_PS2_LIFEBOOK=y
  CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
  # CONFIG_MOUSE_PS2_TOUCHKIT is not set
  CONFIG_MOUSE_SERIAL=m
  # CONFIG_MOUSE_VSXXXAA is not set
@@ -664,11 +654,11 @@ CONFIG_GEN_RTC_X=y
  # CONFIG_THERMAL is not set
  # CONFIG_THERMAL_HWMON is not set
  # CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
  
  #
  # Sonics Silicon Backplane
  #
-CONFIG_SSB_POSSIBLE=y
  # CONFIG_SSB is not set
  
  #
@@ -678,6 +668,7 @@ CONFIG_SSB_POSSIBLE=y
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
  # CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
@@ -703,6 +694,7 @@ CONFIG_SSB_POSSIBLE=y
  CONFIG_FB=y
  # CONFIG_FIRMWARE_EDID is not set
  # CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
  # CONFIG_FB_CFB_FILLRECT is not set
  # CONFIG_FB_CFB_COPYAREA is not set
  # CONFIG_FB_CFB_IMAGEBLIT is not set
@@ -724,6 +716,8 @@ CONFIG_FB=y
  # CONFIG_FB_UVESA is not set
  # CONFIG_FB_S1D13XXX is not set
  # CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
  # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
  
  #
@@ -750,6 +744,12 @@ CONFIG_HID_SUPPORT=y
  CONFIG_HID=m
  # CONFIG_HID_DEBUG is not set
  CONFIG_HIDRAW=y
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_COMPAT=y
  # CONFIG_USB_SUPPORT is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
@@ -758,6 +758,8 @@ CONFIG_HIDRAW=y
  # CONFIG_RTC_CLASS is not set
  # CONFIG_DMADEVICES is not set
  # CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # Character devices
@@ -771,8 +773,9 @@ CONFIG_EXT2_FS=y
  # CONFIG_EXT2_FS_XIP is not set
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
+# CONFIG_EXT4_FS is not set
  CONFIG_JBD=y
+CONFIG_JBD2=m
  CONFIG_REISERFS_FS=m
  # CONFIG_REISERFS_CHECK is not set
  # CONFIG_REISERFS_PROC_INFO is not set
@@ -783,6 +786,7 @@ CONFIG_JFS_FS=m
  # CONFIG_JFS_DEBUG is not set
  # CONFIG_JFS_STATISTICS is not set
  # CONFIG_FS_POSIX_ACL is not set
+CONFIG_FILE_LOCKING=y
  CONFIG_XFS_FS=m
  # CONFIG_XFS_QUOTA is not set
  # CONFIG_XFS_POSIX_ACL is not set
@@ -794,6 +798,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
  # CONFIG_OCFS2_FS_STATS is not set
  # CONFIG_OCFS2_DEBUG_MASKLOG is not set
  # CONFIG_OCFS2_DEBUG_FS is not set
+# CONFIG_OCFS2_COMPAT_JBD is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
@@ -832,6 +837,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
  CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
  CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
  # CONFIG_TMPFS_POSIX_ACL is not set
@@ -875,6 +881,7 @@ CONFIG_EXPORTFS=m
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=y
  CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_REGISTER_V4 is not set
  CONFIG_RPCSEC_GSS_KRB5=y
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  CONFIG_SMB_FS=m
@@ -948,7 +955,13 @@ CONFIG_MAGIC_SYSRQ=y
  # CONFIG_DEBUG_KERNEL is not set
  CONFIG_DEBUG_BUGVERBOSE=y
  CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
  CONFIG_SYSCTL_SYSCALL_CHECK=y
+
+#
+# Tracers
+#
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  
  #
@@ -956,6 +969,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
  #
  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
@@ -966,10 +980,12 @@ CONFIG_CRYPTO=y
  #
  # Crypto core or helper
  #
+# CONFIG_CRYPTO_FIPS is not set
  CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD=y
  CONFIG_CRYPTO_BLKCIPHER=y
  CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_RNG=y
  CONFIG_CRYPTO_MANAGER=y
  CONFIG_CRYPTO_GF128MUL=m
  CONFIG_CRYPTO_NULL=m
@@ -1043,14 +1059,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
  #
  CONFIG_CRYPTO_DEFLATE=m
  CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
  # CONFIG_CRYPTO_HW is not set
  
  #
  # Library routines
  #
  CONFIG_BITREVERSE=y
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=m
  CONFIG_CRC_T10DIF=y
diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug

index 765c8e287d2b2b45f2687f607c61ecc1d1096cad..364ca89388072bdef9c9083183b329cec5828af7 100644 (file)
--- a/arch/mips/Kconfig.debug
+++ b/arch/mips/Kconfig.debug
@@ -48,7 +48,7 @@ config RUNTIME_DEBUG
         help
           If you say Y here, some debugging macros will do run-time checking.
           If you say N here, those macros will mostly turn to no-ops.  See
-         include/asm-mips/debug.h for debuging macros.
+         arch/mips/include/asm/debug.h for debugging macros.
           If unsure, say N.
  
  endmenu
diff --git a/arch/mips/configs/fulong_defconfig b/arch/mips/configs/fulong_defconfig

index 620980081a308080323d48db08328d8c170d370f..b6698a232ae93e8c65e8247ddc5075f3c260dea7 100644 (file)
--- a/arch/mips/configs/fulong_defconfig
+++ b/arch/mips/configs/fulong_defconfig
@@ -1,63 +1,78 @@
  #
  # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc4
-# Mon Jun 11 00:23:51 2007
+# Linux kernel version: 2.6.28-rc6
+# Fri Nov 28 17:53:48 2008
  #
  CONFIG_MIPS=y
  
  #
  # Machine selection
  #
-CONFIG_LEMOTE_FULONG=y
  # CONFIG_MACH_ALCHEMY is not set
  # CONFIG_BASLER_EXCITE is not set
+# CONFIG_BCM47XX is not set
  # CONFIG_MIPS_COBALT is not set
  # CONFIG_MACH_DECSTATION is not set
  # CONFIG_MACH_JAZZ is not set
+# CONFIG_LASAT is not set
+CONFIG_LEMOTE_FULONG=y
  # CONFIG_MIPS_MALTA is not set
-# CONFIG_WR_PPMC is not set
  # CONFIG_MIPS_SIM is not set
+# CONFIG_MACH_EMMA is not set
+# CONFIG_MACH_VR41XX is not set
+# CONFIG_NXP_STB220 is not set
+# CONFIG_NXP_STB225 is not set
  # CONFIG_PNX8550_JBS is not set
  # CONFIG_PNX8550_STB810 is not set
-# CONFIG_MACH_VR41XX is not set
+# CONFIG_PMC_MSP is not set
  # CONFIG_PMC_YOSEMITE is not set
-# CONFIG_MARKEINS is not set
  # CONFIG_SGI_IP22 is not set
  # CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP28 is not set
  # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
  # CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
  # CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
+# CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
+# CONFIG_SIBYTE_SENTOSA is not set
+# CONFIG_SIBYTE_BIGSUR is not set
  # CONFIG_SNI_RM is not set
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_MACH_TX39XX is not set
+# CONFIG_MACH_TX49XX is not set
+# CONFIG_MIKROTIK_RB532 is not set
+# CONFIG_WR_PPMC is not set
  CONFIG_RWSEM_GENERIC_SPINLOCK=y
  # CONFIG_ARCH_HAS_ILOG2_U32 is not set
  # CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_ARCH_SUPPORTS_OPROFILE=y
  CONFIG_GENERIC_FIND_NEXT_BIT=y
  CONFIG_GENERIC_HWEIGHT=y
  CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_CLOCKEVENTS=y
  CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
  CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
  CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_CEVT_R4K=y
+CONFIG_CSRC_R4K=y
  CONFIG_DMA_NONCOHERENT=y
  CONFIG_DMA_NEED_PCI_MAP_STATE=y
  CONFIG_EARLY_PRINTK=y
  CONFIG_SYS_HAS_EARLY_PRINTK=y
+# CONFIG_HOTPLUG_CPU is not set
  CONFIG_I8259=y
  # CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y
  # CONFIG_CPU_BIG_ENDIAN is not set
  CONFIG_CPU_LITTLE_ENDIAN=y
  CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
  CONFIG_IRQ_CPU=y
  CONFIG_BOOT_ELF32=y
  CONFIG_MIPS_L1_CACHE_SHIFT=5
+CONFIG_HAVE_STD_PC_SERIAL_PORT=y
  
  #
  # CPU selection
@@ -75,6 +90,7 @@ CONFIG_CPU_LOONGSON2=y
  # CONFIG_CPU_TX49XX is not set
  # CONFIG_CPU_R5000 is not set
  # CONFIG_CPU_R5432 is not set
+# CONFIG_CPU_R5500 is not set
  # CONFIG_CPU_R6000 is not set
  # CONFIG_CPU_NEVADA is not set
  # CONFIG_CPU_R8000 is not set
@@ -101,7 +117,6 @@ CONFIG_BOARD_SCACHE=y
  CONFIG_MIPS_MT_DISABLED=y
  # CONFIG_MIPS_MT_SMP is not set
  # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
  CONFIG_CPU_HAS_WB=y
  CONFIG_CPU_HAS_SYNC=y
  CONFIG_GENERIC_HARDIRQS=y
@@ -109,6 +124,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
  CONFIG_CPU_SUPPORTS_HIGHMEM=y
  CONFIG_SYS_SUPPORTS_HIGHMEM=y
  CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
  CONFIG_ARCH_SPARSEMEM_ENABLE=y
  CONFIG_SELECT_MEMORY_MODEL=y
  CONFIG_FLATMEM_MANUAL=y
@@ -117,9 +133,17 @@ CONFIG_FLATMEM_MANUAL=y
  CONFIG_FLATMEM=y
  CONFIG_FLAT_NODE_MEM_MAP=y
  CONFIG_SPARSEMEM_STATIC=y
+CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  CONFIG_RESOURCES_64BIT=y
+CONFIG_PHYS_ADDR_T_64BIT=y
  CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
  # CONFIG_HZ_48 is not set
  # CONFIG_HZ_100 is not set
  # CONFIG_HZ_128 is not set
@@ -133,37 +157,40 @@ CONFIG_HZ=250
  CONFIG_PREEMPT_VOLUNTARY=y
  # CONFIG_PREEMPT is not set
  # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
  CONFIG_LOCKDEP_SUPPORT=y
  CONFIG_STACKTRACE_SUPPORT=y
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
  #
-# Code maturity level options
+# General setup
  #
  CONFIG_EXPERIMENTAL=y
  CONFIG_BROKEN_ON_SMP=y
  CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
  CONFIG_LOCALVERSION="lm32"
  # CONFIG_LOCALVERSION_AUTO is not set
  CONFIG_SWAP=y
  CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
  CONFIG_SYSVIPC_SYSCTL=y
  CONFIG_POSIX_MQUEUE=y
  CONFIG_BSD_PROCESS_ACCT=y
  # CONFIG_BSD_PROCESS_ACCT_V3 is not set
  # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
  # CONFIG_AUDIT is not set
  CONFIG_IKCONFIG=y
  CONFIG_IKCONFIG_PROC=y
  CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+# CONFIG_GROUP_SCHED is not set
  CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
  # CONFIG_RELAY is not set
+CONFIG_NAMESPACES=y
+# CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
  # CONFIG_BLK_DEV_INITRD is not set
  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
  CONFIG_SYSCTL=y
@@ -175,6 +202,8 @@ CONFIG_HOTPLUG=y
  CONFIG_PRINTK=y
  CONFIG_BUG=y
  CONFIG_ELF_CORE=y
+# CONFIG_PCSPKR_PLATFORM is not set
+# CONFIG_COMPAT_BRK is not set
  CONFIG_BASE_FULL=y
  CONFIG_FUTEX=y
  CONFIG_ANON_INODES=y
@@ -183,29 +212,33 @@ CONFIG_SIGNALFD=y
  CONFIG_TIMERFD=y
  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
+CONFIG_AIO=y
  CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
  CONFIG_SLAB=y
  # CONFIG_SLUB is not set
  # CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+# CONFIG_MARKERS is not set
+CONFIG_OPROFILE=m
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
  # CONFIG_TINY_SHMEM is not set
  CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
  CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
  CONFIG_MODULE_UNLOAD=y
  CONFIG_MODULE_FORCE_UNLOAD=y
  # CONFIG_MODVERSIONS is not set
  # CONFIG_MODULE_SRCVERSION_ALL is not set
  CONFIG_KMOD=y
-
-#
-# Block layer
-#
  CONFIG_BLOCK=y
  # CONFIG_BLK_DEV_IO_TRACE is not set
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLOCK_COMPAT=y
  
  #
  # IO Schedulers
@@ -219,19 +252,19 @@ CONFIG_IOSCHED_CFQ=y
  CONFIG_DEFAULT_CFQ=y
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_CLASSIC_RCU=y
+CONFIG_FREEZER=y
  
  #
  # Bus options (PCI, PCMCIA, EISA, ISA, TC)
  #
  CONFIG_HW_HAS_PCI=y
  CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
  # CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCI_LEGACY=y
  CONFIG_ISA=y
  CONFIG_MMU=y
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
  # CONFIG_PCCARD is not set
  # CONFIG_HOTPLUG_PCI is not set
  
@@ -239,8 +272,9 @@ CONFIG_MMU=y
  # Executable file formats
  #
  CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
  CONFIG_BINFMT_MISC=y
-# CONFIG_BUILD_ELF64 is not set
  CONFIG_MIPS32_COMPAT=y
  CONFIG_COMPAT=y
  CONFIG_SYSVIPC_COMPAT=y
@@ -251,14 +285,12 @@ CONFIG_BINFMT_ELF32=y
  #
  # Power management options
  #
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
  CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
  # CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
-
-#
-# Networking
-#
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
  CONFIG_NET=y
  
  #
@@ -271,6 +303,7 @@ CONFIG_XFRM=y
  # CONFIG_XFRM_USER is not set
  # CONFIG_XFRM_SUB_POLICY is not set
  # CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
  # CONFIG_NET_KEY is not set
  CONFIG_INET=y
  CONFIG_IP_MULTICAST=y
@@ -294,18 +327,17 @@ CONFIG_INET_TUNNEL=m
  # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
  # CONFIG_INET_XFRM_MODE_TUNNEL is not set
  CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
  # CONFIG_INET_DIAG is not set
  # CONFIG_TCP_CONG_ADVANCED is not set
  CONFIG_TCP_CONG_CUBIC=y
  CONFIG_DEFAULT_TCP_CONG="cubic"
  # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
  # CONFIG_IPV6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
  # CONFIG_NETWORK_SECMARK is not set
  CONFIG_NETFILTER=y
  # CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
  
  #
  # Core Netfilter Configuration
@@ -313,53 +345,59 @@ CONFIG_NETFILTER=y
  CONFIG_NETFILTER_NETLINK=m
  CONFIG_NETFILTER_NETLINK_QUEUE=m
  CONFIG_NETFILTER_NETLINK_LOG=m
-# CONFIG_NF_CONNTRACK_ENABLED is not set
  # CONFIG_NF_CONNTRACK is not set
  CONFIG_NETFILTER_XTABLES=m
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  # CONFIG_NETFILTER_XT_TARGET_DSCP is not set
  CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
  # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
  CONFIG_NETFILTER_XT_MATCH_COMMENT=m
  CONFIG_NETFILTER_XT_MATCH_DCCP=m
  # CONFIG_NETFILTER_XT_MATCH_DSCP is not set
  CONFIG_NETFILTER_XT_MATCH_ESP=m
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
  CONFIG_NETFILTER_XT_MATCH_LENGTH=m
  CONFIG_NETFILTER_XT_MATCH_LIMIT=m
  CONFIG_NETFILTER_XT_MATCH_MAC=m
  CONFIG_NETFILTER_XT_MATCH_MARK=m
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
  CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
  CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
  CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
  CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
  CONFIG_NETFILTER_XT_MATCH_SCTP=m
  CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
  CONFIG_NETFILTER_XT_MATCH_STRING=m
  CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# CONFIG_IP_VS is not set
  
  #
  # IP: Netfilter Configuration
  #
+# CONFIG_NF_DEFRAG_IPV4 is not set
  CONFIG_IP_NF_QUEUE=m
  CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
  CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_FILTER=m
  CONFIG_IP_NF_TARGET_REJECT=m
  CONFIG_IP_NF_TARGET_LOG=m
  CONFIG_IP_NF_TARGET_ULOG=m
  CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
  CONFIG_IP_NF_TARGET_ECN=m
  CONFIG_IP_NF_TARGET_TTL=m
  CONFIG_IP_NF_RAW=m
@@ -371,6 +409,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
  # CONFIG_TIPC is not set
  # CONFIG_ATM is not set
  # CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
  # CONFIG_VLAN_8021Q is not set
  # CONFIG_DECNET is not set
  # CONFIG_LLC2 is not set
@@ -380,10 +419,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
  # CONFIG_LAPB is not set
  # CONFIG_ECONET is not set
  # CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
  # CONFIG_NET_SCHED is not set
  CONFIG_NET_CLS_ROUTE=y
  
@@ -392,23 +427,25 @@ CONFIG_NET_CLS_ROUTE=y
  #
  # CONFIG_NET_PKTGEN is not set
  # CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
  # CONFIG_AF_RXRPC is not set
-
-#
-# Wireless
-#
+CONFIG_PHONET=m
+CONFIG_WIRELESS=y
  # CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_OLD_REGULATORY=y
  CONFIG_WIRELESS_EXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
  # CONFIG_MAC80211 is not set
  CONFIG_IEEE80211=m
  # CONFIG_IEEE80211_DEBUG is not set
  CONFIG_IEEE80211_CRYPT_WEP=m
  # CONFIG_IEEE80211_CRYPT_CCMP is not set
  # CONFIG_IEEE80211_CRYPT_TKIP is not set
-# CONFIG_IEEE80211_SOFTMAC is not set
  # CONFIG_RFKILL is not set
+CONFIG_NET_9P=m
+# CONFIG_NET_9P_DEBUG is not set
  
  #
  # Device Drivers
@@ -417,14 +454,13 @@ CONFIG_IEEE80211_CRYPT_WEP=m
  #
  # Generic Driver Options
  #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
  CONFIG_STANDALONE=y
  CONFIG_PREVENT_FIRMWARE_BUILD=y
  CONFIG_FW_LOADER=m
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
  # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
  # CONFIG_CONNECTOR is not set
  CONFIG_MTD=m
  # CONFIG_MTD_DEBUG is not set
@@ -443,6 +479,7 @@ CONFIG_MTD_BLOCK=m
  # CONFIG_INFTL is not set
  # CONFIG_RFD_FTL is not set
  # CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
  
  #
  # RAM/ROM/Flash chip drivers
@@ -482,6 +519,7 @@ CONFIG_MTD_PHYSMAP=m
  CONFIG_MTD_PHYSMAP_START=0x1fc00000
  CONFIG_MTD_PHYSMAP_LEN=0x80000
  CONFIG_MTD_PHYSMAP_BANKWIDTH=1
+# CONFIG_MTD_INTEL_VR_NOR is not set
  # CONFIG_MTD_PLATRAM is not set
  
  #
@@ -506,21 +544,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1
  # UBI - Unsorted block images
  #
  # CONFIG_MTD_UBI is not set
-
-#
-# Parallel port support
-#
  # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
  # CONFIG_PNP is not set
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
  # CONFIG_BLK_CPQ_DA is not set
  # CONFIG_BLK_CPQ_CISS_DA is not set
  # CONFIG_BLK_DEV_DAC960 is not set
@@ -534,32 +560,28 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
  CONFIG_BLK_DEV_RAM=m
  CONFIG_BLK_DEV_RAM_COUNT=16
  CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_BLK_DEV_XIP is not set
  CONFIG_CDROM_PKTCDVD=m
  CONFIG_CDROM_PKTCDVD_BUFFERS=8
  # CONFIG_CDROM_PKTCDVD_WCACHE is not set
  CONFIG_ATA_OVER_ETH=m
-
-#
-# Misc devices
-#
-# CONFIG_PHANTOM is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
  CONFIG_IDE=y
-CONFIG_IDE_MAX_HWIFS=4
-CONFIG_BLK_DEV_IDE=y
  
  #
-# Please see Documentation/ide.txt for help/info on IDE drives
+# Please see Documentation/ide/ide.txt for help/info on IDE drives
  #
+CONFIG_IDE_TIMINGS=y
+CONFIG_IDE_ATAPI=y
  # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_IDEDISK_MULTI_MODE=y
+CONFIG_IDE_GD=y
+CONFIG_IDE_GD_ATA=y
+# CONFIG_IDE_GD_ATAPI is not set
  CONFIG_BLK_DEV_IDECD=y
+CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
  # CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
  CONFIG_BLK_DEV_IDESCSI=y
  CONFIG_IDE_TASK_IOCTL=y
  CONFIG_IDE_PROC_FS=y
@@ -568,24 +590,25 @@ CONFIG_IDE_PROC_FS=y
  # IDE chipset support/bugfixes
  #
  CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_PLATFORM is not set
+CONFIG_BLK_DEV_IDEDMA_SFF=y
+
+#
+# PCI IDE chipsets support
+#
  CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
  CONFIG_IDEPCI_PCIBUS_ORDER=y
  # CONFIG_BLK_DEV_OFFBOARD is not set
  CONFIG_BLK_DEV_GENERIC=y
  # CONFIG_BLK_DEV_OPTI621 is not set
  CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
  # CONFIG_BLK_DEV_AEC62XX is not set
  # CONFIG_BLK_DEV_ALI15X3 is not set
  # CONFIG_BLK_DEV_AMD74XX is not set
  # CONFIG_BLK_DEV_CMD64X is not set
  # CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
  # CONFIG_BLK_DEV_CS5520 is not set
  # CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_HPT34X is not set
  # CONFIG_BLK_DEV_HPT366 is not set
  # CONFIG_BLK_DEV_JMICRON is not set
  # CONFIG_BLK_DEV_SC1200 is not set
@@ -601,17 +624,28 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
  # CONFIG_BLK_DEV_TRM290 is not set
  CONFIG_BLK_DEV_VIA82CXXX=y
  # CONFIG_BLK_DEV_TC86C001 is not set
-# CONFIG_IDE_ARM is not set
-# CONFIG_IDE_CHIPSETS is not set
+
+#
+# Other IDE chipsets support
+#
+
+#
+# Note: most of these also require special kernel boot parameters
+#
+# CONFIG_BLK_DEV_4DRIVES is not set
+# CONFIG_BLK_DEV_ALI14XX is not set
+# CONFIG_BLK_DEV_DTC2278 is not set
+# CONFIG_BLK_DEV_HT6560B is not set
+# CONFIG_BLK_DEV_QD65XX is not set
+# CONFIG_BLK_DEV_UMC8672 is not set
  CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_BLK_DEV_HD is not set
  
  #
  # SCSI device support
  #
  # CONFIG_RAID_ATTRS is not set
  CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
  # CONFIG_SCSI_TGT is not set
  # CONFIG_SCSI_NETLINK is not set
  CONFIG_SCSI_PROC_FS=y
@@ -644,88 +678,30 @@ CONFIG_SCSI_WAIT_SCAN=m
  # CONFIG_SCSI_ISCSI_ATTRS is not set
  # CONFIG_SCSI_SAS_ATTRS is not set
  # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+# CONFIG_SCSI_LOWLEVEL is not set
+# CONFIG_SCSI_DH is not set
  # CONFIG_ATA is not set
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
  # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
  # CONFIG_FUSION is not set
-# CONFIG_FUSION_SPI is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION_SAS is not set
  
  #
  # IEEE 1394 (FireWire) support
  #
-# CONFIG_FIREWIRE is not set
-# CONFIG_IEEE1394 is not set
  
  #
-# I2O device support
+# Enable only one of the two stacks, unless you know what you are doing
  #
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
  # CONFIG_I2O is not set
-
-#
-# Network device support
-#
  CONFIG_NETDEVICES=y
  # CONFIG_DUMMY is not set
  # CONFIG_BONDING is not set
+CONFIG_MACVLAN=m
  # CONFIG_EQUALIZER is not set
  # CONFIG_TUN is not set
+CONFIG_VETH=m
  # CONFIG_ARCNET is not set
  CONFIG_PHYLIB=m
  
@@ -740,29 +716,32 @@ CONFIG_CICADA_PHY=m
  # CONFIG_VITESSE_PHY is not set
  # CONFIG_SMSC_PHY is not set
  # CONFIG_BROADCOM_PHY is not set
-# CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
  CONFIG_NET_ETHERNET=y
  CONFIG_MII=y
+# CONFIG_AX88796 is not set
  # CONFIG_HAPPYMEAL is not set
  # CONFIG_SUNGEM is not set
  # CONFIG_CASSINI is not set
  # CONFIG_NET_VENDOR_3COM is not set
  # CONFIG_NET_VENDOR_SMC is not set
+# CONFIG_SMC91X is not set
  # CONFIG_DM9000 is not set
  # CONFIG_NET_VENDOR_RACAL is not set
-
-#
-# Tulip family network device support
-#
  # CONFIG_NET_TULIP is not set
  # CONFIG_AT1700 is not set
  # CONFIG_DEPCA is not set
  # CONFIG_HP100 is not set
  # CONFIG_NET_ISA is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  CONFIG_NET_PCI=y
  # CONFIG_PCNET32 is not set
  # CONFIG_AMD8111_ETH is not set
@@ -773,7 +752,6 @@ CONFIG_NET_PCI=y
  # CONFIG_FORCEDETH is not set
  # CONFIG_CS89x0 is not set
  # CONFIG_TC35815 is not set
-# CONFIG_DGRS is not set
  # CONFIG_EEPRO100 is not set
  # CONFIG_E100 is not set
  # CONFIG_FEALNX is not set
@@ -785,15 +763,21 @@ CONFIG_8139TOO=y
  # CONFIG_8139TOO_TUNE_TWISTER is not set
  # CONFIG_8139TOO_8129 is not set
  # CONFIG_8139_OLD_RX_RESET is not set
+# CONFIG_R6040 is not set
  # CONFIG_SIS900 is not set
  # CONFIG_EPIC100 is not set
  # CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
  # CONFIG_VIA_RHINE is not set
  # CONFIG_SC92031 is not set
+# CONFIG_ATL2 is not set
  CONFIG_NETDEV_1000=y
  # CONFIG_ACENIC is not set
  # CONFIG_DL2K is not set
  # CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
  # CONFIG_NS83820 is not set
  # CONFIG_HAMACHI is not set
  # CONFIG_YELLOWFIN is not set
@@ -801,20 +785,29 @@ CONFIG_NETDEV_1000=y
  # CONFIG_SIS190 is not set
  # CONFIG_SKGE is not set
  # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
  # CONFIG_VIA_VELOCITY is not set
  # CONFIG_TIGON3 is not set
  # CONFIG_BNX2 is not set
  # CONFIG_QLA3XXX is not set
  # CONFIG_ATL1 is not set
+# CONFIG_ATL1E is not set
+# CONFIG_JME is not set
  CONFIG_NETDEV_10000=y
  # CONFIG_CHELSIO_T1 is not set
  # CONFIG_CHELSIO_T3 is not set
+# CONFIG_ENIC is not set
+# CONFIG_IXGBE is not set
  # CONFIG_IXGB is not set
  # CONFIG_S2IO is not set
  # CONFIG_MYRI10GE is not set
  # CONFIG_NETXEN_NIC is not set
+# CONFIG_NIU is not set
+# CONFIG_MLX4_EN is not set
  # CONFIG_MLX4_CORE is not set
+# CONFIG_TEHUTI is not set
+# CONFIG_BNX2X is not set
+# CONFIG_QLGE is not set
+# CONFIG_SFC is not set
  # CONFIG_TR is not set
  
  #
@@ -822,6 +815,7 @@ CONFIG_NETDEV_10000=y
  #
  # CONFIG_WLAN_PRE80211 is not set
  # CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
  
  #
  # USB Network Adapters
@@ -830,7 +824,6 @@ CONFIG_NETDEV_10000=y
  # CONFIG_USB_KAWETH is not set
  # CONFIG_USB_PEGASUS is not set
  # CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
  # CONFIG_USB_USBNET is not set
  # CONFIG_WAN is not set
  # CONFIG_FDDI is not set
@@ -844,25 +837,17 @@ CONFIG_PPP_DEFLATE=m
  CONFIG_PPP_BSDCOMP=m
  CONFIG_PPP_MPPE=m
  CONFIG_PPPOE=m
+CONFIG_PPPOL2TP=m
  CONFIG_SLIP=m
  CONFIG_SLIP_COMPRESSED=y
  CONFIG_SLHC=m
  CONFIG_SLIP_SMART=y
  CONFIG_SLIP_MODE_SLIP6=y
  CONFIG_NET_FC=y
-# CONFIG_SHAPER is not set
  # CONFIG_NETCONSOLE is not set
  # CONFIG_NETPOLL is not set
  # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
  # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
  # CONFIG_PHONE is not set
  
  #
@@ -870,6 +855,7 @@ CONFIG_NET_FC=y
  #
  CONFIG_INPUT=y
  CONFIG_INPUT_FF_MEMLESS=y
+# CONFIG_INPUT_POLLDEV is not set
  
  #
  # Userland interfaces
@@ -879,7 +865,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
  CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
  CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
  # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
  # CONFIG_INPUT_EVDEV is not set
  # CONFIG_INPUT_EVBUG is not set
  
@@ -900,9 +885,11 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
  CONFIG_MOUSE_PS2_SYNAPTICS=y
  CONFIG_MOUSE_PS2_LIFEBOOK=y
  CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
  # CONFIG_MOUSE_PS2_TOUCHKIT is not set
  CONFIG_MOUSE_SERIAL=y
  # CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
  # CONFIG_MOUSE_INPORT is not set
  # CONFIG_MOUSE_LOGIBM is not set
  # CONFIG_MOUSE_PC110PAD is not set
@@ -927,10 +914,13 @@ CONFIG_SERIO_LIBPS2=y
  # Character devices
  #
  CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
  CONFIG_VT_CONSOLE=y
  CONFIG_HW_CONSOLE=y
  # CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
  # CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
  
  #
  # Serial drivers
@@ -951,105 +941,152 @@ CONFIG_SERIAL_CORE_CONSOLE=y
  CONFIG_UNIX98_PTYS=y
  CONFIG_LEGACY_PTYS=y
  CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
  # CONFIG_IPMI_HANDLER is not set
-# CONFIG_WATCHDOG is not set
  CONFIG_HW_RANDOM=y
-CONFIG_RTC=y
  # CONFIG_DTLK is not set
  # CONFIG_R3964 is not set
  # CONFIG_APPLICOM is not set
-# CONFIG_DRM is not set
  # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
  # CONFIG_TCG_TPM is not set
  CONFIG_DEVPORT=y
  CONFIG_I2C=m
  CONFIG_I2C_BOARDINFO=y
  CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_HELPER_AUTO=y
  
  #
-# I2C Algorithms
+# I2C Hardware Bus support
  #
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALGOPCA is not set
  
  #
-# I2C Hardware Bus support
+# PC SMBus host controller drivers
  #
  # CONFIG_I2C_ALI1535 is not set
  # CONFIG_I2C_ALI1563 is not set
  # CONFIG_I2C_ALI15X3 is not set
  # CONFIG_I2C_AMD756 is not set
  # CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_ELEKTOR is not set
  # CONFIG_I2C_I801 is not set
-# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_ISCH is not set
  # CONFIG_I2C_PIIX4 is not set
  # CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PROSAVAGE is not set
-# CONFIG_I2C_SAVAGE4 is not set
-# CONFIG_I2C_SIMTEC is not set
  # CONFIG_I2C_SIS5595 is not set
  # CONFIG_I2C_SIS630 is not set
  # CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_TINY_USB is not set
  # CONFIG_I2C_VIA is not set
  CONFIG_I2C_VIAPRO=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_SIMTEC is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+
+#
+# Graphics adapter I2C/DDC channel drivers
+#
  # CONFIG_I2C_VOODOO3 is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_ELEKTOR is not set
  # CONFIG_I2C_PCA_ISA is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_STUB is not set
  
  #
  # Miscellaneous I2C Chip support
  #
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_AT24 is not set
  # CONFIG_SENSORS_EEPROM is not set
  # CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_PCF8575 is not set
  # CONFIG_SENSORS_PCA9539 is not set
  # CONFIG_SENSORS_PCF8591 is not set
  # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
  # CONFIG_I2C_DEBUG_CORE is not set
  # CONFIG_I2C_DEBUG_ALGO is not set
  # CONFIG_I2C_DEBUG_BUS is not set
  # CONFIG_I2C_DEBUG_CHIP is not set
-
-#
-# SPI support
-#
  # CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
  
  #
-# Dallas's 1-wire bus
+# Sonics Silicon Backplane
  #
-# CONFIG_W1 is not set
-# CONFIG_HWMON is not set
+# CONFIG_SSB is not set
  
  #
  # Multifunction device drivers
  #
+# CONFIG_MFD_CORE is not set
  # CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
  #
+
+#
+# Multimedia core support
+#
  CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_VIDEO_ALLOW_V4L1=y
  CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_V4L2=y
+# CONFIG_DVB_CORE is not set
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_CUSTOMIZE=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L1=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DMA_CONTIG=m
  CONFIG_VIDEO_CAPTURE_DRIVERS=y
  # CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
  CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
  # CONFIG_VIDEO_VIVI is not set
  # CONFIG_VIDEO_BT848 is not set
@@ -1058,17 +1095,46 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
  # CONFIG_VIDEO_CPIA2 is not set
  # CONFIG_VIDEO_SAA5246A is not set
  # CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_TUNER_3036 is not set
  # CONFIG_VIDEO_STRADIS is not set
  # CONFIG_VIDEO_SAA7134 is not set
  # CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_DPC is not set
  # CONFIG_VIDEO_HEXIUM_ORION is not set
  # CONFIG_VIDEO_HEXIUM_GEMINI is not set
  # CONFIG_VIDEO_CX88 is not set
  # CONFIG_VIDEO_IVTV is not set
  # CONFIG_VIDEO_CAFE_CCIC is not set
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_MT9M001=m
+CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_SOC_CAMERA_MT9V022=m
+CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_VIDEO_SH_MOBILE_CEU=m
  CONFIG_V4L_USB_DRIVERS=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_ZC3XX=m
  # CONFIG_VIDEO_PVRUSB2 is not set
  # CONFIG_VIDEO_EM28XX is not set
  # CONFIG_VIDEO_USBVISION is not set
@@ -1079,7 +1145,6 @@ CONFIG_USB_KONICAWC=m
  CONFIG_USB_QUICKCAM_MESSENGER=m
  CONFIG_USB_ET61X251=m
  # CONFIG_VIDEO_OVCAMCHIP is not set
-# CONFIG_USB_W9968CF is not set
  CONFIG_USB_OV511=m
  CONFIG_USB_SE401=m
  CONFIG_USB_SN9C102=m
@@ -1088,6 +1153,8 @@ CONFIG_USB_ZC0301=m
  CONFIG_USB_PWC=m
  # CONFIG_USB_PWC_DEBUG is not set
  # CONFIG_USB_ZR364XX is not set
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
  CONFIG_RADIO_ADAPTERS=y
  # CONFIG_RADIO_CADET is not set
  # CONFIG_RADIO_RTRACK is not set
@@ -1104,33 +1171,30 @@ CONFIG_RADIO_ADAPTERS=y
  # CONFIG_RADIO_TYPHOON is not set
  # CONFIG_RADIO_ZOLTRIX is not set
  # CONFIG_USB_DSBR is not set
-# CONFIG_DVB_CORE is not set
+CONFIG_USB_SI470X=m
+CONFIG_USB_MR800=m
  CONFIG_DAB=y
  # CONFIG_USB_DABUSB is not set
  
  #
  # Graphics support
  #
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_LCD_CLASS_DEVICE=m
-
-#
-# Display device support
-#
-# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_DRM is not set
  # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
  CONFIG_FB=y
  # CONFIG_FIRMWARE_EDID is not set
  # CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
  CONFIG_FB_CFB_FILLRECT=y
  CONFIG_FB_CFB_COPYAREA=y
  CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
  # CONFIG_FB_SYS_FILLRECT is not set
  # CONFIG_FB_SYS_COPYAREA is not set
  # CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
  # CONFIG_FB_SYS_FOPS is not set
-CONFIG_FB_DEFERRED_IO=y
  # CONFIG_FB_SVGALIB is not set
  # CONFIG_FB_MACMODES is not set
  CONFIG_FB_BACKLIGHT=y
@@ -1158,16 +1222,30 @@ CONFIG_FB_RADEON_BACKLIGHT=y
  # CONFIG_FB_S3 is not set
  # CONFIG_FB_SAVAGE is not set
  # CONFIG_FB_SIS is not set
+# CONFIG_FB_VIA is not set
  # CONFIG_FB_NEOMAGIC is not set
  # CONFIG_FB_KYRO is not set
  # CONFIG_FB_3DFX is not set
  # CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_SMIVGX is not set
  # CONFIG_FB_VT8623 is not set
  # CONFIG_FB_TRIDENT is not set
  # CONFIG_FB_ARK is not set
  # CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
  # CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_PLATFORM is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_CORGI is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
  
  #
  # Console display driver support
@@ -1176,20 +1254,14 @@ CONFIG_FB_RADEON_BACKLIGHT=y
  # CONFIG_MDA_CONSOLE is not set
  CONFIG_DUMMY_CONSOLE=y
  CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
  # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
  # CONFIG_FONTS is not set
  CONFIG_FONT_8x8=y
  CONFIG_FONT_8x16=y
  # CONFIG_LOGO is not set
-
-#
-# Sound
-#
  CONFIG_SOUND=y
-
-#
-# Advanced Linux Sound Architecture
-#
+CONFIG_SOUND_OSS_CORE=y
  CONFIG_SND=m
  CONFIG_SND_TIMER=m
  CONFIG_SND_PCM=m
@@ -1201,28 +1273,22 @@ CONFIG_SND_MIXER_OSS=m
  CONFIG_SND_PCM_OSS=m
  CONFIG_SND_PCM_OSS_PLUGINS=y
  CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_RTCTIMER=m
-CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
  # CONFIG_SND_DYNAMIC_MINORS is not set
  CONFIG_SND_SUPPORT_OLD_API=y
  CONFIG_SND_VERBOSE_PROCFS=y
  # CONFIG_SND_VERBOSE_PRINTK is not set
  # CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
+CONFIG_SND_VMASTER=y
  CONFIG_SND_MPU401_UART=m
  CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
  # CONFIG_SND_DUMMY is not set
  # CONFIG_SND_VIRMIDI is not set
  # CONFIG_SND_MTPAV is not set
  # CONFIG_SND_SERIAL_U16550 is not set
  # CONFIG_SND_MPU401 is not set
-
-#
-# PCI devices
-#
+# CONFIG_SND_AC97_POWER_SAVE is not set
+CONFIG_SND_PCI=y
  # CONFIG_SND_AD1889 is not set
  # CONFIG_SND_ALS300 is not set
  # CONFIG_SND_ALI5451 is not set
@@ -1231,10 +1297,12 @@ CONFIG_SND_AC97_CODEC=m
  # CONFIG_SND_AU8810 is not set
  # CONFIG_SND_AU8820 is not set
  # CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
  # CONFIG_SND_AZT3328 is not set
  # CONFIG_SND_BT87X is not set
  # CONFIG_SND_CA0106 is not set
  # CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_OXYGEN is not set
  # CONFIG_SND_CS4281 is not set
  # CONFIG_SND_CS46XX is not set
  # CONFIG_SND_DARLA20 is not set
@@ -1259,6 +1327,7 @@ CONFIG_SND_AC97_CODEC=m
  # CONFIG_SND_HDA_INTEL is not set
  # CONFIG_SND_HDSP is not set
  # CONFIG_SND_HDSPM is not set
+# CONFIG_SND_HIFIER is not set
  # CONFIG_SND_ICE1712 is not set
  # CONFIG_SND_ICE1724 is not set
  # CONFIG_SND_INTEL8X0 is not set
@@ -1276,43 +1345,26 @@ CONFIG_SND_AC97_CODEC=m
  # CONFIG_SND_TRIDENT is not set
  CONFIG_SND_VIA82XX=m
  # CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
  # CONFIG_SND_VX222 is not set
  # CONFIG_SND_YMFPCI is not set
-# CONFIG_SND_AC97_POWER_SAVE is not set
-
-#
-# ALSA MIPS devices
-#
-
-#
-# USB devices
-#
+CONFIG_SND_MIPS=y
+CONFIG_SND_USB=y
  # CONFIG_SND_USB_AUDIO is not set
  # CONFIG_SND_USB_CAIAQ is not set
-
-#
-# System on Chip audio support
-#
  # CONFIG_SND_SOC is not set
-
-#
-# Open Sound System
-#
  # CONFIG_SOUND_PRIME is not set
  CONFIG_AC97_BUS=m
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
  CONFIG_HID=y
  # CONFIG_HID_DEBUG is not set
+CONFIG_HIDRAW=y
  
  #
  # USB Input Devices
  #
  CONFIG_USB_HID=m
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-# CONFIG_HID_FF is not set
+CONFIG_HID_PID=y
  CONFIG_USB_HIDDEV=y
  
  #
@@ -1322,13 +1374,39 @@ CONFIG_USB_HIDDEV=y
  # CONFIG_USB_MOUSE is not set
  
  #
-# USB support
-#
+# Special HID drivers
+#
+CONFIG_HID_COMPAT=y
+CONFIG_HID_A4TECH=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BRIGHT=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DELL=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_LOGITECH=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_PANTHERLORD=m
+# CONFIG_PANTHERLORD_FF is not set
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_SUNPLUS=m
+# CONFIG_THRUSTMASTER_FF is not set
+CONFIG_ZEROPLUS_FF=m
+CONFIG_USB_SUPPORT=y
  CONFIG_USB_ARCH_HAS_HCD=y
  CONFIG_USB_ARCH_HAS_OHCI=y
  CONFIG_USB_ARCH_HAS_EHCI=y
  CONFIG_USB=y
  # CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
  
  #
  # Miscellaneous USB options
@@ -1338,35 +1416,46 @@ CONFIG_USB_DEVICEFS=y
  # CONFIG_USB_DYNAMIC_MINORS is not set
  # CONFIG_USB_SUSPEND is not set
  # CONFIG_USB_OTG is not set
+CONFIG_USB_OTG_WHITELIST=y
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_WUSB is not set
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
  
  #
  # USB Host Controller Drivers
  #
+CONFIG_USB_C67X00_HCD=m
  CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_SPLIT_ISO=y
  CONFIG_USB_EHCI_ROOT_HUB_TT=y
  CONFIG_USB_EHCI_TT_NEWSCHED=y
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
  # CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_ISP1760_HCD=m
  CONFIG_USB_OHCI_HCD=y
  # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
  # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
  CONFIG_USB_OHCI_LITTLE_ENDIAN=y
  CONFIG_USB_UHCI_HCD=m
  # CONFIG_USB_SL811_HCD is not set
+CONFIG_USB_R8A66597_HCD=m
+# CONFIG_USB_WHCI_HCD is not set
+# CONFIG_USB_HWA_HCD is not set
  
  #
  # USB Device Class drivers
  #
  CONFIG_USB_ACM=y
  CONFIG_USB_PRINTER=y
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
  
  #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
  #
  
  #
-# may also be needed; see USB_STORAGE Help for more information
+# see USB_STORAGE Help for more information
  #
  CONFIG_USB_STORAGE=y
  # CONFIG_USB_STORAGE_DEBUG is not set
@@ -1379,7 +1468,9 @@ CONFIG_USB_STORAGE=y
  # CONFIG_USB_STORAGE_SDDR55 is not set
  # CONFIG_USB_STORAGE_JUMPSHOT is not set
  # CONFIG_USB_STORAGE_ALAUDA is not set
+CONFIG_USB_STORAGE_ONETOUCH=y
  # CONFIG_USB_STORAGE_KARMA is not set
+CONFIG_USB_STORAGE_CYPRESS_ATACB=y
  CONFIG_USB_LIBUSUAL=y
  
  #
@@ -1387,15 +1478,10 @@ CONFIG_USB_LIBUSUAL=y
  #
  # CONFIG_USB_MDC800 is not set
  # CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_MON is not set
  
  #
  # USB port drivers
  #
-
-#
-# USB Serial Converter support
-#
  # CONFIG_USB_SERIAL is not set
  
  #
@@ -1404,7 +1490,7 @@ CONFIG_USB_LIBUSUAL=y
  # CONFIG_USB_EMI62 is not set
  # CONFIG_USB_EMI26 is not set
  # CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_AUERSWALD is not set
+CONFIG_USB_SEVSEG=m
  # CONFIG_USB_RIO500 is not set
  # CONFIG_USB_LEGOTOWER is not set
  # CONFIG_USB_LCD is not set
@@ -1421,56 +1507,75 @@ CONFIG_USB_LIBUSUAL=y
  # CONFIG_USB_TRANCEVIBRATOR is not set
  # CONFIG_USB_IOWARRIOR is not set
  # CONFIG_USB_TEST is not set
-
-#
-# USB DSL modem support
-#
-
-#
-# USB Gadget Support
-#
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_VST=m
  # CONFIG_USB_GADGET is not set
+# CONFIG_UWB is not set
  # CONFIG_MMC is not set
-
-#
-# LED devices
-#
+# CONFIG_MEMSTICK is not set
  # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
+# CONFIG_ACCESSIBILITY is not set
  # CONFIG_INFINIBAND is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=m
  
  #
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+# RTC interfaces
  #
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+# CONFIG_RTC_DRV_TEST is not set
  
  #
-# Real Time Clock
+# I2C RTC drivers
  #
-# CONFIG_RTC_CLASS is not set
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
  
  #
-# DMA Engine support
+# SPI RTC drivers
  #
-# CONFIG_DMA_ENGINE is not set
  
  #
-# DMA Clients
+# Platform RTC drivers
  #
+CONFIG_RTC_DRV_CMOS=m
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_V3020 is not set
  
  #
-# DMA Devices
+# on-CPU RTC drivers
  #
+# CONFIG_DMADEVICES is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+# CONFIG_UIO_PDRV is not set
+# CONFIG_UIO_PDRV_GENIRQ is not set
+# CONFIG_UIO_SMX is not set
+# CONFIG_UIO_SERCOS3 is not set
+# CONFIG_STAGING is not set
+CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # File systems
@@ -1478,27 +1583,31 @@ CONFIG_USB_LIBUSUAL=y
  CONFIG_EXT2_FS=y
  # CONFIG_EXT2_FS_XATTR is not set
  CONFIG_EXT2_FS_XIP=y
-CONFIG_FS_XIP=y
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4DEV_COMPAT=y
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_FS_XIP=y
  CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=m
+CONFIG_FS_MBCACHE=m
  CONFIG_REISERFS_FS=m
  # CONFIG_REISERFS_CHECK is not set
  # CONFIG_REISERFS_PROC_INFO is not set
  # CONFIG_REISERFS_FS_XATTR is not set
  # CONFIG_JFS_FS is not set
  CONFIG_FS_POSIX_ACL=y
+CONFIG_FILE_LOCKING=y
  # CONFIG_XFS_FS is not set
  # CONFIG_GFS2_FS is not set
  # CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
+CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
  # CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
  CONFIG_AUTOFS_FS=y
  CONFIG_AUTOFS4_FS=y
  CONFIG_FUSE_FS=y
@@ -1530,11 +1639,11 @@ CONFIG_NTFS_RW=y
  CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
  CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
  # CONFIG_TMPFS_POSIX_ACL is not set
  # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
  # CONFIG_CONFIGFS_FS is not set
  
  #
@@ -1550,25 +1659,23 @@ CONFIG_RAMFS=y
  # CONFIG_JFFS2_FS is not set
  # CONFIG_CRAMFS is not set
  # CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+CONFIG_OMFS_FS=m
  # CONFIG_HPFS_FS is not set
  # CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
  # CONFIG_SYSV_FS is not set
  # CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
+CONFIG_NETWORK_FILESYSTEMS=y
  CONFIG_NFS_FS=m
  CONFIG_NFS_V3=y
  CONFIG_NFS_V3_ACL=y
  CONFIG_NFS_V4=y
-CONFIG_NFS_DIRECTIO=y
  CONFIG_NFSD=m
  CONFIG_NFSD_V2_ACL=y
  CONFIG_NFSD_V3=y
  CONFIG_NFSD_V3_ACL=y
  CONFIG_NFSD_V4=y
-CONFIG_NFSD_TCP=y
  CONFIG_LOCKD=m
  CONFIG_LOCKD_V4=y
  CONFIG_EXPORTFS=m
@@ -1576,7 +1683,7 @@ CONFIG_NFS_ACL_SUPPORT=m
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=m
  CONFIG_SUNRPC_GSS=m
-# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_SUNRPC_REGISTER_V4 is not set
  CONFIG_RPCSEC_GSS_KRB5=m
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  CONFIG_SMB_FS=m
@@ -1616,10 +1723,6 @@ CONFIG_MSDOS_PARTITION=y
  # CONFIG_KARMA_PARTITION is not set
  # CONFIG_EFI_PARTITION is not set
  # CONFIG_SYSV68_PARTITION is not set
-
-#
-# Native Language Support
-#
  CONFIG_NLS=y
  CONFIG_NLS_DEFAULT="utf8"
  # CONFIG_NLS_CODEPAGE_437 is not set
@@ -1660,30 +1763,31 @@ CONFIG_NLS_ISO8859_1=y
  # CONFIG_NLS_KOI8_R is not set
  # CONFIG_NLS_KOI8_U is not set
  CONFIG_NLS_UTF8=y
-
-#
-# Distributed Lock Manager
-#
  # CONFIG_DLM is not set
  
-#
-# Profiling support
-#
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-
  #
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
  # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
  # CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=2048
  # CONFIG_MAGIC_SYSRQ is not set
  # CONFIG_UNUSED_SYMBOLS is not set
  # CONFIG_DEBUG_FS is not set
  # CONFIG_HEADERS_CHECK is not set
  # CONFIG_DEBUG_KERNEL is not set
-CONFIG_CROSSCOMPILE=y
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+
+#
+# Tracers
+#
+CONFIG_DYNAMIC_PRINTK_DEBUG=y
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
  CONFIG_CMDLINE=""
  
  #
@@ -1691,64 +1795,113 @@ CONFIG_CMDLINE=""
  #
  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+CONFIG_SECURITY_FILE_CAPABILITIES=y
+CONFIG_CRYPTO=y
  
  #
-# Cryptographic options
+# Crypto core or helper
  #
-CONFIG_CRYPTO=y
+CONFIG_CRYPTO_FIPS=y
  CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_BLKCIPHER=y
  CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_RNG=y
  CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_GF128MUL=m
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+
+#
+# Hash modes
+#
  CONFIG_CRYPTO_HMAC=y
  # CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_NULL is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
  # CONFIG_CRYPTO_MD4 is not set
  CONFIG_CRYPTO_MD5=m
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
  CONFIG_CRYPTO_SHA1=m
  # CONFIG_CRYPTO_SHA256 is not set
  # CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_WP512 is not set
  # CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_ARC4=m
  # CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
  # CONFIG_CRYPTO_CAST5 is not set
  # CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_TEA is not set
-CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_DES=m
+# CONFIG_CRYPTO_FCRYPT is not set
  # CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SEED=m
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
  CONFIG_CRYPTO_DEFLATE=m
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_LZO=m
  
  #
-# Hardware crypto devices
+# Random Number Generation
  #
+CONFIG_CRYPTO_ANSI_CPRNG=m
+# CONFIG_CRYPTO_HW is not set
  
  #
  # Library routines
  #
  CONFIG_BITREVERSE=y
  CONFIG_CRC_CCITT=y
-# CONFIG_CRC16 is not set
-# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC16=m
+# CONFIG_CRC_T10DIF is not set
+CONFIG_CRC_ITU_T=m
  CONFIG_CRC32=y
+CONFIG_CRC7=m
  # CONFIG_LIBCRC32C is not set
  CONFIG_ZLIB_INFLATE=m
  CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=m
  CONFIG_TEXTSEARCH=y
  CONFIG_TEXTSEARCH_KMP=m
  CONFIG_TEXTSEARCH_BM=m
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig

index f719bf5e01aa4b2a64b9c630beba112591f23308..1158228764175bd98dced751c530f25ee7a74332 100644 (file)
--- a/arch/mips/configs/ip22_defconfig
+++ b/arch/mips/configs/ip22_defconfig
@@ -1,30 +1,34 @@
  #
  # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23-rc2
-# Tue Aug  7 12:39:49 2007
+# Linux kernel version: 2.6.28-rc6
+# Fri Nov 28 15:41:33 2008
  #
  CONFIG_MIPS=y
  
  #
  # Machine selection
  #
-CONFIG_ZONE_DMA=y
  # CONFIG_MACH_ALCHEMY is not set
  # CONFIG_BASLER_EXCITE is not set
+# CONFIG_BCM47XX is not set
  # CONFIG_MIPS_COBALT is not set
  # CONFIG_MACH_DECSTATION is not set
  # CONFIG_MACH_JAZZ is not set
+# CONFIG_LASAT is not set
  # CONFIG_LEMOTE_FULONG is not set
  # CONFIG_MIPS_MALTA is not set
  # CONFIG_MIPS_SIM is not set
-# CONFIG_MARKEINS is not set
+# CONFIG_MACH_EMMA is not set
  # CONFIG_MACH_VR41XX is not set
+# CONFIG_NXP_STB220 is not set
+# CONFIG_NXP_STB225 is not set
  # CONFIG_PNX8550_JBS is not set
  # CONFIG_PNX8550_STB810 is not set
  # CONFIG_PMC_MSP is not set
  # CONFIG_PMC_YOSEMITE is not set
  CONFIG_SGI_IP22=y
  # CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP28 is not set
  # CONFIG_SGI_IP32 is not set
  # CONFIG_SIBYTE_CRHINE is not set
  # CONFIG_SIBYTE_CARMEL is not set
@@ -35,34 +39,49 @@ CONFIG_SGI_IP22=y
  # CONFIG_SIBYTE_SENTOSA is not set
  # CONFIG_SIBYTE_BIGSUR is not set
  # CONFIG_SNI_RM is not set
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_MACH_TX39XX is not set
+# CONFIG_MACH_TX49XX is not set
+# CONFIG_MIKROTIK_RB532 is not set
  # CONFIG_WR_PPMC is not set
  CONFIG_RWSEM_GENERIC_SPINLOCK=y
  # CONFIG_ARCH_HAS_ILOG2_U32 is not set
  # CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_ARCH_SUPPORTS_OPROFILE=y
  CONFIG_GENERIC_FIND_NEXT_BIT=y
  CONFIG_GENERIC_HWEIGHT=y
  CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_CLOCKEVENTS=y
  CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
  CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
  # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
  CONFIG_ARC=y
+CONFIG_CEVT_R4K=y
+CONFIG_CSRC_R4K=y
  CONFIG_DMA_NONCOHERENT=y
  CONFIG_DMA_NEED_PCI_MAP_STATE=y
  CONFIG_EARLY_PRINTK=y
  CONFIG_SYS_HAS_EARLY_PRINTK=y
+# CONFIG_HOTPLUG_CPU is not set
+CONFIG_I8259=y
  # CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_ISA_DMA=y
  CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y
  CONFIG_CPU_BIG_ENDIAN=y
  # CONFIG_CPU_LITTLE_ENDIAN is not set
  CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
  CONFIG_IRQ_CPU=y
  CONFIG_SWAP_IO_SPACE=y
+CONFIG_SGI_HAS_INDYDOG=y
+CONFIG_SGI_HAS_HAL2=y
+CONFIG_SGI_HAS_SEEQ=y
+CONFIG_SGI_HAS_WD93=y
+CONFIG_SGI_HAS_ZILOG=y
+CONFIG_SGI_HAS_I8042=y
+CONFIG_DEFAULT_SGI_PARTITION=y
  CONFIG_ARC32=y
  CONFIG_BOOT_ELF32=y
-CONFIG_MIPS_L1_CACHE_SHIFT=5
+CONFIG_MIPS_L1_CACHE_SHIFT=7
  CONFIG_ARC_CONSOLE=y
  CONFIG_ARC_PROMLIB=y
  
@@ -82,6 +101,7 @@ CONFIG_ARC_PROMLIB=y
  # CONFIG_CPU_TX49XX is not set
  CONFIG_CPU_R5000=y
  # CONFIG_CPU_R5432 is not set
+# CONFIG_CPU_R5500 is not set
  # CONFIG_CPU_R6000 is not set
  # CONFIG_CPU_NEVADA is not set
  # CONFIG_CPU_R8000 is not set
@@ -115,18 +135,24 @@ CONFIG_CPU_HAS_SYNC=y
  CONFIG_GENERIC_HARDIRQS=y
  CONFIG_GENERIC_IRQ_PROBE=y
  CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
  CONFIG_SELECT_MEMORY_MODEL=y
  CONFIG_FLATMEM_MANUAL=y
  # CONFIG_DISCONTIGMEM_MANUAL is not set
  # CONFIG_SPARSEMEM_MANUAL is not set
  CONFIG_FLATMEM=y
  CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
  CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
  # CONFIG_HZ_48 is not set
  # CONFIG_HZ_100 is not set
  # CONFIG_HZ_128 is not set
@@ -159,13 +185,20 @@ CONFIG_SYSVIPC_SYSCTL=y
  # CONFIG_POSIX_MQUEUE is not set
  # CONFIG_BSD_PROCESS_ACCT is not set
  # CONFIG_TASKSTATS is not set
-# CONFIG_USER_NS is not set
  # CONFIG_AUDIT is not set
  CONFIG_IKCONFIG=y
  CONFIG_IKCONFIG_PROC=y
  CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+# CONFIG_GROUP_SCHED is not set
  CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
  CONFIG_RELAY=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
  # CONFIG_BLK_DEV_INITRD is not set
  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
  CONFIG_SYSCTL=y
@@ -177,6 +210,8 @@ CONFIG_KALLSYMS=y
  CONFIG_PRINTK=y
  CONFIG_BUG=y
  CONFIG_ELF_CORE=y
+# CONFIG_PCSPKR_PLATFORM is not set
+# CONFIG_COMPAT_BRK is not set
  CONFIG_BASE_FULL=y
  CONFIG_FUTEX=y
  CONFIG_ANON_INODES=y
@@ -185,14 +220,21 @@ CONFIG_SIGNALFD=y
  CONFIG_TIMERFD=y
  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
+CONFIG_AIO=y
  CONFIG_VM_EVENT_COUNTERS=y
  CONFIG_SLAB=y
  # CONFIG_SLUB is not set
  # CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
  # CONFIG_TINY_SHMEM is not set
  CONFIG_BASE_SMALL=0
  CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
  CONFIG_MODULE_UNLOAD=y
  # CONFIG_MODULE_FORCE_UNLOAD is not set
  CONFIG_MODVERSIONS=y
@@ -203,6 +245,7 @@ CONFIG_BLOCK=y
  # CONFIG_BLK_DEV_IO_TRACE is not set
  # CONFIG_LSF is not set
  # CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
  
  #
  # IO Schedulers
@@ -216,6 +259,8 @@ CONFIG_DEFAULT_AS=y
  # CONFIG_DEFAULT_CFQ is not set
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_CLASSIC_RCU=y
+# CONFIG_FREEZER is not set
  
  #
  # Bus options (PCI, PCMCIA, EISA, ISA, TC)
@@ -224,29 +269,24 @@ CONFIG_HW_HAS_EISA=y
  # CONFIG_ARCH_SUPPORTS_MSI is not set
  # CONFIG_EISA is not set
  CONFIG_MMU=y
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
+CONFIG_I8253=y
  
  #
  # Executable file formats
  #
  CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
  CONFIG_BINFMT_MISC=m
  CONFIG_TRAD_SIGNALS=y
  
  #
  # Power management options
  #
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
  CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
  # CONFIG_PM_DEBUG is not set
  # CONFIG_SUSPEND is not set
-
-#
-# Networking
-#
  CONFIG_NET=y
  
  #
@@ -259,6 +299,8 @@ CONFIG_XFRM=y
  CONFIG_XFRM_USER=m
  # CONFIG_XFRM_SUB_POLICY is not set
  CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
  CONFIG_NET_KEY=y
  CONFIG_NET_KEY_MIGRATE=y
  CONFIG_INET=y
@@ -282,42 +324,13 @@ CONFIG_INET_TUNNEL=m
  CONFIG_INET_XFRM_MODE_TRANSPORT=m
  CONFIG_INET_XFRM_MODE_TUNNEL=m
  CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_LRO is not set
  CONFIG_INET_DIAG=y
  CONFIG_INET_TCP_DIAG=y
  # CONFIG_TCP_CONG_ADVANCED is not set
  CONFIG_TCP_CONG_CUBIC=y
  CONFIG_DEFAULT_TCP_CONG="cubic"
  CONFIG_TCP_MD5SIG=y
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
  CONFIG_IPV6=m
  CONFIG_IPV6_PRIVACY=y
  CONFIG_IPV6_ROUTER_PREF=y
@@ -334,12 +347,16 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
  CONFIG_INET6_XFRM_MODE_BEET=m
  CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
  CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
  CONFIG_IPV6_TUNNEL=m
  CONFIG_IPV6_MULTIPLE_TABLES=y
  CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_PIMSM_V2=y
  CONFIG_NETWORK_SECMARK=y
  CONFIG_NETFILTER=y
  # CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
  
  #
  # Core Netfilter Configuration
@@ -347,12 +364,12 @@ CONFIG_NETFILTER=y
  CONFIG_NETFILTER_NETLINK=m
  CONFIG_NETFILTER_NETLINK_QUEUE=m
  CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK_ENABLED=m
  CONFIG_NF_CONNTRACK=m
  CONFIG_NF_CT_ACCT=y
  CONFIG_NF_CONNTRACK_MARK=y
  CONFIG_NF_CONNTRACK_SECMARK=y
  CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_DCCP=m
  CONFIG_NF_CT_PROTO_GRE=m
  CONFIG_NF_CT_PROTO_SCTP=m
  CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -366,18 +383,22 @@ CONFIG_NF_CONNTRACK_SANE=m
  CONFIG_NF_CONNTRACK_SIP=m
  CONFIG_NF_CONNTRACK_TFTP=m
  CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
  CONFIG_NETFILTER_XTABLES=m
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
  CONFIG_NETFILTER_XT_TARGET_DSCP=m
  CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
  CONFIG_NETFILTER_XT_TARGET_TRACE=m
  CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
  CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
  CONFIG_NETFILTER_XT_MATCH_COMMENT=m
  CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
  CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -386,39 +407,75 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
  CONFIG_NETFILTER_XT_MATCH_DCCP=m
  CONFIG_NETFILTER_XT_MATCH_DSCP=m
  CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
  CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
  CONFIG_NETFILTER_XT_MATCH_LENGTH=m
  CONFIG_NETFILTER_XT_MATCH_LIMIT=m
  CONFIG_NETFILTER_XT_MATCH_MAC=m
  CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
  CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
  CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
  CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
  CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y
  CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
  CONFIG_NETFILTER_XT_MATCH_STATE=m
  CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
  CONFIG_NETFILTER_XT_MATCH_STRING=m
  CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
  CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
  
  #
  # IP: Netfilter Configuration
  #
+CONFIG_NF_DEFRAG_IPV4=m
  CONFIG_NF_CONNTRACK_IPV4=m
  CONFIG_NF_CONNTRACK_PROC_COMPAT=y
  CONFIG_IP_NF_QUEUE=m
  CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
  CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_FILTER=m
  CONFIG_IP_NF_TARGET_REJECT=m
  CONFIG_IP_NF_TARGET_LOG=m
@@ -426,11 +483,13 @@ CONFIG_IP_NF_TARGET_ULOG=m
  CONFIG_NF_NAT=m
  CONFIG_NF_NAT_NEEDED=y
  CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
  CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
  CONFIG_NF_NAT_FTP=m
  CONFIG_NF_NAT_IRC=m
  CONFIG_NF_NAT_TFTP=m
@@ -439,32 +498,30 @@ CONFIG_NF_NAT_PPTP=m
  CONFIG_NF_NAT_H323=m
  CONFIG_NF_NAT_SIP=m
  CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_TARGET_ECN=m
  CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_RAW=m
  CONFIG_IP_NF_ARPTABLES=m
  CONFIG_IP_NF_ARPFILTER=m
  CONFIG_IP_NF_ARP_MANGLE=m
  
  #
-# IPv6: Netfilter Configuration (EXPERIMENTAL)
+# IPv6: Netfilter Configuration
  #
  CONFIG_NF_CONNTRACK_IPV6=m
  CONFIG_IP6_NF_QUEUE=m
  CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
  CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
  CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_OWNER=m
  CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AH=m
  CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
  CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
  CONFIG_IP6_NF_TARGET_REJECT=m
  CONFIG_IP6_NF_MANGLE=m
  CONFIG_IP6_NF_TARGET_HL=m
@@ -479,6 +536,7 @@ CONFIG_SCTP_HMAC_MD5=y
  # CONFIG_TIPC is not set
  # CONFIG_ATM is not set
  # CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
  # CONFIG_VLAN_8021Q is not set
  # CONFIG_DECNET is not set
  # CONFIG_LLC2 is not set
@@ -488,12 +546,7 @@ CONFIG_SCTP_HMAC_MD5=y
  # CONFIG_LAPB is not set
  # CONFIG_ECONET is not set
  # CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
  CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_FIFO=y
  
  #
  # Queueing/Scheduling
@@ -502,7 +555,7 @@ CONFIG_NET_SCH_CBQ=m
  CONFIG_NET_SCH_HTB=m
  CONFIG_NET_SCH_HFSC=m
  CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_RR=m
+# CONFIG_NET_SCH_MULTIQ is not set
  CONFIG_NET_SCH_RED=m
  CONFIG_NET_SCH_SFQ=m
  CONFIG_NET_SCH_TEQL=m
@@ -526,6 +579,7 @@ CONFIG_NET_CLS_U32=m
  # CONFIG_CLS_U32_MARK is not set
  CONFIG_NET_CLS_RSVP=m
  CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
  # CONFIG_NET_EMATCH is not set
  CONFIG_NET_CLS_ACT=y
  CONFIG_NET_ACT_POLICE=y
@@ -533,35 +587,28 @@ CONFIG_NET_ACT_GACT=m
  CONFIG_GACT_PROB=y
  CONFIG_NET_ACT_MIRRED=m
  CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
  CONFIG_NET_ACT_PEDIT=m
  CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_CLS_POLICE=y
+CONFIG_NET_ACT_SKBEDIT=m
  # CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
  
  #
  # Network testing
  #
  # CONFIG_NET_PKTGEN is not set
  # CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
  # CONFIG_AF_RXRPC is not set
+CONFIG_PHONET=m
  CONFIG_FIB_RULES=y
-
-#
-# Wireless
-#
-CONFIG_CFG80211=m
+# CONFIG_WIRELESS is not set
  CONFIG_WIRELESS_EXT=y
-CONFIG_MAC80211=m
-# CONFIG_MAC80211_DEBUG is not set
  CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
  CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
-CONFIG_IEEE80211_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
  CONFIG_RFKILL=m
  CONFIG_RFKILL_INPUT=m
  # CONFIG_NET_9P is not set
@@ -588,7 +635,9 @@ CONFIG_CDROM_PKTCDVD=m
  CONFIG_CDROM_PKTCDVD_BUFFERS=8
  # CONFIG_CDROM_PKTCDVD_WCACHE is not set
  CONFIG_ATA_OVER_ETH=m
+# CONFIG_BLK_DEV_HD is not set
  # CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
  # CONFIG_IDE is not set
  
  #
@@ -628,20 +677,22 @@ CONFIG_SCSI_SPI_ATTRS=m
  # CONFIG_SCSI_FC_ATTRS is not set
  CONFIG_SCSI_ISCSI_ATTRS=m
  # CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
  CONFIG_SCSI_LOWLEVEL=y
  CONFIG_ISCSI_TCP=m
  CONFIG_SGIWD93_SCSI=y
  # CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_DH is not set
  # CONFIG_ATA is not set
  # CONFIG_MD is not set
  CONFIG_NETDEVICES=y
-# CONFIG_NETDEVICES_MULTIQUEUE is not set
  # CONFIG_IFB is not set
  CONFIG_DUMMY=m
  CONFIG_BONDING=m
  CONFIG_MACVLAN=m
  CONFIG_EQUALIZER=m
  CONFIG_TUN=m
+CONFIG_VETH=m
  CONFIG_PHYLIB=m
  
  #
@@ -656,11 +707,21 @@ CONFIG_CICADA_PHY=m
  # CONFIG_SMSC_PHY is not set
  # CONFIG_BROADCOM_PHY is not set
  # CONFIG_ICPLUS_PHY is not set
-# CONFIG_FIXED_PHY is not set
+CONFIG_REALTEK_PHY=m
+CONFIG_MDIO_BITBANG=m
  CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
+CONFIG_MII=m
  # CONFIG_AX88796 is not set
+CONFIG_SMC91X=m
  # CONFIG_DM9000 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_B44 is not set
  CONFIG_SGISEEQ=y
  # CONFIG_NETDEV_1000 is not set
  # CONFIG_NETDEV_10000 is not set
@@ -672,12 +733,12 @@ CONFIG_WLAN_PRE80211=y
  CONFIG_STRIP=m
  CONFIG_WLAN_80211=y
  # CONFIG_LIBERTAS is not set
+# CONFIG_IWLWIFI_LEDS is not set
  CONFIG_HOSTAP=m
  # CONFIG_HOSTAP_FIRMWARE is not set
  # CONFIG_WAN is not set
  # CONFIG_PPP is not set
  # CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
  # CONFIG_NETCONSOLE is not set
  # CONFIG_NETPOLL is not set
  # CONFIG_NET_POLL_CONTROLLER is not set
@@ -699,7 +760,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
  CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
  CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
  # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
  # CONFIG_INPUT_EVDEV is not set
  # CONFIG_INPUT_EVBUG is not set
  
@@ -720,6 +780,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
  # CONFIG_MOUSE_PS2_SYNAPTICS is not set
  # CONFIG_MOUSE_PS2_LIFEBOOK is not set
  CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
  # CONFIG_MOUSE_PS2_TOUCHKIT is not set
  CONFIG_MOUSE_SERIAL=m
  # CONFIG_MOUSE_VSXXXAA is not set
@@ -742,9 +803,11 @@ CONFIG_SERIO_RAW=m
  # Character devices
  #
  CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
  CONFIG_VT_CONSOLE=y
  CONFIG_HW_CONSOLE=y
  CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVKMEM=y
  # CONFIG_SERIAL_NONSTANDARD is not set
  
  #
@@ -761,6 +824,17 @@ CONFIG_UNIX98_PTYS=y
  CONFIG_LEGACY_PTYS=y
  CONFIG_LEGACY_PTY_COUNT=256
  # CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_R3964 is not set
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=256
+# CONFIG_TCG_TPM is not set
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+CONFIG_THERMAL=m
  CONFIG_WATCHDOG=y
  # CONFIG_WATCHDOG_NOWAYOUT is not set
  
@@ -769,47 +843,50 @@ CONFIG_WATCHDOG=y
  #
  # CONFIG_SOFT_WATCHDOG is not set
  CONFIG_INDYDOG=m
-# CONFIG_HW_RANDOM is not set
-# CONFIG_RTC is not set
-# CONFIG_R3964 is not set
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=256
-# CONFIG_TCG_TPM is not set
-# CONFIG_I2C is not set
+CONFIG_SSB_POSSIBLE=y
  
  #
-# SPI support
+# Sonics Silicon Backplane
  #
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-# CONFIG_W1 is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_HWMON is not set
+# CONFIG_SSB is not set
  
  #
  # Multifunction device drivers
  #
+# CONFIG_MFD_CORE is not set
  # CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
  #
+
+#
+# Multimedia core support
+#
  # CONFIG_VIDEO_DEV is not set
  # CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
  # CONFIG_DAB is not set
  
  #
  # Graphics support
  #
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
  # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
  
  #
  # Display device support
  #
  # CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_FB is not set
  
  #
  # Console display driver support
@@ -823,48 +900,77 @@ CONFIG_LOGO=y
  # CONFIG_LOGO_LINUX_VGA16 is not set
  # CONFIG_LOGO_LINUX_CLUT224 is not set
  CONFIG_LOGO_SGI_CLUT224=y
-
-#
-# Sound
-#
  # CONFIG_SOUND is not set
  CONFIG_HID_SUPPORT=y
  CONFIG_HID=y
  # CONFIG_HID_DEBUG is not set
+CONFIG_HIDRAW=y
+CONFIG_HID_PID=y
+
+#
+# Special HID drivers
+#
+CONFIG_HID_COMPAT=y
  CONFIG_USB_SUPPORT=y
  # CONFIG_USB_ARCH_HAS_HCD is not set
  # CONFIG_USB_ARCH_HAS_OHCI is not set
  # CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
  
  #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# Enable Host or Gadget support to see Inventra options
  #
  
  #
-# USB Gadget Support
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
  #
  # CONFIG_USB_GADGET is not set
  # CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
  # CONFIG_NEW_LEDS is not set
-# CONFIG_RTC_CLASS is not set
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
  
  #
-# DMA Engine support
+# RTC interfaces
  #
-# CONFIG_DMA_ENGINE is not set
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+# CONFIG_RTC_DRV_TEST is not set
  
  #
-# DMA Clients
+# SPI RTC drivers
  #
  
  #
-# DMA Devices
+# Platform RTC drivers
  #
+# CONFIG_RTC_DRV_CMOS is not set
+CONFIG_RTC_DRV_DS1286=y
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_V3020 is not set
  
  #
-# Userspace I/O
+# on-CPU RTC drivers
  #
+# CONFIG_DMADEVICES is not set
  # CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # File systems
@@ -876,29 +982,33 @@ CONFIG_EXT3_FS=y
  CONFIG_EXT3_FS_XATTR=y
  CONFIG_EXT3_FS_POSIX_ACL=y
  CONFIG_EXT3_FS_SECURITY=y
-# CONFIG_EXT4DEV_FS is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4DEV_COMPAT=y
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
  CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=m
  CONFIG_FS_MBCACHE=y
  # CONFIG_REISERFS_FS is not set
  # CONFIG_JFS_FS is not set
  CONFIG_FS_POSIX_ACL=y
+CONFIG_FILE_LOCKING=y
  CONFIG_XFS_FS=m
  CONFIG_XFS_QUOTA=y
-CONFIG_XFS_SECURITY=y
  # CONFIG_XFS_POSIX_ACL is not set
  # CONFIG_XFS_RT is not set
-# CONFIG_GFS2_FS is not set
+# CONFIG_XFS_DEBUG is not set
  # CONFIG_OCFS2_FS is not set
-CONFIG_MINIX_FS=m
-# CONFIG_ROMFS_FS is not set
+CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
  CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
  # CONFIG_QFMT_V1 is not set
  CONFIG_QFMT_V2=m
  CONFIG_QUOTACTL=y
-CONFIG_DNOTIFY=y
  CONFIG_AUTOFS_FS=m
  CONFIG_AUTOFS4_FS=m
  CONFIG_FUSE_FS=m
@@ -929,11 +1039,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
  CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
  CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
  CONFIG_TMPFS_POSIX_ACL=y
  # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
  CONFIG_CONFIGFS_FS=m
  
  #
@@ -949,27 +1059,25 @@ CONFIG_CONFIGFS_FS=m
  CONFIG_EFS_FS=m
  # CONFIG_CRAMFS is not set
  # CONFIG_VXFS_FS is not set
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
  # CONFIG_HPFS_FS is not set
  # CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
  # CONFIG_SYSV_FS is not set
  CONFIG_UFS_FS=m
  # CONFIG_UFS_FS_WRITE is not set
  # CONFIG_UFS_DEBUG is not set
-
-#
-# Network File Systems
-#
+CONFIG_NETWORK_FILESYSTEMS=y
  CONFIG_NFS_FS=m
  CONFIG_NFS_V3=y
  CONFIG_NFS_V3_ACL=y
  # CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
  CONFIG_NFSD=m
  CONFIG_NFSD_V2_ACL=y
  CONFIG_NFSD_V3=y
  CONFIG_NFSD_V3_ACL=y
  # CONFIG_NFSD_V4 is not set
-CONFIG_NFSD_TCP=y
  CONFIG_LOCKD=m
  CONFIG_LOCKD_V4=y
  CONFIG_EXPORTFS=m
@@ -977,7 +1085,7 @@ CONFIG_NFS_ACL_SUPPORT=m
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=m
  CONFIG_SUNRPC_GSS=m
-# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_SUNRPC_REGISTER_V4 is not set
  CONFIG_RPCSEC_GSS_KRB5=m
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  CONFIG_SMB_FS=m
@@ -986,12 +1094,12 @@ CONFIG_SMB_NLS_REMOTE="cp437"
  CONFIG_CIFS=m
  # CONFIG_CIFS_STATS is not set
  # CONFIG_CIFS_WEAK_PW_HASH is not set
+CONFIG_CIFS_UPCALL=y
  # CONFIG_CIFS_XATTR is not set
  # CONFIG_CIFS_DEBUG2 is not set
  # CONFIG_CIFS_EXPERIMENTAL is not set
  # CONFIG_NCP_FS is not set
  CONFIG_CODA_FS=m
-# CONFIG_CODA_FS_OLD_API is not set
  # CONFIG_AFS_FS is not set
  
  #
@@ -1015,10 +1123,6 @@ CONFIG_SGI_PARTITION=y
  # CONFIG_KARMA_PARTITION is not set
  # CONFIG_EFI_PARTITION is not set
  # CONFIG_SYSV68_PARTITION is not set
-
-#
-# Native Language Support
-#
  CONFIG_NLS=m
  CONFIG_NLS_DEFAULT="iso8859-1"
  CONFIG_NLS_CODEPAGE_437=m
@@ -1059,30 +1163,32 @@ CONFIG_NLS_ISO8859_15=m
  CONFIG_NLS_KOI8_R=m
  CONFIG_NLS_KOI8_U=m
  CONFIG_NLS_UTF8=m
-
-#
-# Distributed Lock Manager
-#
  CONFIG_DLM=m
  # CONFIG_DLM_DEBUG is not set
  
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
  #
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
  # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
  CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
  # CONFIG_MAGIC_SYSRQ is not set
  # CONFIG_UNUSED_SYMBOLS is not set
  # CONFIG_DEBUG_FS is not set
  # CONFIG_HEADERS_CHECK is not set
  # CONFIG_DEBUG_KERNEL is not set
-CONFIG_CROSSCOMPILE=y
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+
+#
+# Tracers
+#
+CONFIG_DYNAMIC_PRINTK_DEBUG=y
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
  CONFIG_CMDLINE=""
  
  #
@@ -1091,46 +1197,97 @@ CONFIG_CMDLINE=""
  CONFIG_KEYS=y
  CONFIG_KEYS_DEBUG_PROC_KEYS=y
  # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+CONFIG_SECURITY_FILE_CAPABILITIES=y
  CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_FIPS=y
  CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ABLKCIPHER=m
-CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_BLKCIPHER=y
  CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_RNG=y
  CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+
+#
+# Hash modes
+#
  CONFIG_CRYPTO_HMAC=y
  CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_NULL=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
  CONFIG_CRYPTO_MD4=m
  CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
  CONFIG_CRYPTO_SHA1=m
  CONFIG_CRYPTO_SHA256=m
  CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_WP512=m
  CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
  CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
  CONFIG_CRYPTO_CAST5=m
  CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
  CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
  CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CAMELLIA=m
-# CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
  # CONFIG_CRYPTO_HW is not set
  
  #
@@ -1139,12 +1296,15 @@ CONFIG_CRYPTO_CAMELLIA=m
  CONFIG_BITREVERSE=m
  # CONFIG_CRC_CCITT is not set
  CONFIG_CRC16=m
-# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC_ITU_T=m
  CONFIG_CRC32=m
  # CONFIG_CRC7 is not set
  CONFIG_LIBCRC32C=m
  CONFIG_ZLIB_INFLATE=m
  CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=m
  CONFIG_TEXTSEARCH=y
  CONFIG_TEXTSEARCH_KMP=m
  CONFIG_TEXTSEARCH_BM=m
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig

index fe4699df9626c27fc1113c0d6d9e09c36c7277e8..de4c7a0a96ddde228e6b2806ea5f5a48a8758a4c 100644 (file)
--- a/arch/mips/configs/ip32_defconfig
+++ b/arch/mips/configs/ip32_defconfig
@@ -1,71 +1,71 @@
  #
  # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:33 2007
+# Linux kernel version: 2.6.28-rc7
+# Wed Dec 10 14:39:08 2008
  #
  CONFIG_MIPS=y
  
  #
  # Machine selection
  #
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
  # CONFIG_BASLER_EXCITE is not set
+# CONFIG_BCM47XX is not set
  # CONFIG_MIPS_COBALT is not set
  # CONFIG_MACH_DECSTATION is not set
  # CONFIG_MACH_JAZZ is not set
+# CONFIG_LASAT is not set
+# CONFIG_LEMOTE_FULONG is not set
  # CONFIG_MIPS_MALTA is not set
-# CONFIG_WR_PPMC is not set
  # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MACH_EMMA is not set
+# CONFIG_MACH_VR41XX is not set
+# CONFIG_NXP_STB220 is not set
+# CONFIG_NXP_STB225 is not set
  # CONFIG_PNX8550_JBS is not set
  # CONFIG_PNX8550_STB810 is not set
-# CONFIG_MACH_VR41XX is not set
+# CONFIG_PMC_MSP is not set
  # CONFIG_PMC_YOSEMITE is not set
-# CONFIG_MARKEINS is not set
  # CONFIG_SGI_IP22 is not set
  # CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP28 is not set
  CONFIG_SGI_IP32=y
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
  # CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
  # CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
+# CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
+# CONFIG_SIBYTE_SENTOSA is not set
+# CONFIG_SIBYTE_BIGSUR is not set
  # CONFIG_SNI_RM is not set
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_MACH_TX39XX is not set
+# CONFIG_MACH_TX49XX is not set
+# CONFIG_MIKROTIK_RB532 is not set
+# CONFIG_WR_PPMC is not set
  CONFIG_RWSEM_GENERIC_SPINLOCK=y
  # CONFIG_ARCH_HAS_ILOG2_U32 is not set
  # CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_ARCH_SUPPORTS_OPROFILE=y
  CONFIG_GENERIC_FIND_NEXT_BIT=y
  CONFIG_GENERIC_HWEIGHT=y
  CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_CLOCKEVENTS=y
  CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
  CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
  # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
  CONFIG_ARC=y
+CONFIG_CEVT_R4K=y
+CONFIG_CSRC_R4K=y
  CONFIG_DMA_NONCOHERENT=y
  CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_NO_IOPORT is not set
  CONFIG_CPU_BIG_ENDIAN=y
  # CONFIG_CPU_LITTLE_ENDIAN is not set
  CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
+CONFIG_IRQ_CPU=y
  CONFIG_ARC32=y
  CONFIG_BOOT_ELF32=y
  CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -75,6 +75,7 @@ CONFIG_ARC_PROMLIB=y
  #
  # CPU selection
  #
+# CONFIG_CPU_LOONGSON2 is not set
  # CONFIG_CPU_MIPS32_R1 is not set
  # CONFIG_CPU_MIPS32_R2 is not set
  # CONFIG_CPU_MIPS64_R1 is not set
@@ -87,6 +88,7 @@ CONFIG_ARC_PROMLIB=y
  # CONFIG_CPU_TX49XX is not set
  CONFIG_CPU_R5000=y
  # CONFIG_CPU_R5432 is not set
+# CONFIG_CPU_R5500 is not set
  # CONFIG_CPU_R6000 is not set
  # CONFIG_CPU_NEVADA is not set
  # CONFIG_CPU_R8000 is not set
@@ -116,65 +118,73 @@ CONFIG_RM7000_CPU_SCACHE=y
  CONFIG_MIPS_MT_DISABLED=y
  # CONFIG_MIPS_MT_SMP is not set
  # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
  CONFIG_CPU_HAS_LLSC=y
  CONFIG_CPU_HAS_SYNC=y
  CONFIG_GENERIC_HARDIRQS=y
  CONFIG_GENERIC_IRQ_PROBE=y
  CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
  CONFIG_SELECT_MEMORY_MODEL=y
  CONFIG_FLATMEM_MANUAL=y
  # CONFIG_DISCONTIGMEM_MANUAL is not set
  # CONFIG_SPARSEMEM_MANUAL is not set
  CONFIG_FLATMEM=y
  CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  CONFIG_RESOURCES_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
  # CONFIG_HZ_48 is not set
  # CONFIG_HZ_100 is not set
  # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
  # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
  # CONFIG_HZ_1024 is not set
  CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_HZ=250
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
  # CONFIG_PREEMPT is not set
  # CONFIG_KEXEC is not set
+# CONFIG_SECCOMP is not set
  CONFIG_LOCKDEP_SUPPORT=y
  CONFIG_STACKTRACE_SUPPORT=y
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
  #
-# Code maturity level options
+# General setup
  #
  CONFIG_EXPERIMENTAL=y
  CONFIG_BROKEN_ON_SMP=y
  CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
  CONFIG_LOCALVERSION=""
  CONFIG_LOCALVERSION_AUTO=y
  CONFIG_SWAP=y
  CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
  CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
+CONFIG_POSIX_MQUEUE=y
  CONFIG_BSD_PROCESS_ACCT=y
  # CONFIG_BSD_PROCESS_ACCT_V3 is not set
  # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_AUDIT=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+# CONFIG_GROUP_SCHED is not set
  CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
  CONFIG_RELAY=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+# CONFIG_NAMESPACES is not set
+# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
  CONFIG_SYSCTL=y
  CONFIG_EMBEDDED=y
  CONFIG_SYSCTL_SYSCALL=y
@@ -184,27 +194,43 @@ CONFIG_HOTPLUG=y
  CONFIG_PRINTK=y
  CONFIG_BUG=y
  CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_COMPAT_BRK=y
  CONFIG_BASE_FULL=y
  CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
  CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
-CONFIG_SLAB=y
+CONFIG_AIO=y
  CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+# CONFIG_MARKERS is not set
+CONFIG_OPROFILE=m
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
  # CONFIG_TINY_SHMEM is not set
  CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
-
-#
-# Block layer
-#
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
  CONFIG_BLOCK=y
  # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLOCK_COMPAT=y
  
  #
  # IO Schedulers
@@ -213,59 +239,50 @@ CONFIG_IOSCHED_NOOP=y
  CONFIG_IOSCHED_AS=y
  CONFIG_IOSCHED_DEADLINE=y
  CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_AS is not set
  # CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_CFQ=y
  # CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_CLASSIC_RCU=y
+# CONFIG_FREEZER is not set
  
  #
  # Bus options (PCI, PCMCIA, EISA, ISA, TC)
  #
  CONFIG_HW_HAS_PCI=y
  CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCI_LEGACY is not set
  CONFIG_MMU=y
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
  # CONFIG_PCCARD is not set
-
-#
-# PCI Hotplug Support
-#
  # CONFIG_HOTPLUG_PCI is not set
  
  #
  # Executable file formats
  #
  CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
  CONFIG_BINFMT_MISC=y
-# CONFIG_BUILD_ELF64 is not set
  CONFIG_MIPS32_COMPAT=y
  CONFIG_COMPAT=y
  CONFIG_SYSVIPC_COMPAT=y
  CONFIG_MIPS32_O32=y
-# CONFIG_MIPS32_N32 is not set
+CONFIG_MIPS32_N32=y
  CONFIG_BINFMT_ELF32=y
  
  #
  # Power management options
  #
-CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
-
-#
-# Networking
-#
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# CONFIG_PM is not set
  CONFIG_NET=y
  
  #
  # Networking options
  #
-# CONFIG_NETDEBUG is not set
  CONFIG_PACKET=y
  CONFIG_PACKET_MMAP=y
  CONFIG_UNIX=y
@@ -273,56 +290,83 @@ CONFIG_XFRM=y
  CONFIG_XFRM_USER=y
  # CONFIG_XFRM_SUB_POLICY is not set
  CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
  CONFIG_NET_KEY=y
  CONFIG_NET_KEY_MIGRATE=y
  CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
+CONFIG_IP_MULTICAST=y
  # CONFIG_IP_ADVANCED_ROUTER is not set
  CONFIG_IP_FIB_HASH=y
  CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_DHCP is not set
+CONFIG_IP_PNP_DHCP=y
  CONFIG_IP_PNP_BOOTP=y
  # CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+# CONFIG_NET_IPGRE_BROADCAST is not set
+# CONFIG_IP_MROUTE is not set
  # CONFIG_ARPD is not set
  # CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
  CONFIG_INET_XFRM_MODE_TRANSPORT=y
  CONFIG_INET_XFRM_MODE_TUNNEL=y
  CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
  CONFIG_INET_DIAG=y
  CONFIG_INET_TCP_DIAG=y
-# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
  CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+# CONFIG_TCP_CONG_HSTCP is not set
+# CONFIG_TCP_CONG_HYBLA is not set
+# CONFIG_TCP_CONG_VEGAS is not set
+# CONFIG_TCP_CONG_SCALABLE is not set
+# CONFIG_TCP_CONG_LP is not set
+# CONFIG_TCP_CONG_VENO is not set
+# CONFIG_TCP_CONG_YEAH is not set
+# CONFIG_TCP_CONG_ILLINOIS is not set
+# CONFIG_DEFAULT_BIC is not set
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_HTCP is not set
+# CONFIG_DEFAULT_VEGAS is not set
+# CONFIG_DEFAULT_WESTWOOD is not set
+# CONFIG_DEFAULT_RENO is not set
  CONFIG_DEFAULT_TCP_CONG="cubic"
  CONFIG_TCP_MD5SIG=y
-# CONFIG_IPV6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+# CONFIG_IPV6_MIP6 is not set
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
  CONFIG_NETWORK_SECMARK=y
  # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
  # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
  # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
  # CONFIG_TIPC is not set
  # CONFIG_ATM is not set
  # CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
  # CONFIG_VLAN_8021Q is not set
  # CONFIG_DECNET is not set
  # CONFIG_LLC2 is not set
@@ -332,10 +376,6 @@ CONFIG_NETWORK_SECMARK=y
  # CONFIG_LAPB is not set
  # CONFIG_ECONET is not set
  # CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
  # CONFIG_NET_SCHED is not set
  
  #
@@ -343,15 +383,14 @@ CONFIG_NETWORK_SECMARK=y
  #
  # CONFIG_NET_PKTGEN is not set
  # CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
-CONFIG_IEEE80211=y
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=y
-CONFIG_IEEE80211_CRYPT_CCMP=y
-CONFIG_IEEE80211_SOFTMAC=y
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_WIRELESS_EXT=y
+# CONFIG_AF_RXRPC is not set
+# CONFIG_PHONET is not set
+# CONFIG_WIRELESS is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
  
  #
  # Device Drivers
@@ -360,60 +399,40 @@ CONFIG_WIRELESS_EXT=y
  #
  # Generic Driver Options
  #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
  CONFIG_STANDALONE=y
  CONFIG_PREVENT_FIRMWARE_BUILD=y
  CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
  # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
  CONFIG_CONNECTOR=y
  CONFIG_PROC_EVENTS=y
-
-#
-# Memory Technology Devices (MTD)
-#
  # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
  # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
  # CONFIG_BLK_CPQ_DA is not set
  # CONFIG_BLK_CPQ_CISS_DA is not set
  # CONFIG_BLK_DEV_DAC960 is not set
  # CONFIG_BLK_DEV_UMEM is not set
  # CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_NBD=m
  # CONFIG_BLK_DEV_SX8 is not set
  # CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_CDROM_PKTCDVD=y
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=y
-
-#
-# Misc devices
-#
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
  CONFIG_SGI_IOC4=y
  # CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_C2PORT is not set
+CONFIG_HAVE_IDE=y
  # CONFIG_IDE is not set
  
  #
@@ -421,19 +440,20 @@ CONFIG_SGI_IOC4=y
  #
  CONFIG_RAID_ATTRS=y
  CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
  CONFIG_SCSI_TGT=y
-CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_NETLINK is not set
  CONFIG_SCSI_PROC_FS=y
  
  #
  # SCSI support type (disk, tape, CD-ROM)
  #
  CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
-CONFIG_CHR_DEV_OSST=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
  CONFIG_BLK_DEV_SR=y
  CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=y
+CONFIG_CHR_DEV_SG=m
  # CONFIG_CHR_DEV_SCH is not set
  
  #
@@ -443,35 +463,36 @@ CONFIG_SCSI_MULTI_LUN=y
  CONFIG_SCSI_CONSTANTS=y
  CONFIG_SCSI_LOGGING=y
  CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_WAIT_SCAN=m
  
  #
  # SCSI Transports
  #
  CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_FC_ATTRS=y
+# CONFIG_SCSI_FC_ATTRS is not set
  # CONFIG_SCSI_ISCSI_ATTRS is not set
  CONFIG_SCSI_SAS_ATTRS=y
  CONFIG_SCSI_SAS_LIBSAS=y
+CONFIG_SCSI_SAS_HOST_SMP=y
  # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
-
-#
-# SCSI low-level drivers
-#
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
  # CONFIG_ISCSI_TCP is not set
  # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
  # CONFIG_SCSI_3W_9XXX is not set
  # CONFIG_SCSI_ACARD is not set
  # CONFIG_SCSI_AACRAID is not set
  CONFIG_SCSI_AIC7XXX=y
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
  CONFIG_AIC7XXX_RESET_DELAY_MS=15000
  CONFIG_AIC7XXX_DEBUG_ENABLE=y
  CONFIG_AIC7XXX_DEBUG_MASK=0
  CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
  # CONFIG_SCSI_AIC7XXX_OLD is not set
  # CONFIG_SCSI_AIC79XX is not set
-CONFIG_SCSI_AIC94XX=y
-# CONFIG_AIC94XX_DEBUG is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
  # CONFIG_SCSI_ARCMSR is not set
  # CONFIG_MEGARAID_NEWGEN is not set
  # CONFIG_MEGARAID_LEGACY is not set
@@ -482,6 +503,7 @@ CONFIG_SCSI_AIC94XX=y
  # CONFIG_SCSI_IPS is not set
  # CONFIG_SCSI_INITIO is not set
  # CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_MVSAS is not set
  # CONFIG_SCSI_STEX is not set
  # CONFIG_SCSI_SYM53C8XX_2 is not set
  # CONFIG_SCSI_QLOGIC_1280 is not set
@@ -492,147 +514,81 @@ CONFIG_SCSI_AIC94XX=y
  # CONFIG_SCSI_DC390T is not set
  # CONFIG_SCSI_DEBUG is not set
  # CONFIG_SCSI_SRP is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
+# CONFIG_SCSI_DH is not set
  # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
  # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
  # CONFIG_FUSION is not set
-# CONFIG_FUSION_SPI is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION_SAS is not set
  
  #
  # IEEE 1394 (FireWire) support
  #
-# CONFIG_IEEE1394 is not set
  
  #
-# I2O device support
+# Enable only one of the two stacks, unless you know what you are doing
  #
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
  # CONFIG_I2O is not set
-
-#
-# Network device support
-#
  CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+# CONFIG_MACVLAN is not set
  # CONFIG_EQUALIZER is not set
  # CONFIG_TUN is not set
-
-#
-# ARCnet devices
-#
+# CONFIG_VETH is not set
  # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
-CONFIG_PHYLIB=y
-
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=y
-CONFIG_DAVICOM_PHY=y
-CONFIG_QSEMI_PHY=y
-CONFIG_LXT_PHY=y
-CONFIG_CICADA_PHY=y
-CONFIG_VITESSE_PHY=y
-CONFIG_SMSC_PHY=y
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
+# CONFIG_PHYLIB is not set
  CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
+CONFIG_MII=y
+# CONFIG_AX88796 is not set
  CONFIG_SGI_O2MACE_ETH=y
  # CONFIG_HAPPYMEAL is not set
  # CONFIG_SUNGEM is not set
  # CONFIG_CASSINI is not set
  # CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_SMC91X is not set
  # CONFIG_DM9000 is not set
-
-#
-# Tulip family network device support
-#
-# CONFIG_NET_TULIP is not set
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+CONFIG_TULIP_MMIO=y
+# CONFIG_TULIP_NAPI is not set
+# CONFIG_DE4X5 is not set
+# CONFIG_WINBOND_840 is not set
+# CONFIG_DM9102 is not set
+# CONFIG_ULI526X is not set
  # CONFIG_HP100 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  # CONFIG_NET_PCI is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-CONFIG_QLA3XXX=y
-# CONFIG_ATL1 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_CHELSIO_T1 is not set
-CONFIG_CHELSIO_T3=y
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_MYRI10GE is not set
-CONFIG_NETXEN_NIC=y
-
-#
-# Token Ring devices
-#
+# CONFIG_B44 is not set
+# CONFIG_ATL2 is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
  # CONFIG_TR is not set
  
  #
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
+# Wireless LAN
  #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
  # CONFIG_WAN is not set
  # CONFIG_FDDI is not set
  # CONFIG_HIPPI is not set
  # CONFIG_PPP is not set
  # CONFIG_SLIP is not set
  # CONFIG_NET_FC is not set
-# CONFIG_SHAPER is not set
  # CONFIG_NETCONSOLE is not set
  # CONFIG_NETPOLL is not set
  # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
  # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
  # CONFIG_PHONE is not set
  
  #
@@ -640,6 +596,7 @@ CONFIG_NETXEN_NIC=y
  #
  CONFIG_INPUT=y
  # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
  
  #
  # Userland interfaces
@@ -649,16 +606,32 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
  CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
  CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
  # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
+CONFIG_INPUT_EVDEV=m
  # CONFIG_INPUT_EVBUG is not set
  
  #
  # Input Device Drivers
  #
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_VSXXXAA is not set
  # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
  # CONFIG_INPUT_TOUCHSCREEN is not set
  # CONFIG_INPUT_MISC is not set
  
@@ -669,8 +642,8 @@ CONFIG_SERIO=y
  # CONFIG_SERIO_I8042 is not set
  CONFIG_SERIO_SERPORT=y
  # CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_MACEPS2 is not set
-# CONFIG_SERIO_LIBPS2 is not set
+CONFIG_SERIO_MACEPS2=y
+CONFIG_SERIO_LIBPS2=y
  CONFIG_SERIO_RAW=y
  # CONFIG_GAMEPORT is not set
  
@@ -678,10 +651,13 @@ CONFIG_SERIO_RAW=y
  # Character devices
  #
  CONFIG_VT=y
+# CONFIG_CONSOLE_TRANSLATIONS is not set
  CONFIG_VT_CONSOLE=y
  CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
  # CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
  
  #
  # Serial drivers
@@ -702,192 +678,304 @@ CONFIG_SERIAL_CORE_CONSOLE=y
  CONFIG_UNIX98_PTYS=y
  CONFIG_LEGACY_PTYS=y
  CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
  # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
+CONFIG_HW_RANDOM=y
  # CONFIG_R3964 is not set
  # CONFIG_APPLICOM is not set
-# CONFIG_DRM is not set
  # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
  # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
  
  #
-# I2C support
+# Watchdog Device Drivers
  #
-# CONFIG_I2C is not set
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_ALIM7101_WDT is not set
  
  #
-# SPI support
+# PCI-based Watchdog Cards
  #
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+CONFIG_SSB_POSSIBLE=y
  
  #
-# Dallas's 1-wire bus
+# Sonics Silicon Backplane
  #
-# CONFIG_W1 is not set
+# CONFIG_SSB is not set
  
  #
-# Hardware Monitoring support
+# Multifunction device drivers
  #
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
  #
-# CONFIG_VIDEO_DEV is not set
  
  #
-# Digital Video Broadcasting Devices
+# Multimedia core support
  #
-# CONFIG_DVB is not set
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_VIDEO_ALLOW_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
+# CONFIG_DVB_CORE is not set
+CONFIG_VIDEO_MEDIA=m
  
  #
-# Graphics support
+# Multimedia drivers
  #
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB is not set
+# CONFIG_MEDIA_ATTACH is not set
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L1=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+CONFIG_VIDEO_VIVI=m
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_STRADIS is not set
+# CONFIG_SOC_CAMERA is not set
+CONFIG_RADIO_ADAPTERS=y
+# CONFIG_RADIO_GEMTEK_PCI is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_MAESTRO is not set
+CONFIG_DAB=y
  
  #
-# Console display driver support
+# Graphics support
  #
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_GBE=y
+CONFIG_FB_GBE_MEM=4
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_VIA is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
  # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
  
  #
-# Sound
+# Display device support
  #
-# CONFIG_SOUND is not set
+# CONFIG_DISPLAY_SUPPORT is not set
  
  #
-# HID Devices
+# Console display driver support
  #
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+# CONFIG_LOGO_LINUX_CLUT224 is not set
+CONFIG_LOGO_SGI_CLUT224=y
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
  CONFIG_HID=y
  # CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
+# CONFIG_HID_PID is not set
  
  #
-# USB support
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
+# Special HID drivers
  #
+CONFIG_HID_COMPAT=y
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_UWB is not set
  # CONFIG_MMC is not set
-
-#
-# LED devices
-#
+# CONFIG_MEMSTICK is not set
  # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
+# CONFIG_ACCESSIBILITY is not set
  # CONFIG_INFINIBAND is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+# CONFIG_RTC_HCTOSYS is not set
+# CONFIG_RTC_DEBUG is not set
  
  #
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+# RTC interfaces
  #
+# CONFIG_RTC_INTF_SYSFS is not set
+# CONFIG_RTC_INTF_PROC is not set
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
  
  #
-# Real Time Clock
+# SPI RTC drivers
  #
-# CONFIG_RTC_CLASS is not set
  
  #
-# DMA Engine support
+# Platform RTC drivers
  #
-# CONFIG_DMA_ENGINE is not set
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_V3020 is not set
  
  #
-# DMA Clients
-#
-
-#
-# DMA Devices
-#
-
-#
-# Auxiliary Display support
-#
-
-#
-# Virtualization
+# on-CPU RTC drivers
  #
+# CONFIG_DMADEVICES is not set
+# CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # File systems
  #
  CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
  # CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT4DEV_FS is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+# CONFIG_EXT4_FS is not set
+CONFIG_JBD=y
+CONFIG_FS_MBCACHE=y
  # CONFIG_REISERFS_FS is not set
  # CONFIG_JFS_FS is not set
  CONFIG_FS_POSIX_ACL=y
+CONFIG_FILE_LOCKING=y
  # CONFIG_XFS_FS is not set
  # CONFIG_GFS2_FS is not set
  # CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
+CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-CONFIG_FUSE_FS=y
+CONFIG_QUOTA=y
+# CONFIG_QUOTA_NETLINK_INTERFACE is not set
+CONFIG_PRINT_QUOTA_WARNING=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS_FS=m
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
  CONFIG_GENERIC_ACL=y
  
  #
  # CD-ROM/DVD Filesystems
  #
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
  
  #
  # DOS/FAT/NT Filesystems
  #
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
  # CONFIG_NTFS_FS is not set
  
  #
@@ -896,11 +984,11 @@ CONFIG_GENERIC_ACL=y
  CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
  CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
  CONFIG_TMPFS_POSIX_ACL=y
  # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
  CONFIG_CONFIGFS_FS=y
  
  #
@@ -916,33 +1004,42 @@ CONFIG_CONFIGFS_FS=y
  # CONFIG_EFS_FS is not set
  # CONFIG_CRAMFS is not set
  # CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
  # CONFIG_HPFS_FS is not set
  # CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
  # CONFIG_SYSV_FS is not set
  # CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
+CONFIG_NETWORK_FILESYSTEMS=y
  CONFIG_NFS_FS=y
  CONFIG_NFS_V3=y
  # CONFIG_NFS_V3_ACL is not set
  # CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
  CONFIG_ROOT_NFS=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
  CONFIG_LOCKD=y
  CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_REGISTER_V4 is not set
  # CONFIG_RPCSEC_GSS_KRB5 is not set
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  # CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_UPCALL is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
  # CONFIG_NCP_FS is not set
  # CONFIG_CODA_FS is not set
  # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
  
  #
  # Partition Types
@@ -953,45 +1050,83 @@ CONFIG_PARTITION_ADVANCED=y
  # CONFIG_AMIGA_PARTITION is not set
  # CONFIG_ATARI_PARTITION is not set
  # CONFIG_MAC_PARTITION is not set
-# CONFIG_MSDOS_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
  # CONFIG_LDM_PARTITION is not set
  CONFIG_SGI_PARTITION=y
  # CONFIG_ULTRIX_PARTITION is not set
  # CONFIG_SUN_PARTITION is not set
  # CONFIG_KARMA_PARTITION is not set
  # CONFIG_EFI_PARTITION is not set
-
-#
-# Native Language Support
-#
-# CONFIG_NLS is not set
-
-#
-# Distributed Lock Manager
-#
-CONFIG_DLM=y
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+# CONFIG_DLM is not set
  
  #
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
  # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
  CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_FRAME_WARN=2048
+CONFIG_MAGIC_SYSRQ=y
  # CONFIG_UNUSED_SYMBOLS is not set
  # CONFIG_DEBUG_FS is not set
  # CONFIG_HEADERS_CHECK is not set
  # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_CROSSCOMPILE=y
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+
+#
+# Tracers
+#
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
  CONFIG_CMDLINE=""
  
  #
@@ -1000,51 +1135,99 @@ CONFIG_CMDLINE=""
  CONFIG_KEYS=y
  CONFIG_KEYS_DEBUG_PROC_KEYS=y
  # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
  
  #
-# Cryptographic options
+# Crypto core or helper
  #
-CONFIG_CRYPTO=y
+# CONFIG_CRYPTO_FIPS is not set
  CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_AEAD=y
  CONFIG_CRYPTO_BLKCIPHER=y
  CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_RNG=y
  CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_PCBC=y
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
  CONFIG_CRYPTO_HMAC=y
  CONFIG_CRYPTO_XCBC=y
-CONFIG_CRYPTO_NULL=y
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
  CONFIG_CRYPTO_MD4=y
  CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
  CONFIG_CRYPTO_SHA1=y
  CONFIG_CRYPTO_SHA256=y
  CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_WP512=y
  CONFIG_CRYPTO_TGR192=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_PCBC=y
-CONFIG_CRYPTO_LRW=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_FCRYPT=y
-CONFIG_CRYPTO_BLOWFISH=y
-CONFIG_CRYPTO_TWOFISH=y
-CONFIG_CRYPTO_TWOFISH_COMMON=y
-CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_WP512=y
+
+#
+# Ciphers
+#
  CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_ANUBIS=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_CAMELLIA=y
  CONFIG_CRYPTO_CAST5=y
  CONFIG_CRYPTO_CAST6=y
-CONFIG_CRYPTO_TEA=y
-CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_FCRYPT=y
  CONFIG_CRYPTO_KHAZAD=y
-CONFIG_CRYPTO_ANUBIS=y
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_TEA=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y
+
+#
+# Compression
+#
  CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CAMELLIA=y
+# CONFIG_CRYPTO_LZO is not set
  
  #
-# Hardware crypto devices
+# Random Number Generation
  #
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
  
  #
  # Library routines
@@ -1052,10 +1235,15 @@ CONFIG_CRYPTO_CAMELLIA=y
  CONFIG_BITREVERSE=y
  # CONFIG_CRC_CCITT is not set
  CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
  CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
  CONFIG_LIBCRC32C=y
+CONFIG_AUDIT_GENERIC=y
  CONFIG_ZLIB_INFLATE=y
  CONFIG_ZLIB_DEFLATE=y
  CONFIG_PLIST=y
  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig

index 74daa0cf87e6800cea3a7c3e71b7bf8b9801e5d5..1ecdd3b65dc7bc7f9e11c1e29aa09bc514a55da7 100644 (file)
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23-rc2
-# Tue Aug  7 12:59:29 2007
+# Linux kernel version: 2.6.28-rc6
+# Mon Dec  1 08:08:19 2008
  #
  CONFIG_MIPS=y
  
@@ -11,20 +11,25 @@ CONFIG_MIPS=y
  CONFIG_ZONE_DMA=y
  # CONFIG_MACH_ALCHEMY is not set
  # CONFIG_BASLER_EXCITE is not set
+# CONFIG_BCM47XX is not set
  # CONFIG_MIPS_COBALT is not set
  # CONFIG_MACH_DECSTATION is not set
  # CONFIG_MACH_JAZZ is not set
+# CONFIG_LASAT is not set
  # CONFIG_LEMOTE_FULONG is not set
  CONFIG_MIPS_MALTA=y
  # CONFIG_MIPS_SIM is not set
-# CONFIG_MARKEINS is not set
+# CONFIG_MACH_EMMA is not set
  # CONFIG_MACH_VR41XX is not set
+# CONFIG_NXP_STB220 is not set
+# CONFIG_NXP_STB225 is not set
  # CONFIG_PNX8550_JBS is not set
  # CONFIG_PNX8550_STB810 is not set
  # CONFIG_PMC_MSP is not set
  # CONFIG_PMC_YOSEMITE is not set
  # CONFIG_SGI_IP22 is not set
  # CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP28 is not set
  # CONFIG_SGI_IP32 is not set
  # CONFIG_SIBYTE_CRHINE is not set
  # CONFIG_SIBYTE_CARMEL is not set
@@ -35,13 +40,14 @@ CONFIG_MIPS_MALTA=y
  # CONFIG_SIBYTE_SENTOSA is not set
  # CONFIG_SIBYTE_BIGSUR is not set
  # CONFIG_SNI_RM is not set
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_MACH_TX39XX is not set
+# CONFIG_MACH_TX49XX is not set
+# CONFIG_MIKROTIK_RB532 is not set
  # CONFIG_WR_PPMC is not set
  CONFIG_RWSEM_GENERIC_SPINLOCK=y
  # CONFIG_ARCH_HAS_ILOG2_U32 is not set
  # CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_ARCH_SUPPORTS_OPROFILE=y
  CONFIG_GENERIC_FIND_NEXT_BIT=y
  CONFIG_GENERIC_HWEIGHT=y
  CONFIG_GENERIC_CALIBRATE_DELAY=y
@@ -51,21 +57,26 @@ CONFIG_GENERIC_CMOS_UPDATE=y
  CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
  # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
  CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_BOOT_RAW=y
  CONFIG_CEVT_R4K=y
+CONFIG_CSRC_R4K=y
  CONFIG_DMA_NONCOHERENT=y
  CONFIG_DMA_NEED_PCI_MAP_STATE=y
  CONFIG_EARLY_PRINTK=y
  CONFIG_SYS_HAS_EARLY_PRINTK=y
-CONFIG_GENERIC_ISA_DMA=y
+# CONFIG_HOTPLUG_CPU is not set
  CONFIG_I8259=y
  CONFIG_MIPS_BONITO64=y
  CONFIG_MIPS_MSC=y
  # CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_ISA_DMA=y
  # CONFIG_CPU_BIG_ENDIAN is not set
  CONFIG_CPU_LITTLE_ENDIAN=y
  CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
  CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
  CONFIG_IRQ_CPU=y
+CONFIG_IRQ_GIC=y
+CONFIG_MIPS_BOARDS_GEN=y
  CONFIG_PCI_GT64XXX_PCI0=y
  CONFIG_SWAP_IO_SPACE=y
  CONFIG_BOOT_ELF32=y
@@ -74,10 +85,6 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
  #
  # CPU selection
  #
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
  # CONFIG_CPU_LOONGSON2 is not set
  # CONFIG_CPU_MIPS32_R1 is not set
  CONFIG_CPU_MIPS32_R2=y
@@ -91,6 +98,7 @@ CONFIG_CPU_MIPS32_R2=y
  # CONFIG_CPU_TX49XX is not set
  # CONFIG_CPU_R5000 is not set
  # CONFIG_CPU_R5432 is not set
+# CONFIG_CPU_R5500 is not set
  # CONFIG_CPU_R6000 is not set
  # CONFIG_CPU_NEVADA is not set
  # CONFIG_CPU_R8000 is not set
@@ -108,6 +116,7 @@ CONFIG_CPU_MIPSR2=y
  CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
  CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
  CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
+CONFIG_HARDWARE_WATCHPOINTS=y
  
  #
  # Kernel type
@@ -125,6 +134,8 @@ CONFIG_CPU_HAS_PREFETCH=y
  CONFIG_MIPS_MT_SMP=y
  # CONFIG_MIPS_MT_SMTC is not set
  CONFIG_MIPS_MT=y
+# CONFIG_SCHED_SMT is not set
+CONFIG_SYS_SUPPORTS_SCHED_SMT=y
  CONFIG_SYS_SUPPORTS_MULTITHREADING=y
  CONFIG_MIPS_MT_FPAFF=y
  # CONFIG_MIPS_VPE_LOADER is not set
@@ -132,7 +143,6 @@ CONFIG_CPU_HAS_LLSC=y
  # CONFIG_CPU_HAS_SMARTMIPS is not set
  CONFIG_CPU_MIPSR2_IRQ_VI=y
  CONFIG_CPU_MIPSR2_IRQ_EI=y
-CONFIG_CPU_MIPSR2_SRS=y
  CONFIG_CPU_HAS_SYNC=y
  CONFIG_GENERIC_HARDIRQS=y
  CONFIG_GENERIC_IRQ_PROBE=y
@@ -140,22 +150,30 @@ CONFIG_IRQ_PER_CPU=y
  CONFIG_CPU_SUPPORTS_HIGHMEM=y
  CONFIG_SYS_SUPPORTS_SMARTMIPS=y
  CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
  CONFIG_SELECT_MEMORY_MODEL=y
  CONFIG_FLATMEM_MANUAL=y
  # CONFIG_DISCONTIGMEM_MANUAL is not set
  # CONFIG_SPARSEMEM_MANUAL is not set
  CONFIG_FLATMEM=y
  CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  # CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
  CONFIG_SMP=y
+CONFIG_SMP_UP=y
  CONFIG_SYS_SUPPORTS_SMP=y
  CONFIG_NR_CPUS_DEFAULT_2=y
  CONFIG_NR_CPUS=2
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
  # CONFIG_HZ_48 is not set
  CONFIG_HZ_100=y
  # CONFIG_HZ_128 is not set
@@ -168,7 +186,6 @@ CONFIG_HZ=100
  CONFIG_PREEMPT_NONE=y
  # CONFIG_PREEMPT_VOLUNTARY is not set
  # CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_BKL=y
  # CONFIG_KEXEC is not set
  CONFIG_SECCOMP=y
  CONFIG_LOCKDEP_SUPPORT=y
@@ -189,13 +206,19 @@ CONFIG_SYSVIPC_SYSCTL=y
  # CONFIG_POSIX_MQUEUE is not set
  # CONFIG_BSD_PROCESS_ACCT is not set
  # CONFIG_TASKSTATS is not set
-# CONFIG_USER_NS is not set
  # CONFIG_AUDIT is not set
  # CONFIG_IKCONFIG is not set
  CONFIG_LOG_BUF_SHIFT=15
-# CONFIG_CPUSETS is not set
+# CONFIG_CGROUPS is not set
+# CONFIG_GROUP_SCHED is not set
  CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
  CONFIG_RELAY=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+# CONFIG_USER_NS is not set
+CONFIG_PID_NS=y
  # CONFIG_BLK_DEV_INITRD is not set
  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
  CONFIG_SYSCTL=y
@@ -207,6 +230,8 @@ CONFIG_HOTPLUG=y
  CONFIG_PRINTK=y
  CONFIG_BUG=y
  CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+# CONFIG_COMPAT_BRK is not set
  CONFIG_BASE_FULL=y
  CONFIG_FUTEX=y
  CONFIG_ANON_INODES=y
@@ -215,14 +240,23 @@ CONFIG_SIGNALFD=y
  CONFIG_TIMERFD=y
  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
+CONFIG_AIO=y
  CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
  CONFIG_SLAB=y
  # CONFIG_SLUB is not set
  # CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
  # CONFIG_TINY_SHMEM is not set
  CONFIG_BASE_SMALL=0
  CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
  CONFIG_MODULE_UNLOAD=y
  # CONFIG_MODULE_FORCE_UNLOAD is not set
  CONFIG_MODVERSIONS=y
@@ -234,6 +268,7 @@ CONFIG_BLOCK=y
  # CONFIG_BLK_DEV_IO_TRACE is not set
  # CONFIG_LSF is not set
  # CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
  
  #
  # IO Schedulers
@@ -247,19 +282,19 @@ CONFIG_DEFAULT_AS=y
  # CONFIG_DEFAULT_CFQ is not set
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_CLASSIC_RCU=y
+# CONFIG_FREEZER is not set
  
  #
  # Bus options (PCI, PCMCIA, EISA, ISA, TC)
  #
  CONFIG_HW_HAS_PCI=y
  CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
  # CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCI_LEGACY=y
  CONFIG_MMU=y
  CONFIG_I8253=y
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
  # CONFIG_PCCARD is not set
  # CONFIG_HOTPLUG_PCI is not set
  
@@ -267,6 +302,8 @@ CONFIG_I8253=y
  # Executable file formats
  #
  CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
  # CONFIG_BINFMT_MISC is not set
  CONFIG_TRAD_SIGNALS=y
  
@@ -274,12 +311,7 @@ CONFIG_TRAD_SIGNALS=y
  # Power management options
  #
  CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
  # CONFIG_PM_DEBUG is not set
-
-#
-# Networking
-#
  CONFIG_NET=y
  
  #
@@ -292,6 +324,8 @@ CONFIG_XFRM=y
  CONFIG_XFRM_USER=m
  # CONFIG_XFRM_SUB_POLICY is not set
  CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
  CONFIG_NET_KEY=y
  CONFIG_NET_KEY_MIGRATE=y
  CONFIG_INET=y
@@ -323,42 +357,13 @@ CONFIG_INET_TUNNEL=m
  CONFIG_INET_XFRM_MODE_TRANSPORT=m
  CONFIG_INET_XFRM_MODE_TUNNEL=m
  CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_LRO=m
  CONFIG_INET_DIAG=y
  CONFIG_INET_TCP_DIAG=y
  # CONFIG_TCP_CONG_ADVANCED is not set
  CONFIG_TCP_CONG_CUBIC=y
  CONFIG_DEFAULT_TCP_CONG="cubic"
  CONFIG_TCP_MD5SIG=y
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
  CONFIG_IPV6=m
  CONFIG_IPV6_PRIVACY=y
  CONFIG_IPV6_ROUTER_PREF=y
@@ -375,11 +380,15 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
  CONFIG_INET6_XFRM_MODE_BEET=m
  # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
  CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
  CONFIG_IPV6_TUNNEL=m
  # CONFIG_IPV6_MULTIPLE_TABLES is not set
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_PIMSM_V2=y
  CONFIG_NETWORK_SECMARK=y
  CONFIG_NETFILTER=y
  # CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
  CONFIG_BRIDGE_NETFILTER=y
  
  #
@@ -388,12 +397,12 @@ CONFIG_BRIDGE_NETFILTER=y
  CONFIG_NETFILTER_NETLINK=m
  CONFIG_NETFILTER_NETLINK_QUEUE=m
  CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK_ENABLED=m
  CONFIG_NF_CONNTRACK=m
  CONFIG_NF_CT_ACCT=y
  CONFIG_NF_CONNTRACK_MARK=y
  CONFIG_NF_CONNTRACK_SECMARK=y
  CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_DCCP=m
  CONFIG_NF_CT_PROTO_GRE=m
  CONFIG_NF_CT_PROTO_SCTP=m
  CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -407,18 +416,22 @@ CONFIG_NF_CONNTRACK_SANE=m
  CONFIG_NF_CONNTRACK_SIP=m
  CONFIG_NF_CONNTRACK_TFTP=m
  CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
  CONFIG_NETFILTER_XTABLES=m
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set
  # CONFIG_NETFILTER_XT_TARGET_DSCP is not set
  CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
  CONFIG_NETFILTER_XT_TARGET_TRACE=m
  CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set
  CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
  CONFIG_NETFILTER_XT_MATCH_COMMENT=m
  CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
  CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -427,40 +440,76 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
  CONFIG_NETFILTER_XT_MATCH_DCCP=m
  # CONFIG_NETFILTER_XT_MATCH_DSCP is not set
  CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
  CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
  CONFIG_NETFILTER_XT_MATCH_LENGTH=m
  CONFIG_NETFILTER_XT_MATCH_LIMIT=m
  CONFIG_NETFILTER_XT_MATCH_MAC=m
  CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
  CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
  # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
  CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
  CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
  CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
  CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
  CONFIG_NETFILTER_XT_MATCH_STATE=m
  CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
  CONFIG_NETFILTER_XT_MATCH_STRING=m
  CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
  CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
  
  #
  # IP: Netfilter Configuration
  #
+CONFIG_NF_DEFRAG_IPV4=m
  CONFIG_NF_CONNTRACK_IPV4=m
  CONFIG_NF_CONNTRACK_PROC_COMPAT=y
  CONFIG_IP_NF_QUEUE=m
  CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
  CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_FILTER=m
  CONFIG_IP_NF_TARGET_REJECT=m
  CONFIG_IP_NF_TARGET_LOG=m
@@ -468,11 +517,13 @@ CONFIG_IP_NF_TARGET_ULOG=m
  CONFIG_NF_NAT=m
  CONFIG_NF_NAT_NEEDED=y
  CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
  CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
  CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
  CONFIG_NF_NAT_FTP=m
  CONFIG_NF_NAT_IRC=m
  CONFIG_NF_NAT_TFTP=m
@@ -481,40 +532,34 @@ CONFIG_NF_NAT_PPTP=m
  CONFIG_NF_NAT_H323=m
  CONFIG_NF_NAT_SIP=m
  CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_TARGET_ECN=m
  CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_RAW=m
  CONFIG_IP_NF_ARPTABLES=m
  CONFIG_IP_NF_ARPFILTER=m
  CONFIG_IP_NF_ARP_MANGLE=m
  
  #
-# IPv6: Netfilter Configuration (EXPERIMENTAL)
+# IPv6: Netfilter Configuration
  #
  CONFIG_NF_CONNTRACK_IPV6=m
  CONFIG_IP6_NF_QUEUE=m
  CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
  CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
  CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_OWNER=m
  CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AH=m
  CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
  CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
  CONFIG_IP6_NF_TARGET_REJECT=m
  CONFIG_IP6_NF_MANGLE=m
  CONFIG_IP6_NF_TARGET_HL=m
  CONFIG_IP6_NF_RAW=m
-
-#
-# Bridge: Netfilter Configuration
-#
  CONFIG_BRIDGE_NF_EBTABLES=m
  CONFIG_BRIDGE_EBT_BROUTE=m
  CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -523,6 +568,7 @@ CONFIG_BRIDGE_EBT_802_3=m
  CONFIG_BRIDGE_EBT_AMONG=m
  CONFIG_BRIDGE_EBT_ARP=m
  CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
  CONFIG_BRIDGE_EBT_LIMIT=m
  CONFIG_BRIDGE_EBT_MARK=m
  CONFIG_BRIDGE_EBT_PKTTYPE=m
@@ -535,6 +581,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
  CONFIG_BRIDGE_EBT_SNAT=m
  CONFIG_BRIDGE_EBT_LOG=m
  CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
  # CONFIG_IP_DCCP is not set
  CONFIG_IP_SCTP=m
  # CONFIG_SCTP_DBG_MSG is not set
@@ -544,8 +591,12 @@ CONFIG_IP_SCTP=m
  CONFIG_SCTP_HMAC_MD5=y
  # CONFIG_TIPC is not set
  # CONFIG_ATM is not set
+CONFIG_STP=m
+CONFIG_GARP=m
  CONFIG_BRIDGE=m
+# CONFIG_NET_DSA is not set
  CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
  # CONFIG_DECNET is not set
  CONFIG_LLC=m
  # CONFIG_LLC2 is not set
@@ -559,12 +610,7 @@ CONFIG_IPDDP_DECAP=y
  # CONFIG_LAPB is not set
  # CONFIG_ECONET is not set
  # CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
  CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_FIFO=y
  
  #
  # Queueing/Scheduling
@@ -573,7 +619,7 @@ CONFIG_NET_SCH_CBQ=m
  CONFIG_NET_SCH_HTB=m
  CONFIG_NET_SCH_HFSC=m
  CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_RR=m
+# CONFIG_NET_SCH_MULTIQ is not set
  CONFIG_NET_SCH_RED=m
  CONFIG_NET_SCH_SFQ=m
  CONFIG_NET_SCH_TEQL=m
@@ -597,6 +643,7 @@ CONFIG_NET_CLS_U32=m
  # CONFIG_CLS_U32_MARK is not set
  CONFIG_NET_CLS_RSVP=m
  CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
  # CONFIG_NET_EMATCH is not set
  CONFIG_NET_CLS_ACT=y
  CONFIG_NET_ACT_POLICE=y
@@ -604,37 +651,51 @@ CONFIG_NET_ACT_GACT=m
  CONFIG_GACT_PROB=y
  CONFIG_NET_ACT_MIRRED=m
  CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
  CONFIG_NET_ACT_PEDIT=m
  CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_CLS_POLICE=y
+CONFIG_NET_ACT_SKBEDIT=m
  CONFIG_NET_CLS_IND=y
+CONFIG_NET_SCH_FIFO=y
  
  #
  # Network testing
  #
  # CONFIG_NET_PKTGEN is not set
  # CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
  # CONFIG_AF_RXRPC is not set
+CONFIG_PHONET=m
  CONFIG_FIB_RULES=y
-
-#
-# Wireless
-#
+CONFIG_WIRELESS=y
  CONFIG_CFG80211=m
+CONFIG_NL80211=y
+CONFIG_WIRELESS_OLD_REGULATORY=y
  CONFIG_WIRELESS_EXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
  CONFIG_MAC80211=m
-# CONFIG_MAC80211_DEBUG is not set
+
+#
+# Rate control algorithm selection
+#
+CONFIG_MAC80211_RC_PID=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_PID=y
+# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
+CONFIG_MAC80211_RC_DEFAULT="pid"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG_MENU is not set
  CONFIG_IEEE80211=m
  # CONFIG_IEEE80211_DEBUG is not set
  CONFIG_IEEE80211_CRYPT_WEP=m
  CONFIG_IEEE80211_CRYPT_CCMP=m
  CONFIG_IEEE80211_CRYPT_TKIP=m
-CONFIG_IEEE80211_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
  CONFIG_RFKILL=m
  CONFIG_RFKILL_INPUT=m
+CONFIG_RFKILL_LEDS=y
  # CONFIG_NET_9P is not set
  
  #
@@ -644,9 +705,12 @@ CONFIG_RFKILL_INPUT=m
  #
  # Generic Driver Options
  #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
  CONFIG_STANDALONE=y
  CONFIG_PREVENT_FIRMWARE_BUILD=y
  CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
  # CONFIG_SYS_HYPERVISOR is not set
  CONFIG_CONNECTOR=m
  CONFIG_MTD=y
@@ -655,6 +719,7 @@ CONFIG_MTD=y
  CONFIG_MTD_PARTITIONS=y
  # CONFIG_MTD_REDBOOT_PARTS is not set
  # CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
  
  #
  # User Modules And Translation Layers
@@ -667,6 +732,7 @@ CONFIG_MTD_BLOCK=y
  # CONFIG_INFTL is not set
  # CONFIG_RFD_FTL is not set
  # CONFIG_SSFDC is not set
+CONFIG_MTD_OOPS=m
  
  #
  # RAM/ROM/Flash chip drivers
@@ -701,6 +767,7 @@ CONFIG_MTD_PHYSMAP=y
  CONFIG_MTD_PHYSMAP_START=0x0
  CONFIG_MTD_PHYSMAP_LEN=0x0
  CONFIG_MTD_PHYSMAP_BANKWIDTH=0
+# CONFIG_MTD_INTEL_VR_NOR is not set
  # CONFIG_MTD_PLATRAM is not set
  
  #
@@ -748,25 +815,26 @@ CONFIG_BLK_DEV_NBD=m
  CONFIG_BLK_DEV_RAM=y
  CONFIG_BLK_DEV_RAM_COUNT=16
  CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_BLK_DEV_XIP is not set
  CONFIG_CDROM_PKTCDVD=m
  CONFIG_CDROM_PKTCDVD_BUFFERS=8
  # CONFIG_CDROM_PKTCDVD_WCACHE is not set
  CONFIG_ATA_OVER_ETH=m
+# CONFIG_BLK_DEV_HD is not set
  # CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
  CONFIG_IDE=y
-CONFIG_IDE_MAX_HWIFS=4
-CONFIG_BLK_DEV_IDE=y
  
  #
-# Please see Documentation/ide.txt for help/info on IDE drives
+# Please see Documentation/ide/ide.txt for help/info on IDE drives
  #
  # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD=y
+CONFIG_IDE_GD_ATA=y
+# CONFIG_IDE_GD_ATAPI is not set
  CONFIG_BLK_DEV_IDECD=y
+CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
  # CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
  # CONFIG_BLK_DEV_IDESCSI is not set
  # CONFIG_IDE_TASK_IOCTL is not set
  CONFIG_IDE_PROC_FS=y
@@ -775,24 +843,25 @@ CONFIG_IDE_PROC_FS=y
  # IDE chipset support/bugfixes
  #
  CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_PLATFORM is not set
+CONFIG_BLK_DEV_IDEDMA_SFF=y
+
+#
+# PCI IDE chipsets support
+#
  CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_IDEPCI_SHARE_IRQ is not set
  CONFIG_IDEPCI_PCIBUS_ORDER=y
  # CONFIG_BLK_DEV_OFFBOARD is not set
  CONFIG_BLK_DEV_GENERIC=y
  # CONFIG_BLK_DEV_OPTI621 is not set
  CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
  # CONFIG_BLK_DEV_AEC62XX is not set
  # CONFIG_BLK_DEV_ALI15X3 is not set
  # CONFIG_BLK_DEV_AMD74XX is not set
  # CONFIG_BLK_DEV_CMD64X is not set
  # CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
  # CONFIG_BLK_DEV_CS5520 is not set
  # CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_HPT34X is not set
  # CONFIG_BLK_DEV_HPT366 is not set
  # CONFIG_BLK_DEV_JMICRON is not set
  # CONFIG_BLK_DEV_SC1200 is not set
@@ -808,10 +877,7 @@ CONFIG_BLK_DEV_IT8213=m
  # CONFIG_BLK_DEV_TRM290 is not set
  # CONFIG_BLK_DEV_VIA82CXXX is not set
  CONFIG_BLK_DEV_TC86C001=m
-# CONFIG_IDE_ARM is not set
  CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_BLK_DEV_HD is not set
  
  #
  # SCSI device support
@@ -848,8 +914,10 @@ CONFIG_SCSI_WAIT_SCAN=m
  #
  CONFIG_SCSI_SPI_ATTRS=m
  CONFIG_SCSI_FC_ATTRS=m
+# CONFIG_SCSI_FC_TGT_ATTRS is not set
  CONFIG_SCSI_ISCSI_ATTRS=m
  # CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
  CONFIG_SCSI_LOWLEVEL=y
  CONFIG_ISCSI_TCP=m
  CONFIG_BLK_DEV_3W_XXXX_RAID=m
@@ -866,6 +934,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
  # CONFIG_SCSI_AIC79XX is not set
  # CONFIG_SCSI_AIC94XX is not set
  # CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
  # CONFIG_SCSI_ARCMSR is not set
  # CONFIG_MEGARAID_NEWGEN is not set
  # CONFIG_MEGARAID_LEGACY is not set
@@ -876,6 +945,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
  # CONFIG_SCSI_IPS is not set
  # CONFIG_SCSI_INITIO is not set
  # CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_MVSAS is not set
  # CONFIG_SCSI_STEX is not set
  # CONFIG_SCSI_SYM53C8XX_2 is not set
  # CONFIG_SCSI_QLOGIC_1280 is not set
@@ -887,6 +957,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
  # CONFIG_SCSI_NSP32 is not set
  # CONFIG_SCSI_DEBUG is not set
  # CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_DH is not set
  # CONFIG_ATA is not set
  CONFIG_MD=y
  CONFIG_BLK_DEV_MD=m
@@ -905,32 +976,28 @@ CONFIG_DM_SNAPSHOT=m
  CONFIG_DM_MIRROR=m
  CONFIG_DM_ZERO=m
  CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_EMC=m
-CONFIG_DM_MULTIPATH_RDAC=m
  # CONFIG_DM_DELAY is not set
+# CONFIG_DM_UEVENT is not set
+# CONFIG_FUSION is not set
  
  #
-# Fusion MPT device support
+# IEEE 1394 (FireWire) support
  #
-# CONFIG_FUSION is not set
-# CONFIG_FUSION_SPI is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION_SAS is not set
  
  #
-# IEEE 1394 (FireWire) support
+# Enable only one of the two stacks, unless you know what you are doing
  #
  # CONFIG_FIREWIRE is not set
  # CONFIG_IEEE1394 is not set
  # CONFIG_I2O is not set
  CONFIG_NETDEVICES=y
-CONFIG_NETDEVICES_MULTIQUEUE=y
  CONFIG_IFB=m
  CONFIG_DUMMY=m
  CONFIG_BONDING=m
  CONFIG_MACVLAN=m
  CONFIG_EQUALIZER=m
  CONFIG_TUN=m
+CONFIG_VETH=m
  # CONFIG_ARCNET is not set
  CONFIG_PHYLIB=m
  
@@ -946,26 +1013,34 @@ CONFIG_VITESSE_PHY=m
  CONFIG_SMSC_PHY=m
  CONFIG_BROADCOM_PHY=m
  CONFIG_ICPLUS_PHY=m
-# CONFIG_FIXED_PHY is not set
+CONFIG_REALTEK_PHY=m
+CONFIG_MDIO_BITBANG=m
  CONFIG_NET_ETHERNET=y
  CONFIG_MII=y
  CONFIG_AX88796=m
+# CONFIG_AX88796_93CX6 is not set
  # CONFIG_HAPPYMEAL is not set
  # CONFIG_SUNGEM is not set
  # CONFIG_CASSINI is not set
  # CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_SMC91X is not set
  # CONFIG_DM9000 is not set
  # CONFIG_NET_TULIP is not set
  # CONFIG_HP100 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  CONFIG_NET_PCI=y
  CONFIG_PCNET32=y
-# CONFIG_PCNET32_NAPI is not set
  # CONFIG_AMD8111_ETH is not set
  # CONFIG_ADAPTEC_STARFIRE is not set
  # CONFIG_B44 is not set
  # CONFIG_FORCEDETH is not set
  CONFIG_TC35815=m
-# CONFIG_DGRS is not set
  # CONFIG_EEPRO100 is not set
  # CONFIG_E100 is not set
  # CONFIG_FEALNX is not set
@@ -973,16 +1048,21 @@ CONFIG_TC35815=m
  # CONFIG_NE2K_PCI is not set
  # CONFIG_8139CP is not set
  # CONFIG_8139TOO is not set
+# CONFIG_R6040 is not set
  # CONFIG_SIS900 is not set
  # CONFIG_EPIC100 is not set
  # CONFIG_SUNDANCE is not set
  # CONFIG_TLAN is not set
  # CONFIG_VIA_RHINE is not set
  # CONFIG_SC92031 is not set
+# CONFIG_ATL2 is not set
  CONFIG_NETDEV_1000=y
  # CONFIG_ACENIC is not set
  # CONFIG_DL2K is not set
  # CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
  # CONFIG_NS83820 is not set
  # CONFIG_HAMACHI is not set
  # CONFIG_YELLOWFIN is not set
@@ -995,14 +1075,24 @@ CONFIG_NETDEV_1000=y
  # CONFIG_BNX2 is not set
  # CONFIG_QLA3XXX is not set
  # CONFIG_ATL1 is not set
+# CONFIG_ATL1E is not set
+# CONFIG_JME is not set
  CONFIG_NETDEV_10000=y
  # CONFIG_CHELSIO_T1 is not set
  CONFIG_CHELSIO_T3=m
+# CONFIG_ENIC is not set
+# CONFIG_IXGBE is not set
  # CONFIG_IXGB is not set
  # CONFIG_S2IO is not set
  # CONFIG_MYRI10GE is not set
  CONFIG_NETXEN_NIC=m
+# CONFIG_NIU is not set
+# CONFIG_MLX4_EN is not set
  # CONFIG_MLX4_CORE is not set
+# CONFIG_TEHUTI is not set
+# CONFIG_BNX2X is not set
+# CONFIG_QLGE is not set
+# CONFIG_SFC is not set
  # CONFIG_TR is not set
  
  #
@@ -1022,6 +1112,7 @@ CONFIG_IPW2200_QOS=y
  # CONFIG_IPW2200_DEBUG is not set
  CONFIG_LIBERTAS=m
  # CONFIG_LIBERTAS_DEBUG is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
  CONFIG_HERMES=m
  CONFIG_PLX_HERMES=m
  CONFIG_TMD_HERMES=m
@@ -1030,25 +1121,30 @@ CONFIG_PCI_HERMES=m
  CONFIG_ATMEL=m
  CONFIG_PCI_ATMEL=m
  CONFIG_PRISM54=m
+# CONFIG_RTL8180 is not set
+# CONFIG_ADM8211 is not set
+# CONFIG_MAC80211_HWSIM is not set
+# CONFIG_P54_COMMON is not set
+# CONFIG_ATH5K is not set
+# CONFIG_ATH9K is not set
+# CONFIG_IWLCORE is not set
+# CONFIG_IWLWIFI_LEDS is not set
+# CONFIG_IWLAGN is not set
+# CONFIG_IWL3945 is not set
  CONFIG_HOSTAP=m
  CONFIG_HOSTAP_FIRMWARE=y
  CONFIG_HOSTAP_FIRMWARE_NVRAM=y
  CONFIG_HOSTAP_PLX=m
  CONFIG_HOSTAP_PCI=m
-CONFIG_BCM43XX=m
-CONFIG_BCM43XX_DEBUG=y
-CONFIG_BCM43XX_DMA=y
-CONFIG_BCM43XX_PIO=y
-CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_DMA_MODE is not set
-# CONFIG_BCM43XX_PIO_MODE is not set
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_RT2X00 is not set
  # CONFIG_WAN is not set
  # CONFIG_FDDI is not set
  # CONFIG_HIPPI is not set
  # CONFIG_PPP is not set
  # CONFIG_SLIP is not set
  # CONFIG_NET_FC is not set
-# CONFIG_SHAPER is not set
  # CONFIG_NETCONSOLE is not set
  # CONFIG_NETPOLL is not set
  # CONFIG_NET_POLL_CONTROLLER is not set
@@ -1070,7 +1166,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
  CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
  CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
  # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
  # CONFIG_INPUT_EVDEV is not set
  # CONFIG_INPUT_EVBUG is not set
  
@@ -1099,10 +1194,13 @@ CONFIG_SERIO_SERPORT=y
  # Character devices
  #
  CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
  CONFIG_VT_CONSOLE=y
  CONFIG_HW_CONSOLE=y
  CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVKMEM=y
  # CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
  
  #
  # Serial drivers
@@ -1124,101 +1222,165 @@ CONFIG_UNIX98_PTYS=y
  CONFIG_LEGACY_PTYS=y
  CONFIG_LEGACY_PTY_COUNT=256
  # CONFIG_IPMI_HANDLER is not set
-# CONFIG_WATCHDOG is not set
  CONFIG_HW_RANDOM=m
-CONFIG_RTC=y
  # CONFIG_R3964 is not set
  # CONFIG_APPLICOM is not set
-# CONFIG_DRM is not set
  # CONFIG_RAW_DRIVER is not set
  # CONFIG_TCG_TPM is not set
  CONFIG_DEVPORT=y
  # CONFIG_I2C is not set
-
-#
-# SPI support
-#
  # CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
  # CONFIG_W1 is not set
  # CONFIG_POWER_SUPPLY is not set
  # CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
  
  #
  # Multifunction device drivers
  #
+# CONFIG_MFD_CORE is not set
  # CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
  #
+
+#
+# Multimedia core support
+#
  # CONFIG_VIDEO_DEV is not set
  # CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
  # CONFIG_DAB is not set
  
  #
  # Graphics support
  #
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
  # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
  
  #
  # Display device support
  #
  # CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_FB is not set
  
  #
  # Console display driver support
  #
  # CONFIG_VGA_CONSOLE is not set
  CONFIG_DUMMY_CONSOLE=y
-
-#
-# Sound
-#
  # CONFIG_SOUND is not set
  CONFIG_HID_SUPPORT=y
  CONFIG_HID=m
  # CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_COMPAT=y
  CONFIG_USB_SUPPORT=y
  CONFIG_USB_ARCH_HAS_HCD=y
  CONFIG_USB_ARCH_HAS_OHCI=y
  CONFIG_USB_ARCH_HAS_EHCI=y
  # CONFIG_USB is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
  
  #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# Enable Host or Gadget support to see Inventra options
  #
  
  #
-# USB Gadget Support
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
  #
  # CONFIG_USB_GADGET is not set
+# CONFIG_UWB is not set
  # CONFIG_MMC is not set
-# CONFIG_NEW_LEDS is not set
+# CONFIG_MEMSTICK is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=m
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+# CONFIG_ACCESSIBILITY is not set
  # CONFIG_INFINIBAND is not set
-# CONFIG_RTC_CLASS is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
  
  #
-# DMA Engine support
+# RTC interfaces
  #
-# CONFIG_DMA_ENGINE is not set
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
  
  #
-# DMA Clients
+# SPI RTC drivers
  #
  
  #
-# DMA Devices
+# Platform RTC drivers
  #
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_V3020 is not set
  
  #
-# Userspace I/O
+# on-CPU RTC drivers
  #
+# CONFIG_DMADEVICES is not set
  CONFIG_UIO=m
  CONFIG_UIO_CIF=m
+# CONFIG_UIO_PDRV is not set
+# CONFIG_UIO_PDRV_GENIRQ is not set
+# CONFIG_UIO_SMX is not set
+# CONFIG_UIO_SERCOS3 is not set
+# CONFIG_STAGING is not set
+CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # File systems
@@ -1230,9 +1392,8 @@ CONFIG_EXT3_FS=y
  CONFIG_EXT3_FS_XATTR=y
  # CONFIG_EXT3_FS_POSIX_ACL is not set
  # CONFIG_EXT3_FS_SECURITY is not set
-# CONFIG_EXT4DEV_FS is not set
+# CONFIG_EXT4_FS is not set
  CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
  CONFIG_FS_MBCACHE=y
  CONFIG_REISERFS_FS=m
  # CONFIG_REISERFS_CHECK is not set
@@ -1246,22 +1407,22 @@ CONFIG_JFS_SECURITY=y
  # CONFIG_JFS_DEBUG is not set
  # CONFIG_JFS_STATISTICS is not set
  CONFIG_FS_POSIX_ACL=y
+CONFIG_FILE_LOCKING=y
  CONFIG_XFS_FS=m
  CONFIG_XFS_QUOTA=y
-CONFIG_XFS_SECURITY=y
  CONFIG_XFS_POSIX_ACL=y
  # CONFIG_XFS_RT is not set
-# CONFIG_GFS2_FS is not set
+# CONFIG_XFS_DEBUG is not set
  # CONFIG_OCFS2_FS is not set
-CONFIG_MINIX_FS=m
-CONFIG_ROMFS_FS=m
+CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
  CONFIG_QUOTA=y
+# CONFIG_QUOTA_NETLINK_INTERFACE is not set
+CONFIG_PRINT_QUOTA_WARNING=y
  # CONFIG_QFMT_V1 is not set
  CONFIG_QFMT_V2=y
  CONFIG_QUOTACTL=y
-CONFIG_DNOTIFY=y
  CONFIG_AUTOFS_FS=y
  # CONFIG_AUTOFS4_FS is not set
  CONFIG_FUSE_FS=m
@@ -1291,11 +1452,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
  CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
  CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
  # CONFIG_TMPFS_POSIX_ACL is not set
  # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
  # CONFIG_CONFIGFS_FS is not set
  
  #
@@ -1312,46 +1473,48 @@ CONFIG_EFS_FS=m
  CONFIG_JFFS2_FS=m
  CONFIG_JFFS2_FS_DEBUG=0
  CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
  # CONFIG_JFFS2_SUMMARY is not set
  CONFIG_JFFS2_FS_XATTR=y
  CONFIG_JFFS2_FS_POSIX_ACL=y
  CONFIG_JFFS2_FS_SECURITY=y
  CONFIG_JFFS2_COMPRESSION_OPTIONS=y
  CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
  CONFIG_JFFS2_RTIME=y
  CONFIG_JFFS2_RUBIN=y
  # CONFIG_JFFS2_CMODE_NONE is not set
  CONFIG_JFFS2_CMODE_PRIORITY=y
  # CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+# CONFIG_UBIFS_FS is not set
  CONFIG_CRAMFS=m
  CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+# CONFIG_OMFS_FS is not set
  # CONFIG_HPFS_FS is not set
  # CONFIG_QNX4FS_FS is not set
+CONFIG_ROMFS_FS=m
  CONFIG_SYSV_FS=m
  CONFIG_UFS_FS=m
  # CONFIG_UFS_FS_WRITE is not set
  # CONFIG_UFS_DEBUG is not set
-
-#
-# Network File Systems
-#
+CONFIG_NETWORK_FILESYSTEMS=y
  CONFIG_NFS_FS=y
  CONFIG_NFS_V3=y
  # CONFIG_NFS_V3_ACL is not set
  # CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
+CONFIG_ROOT_NFS=y
  CONFIG_NFSD=y
  CONFIG_NFSD_V3=y
  # CONFIG_NFSD_V3_ACL is not set
  # CONFIG_NFSD_V4 is not set
-# CONFIG_NFSD_TCP is not set
-CONFIG_ROOT_NFS=y
  CONFIG_LOCKD=y
  CONFIG_LOCKD_V4=y
  CONFIG_EXPORTFS=y
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=y
-# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_SUNRPC_REGISTER_V4 is not set
  # CONFIG_RPCSEC_GSS_KRB5 is not set
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  # CONFIG_SMB_FS is not set
@@ -1365,10 +1528,6 @@ CONFIG_SUNRPC=y
  #
  # CONFIG_PARTITION_ADVANCED is not set
  CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
  CONFIG_NLS=m
  CONFIG_NLS_DEFAULT="iso8859-1"
  CONFIG_NLS_CODEPAGE_437=m
@@ -1409,29 +1568,30 @@ CONFIG_NLS_ISO8859_15=m
  CONFIG_NLS_KOI8_R=m
  CONFIG_NLS_KOI8_U=m
  CONFIG_NLS_UTF8=m
-
-#
-# Distributed Lock Manager
-#
  # CONFIG_DLM is not set
  
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
  #
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
  # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
  CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
  # CONFIG_MAGIC_SYSRQ is not set
  # CONFIG_UNUSED_SYMBOLS is not set
  # CONFIG_DEBUG_FS is not set
  # CONFIG_HEADERS_CHECK is not set
  # CONFIG_DEBUG_KERNEL is not set
-CONFIG_CROSSCOMPILE=y
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+
+#
+# Tracers
+#
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
  CONFIG_CMDLINE=""
  
  #
@@ -1439,51 +1599,103 @@ CONFIG_CMDLINE=""
  #
  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
  CONFIG_ASYNC_MEMCPY=m
  CONFIG_ASYNC_XOR=m
  CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_FIPS is not set
  CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ABLKCIPHER=m
-CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_BLKCIPHER=y
  CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_RNG=y
  CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
  CONFIG_CRYPTO_HMAC=y
  CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_NULL=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
  CONFIG_CRYPTO_MD4=m
  CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
  CONFIG_CRYPTO_SHA1=m
  CONFIG_CRYPTO_SHA256=m
  CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_WP512=m
  CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
  CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
  CONFIG_CRYPTO_CAST5=m
  CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
  CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
  CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CAMELLIA=m
-# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_LZO is not set
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
  CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
  
  #
  # Library routines
@@ -1491,7 +1703,8 @@ CONFIG_CRYPTO_HW=y
  CONFIG_BITREVERSE=y
  # CONFIG_CRC_CCITT is not set
  CONFIG_CRC16=m
-# CONFIG_CRC_ITU_T is not set
+# CONFIG_CRC_T10DIF is not set
+CONFIG_CRC_ITU_T=m
  CONFIG_CRC32=y
  # CONFIG_CRC7 is not set
  CONFIG_LIBCRC32C=m
diff --git a/arch/mips/include/asm/asmmacro.h b/arch/mips/include/asm/asmmacro.h

index 7a881755800f94a4be165b989a9f2f54fb6ffaa1..6c8342ae74db88cd3187d1964274aa03c6031165 100644 (file)
--- a/arch/mips/include/asm/asmmacro.h
+++ b/arch/mips/include/asm/asmmacro.h
@@ -35,6 +35,16 @@
         mtc0    \reg, CP0_TCSTATUS
         _ehb
         .endm
+#elif defined(CONFIG_CPU_MIPSR2)
+       .macro  local_irq_enable reg=t0
+       ei
+       irq_enable_hazard
+       .endm
+
+       .macro  local_irq_disable reg=t0
+       di
+       irq_disable_hazard
+       .endm
  #else
         .macro  local_irq_enable reg=t0
         mfc0    \reg, CP0_STATUS
diff --git a/arch/mips/include/asm/byteorder.h b/arch/mips/include/asm/byteorder.h

index 2988d29a0867f4c0ce187040e710e3c87344030d..33790b9e0cc0d46ee41f0ec8d3f3dbf181c8a9fc 100644 (file)
--- a/arch/mips/include/asm/byteorder.h
+++ b/arch/mips/include/asm/byteorder.h
@@ -50,9 +50,8 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
  static inline __attribute_const__ __u64 __arch_swab64(__u64 x)
  {
         __asm__(
-       "       dsbh    %0, %1                  \n"
-       "       dshd    %0, %0                  \n"
-       "       drotr   %0, %0, 32              \n"
+       "       dsbh    %0, %1\n"
+       "       dshd    %0, %0"
         : "=r" (x)
         : "r" (x));
  
diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h

index a8eac1697b3ddcf05dccc71d42267c549cc40904..d58f128aa747be974ac10ffd5fb1749d3292f505 100644 (file)
--- a/arch/mips/include/asm/elf.h
+++ b/arch/mips/include/asm/elf.h
@@ -232,7 +232,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
   */
  #ifdef __MIPSEB__
  #define ELF_DATA       ELFDATA2MSB
-#elif __MIPSEL__
+#elif defined(__MIPSEL__)
  #define ELF_DATA       ELFDATA2LSB
  #endif
  #define ELF_ARCH       EM_MIPS
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h

index 5510c53b7feb7f5b7d2e721b70c763d055f8ef0d..053e4634acee61b78ca8e3d4cd2fded4c4e2aa06 100644 (file)
--- a/arch/mips/include/asm/pci.h
+++ b/arch/mips/include/asm/pci.h
@@ -79,6 +79,11 @@ static inline void pcibios_penalize_isa_irq(int irq, int active)
         /* We don't do dynamic PCI IRQ allocation */
  }
  
+#define HAVE_PCI_MMAP
+
+extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
+       enum pci_mmap_state mmap_state, int write_combine);
+
  /*
   * Dynamic DMA mapping stuff.
   * MIPS has everything mapped statically.
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S

index 759f68066b5d529991dea584758d46c26ef1887b..d0916a55cd775f09f54826eb9358c626ba19dd7d 100644 (file)
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -262,14 +262,11 @@ bad_alignment:
         LEAF(sys_syscall)
         subu    t0, a0, __NR_O32_Linux  # check syscall number
         sltiu   v0, t0, __NR_O32_Linux_syscalls + 1
+       beqz    t0, einval              # do not recurse
         sll     t1, t0, 3
         beqz    v0, einval
-
         lw      t2, sys_call_table(t1)          # syscall routine
  
-       li      v1, 4000 - __NR_O32_Linux       # index of sys_syscall
-       beq     t0, v1, einval                  # do not recurse
-
         /* Some syscalls like execve get their arguments from struct pt_regs
            and claim zero arguments in the syscall table. Thus we have to
            assume the worst case and shuffle around all potential arguments.
@@ -627,7 +624,7 @@ einval:     li      v0, -ENOSYS
         sys     sys_pselect6            6
         sys     sys_ppoll               5
         sys     sys_unshare             1
-       sys     sys_splice              4
+       sys     sys_splice              6
         sys     sys_sync_file_range     7       /* 4305 */
         sys     sys_tee                 4
         sys     sys_vmsplice            4
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S

index e266b3aa6560fa8de6e3b0fd607bee6a714685a8..30f3b6317a83f1ec7d753cdb49b96d1aedce1186 100644 (file)
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -390,7 +390,7 @@ EXPORT(sysn32_call_table)
         PTR     sys_splice
         PTR     sys_sync_file_range
         PTR     sys_tee
-       PTR     sys_vmsplice                    /* 6270 */
+       PTR     compat_sys_vmsplice             /* 6270 */
         PTR     sys_move_pages
         PTR     compat_sys_set_robust_list
         PTR     compat_sys_get_robust_list
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S

index 6c7ef8313ebd702dde4997d225f06189fdb560a0..fefef4af8595493ec3c5414f3fb0fcaff14869b1 100644 (file)
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -174,14 +174,12 @@ not_o32_scall:
         END(handle_sys)
  
  LEAF(sys32_syscall)
-       sltu    v0, a0, __NR_O32_Linux + __NR_O32_Linux_syscalls + 1
+       subu    t0, a0, __NR_O32_Linux  # check syscall number
+       sltiu   v0, t0, __NR_O32_Linux_syscalls + 1
+       beqz    t0, einval              # do not recurse
+       dsll    t1, t0, 3
         beqz    v0, einval
-
-       dsll    v0, a0, 3
-       ld      t2, (sys_call_table - (__NR_O32_Linux * 8))(v0)
-
-       li      v1, 4000                # indirect syscall number
-       beq     a0, v1, einval          # do not recurse
+       ld      t2, sys_call_table(t1)          # syscall routine
  
         move    a0, a1                  # shift argument registers
         move    a1, a2
@@ -198,7 +196,7 @@ LEAF(sys32_syscall)
         jr      t2
         /* Unreached */
  
-einval:        li      v0, -EINVAL
+einval:        li      v0, -ENOSYS
         jr      ra
         END(sys32_syscall)
  
@@ -512,7 +510,7 @@ sys_call_table:
         PTR     sys_splice
         PTR     sys32_sync_file_range           /* 4305 */
         PTR     sys_tee
-       PTR     sys_vmsplice
+       PTR     compat_sys_vmsplice
         PTR     compat_sys_move_pages
         PTR     compat_sys_set_robust_list
         PTR     compat_sys_get_robust_list      /* 4310 */
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c

index 972b2d2b8401b6dd7bd4922690205c6b8f3a5cdf..a1b3da6bad5cb17c577712ac4bf83f439b5d7292 100644 (file)
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -1134,7 +1134,7 @@ static int vpe_release(struct inode *inode, struct file *filp)
  
         /* It's good to be able to run the SP and if it chokes have a look at
            the /dev/rt?. But if we reset the pointer to the shared struct we
-          loose what has happened. So perhaps if garbage is sent to the vpe
+          lose what has happened. So perhaps if garbage is sent to the vpe
            device, use it as a trigger for the reset. Hopefully a nice
            executable will be along shortly. */
         if (ret < 0)
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c

index 5b98d0e731c2238ae0f8ff64d3a3d139aa4ef562..e6708b3ad343f478e15a7d1102a90df2c7f61841 100644 (file)
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -111,6 +111,7 @@ EXPORT_SYMBOL(dma_alloc_coherent);
  void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr,
         dma_addr_t dma_handle)
  {
+       plat_unmap_dma_mem(dma_handle);
         free_pages((unsigned long) vaddr, get_order(size));
  }
  
@@ -121,6 +122,8 @@ void dma_free_coherent(struct device *dev, size_t size, void *vaddr,
  {
         unsigned long addr = (unsigned long) vaddr;
  
+       plat_unmap_dma_mem(dma_handle);
+
         if (!plat_device_is_coherent(dev))
                 addr = CAC_ADDR(addr);
  
diff --git a/arch/mips/mti-malta/Makefile b/arch/mips/mti-malta/Makefile

index cef2db8d22253185d8d66402e4e300422fcd4645..32e847808df166cf6469a4d919b2763dd7bde8da 100644 (file)
--- a/arch/mips/mti-malta/Makefile
+++ b/arch/mips/mti-malta/Makefile
@@ -7,9 +7,8 @@
  #
  obj-y                          := malta-amon.o malta-cmdline.o \
                                    malta-display.o malta-init.o malta-int.o \
-                                  malta-memory.o malta-mtd.o \
-                                  malta-platform.o malta-reset.o \
-                                  malta-setup.o malta-time.o
+                                  malta-memory.o malta-platform.o \
+                                  malta-reset.o malta-setup.o malta-time.o
  
  obj-$(CONFIG_EARLY_PRINTK)     += malta-console.o
  obj-$(CONFIG_PCI)              += malta-pci.o
diff --git a/arch/mips/mti-malta/malta-mtd.c b/arch/mips/mti-malta/malta-mtd.c

deleted file mode 100644 (file)

index 8ad9bdf..0000000
--- a/arch/mips/mti-malta/malta-mtd.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2006 MIPS Technologies, Inc.
- *     written by Ralf Baechle <ralf@linux-mips.org>
- */
-
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-#include <mtd/mtd-abi.h>
-
-static struct mtd_partition malta_mtd_partitions[] = {
-       {
-               .name =         "YAMON",
-               .offset =       0x0,
-               .size =         0x100000,
-               .mask_flags =   MTD_WRITEABLE
-       }, {
-               .name =         "User FS",
-               .offset =       0x100000,
-               .size =         0x2e0000
-       }, {
-               .name =         "Board Config",
-               .offset =       0x3e0000,
-               .size =         0x020000,
-               .mask_flags =   MTD_WRITEABLE
-       }
-};
-
-static struct physmap_flash_data malta_flash_data = {
-       .width          = 4,
-       .nr_parts       = ARRAY_SIZE(malta_mtd_partitions),
-       .parts          = malta_mtd_partitions
-};
-
-static struct resource malta_flash_resource = {
-       .start          = 0x1e000000,
-       .end            = 0x1e3fffff,
-       .flags          = IORESOURCE_MEM
-};
-
-static struct platform_device malta_flash = {
-       .name           = "physmap-flash",
-       .id             = 0,
-       .dev            = {
-               .platform_data  = &malta_flash_data,
-       },
-       .num_resources  = 1,
-       .resource       = &malta_flash_resource,
-};
-
-static int __init malta_mtd_init(void)
-{
-       platform_device_register(&malta_flash);
-
-       return 0;
-}
-
-module_init(malta_mtd_init)
diff --git a/arch/mips/mti-malta/malta-platform.c b/arch/mips/mti-malta/malta-platform.c

index 83b9bab3cd3f72c837096a4fa8ef73d0dc26db78..72e32a7715beff770347237d6944472184853cf4 100644 (file)
--- a/arch/mips/mti-malta/malta-platform.c
+++ b/arch/mips/mti-malta/malta-platform.c
@@ -3,10 +3,14 @@
   * License.  See the file "COPYING" in the main directory of this archive
   * for more details.
   *
- * Copyright (C) 2007 MIPS Technologies, Inc.
+ * Copyright (C) 2006, 07 MIPS Technologies, Inc.
   *   written by Ralf Baechle (ralf@linux-mips.org)
+ *     written by Ralf Baechle <ralf@linux-mips.org>
   *
- * Probe driver for the Malta's UART ports:
+ * Copyright (C) 2008 Wind River Systems, Inc.
+ *   updated by Tiejun Chen <tiejun.chen@windriver.com>
+ *
+ * 1. Probe driver for the Malta's UART ports:
   *
   *   o 2 ports in the SMC SuperIO
   *   o 1 port in the CBUS UART, a discrete 16550 which normally is only used
@@ -14,10 +18,17 @@
   *
   * We don't use 8250_platform.c on Malta as it would result in the CBUS
   * UART becoming ttyS0.
+ *
+ * 2. Register RTC-CMOS platform device on Malta.
   */
-#include <linux/module.h>
  #include <linux/init.h>
  #include <linux/serial_8250.h>
+#include <linux/mc146818rtc.h>
+#include <linux/module.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+#include <linux/platform_device.h>
+#include <mtd/mtd-abi.h>
  
  #define SMC_PORT(base, int)                                            \
  {                                                                      \
@@ -45,21 +56,93 @@ static struct plat_serial8250_port uart8250_data[] = {
         { },
  };
  
-static struct platform_device uart8250_device = {
+static struct platform_device malta_uart8250_device = {
         .name                   = "serial8250",
-       .id                     = PLAT8250_DEV_PLATFORM2,
+       .id                     = PLAT8250_DEV_PLATFORM,
         .dev                    = {
                 .platform_data  = uart8250_data,
         },
  };
  
-static int __init uart8250_init(void)
+struct resource malta_rtc_resources[] = {
+       {
+               .start  = RTC_PORT(0),
+               .end    = RTC_PORT(7),
+               .flags  = IORESOURCE_IO,
+       }, {
+               .start  = RTC_IRQ,
+               .end    = RTC_IRQ,
+               .flags  = IORESOURCE_IRQ,
+       }
+};
+
+static struct platform_device malta_rtc_device = {
+       .name           = "rtc_cmos",
+       .id             = -1,
+       .resource       = malta_rtc_resources,
+       .num_resources  = ARRAY_SIZE(malta_rtc_resources),
+};
+
+static struct mtd_partition malta_mtd_partitions[] = {
+       {
+               .name =         "YAMON",
+               .offset =       0x0,
+               .size =         0x100000,
+               .mask_flags =   MTD_WRITEABLE
+       }, {
+               .name =         "User FS",
+               .offset =       0x100000,
+               .size =         0x2e0000
+       }, {
+               .name =         "Board Config",
+               .offset =       0x3e0000,
+               .size =         0x020000,
+               .mask_flags =   MTD_WRITEABLE
+       }
+};
+
+static struct physmap_flash_data malta_flash_data = {
+       .width          = 4,
+       .nr_parts       = ARRAY_SIZE(malta_mtd_partitions),
+       .parts          = malta_mtd_partitions
+};
+
+static struct resource malta_flash_resource = {
+       .start          = 0x1e000000,
+       .end            = 0x1e3fffff,
+       .flags          = IORESOURCE_MEM
+};
+
+static struct platform_device malta_flash_device = {
+       .name           = "physmap-flash",
+       .id             = 0,
+       .dev            = {
+               .platform_data  = &malta_flash_data,
+       },
+       .num_resources  = 1,
+       .resource       = &malta_flash_resource,
+};
+
+static struct platform_device *malta_devices[] __initdata = {
+       &malta_uart8250_device,
+       &malta_rtc_device,
+       &malta_flash_device,
+};
+
+static int __init malta_add_devices(void)
  {
-       return platform_device_register(&uart8250_device);
-}
+       int err;
  
-module_init(uart8250_init);
+       err = platform_add_devices(malta_devices, ARRAY_SIZE(malta_devices));
+       if (err)
+               return err;
+
+       /*
+        * Set RTC to BCD mode to support current alarm code.
+        */
+       CMOS_WRITE(CMOS_READ(RTC_CONTROL) & ~RTC_DM_BINARY, RTC_CONTROL);
+
+       return 0;
+}
  
-MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("8250 UART probe driver for the Malta CBUS UART");
+device_initcall(malta_add_devices);
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c

index a377e9d2d029be681072a265908ba7f0f9a2dd17..62cae740e250f9d6d42df81897bf3dabe735ede9 100644 (file)
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -354,6 +354,30 @@ EXPORT_SYMBOL(PCIBIOS_MIN_IO);
  EXPORT_SYMBOL(PCIBIOS_MIN_MEM);
  #endif
  
+int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
+                       enum pci_mmap_state mmap_state, int write_combine)
+{
+       unsigned long prot;
+
+       /*
+        * I/O space can be accessed via normal processor loads and stores on
+        * this platform but for now we elect not to do this and portable
+        * drivers should not do this anyway.
+        */
+       if (mmap_state == pci_mmap_io)
+               return -EINVAL;
+
+       /*
+        * Ignore write-combine; for now only return uncached mappings.
+        */
+       prot = pgprot_val(vma->vm_page_prot);
+       prot = (prot & ~_CACHE_MASK) | _CACHE_UNCACHED;
+       vma->vm_page_prot = __pgprot(prot);
+
+       return remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
+               vma->vm_end - vma->vm_start, vma->vm_page_prot);
+}
+
  char * (*pcibios_plat_setup)(char *str) __devinitdata;
  
  char *__devinit pcibios_setup(char *str)
diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S

index b7cbb1487af462cf8d8a626a718e39d5dfa19014..62fba8aa9b6e1ae84aa8cc1583d57a8e628f16d6 100644 (file)
--- a/arch/mn10300/kernel/entry.S
+++ b/arch/mn10300/kernel/entry.S
@@ -180,6 +180,7 @@ ENTRY(resume_userspace)
  
  #ifdef CONFIG_PREEMPT
  ENTRY(resume_kernel)
+       __cli
         mov     (TI_preempt_count,a2),d0        # non-zero preempt_count ?
         cmp     0,d0
         bne     restore_all
@@ -190,7 +191,7 @@ need_resched:
         mov     (REG_EPSW,fp),d0
         and     EPSW_IM,d0
         cmp     EPSW_IM_7,d0            # interrupts off (exception path) ?
-       beq     restore_all
+       bne     restore_all
         call    preempt_schedule_irq[],0
         jmp     need_resched
  #endif
diff --git a/arch/mn10300/kernel/gdb-io-serial.c b/arch/mn10300/kernel/gdb-io-serial.c

index 9a6d4e8ebe7396f058ccc740d48dfc3a0e14f979..11584c51acd93669dfe587cd2983ca81663397b5 100644 (file)
--- a/arch/mn10300/kernel/gdb-io-serial.c
+++ b/arch/mn10300/kernel/gdb-io-serial.c
@@ -99,6 +99,7 @@ int gdbstub_io_rx_char(unsigned char *_ch, int nonblock)
   try_again:
         /* pull chars out of the buffer */
         ix = gdbstub_rx_outp;
+       barrier();
         if (ix == gdbstub_rx_inp) {
                 if (nonblock)
                         return -EAGAIN;
@@ -110,6 +111,7 @@ int gdbstub_io_rx_char(unsigned char *_ch, int nonblock)
  
         ch = gdbstub_rx_buffer[ix++];
         st = gdbstub_rx_buffer[ix++];
+       barrier();
         gdbstub_rx_outp = ix & 0x00000fff;
  
         if (st & UART_LSR_BI) {
diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c

index aa07d0cd19052b483f002bb27a166e7defd75646..59b9c4bf9583a67e8e1467576d6e7fc49125eca7 100644 (file)
--- a/arch/mn10300/kernel/mn10300-serial.c
+++ b/arch/mn10300/kernel/mn10300-serial.c
@@ -566,6 +566,11 @@ static void mn10300_serial_transmit_interrupt(struct mn10300_serial_port *port)
  {
         _enter("%s", port->name);
  
+       if (!port->uart.info || !port->uart.info->port.tty) {
+               mn10300_serial_dis_tx_intr(port);
+               return;
+       }
+
         if (uart_tx_stopped(&port->uart) ||
             uart_circ_empty(&port->uart.info->xmit))
                 mn10300_serial_dis_tx_intr(port);
diff --git a/arch/mn10300/kernel/module.c b/arch/mn10300/kernel/module.c

index 8fa36893df7af1f5f20bcfc379d88d40a1f61a49..6b287f2e8e843f885c9a856df8527f862e9147a1 100644 (file)
--- a/arch/mn10300/kernel/module.c
+++ b/arch/mn10300/kernel/module.c
@@ -1,6 +1,6 @@
  /* MN10300 Kernel module helper routines
   *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Copyright (C) 2007, 2008 Red Hat, Inc. All Rights Reserved.
   * Written by Mark Salter (msalter@redhat.com)
   * - Derived from arch/i386/kernel/module.c
   *
@@ -64,21 +64,6 @@ int module_frob_arch_sections(Elf_Ehdr *hdr,
         return 0;
  }
  
-static uint32_t reloc_get16(uint8_t *p)
-{
-       return p[0] | (p[1] << 8);
-}
-
-static uint32_t reloc_get24(uint8_t *p)
-{
-       return reloc_get16(p) | (p[2] << 16);
-}
-
-static uint32_t reloc_get32(uint8_t *p)
-{
-       return reloc_get16(p) | (reloc_get16(p+2) << 16);
-}
-
  static void reloc_put16(uint8_t *p, uint32_t val)
  {
         p[0] = val & 0xff;
@@ -144,25 +129,19 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
                 relocation = sym->st_value + rel[i].r_addend;
  
                 switch (ELF32_R_TYPE(rel[i].r_info)) {
-                       /* for the first four relocation types, we add the
-                        * adjustment into the value at the location given */
+                       /* for the first four relocation types, we simply
+                        * store the adjustment at the location given */
                 case R_MN10300_32:
-                       value = reloc_get32(location);
-                       value += relocation;
-                       reloc_put32(location, value);
+                       reloc_put32(location, relocation);
                         break;
                 case R_MN10300_24:
-                       value = reloc_get24(location);
-                       value += relocation;
-                       reloc_put24(location, value);
+                       reloc_put24(location, relocation);
                         break;
                 case R_MN10300_16:
-                       value = reloc_get16(location);
-                       value += relocation;
-                       reloc_put16(location, value);
+                       reloc_put16(location, relocation);
                         break;
                 case R_MN10300_8:
-                       *location += relocation;
+                       *location = relocation;
                         break;
  
                         /* for the next three relocation types, we write the
diff --git a/arch/mn10300/kernel/setup.c b/arch/mn10300/kernel/setup.c

index 017121ce896f345b63af32afe8f6a9aee1aaa7e3..e1d88ab51008896ce6fa423d6e8e1fd1ce5b3672 100644 (file)
--- a/arch/mn10300/kernel/setup.c
+++ b/arch/mn10300/kernel/setup.c
@@ -161,7 +161,7 @@ void __init setup_arch(char **cmdline_p)
            reserve the page it is occupying. */
         if (CONFIG_INTERRUPT_VECTOR_BASE >= CONFIG_KERNEL_RAM_BASE_ADDRESS &&
             CONFIG_INTERRUPT_VECTOR_BASE < memory_end)
-               reserve_bootmem(CONFIG_INTERRUPT_VECTOR_BASE, 1,
+               reserve_bootmem(CONFIG_INTERRUPT_VECTOR_BASE, PAGE_SIZE,
                                 BOOTMEM_DEFAULT);
  
         reserve_bootmem(PAGE_ALIGN(PFN_PHYS(free_pfn)), bootmap_size,
diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S

index a3e80f444f55a880b644fcdcfc109a5150fa151c..b8259668f7dcfb8b11c4fbcc2c05050d80263921 100644 (file)
--- a/arch/mn10300/kernel/vmlinux.lds.S
+++ b/arch/mn10300/kernel/vmlinux.lds.S
@@ -11,6 +11,7 @@
  #define __VMLINUX_LDS__
  #include <asm-generic/vmlinux.lds.h>
  #include <asm/thread_info.h>
+#include <asm/page.h>
  
  OUTPUT_FORMAT("elf32-am33lin", "elf32-am33lin", "elf32-am33lin")
  OUTPUT_ARCH(mn10300)
@@ -55,13 +56,13 @@ SECTIONS
         CONSTRUCTORS
         }
  
-  . = ALIGN(4096);
+  . = ALIGN(PAGE_SIZE);
    __nosave_begin = .;
    .data_nosave : { *(.data.nosave) }
-  . = ALIGN(4096);
+  . = ALIGN(PAGE_SIZE);
    __nosave_end = .;
  
-  . = ALIGN(4096);
+  . = ALIGN(PAGE_SIZE);
    .data.page_aligned : { *(.data.idt) }
  
    . = ALIGN(32);
@@ -78,7 +79,7 @@ SECTIONS
    .data.init_task : { *(.data.init_task) }
  
    /* might get freed after init */
-  . = ALIGN(4096);
+  . = ALIGN(PAGE_SIZE);
    .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
         __smp_locks = .;
         *(.smp_locks)
@@ -86,7 +87,7 @@ SECTIONS
    }
  
    /* will be freed after init */
-  . = ALIGN(4096);             /* Init code and data */
+  . = ALIGN(PAGE_SIZE);                /* Init code and data */
    __init_begin = .;
    .init.text : {
         _sinittext = .;
@@ -120,17 +121,14 @@ SECTIONS
    .exit.data : { *(.exit.data) }
  
  #ifdef CONFIG_BLK_DEV_INITRD
-  . = ALIGN(4096);
+  . = ALIGN(PAGE_SIZE);
    __initramfs_start = .;
    .init.ramfs : { *(.init.ramfs) }
    __initramfs_end = .;
  #endif
  
-  . = ALIGN(32);
-  __per_cpu_start = .;
-  .data.percpu  : { *(.data.percpu) }
-  __per_cpu_end = .;
-  . = ALIGN(4096);
+  PERCPU(32)
+  . = ALIGN(PAGE_SIZE);
    __init_end = .;
    /* freed after init ends here */
  
@@ -145,7 +143,7 @@ SECTIONS
    _end = . ;
  
    /* This is where the kernel creates the early boot page tables */
-  . = ALIGN(4096);
+  . = ALIGN(PAGE_SIZE);
    pg0 = .;
  
    /* Sections to be discarded */
diff --git a/arch/parisc/include/asm/tlbflush.h b/arch/parisc/include/asm/tlbflush.h

index b72ec66db699e56f0985ebd6d88d82a7ceb14411..1f6fd4fc05b91b518f4f574b3ada13ddd24b285a 100644 (file)
--- a/arch/parisc/include/asm/tlbflush.h
+++ b/arch/parisc/include/asm/tlbflush.h
@@ -44,9 +44,12 @@ static inline void flush_tlb_mm(struct mm_struct *mm)
  {
         BUG_ON(mm == &init_mm); /* Should never happen */
  
-#ifdef CONFIG_SMP
+#if 1 || defined(CONFIG_SMP)
         flush_tlb_all();
  #else
+       /* FIXME: currently broken, causing space id and protection ids
+        *  to go out of sync, resulting in faults on userspace accesses.
+        */
         if (mm) {
                 if (mm->context != 0)
                         free_sid(mm->context);
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile

index 8fc6d72849ae435c095ec75a94acb677f0815d5e..3d3daa674299038072e3d8e7f2d36f3181b5cb1f 100644 (file)
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -41,6 +41,7 @@ $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
  $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
  $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
  $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
+$(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
  $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
  $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
  
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts

index 2c9d54a35bc312e8286812a67507e7a71e9f9141..4bdbaf4993a185c176000890f1c999108f6b2f11 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -91,6 +91,14 @@
                                 interrupts = <18 0x8>;
                                 interrupt-parent = <&ipic>;
                         };
+
+                       mcu_pio: mcu@a {
+                               #gpio-cells = <2>;
+                               compatible = "fsl,mc9s08qg8-mpc8349emitx",
+                                            "fsl,mcu-mpc8349emitx";
+                               reg = <0x0a>;
+                               gpio-controller;
+                       };
                 };
  
                 spi@7000 {
@@ -139,14 +147,6 @@
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
-
-                       mcu_pio: mcu@a {
-                               #gpio-cells = <2>;
-                               compatible = "fsl,mc9s08qg8-mpc8349emitx",
-                                            "fsl,mcu-mpc8349emitx";
-                               reg = <0x0a>;
-                               gpio-controller;
-                       };
                 };
  
                 usb@22000 {
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig

index e55ff7c47a366878a63e3546835031f5098f34a5..07a674f5344e9f5cc876deb0ca63c3b9e45ebe14 100644 (file)
--- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
@@ -723,7 +723,7 @@ CONFIG_CICADA_PHY=y
  # CONFIG_BROADCOM_PHY is not set
  # CONFIG_ICPLUS_PHY is not set
  # CONFIG_REALTEK_PHY is not set
-# CONFIG_FIXED_PHY is not set
+CONFIG_FIXED_PHY=y
  # CONFIG_MDIO_BITBANG is not set
  # CONFIG_NET_ETHERNET is not set
  CONFIG_NETDEV_1000=y
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig

index 15eb30c9b3f99b6f076b0769f3ffad08edebf33c..d582014b0a38e8c49283bccdd12d6daad58c94b0 100644 (file)
--- a/arch/powerpc/configs/mpc83xx_defconfig
+++ b/arch/powerpc/configs/mpc83xx_defconfig
@@ -682,7 +682,7 @@ CONFIG_VITESSE_PHY=y
  # CONFIG_BROADCOM_PHY is not set
  CONFIG_ICPLUS_PHY=y
  # CONFIG_REALTEK_PHY is not set
-# CONFIG_FIXED_PHY is not set
+CONFIG_FIXED_PHY=y
  # CONFIG_MDIO_BITBANG is not set
  CONFIG_NET_ETHERNET=y
  CONFIG_MII=y
diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h

index 8931ba729d2b519ec4d4efb1d0851301d96e1d3a..bb62ad876de32750c70cc7ecd91adcb9f0539d5a 100644 (file)
--- a/arch/powerpc/include/asm/kvm_ppc.h
+++ b/arch/powerpc/include/asm/kvm_ppc.h
@@ -104,4 +104,6 @@ static inline void kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 new_pid)
         }
  }
  
+extern void kvmppc_core_destroy_mmu(struct kvm_vcpu *vcpu);
+
  #endif /* __POWERPC_KVM_PPC_H__ */
diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S

index 31c18b52affb878031c69fda37421ff5e53c391f..10b4ab1008afe66914f4a5115868b4c2ef6cf038 100644 (file)
--- a/arch/powerpc/kernel/cpu_setup_44x.S
+++ b/arch/powerpc/kernel/cpu_setup_44x.S
@@ -40,6 +40,7 @@ _GLOBAL(__setup_cpu_460gt)
         mtlr    r4
         blr
  
+_GLOBAL(__setup_cpu_440x5)
  _GLOBAL(__setup_cpu_440gx)
  _GLOBAL(__setup_cpu_440spe)
         b       __fixup_440A_mcheck
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c

index b1eb834bc0fcd00ba563ca8d60287d912a9fdc80..7e8719504f39d65bf50e822289c602470f569713 100644 (file)
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -39,6 +39,7 @@ extern void __setup_cpu_440epx(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec);
+extern void __setup_cpu_440x5(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec);
@@ -1500,6 +1501,8 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_BOOKE,
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
+               .cpu_setup              = __setup_cpu_440x5,
+               .machine_check          = machine_check_440A,
                 .platform               = "ppc440",
         },
         { /* 460EX */
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c

index 1562daf8839a95d62c75e58e7af7b156787845bf..3a6eaa876ee1169026837a52fcb119a95def9bd3 100644 (file)
--- a/arch/powerpc/kernel/dma.c
+++ b/arch/powerpc/kernel/dma.c
@@ -75,6 +75,7 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,
         for_each_sg(sgl, sg, nents, i) {
                 sg->dma_address = sg_phys(sg) + get_dma_direct_offset(dev);
                 sg->dma_length = sg->length;
+               __dma_sync_page(sg_page(sg), sg->offset, sg->length, direction);
         }
  
         return nents;
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S

index bdc8b0e860e5e1b25cc3dafe23455ec1a738812b..5c33bc14bd9fe161a75d7c12bc6809e77cba5a93 100644 (file)
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -479,17 +479,20 @@ _GLOBAL(_tlbil_pid)
   * (no broadcast)
   */
  _GLOBAL(_tlbil_va)
+       mfmsr   r10
+       wrteei  0
         slwi    r4,r4,16
         mtspr   SPRN_MAS6,r4            /* assume AS=0 for now */
         tlbsx   0,r3
         mfspr   r4,SPRN_MAS1            /* check valid */
         andis.  r3,r4,MAS1_VALID@h
-       beqlr
+       beq     1f
         rlwinm  r4,r4,0,1,31
         mtspr   SPRN_MAS1,r4
         tlbwe
         msync
         isync
+1:     wrtee   r10
         blr
  #endif /* CONFIG_FSL_BOOKE */
  
diff --git a/arch/powerpc/kvm/44x_tlb.c b/arch/powerpc/kvm/44x_tlb.c

index 2e227a412bc240f2bc889b0c7c1fe2e17a7bdd8c..ad72c6f9811f62ed05695ca23221bd2d9b87f31a 100644 (file)
--- a/arch/powerpc/kvm/44x_tlb.c
+++ b/arch/powerpc/kvm/44x_tlb.c
@@ -124,6 +124,14 @@ static void kvmppc_44x_shadow_release(struct kvm_vcpu *vcpu,
         }
  }
  
+void kvmppc_core_destroy_mmu(struct kvm_vcpu *vcpu)
+{
+       int i;
+
+       for (i = 0; i <= tlb_44x_hwater; i++)
+               kvmppc_44x_shadow_release(vcpu, i);
+}
+
  void kvmppc_tlbe_set_modified(struct kvm_vcpu *vcpu, unsigned int i)
  {
      vcpu->arch.shadow_tlb_mod[i] = 1;
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c

index 90a6fc422b238ccbd38becc6d36546c0a7ca0cd0..fda9baada132b1c5348dfec8b84ba99d8bc24dc1 100644 (file)
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -238,6 +238,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
  
  void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)
  {
+       kvmppc_core_destroy_mmu(vcpu);
  }
  
  /* Note: clearing MSR[DE] just means that the debug interrupt will not be
diff --git a/arch/powerpc/lib/rheap.c b/arch/powerpc/lib/rheap.c

index 29b2941cada0b67ac5be0248c2a1321179bf19a6..45907c1dae66da343344b5e1cfe9c682afc409ff 100644 (file)
--- a/arch/powerpc/lib/rheap.c
+++ b/arch/powerpc/lib/rheap.c
@@ -556,6 +556,7 @@ unsigned long rh_alloc_fixed(rh_info_t * info, unsigned long start, int size, co
                 be = blk->start + blk->size;
                 if (s >= bs && e <= be)
                         break;
+               blk = NULL;
         }
  
         if (blk == NULL)
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c

index 7bbf4e4ed4306b3a395906b6307808df326fb7cf..f0c3b88d50fa5a5f98847bd1914be1881885af9d 100644 (file)
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -507,6 +507,9 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
  {
         struct hstate *hstate = hstate_file(file);
         int mmu_psize = shift_to_mmu_psize(huge_page_shift(hstate));
+
+       if (!mmu_huge_psizes[mmu_psize])
+               return -EINVAL;
         return slice_get_unmapped_area(addr, len, flags, mmu_psize, 1, 0);
  }
  
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c

index a8397bbad3d4d54a5cd50ae9ee201118c767d1d4..cf81049e1e51a0ce98d0ebdf9b7a74d5901de211 100644 (file)
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -901,10 +901,17 @@ static void mark_reserved_regions_for_nid(int nid)
                         if (end_pfn > node_ar.end_pfn)
                                 reserve_size = (node_ar.end_pfn << PAGE_SHIFT)
                                         - (start_pfn << PAGE_SHIFT);
-                       dbg("reserve_bootmem %lx %lx nid=%d\n", physbase,
-                               reserve_size, node_ar.nid);
-                       reserve_bootmem_node(NODE_DATA(node_ar.nid), physbase,
-                                               reserve_size, BOOTMEM_DEFAULT);
+                       /*
+                        * Only worry about *this* node, others may not
+                        * yet have valid NODE_DATA().
+                        */
+                       if (node_ar.nid == nid) {
+                               dbg("reserve_bootmem %lx %lx nid=%d\n",
+                                       physbase, reserve_size, node_ar.nid);
+                               reserve_bootmem_node(NODE_DATA(node_ar.nid),
+                                               physbase, reserve_size,
+                                               BOOTMEM_DEFAULT);
+                       }
                         /*
                          * if reserved region is contained in the active region
                          * then done.
@@ -929,7 +936,6 @@ static void mark_reserved_regions_for_nid(int nid)
  void __init do_init_bootmem(void)
  {
         int nid;
-       unsigned int i;
  
         min_low_pfn = 0;
         max_low_pfn = lmb_end_of_DRAM() >> PAGE_SHIFT;
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c

index 442cf36aa172920b355710e65a68624d43293d33..0ce45c2b42f8eb67a1ea5156fcf476bdb3f3924a 100644 (file)
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -413,6 +413,9 @@ static int axon_msi_probe(struct of_device *device,
                         MSIC_CTRL_IRQ_ENABLE | MSIC_CTRL_ENABLE |
                         MSIC_CTRL_FIFO_SIZE);
  
+       msic->read_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG)
+                               & MSIC_FIFO_SIZE_MASK;
+
         device->dev.platform_data = msic;
  
         ppc_md.setup_msi_irqs = axon_msi_setup_msi_irqs;
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c

index b24e1d0855573df690aaf6f9022266ad98b95604..1890fb085cded9bdcc66c61214a4058b579c98e6 100644 (file)
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -600,7 +600,7 @@ static int irq_choose_cpu(unsigned int virt_irq)
                 cpuid = first_cpu(tmp);
         }
  
-       return cpuid;
+       return get_hard_smp_processor_id(cpuid);
  }
  #else
  static int irq_choose_cpu(unsigned int virt_irq)
diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c

index 170392687ce042f64c69ea7f4fe85d863025b768..2a01b9e02801f14afd348162f31679237cbd340a 100644 (file)
--- a/arch/s390/kvm/sigp.c
+++ b/arch/s390/kvm/sigp.c
@@ -237,6 +237,11 @@ int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu)
         u8 order_code;
         int rc;
  
+       /* sigp in userspace can exit */
+       if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)
+               return kvm_s390_inject_program_int(vcpu,
+                                                  PGM_PRIVILEGED_OPERATION);
+
         order_code = disp2;
         if (base2)
                 order_code += vcpu->arch.guest_gprs[base2];
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig

index 80119b3398e7f2acb1f2a1091c247cb8193e947e..5c9cbfc14c4d5ad9ad06bf18f3a4b2f523eebd0b 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -55,6 +55,8 @@ config GENERIC_HARDIRQS
  
  config GENERIC_HARDIRQS_NO__DO_IRQ
         def_bool y
+       depends on SUPERH32 && (!SH_DREAMCAST && !SH_SH4202_MICRODEV && \
+                               !SH_7751_SYSTEMH && !HD64461)
  
  config GENERIC_IRQ_PROBE
         def_bool y
diff --git a/arch/sparc/include/asm/bitops_32.h b/arch/sparc/include/asm/bitops_32.h

index 68b98a7e6454952500e54cd6728eb688813836a2..9cf4ae0cd7ba7b2a173c5c30039365a06f0a1db1 100644 (file)
--- a/arch/sparc/include/asm/bitops_32.h
+++ b/arch/sparc/include/asm/bitops_32.h
@@ -98,6 +98,7 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr)
  #include <asm-generic/bitops/sched.h>
  #include <asm-generic/bitops/ffs.h>
  #include <asm-generic/bitops/fls.h>
+#include <asm-generic/bitops/__fls.h>
  #include <asm-generic/bitops/fls64.h>
  #include <asm-generic/bitops/hweight.h>
  #include <asm-generic/bitops/lock.h>
diff --git a/arch/sparc/include/asm/ptrace_32.h b/arch/sparc/include/asm/ptrace_32.h

index d409c4f21a5cdea420e75fef24a2ceec1cb0e834..4cef450167dd6ae697e7e429078979f2277f92fd 100644 (file)
--- a/arch/sparc/include/asm/ptrace_32.h
+++ b/arch/sparc/include/asm/ptrace_32.h
@@ -62,6 +62,8 @@ struct sparc_stackf {
  
  #ifdef __KERNEL__
  
+#include <asm/system.h>
+
  static inline bool pt_regs_is_syscall(struct pt_regs *regs)
  {
         return (regs->psr & PSR_SYSCALL);
@@ -72,6 +74,14 @@ static inline bool pt_regs_clear_syscall(struct pt_regs *regs)
         return (regs->psr &= ~PSR_SYSCALL);
  }
  
+#define arch_ptrace_stop_needed(exit_code, info) \
+({     flush_user_windows(); \
+       current_thread_info()->w_saved != 0;    \
+})
+
+#define arch_ptrace_stop(exit_code, info) \
+       synchronize_user_stack()
+
  #define user_mode(regs) (!((regs)->psr & PSR_PS))
  #define instruction_pointer(regs) ((regs)->pc)
  #define user_stack_pointer(regs) ((regs)->u_regs[UREG_FP])
diff --git a/arch/sparc/include/asm/ptrace_64.h b/arch/sparc/include/asm/ptrace_64.h

index 84e969f06afe318d986a9890d130cbf26759b704..cd6fbfc2043533636dd16fec2918cf0a07124be1 100644 (file)
--- a/arch/sparc/include/asm/ptrace_64.h
+++ b/arch/sparc/include/asm/ptrace_64.h
@@ -114,6 +114,7 @@ struct sparc_trapf {
  #ifdef __KERNEL__
  
  #include <linux/threads.h>
+#include <asm/system.h>
  
  static inline int pt_regs_trap_type(struct pt_regs *regs)
  {
@@ -130,6 +131,14 @@ static inline bool pt_regs_clear_syscall(struct pt_regs *regs)
         return (regs->tstate &= ~TSTATE_SYSCALL);
  }
  
+#define arch_ptrace_stop_needed(exit_code, info) \
+({     flush_user_windows(); \
+       get_thread_wsaved() != 0; \
+})
+
+#define arch_ptrace_stop(exit_code, info) \
+       synchronize_user_stack()
+
  struct global_reg_snapshot {
         unsigned long           tstate;
         unsigned long           tpc;
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c

index f43adbc773caca890f96a214647a7f63ee225531..a941c610e7ce0cdf8c38c38c5e3d46c32419114f 100644 (file)
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -1014,7 +1014,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 break;
  
         case PTRACE_SETFPREGS64:
-               ret = copy_regset_to_user(child, view, REGSET_FP,
+               ret = copy_regset_from_user(child, view, REGSET_FP,
                                           0 * sizeof(u64),
                                           33 * sizeof(u64),
                                           fps);
diff --git a/arch/sparc64/kernel/visemul.c b/arch/sparc64/kernel/visemul.c

index 9e05cb5cb855ba5d0f2d3367d6e0a4e5023fe663..b956fd71c131143e4240ebea47548ab110c747a0 100644 (file)
--- a/arch/sparc64/kernel/visemul.c
+++ b/arch/sparc64/kernel/visemul.c
@@ -131,7 +131,7 @@
  #define VIS_OPF_SHIFT  5
  #define VIS_OPF_MASK   (0x1ff << VIS_OPF_SHIFT)
  
-#define RS1(INSN)      (((INSN) >> 24) & 0x1f)
+#define RS1(INSN)      (((INSN) >> 14) & 0x1f)
  #define RS2(INSN)      (((INSN) >>  0) & 0x1f)
  #define RD(INSN)       (((INSN) >> 25) & 0x1f)
  
@@ -445,7 +445,7 @@ static void pdist(struct pt_regs *regs, unsigned int insn)
         unsigned long i;
  
         rs1 = fpd_regval(f, RS1(insn));
-       rs2 = fpd_regval(f, RS1(insn));
+       rs2 = fpd_regval(f, RS2(insn));
         rd = fpd_regaddr(f, RD(insn));
  
         rd_val = *rd;
@@ -807,6 +807,8 @@ int vis_emul(struct pt_regs *regs, unsigned int insn)
         if (get_user(insn, (u32 __user *) pc))
                 return -EFAULT;
  
+       save_and_clear_fpu();
+
         opf = (insn & VIS_OPF_MASK) >> VIS_OPF_SHIFT;
         switch (opf) {
         default:
diff --git a/arch/sparc64/lib/user_fixup.c b/arch/sparc64/lib/user_fixup.c

index 19d1fdb17d0e8b4f5b3ac6ce0a72fe7c11c65a6b..05a361b0a1a40e6d87ad6c86d59ab464fd48e4c5 100644 (file)
--- a/arch/sparc64/lib/user_fixup.c
+++ b/arch/sparc64/lib/user_fixup.c
@@ -24,7 +24,7 @@ static unsigned long compute_size(unsigned long start, unsigned long size, unsig
         if (fault_addr < start || fault_addr >= end) {
                 *offset = 0;
         } else {
-               *offset = start - fault_addr;
+               *offset = fault_addr - start;
                 size = end - fault_addr;
         }
         return size;
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c

index 19d579d74d27f18ae67bb1b5c9adcf93f963a288..8f44ebb0dec82286e85838369d8fdfd9de929ae6 100644 (file)
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -16,6 +16,8 @@
  #include <linux/slab.h>
  #include <linux/syscalls.h>
  #include <linux/utsname.h>
+#include <linux/socket.h>
+#include <linux/un.h>
  #include <linux/workqueue.h>
  #include <linux/mutex.h>
  #include <asm/uaccess.h>
@@ -785,7 +787,7 @@ static int __init mconsole_init(void)
         /* long to avoid size mismatch warnings from gcc */
         long sock;
         int err;
-       char file[256];
+       char file[UNIX_PATH_MAX];
  
         if (umid_file_name("mconsole", file, sizeof(file)))
                 return -1;
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu

index b815664fe3700b77aa031fab7711be4128c858d1..8e99073b9e0f2cad52d1346fd7a525c835681b1a 100644 (file)
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -520,6 +520,7 @@ config X86_PTRACE_BTS
         bool "Branch Trace Store"
         default y
         depends on X86_DEBUGCTLMSR
+       depends on BROKEN
         help
           This adds a ptrace interface to the hardware's branch trace store.
  
diff --git a/arch/x86/include/asm/amd_iommu_types.h b/arch/x86/include/asm/amd_iommu_types.h

index 1a30c0440c6bb4c907b400313c7bbd1865bb9298..ac302a2fa3397f3ae9a65a4553a2731706b34e18 100644 (file)
--- a/arch/x86/include/asm/amd_iommu_types.h
+++ b/arch/x86/include/asm/amd_iommu_types.h
@@ -251,13 +251,6 @@ struct amd_iommu {
         /* Pointer to PCI device of this IOMMU */
         struct pci_dev *dev;
  
-       /*
-        * Capability pointer. There could be more than one IOMMU per PCI
-        * device function if there are more than one AMD IOMMU capability
-        * pointers.
-        */
-       u16 cap_ptr;
-
         /* physical address of MMIO space */
         u64 mmio_phys;
         /* virtual address of MMIO space */
@@ -266,6 +259,13 @@ struct amd_iommu {
         /* capabilities of that IOMMU read from ACPI */
         u32 cap;
  
+       /*
+        * Capability pointer. There could be more than one IOMMU per PCI
+        * device function if there are more than one AMD IOMMU capability
+        * pointers.
+        */
+       u16 cap_ptr;
+
         /* pci domain of this IOMMU */
         u16 pci_seg;
  
@@ -284,19 +284,19 @@ struct amd_iommu {
         /* size of command buffer */
         u32 cmd_buf_size;
  
-       /* event buffer virtual address */
-       u8 *evt_buf;
         /* size of event buffer */
         u32 evt_buf_size;
+       /* event buffer virtual address */
+       u8 *evt_buf;
         /* MSI number for event interrupt */
         u16 evt_msi_num;
  
-       /* if one, we need to send a completion wait command */
-       int need_sync;
-
         /* true if interrupts for this IOMMU are already enabled */
         bool int_enabled;
  
+       /* if one, we need to send a completion wait command */
+       int need_sync;
+
         /* default dma_ops domain for that IOMMU */
         struct dma_ops_domain *default_dom;
  };
diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h

index 7f225a4b2a26aedd2995d8c68c75df6962f19778..097794ff6b796a2f955ddc7a8eef96a249c8b94f 100644 (file)
--- a/arch/x86/include/asm/dma-mapping.h
+++ b/arch/x86/include/asm/dma-mapping.h
@@ -71,15 +71,13 @@ static inline struct dma_mapping_ops *get_dma_ops(struct device *dev)
  /* Make sure we keep the same behaviour */
  static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
  {
-#ifdef CONFIG_X86_32
-       return 0;
-#else
+#ifdef CONFIG_X86_64
         struct dma_mapping_ops *ops = get_dma_ops(dev);
         if (ops->mapping_error)
                 return ops->mapping_error(dev, dma_addr);
  
-       return (dma_addr == bad_dma_address);
  #endif
+       return (dma_addr == bad_dma_address);
  }
  
  #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h

index 4850e4b02b61b255c14db559feb136e80a2f32c9..ff386ff50ed766d5d8c4e661d9ef2c3acef3162f 100644 (file)
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -239,7 +239,7 @@ struct pci_bus;
  void set_pci_bus_resources_arch_default(struct pci_bus *b);
  
  #ifdef CONFIG_SMP
-#define mc_capable()                   (boot_cpu_data.x86_max_cores > 1)
+#define mc_capable()   (cpus_weight(per_cpu(cpu_core_map, 0)) != nr_cpu_ids)
  #define smt_capable()                  (smp_num_siblings > 1)
  #endif
  
diff --git a/arch/x86/include/asm/vmi.h b/arch/x86/include/asm/vmi.h

index b7c0dea119fed8f8ea62e520ecf1e504e65e05f0..61e08c0a290785c5527d9faf607c0c2ab2e384e2 100644 (file)
--- a/arch/x86/include/asm/vmi.h
+++ b/arch/x86/include/asm/vmi.h
@@ -223,9 +223,15 @@ struct pci_header {
  } __attribute__((packed));
  
  /* Function prototypes for bootstrapping */
+#ifdef CONFIG_VMI
  extern void vmi_init(void);
+extern void vmi_activate(void);
  extern void vmi_bringup(void);
-extern void vmi_apply_boot_page_allocations(void);
+#else
+static inline void vmi_init(void) {}
+static inline void vmi_activate(void) {}
+static inline void vmi_bringup(void) {}
+#endif
  
  /* State needed to start an application processor in an SMP system. */
  struct vmi_ap_state {
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c

index e4899e0e878740726bfa7ea56e655c53a6b88f37..0a60d60ed036b264e6d4c05174dfc3b464574852 100644 (file)
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -187,6 +187,8 @@ static int iommu_queue_command(struct amd_iommu *iommu, struct iommu_cmd *cmd)
  
         spin_lock_irqsave(&iommu->lock, flags);
         ret = __iommu_queue_command(iommu, cmd);
+       if (!ret)
+               iommu->need_sync = 1;
         spin_unlock_irqrestore(&iommu->lock, flags);
  
         return ret;
@@ -210,10 +212,13 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
         cmd.data[0] = CMD_COMPL_WAIT_INT_MASK;
         CMD_SET_TYPE(&cmd, CMD_COMPL_WAIT);
  
-       iommu->need_sync = 0;
-
         spin_lock_irqsave(&iommu->lock, flags);
  
+       if (!iommu->need_sync)
+               goto out;
+
+       iommu->need_sync = 0;
+
         ret = __iommu_queue_command(iommu, &cmd);
  
         if (ret)
@@ -230,8 +235,9 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
         status &= ~MMIO_STATUS_COM_WAIT_INT_MASK;
         writel(status, iommu->mmio_base + MMIO_STATUS_OFFSET);
  
-       if (unlikely((i == EXIT_LOOP_COUNT) && printk_ratelimit()))
-               printk(KERN_WARNING "AMD IOMMU: Completion wait loop failed\n");
+       if (unlikely(i == EXIT_LOOP_COUNT))
+               panic("AMD IOMMU: Completion wait loop failed\n");
+
  out:
         spin_unlock_irqrestore(&iommu->lock, flags);
  
@@ -254,8 +260,6 @@ static int iommu_queue_inv_dev_entry(struct amd_iommu *iommu, u16 devid)
  
         ret = iommu_queue_command(iommu, &cmd);
  
-       iommu->need_sync = 1;
-
         return ret;
  }
  
@@ -281,8 +285,6 @@ static int iommu_queue_inv_iommu_pages(struct amd_iommu *iommu,
  
         ret = iommu_queue_command(iommu, &cmd);
  
-       iommu->need_sync = 1;
-
         return ret;
  }
  
@@ -343,7 +345,7 @@ static int iommu_map(struct protection_domain *dom,
         u64 __pte, *pte, *page;
  
         bus_addr  = PAGE_ALIGN(bus_addr);
-       phys_addr = PAGE_ALIGN(bus_addr);
+       phys_addr = PAGE_ALIGN(phys_addr);
  
         /* only support 512GB address spaces for now */
         if (bus_addr > IOMMU_MAP_SIZE_L3 || !(prot & IOMMU_PROT_MASK))
@@ -599,7 +601,7 @@ static void dma_ops_free_pagetable(struct dma_ops_domain *dma_dom)
                         continue;
  
                 p2 = IOMMU_PTE_PAGE(p1[i]);
-               for (j = 0; j < 512; ++i) {
+               for (j = 0; j < 512; ++j) {
                         if (!IOMMU_PTE_PRESENT(p2[j]))
                                 continue;
                         p3 = IOMMU_PTE_PAGE(p2[j]);
@@ -762,8 +764,6 @@ static void set_device_domain(struct amd_iommu *iommu,
         write_unlock_irqrestore(&amd_iommu_devtable_lock, flags);
  
         iommu_queue_inv_dev_entry(iommu, devid);
-
-       iommu->need_sync = 1;
  }
  
  /*****************************************************************************
@@ -858,6 +858,9 @@ static int get_device_resources(struct device *dev,
                 print_devid(_bdf, 1);
         }
  
+       if (domain_for_device(_bdf) == NULL)
+               set_device_domain(*iommu, *domain, _bdf);
+
         return 1;
  }
  
@@ -908,7 +911,7 @@ static void dma_ops_domain_unmap(struct amd_iommu *iommu,
         if (address >= dom->aperture_size)
                 return;
  
-       WARN_ON(address & 0xfffULL || address > dom->aperture_size);
+       WARN_ON(address & ~PAGE_MASK || address >= dom->aperture_size);
  
         pte  = dom->pte_pages[IOMMU_PTE_L1_INDEX(address)];
         pte += IOMMU_PTE_L0_INDEX(address);
@@ -920,8 +923,8 @@ static void dma_ops_domain_unmap(struct amd_iommu *iommu,
  
  /*
   * This function contains common code for mapping of a physically
- * contiguous memory region into DMA address space. It is uses by all
- * mapping functions provided by this IOMMU driver.
+ * contiguous memory region into DMA address space. It is used by all
+ * mapping functions provided with this IOMMU driver.
   * Must be called with the domain lock held.
   */
  static dma_addr_t __map_single(struct device *dev,
@@ -981,7 +984,8 @@ static void __unmap_single(struct amd_iommu *iommu,
         dma_addr_t i, start;
         unsigned int pages;
  
-       if ((dma_addr == 0) || (dma_addr + size > dma_dom->aperture_size))
+       if ((dma_addr == bad_dma_address) ||
+           (dma_addr + size > dma_dom->aperture_size))
                 return;
  
         pages = iommu_num_pages(dma_addr, size, PAGE_SIZE);
@@ -1031,8 +1035,7 @@ static dma_addr_t map_single(struct device *dev, phys_addr_t paddr,
         if (addr == bad_dma_address)
                 goto out;
  
-       if (unlikely(iommu->need_sync))
-               iommu_completion_wait(iommu);
+       iommu_completion_wait(iommu);
  
  out:
         spin_unlock_irqrestore(&domain->lock, flags);
@@ -1060,8 +1063,7 @@ static void unmap_single(struct device *dev, dma_addr_t dma_addr,
  
         __unmap_single(iommu, domain->priv, dma_addr, size, dir);
  
-       if (unlikely(iommu->need_sync))
-               iommu_completion_wait(iommu);
+       iommu_completion_wait(iommu);
  
         spin_unlock_irqrestore(&domain->lock, flags);
  }
@@ -1127,8 +1129,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,
                         goto unmap;
         }
  
-       if (unlikely(iommu->need_sync))
-               iommu_completion_wait(iommu);
+       iommu_completion_wait(iommu);
  
  out:
         spin_unlock_irqrestore(&domain->lock, flags);
@@ -1173,8 +1174,7 @@ static void unmap_sg(struct device *dev, struct scatterlist *sglist,
                 s->dma_address = s->dma_length = 0;
         }
  
-       if (unlikely(iommu->need_sync))
-               iommu_completion_wait(iommu);
+       iommu_completion_wait(iommu);
  
         spin_unlock_irqrestore(&domain->lock, flags);
  }
@@ -1225,8 +1225,7 @@ static void *alloc_coherent(struct device *dev, size_t size,
                 goto out;
         }
  
-       if (unlikely(iommu->need_sync))
-               iommu_completion_wait(iommu);
+       iommu_completion_wait(iommu);
  
  out:
         spin_unlock_irqrestore(&domain->lock, flags);
@@ -1257,8 +1256,7 @@ static void free_coherent(struct device *dev, size_t size,
  
         __unmap_single(iommu, domain->priv, dma_addr, size, DMA_BIDIRECTIONAL);
  
-       if (unlikely(iommu->need_sync))
-               iommu_completion_wait(iommu);
+       iommu_completion_wait(iommu);
  
         spin_unlock_irqrestore(&domain->lock, flags);
  
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c

index 30ae2701b3df1b8976400d5996ed72a4a98baeea..c6cc22815d35f232dd21fae7d2718a3c161b373c 100644 (file)
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -427,6 +427,10 @@ static u8 * __init alloc_command_buffer(struct amd_iommu *iommu)
         memcpy_toio(iommu->mmio_base + MMIO_CMD_BUF_OFFSET,
                         &entry, sizeof(entry));
  
+       /* set head and tail to zero manually */
+       writel(0x00, iommu->mmio_base + MMIO_CMD_HEAD_OFFSET);
+       writel(0x00, iommu->mmio_base + MMIO_CMD_TAIL_OFFSET);
+
         iommu_feature_enable(iommu, CONTROL_CMDBUF_EN);
  
         return cmd_buf;
@@ -1074,7 +1078,8 @@ int __init amd_iommu_init(void)
                 goto free;
  
         /* IOMMU rlookup table - find the IOMMU for a specific device */
-       amd_iommu_rlookup_table = (void *)__get_free_pages(GFP_KERNEL,
+       amd_iommu_rlookup_table = (void *)__get_free_pages(
+                       GFP_KERNEL | __GFP_ZERO,
                         get_order(rlookup_table_size));
         if (amd_iommu_rlookup_table == NULL)
                 goto free;
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c

index 4b031a4ac8562d3ed69f14f0d750dfe8519a057e..1c838032fd3732fde9bff776cbb63a2821115d60 100644 (file)
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -510,12 +510,9 @@ static void __cpuinit mce_cpu_features(struct cpuinfo_x86 *c)
   */
  void __cpuinit mcheck_init(struct cpuinfo_x86 *c)
  {
-       static cpumask_t mce_cpus = CPU_MASK_NONE;
-
         mce_cpu_quirks(c);
  
         if (mce_dont_init ||
-           cpu_test_and_set(smp_processor_id(), mce_cpus) ||
             !mce_available(c))
                 return;
  
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c

index 82fb2809ce32208eacd7231c38597938031d4036..c4b5b24e0217c585cbb8d0f8011a8b6c87229a6f 100644 (file)
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@ -272,13 +272,18 @@ static struct attribute_group mc_attr_group = {
         .name = "microcode",
  };
  
-static void microcode_fini_cpu(int cpu)
+static void __microcode_fini_cpu(int cpu)
  {
         struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
  
-       mutex_lock(&microcode_mutex);
         microcode_ops->microcode_fini_cpu(cpu);
         uci->valid = 0;
+}
+
+static void microcode_fini_cpu(int cpu)
+{
+       mutex_lock(&microcode_mutex);
+       __microcode_fini_cpu(cpu);
         mutex_unlock(&microcode_mutex);
  }
  
@@ -306,12 +311,16 @@ static int microcode_resume_cpu(int cpu)
          * to this cpu (a bit of paranoia):
          */
         if (microcode_ops->collect_cpu_info(cpu, &nsig)) {
-               microcode_fini_cpu(cpu);
+               __microcode_fini_cpu(cpu);
+               printk(KERN_ERR "failed to collect_cpu_info for resuming cpu #%d\n",
+                               cpu);
                 return -1;
         }
  
-       if (memcmp(&nsig, &uci->cpu_sig, sizeof(nsig))) {
-               microcode_fini_cpu(cpu);
+       if ((nsig.sig != uci->cpu_sig.sig) || (nsig.pf != uci->cpu_sig.pf)) {
+               __microcode_fini_cpu(cpu);
+               printk(KERN_ERR "cached ucode doesn't match the resuming cpu #%d\n",
+                               cpu);
                 /* Should we look for a new ucode here? */
                 return 1;
         }
diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c

index 622dc4a217848d1c8d16941796a4f82f868fc967..a8e62792d171c6c63645582441b3d9482fffcbac 100644 (file)
--- a/arch/x86/kernel/microcode_intel.c
+++ b/arch/x86/kernel/microcode_intel.c
@@ -155,6 +155,7 @@ static DEFINE_SPINLOCK(microcode_update_lock);
  static int collect_cpu_info(int cpu_num, struct cpu_signature *csig)
  {
         struct cpuinfo_x86 *c = &cpu_data(cpu_num);
+       unsigned long flags;
         unsigned int val[2];
  
         memset(csig, 0, sizeof(*csig));
@@ -174,11 +175,16 @@ static int collect_cpu_info(int cpu_num, struct cpu_signature *csig)
                 csig->pf = 1 << ((val[1] >> 18) & 7);
         }
  
+       /* serialize access to the physical write to MSR 0x79 */
+       spin_lock_irqsave(&microcode_update_lock, flags);
+
         wrmsr(MSR_IA32_UCODE_REV, 0, 0);
         /* see notes above for revision 1.07.  Apparent chip bug */
         sync_core();
         /* get the current revision from MSR 0x8B */
         rdmsr(MSR_IA32_UCODE_REV, val[0], csig->rev);
+       spin_unlock_irqrestore(&microcode_update_lock, flags);
+
         pr_debug("microcode: collect_cpu_info : sig=0x%x, pf=0x%x, rev=0x%x\n",
                         csig->sig, csig->pf, csig->rev);
  
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c

index f98f4e1dba0963ddc4908074a7a16e3249703677..0f4c1fd5a1f434259afd90480b5af527b326b855 100644 (file)
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -604,6 +604,9 @@ static void __init __get_smp_config(unsigned int early)
                 printk(KERN_INFO "Using ACPI for processor (LAPIC) "
                        "configuration information\n");
  
+       if (!mpf)
+               return;
+
         printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n",
                mpf->mpf_specification);
  #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32)
diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c

index 0e9f1982b1dd1aca8c60025f3ff691b311ee8390..95777b0faa7388f9c236bb093fae1a4934bb91c0 100644 (file)
--- a/arch/x86/kernel/paravirt-spinlocks.c
+++ b/arch/x86/kernel/paravirt-spinlocks.c
@@ -7,7 +7,8 @@
  
  #include <asm/paravirt.h>
  
-static void default_spin_lock_flags(struct raw_spinlock *lock, unsigned long flags)
+static inline void
+default_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
  {
         __raw_spin_lock(lock);
  }
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c

index a42b02b4df68855714b4ea2f7f3e580e0327e7b3..a35eaa379ff632fb142367df58a8fdeaaad81267 100644 (file)
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@ -123,6 +123,8 @@ static void free_iommu(unsigned long offset, int size)
  
         spin_lock_irqsave(&iommu_bitmap_lock, flags);
         iommu_area_free(iommu_gart_bitmap, offset, size);
+       if (offset >= next_bit)
+               next_bit = offset + size;
         spin_unlock_irqrestore(&iommu_bitmap_lock, flags);
  }
  
@@ -743,10 +745,8 @@ void __init gart_iommu_init(void)
         unsigned long scratch;
         long i;
  
-       if (cache_k8_northbridges() < 0 || num_k8_northbridges == 0) {
-               printk(KERN_INFO "PCI-GART: No AMD GART found.\n");
+       if (cache_k8_northbridges() < 0 || num_k8_northbridges == 0)
                 return;
-       }
  
  #ifndef CONFIG_AGP_AMD64
         no_agp = 1;
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c

index 9d5674f7b6ccbfbdef7f5ad16901f9dc9dc08ad0..bdec76e5559433d77366b85535f0563451614501 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -794,6 +794,9 @@ void __init setup_arch(char **cmdline_p)
         printk(KERN_INFO "Command line: %s\n", boot_command_line);
  #endif
  
+       /* VMI may relocate the fixmap; do this before touching ioremap area */
+       vmi_init();
+
         early_cpu_init();
         early_ioremap_init();
  
@@ -880,13 +883,8 @@ void __init setup_arch(char **cmdline_p)
         check_efer();
  #endif
  
-#if defined(CONFIG_VMI) && defined(CONFIG_X86_32)
-       /*
-        * Must be before kernel pagetables are setup
-        * or fixmap area is touched.
-        */
-       vmi_init();
-#endif
+       /* Must be before kernel pagetables are setup */
+       vmi_activate();
  
         /* after early param, so could get panic from serial */
         reserve_early_setup_data();
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c

index 7b1093397319766b2e4848a5a883b0dc35f49804..f71f96fc9e62ea8e4f027a78cb3aafcd96fdbf99 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -294,9 +294,7 @@ static void __cpuinit start_secondary(void *unused)
          * fragile that we want to limit the things done here to the
          * most necessary things.
          */
-#ifdef CONFIG_VMI
         vmi_bringup();
-#endif
         cpu_init();
         preempt_disable();
         smp_callin();
diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c

index 8b6c393ab9fd14f06b86d9deb656b3643d9006f3..22fd6577156a9ac81453792185e3cc0a317d96d2 100644 (file)
--- a/arch/x86/kernel/vmi_32.c
+++ b/arch/x86/kernel/vmi_32.c
@@ -960,8 +960,6 @@ static inline int __init activate_vmi(void)
  
  void __init vmi_init(void)
  {
-       unsigned long flags;
-
         if (!vmi_rom)
                 probe_vmi_rom();
         else
@@ -973,13 +971,21 @@ void __init vmi_init(void)
  
         reserve_top_address(-vmi_rom->virtual_top);
  
-       local_irq_save(flags);
-       activate_vmi();
-
  #ifdef CONFIG_X86_IO_APIC
         /* This is virtual hardware; timer routing is wired correctly */
         no_timer_check = 1;
  #endif
+}
+
+void vmi_activate(void)
+{
+       unsigned long flags;
+
+       if (!vmi_rom)
+               return;
+
+       local_irq_save(flags);
+       activate_vmi();
         local_irq_restore(flags & X86_EFLAGS_IF);
  }
  
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c

index f1983d9477cd163bc13de766f1edd8ffee4c720b..410ddbc1aa2eb0fc2dfa45de560c829df364aa81 100644 (file)
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -1038,13 +1038,13 @@ static int kvm_sync_page(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)
         }
  
         rmap_write_protect(vcpu->kvm, sp->gfn);
+       kvm_unlink_unsync_page(vcpu->kvm, sp);
         if (vcpu->arch.mmu.sync_page(vcpu, sp)) {
                 kvm_mmu_zap_page(vcpu->kvm, sp);
                 return 1;
         }
  
         kvm_mmu_flush_tlb(vcpu);
-       kvm_unlink_unsync_page(vcpu->kvm, sp);
         return 0;
  }
  
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h

index 613ec9aa674afe06cd76c99b8ebc06eaa3f91f32..84eee43bbe742b005bd1825b0cdac24ba5efffbb 100644 (file)
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -331,6 +331,7 @@ static int FNAME(shadow_walk_entry)(struct kvm_shadow_walk *_sw,
                 r = kvm_read_guest_atomic(vcpu->kvm, gw->pte_gpa[level - 2],
                                           &curr_pte, sizeof(curr_pte));
                 if (r || curr_pte != gw->ptes[level - 2]) {
+                       kvm_mmu_put_page(shadow_page, sptep);
                         kvm_release_pfn_clean(sw->pfn);
                         sw->sptep = NULL;
                         return 1;
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c

index d06b4dc0e2eac49c3d1df9d78ec4b6d6ad975c4f..a4018b01e1f973bad1619d6ca16e0e67e29aceab 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -3149,7 +3149,9 @@ static void vmx_intr_assist(struct kvm_vcpu *vcpu)
  
         if (cpu_has_virtual_nmis()) {
                 if (vcpu->arch.nmi_pending && !vcpu->arch.nmi_injected) {
-                       if (vmx_nmi_enabled(vcpu)) {
+                       if (vcpu->arch.interrupt.pending) {
+                               enable_nmi_window(vcpu);
+                       } else if (vmx_nmi_enabled(vcpu)) {
                                 vcpu->arch.nmi_pending = false;
                                 vcpu->arch.nmi_injected = true;
                         } else {
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c

index 022cd41ea9b4106e5884277096e80e9088a7c7a9..202864ad49a7e5bf2a6574922d7cd938dd023fd9 100644 (file)
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -401,14 +401,13 @@ static int __init ppro_init(char **cpu_type)
                 *cpu_type = "i386/pii";
                 break;
         case 6 ... 8:
+       case 10 ... 11:
                 *cpu_type = "i386/piii";
                 break;
         case 9:
+       case 13:
                 *cpu_type = "i386/p6_mobile";
                 break;
-       case 10 ... 13:
-               *cpu_type = "i386/p6";
-               break;
         case 14:
                 *cpu_type = "i386/core";
                 break;
diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c

index 716d26f0e5d47b74ae43abb862d7d296c17ef609..e9f80c744cf3409d72f77dd9044ec1dd90534609 100644 (file)
--- a/arch/x86/oprofile/op_model_ppro.c
+++ b/arch/x86/oprofile/op_model_ppro.c
@@ -156,6 +156,8 @@ static void ppro_start(struct op_msrs const * const msrs)
         unsigned int low, high;
         int i;
  
+       if (!reset_value)
+               return;
         for (i = 0; i < num_counters; ++i) {
                 if (reset_value[i]) {
                         CTRL_READ(low, high, msrs, i);
@@ -171,6 +173,8 @@ static void ppro_stop(struct op_msrs const * const msrs)
         unsigned int low, high;
         int i;
  
+       if (!reset_value)
+               return;
         for (i = 0; i < num_counters; ++i) {
                 if (!reset_value[i])
                         continue;
diff --git a/block/blk-barrier.c b/block/blk-barrier.c

index 5c99ff8d2db8937cffb50ab1d768e52fd49ff9f3..6e72d661ae425daa62f8b7999acc8f825e2a12e9 100644 (file)
--- a/block/blk-barrier.c
+++ b/block/blk-barrier.c
@@ -161,7 +161,7 @@ static inline struct request *start_ordered(struct request_queue *q,
         /*
          * Prep proxy barrier request.
          */
-       blkdev_dequeue_request(rq);
+       elv_dequeue_request(q, rq);
         q->orig_bar_rq = rq;
         rq = &q->bar_rq;
         blk_rq_init(q, rq);
@@ -219,7 +219,7 @@ int blk_do_ordered(struct request_queue *q, struct request **rqp)
                          * This can happen when the queue switches to
                          * ORDERED_NONE while this request is on it.
                          */
-                       blkdev_dequeue_request(rq);
+                       elv_dequeue_request(q, rq);
                         if (__blk_end_request(rq, -EOPNOTSUPP,
                                               blk_rq_bytes(rq)))
                                 BUG();
diff --git a/block/blk-core.c b/block/blk-core.c

index 10e8a64a5a5b1b213cbc2886755b22dedce76313..c36aa98fafa3e4ed94adcf3e462945d59b0c1fcd 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -592,7 +592,7 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)
                                    1 << QUEUE_FLAG_STACKABLE);
         q->queue_lock           = lock;
  
-       blk_queue_segment_boundary(q, 0xffffffff);
+       blk_queue_segment_boundary(q, BLK_SEG_BOUNDARY_MASK);
  
         blk_queue_make_request(q, __make_request);
         blk_queue_max_segment_size(q, MAX_SEGMENT_SIZE);
@@ -1636,6 +1636,28 @@ int blk_insert_cloned_request(struct request_queue *q, struct request *rq)
  }
  EXPORT_SYMBOL_GPL(blk_insert_cloned_request);
  
+/**
+ * blkdev_dequeue_request - dequeue request and start timeout timer
+ * @req: request to dequeue
+ *
+ * Dequeue @req and start timeout timer on it.  This hands off the
+ * request to the driver.
+ *
+ * Block internal functions which don't want to start timer should
+ * call elv_dequeue_request().
+ */
+void blkdev_dequeue_request(struct request *req)
+{
+       elv_dequeue_request(req->q, req);
+
+       /*
+        * We are now handing the request to the hardware, add the
+        * timeout handler.
+        */
+       blk_add_timer(req);
+}
+EXPORT_SYMBOL(blkdev_dequeue_request);
+
  /**
   * __end_that_request_first - end I/O on a request
   * @req:      the request being processed
@@ -1774,7 +1796,7 @@ static void end_that_request_last(struct request *req, int error)
                 blk_queue_end_tag(req->q, req);
  
         if (blk_queued_rq(req))
-               blkdev_dequeue_request(req);
+               elv_dequeue_request(req->q, req);
  
         if (unlikely(laptop_mode) && blk_fs_request(req))
                 laptop_io_completion();
diff --git a/block/blk-map.c b/block/blk-map.c

index 0f4b4b88181178b0344127df63af79f7d95da915..2990447f45e913f7aa968ddc3979ea7b1a027a80 100644 (file)
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -224,7 +224,7 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
                  */
                 bio_get(bio);
                 bio_endio(bio, 0);
-               bio_unmap_user(bio);
+               __blk_rq_unmap_user(bio);
                 return -EINVAL;
         }
  
diff --git a/block/blk-settings.c b/block/blk-settings.c

index 41392fbe19ff9615253278fdf48e63369ad7e856..afa55e14e27896837cb026ce706438520ea848aa 100644 (file)
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -125,6 +125,9 @@ void blk_queue_make_request(struct request_queue *q, make_request_fn *mfn)
         q->nr_requests = BLKDEV_MAX_RQ;
         blk_queue_max_phys_segments(q, MAX_PHYS_SEGMENTS);
         blk_queue_max_hw_segments(q, MAX_HW_SEGMENTS);
+       blk_queue_segment_boundary(q, BLK_SEG_BOUNDARY_MASK);
+       blk_queue_max_segment_size(q, MAX_SEGMENT_SIZE);
+
         q->make_request_fn = mfn;
         q->backing_dev_info.ra_pages =
                         (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;
@@ -314,6 +317,7 @@ void blk_queue_stack_limits(struct request_queue *t, struct request_queue *b)
         /* zero is "infinity" */
         t->max_sectors = min_not_zero(t->max_sectors, b->max_sectors);
         t->max_hw_sectors = min_not_zero(t->max_hw_sectors, b->max_hw_sectors);
+       t->seg_boundary_mask = min_not_zero(t->seg_boundary_mask, b->seg_boundary_mask);
  
         t->max_phys_segments = min(t->max_phys_segments, b->max_phys_segments);
         t->max_hw_segments = min(t->max_hw_segments, b->max_hw_segments);
diff --git a/block/bsg.c b/block/bsg.c

index e8bd2475682ab4c2d29f8f205e57b62427b7cfe2..e73e50daf3d0a36df8977cad29b550e3139fbef0 100644 (file)
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -202,6 +202,8 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
                 rq->timeout = q->sg_timeout;
         if (!rq->timeout)
                 rq->timeout = BLK_DEFAULT_SG_TIMEOUT;
+       if (rq->timeout < BLK_MIN_SG_TIMEOUT)
+               rq->timeout = BLK_MIN_SG_TIMEOUT;
  
         return 0;
  }
diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c

index 3d3e7a46f38c43319a2fcbed71e99a5da9af8e68..67eb93cff699ba2a4dc9231f73c0d4d46d9fc443 100644 (file)
--- a/block/compat_ioctl.c
+++ b/block/compat_ioctl.c
@@ -677,6 +677,29 @@ static int compat_blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode,
         case DVD_WRITE_STRUCT:
         case DVD_AUTH:
                 arg = (unsigned long)compat_ptr(arg);
+       /* These intepret arg as an unsigned long, not as a pointer,
+        * so we must not do compat_ptr() conversion. */
+       case HDIO_SET_MULTCOUNT:
+       case HDIO_SET_UNMASKINTR:
+       case HDIO_SET_KEEPSETTINGS:
+       case HDIO_SET_32BIT:
+       case HDIO_SET_NOWERR:
+       case HDIO_SET_DMA:
+       case HDIO_SET_PIO_MODE:
+       case HDIO_SET_NICE:
+       case HDIO_SET_WCACHE:
+       case HDIO_SET_ACOUSTIC:
+       case HDIO_SET_BUSSTATE:
+       case HDIO_SET_ADDRESS:
+       case CDROMEJECT_SW:
+       case CDROM_SET_OPTIONS:
+       case CDROM_CLEAR_OPTIONS:
+       case CDROM_SELECT_SPEED:
+       case CDROM_SELECT_DISC:
+       case CDROM_MEDIA_CHANGED:
+       case CDROM_DRIVE_STATUS:
+       case CDROM_LOCKDOOR:
+       case CDROM_DEBUG:
                 break;
         default:
                 /* unknown ioctl number */
@@ -699,8 +722,14 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
         struct backing_dev_info *bdi;
         loff_t size;
  
+       /*
+        * O_NDELAY can be altered using fcntl(.., F_SETFL, ..), so we have
+        * to updated it before every ioctl.
+        */
         if (file->f_flags & O_NDELAY)
-               mode |= FMODE_NDELAY_NOW;
+               mode |= FMODE_NDELAY;
+       else
+               mode &= ~FMODE_NDELAY;
  
         switch (cmd) {
         case HDIO_GETGEO:
diff --git a/block/elevator.c b/block/elevator.c

index 9ac82dde99dddcd5434659f65a1e81c2a166b639..a6951f76ba0c3fa3e9a0c9f8ff58a108e63dc85c 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -844,14 +844,7 @@ void elv_dequeue_request(struct request_queue *q, struct request *rq)
          */
         if (blk_account_rq(rq))
                 q->in_flight++;
-
-       /*
-        * We are now handing the request to the hardware, add the
-        * timeout handler.
-        */
-       blk_add_timer(rq);
  }
-EXPORT_SYMBOL(elv_dequeue_request);
  
  int elv_queue_empty(struct request_queue *q)
  {
diff --git a/block/genhd.c b/block/genhd.c

index 27549e470da54d858e3bccd99946e2db2a311fa6..2f7feda61e35fc3cfd8dc74264300baeeaa56826 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1102,6 +1102,7 @@ struct gendisk *alloc_disk_node(int minors, int node_id)
                         kfree(disk);
                         return NULL;
                 }
+               disk->node_id = node_id;
                 if (disk_expand_part_tbl(disk, 0)) {
                         free_part_stats(&disk->part0);
                         kfree(disk);
@@ -1116,7 +1117,6 @@ struct gendisk *alloc_disk_node(int minors, int node_id)
                 device_initialize(disk_to_dev(disk));
                 INIT_WORK(&disk->async_notify,
                         media_change_notify_thread);
-               disk->node_id = node_id;
         }
         return disk;
  }
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c

index 5963cf91a3a0c4f67dc709f9a6b98fdd87235f53..d0bb92cbefb9d698fc4756ec9041aeb2f5794005 100644 (file)
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -208,6 +208,8 @@ static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
                 rq->timeout = q->sg_timeout;
         if (!rq->timeout)
                 rq->timeout = BLK_DEFAULT_SG_TIMEOUT;
+       if (rq->timeout < BLK_MIN_SG_TIMEOUT)
+               rq->timeout = BLK_MIN_SG_TIMEOUT;
  
         return 0;
  }
diff --git a/crypto/Kconfig b/crypto/Kconfig

index 39dbd8e4dde13c2769a1acb71c8d9937f12b3499..dc20a34ba5efaf9922cf225f1ec18a962b5f1024 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -31,35 +31,63 @@ config CRYPTO_FIPS
  
  config CRYPTO_ALGAPI
         tristate
+       select CRYPTO_ALGAPI2
         help
           This option provides the API for cryptographic algorithms.
  
+config CRYPTO_ALGAPI2
+       tristate
+
  config CRYPTO_AEAD
         tristate
+       select CRYPTO_AEAD2
         select CRYPTO_ALGAPI
  
+config CRYPTO_AEAD2
+       tristate
+       select CRYPTO_ALGAPI2
+
  config CRYPTO_BLKCIPHER
         tristate
+       select CRYPTO_BLKCIPHER2
         select CRYPTO_ALGAPI
-       select CRYPTO_RNG
+
+config CRYPTO_BLKCIPHER2
+       tristate
+       select CRYPTO_ALGAPI2
+       select CRYPTO_RNG2
  
  config CRYPTO_HASH
         tristate
+       select CRYPTO_HASH2
         select CRYPTO_ALGAPI
  
+config CRYPTO_HASH2
+       tristate
+       select CRYPTO_ALGAPI2
+
  config CRYPTO_RNG
         tristate
+       select CRYPTO_RNG2
         select CRYPTO_ALGAPI
  
+config CRYPTO_RNG2
+       tristate
+       select CRYPTO_ALGAPI2
+
  config CRYPTO_MANAGER
         tristate "Cryptographic algorithm manager"
-       select CRYPTO_AEAD
-       select CRYPTO_HASH
-       select CRYPTO_BLKCIPHER
+       select CRYPTO_MANAGER2
         help
           Create default cryptographic template instantiations such as
           cbc(aes).
  
+config CRYPTO_MANAGER2
+       def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
+       select CRYPTO_AEAD2
+       select CRYPTO_HASH2
+       select CRYPTO_BLKCIPHER2
+
  config CRYPTO_GF128MUL
         tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
         depends on EXPERIMENTAL
diff --git a/crypto/Makefile b/crypto/Makefile

index 5862b807334e5c0f46fbad14bf01e058fe4e9939..cd4a4ed078ff1252642dba2fc87093fa97eedb18 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -9,24 +9,24 @@ obj-$(CONFIG_CRYPTO_FIPS) += fips.o
  
  crypto_algapi-$(CONFIG_PROC_FS) += proc.o
  crypto_algapi-objs := algapi.o scatterwalk.o $(crypto_algapi-y)
-obj-$(CONFIG_CRYPTO_ALGAPI) += crypto_algapi.o
+obj-$(CONFIG_CRYPTO_ALGAPI2) += crypto_algapi.o
  
-obj-$(CONFIG_CRYPTO_AEAD) += aead.o
+obj-$(CONFIG_CRYPTO_AEAD2) += aead.o
  
  crypto_blkcipher-objs := ablkcipher.o
  crypto_blkcipher-objs += blkcipher.o
-obj-$(CONFIG_CRYPTO_BLKCIPHER) += crypto_blkcipher.o
-obj-$(CONFIG_CRYPTO_BLKCIPHER) += chainiv.o
-obj-$(CONFIG_CRYPTO_BLKCIPHER) += eseqiv.o
+obj-$(CONFIG_CRYPTO_BLKCIPHER2) += crypto_blkcipher.o
+obj-$(CONFIG_CRYPTO_BLKCIPHER2) += chainiv.o
+obj-$(CONFIG_CRYPTO_BLKCIPHER2) += eseqiv.o
  obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o
  
  crypto_hash-objs := hash.o
  crypto_hash-objs += ahash.o
-obj-$(CONFIG_CRYPTO_HASH) += crypto_hash.o
+obj-$(CONFIG_CRYPTO_HASH2) += crypto_hash.o
  
  cryptomgr-objs := algboss.o testmgr.o
  
-obj-$(CONFIG_CRYPTO_MANAGER) += cryptomgr.o
+obj-$(CONFIG_CRYPTO_MANAGER2) += cryptomgr.o
  obj-$(CONFIG_CRYPTO_HMAC) += hmac.o
  obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o
  obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o
@@ -73,8 +73,8 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o
  obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
  obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o
  obj-$(CONFIG_CRYPTO_LZO) += lzo.o
-obj-$(CONFIG_CRYPTO_RNG) += rng.o
-obj-$(CONFIG_CRYPTO_RNG) += krng.o
+obj-$(CONFIG_CRYPTO_RNG2) += rng.o
+obj-$(CONFIG_CRYPTO_RNG2) += krng.o
  obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_cprng.o
  obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
  
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c

index c029d3eb9ef0a76ed248deb4a40e47511ba12afe..595b78672b36ad90e27cf50ed28126bb43970fb5 100644 (file)
--- a/crypto/async_tx/async_xor.c
+++ b/crypto/async_tx/async_xor.c
@@ -53,10 +53,17 @@ do_async_xor(struct dma_chan *chan, struct page *dest, struct page **src_list,
         int xor_src_cnt;
         dma_addr_t dma_dest;
  
-       dma_dest = dma_map_page(dma->dev, dest, offset, len, DMA_FROM_DEVICE);
-       for (i = 0; i < src_cnt; i++)
+       /* map the dest bidrectional in case it is re-used as a source */
+       dma_dest = dma_map_page(dma->dev, dest, offset, len, DMA_BIDIRECTIONAL);
+       for (i = 0; i < src_cnt; i++) {
+               /* only map the dest once */
+               if (unlikely(src_list[i] == dest)) {
+                       dma_src[i] = dma_dest;
+                       continue;
+               }
                 dma_src[i] = dma_map_page(dma->dev, src_list[i], offset,
                                           len, DMA_TO_DEVICE);
+       }
  
         while (src_cnt) {
                 async_flags = flags;
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c

index a0a178dd189c3259fcc82f323b6c4011fe1442a4..1423b0c0cd2eecc6e3c7b2f5c78746cee5fac4eb 100644 (file)
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -174,15 +174,6 @@ static int acpi_battery_get_property(struct power_supply *psy,
                 break;
         case POWER_SUPPLY_PROP_CURRENT_NOW:
                 val->intval = battery->current_now * 1000;
-               /* if power units are mW, convert to mA by
-                  dividing by current voltage (mV/1000) */
-               if (!battery->power_unit) {
-                       if (battery->voltage_now) {
-                               val->intval /= battery->voltage_now;
-                               val->intval *= 1000;
-                       } else
-                               val->intval = -1;
-               }
                 break;
         case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
         case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c

index 7edf6d913c1318fded1fd4cf6a448b2f799a0849..765fd1c56cd66bc445ab5228f562177b9eb469e1 100644 (file)
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -688,14 +688,6 @@ void __init acpi_early_init(void)
         if (acpi_disabled)
                 return;
  
-       /*
-        * ACPI CA initializes acpi_dbg_level to non-zero, which means
-        * we get debug output merely by turning on CONFIG_ACPI_DEBUG.
-        * Turn it off so we don't get output unless the user specifies
-        * acpi.debug_level.
-        */
-       acpi_dbg_level = 0;
-
         printk(KERN_INFO PREFIX "Core revision %08x\n", ACPI_CA_VERSION);
  
         /* enable workarounds, unless strict ACPI spec. compliance */
diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c

index 25f531d892deacbb5082b0696f0ba460c48a5494..40e60fc2e596daead5c656396aa84fca0587868b 100644 (file)
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
@@ -824,32 +824,36 @@ static int __init toshiba_acpi_init(void)
                         toshiba_acpi_exit();
                         return -ENOMEM;
                 }
-       }
  
-       /* Register input device for kill switch */
-       toshiba_acpi.poll_dev = input_allocate_polled_device();
-       if (!toshiba_acpi.poll_dev) {
-               printk(MY_ERR "unable to allocate kill-switch input device\n");
-               toshiba_acpi_exit();
-               return -ENOMEM;
-       }
-       toshiba_acpi.poll_dev->private = &toshiba_acpi;
-       toshiba_acpi.poll_dev->poll = bt_poll_rfkill;
-       toshiba_acpi.poll_dev->poll_interval = 1000; /* msecs */
-
-       toshiba_acpi.poll_dev->input->name = toshiba_acpi.rfk_name;
-       toshiba_acpi.poll_dev->input->id.bustype = BUS_HOST;
-       toshiba_acpi.poll_dev->input->id.vendor = 0x0930; /* Toshiba USB ID */
-       set_bit(EV_SW, toshiba_acpi.poll_dev->input->evbit);
-       set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev->input->swbit);
-       input_report_switch(toshiba_acpi.poll_dev->input, SW_RFKILL_ALL, TRUE);
-       input_sync(toshiba_acpi.poll_dev->input);
-
-       ret = input_register_polled_device(toshiba_acpi.poll_dev);
-       if (ret) {
-               printk(MY_ERR "unable to register kill-switch input device\n");
-               toshiba_acpi_exit();
-               return ret;
+               /* Register input device for kill switch */
+               toshiba_acpi.poll_dev = input_allocate_polled_device();
+               if (!toshiba_acpi.poll_dev) {
+                       printk(MY_ERR
+                              "unable to allocate kill-switch input device\n");
+                       toshiba_acpi_exit();
+                       return -ENOMEM;
+               }
+               toshiba_acpi.poll_dev->private = &toshiba_acpi;
+               toshiba_acpi.poll_dev->poll = bt_poll_rfkill;
+               toshiba_acpi.poll_dev->poll_interval = 1000; /* msecs */
+
+               toshiba_acpi.poll_dev->input->name = toshiba_acpi.rfk_name;
+               toshiba_acpi.poll_dev->input->id.bustype = BUS_HOST;
+               /* Toshiba USB ID */
+               toshiba_acpi.poll_dev->input->id.vendor = 0x0930;
+               set_bit(EV_SW, toshiba_acpi.poll_dev->input->evbit);
+               set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev->input->swbit);
+               input_report_switch(toshiba_acpi.poll_dev->input,
+                                   SW_RFKILL_ALL, TRUE);
+               input_sync(toshiba_acpi.poll_dev->input);
+
+               ret = input_register_polled_device(toshiba_acpi.poll_dev);
+               if (ret) {
+                       printk(MY_ERR
+                              "unable to register kill-switch input device\n");
+                       toshiba_acpi_exit();
+                       return ret;
+               }
         }
  
         return 0;
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c

index 670551b95e56e44fecfc075d9cbd5255a2aebc55..17ed5ac840f7be1d65c37acb967a29e4e9bc4965 100644 (file)
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/utilities/utglobal.c
@@ -64,7 +64,7 @@ u32 acpi_dbg_level = ACPI_DEBUG_DEFAULT;
  
  /* Debug switch - layer (component) mask */
  
-u32 acpi_dbg_layer = ACPI_COMPONENT_DEFAULT | ACPI_ALL_DRIVERS;
+u32 acpi_dbg_layer = 0;
  u32 acpi_gbl_nesting_level = 0;
  
  /* Debugger globals */
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig

index 78fbec8ceda0452c83b715e1d86bc593be8eb3cf..421b7c71e72db447a7c3b09abe183908399ac34a 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -153,7 +153,7 @@ config SATA_PROMISE
           If unsure, say N.
  
  config SATA_SX4
-       tristate "Promise SATA SX4 support"
+       tristate "Promise SATA SX4 support (Experimental)"
         depends on PCI && EXPERIMENTAL
         help
           This option enables support for Promise Serial ATA SX4.
@@ -219,8 +219,8 @@ config PATA_ACPI
           otherwise unsupported hardware.
  
  config PATA_ALI
-       tristate "ALi PATA support (Experimental)"
-       depends on PCI && EXPERIMENTAL
+       tristate "ALi PATA support"
+       depends on PCI
         help
           This option enables support for the ALi ATA interfaces
           found on the many ALi chipsets.
@@ -263,7 +263,7 @@ config PATA_ATIIXP
           If unsure, say N.
  
  config PATA_CMD640_PCI
-       tristate "CMD640 PCI PATA support (Very Experimental)"
+       tristate "CMD640 PCI PATA support (Experimental)"
         depends on PCI && EXPERIMENTAL
         help
           This option enables support for the CMD640 PCI IDE
@@ -291,8 +291,8 @@ config PATA_CS5520
           If unsure, say N.
  
  config PATA_CS5530
-       tristate "CS5530 PATA support (Experimental)"
-       depends on PCI && EXPERIMENTAL
+       tristate "CS5530 PATA support"
+       depends on PCI
         help
           This option enables support for the Cyrix/NatSemi/AMD CS5530
           companion chip used with the MediaGX/Geode processor family.
@@ -309,8 +309,8 @@ config PATA_CS5535
           If unsure, say N.
  
  config PATA_CS5536
-       tristate "CS5536 PATA support (Experimental)"
-       depends on PCI && X86 && !X86_64 && EXPERIMENTAL
+       tristate "CS5536 PATA support"
+       depends on PCI && X86 && !X86_64
         help
           This option enables support for the AMD CS5536
           companion chip used with the Geode LX processor family.
@@ -363,7 +363,7 @@ config PATA_HPT37X
           If unsure, say N.
  
  config PATA_HPT3X2N
-       tristate "HPT 372N/302N PATA support (Very Experimental)"
+       tristate "HPT 372N/302N PATA support (Experimental)"
         depends on PCI && EXPERIMENTAL
         help
           This option enables support for the N variant HPT PATA
@@ -389,8 +389,8 @@ config PATA_HPT3X3_DMA
           problems with DMA on this chipset.
  
  config PATA_ISAPNP
-       tristate "ISA Plug and Play PATA support (Experimental)"
-       depends on EXPERIMENTAL && ISAPNP
+       tristate "ISA Plug and Play PATA support"
+       depends on ISAPNP
         help
           This option enables support for ISA plug & play ATA
           controllers such as those found on old soundcards.
@@ -498,8 +498,8 @@ config PATA_NINJA32
           If unsure, say N.
  
  config PATA_NS87410
-       tristate "Nat Semi NS87410 PATA support (Experimental)"
-       depends on PCI && EXPERIMENTAL
+       tristate "Nat Semi NS87410 PATA support"
+       depends on PCI
         help
           This option enables support for the National Semiconductor
           NS87410 PCI-IDE controller.
@@ -507,8 +507,8 @@ config PATA_NS87410
           If unsure, say N.
  
  config PATA_NS87415
-       tristate "Nat Semi NS87415 PATA support (Experimental)"
-       depends on PCI && EXPERIMENTAL
+       tristate "Nat Semi NS87415 PATA support"
+       depends on PCI
         help
           This option enables support for the National Semiconductor
           NS87415 PCI-IDE controller.
@@ -544,8 +544,8 @@ config PATA_PCMCIA
           If unsure, say N.
  
  config PATA_PDC_OLD
-       tristate "Older Promise PATA controller support (Experimental)"
-       depends on PCI && EXPERIMENTAL
+       tristate "Older Promise PATA controller support"
+       depends on PCI
         help
           This option enables support for the Promise 20246, 20262, 20263,
           20265 and 20267 adapters.
@@ -559,7 +559,7 @@ config PATA_QDI
           Support for QDI 6500 and 6580 PATA controllers on VESA local bus.
  
  config PATA_RADISYS
-       tristate "RADISYS 82600 PATA support (Very Experimental)"
+       tristate "RADISYS 82600 PATA support (Experimental)"
         depends on PCI && EXPERIMENTAL
         help
           This option enables support for the RADISYS 82600
@@ -586,8 +586,8 @@ config PATA_RZ1000
           If unsure, say N.
  
  config PATA_SC1200
-       tristate "SC1200 PATA support (Very Experimental)"
-       depends on PCI && EXPERIMENTAL
+       tristate "SC1200 PATA support"
+       depends on PCI
         help
           This option enables support for the NatSemi/AMD SC1200 SoC
           companion chip used with the Geode processor family.
@@ -620,8 +620,8 @@ config PATA_SIL680
           If unsure, say N.
  
  config PATA_SIS
-       tristate "SiS PATA support (Experimental)"
-       depends on PCI && EXPERIMENTAL
+       tristate "SiS PATA support"
+       depends on PCI
         help
           This option enables support for SiS PATA controllers
  
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c

index 8e37be19bbf520b1b8e9d8409d9874846ee868f4..c11936e13dd3ccd39952b35b242e42dd5e0d1078 100644 (file)
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -1066,6 +1066,28 @@ static int piix_broken_suspend(void)
                 if (dmi_find_device(DMI_DEV_TYPE_OEM_STRING, oemstrs[i], NULL))
                         return 1;
  
+       /* TECRA M4 sometimes forgets its identify and reports bogus
+        * DMI information.  As the bogus information is a bit
+        * generic, match as many entries as possible.  This manual
+        * matching is necessary because dmi_system_id.matches is
+        * limited to four entries.
+        */
+       if (dmi_get_system_info(DMI_SYS_VENDOR) &&
+           dmi_get_system_info(DMI_PRODUCT_NAME) &&
+           dmi_get_system_info(DMI_PRODUCT_VERSION) &&
+           dmi_get_system_info(DMI_PRODUCT_SERIAL) &&
+           dmi_get_system_info(DMI_BOARD_VENDOR) &&
+           dmi_get_system_info(DMI_BOARD_NAME) &&
+           dmi_get_system_info(DMI_BOARD_VERSION) &&
+           !strcmp(dmi_get_system_info(DMI_SYS_VENDOR), "TOSHIBA") &&
+           !strcmp(dmi_get_system_info(DMI_PRODUCT_NAME), "000000") &&
+           !strcmp(dmi_get_system_info(DMI_PRODUCT_VERSION), "000000") &&
+           !strcmp(dmi_get_system_info(DMI_PRODUCT_SERIAL), "000000") &&
+           !strcmp(dmi_get_system_info(DMI_BOARD_VENDOR), "TOSHIBA") &&
+           !strcmp(dmi_get_system_info(DMI_BOARD_NAME), "Portable PC") &&
+           !strcmp(dmi_get_system_info(DMI_BOARD_VERSION), "Version A0"))
+               return 1;
+
         return 0;
  }
  
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c

index 4214bfb13bbd4185e10ec877a9d0f7245f9d026a..bc6695e3c8482927e5b6de7ae4017c9884bea4a8 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2492,6 +2492,13 @@ int ata_dev_configure(struct ata_device *dev)
                 }
         }
  
+       if ((dev->horkage & ATA_HORKAGE_FIRMWARE_WARN) && print_info) {
+               ata_dev_printk(dev, KERN_WARNING, "WARNING: device requires "
+                              "firmware update to be fully functional.\n");
+               ata_dev_printk(dev, KERN_WARNING, "         contact the vendor "
+                              "or visit http://ata.wiki.kernel.org.\n");
+       }
+
         return 0;
  
  err_out_nosup:
@@ -4042,6 +4049,73 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         { "ST380817AS",         "3.42",         ATA_HORKAGE_NONCQ },
         { "ST3160023AS",        "3.42",         ATA_HORKAGE_NONCQ },
  
+       /* Seagate NCQ + FLUSH CACHE firmware bug */
+       { "ST31500341AS",       "SD15",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST31500341AS",       "SD16",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST31500341AS",       "SD17",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST31500341AS",       "SD18",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST31500341AS",       "SD19",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+
+       { "ST31000333AS",       "SD15",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST31000333AS",       "SD16",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST31000333AS",       "SD17",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST31000333AS",       "SD18",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST31000333AS",       "SD19",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+
+       { "ST3640623AS",        "SD15",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST3640623AS",        "SD16",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST3640623AS",        "SD17",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST3640623AS",        "SD18",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST3640623AS",        "SD19",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+
+       { "ST3640323AS",        "SD15",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST3640323AS",        "SD16",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST3640323AS",        "SD17",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST3640323AS",        "SD18",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST3640323AS",        "SD19",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+
+       { "ST3320813AS",        "SD15",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST3320813AS",        "SD16",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST3320813AS",        "SD17",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST3320813AS",        "SD18",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST3320813AS",        "SD19",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+
+       { "ST3320613AS",        "SD15",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST3320613AS",        "SD16",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST3320613AS",        "SD17",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST3320613AS",        "SD18",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+       { "ST3320613AS",        "SD19",         ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+
         /* Blacklist entries taken from Silicon Image 3124/3132
            Windows driver .inf file - also several Linux problem reports */
         { "HTS541060G9SA00",    "MB3OC60D",     ATA_HORKAGE_NONCQ, },
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c

index f2b83eabc7c7cd2bb59ba198df4f5c85b7b20355..e0c4f05d7d579a807becb30af2bf44b3a9ea7260 100644 (file)
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -183,7 +183,9 @@ static unsigned long hpt366_filter(struct ata_device *adev, unsigned long mask)
                         mask &= ~(0xF8 << ATA_SHIFT_UDMA);
                 if (hpt_dma_blacklisted(adev, "UDMA4", bad_ata66_4))
                         mask &= ~(0xF0 << ATA_SHIFT_UDMA);
-       }
+       } else if (adev->class == ATA_DEV_ATAPI)
+               mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA);
+
         return ata_bmdma_mode_filter(adev, mask);
  }
  
@@ -211,11 +213,15 @@ static u32 hpt36x_find_mode(struct ata_port *ap, int speed)
  
  static int hpt36x_cable_detect(struct ata_port *ap)
  {
-       u8 ata66;
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
+       u8 ata66;
  
+       /*
+        * Each channel of pata_hpt366 occupies separate PCI function
+        * as the primary channel and bit1 indicates the cable type.
+        */
         pci_read_config_byte(pdev, 0x5A, &ata66);
-       if (ata66 & (1 << ap->port_no))
+       if (ata66 & 2)
                 return ATA_CBL_PATA40;
         return ATA_CBL_PATA80;
  }
@@ -382,10 +388,10 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         /* PCI clocking determines the ATA timing values to use */
         /* info_hpt366 is safe against re-entry so we can scribble on it */
         switch((reg1 & 0x700) >> 8) {
-               case 5:
+               case 9:
                         hpriv = &hpt366_40;
                         break;
-               case 9:
+               case 5:
                         hpriv = &hpt366_25;
                         break;
                 default:
diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c

index 4e466eae8b462e31d82f7404d25f43a3b9cfd5cb..4dd9a3b031e4dc4fc932cea32b9cd6fc6b42d063 100644 (file)
--- a/drivers/ata/pata_ninja32.c
+++ b/drivers/ata/pata_ninja32.c
@@ -44,7 +44,7 @@
  #include <linux/libata.h>
  
  #define DRV_NAME "pata_ninja32"
-#define DRV_VERSION "0.1.1"
+#define DRV_VERSION "0.1.3"
  
  
  /**
@@ -130,7 +130,8 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 return rc;
         pci_set_master(dev);
  
-       /* Set up the register mappings */
+       /* Set up the register mappings. We use the I/O mapping as only the
+          older chips also have MMIO on BAR 1 */
         base = host->iomap[0];
         if (!base)
                 return -ENOMEM;
@@ -167,8 +168,12 @@ static int ninja32_reinit_one(struct pci_dev *pdev)
  #endif
  
  static const struct pci_device_id ninja32[] = {
+       { 0x10FC, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+       { 0x1145, 0x8008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+       { 0x1145, 0xf008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
         { 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
         { 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+       { 0x1145, 0xf02C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
         { },
  };
  
diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c

index f8b3ffc8ae9e40d5b5e0df5a8ad84ee6923710d8..c2e6fb9f2ef9f730b27c3a9c16f96f85fd3de7dd 100644 (file)
--- a/drivers/ata/pata_rb532_cf.c
+++ b/drivers/ata/pata_rb532_cf.c
@@ -39,9 +39,11 @@
  #define RB500_CF_MAXPORTS      1
  #define RB500_CF_IO_DELAY      400
  
-#define RB500_CF_REG_CMD       0x0800
+#define RB500_CF_REG_BASE      0x0800
+#define RB500_CF_REG_ERR       0x080D
  #define RB500_CF_REG_CTRL      0x080E
-#define RB500_CF_REG_DATA      0x0C00
+/* 32bit buffered data register offset */
+#define RB500_CF_REG_DBUF32    0x0C00
  
  struct rb532_cf_info {
         void __iomem    *iobase;
@@ -72,11 +74,12 @@ static void rb532_pata_exec_command(struct ata_port *ap,
         rb532_pata_finish_io(ap);
  }
  
-static void rb532_pata_data_xfer(struct ata_device *adev, unsigned char *buf,
+static unsigned int rb532_pata_data_xfer(struct ata_device *adev, unsigned char *buf,
                                 unsigned int buflen, int write_data)
  {
         struct ata_port *ap = adev->link->ap;
         void __iomem *ioaddr = ap->ioaddr.data_addr;
+       int retlen = buflen;
  
         if (write_data) {
                 for (; buflen > 0; buflen--, buf++)
@@ -87,6 +90,7 @@ static void rb532_pata_data_xfer(struct ata_device *adev, unsigned char *buf,
         }
  
         rb532_pata_finish_io(adev->link->ap);
+       return retlen;
  }
  
  static void rb532_pata_freeze(struct ata_port *ap)
@@ -146,13 +150,14 @@ static void rb532_pata_setup_ports(struct ata_host *ah)
         ap->pio_mask    = 0x1f; /* PIO4 */
         ap->flags       = ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO;
  
-       ap->ioaddr.cmd_addr     = info->iobase + RB500_CF_REG_CMD;
+       ap->ioaddr.cmd_addr     = info->iobase + RB500_CF_REG_BASE;
         ap->ioaddr.ctl_addr     = info->iobase + RB500_CF_REG_CTRL;
         ap->ioaddr.altstatus_addr = info->iobase + RB500_CF_REG_CTRL;
  
         ata_sff_std_ports(&ap->ioaddr);
  
-       ap->ioaddr.data_addr    = info->iobase + RB500_CF_REG_DATA;
+       ap->ioaddr.data_addr    = info->iobase + RB500_CF_REG_DBUF32;
+       ap->ioaddr.error_addr   = info->iobase + RB500_CF_REG_ERR;
  }
  
  static __devinit int rb532_pata_driver_probe(struct platform_device *pdev)
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c

index d34236611752d8c8c3cddc2ca868cee655051c26..e4be55e047f61c3608bb9a0ae02027555475eb2c 100644 (file)
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -56,7 +56,6 @@ static const struct sis_laptop sis_laptop[] = {
         { 0x5513, 0x1043, 0x1107 },     /* ASUS A6K */
         { 0x5513, 0x1734, 0x105F },     /* FSC Amilo A1630 */
         { 0x5513, 0x1071, 0x8640 },     /* EasyNote K5305 */
-       { 0x5513, 0x1039, 0x5513 },     /* Targa Visionary 1000 */
         /* end marker */
         { 0, }
  };
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c

index 615412364e9930aa042b682e503d3816f2498b8e..6b969f8c684fad8d963c707cc85fcd139fb766ce 100644 (file)
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -2705,7 +2705,7 @@ static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_
  
         /* XXX DEV_LABEL is a guess */
         if (!request_region(iobase, HRZ_IO_EXTENT, DEV_LABEL)) {
-               return -EINVAL;
+               err = -EINVAL;
                 goto out_disable;
         }
  
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c

index 9364dc554257e5af44a3a4a2aff7fc3f6598fa27..9f7c543cc04b265344b0e37443c4349147e88574 100644 (file)
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1693,6 +1693,11 @@ static int rebuild_lun_table(ctlr_info_t *h, int first_time)
         for (i = 0; i <= h->highest_lun; i++) {
                 int j;
                 drv_found = 0;
+
+               /* skip holes in the array from already deleted drives */
+               if (h->drv[i].raid_level == -1)
+                       continue;
+
                 for (j = 0; j < num_luns; j++) {
                         memcpy(&lunid, &ld_buff->LUN[j][0], 4);
                         lunid = le32_to_cpu(lunid);
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c

index f20bf359b84f20e7ff10f7081f54b37371e12f18..dc7a8c352da2e7c5b44a3d9a4e7a02bfd029d0c2 100644 (file)
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -302,7 +302,7 @@ static struct kobj_type kobj_pkt_type_wqueue = {
  static void pkt_sysfs_dev_new(struct pktcdvd_device *pd)
  {
         if (class_pktcdvd) {
-               pd->dev = device_create(class_pktcdvd, NULL, pd->pkt_dev, NULL,
+               pd->dev = device_create(class_pktcdvd, NULL, MKDEV(0, 0), NULL,
                                         "%s", pd->name);
                 if (IS_ERR(pd->dev))
                         pd->dev = NULL;
@@ -2790,7 +2790,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)
         return 0;
  
  out_mem:
-       blkdev_put(bdev, FMODE_READ|FMODE_WRITE);
+       blkdev_put(bdev, FMODE_READ | FMODE_NDELAY);
         /* This is safe: open() is still holding a reference. */
         module_put(THIS_MODULE);
         return ret;
@@ -2975,7 +2975,7 @@ static int pkt_remove_dev(dev_t pkt_dev)
         pkt_debugfs_dev_remove(pd);
         pkt_sysfs_dev_remove(pd);
  
-       blkdev_put(pd->bdev, FMODE_READ|FMODE_WRITE);
+       blkdev_put(pd->bdev, FMODE_READ | FMODE_NDELAY);
  
         remove_proc_entry(pd->name, pkt_proc);
         DPRINTK(DRIVER_NAME": writer %s unmapped\n", pd->name);
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c

index d16b02423d6192f43ad8121776ca419f08cc01c2..7d2e91cccb13e99068a4499bc469ef9bc032c67b 100644 (file)
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2081,10 +2081,6 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
         if (!q)
                 return -ENXIO;
  
-       rq = blk_get_request(q, READ, GFP_KERNEL);
-       if (!rq)
-               return -ENOMEM;
-
         cdi->last_sense = 0;
  
         while (nframes) {
@@ -2096,9 +2092,17 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
  
                 len = nr * CD_FRAMESIZE_RAW;
  
+               rq = blk_get_request(q, READ, GFP_KERNEL);
+               if (!rq) {
+                       ret = -ENOMEM;
+                       break;
+               }
+
                 ret = blk_rq_map_user(q, rq, NULL, ubuf, len, GFP_KERNEL);
-               if (ret)
+               if (ret) {
+                       blk_put_request(rq);
                         break;
+               }
  
                 rq->cmd[0] = GPCMD_READ_CD;
                 rq->cmd[1] = 1 << 2;
@@ -2124,6 +2128,7 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
  
                 if (blk_rq_unmap_user(bio))
                         ret = -EFAULT;
+               blk_put_request(rq);
  
                 if (ret)
                         break;
@@ -2133,7 +2138,6 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
                 ubuf += len;
         }
  
-       blk_put_request(rq);
         return ret;
  }
  
diff --git a/drivers/char/cp437.uni b/drivers/char/cp437.uni

index 1f06889a96b97e033bdaa294dece945eb8310cc4..bc6163484f62573389fcdcc0388f62270e6bbf53 100644 (file)
--- a/drivers/char/cp437.uni
+++ b/drivers/char/cp437.uni
@@ -27,7 +27,7 @@
  0x0c   U+2640
  0x0d   U+266a
  0x0e   U+266b
-0x0f   U+263c
+0x0f   U+263c U+00a4
  0x10   U+25b6 U+25ba
  0x11   U+25c0 U+25c4
  0x12   U+2195
@@ -55,7 +55,7 @@
  0x24   U+0024
  0x25   U+0025
  0x26   U+0026
-0x27   U+0027
+0x27   U+0027 U+00b4
  0x28   U+0028
  0x29   U+0029
  0x2a   U+002a
@@ -84,7 +84,7 @@
  0x41   U+0041 U+00c0 U+00c1 U+00c2 U+00c3
  0x42   U+0042
  0x43   U+0043 U+00a9
-0x44   U+0044
+0x44   U+0044 U+00d0
  0x45   U+0045 U+00c8 U+00ca U+00cb
  0x46   U+0046
  0x47   U+0047
@@ -140,7 +140,7 @@
  0x79   U+0079 U+00fd
  0x7a   U+007a
  0x7b   U+007b
-0x7c   U+007c U+00a5
+0x7c   U+007c U+00a6
  0x7d   U+007d
  0x7e   U+007e
  #
@@ -263,10 +263,10 @@
  0xe8   U+03a6 U+00d8
  0xe9   U+0398
  0xea   U+03a9 U+2126
-0xeb   U+03b4
+0xeb   U+03b4 U+00f0
  0xec   U+221e
  0xed   U+03c6 U+00f8
-0xee   U+03b5
+0xee   U+03b5 U+2208
  0xef   U+2229
  0xf0   U+2261
  0xf1   U+00b1
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c

index 3b23270eaa65385f56a2cef7652aeb2ccea77055..a8f15e6be594237f150b1b3e92ad1b9a7d468ae1 100644 (file)
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -418,7 +418,7 @@ static irqreturn_t cd2401_rxerr_interrupt(int irq, void *dev_id)
                                                              TTY_OVERRUN);
                                         /*
                                            If the flip buffer itself is
-                                          overflowing, we still loose
+                                          overflowing, we still lose
                                            the next incoming character.
                                          */
                                         if (tty_buffer_request_room(tty, 1) !=
diff --git a/drivers/char/vt.c b/drivers/char/vt.c

index a5af6072e2b34760ade3cf63b879dd16f4015957..008176edbd64511148ac5e1e40d21d3fbf1883d5 100644 (file)
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -2274,7 +2274,7 @@ rescan_last_byte:
                                     continue; /* nothing to display */
                                 }
                                 /* Glyph not found */
-                               if ((!(vc->vc_utf && !vc->vc_disp_ctrl) || c < 128) && !(c & ~charmask)) {
+                               if ((!(vc->vc_utf && !vc->vc_disp_ctrl) && c < 128) && !(c & ~charmask)) {
                                     /* In legacy mode use the glyph we get by a 1:1 mapping.
                                        This would make absolutely no sense with Unicode in mind,
                                        but do this for ASCII characters since a font may lack
diff --git a/drivers/char/xilinx_hwicap/buffer_icap.c b/drivers/char/xilinx_hwicap/buffer_icap.c

index aa7f7962a9a0e678b0e3cdfdd9da1058c3798d14..05d897764f027489a346774cedc0ded600f28d2c 100644 (file)
--- a/drivers/char/xilinx_hwicap/buffer_icap.c
+++ b/drivers/char/xilinx_hwicap/buffer_icap.c
@@ -21,9 +21,6 @@
   *     INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
   *     FOR A PARTICULAR PURPOSE.
   *
- *     Xilinx products are not intended for use in life support appliances,
- *     devices, or systems. Use in such applications is expressly prohibited.
- *
   *     (c) Copyright 2003-2008 Xilinx Inc.
   *     All rights reserved.
   *
diff --git a/drivers/char/xilinx_hwicap/buffer_icap.h b/drivers/char/xilinx_hwicap/buffer_icap.h

index 8b0252bf06e221ea89a0b9b6b3f89f0eda301722..d4f419ee87abbfc6fb0d41fd98ab8665524514cf 100644 (file)
--- a/drivers/char/xilinx_hwicap/buffer_icap.h
+++ b/drivers/char/xilinx_hwicap/buffer_icap.h
@@ -21,9 +21,6 @@
   *     INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
   *     FOR A PARTICULAR PURPOSE.
   *
- *     Xilinx products are not intended for use in life support appliances,
- *     devices, or systems. Use in such applications is expressly prohibited.
- *
   *     (c) Copyright 2003-2008 Xilinx Inc.
   *     All rights reserved.
   *
diff --git a/drivers/char/xilinx_hwicap/fifo_icap.c b/drivers/char/xilinx_hwicap/fifo_icap.c

index 776b505284783cc0f128763a65925c9dbbd622e1..02225eb19cf6bd2e6d99085b6edea7aa4801c30b 100644 (file)
--- a/drivers/char/xilinx_hwicap/fifo_icap.c
+++ b/drivers/char/xilinx_hwicap/fifo_icap.c
@@ -21,9 +21,6 @@
   *     INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
   *     FOR A PARTICULAR PURPOSE.
   *
- *     Xilinx products are not intended for use in life support appliances,
- *     devices, or systems. Use in such applications is expressly prohibited.
- *
   *     (c) Copyright 2007-2008 Xilinx Inc.
   *     All rights reserved.
   *
diff --git a/drivers/char/xilinx_hwicap/fifo_icap.h b/drivers/char/xilinx_hwicap/fifo_icap.h

index 62bda453c90b8a6101e91d11f00ec24406ab48b4..4c9dd9a3b62ac4b0266389141a4f66b9e2e34fd6 100644 (file)
--- a/drivers/char/xilinx_hwicap/fifo_icap.h
+++ b/drivers/char/xilinx_hwicap/fifo_icap.h
@@ -21,9 +21,6 @@
   *     INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
   *     FOR A PARTICULAR PURPOSE.
   *
- *     Xilinx products are not intended for use in life support appliances,
- *     devices, or systems. Use in such applications is expressly prohibited.
- *
   *     (c) Copyright 2007-2008 Xilinx Inc.
   *     All rights reserved.
   *
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c

index d16131949097696cc8a72d2d07ae6a393094ebb7..f40ab699860f4645a693f76a239473812e767493 100644 (file)
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -21,9 +21,6 @@
   *     INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
   *     FOR A PARTICULAR PURPOSE.
   *
- *     Xilinx products are not intended for use in life support appliances,
- *     devices, or systems. Use in such applications is expressly prohibited.
- *
   *     (c) Copyright 2002 Xilinx Inc., Systems Engineering Group
   *     (c) Copyright 2004 Xilinx Inc., Systems Engineering Group
   *     (c) Copyright 2007-2008 Xilinx Inc.
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.h b/drivers/char/xilinx_hwicap/xilinx_hwicap.h

index 24d0d9b938fb39e485c56d9e74d1d9ff6effa5e6..8cca11981c5ff73036eaaeb915fbcf0a050a87c5 100644 (file)
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.h
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
@@ -21,9 +21,6 @@
   *     INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
   *     FOR A PARTICULAR PURPOSE.
   *
- *     Xilinx products are not intended for use in life support appliances,
- *     devices, or systems. Use in such applications is expressly prohibited.
- *
   *     (c) Copyright 2003-2007 Xilinx Inc.
   *     All rights reserved.
   *
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c

index 5317e08221ecb2a34e699c77bac4f72a505f59e6..657996517374f30f51f10257dd0ef0ee40ae66b9 100644 (file)
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -388,7 +388,10 @@ int dma_async_device_register(struct dma_device *device)
  
         init_completion(&device->done);
         kref_init(&device->refcount);
+
+       mutex_lock(&dma_list_mutex);
         device->dev_id = id++;
+       mutex_unlock(&dma_list_mutex);
  
         /* represent channels in sysfs. Probably want devs too */
         list_for_each_entry(chan, &device->channels, device_node) {
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c

index ecd743f7cc617b9921b7d08e553da0264d8c401c..6607fdd00b1cd3a31655cc6b53fca580919f3354 100644 (file)
--- a/drivers/dma/ioat_dma.c
+++ b/drivers/dma/ioat_dma.c
@@ -1341,10 +1341,12 @@ static void ioat_dma_start_null_desc(struct ioat_dma_chan *ioat_chan)
   */
  #define IOAT_TEST_SIZE 2000
  
+DECLARE_COMPLETION(test_completion);
  static void ioat_dma_test_callback(void *dma_async_param)
  {
         printk(KERN_ERR "ioatdma: ioat_dma_test_callback(%p)\n",
                 dma_async_param);
+       complete(&test_completion);
  }
  
  /**
@@ -1410,7 +1412,8 @@ static int ioat_dma_self_test(struct ioatdma_device *device)
                 goto free_resources;
         }
         device->common.device_issue_pending(dma_chan);
-       msleep(1);
+
+       wait_for_completion_timeout(&test_completion, msecs_to_jiffies(3000));
  
         if (device->common.device_is_tx_complete(dma_chan, cookie, NULL, NULL)
                                         != DMA_SUCCESS) {
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c

index c7a9306d951d2c61f622c601ef2d49af422b679e..6be3172622009ff67ec502b049f167d6ccebe1cd 100644 (file)
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -85,18 +85,28 @@ iop_adma_run_tx_complete_actions(struct iop_adma_desc_slot *desc,
                         enum dma_ctrl_flags flags = desc->async_tx.flags;
                         u32 src_cnt;
                         dma_addr_t addr;
+                       dma_addr_t dest;
  
+                       src_cnt = unmap->unmap_src_cnt;
+                       dest = iop_desc_get_dest_addr(unmap, iop_chan);
                         if (!(flags & DMA_COMPL_SKIP_DEST_UNMAP)) {
-                               addr = iop_desc_get_dest_addr(unmap, iop_chan);
-                               dma_unmap_page(dev, addr, len, DMA_FROM_DEVICE);
+                               enum dma_data_direction dir;
+
+                               if (src_cnt > 1) /* is xor? */
+                                       dir = DMA_BIDIRECTIONAL;
+                               else
+                                       dir = DMA_FROM_DEVICE;
+
+                               dma_unmap_page(dev, dest, len, dir);
                         }
  
                         if (!(flags & DMA_COMPL_SKIP_SRC_UNMAP)) {
-                               src_cnt = unmap->unmap_src_cnt;
                                 while (src_cnt--) {
                                         addr = iop_desc_get_src_addr(unmap,
                                                                      iop_chan,
                                                                      src_cnt);
+                                       if (addr == dest)
+                                               continue;
                                         dma_unmap_page(dev, addr, len,
                                                        DMA_TO_DEVICE);
                                 }
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c

index 0328da020a1084e6c7f0fcfd0e729a00e079702d..bcda17426411ea6f4c311aa5b077a1e91e906b63 100644 (file)
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -311,17 +311,26 @@ mv_xor_run_tx_complete_actions(struct mv_xor_desc_slot *desc,
                         enum dma_ctrl_flags flags = desc->async_tx.flags;
                         u32 src_cnt;
                         dma_addr_t addr;
+                       dma_addr_t dest;
  
+                       src_cnt = unmap->unmap_src_cnt;
+                       dest = mv_desc_get_dest_addr(unmap);
                         if (!(flags & DMA_COMPL_SKIP_DEST_UNMAP)) {
-                               addr = mv_desc_get_dest_addr(unmap);
-                               dma_unmap_page(dev, addr, len, DMA_FROM_DEVICE);
+                               enum dma_data_direction dir;
+
+                               if (src_cnt > 1) /* is xor ? */
+                                       dir = DMA_BIDIRECTIONAL;
+                               else
+                                       dir = DMA_FROM_DEVICE;
+                               dma_unmap_page(dev, dest, len, dir);
                         }
  
                         if (!(flags & DMA_COMPL_SKIP_SRC_UNMAP)) {
-                               src_cnt = unmap->unmap_src_cnt;
                                 while (src_cnt--) {
                                         addr = mv_desc_get_src_addr(unmap,
                                                                     src_cnt);
+                                       if (addr == dest)
+                                               continue;
                                         dma_unmap_page(dev, addr, len,
                                                        DMA_TO_DEVICE);
                                 }
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c

index 5fcd3d89c75d91cda65acd42fe34be8d987e9c67..4041e91432837b2d2cc9b898e10f04f20cc778ce 100644 (file)
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -394,6 +394,12 @@ static void edac_device_workq_function(struct work_struct *work_req)
  
         mutex_lock(&device_ctls_mutex);
  
+       /* If we are being removed, bail out immediately */
+       if (edac_dev->op_state == OP_OFFLINE) {
+               mutex_unlock(&device_ctls_mutex);
+               return;
+       }
+
         /* Only poll controllers that are running polled and have a check */
         if ((edac_dev->op_state == OP_RUNNING_POLL) &&
                 (edac_dev->edac_check != NULL)) {
@@ -585,14 +591,14 @@ struct edac_device_ctl_info *edac_device_del_device(struct device *dev)
         /* mark this instance as OFFLINE */
         edac_dev->op_state = OP_OFFLINE;
  
-       /* clear workq processing on this instance */
-       edac_device_workq_teardown(edac_dev);
-
         /* deregister from global list */
         del_edac_device_from_global_list(edac_dev);
  
         mutex_unlock(&device_ctls_mutex);
  
+       /* clear workq processing on this instance */
+       edac_device_workq_teardown(edac_dev);
+
         /* Tear down the sysfs entries for this instance */
         edac_device_remove_sysfs(edac_dev);
  
diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c

index e43bdc43a1bf09732a7f9037b76852968c24c4f5..ebb037b78758f5f86f06abba1613121f8195d858 100644 (file)
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@ -182,8 +182,6 @@ static struct pci_dev *mci_pdev;    /* init dev: in case that AGP code has
                                          * already registered driver
                                          */
  
-static int i82875p_registered = 1;
-
  static struct edac_pci_ctl_info *i82875p_pci;
  
  static void i82875p_get_error_info(struct mem_ctl_info *mci,
@@ -295,6 +293,7 @@ static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
                                 "%s(): pci_bus_add_device() Failed\n",
                                 __func__);
                 }
+               pci_bus_assign_resources(dev->bus);
         }
  
         *ovrfl_pdev = dev;
@@ -409,6 +408,9 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
                 goto fail0;
         }
  
+       /* Keeps mci available after edac_mc_del_mc() till edac_mc_free() */
+       kobject_get(&mci->edac_mci_kobj);
+
         debugf3("%s(): init mci\n", __func__);
         mci->dev = &pdev->dev;
         mci->mtype_cap = MEM_FLAG_DDR;
@@ -451,6 +453,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
         return 0;
  
  fail1:
+       kobject_put(&mci->edac_mci_kobj);
         edac_mc_free(mci);
  
  fail0:
@@ -578,12 +581,11 @@ static void __exit i82875p_exit(void)
  {
         debugf3("%s()\n", __func__);
  
+       i82875p_remove_one(mci_pdev);
+       pci_dev_put(mci_pdev);
+
         pci_unregister_driver(&i82875p_driver);
  
-       if (!i82875p_registered) {
-               i82875p_remove_one(mci_pdev);
-               pci_dev_put(mci_pdev);
-       }
  }
  
  module_init(i82875p_init);
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c

index 46610b090415544306a292a02a4d62f63033d901..ab9c01e462ef64a197c72250fed471b361477f02 100644 (file)
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -974,6 +974,7 @@ at_context_queue_packet(struct context *ctx, struct fw_packet *packet)
                         packet->ack = RCODE_SEND_ERROR;
                         return -1;
                 }
+               packet->payload_bus = payload_bus;
  
                 d[2].req_count    = cpu_to_le16(packet->payload_length);
                 d[2].data_address = cpu_to_le32(payload_bus);
@@ -1025,7 +1026,6 @@ static int handle_at_packet(struct context *context,
         struct driver_data *driver_data;
         struct fw_packet *packet;
         struct fw_ohci *ohci = context->ohci;
-       dma_addr_t payload_bus;
         int evt;
  
         if (last->transfer_status == 0)
@@ -1038,9 +1038,8 @@ static int handle_at_packet(struct context *context,
                 /* This packet was cancelled, just continue. */
                 return 1;
  
-       payload_bus = le32_to_cpu(last->data_address);
-       if (payload_bus != 0)
-               dma_unmap_single(ohci->card.device, payload_bus,
+       if (packet->payload_bus)
+               dma_unmap_single(ohci->card.device, packet->payload_bus,
                                  packet->payload_length, DMA_TO_DEVICE);
  
         evt = le16_to_cpu(last->transfer_status) & 0x1f;
@@ -1697,6 +1696,10 @@ static int ohci_cancel_packet(struct fw_card *card, struct fw_packet *packet)
         if (packet->ack != 0)
                 goto out;
  
+       if (packet->payload_bus)
+               dma_unmap_single(ohci->card.device, packet->payload_bus,
+                                packet->payload_length, DMA_TO_DEVICE);
+
         log_ar_at_event('T', packet->speed, packet->header, 0x20);
         driver_data->packet = NULL;
         packet->ack = RCODE_CANCELLED;
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c

index 97df6dac3a821c250dbf068e0e11b33d13affb6f..e54403ee59e7f3f715f587f804d68d7cad21a5c6 100644 (file)
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -370,6 +370,11 @@ static const struct {
                 .model                  = 0x000021,
                 .workarounds            = SBP2_WORKAROUND_FIX_CAPACITY,
         },
+       /* iPod mini */ {
+               .firmware_revision      = 0x0a2700,
+               .model                  = 0x000022,
+               .workarounds            = SBP2_WORKAROUND_FIX_CAPACITY,
+       },
         /* iPod mini */ {
                 .firmware_revision      = 0x0a2700,
                 .model                  = 0x000023,
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c

index 022ac4fabb6740d3fec872142e9d65d1bc001a96..2884f876397b872085925353997276e24e6c4a83 100644 (file)
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -207,6 +207,7 @@ fw_fill_request(struct fw_packet *packet, int tcode, int tlabel,
         packet->speed = speed;
         packet->generation = generation;
         packet->ack = 0;
+       packet->payload_bus = 0;
  }
  
  /**
@@ -581,6 +582,8 @@ fw_fill_response(struct fw_packet *response, u32 *request_header,
                 BUG();
                 return;
         }
+
+       response->payload_bus = 0;
  }
  EXPORT_SYMBOL(fw_fill_response);
  
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h

index aed7dbb17cdaebb47a695a8b88a019ccf610d614..839466f0a795c57fe2df325a3b1d8e3a8813d1dd 100644 (file)
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -27,6 +27,7 @@
  #include <linux/list.h>
  #include <linux/spinlock_types.h>
  #include <linux/timer.h>
+#include <linux/types.h>
  #include <linux/workqueue.h>
  
  #define TCODE_IS_READ_REQUEST(tcode)   (((tcode) & ~1) == 4)
@@ -153,6 +154,7 @@ struct fw_packet {
         size_t header_length;
         void *payload;
         size_t payload_length;
+       dma_addr_t payload_bus;
         u32 timestamp;
  
         /*
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c

index ba89b42f790abb693a0b355e9ee918f0f1339c81..afa8a12cd00902c1c34ea4f4ba83e55c3b7a74e2 100644 (file)
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -717,7 +717,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
                 value = dev->pci_device;
                 break;
         case I915_PARAM_HAS_GEM:
-               value = 1;
+               value = dev_priv->has_gem;
                 break;
         default:
                 DRM_ERROR("Unknown parameter %d\n", param->param);
@@ -830,6 +830,14 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
  
         dev_priv->regs = ioremap(base, size);
  
+#ifdef CONFIG_HIGHMEM64G
+       /* don't enable GEM on PAE - needs agp + set_memory_* interface fixes */
+       dev_priv->has_gem = 0;
+#else
+       /* enable GEM by default */
+       dev_priv->has_gem = 1;
+#endif
+
         i915_gem_load(dev);
  
         /* Init HWS */
@@ -847,9 +855,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
          * and the registers being closely associated.
          *
          * According to chipset errata, on the 965GM, MSI interrupts may
-        * be lost or delayed
+        * be lost or delayed, but we use them anyways to avoid
+        * stuck interrupts on some machines.
          */
-       if (!IS_I945G(dev) && !IS_I945GM(dev) && !IS_I965GM(dev))
+       if (!IS_I945G(dev) && !IS_I945GM(dev))
                 pci_enable_msi(dev->pdev);
  
         intel_opregion_init(dev);
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h

index 0a4f39b9a0ec1623b79fa4073b8580efb203caa0..b3cc4731aa7c07b43d2d9825068f3e8a70ce34bd 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -106,6 +106,8 @@ struct intel_opregion {
  typedef struct drm_i915_private {
         struct drm_device *dev;
  
+       int has_gem;
+
         void __iomem *regs;
         drm_local_map_t *sarea;
  
@@ -244,6 +246,10 @@ typedef struct drm_i915_private {
                  * List of objects currently involved in rendering from the
                  * ringbuffer.
                  *
+                * Includes buffers having the contents of their GPU caches
+                * flushed, not necessarily primitives.  last_rendering_seqno
+                * represents when the rendering involved will be completed.
+                *
                  * A reference is held on the buffer while on this list.
                  */
                 struct list_head active_list;
@@ -253,6 +259,8 @@ typedef struct drm_i915_private {
                  * still have a write_domain which needs to be flushed before
                  * unbinding.
                  *
+                * last_rendering_seqno is 0 while an object is in this list.
+                *
                  * A reference is held on the buffer while on this list.
                  */
                 struct list_head flushing_list;
@@ -261,6 +269,8 @@ typedef struct drm_i915_private {
                  * LRU list of objects which are not in the ringbuffer and
                  * are ready to unbind, but are still in the GTT.
                  *
+                * last_rendering_seqno is 0 while an object is in this list.
+                *
                  * A reference is not held on the buffer while on this list,
                  * as merely being GTT-bound shouldn't prevent its being
                  * freed, and we'll pull it off the list in the free path.
@@ -371,8 +381,8 @@ struct drm_i915_gem_object {
         uint32_t agp_type;
  
         /**
-        * Flagging of which individual pages are valid in GEM_DOMAIN_CPU when
-        * GEM_DOMAIN_CPU is not in the object's read domain.
+        * If present, while GEM_DOMAIN_CPU is in the read domain this array
+        * flags which individual pages are valid.
          */
         uint8_t *page_cpu_valid;
  };
@@ -394,9 +404,6 @@ struct drm_i915_gem_request {
         /** Time at which this request was emitted, in jiffies. */
         unsigned long emitted_jiffies;
  
-       /** Cache domains that were flushed at the start of the request. */
-       uint32_t flush_domains;
-
         struct list_head list;
  };
  
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c

index d58ddef468f8124c29f6af32412ee2ba31f9873e..24fe8c10b4b22c6bac1cfa17d79d55f02dd59179 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -33,21 +33,21 @@
  
  #define I915_GEM_GPU_DOMAINS   (~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT))
  
-static int
-i915_gem_object_set_domain(struct drm_gem_object *obj,
-                           uint32_t read_domains,
-                           uint32_t write_domain);
-static int
-i915_gem_object_set_domain_range(struct drm_gem_object *obj,
-                                uint64_t offset,
-                                uint64_t size,
-                                uint32_t read_domains,
-                                uint32_t write_domain);
-static int
-i915_gem_set_domain(struct drm_gem_object *obj,
-                   struct drm_file *file_priv,
-                   uint32_t read_domains,
-                   uint32_t write_domain);
+static void
+i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj,
+                                 uint32_t read_domains,
+                                 uint32_t write_domain);
+static void i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj);
+static void i915_gem_object_flush_gtt_write_domain(struct drm_gem_object *obj);
+static void i915_gem_object_flush_cpu_write_domain(struct drm_gem_object *obj);
+static int i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj,
+                                            int write);
+static int i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj,
+                                            int write);
+static int i915_gem_object_set_cpu_read_domain_range(struct drm_gem_object *obj,
+                                                    uint64_t offset,
+                                                    uint64_t size);
+static void i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj);
  static int i915_gem_object_get_page_list(struct drm_gem_object *obj);
  static void i915_gem_object_free_page_list(struct drm_gem_object *obj);
  static int i915_gem_object_wait_rendering(struct drm_gem_object *obj);
@@ -162,8 +162,8 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,
  
         mutex_lock(&dev->struct_mutex);
  
-       ret = i915_gem_object_set_domain_range(obj, args->offset, args->size,
-                                              I915_GEM_DOMAIN_CPU, 0);
+       ret = i915_gem_object_set_cpu_read_domain_range(obj, args->offset,
+                                                       args->size);
         if (ret != 0) {
                 drm_gem_object_unreference(obj);
                 mutex_unlock(&dev->struct_mutex);
@@ -260,8 +260,7 @@ i915_gem_gtt_pwrite(struct drm_device *dev, struct drm_gem_object *obj,
                 mutex_unlock(&dev->struct_mutex);
                 return ret;
         }
-       ret = i915_gem_set_domain(obj, file_priv,
-                                 I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT);
+       ret = i915_gem_object_set_to_gtt_domain(obj, 1);
         if (ret)
                 goto fail;
  
@@ -320,8 +319,7 @@ i915_gem_shmem_pwrite(struct drm_device *dev, struct drm_gem_object *obj,
  
         mutex_lock(&dev->struct_mutex);
  
-       ret = i915_gem_set_domain(obj, file_priv,
-                                 I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
+       ret = i915_gem_object_set_to_cpu_domain(obj, 1);
         if (ret) {
                 mutex_unlock(&dev->struct_mutex);
                 return ret;
@@ -397,7 +395,8 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
  }
  
  /**
- * Called when user space prepares to use an object
+ * Called when user space prepares to use an object with the CPU, either
+ * through the mmap ioctl's mapping or a GTT mapping.
   */
  int
  i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
@@ -405,11 +404,26 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
  {
         struct drm_i915_gem_set_domain *args = data;
         struct drm_gem_object *obj;
+       uint32_t read_domains = args->read_domains;
+       uint32_t write_domain = args->write_domain;
         int ret;
  
         if (!(dev->driver->driver_features & DRIVER_GEM))
                 return -ENODEV;
  
+       /* Only handle setting domains to types used by the CPU. */
+       if (write_domain & ~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT))
+               return -EINVAL;
+
+       if (read_domains & ~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT))
+               return -EINVAL;
+
+       /* Having something in the write domain implies it's in the read
+        * domain, and only that read domain.  Enforce that in the request.
+        */
+       if (write_domain != 0 && read_domains != write_domain)
+               return -EINVAL;
+
         obj = drm_gem_object_lookup(dev, file_priv, args->handle);
         if (obj == NULL)
                 return -EBADF;
@@ -417,10 +431,21 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
         mutex_lock(&dev->struct_mutex);
  #if WATCH_BUF
         DRM_INFO("set_domain_ioctl %p(%d), %08x %08x\n",
-                obj, obj->size, args->read_domains, args->write_domain);
+                obj, obj->size, read_domains, write_domain);
  #endif
-       ret = i915_gem_set_domain(obj, file_priv,
-                                 args->read_domains, args->write_domain);
+       if (read_domains & I915_GEM_DOMAIN_GTT) {
+               ret = i915_gem_object_set_to_gtt_domain(obj, write_domain != 0);
+
+               /* Silently promote "you're not bound, there was nothing to do"
+                * to success, since the client was just asking us to
+                * make sure everything was done.
+                */
+               if (ret == -EINVAL)
+                       ret = 0;
+       } else {
+               ret = i915_gem_object_set_to_cpu_domain(obj, write_domain != 0);
+       }
+
         drm_gem_object_unreference(obj);
         mutex_unlock(&dev->struct_mutex);
         return ret;
@@ -455,10 +480,9 @@ i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,
         obj_priv = obj->driver_private;
  
         /* Pinned buffers may be scanout, so flush the cache */
-       if ((obj->write_domain & I915_GEM_DOMAIN_CPU) && obj_priv->pin_count) {
-               i915_gem_clflush_object(obj);
-               drm_agp_chipset_flush(dev);
-       }
+       if (obj_priv->pin_count)
+               i915_gem_object_flush_cpu_write_domain(obj);
+
         drm_gem_object_unreference(obj);
         mutex_unlock(&dev->struct_mutex);
         return ret;
@@ -532,7 +556,7 @@ i915_gem_object_free_page_list(struct drm_gem_object *obj)
  }
  
  static void
-i915_gem_object_move_to_active(struct drm_gem_object *obj)
+i915_gem_object_move_to_active(struct drm_gem_object *obj, uint32_t seqno)
  {
         struct drm_device *dev = obj->dev;
         drm_i915_private_t *dev_priv = dev->dev_private;
@@ -546,8 +570,20 @@ i915_gem_object_move_to_active(struct drm_gem_object *obj)
         /* Move from whatever list we were on to the tail of execution. */
         list_move_tail(&obj_priv->list,
                        &dev_priv->mm.active_list);
+       obj_priv->last_rendering_seqno = seqno;
  }
  
+static void
+i915_gem_object_move_to_flushing(struct drm_gem_object *obj)
+{
+       struct drm_device *dev = obj->dev;
+       drm_i915_private_t *dev_priv = dev->dev_private;
+       struct drm_i915_gem_object *obj_priv = obj->driver_private;
+
+       BUG_ON(!obj_priv->active);
+       list_move_tail(&obj_priv->list, &dev_priv->mm.flushing_list);
+       obj_priv->last_rendering_seqno = 0;
+}
  
  static void
  i915_gem_object_move_to_inactive(struct drm_gem_object *obj)
@@ -562,6 +598,7 @@ i915_gem_object_move_to_inactive(struct drm_gem_object *obj)
         else
                 list_move_tail(&obj_priv->list, &dev_priv->mm.inactive_list);
  
+       obj_priv->last_rendering_seqno = 0;
         if (obj_priv->active) {
                 obj_priv->active = 0;
                 drm_gem_object_unreference(obj);
@@ -610,10 +647,28 @@ i915_add_request(struct drm_device *dev, uint32_t flush_domains)
  
         request->seqno = seqno;
         request->emitted_jiffies = jiffies;
-       request->flush_domains = flush_domains;
         was_empty = list_empty(&dev_priv->mm.request_list);
         list_add_tail(&request->list, &dev_priv->mm.request_list);
  
+       /* Associate any objects on the flushing list matching the write
+        * domain we're flushing with our flush.
+        */
+       if (flush_domains != 0) {
+               struct drm_i915_gem_object *obj_priv, *next;
+
+               list_for_each_entry_safe(obj_priv, next,
+                                        &dev_priv->mm.flushing_list, list) {
+                       struct drm_gem_object *obj = obj_priv->obj;
+
+                       if ((obj->write_domain & flush_domains) ==
+                           obj->write_domain) {
+                               obj->write_domain = 0;
+                               i915_gem_object_move_to_active(obj, seqno);
+                       }
+               }
+
+       }
+
         if (was_empty && !dev_priv->mm.suspended)
                 schedule_delayed_work(&dev_priv->mm.retire_work, HZ);
         return seqno;
@@ -676,30 +731,10 @@ i915_gem_retire_request(struct drm_device *dev,
                          __func__, request->seqno, obj);
  #endif
  
-               if (obj->write_domain != 0) {
-                       list_move_tail(&obj_priv->list,
-                                      &dev_priv->mm.flushing_list);
-               } else {
+               if (obj->write_domain != 0)
+                       i915_gem_object_move_to_flushing(obj);
+               else
                         i915_gem_object_move_to_inactive(obj);
-               }
-       }
-
-       if (request->flush_domains != 0) {
-               struct drm_i915_gem_object *obj_priv, *next;
-
-               /* Clear the write domain and activity from any buffers
-                * that are just waiting for a flush matching the one retired.
-                */
-               list_for_each_entry_safe(obj_priv, next,
-                                        &dev_priv->mm.flushing_list, list) {
-                       struct drm_gem_object *obj = obj_priv->obj;
-
-                       if (obj->write_domain & request->flush_domains) {
-                               obj->write_domain = 0;
-                               i915_gem_object_move_to_inactive(obj);
-                       }
-               }
-
         }
  }
  
@@ -892,25 +927,10 @@ i915_gem_object_wait_rendering(struct drm_gem_object *obj)
         struct drm_i915_gem_object *obj_priv = obj->driver_private;
         int ret;
  
-       /* If there are writes queued to the buffer, flush and
-        * create a new seqno to wait for.
+       /* This function only exists to support waiting for existing rendering,
+        * not for emitting required flushes.
          */
-       if (obj->write_domain & ~(I915_GEM_DOMAIN_CPU|I915_GEM_DOMAIN_GTT)) {
-               uint32_t write_domain = obj->write_domain;
-#if WATCH_BUF
-               DRM_INFO("%s: flushing object %p from write domain %08x\n",
-                         __func__, obj, write_domain);
-#endif
-               i915_gem_flush(dev, 0, write_domain);
-
-               i915_gem_object_move_to_active(obj);
-               obj_priv->last_rendering_seqno = i915_add_request(dev,
-                                                                 write_domain);
-               BUG_ON(obj_priv->last_rendering_seqno == 0);
-#if WATCH_LRU
-               DRM_INFO("%s: flush moves to exec list %p\n", __func__, obj);
-#endif
-       }
+       BUG_ON((obj->write_domain & I915_GEM_GPU_DOMAINS) != 0);
  
         /* If there is rendering queued on the buffer being evicted, wait for
          * it.
@@ -950,24 +970,16 @@ i915_gem_object_unbind(struct drm_gem_object *obj)
                 return -EINVAL;
         }
  
-       /* Wait for any rendering to complete
-        */
-       ret = i915_gem_object_wait_rendering(obj);
-       if (ret) {
-               DRM_ERROR("wait_rendering failed: %d\n", ret);
-               return ret;
-       }
-
         /* Move the object to the CPU domain to ensure that
          * any possible CPU writes while it's not in the GTT
          * are flushed when we go to remap it. This will
          * also ensure that all pending GPU writes are finished
          * before we unbind.
          */
-       ret = i915_gem_object_set_domain(obj, I915_GEM_DOMAIN_CPU,
-                                        I915_GEM_DOMAIN_CPU);
+       ret = i915_gem_object_set_to_cpu_domain(obj, 1);
         if (ret) {
-               DRM_ERROR("set_domain failed: %d\n", ret);
+               if (ret != -ERESTARTSYS)
+                       DRM_ERROR("set_domain failed: %d\n", ret);
                 return ret;
         }
  
@@ -1082,6 +1094,21 @@ i915_gem_evict_something(struct drm_device *dev)
         return ret;
  }
  
+static int
+i915_gem_evict_everything(struct drm_device *dev)
+{
+       int ret;
+
+       for (;;) {
+               ret = i915_gem_evict_something(dev);
+               if (ret != 0)
+                       break;
+       }
+       if (ret == -ENOMEM)
+               return 0;
+       return ret;
+}
+
  static int
  i915_gem_object_get_page_list(struct drm_gem_object *obj)
  {
@@ -1168,7 +1195,8 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)
  
                 ret = i915_gem_evict_something(dev);
                 if (ret != 0) {
-                       DRM_ERROR("Failed to evict a buffer %d\n", ret);
+                       if (ret != -ERESTARTSYS)
+                               DRM_ERROR("Failed to evict a buffer %d\n", ret);
                         return ret;
                 }
                 goto search_free;
@@ -1228,6 +1256,143 @@ i915_gem_clflush_object(struct drm_gem_object *obj)
         drm_clflush_pages(obj_priv->page_list, obj->size / PAGE_SIZE);
  }
  
+/** Flushes any GPU write domain for the object if it's dirty. */
+static void
+i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj)
+{
+       struct drm_device *dev = obj->dev;
+       uint32_t seqno;
+
+       if ((obj->write_domain & I915_GEM_GPU_DOMAINS) == 0)
+               return;
+
+       /* Queue the GPU write cache flushing we need. */
+       i915_gem_flush(dev, 0, obj->write_domain);
+       seqno = i915_add_request(dev, obj->write_domain);
+       obj->write_domain = 0;
+       i915_gem_object_move_to_active(obj, seqno);
+}
+
+/** Flushes the GTT write domain for the object if it's dirty. */
+static void
+i915_gem_object_flush_gtt_write_domain(struct drm_gem_object *obj)
+{
+       if (obj->write_domain != I915_GEM_DOMAIN_GTT)
+               return;
+
+       /* No actual flushing is required for the GTT write domain.   Writes
+        * to it immediately go to main memory as far as we know, so there's
+        * no chipset flush.  It also doesn't land in render cache.
+        */
+       obj->write_domain = 0;
+}
+
+/** Flushes the CPU write domain for the object if it's dirty. */
+static void
+i915_gem_object_flush_cpu_write_domain(struct drm_gem_object *obj)
+{
+       struct drm_device *dev = obj->dev;
+
+       if (obj->write_domain != I915_GEM_DOMAIN_CPU)
+               return;
+
+       i915_gem_clflush_object(obj);
+       drm_agp_chipset_flush(dev);
+       obj->write_domain = 0;
+}
+
+/**
+ * Moves a single object to the GTT read, and possibly write domain.
+ *
+ * This function returns when the move is complete, including waiting on
+ * flushes to occur.
+ */
+static int
+i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, int write)
+{
+       struct drm_i915_gem_object *obj_priv = obj->driver_private;
+       int ret;
+
+       /* Not valid to be called on unbound objects. */
+       if (obj_priv->gtt_space == NULL)
+               return -EINVAL;
+
+       i915_gem_object_flush_gpu_write_domain(obj);
+       /* Wait on any GPU rendering and flushing to occur. */
+       ret = i915_gem_object_wait_rendering(obj);
+       if (ret != 0)
+               return ret;
+
+       /* If we're writing through the GTT domain, then CPU and GPU caches
+        * will need to be invalidated at next use.
+        */
+       if (write)
+               obj->read_domains &= I915_GEM_DOMAIN_GTT;
+
+       i915_gem_object_flush_cpu_write_domain(obj);
+
+       /* It should now be out of any other write domains, and we can update
+        * the domain values for our changes.
+        */
+       BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_GTT) != 0);
+       obj->read_domains |= I915_GEM_DOMAIN_GTT;
+       if (write) {
+               obj->write_domain = I915_GEM_DOMAIN_GTT;
+               obj_priv->dirty = 1;
+       }
+
+       return 0;
+}
+
+/**
+ * Moves a single object to the CPU read, and possibly write domain.
+ *
+ * This function returns when the move is complete, including waiting on
+ * flushes to occur.
+ */
+static int
+i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, int write)
+{
+       struct drm_device *dev = obj->dev;
+       int ret;
+
+       i915_gem_object_flush_gpu_write_domain(obj);
+       /* Wait on any GPU rendering and flushing to occur. */
+       ret = i915_gem_object_wait_rendering(obj);
+       if (ret != 0)
+               return ret;
+
+       i915_gem_object_flush_gtt_write_domain(obj);
+
+       /* If we have a partially-valid cache of the object in the CPU,
+        * finish invalidating it and free the per-page flags.
+        */
+       i915_gem_object_set_to_full_cpu_read_domain(obj);
+
+       /* Flush the CPU cache if it's still invalid. */
+       if ((obj->read_domains & I915_GEM_DOMAIN_CPU) == 0) {
+               i915_gem_clflush_object(obj);
+               drm_agp_chipset_flush(dev);
+
+               obj->read_domains |= I915_GEM_DOMAIN_CPU;
+       }
+
+       /* It should now be out of any other write domains, and we can update
+        * the domain values for our changes.
+        */
+       BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_CPU) != 0);
+
+       /* If we're writing through the CPU, then the GPU read domains will
+        * need to be invalidated at next use.
+        */
+       if (write) {
+               obj->read_domains &= I915_GEM_DOMAIN_CPU;
+               obj->write_domain = I915_GEM_DOMAIN_CPU;
+       }
+
+       return 0;
+}
+
  /*
   * Set the next domain for the specified object. This
   * may not actually perform the necessary flushing/invaliding though,
@@ -1339,16 +1504,18 @@ i915_gem_clflush_object(struct drm_gem_object *obj)
   *             MI_FLUSH
   *             drm_agp_chipset_flush
   */
-static int
-i915_gem_object_set_domain(struct drm_gem_object *obj,
-                           uint32_t read_domains,
-                           uint32_t write_domain)
+static void
+i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj,
+                                 uint32_t read_domains,
+                                 uint32_t write_domain)
  {
         struct drm_device               *dev = obj->dev;
         struct drm_i915_gem_object      *obj_priv = obj->driver_private;
         uint32_t                        invalidate_domains = 0;
         uint32_t                        flush_domains = 0;
-       int                             ret;
+
+       BUG_ON(read_domains & I915_GEM_DOMAIN_CPU);
+       BUG_ON(write_domain == I915_GEM_DOMAIN_CPU);
  
  #if WATCH_BUF
         DRM_INFO("%s: object %p read %08x -> %08x write %08x -> %08x\n",
@@ -1385,34 +1552,11 @@ i915_gem_object_set_domain(struct drm_gem_object *obj,
                 DRM_INFO("%s: CPU domain flush %08x invalidate %08x\n",
                          __func__, flush_domains, invalidate_domains);
  #endif
-               /*
-                * If we're invaliding the CPU cache and flushing a GPU cache,
-                * then pause for rendering so that the GPU caches will be
-                * flushed before the cpu cache is invalidated
-                */
-               if ((invalidate_domains & I915_GEM_DOMAIN_CPU) &&
-                   (flush_domains & ~(I915_GEM_DOMAIN_CPU |
-                                      I915_GEM_DOMAIN_GTT))) {
-                       ret = i915_gem_object_wait_rendering(obj);
-                       if (ret)
-                               return ret;
-               }
                 i915_gem_clflush_object(obj);
         }
  
         if ((write_domain | flush_domains) != 0)
                 obj->write_domain = write_domain;
-
-       /* If we're invalidating the CPU domain, clear the per-page CPU
-        * domain list as well.
-        */
-       if (obj_priv->page_cpu_valid != NULL &&
-           (write_domain != 0 ||
-            read_domains & I915_GEM_DOMAIN_CPU)) {
-               drm_free(obj_priv->page_cpu_valid, obj->size / PAGE_SIZE,
-                        DRM_MEM_DRIVER);
-               obj_priv->page_cpu_valid = NULL;
-       }
         obj->read_domains = read_domains;
  
         dev->invalidate_domains |= invalidate_domains;
@@ -1423,47 +1567,94 @@ i915_gem_object_set_domain(struct drm_gem_object *obj,
                  obj->read_domains, obj->write_domain,
                  dev->invalidate_domains, dev->flush_domains);
  #endif
-       return 0;
  }
  
  /**
- * Set the read/write domain on a range of the object.
+ * Moves the object from a partially CPU read to a full one.
   *
- * Currently only implemented for CPU reads, otherwise drops to normal
- * i915_gem_object_set_domain().
+ * Note that this only resolves i915_gem_object_set_cpu_read_domain_range(),
+ * and doesn't handle transitioning from !(read_domains & I915_GEM_DOMAIN_CPU).
   */
-static int
-i915_gem_object_set_domain_range(struct drm_gem_object *obj,
-                                uint64_t offset,
-                                uint64_t size,
-                                uint32_t read_domains,
-                                uint32_t write_domain)
+static void
+i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj)
  {
+       struct drm_device *dev = obj->dev;
         struct drm_i915_gem_object *obj_priv = obj->driver_private;
-       int ret, i;
  
-       if (obj->read_domains & I915_GEM_DOMAIN_CPU)
-               return 0;
+       if (!obj_priv->page_cpu_valid)
+               return;
  
-       if (read_domains != I915_GEM_DOMAIN_CPU ||
-           write_domain != 0)
-               return i915_gem_object_set_domain(obj,
-                                                 read_domains, write_domain);
+       /* If we're partially in the CPU read domain, finish moving it in.
+        */
+       if (obj->read_domains & I915_GEM_DOMAIN_CPU) {
+               int i;
  
-       /* Wait on any GPU rendering to the object to be flushed. */
+               for (i = 0; i <= (obj->size - 1) / PAGE_SIZE; i++) {
+                       if (obj_priv->page_cpu_valid[i])
+                               continue;
+                       drm_clflush_pages(obj_priv->page_list + i, 1);
+               }
+               drm_agp_chipset_flush(dev);
+       }
+
+       /* Free the page_cpu_valid mappings which are now stale, whether
+        * or not we've got I915_GEM_DOMAIN_CPU.
+        */
+       drm_free(obj_priv->page_cpu_valid, obj->size / PAGE_SIZE,
+                DRM_MEM_DRIVER);
+       obj_priv->page_cpu_valid = NULL;
+}
+
+/**
+ * Set the CPU read domain on a range of the object.
+ *
+ * The object ends up with I915_GEM_DOMAIN_CPU in its read flags although it's
+ * not entirely valid.  The page_cpu_valid member of the object flags which
+ * pages have been flushed, and will be respected by
+ * i915_gem_object_set_to_cpu_domain() if it's called on to get a valid mapping
+ * of the whole object.
+ *
+ * This function returns when the move is complete, including waiting on
+ * flushes to occur.
+ */
+static int
+i915_gem_object_set_cpu_read_domain_range(struct drm_gem_object *obj,
+                                         uint64_t offset, uint64_t size)
+{
+       struct drm_i915_gem_object *obj_priv = obj->driver_private;
+       int i, ret;
+
+       if (offset == 0 && size == obj->size)
+               return i915_gem_object_set_to_cpu_domain(obj, 0);
+
+       i915_gem_object_flush_gpu_write_domain(obj);
+       /* Wait on any GPU rendering and flushing to occur. */
         ret = i915_gem_object_wait_rendering(obj);
-       if (ret)
+       if (ret != 0)
                 return ret;
+       i915_gem_object_flush_gtt_write_domain(obj);
  
+       /* If we're already fully in the CPU read domain, we're done. */
+       if (obj_priv->page_cpu_valid == NULL &&
+           (obj->read_domains & I915_GEM_DOMAIN_CPU) != 0)
+               return 0;
+
+       /* Otherwise, create/clear the per-page CPU read domain flag if we're
+        * newly adding I915_GEM_DOMAIN_CPU
+        */
         if (obj_priv->page_cpu_valid == NULL) {
                 obj_priv->page_cpu_valid = drm_calloc(1, obj->size / PAGE_SIZE,
                                                       DRM_MEM_DRIVER);
-       }
+               if (obj_priv->page_cpu_valid == NULL)
+                       return -ENOMEM;
+       } else if ((obj->read_domains & I915_GEM_DOMAIN_CPU) == 0)
+               memset(obj_priv->page_cpu_valid, 0, obj->size / PAGE_SIZE);
  
         /* Flush the cache on any pages that are still invalid from the CPU's
          * perspective.
          */
-       for (i = offset / PAGE_SIZE; i <= (offset + size - 1) / PAGE_SIZE; i++) {
+       for (i = offset / PAGE_SIZE; i <= (offset + size - 1) / PAGE_SIZE;
+            i++) {
                 if (obj_priv->page_cpu_valid[i])
                         continue;
  
@@ -1472,39 +1663,14 @@ i915_gem_object_set_domain_range(struct drm_gem_object *obj,
                 obj_priv->page_cpu_valid[i] = 1;
         }
  
-       return 0;
-}
-
-/**
- * Once all of the objects have been set in the proper domain,
- * perform the necessary flush and invalidate operations.
- *
- * Returns the write domains flushed, for use in flush tracking.
- */
-static uint32_t
-i915_gem_dev_set_domain(struct drm_device *dev)
-{
-       uint32_t flush_domains = dev->flush_domains;
-
-       /*
-        * Now that all the buffers are synced to the proper domains,
-        * flush and invalidate the collected domains
+       /* It should now be out of any other write domains, and we can update
+        * the domain values for our changes.
          */
-       if (dev->invalidate_domains | dev->flush_domains) {
-#if WATCH_EXEC
-               DRM_INFO("%s: invalidate_domains %08x flush_domains %08x\n",
-                         __func__,
-                        dev->invalidate_domains,
-                        dev->flush_domains);
-#endif
-               i915_gem_flush(dev,
-                              dev->invalidate_domains,
-                              dev->flush_domains);
-               dev->invalidate_domains = 0;
-               dev->flush_domains = 0;
-       }
+       BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_CPU) != 0);
  
-       return flush_domains;
+       obj->read_domains |= I915_GEM_DOMAIN_CPU;
+
+       return 0;
  }
  
  /**
@@ -1585,6 +1751,18 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
                         return -EINVAL;
                 }
  
+               if (reloc.write_domain & I915_GEM_DOMAIN_CPU ||
+                   reloc.read_domains & I915_GEM_DOMAIN_CPU) {
+                       DRM_ERROR("reloc with read/write CPU domains: "
+                                 "obj %p target %d offset %d "
+                                 "read %08x write %08x",
+                                 obj, reloc.target_handle,
+                                 (int) reloc.offset,
+                                 reloc.read_domains,
+                                 reloc.write_domain);
+                       return -EINVAL;
+               }
+
                 if (reloc.write_domain && target_obj->pending_write_domain &&
                     reloc.write_domain != target_obj->pending_write_domain) {
                         DRM_ERROR("Write domain conflict: "
@@ -1625,19 +1803,11 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
                         continue;
                 }
  
-               /* Now that we're going to actually write some data in,
-                * make sure that any rendering using this buffer's contents
-                * is completed.
-                */
-               i915_gem_object_wait_rendering(obj);
-
-               /* As we're writing through the gtt, flush
-                * any CPU writes before we write the relocations
-                */
-               if (obj->write_domain & I915_GEM_DOMAIN_CPU) {
-                       i915_gem_clflush_object(obj);
-                       drm_agp_chipset_flush(dev);
-                       obj->write_domain = 0;
+               ret = i915_gem_object_set_to_gtt_domain(obj, 1);
+               if (ret != 0) {
+                       drm_gem_object_unreference(target_obj);
+                       i915_gem_object_unpin(obj);
+                       return -EINVAL;
                 }
  
                 /* Map the page containing the relocation we're going to
@@ -1779,6 +1949,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
         int ret, i, pinned = 0;
         uint64_t exec_offset;
         uint32_t seqno, flush_domains;
+       int pin_tries;
  
  #if WATCH_EXEC
         DRM_INFO("buffers_ptr %d buffer_count %d len %08x\n",
@@ -1827,14 +1998,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
                 return -EBUSY;
         }
  
-       /* Zero the gloabl flush/invalidate flags. These
-        * will be modified as each object is bound to the
-        * gtt
-        */
-       dev->invalidate_domains = 0;
-       dev->flush_domains = 0;
-
-       /* Look up object handles and perform the relocations */
+       /* Look up object handles */
         for (i = 0; i < args->buffer_count; i++) {
                 object_list[i] = drm_gem_object_lookup(dev, file_priv,
                                                        exec_list[i].handle);
@@ -1844,17 +2008,39 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
                         ret = -EBADF;
                         goto err;
                 }
+       }
  
-               object_list[i]->pending_read_domains = 0;
-               object_list[i]->pending_write_domain = 0;
-               ret = i915_gem_object_pin_and_relocate(object_list[i],
-                                                      file_priv,
-                                                      &exec_list[i]);
-               if (ret) {
-                       DRM_ERROR("object bind and relocate failed %d\n", ret);
+       /* Pin and relocate */
+       for (pin_tries = 0; ; pin_tries++) {
+               ret = 0;
+               for (i = 0; i < args->buffer_count; i++) {
+                       object_list[i]->pending_read_domains = 0;
+                       object_list[i]->pending_write_domain = 0;
+                       ret = i915_gem_object_pin_and_relocate(object_list[i],
+                                                              file_priv,
+                                                              &exec_list[i]);
+                       if (ret)
+                               break;
+                       pinned = i + 1;
+               }
+               /* success */
+               if (ret == 0)
+                       break;
+
+               /* error other than GTT full, or we've already tried again */
+               if (ret != -ENOMEM || pin_tries >= 1) {
+                       DRM_ERROR("Failed to pin buffers %d\n", ret);
                         goto err;
                 }
-               pinned = i + 1;
+
+               /* unpin all of our buffers */
+               for (i = 0; i < pinned; i++)
+                       i915_gem_object_unpin(object_list[i]);
+
+               /* evict everyone we can from the aperture */
+               ret = i915_gem_evict_everything(dev);
+               if (ret)
+                       goto err;
         }
  
         /* Set the pending read domains for the batch buffer to COMMAND */
@@ -1864,21 +2050,37 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
  
         i915_verify_inactive(dev, __FILE__, __LINE__);
  
+       /* Zero the global flush/invalidate flags. These
+        * will be modified as new domains are computed
+        * for each object
+        */
+       dev->invalidate_domains = 0;
+       dev->flush_domains = 0;
+
         for (i = 0; i < args->buffer_count; i++) {
                 struct drm_gem_object *obj = object_list[i];
  
-               /* make sure all previous memory operations have passed */
-               ret = i915_gem_object_set_domain(obj,
-                                                obj->pending_read_domains,
-                                                obj->pending_write_domain);
-               if (ret)
-                       goto err;
+               /* Compute new gpu domains and update invalidate/flush */
+               i915_gem_object_set_to_gpu_domain(obj,
+                                                 obj->pending_read_domains,
+                                                 obj->pending_write_domain);
         }
  
         i915_verify_inactive(dev, __FILE__, __LINE__);
  
-       /* Flush/invalidate caches and chipset buffer */
-       flush_domains = i915_gem_dev_set_domain(dev);
+       if (dev->invalidate_domains | dev->flush_domains) {
+#if WATCH_EXEC
+               DRM_INFO("%s: invalidate_domains %08x flush_domains %08x\n",
+                         __func__,
+                        dev->invalidate_domains,
+                        dev->flush_domains);
+#endif
+               i915_gem_flush(dev,
+                              dev->invalidate_domains,
+                              dev->flush_domains);
+               if (dev->flush_domains)
+                       (void)i915_add_request(dev, dev->flush_domains);
+       }
  
         i915_verify_inactive(dev, __FILE__, __LINE__);
  
@@ -1898,8 +2100,6 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
                               ~0);
  #endif
  
-       (void)i915_add_request(dev, flush_domains);
-
         /* Exec the batchbuffer */
         ret = i915_dispatch_gem_execbuffer(dev, args, exec_offset);
         if (ret) {
@@ -1927,10 +2127,8 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
         i915_file_priv->mm.last_gem_seqno = seqno;
         for (i = 0; i < args->buffer_count; i++) {
                 struct drm_gem_object *obj = object_list[i];
-               struct drm_i915_gem_object *obj_priv = obj->driver_private;
  
-               i915_gem_object_move_to_active(obj);
-               obj_priv->last_rendering_seqno = seqno;
+               i915_gem_object_move_to_active(obj, seqno);
  #if WATCH_LRU
                 DRM_INFO("%s: move to exec list %p\n", __func__, obj);
  #endif
@@ -2061,11 +2259,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data,
         /* XXX - flush the CPU caches for pinned objects
          * as the X server doesn't manage domains yet
          */
-       if (obj->write_domain & I915_GEM_DOMAIN_CPU) {
-               i915_gem_clflush_object(obj);
-               drm_agp_chipset_flush(dev);
-               obj->write_domain = 0;
-       }
+       i915_gem_object_flush_cpu_write_domain(obj);
         args->offset = obj_priv->gtt_offset;
         drm_gem_object_unreference(obj);
         mutex_unlock(&dev->struct_mutex);
@@ -2115,7 +2309,14 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
         }
  
         obj_priv = obj->driver_private;
-       args->busy = obj_priv->active;
+       /* Don't count being on the flushing list against the object being
+        * done.  Otherwise, a buffer left on the flushing list but not getting
+        * flushed (because nobody's flushing that domain) won't ever return
+        * unbusy and get reused by libdrm's bo cache.  The other expected
+        * consumer of this interface, OpenGL's occlusion queries, also specs
+        * that the objects get unbusy "eventually" without any interference.
+        */
+       args->busy = obj_priv->active && obj_priv->last_rendering_seqno != 0;
  
         drm_gem_object_unreference(obj);
         mutex_unlock(&dev->struct_mutex);
@@ -2167,29 +2368,6 @@ void i915_gem_free_object(struct drm_gem_object *obj)
         drm_free(obj->driver_private, 1, DRM_MEM_DRIVER);
  }
  
-static int
-i915_gem_set_domain(struct drm_gem_object *obj,
-                   struct drm_file *file_priv,
-                   uint32_t read_domains,
-                   uint32_t write_domain)
-{
-       struct drm_device *dev = obj->dev;
-       int ret;
-       uint32_t flush_domains;
-
-       BUG_ON(!mutex_is_locked(&dev->struct_mutex));
-
-       ret = i915_gem_object_set_domain(obj, read_domains, write_domain);
-       if (ret)
-               return ret;
-       flush_domains = i915_gem_dev_set_domain(obj->dev);
-
-       if (flush_domains & ~(I915_GEM_DOMAIN_CPU|I915_GEM_DOMAIN_GTT))
-               (void) i915_add_request(dev, flush_domains);
-
-       return 0;
-}
-
  /** Unbinds all objects that are on the given buffer list. */
  static int
  i915_gem_evict_from_list(struct drm_device *dev, struct list_head *head)
diff --git a/drivers/gpu/drm/i915/i915_gem_proc.c b/drivers/gpu/drm/i915/i915_gem_proc.c

index 93de15b4c9a722749d69d417d88cc1aba49d8280..e8d5abe1250ee14404bf8f9da972e34fd74ff6f0 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_proc.c
+++ b/drivers/gpu/drm/i915/i915_gem_proc.c
@@ -166,10 +166,9 @@ static int i915_gem_request_info(char *buf, char **start, off_t offset,
         list_for_each_entry(gem_request, &dev_priv->mm.request_list,
                             list)
         {
-               DRM_PROC_PRINT("    %d @ %d %08x\n",
+               DRM_PROC_PRINT("    %d @ %d\n",
                                gem_request->seqno,
-                              (int) (jiffies - gem_request->emitted_jiffies),
-                              gem_request->flush_domains);
+                              (int) (jiffies - gem_request->emitted_jiffies));
         }
         if (len > request + offset)
                 return request;
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c

index e8b85ac4ca041159553f5211e0bc3cbe58f03cc8..a8cb69469c641ff28f4d57df20b51d0dd5772f7c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -119,9 +119,10 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
                             dcc & DCC_CHANNEL_XOR_DISABLE) {
                                 swizzle_x = I915_BIT_6_SWIZZLE_9_10;
                                 swizzle_y = I915_BIT_6_SWIZZLE_9;
-                       } else if (IS_I965GM(dev) || IS_GM45(dev)) {
-                               /* GM965 only does bit 11-based channel
-                                * randomization
+                       } else if ((IS_I965GM(dev) || IS_GM45(dev)) &&
+                                  (dcc & DCC_CHANNEL_XOR_BIT_17) == 0) {
+                               /* GM965/GM45 does either bit 11 or bit 17
+                                * swizzling.
                                  */
                                 swizzle_x = I915_BIT_6_SWIZZLE_9_10_11;
                                 swizzle_y = I915_BIT_6_SWIZZLE_9_11;
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c

index fe3d9cc72bf510403c797398c2cafa00eeecf8c2..69b9a42da95ed720e85841c00ab7580fdff94830 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -78,7 +78,7 @@ i915_pipestat(int pipe)
                 return PIPEASTAT;
         if (pipe == 1)
                 return PIPEBSTAT;
-       BUG_ON(1);
+       BUG();
  }
  
  void
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h

index 0e476eba36e662b75ce24db2b7bb52162699f9e6..9d24aaeb8a453d76e2d23e2223af3bfc527a74fa 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -522,6 +522,7 @@
  #define DCC_ADDRESSING_MODE_DUAL_CHANNEL_INTERLEAVED   (2 << 0)
  #define DCC_ADDRESSING_MODE_MASK                       (3 << 0)
  #define DCC_CHANNEL_XOR_DISABLE                                (1 << 10)
+#define DCC_CHANNEL_XOR_BIT_17                         (1 << 9)
  
  /** 965 MCH register controlling DRAM channel configuration */
  #define C0DRB3                 0x10206
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h

index 7a183789be978d97d3e317b141c5119ff2dfe9c6..3bbb871b25d5102a2b6d832702cc55bc338a70ea 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
@@ -299,7 +299,6 @@ typedef struct drm_radeon_private {
         atomic_t swi_emitted;
         int vblank_crtc;
         uint32_t irq_enable_reg;
-       int irq_enabled;
         uint32_t r500_disp_irq_reg;
  
         struct radeon_surface surfaces[RADEON_MAX_SURFACES];
diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c

index 97c0599fdb1e2c49898c14c0ba097101978f8dc2..8289e16419a8d24566559223489037860809ec54 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_irq.c
+++ b/drivers/gpu/drm/radeon/radeon_irq.c
@@ -44,7 +44,8 @@ void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state)
         else
                 dev_priv->irq_enable_reg &= ~mask;
  
-       RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg);
+       if (dev->irq_enabled)
+               RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg);
  }
  
  static void r500_vbl_irq_set_state(struct drm_device *dev, u32 mask, int state)
@@ -56,7 +57,8 @@ static void r500_vbl_irq_set_state(struct drm_device *dev, u32 mask, int state)
         else
                 dev_priv->r500_disp_irq_reg &= ~mask;
  
-       RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg);
+       if (dev->irq_enabled)
+               RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg);
  }
  
  int radeon_enable_vblank(struct drm_device *dev, int crtc)
@@ -355,8 +357,6 @@ void radeon_driver_irq_uninstall(struct drm_device * dev)
         if (!dev_priv)
                 return;
  
-       dev_priv->irq_enabled = 0;
-
         if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690)
                 RADEON_WRITE(R500_DxMODE_INT_MASK, 0);
         /* Disable *all* interrupts */
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c

index f7dce8b9f64b429f30b5eb5128ccca7c0df71bc1..086c2a5cef0bcdfeae7de4cf4fba665b6745134d 100644 (file)
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -1564,3 +1564,4 @@ module_exit(applesmc_exit);
  MODULE_AUTHOR("Nicolas Boichat");
  MODULE_DESCRIPTION("Apple SMC");
  MODULE_LICENSE("GPL v2");
+MODULE_DEVICE_TABLE(dmi, applesmc_whitelist);
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c

index 228f75723063968c4e77fbb374e5421e5c87e393..3fcf78e906db185187d10c87466786fb3c3280c2 100644 (file)
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -365,6 +365,7 @@ static int cpm_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
                 pmsg = &msgs[tptr];
                 if (pmsg->flags & I2C_M_RD)
                         ret = wait_event_interruptible_timeout(cpm->i2c_wait,
+                               (in_be16(&tbdf[tptr].cbd_sc) & BD_SC_NAK) ||
                                 !(in_be16(&rbdf[rptr].cbd_sc) & BD_SC_EMPTY),
                                 1 * HZ);
                 else
diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c

index f4d22ae9d294a48fb69e1f53e4f46d5d496f7ce7..e5a8dae4a2890435f065e2b97017b83179647bcc 100644 (file)
--- a/drivers/i2c/busses/i2c-highlander.c
+++ b/drivers/i2c/busses/i2c-highlander.c
@@ -92,7 +92,7 @@ static void highlander_i2c_setup(struct highlander_i2c_dev *dev)
  static void smbus_write_data(u8 *src, u16 *dst, int len)
  {
         for (; len > 1; len -= 2) {
-               *dst++ = be16_to_cpup((u16 *)src);
+               *dst++ = be16_to_cpup((__be16 *)src);
                 src += 2;
         }
  
@@ -103,7 +103,7 @@ static void smbus_write_data(u8 *src, u16 *dst, int len)
  static void smbus_read_data(u16 *src, u8 *dst, int len)
  {
         for (; len > 1; len -= 2) {
-               *(u16 *)dst = cpu_to_be16p(src++);
+               *(__be16 *)dst = cpu_to_be16p(src++);
                 dst += 2;
         }
  
diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c

index dcf2045b5222b44aac99b568f7170701ecf0ae78..0bdb2d7f0570bd465e59b4b87ef23dd33db04b1d 100644 (file)
--- a/drivers/i2c/busses/i2c-pmcmsp.c
+++ b/drivers/i2c/busses/i2c-pmcmsp.c
@@ -486,7 +486,7 @@ static enum pmcmsptwi_xfer_result pmcmsptwi_xfer_cmd(
  
         if (cmd->type == MSP_TWI_CMD_WRITE ||
             cmd->type == MSP_TWI_CMD_WRITE_READ) {
-               __be64 tmp = cpu_to_be64p((u64 *)cmd->write_data);
+               u64 tmp = be64_to_cpup((__be64 *)cmd->write_data);
                 tmp >>= (MSP_MAX_BYTES_PER_RW - cmd->write_len) * 8;
                 dev_dbg(&pmcmsptwi_adapter.dev, "Writing 0x%016llx\n", tmp);
                 pmcmsptwi_writel(tmp & 0x00000000ffffffffLL,
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c

index 1fac4e233133879c8b06b07045c5318d87b91840..b7434d24904ebfa9750d655df8ab42f521ec2c40 100644 (file)
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -56,6 +56,7 @@ enum s3c24xx_i2c_state {
  struct s3c24xx_i2c {
         spinlock_t              lock;
         wait_queue_head_t       wait;
+       unsigned int            suspended:1;
  
         struct i2c_msg          *msg;
         unsigned int            msg_num;
@@ -507,7 +508,7 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int
         unsigned long timeout;
         int ret;
  
-       if (!(readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN))
+       if (i2c->suspended)
                 return -EIO;
  
         ret = s3c24xx_i2c_set_master(i2c);
@@ -986,17 +987,26 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev)
  }
  
  #ifdef CONFIG_PM
+static int s3c24xx_i2c_suspend_late(struct platform_device *dev,
+                                   pm_message_t msg)
+{
+       struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
+       i2c->suspended = 1;
+       return 0;
+}
+
  static int s3c24xx_i2c_resume(struct platform_device *dev)
  {
         struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
  
-       if (i2c != NULL)
-               s3c24xx_i2c_init(i2c);
+       i2c->suspended = 0;
+       s3c24xx_i2c_init(i2c);
  
         return 0;
  }
  
  #else
+#define s3c24xx_i2c_suspend_late NULL
  #define s3c24xx_i2c_resume NULL
  #endif
  
@@ -1005,6 +1015,7 @@ static int s3c24xx_i2c_resume(struct platform_device *dev)
  static struct platform_driver s3c2410_i2c_driver = {
         .probe          = s3c24xx_i2c_probe,
         .remove         = s3c24xx_i2c_remove,
+       .suspend_late   = s3c24xx_i2c_suspend_late,
         .resume         = s3c24xx_i2c_resume,
         .driver         = {
                 .owner  = THIS_MODULE,
@@ -1015,6 +1026,7 @@ static struct platform_driver s3c2410_i2c_driver = {
  static struct platform_driver s3c2440_i2c_driver = {
         .probe          = s3c24xx_i2c_probe,
         .remove         = s3c24xx_i2c_remove,
+       .suspend_late   = s3c24xx_i2c_suspend_late,
         .resume         = s3c24xx_i2c_resume,
         .driver         = {
                 .owner  = THIS_MODULE,
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig

index 6d7401772a8f6d7530a89331a16cace5528b4623..e6857e01d1bad372da0c62480753adbd1266d1f4 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -669,10 +669,12 @@ config BLK_DEV_CELLEB
  
  endif
  
+# TODO: BLK_DEV_IDEDMA_PCI -> BLK_DEV_IDEDMA_SFF
  config BLK_DEV_IDE_PMAC
         tristate "PowerMac on-board IDE support"
         depends on PPC_PMAC && IDE=y
         select IDE_TIMINGS
+       select BLK_DEV_IDEDMA_PCI
         help
           This driver provides support for the on-board IDE controller on
           most of the recent Apple Power Macintoshes and PowerBooks.
@@ -689,16 +691,6 @@ config BLK_DEV_IDE_PMAC_ATA100FIRST
           CD-ROM on hda. This option changes this to more natural hda for
           hard disk and hdc for CD-ROM.
  
-config BLK_DEV_IDEDMA_PMAC
-       bool "PowerMac IDE DMA support"
-       depends on BLK_DEV_IDE_PMAC
-       select BLK_DEV_IDEDMA_PCI
-       help
-         This option allows the driver for the on-board IDE controller on
-         Power Macintoshes and PowerBooks to use DMA (direct memory access)
-         to transfer data to and from memory.  Saying Y is safe and improves
-         performance.
-
  config BLK_DEV_IDE_AU1XXX
         bool "IDE for AMD Alchemy Au1200"
         depends on SOC_AU1200
@@ -912,7 +904,7 @@ config BLK_DEV_UMC8672
  endif
  
  config BLK_DEV_IDEDMA
-       def_bool BLK_DEV_IDEDMA_SFF || BLK_DEV_IDEDMA_PMAC || \
+       def_bool BLK_DEV_IDEDMA_SFF || \
                  BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
  
  endif # IDE
diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c

index e56c7b72f9e24ce592e4f776932815bf9dd5bccb..45d2356bb7254ff1fb9f96d71e6c7e1661e4bf18 100644 (file)
--- a/drivers/ide/alim15x3.c
+++ b/drivers/ide/alim15x3.c
@@ -591,7 +591,7 @@ static int __init ali15x3_ide_init(void)
  
  static void __exit ali15x3_ide_exit(void)
  {
-       return pci_unregister_driver(&alim15x3_pci_driver);
+       pci_unregister_driver(&alim15x3_pci_driver);
  }
  
  module_init(ali15x3_ide_init);
diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c

index 81ec73134edacfead9286aa479c0a73f1526de05..c6bcd3014a29ec7891b3e11543cd6195ff30e985 100644 (file)
--- a/drivers/ide/amd74xx.c
+++ b/drivers/ide/amd74xx.c
@@ -3,7 +3,7 @@
   * IDE driver for Linux.
   *
   * Copyright (c) 2000-2002 Vojtech Pavlik
- * Copyright (c) 2007 Bartlomiej Zolnierkiewicz
+ * Copyright (c) 2007-2008 Bartlomiej Zolnierkiewicz
   *
   * Based on the work of:
   *      Andre Hedrick
@@ -263,6 +263,15 @@ static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_
                         d.udma_mask = ATA_UDMA5;
         }
  
+       /*
+        * It seems that on some nVidia controllers using AltStatus
+        * register can be unreliable so default to Status register
+        * if the device is in Compatibility Mode.
+        */
+       if (dev->vendor == PCI_VENDOR_ID_NVIDIA &&
+           ide_pci_is_in_compatibility_mode(dev))
+               d.host_flags |= IDE_HFLAG_BROKEN_ALTSTATUS;
+
         printk(KERN_INFO "%s %s: UDMA%s controller\n",
                 d.name, pci_name(dev), amd_dma[fls(d.udma_mask) - 1]);
  
diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c

index 53f079cc00afc010f2cf62b643fe98432feceea8..d8ede85fe17f4428be6713394e678af59c1457b2 100644 (file)
--- a/drivers/ide/cs5530.c
+++ b/drivers/ide/cs5530.c
@@ -81,11 +81,12 @@ static u8 cs5530_udma_filter(ide_drive_t *drive)
  {
         ide_hwif_t *hwif = drive->hwif;
         ide_drive_t *mate = ide_get_pair_dev(drive);
-       u16 *mateid = mate->id;
+       u16 *mateid;
         u8 mask = hwif->ultra_mask;
  
         if (mate == NULL)
                 goto out;
+       mateid = mate->id;
  
         if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) {
                 if ((mateid[ATA_ID_FIELD_VALID] & 4) &&
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c

index 7162d67562af92e1679501a99a9fc09bce69e745..cc35d6dbd41026d02cdc1ab5a32085cc8c63e0db 100644 (file)
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -132,10 +132,14 @@ int ide_end_request (ide_drive_t *drive, int uptodate, int nr_sectors)
  }
  EXPORT_SYMBOL(ide_end_request);
  
-static void ide_complete_power_step(ide_drive_t *drive, struct request *rq, u8 stat, u8 error)
+static void ide_complete_power_step(ide_drive_t *drive, struct request *rq)
  {
         struct request_pm_state *pm = rq->data;
  
+#ifdef DEBUG_PM
+       printk(KERN_INFO "%s: complete_power_step(step: %d)\n",
+               drive->name, pm->pm_step);
+#endif
         if (drive->media != ide_disk)
                 return;
  
@@ -172,7 +176,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
                 /* Not supported? Switch to next step now. */
                 if (ata_id_flush_enabled(drive->id) == 0 ||
                     (drive->dev_flags & IDE_DFLAG_WCACHE) == 0) {
-                       ide_complete_power_step(drive, rq, 0, 0);
+                       ide_complete_power_step(drive, rq);
                         return ide_stopped;
                 }
                 if (ata_id_flush_ext_enabled(drive->id))
@@ -191,7 +195,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
                 if (drive->media != ide_disk)
                         pm->pm_step = IDE_PM_RESTORE_DMA;
                 else
-                       ide_complete_power_step(drive, rq, 0, 0);
+                       ide_complete_power_step(drive, rq);
                 return ide_stopped;
         case IDE_PM_IDLE:               /* Resume step 2 (idle) */
                 args->tf.command = ATA_CMD_IDLEIMMEDIATE;
@@ -322,11 +326,8 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err)
                 }
         } else if (blk_pm_request(rq)) {
                 struct request_pm_state *pm = rq->data;
-#ifdef DEBUG_PM
-               printk("%s: complete_power_step(step: %d, stat: %x, err: %x)\n",
-                       drive->name, rq->pm->pm_step, stat, err);
-#endif
-               ide_complete_power_step(drive, rq, stat, err);
+
+               ide_complete_power_step(drive, rq);
                 if (pm->pm_step == IDE_PM_COMPLETED)
                         ide_complete_pm_request(drive, rq);
                 return;
@@ -804,7 +805,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
                         struct request_pm_state *pm = rq->data;
  #ifdef DEBUG_PM
                         printk("%s: start_power_step(step: %d)\n",
-                               drive->name, rq->pm->pm_step);
+                               drive->name, pm->pm_step);
  #endif
                         startstop = ide_start_power_step(drive, rq);
                         if (startstop == ide_stopped &&
@@ -967,14 +968,13 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)
         ide_startstop_t startstop;
         int             loops = 0;
  
-       /* for atari only: POSSIBLY BROKEN HERE(?) */
-       ide_get_lock(ide_intr, hwgroup);
-
         /* caller must own ide_lock */
         BUG_ON(!irqs_disabled());
  
         while (!hwgroup->busy) {
                 hwgroup->busy = 1;
+               /* for atari only */
+               ide_get_lock(ide_intr, hwgroup);
                 drive = choose_drive(hwgroup);
                 if (drive == NULL) {
                         int sleeping = 0;
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c

index 5d6ba14e211df826f794693bf0c682c59a9e4c06..c41c3b9b6f022b89148792c05d9564021ff271da 100644 (file)
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -457,18 +457,14 @@ int drive_is_ready (ide_drive_t *drive)
         if (drive->waiting_for_dma)
                 return hwif->dma_ops->dma_test_irq(drive);
  
-#if 0
-       /* need to guarantee 400ns since last command was issued */
-       udelay(1);
-#endif
-
         /*
          * We do a passive status test under shared PCI interrupts on
          * cards that truly share the ATA side interrupt, but may also share
          * an interrupt with another pci card/device.  We make no assumptions
          * about possible isa-pnp and pci-pnp issues yet.
          */
-       if (hwif->io_ports.ctl_addr)
+       if (hwif->io_ports.ctl_addr &&
+           (hwif->host_flags & IDE_HFLAG_BROKEN_ALTSTATUS) == 0)
                 stat = hwif->tp_ops->read_altstatus(hwif);
         else
                 /* Note: this may clear a pending IRQ!! */
@@ -610,6 +606,7 @@ static const struct drive_list_entry ivb_list[] = {
         { "TSSTcorp CDDVDW SH-S202N"    , "SB01"        },
         { "TSSTcorp CDDVDW SH-S202H"    , "SB00"        },
         { "TSSTcorp CDDVDW SH-S202H"    , "SB01"        },
+       { "SAMSUNG SP0822N"             , "WA100-10"    },
         { NULL                          , NULL          }
  };
  
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c

index 1649ea54f76ce7c194f7ec8f5016f132aec79d0f..c55bdbd2231467541d5218de67ae2ff5479f3429 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -266,7 +266,8 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)
         /* take a deep breath */
         msleep(50);
  
-       if (io_ports->ctl_addr) {
+       if (io_ports->ctl_addr &&
+           (hwif->host_flags & IDE_HFLAG_BROKEN_ALTSTATUS) == 0) {
                 a = tp_ops->read_altstatus(hwif);
                 s = tp_ops->read_status(hwif);
                 if ((a ^ s) & ~ATA_IDX)
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c

index 2e19d6298536f2fb94d3e0a8a1b5fd08877f3734..7c481bb56fab90427001c4ac5f46a0fc367ac449 100644 (file)
--- a/drivers/ide/pmac.c
+++ b/drivers/ide/pmac.c
@@ -66,7 +66,6 @@ typedef struct pmac_ide_hwif {
         struct macio_dev                *mdev;
         u32                             timings[4];
         volatile u32 __iomem *          *kauai_fcr;
-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
         /* Those fields are duplicating what is in hwif. We currently
          * can't use the hwif ones because of some assumptions that are
          * beeing done by the generic code about the kind of dma controller
@@ -74,8 +73,6 @@ typedef struct pmac_ide_hwif {
          */
         volatile struct dbdma_regs __iomem *    dma_regs;
         struct dbdma_cmd*               dma_table_cpu;
-#endif
-       
  } pmac_ide_hwif_t;
  
  enum {
@@ -222,8 +219,6 @@ static const char* model_name[] = {
  #define KAUAI_FCR_UATA_RESET_N         0x00000002
  #define KAUAI_FCR_UATA_ENABLE          0x00000001
  
-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
-
  /* Rounded Multiword DMA timings
   * 
   * I gave up finding a generic formula for all controller
@@ -413,8 +408,6 @@ static int pmac_ide_build_dmatable(ide_drive_t *drive, struct request *rq);
  static void pmac_ide_selectproc(ide_drive_t *drive);
  static void pmac_ide_kauai_selectproc(ide_drive_t *drive);
  
-#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
-
  #define PMAC_IDE_REG(x) \
         ((void __iomem *)((drive)->hwif->io_ports.data_addr + (x)))
  
@@ -584,8 +577,6 @@ pmac_ide_set_pio_mode(ide_drive_t *drive, const u8 pio)
         pmac_ide_do_update_timings(drive);
  }
  
-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
-
  /*
   * Calculate KeyLargo ATA/66 UDMA timings
   */
@@ -786,7 +777,6 @@ set_timings_mdma(ide_drive_t *drive, int intf_type, u32 *timings, u32 *timings2,
                 drive->name, speed & 0xf,  *timings);
  #endif 
  }
-#endif /* #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC */
  
  static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed)
  {
@@ -804,7 +794,6 @@ static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed)
         tl[0] = *timings;
         tl[1] = *timings2;
  
-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
         if (speed >= XFER_UDMA_0) {
                 if (pmif->kind == controller_kl_ata4)
                         ret = set_timings_udma_ata4(&tl[0], speed);
@@ -817,7 +806,7 @@ static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed)
                         ret = -1;
         } else
                 set_timings_mdma(drive, pmif->kind, &tl[0], &tl[1], speed);
-#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
+
         if (ret)
                 return;
  
@@ -1008,9 +997,7 @@ static const struct ide_port_info pmac_port_info = {
         .chipset                = ide_pmac,
         .tp_ops                 = &pmac_tp_ops,
         .port_ops               = &pmac_ide_port_ops,
-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
         .dma_ops                = &pmac_dma_ops,
-#endif
         .host_flags             = IDE_HFLAG_SET_PIO_MODE_KEEP_DMA |
                                   IDE_HFLAG_POST_SET_MODE |
                                   IDE_HFLAG_MMIO |
@@ -1182,7 +1169,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)
         pmif->regbase = regbase;
         pmif->irq = irq;
         pmif->kauai_fcr = NULL;
-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
+
         if (macio_resource_count(mdev) >= 2) {
                 if (macio_request_resource(mdev, 1, "ide-pmac (dma)"))
                         printk(KERN_WARNING "ide-pmac: can't request DMA "
@@ -1192,7 +1179,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)
                         pmif->dma_regs = ioremap(macio_resource_start(mdev, 1), 0x1000);
         } else
                 pmif->dma_regs = NULL;
-#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
+
         dev_set_drvdata(&mdev->ofdev.dev, pmif);
  
         memset(&hw, 0, sizeof(hw));
@@ -1300,9 +1287,7 @@ pmac_ide_pci_attach(struct pci_dev *pdev, const struct pci_device_id *id)
  
         base = ioremap(rbase, rlen);
         pmif->regbase = (unsigned long) base + 0x2000;
-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
         pmif->dma_regs = base + 0x1000;
-#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
         pmif->kauai_fcr = base;
         pmif->irq = pdev->irq;
  
@@ -1434,8 +1419,6 @@ out:
         return error;
  }
  
-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
-
  /*
   * pmac_ide_build_dmatable builds the DBDMA command list
   * for a transfer and sets the DBDMA channel to point to it.
@@ -1723,13 +1706,6 @@ static int __devinit pmac_ide_init_dma(ide_hwif_t *hwif,
  
         return 0;
  }
-#else
-static int __devinit pmac_ide_init_dma(ide_hwif_t *hwif,
-                                      const struct ide_port_info *d)
-{
-       return -EOPNOTSUPP;
-}
-#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
  
  module_init(pmac_ide_probe);
  
diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c

index f1a8758e3a99f7d8b6953782c4150c35fefb8097..ec7f766ef5e44ff6387e962592c5a985282de4c9 100644 (file)
--- a/drivers/ide/sc1200.c
+++ b/drivers/ide/sc1200.c
@@ -104,11 +104,12 @@ static u8 sc1200_udma_filter(ide_drive_t *drive)
  {
         ide_hwif_t *hwif = drive->hwif;
         ide_drive_t *mate = ide_get_pair_dev(drive);
-       u16 *mateid = mate->id;
+       u16 *mateid;
         u8 mask = hwif->ultra_mask;
  
         if (mate == NULL)
                 goto out;
+       mateid = mate->id;
  
         if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) {
                 if ((mateid[ATA_ID_FIELD_VALID] & 4) &&
diff --git a/drivers/ide/sgiioc4.c b/drivers/ide/sgiioc4.c

index 7defa0ae2014b1f0ea8b1598c0b0f135bd24b0f7..a687a7dfea6fd849a3c79916ba5c8c7facfe8b7b 100644 (file)
--- a/drivers/ide/sgiioc4.c
+++ b/drivers/ide/sgiioc4.c
@@ -550,7 +550,7 @@ static const struct ide_dma_ops sgiioc4_dma_ops = {
         .dma_timeout            = ide_dma_timeout,
  };
  
-static const struct ide_port_info sgiioc4_port_info __devinitdata = {
+static const struct ide_port_info sgiioc4_port_info __devinitconst = {
         .name                   = DRV_NAME,
         .chipset                = ide_pci,
         .init_dma               = ide_dma_sgiioc4,
@@ -633,7 +633,7 @@ out:
         return ret;
  }
  
-int
+int __devinit
  ioc4_ide_attach_one(struct ioc4_driver_data *idd)
  {
         /* PCI-RT does not bring out IDE connection.
@@ -645,7 +645,7 @@ ioc4_ide_attach_one(struct ioc4_driver_data *idd)
         return pci_init_sgiioc4(idd->idd_pdev);
  }
  
-static struct ioc4_submodule ioc4_ide_submodule = {
+static struct ioc4_submodule __devinitdata ioc4_ide_submodule = {
         .is_name = "IOC4_ide",
         .is_owner = THIS_MODULE,
         .is_probe = ioc4_ide_attach_one,
diff --git a/drivers/ieee1394/highlevel.c b/drivers/ieee1394/highlevel.c

index 918ffc4fc8ace2923f660d452d6f389a488c8b25..272543a42a43b0478caf4879c3664782790bafc2 100644 (file)
--- a/drivers/ieee1394/highlevel.c
+++ b/drivers/ieee1394/highlevel.c
@@ -46,10 +46,6 @@ static DEFINE_RWLOCK(hl_irqs_lock);
  
  static DEFINE_RWLOCK(addr_space_lock);
  
-/* addr_space list will have zero and max already included as bounds */
-static struct hpsb_address_ops dummy_ops = { NULL, NULL, NULL, NULL };
-static struct hpsb_address_serve dummy_zero_addr, dummy_max_addr;
-
  
  static struct hl_host_info *hl_get_hostinfo(struct hpsb_highlevel *hl,
                                             struct hpsb_host *host)
@@ -481,20 +477,23 @@ int hpsb_unregister_addrspace(struct hpsb_highlevel *hl, struct hpsb_host *host,
         return retval;
  }
  
+static struct hpsb_address_ops dummy_ops;
+
+/* dummy address spaces as lower and upper bounds of the host's a.s. list */
  static void init_hpsb_highlevel(struct hpsb_host *host)
  {
-       INIT_LIST_HEAD(&dummy_zero_addr.host_list);
-       INIT_LIST_HEAD(&dummy_zero_addr.hl_list);
-       INIT_LIST_HEAD(&dummy_max_addr.host_list);
-       INIT_LIST_HEAD(&dummy_max_addr.hl_list);
+       INIT_LIST_HEAD(&host->dummy_zero_addr.host_list);
+       INIT_LIST_HEAD(&host->dummy_zero_addr.hl_list);
+       INIT_LIST_HEAD(&host->dummy_max_addr.host_list);
+       INIT_LIST_HEAD(&host->dummy_max_addr.hl_list);
  
-       dummy_zero_addr.op = dummy_max_addr.op = &dummy_ops;
+       host->dummy_zero_addr.op = host->dummy_max_addr.op = &dummy_ops;
  
-       dummy_zero_addr.start = dummy_zero_addr.end = 0;
-       dummy_max_addr.start = dummy_max_addr.end = ((u64) 1) << 48;
+       host->dummy_zero_addr.start = host->dummy_zero_addr.end = 0;
+       host->dummy_max_addr.start = host->dummy_max_addr.end = ((u64) 1) << 48;
  
-       list_add_tail(&dummy_zero_addr.host_list, &host->addr_space);
-       list_add_tail(&dummy_max_addr.host_list, &host->addr_space);
+       list_add_tail(&host->dummy_zero_addr.host_list, &host->addr_space);
+       list_add_tail(&host->dummy_max_addr.host_list, &host->addr_space);
  }
  
  void highlevel_add_host(struct hpsb_host *host)
diff --git a/drivers/ieee1394/hosts.h b/drivers/ieee1394/hosts.h

index e4e8aeb4d7788d2caf2ef7d5821dbf77a038c27d..dd229950acca4633b3f1d2952d8d40fed2e3ebd5 100644 (file)
--- a/drivers/ieee1394/hosts.h
+++ b/drivers/ieee1394/hosts.h
@@ -13,6 +13,7 @@ struct module;
  
  #include "ieee1394_types.h"
  #include "csr.h"
+#include "highlevel.h"
  
  struct hpsb_packet;
  struct hpsb_iso;
@@ -72,6 +73,9 @@ struct hpsb_host {
         struct { DECLARE_BITMAP(map, 64); } tl_pool[ALL_NODES];
  
         struct csr_control csr;
+
+       struct hpsb_address_serve dummy_zero_addr;
+       struct hpsb_address_serve dummy_max_addr;
  };
  
  enum devctl_cmd {
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c

index 9e39f73282ee6dd439e76647af5ab5c4755e711a..79ef5fd928ae42c0d8252f1d8bf07c479782be9c 100644 (file)
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -115,8 +115,14 @@ static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr, u16 length,
         return error;
  }
  
+#define OUI_FREECOM_TECHNOLOGIES_GMBH 0x0001db
+
  static int nodemgr_get_max_rom(quadlet_t *bus_info_data, void *__ci)
  {
+       /* Freecom FireWire Hard Drive firmware bug */
+       if (be32_to_cpu(bus_info_data[3]) >> 8 == OUI_FREECOM_TECHNOLOGIES_GMBH)
+               return 0;
+
         return (be32_to_cpu(bus_info_data[2]) >> 8) & 0x3;
  }
  
@@ -1685,6 +1691,7 @@ static int nodemgr_host_thread(void *data)
                 g = get_hpsb_generation(host);
                 for (i = 0; i < 4 ; i++) {
                         msleep_interruptible(63);
+                       try_to_freeze();
                         if (kthread_should_stop())
                                 goto exit;
  
@@ -1725,6 +1732,7 @@ static int nodemgr_host_thread(void *data)
                 /* Sleep 3 seconds */
                 for (i = 3000/200; i; i--) {
                         msleep_interruptible(200);
+                       try_to_freeze();
                         if (kthread_should_stop())
                                 goto exit;
  
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c

index c52f6e6e8af2a8bacac026e4f9974652ee794661..a373c18cf7b8fe8bd077c47b0808abea743e573f 100644 (file)
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -400,6 +400,11 @@ static const struct {
                 .model_id               = 0x000021,
                 .workarounds            = SBP2_WORKAROUND_FIX_CAPACITY,
         },
+       /* iPod mini */ {
+               .firmware_revision      = 0x0a2700,
+               .model_id               = 0x000022,
+               .workarounds            = SBP2_WORKAROUND_FIX_CAPACITY,
+       },
         /* iPod mini */ {
                 .firmware_revision      = 0x0a2700,
                 .model_id               = 0x000023,
@@ -890,12 +895,13 @@ static void sbp2_host_reset(struct hpsb_host *host)
                 return;
  
         read_lock_irqsave(&sbp2_hi_logical_units_lock, flags);
+
         list_for_each_entry(lu, &hi->logical_units, lu_list)
-               if (likely(atomic_read(&lu->state) !=
-                          SBP2LU_STATE_IN_SHUTDOWN)) {
-                       atomic_set(&lu->state, SBP2LU_STATE_IN_RESET);
+               if (atomic_cmpxchg(&lu->state,
+                                  SBP2LU_STATE_RUNNING, SBP2LU_STATE_IN_RESET)
+                   == SBP2LU_STATE_RUNNING)
                         scsi_block_requests(lu->shost);
-               }
+
         read_unlock_irqrestore(&sbp2_hi_logical_units_lock, flags);
  }
  
diff --git a/drivers/infiniband/hw/ehca/ehca_classes.h b/drivers/infiniband/hw/ehca/ehca_classes.h

index 4df887af66a527156a4ad9688e319bb308f36ebc..7fc35cf0cddf35285cd91586e6d1aa02145a6a00 100644 (file)
--- a/drivers/infiniband/hw/ehca/ehca_classes.h
+++ b/drivers/infiniband/hw/ehca/ehca_classes.h
@@ -163,7 +163,8 @@ struct ehca_mod_qp_parm {
  /* struct for tracking if cqes have been reported to the application */
  struct ehca_qmap_entry {
         u16 app_wr_id;
-       u16 reported;
+       u8 reported;
+       u8 cqe_req;
  };
  
  struct ehca_queue_map {
@@ -171,6 +172,7 @@ struct ehca_queue_map {
         unsigned int entries;
         unsigned int tail;
         unsigned int left_to_poll;
+       unsigned int next_wqe_idx;   /* Idx to first wqe to be flushed */
  };
  
  struct ehca_qp {
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c

index bb02a86aa5269d7b3c22a85aa23d1caaf0411e7e..bec7e0249358f6cb876729d9070c51d94f6e29e7 100644 (file)
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -994,8 +994,7 @@ static int ehca_mem_notifier(struct notifier_block *nb,
                         if (printk_timed_ratelimit(&ehca_dmem_warn_time,
                                                    30 * 1000))
                                 ehca_gen_err("DMEM operations are not allowed"
-                                            "as long as an ehca adapter is"
-                                            "attached to the LPAR");
+                                            "in conjunction with eHCA");
                         return NOTIFY_BAD;
                 }
         }
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c

index 9e05ee2db39baab87389049d7d2f479e8efe1a6a..cadbf0cdd910e996ddca5029e6a66dcbe27382a9 100644 (file)
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -435,9 +435,13 @@ static void reset_queue_map(struct ehca_queue_map *qmap)
  {
         int i;
  
-       qmap->tail = 0;
-       for (i = 0; i < qmap->entries; i++)
+       qmap->tail = qmap->entries - 1;
+       qmap->left_to_poll = 0;
+       qmap->next_wqe_idx = 0;
+       for (i = 0; i < qmap->entries; i++) {
                 qmap->map[i].reported = 1;
+               qmap->map[i].cqe_req = 0;
+       }
  }
  
  /*
@@ -1121,6 +1125,7 @@ static int calc_left_cqes(u64 wqe_p, struct ipz_queue *ipz_queue,
         void *wqe_v;
         u64 q_ofs;
         u32 wqe_idx;
+       unsigned int tail_idx;
  
         /* convert real to abs address */
         wqe_p = wqe_p & (~(1UL << 63));
@@ -1133,12 +1138,17 @@ static int calc_left_cqes(u64 wqe_p, struct ipz_queue *ipz_queue,
                 return -EFAULT;
         }
  
+       tail_idx = (qmap->tail + 1) % qmap->entries;
         wqe_idx = q_ofs / ipz_queue->qe_size;
-       if (wqe_idx < qmap->tail)
-               qmap->left_to_poll = (qmap->entries - qmap->tail) + wqe_idx;
-       else
-               qmap->left_to_poll = wqe_idx - qmap->tail;
  
+       /* check all processed wqes, whether a cqe is requested or not */
+       while (tail_idx != wqe_idx) {
+               if (qmap->map[tail_idx].cqe_req)
+                       qmap->left_to_poll++;
+               tail_idx = (tail_idx + 1) % qmap->entries;
+       }
+       /* save index in queue, where we have to start flushing */
+       qmap->next_wqe_idx = wqe_idx;
         return 0;
  }
  
@@ -1185,10 +1195,14 @@ static int check_for_left_cqes(struct ehca_qp *my_qp, struct ehca_shca *shca)
         } else {
                 spin_lock_irqsave(&my_qp->send_cq->spinlock, flags);
                 my_qp->sq_map.left_to_poll = 0;
+               my_qp->sq_map.next_wqe_idx = (my_qp->sq_map.tail + 1) %
+                                               my_qp->sq_map.entries;
                 spin_unlock_irqrestore(&my_qp->send_cq->spinlock, flags);
  
                 spin_lock_irqsave(&my_qp->recv_cq->spinlock, flags);
                 my_qp->rq_map.left_to_poll = 0;
+               my_qp->rq_map.next_wqe_idx = (my_qp->rq_map.tail + 1) %
+                                               my_qp->rq_map.entries;
                 spin_unlock_irqrestore(&my_qp->recv_cq->spinlock, flags);
         }
  
diff --git a/drivers/infiniband/hw/ehca/ehca_reqs.c b/drivers/infiniband/hw/ehca/ehca_reqs.c

index 64928079eafa93bc3a73b13aed73bd6ee57b80bb..00a648f4316c66b0f4585cfbf63db7792fee2c3d 100644 (file)
--- a/drivers/infiniband/hw/ehca/ehca_reqs.c
+++ b/drivers/infiniband/hw/ehca/ehca_reqs.c
@@ -179,6 +179,7 @@ static inline int ehca_write_swqe(struct ehca_qp *qp,
  
         qmap_entry->app_wr_id = get_app_wr_id(send_wr->wr_id);
         qmap_entry->reported = 0;
+       qmap_entry->cqe_req = 0;
  
         switch (send_wr->opcode) {
         case IB_WR_SEND:
@@ -203,8 +204,10 @@ static inline int ehca_write_swqe(struct ehca_qp *qp,
  
         if ((send_wr->send_flags & IB_SEND_SIGNALED ||
             qp->init_attr.sq_sig_type == IB_SIGNAL_ALL_WR)
-           && !hidden)
+           && !hidden) {
                 wqe_p->wr_flag |= WQE_WRFLAG_REQ_SIGNAL_COM;
+               qmap_entry->cqe_req = 1;
+       }
  
         if (send_wr->opcode == IB_WR_SEND_WITH_IMM ||
             send_wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM) {
@@ -569,6 +572,7 @@ static int internal_post_recv(struct ehca_qp *my_qp,
                 qmap_entry = &my_qp->rq_map.map[rq_map_idx];
                 qmap_entry->app_wr_id = get_app_wr_id(cur_recv_wr->wr_id);
                 qmap_entry->reported = 0;
+               qmap_entry->cqe_req = 1;
  
                 wqe_cnt++;
         } /* eof for cur_recv_wr */
@@ -706,27 +710,34 @@ repoll:
                 goto repoll;
         wc->qp = &my_qp->ib_qp;
  
+       qmap_tail_idx = get_app_wr_id(cqe->work_request_id);
+       if (!(cqe->w_completion_flags & WC_SEND_RECEIVE_BIT))
+               /* We got a send completion. */
+               qmap = &my_qp->sq_map;
+       else
+               /* We got a receive completion. */
+               qmap = &my_qp->rq_map;
+
+       /* advance the tail pointer */
+       qmap->tail = qmap_tail_idx;
+
         if (is_error) {
                 /*
                  * set left_to_poll to 0 because in error state, we will not
                  * get any additional CQEs
                  */
-               ehca_add_to_err_list(my_qp, 1);
+               my_qp->sq_map.next_wqe_idx = (my_qp->sq_map.tail + 1) %
+                                               my_qp->sq_map.entries;
                 my_qp->sq_map.left_to_poll = 0;
+               ehca_add_to_err_list(my_qp, 1);
  
+               my_qp->rq_map.next_wqe_idx = (my_qp->rq_map.tail + 1) %
+                                               my_qp->rq_map.entries;
+               my_qp->rq_map.left_to_poll = 0;
                 if (HAS_RQ(my_qp))
                         ehca_add_to_err_list(my_qp, 0);
-               my_qp->rq_map.left_to_poll = 0;
         }
  
-       qmap_tail_idx = get_app_wr_id(cqe->work_request_id);
-       if (!(cqe->w_completion_flags & WC_SEND_RECEIVE_BIT))
-               /* We got a send completion. */
-               qmap = &my_qp->sq_map;
-       else
-               /* We got a receive completion. */
-               qmap = &my_qp->rq_map;
-
         qmap_entry = &qmap->map[qmap_tail_idx];
         if (qmap_entry->reported) {
                 ehca_warn(cq->device, "Double cqe on qp_num=%#x",
@@ -738,10 +749,6 @@ repoll:
         wc->wr_id = replace_wr_id(cqe->work_request_id, qmap_entry->app_wr_id);
         qmap_entry->reported = 1;
  
-       /* this is a proper completion, we need to advance the tail pointer */
-       if (++qmap->tail == qmap->entries)
-               qmap->tail = 0;
-
         /* if left_to_poll is decremented to 0, add the QP to the error list */
         if (qmap->left_to_poll > 0) {
                 qmap->left_to_poll--;
@@ -805,13 +812,14 @@ static int generate_flush_cqes(struct ehca_qp *my_qp, struct ib_cq *cq,
         else
                 qmap = &my_qp->rq_map;
  
-       qmap_entry = &qmap->map[qmap->tail];
+       qmap_entry = &qmap->map[qmap->next_wqe_idx];
  
         while ((nr < num_entries) && (qmap_entry->reported == 0)) {
                 /* generate flush CQE */
+
                 memset(wc, 0, sizeof(*wc));
  
-               offset = qmap->tail * ipz_queue->qe_size;
+               offset = qmap->next_wqe_idx * ipz_queue->qe_size;
                 wqe = (struct ehca_wqe *)ipz_qeit_calc(ipz_queue, offset);
                 if (!wqe) {
                         ehca_err(cq->device, "Invalid wqe offset=%#lx on "
@@ -850,11 +858,12 @@ static int generate_flush_cqes(struct ehca_qp *my_qp, struct ib_cq *cq,
  
                 wc->qp = &my_qp->ib_qp;
  
-               /* mark as reported and advance tail pointer */
+               /* mark as reported and advance next_wqe pointer */
                 qmap_entry->reported = 1;
-               if (++qmap->tail == qmap->entries)
-                       qmap->tail = 0;
-               qmap_entry = &qmap->map[qmap->tail];
+               qmap->next_wqe_idx++;
+               if (qmap->next_wqe_idx == qmap->entries)
+                       qmap->next_wqe_idx = 0;
+               qmap_entry = &qmap->map[qmap->next_wqe_idx];
  
                 wc++; nr++;
         }
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c

index d0866a3636e257b402427588346bb9be28f35fbb..18308494a195bb0d4af1a068ddfd319a3f7b3488 100644 (file)
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -343,6 +343,7 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
  {
         struct mlx4_ib_dev *dev = to_mdev(ibcq->device);
         struct mlx4_ib_cq *cq = to_mcq(ibcq);
+       struct mlx4_mtt mtt;
         int outst_cqe;
         int err;
  
@@ -376,10 +377,13 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
                         goto out;
         }
  
+       mtt = cq->buf.mtt;
+
         err = mlx4_cq_resize(dev->dev, &cq->mcq, entries, &cq->resize_buf->buf.mtt);
         if (err)
                 goto err_buf;
  
+       mlx4_mtt_cleanup(dev->dev, &mtt);
         if (ibcq->uobject) {
                 cq->buf      = cq->resize_buf->buf;
                 cq->ibcq.cqe = cq->resize_buf->cqe;
@@ -406,6 +410,7 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
         goto out;
  
  err_buf:
+       mlx4_mtt_cleanup(dev->dev, &cq->resize_buf->buf.mtt);
         if (!ibcq->uobject)
                 mlx4_ib_free_cq_buf(dev, &cq->resize_buf->buf,
                                     cq->resize_buf->cqe);
diff --git a/drivers/isdn/hardware/avm/b1isa.c b/drivers/isdn/hardware/avm/b1isa.c

index 1e288eeb5e2a5679908ca0f9cbf79793b91e18b8..6461a32bc838af31dceb5ea4073c17c5f3c79e41 100644 (file)
--- a/drivers/isdn/hardware/avm/b1isa.c
+++ b/drivers/isdn/hardware/avm/b1isa.c
@@ -233,10 +233,8 @@ static void __exit b1isa_exit(void)
         int i;
  
         for (i = 0; i < MAX_CARDS; i++) {
-               if (!io[i])
-                       break;
-
-               b1isa_remove(&isa_dev[i]);
+               if (isa_dev[i].resource[0].start)
+                       b1isa_remove(&isa_dev[i]);
         }
         unregister_capi_driver(&capi_driver_b1isa);
  }
diff --git a/drivers/isdn/hysdn/hysdn_net.c b/drivers/isdn/hysdn/hysdn_net.c

index cfa8fa5e44ab5d1352eff43b3cc5407624ca80e1..3f2a0a20c19b040538ba23fcce7d3d346d2e0f89 100644 (file)
--- a/drivers/isdn/hysdn/hysdn_net.c
+++ b/drivers/isdn/hysdn/hysdn_net.c
@@ -83,12 +83,12 @@ net_open(struct net_device *dev)
  
         /* Fill in the MAC-level header (if not already set) */
         if (!card->mac_addr[0]) {
-               for (i = 0; i < ETH_ALEN - sizeof(unsigned long); i++)
+               for (i = 0; i < ETH_ALEN; i++)
                         dev->dev_addr[i] = 0xfc;
                 if ((in_dev = dev->ip_ptr) != NULL) {
                         struct in_ifaddr *ifa = in_dev->ifa_list;
                         if (ifa != NULL)
-                               memcpy(dev->dev_addr + (ETH_ALEN - sizeof(unsigned long)), &ifa->ifa_local, sizeof(unsigned long));
+                               memcpy(dev->dev_addr + (ETH_ALEN - sizeof(ifa->ifa_local)), &ifa->ifa_local, sizeof(ifa->ifa_local));
                 }
         } else
                 memcpy(dev->dev_addr, card->mac_addr, ETH_ALEN);
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c

index ac89a5deaca2e12fa62ccb78f1d62b088039675c..ab7c8e4a61f943c516ae5a3534e8775c33180f6b 100644 (file)
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -208,15 +208,18 @@ static void bitmap_checkfree(struct bitmap *bitmap, unsigned long page)
   */
  
  /* IO operations when bitmap is stored near all superblocks */
-static struct page *read_sb_page(mddev_t *mddev, long offset, unsigned long index)
+static struct page *read_sb_page(mddev_t *mddev, long offset,
+                                struct page *page,
+                                unsigned long index, int size)
  {
         /* choose a good rdev and read the page from there */
  
         mdk_rdev_t *rdev;
         struct list_head *tmp;
-       struct page *page = alloc_page(GFP_KERNEL);
         sector_t target;
  
+       if (!page)
+               page = alloc_page(GFP_KERNEL);
         if (!page)
                 return ERR_PTR(-ENOMEM);
  
@@ -227,7 +230,9 @@ static struct page *read_sb_page(mddev_t *mddev, long offset, unsigned long inde
  
                 target = rdev->sb_start + offset + index * (PAGE_SIZE/512);
  
-               if (sync_page_io(rdev->bdev, target, PAGE_SIZE, page, READ)) {
+               if (sync_page_io(rdev->bdev, target,
+                                roundup(size, bdev_hardsect_size(rdev->bdev)),
+                                page, READ)) {
                         page->index = index;
                         attach_page_buffers(page, NULL); /* so that free_buffer will
                                                           * quietly no-op */
@@ -544,7 +549,9 @@ static int bitmap_read_sb(struct bitmap *bitmap)
  
                 bitmap->sb_page = read_page(bitmap->file, 0, bitmap, bytes);
         } else {
-               bitmap->sb_page = read_sb_page(bitmap->mddev, bitmap->offset, 0);
+               bitmap->sb_page = read_sb_page(bitmap->mddev, bitmap->offset,
+                                              NULL,
+                                              0, sizeof(bitmap_super_t));
         }
         if (IS_ERR(bitmap->sb_page)) {
                 err = PTR_ERR(bitmap->sb_page);
@@ -957,11 +964,16 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start)
                                  */
                                 page = bitmap->sb_page;
                                 offset = sizeof(bitmap_super_t);
+                               read_sb_page(bitmap->mddev, bitmap->offset,
+                                            page,
+                                            index, count);
                         } else if (file) {
                                 page = read_page(file, index, bitmap, count);
                                 offset = 0;
                         } else {
-                               page = read_sb_page(bitmap->mddev, bitmap->offset, index);
+                               page = read_sb_page(bitmap->mddev, bitmap->offset,
+                                                   NULL,
+                                                   index, count);
                                 offset = 0;
                         }
                         if (IS_ERR(page)) { /* read error */
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c

index a63161aec48750ef51feb6e6e506c7ff83044dc0..04e5fd742c2c29e42fbba920e1303b889229ccf7 100644 (file)
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -668,7 +668,7 @@ static void check_for_valid_limits(struct io_restrictions *rs)
         if (!rs->max_segment_size)
                 rs->max_segment_size = MAX_SEGMENT_SIZE;
         if (!rs->seg_boundary_mask)
-               rs->seg_boundary_mask = -1;
+               rs->seg_boundary_mask = BLK_SEG_BOUNDARY_MASK;
         if (!rs->bounce_pfn)
                 rs->bounce_pfn = -1;
  }
diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig

index 73dc2ee9b014021a5681d83be1badd96802010bc..b34301d56cd2859f7b248ee0df8c7899317d59d5 100644 (file)
--- a/drivers/media/dvb/b2c2/Kconfig
+++ b/drivers/media/dvb/b2c2/Kconfig
@@ -9,11 +9,11 @@ config DVB_B2C2_FLEXCOP
         select DVB_STV0297 if !DVB_FE_CUSTOMISE
         select DVB_BCM3510 if !DVB_FE_CUSTOMISE
         select DVB_LGDT330X if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
         select DVB_S5H1420 if !DVB_FE_CUSTOMISE
         select DVB_TUNER_ITD1000 if !DVB_FE_CUSTOMISE
         select DVB_ISL6421 if !DVB_FE_CUSTOMISE
         select DVB_CX24123 if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
         help
           Support for the digital TV receiver chip made by B2C2 Inc. included in
           Technisats PCI cards and USB boxes.
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c

index a127a4175c402a45c1940d7dec586762557544b5..5cded370854167b2d3db6ffec80e7914ad7437f1 100644 (file)
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -628,12 +628,14 @@ int flexcop_frontend_init(struct flexcop_device *fc)
         }
  
         /* try the cable dvb (stv0297) */
+       fc->fc_i2c_adap[0].no_base_addr = 1;
         fc->fe = dvb_attach(stv0297_attach, &alps_tdee4_stv0297_config, i2c);
         if (fc->fe != NULL) {
                 fc->dev_type = FC_CABLE;
                 fc->fe->ops.tuner_ops.set_params = alps_tdee4_stv0297_tuner_set_params;
                 goto fe_found;
         }
+       fc->fc_i2c_adap[0].no_base_addr = 0;
  
         /* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */
         fc->fe = dvb_attach(mt312_attach,
diff --git a/drivers/media/dvb/b2c2/flexcop-i2c.c b/drivers/media/dvb/b2c2/flexcop-i2c.c

index 43a112ec6d44f146b260c64cf12446d036e1283a..f13783f08f0f4e09bd054c38806792e1289af3a4 100644 (file)
--- a/drivers/media/dvb/b2c2/flexcop-i2c.c
+++ b/drivers/media/dvb/b2c2/flexcop-i2c.c
@@ -47,8 +47,12 @@ static int flexcop_i2c_read4(struct flexcop_i2c_adapter *i2c,
         int len = r100.tw_sm_c_100.total_bytes, /* remember total_bytes is buflen-1 */
                 ret;
  
-       r100.tw_sm_c_100.no_base_addr_ack_error = i2c->no_base_addr;
         ret = flexcop_i2c_operation(i2c->fc, &r100);
+       if (ret != 0) {
+               deb_i2c("Retrying operation\n");
+               r100.tw_sm_c_100.no_base_addr_ack_error = i2c->no_base_addr;
+               ret = flexcop_i2c_operation(i2c->fc, &r100);
+       }
         if (ret != 0) {
                 deb_i2c("read failed. %d\n", ret);
                 return ret;
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig

index 7e9c090fc04ea9ae2e7273890fce6f5c04241db1..27edb0ece58752b0617f9bdb2bd26ef05500f510 100644 (file)
--- a/drivers/media/dvb/bt8xx/Kconfig
+++ b/drivers/media/dvb/bt8xx/Kconfig
@@ -8,7 +8,7 @@ config DVB_BT8XX
         select DVB_OR51211 if !DVB_FE_CUSTOMISE
         select DVB_LGDT330X if !DVB_FE_CUSTOMISE
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
         help
           Support for PCI cards based on the Bt8xx PCI bridge. Examples are
           the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards,
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c

index 14e627ef6465f28dc88fc07bd5bd6c5c8e1e40af..c1d92f838ca83ba608bd28678709bf9a5afa7be1 100644 (file)
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -376,7 +376,7 @@ static void dm1105dvb_dma_unmap(struct dm1105dvb *dm1105dvb)
         pci_free_consistent(dm1105dvb->pdev, 6*DM1105_DMA_BYTES, dm1105dvb->ts_buf, dm1105dvb->dma_addr);
  }
  
-static void __devinit dm1105dvb_enable_irqs(struct dm1105dvb *dm1105dvb)
+static void dm1105dvb_enable_irqs(struct dm1105dvb *dm1105dvb)
  {
         outb(INTMAK_ALLMASK, dm_io_mem(DM1105_INTMAK));
         outb(1, dm_io_mem(DM1105_CR));
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c

index 8557bf12cfb46f98893a0ed770e58e8e74ad321d..7a421e9dba5aeef3e0ee51036dfe327359fbd273 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -585,6 +585,8 @@ restart:
                 if (fe->ops.set_voltage)
                         fe->ops.set_voltage(fe, SEC_VOLTAGE_OFF);
                 if (fe->ops.tuner_ops.sleep) {
+                       if (fe->ops.i2c_gate_ctrl)
+                               fe->ops.i2c_gate_ctrl(fe, 1);
                         fe->ops.tuner_ops.sleep(fe);
                         if (fe->ops.i2c_gate_ctrl)
                                 fe->ops.i2c_gate_ctrl(fe, 0);
@@ -934,7 +936,8 @@ void dtv_property_dump(struct dtv_property *tvp)
  int is_legacy_delivery_system(fe_delivery_system_t s)
  {
         if((s == SYS_UNDEFINED) || (s == SYS_DVBC_ANNEX_AC) ||
-               (s == SYS_DVBC_ANNEX_B) || (s == SYS_DVBT) || (s == SYS_DVBS))
+          (s == SYS_DVBC_ANNEX_B) || (s == SYS_DVBT) || (s == SYS_DVBS) ||
+          (s == SYS_ATSC))
                 return 1;
  
         return 0;
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig

index 62b68c291d9968636ebe62a2a1605afc9a712d38..49f7b20c25d6f134f883d5c3c1e15cbebeb5a547 100644 (file)
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -24,8 +24,8 @@ config DVB_USB_A800
         tristate "AVerMedia AverTV DVB-T USB 2.0 (A800)"
         depends on DVB_USB
         select DVB_DIB3000MC
-       select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
         select DVB_PLL if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to support the AVerMedia AverTV DVB-T USB 2.0 (A800) receiver.
  
@@ -34,7 +34,7 @@ config DVB_USB_DIBUSB_MB
         depends on DVB_USB
         select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_DIB3000MB
-       select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
         help
           Support for USB 1.1 and 2.0 DVB-T receivers based on reference designs made by
           DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-B demodulator.
@@ -55,7 +55,7 @@ config DVB_USB_DIBUSB_MC
         tristate "DiBcom USB DVB-T devices (based on the DiB3000M-C/P) (see help for device list)"
         depends on DVB_USB
         select DVB_DIB3000MC
-       select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
         help
           Support for USB2.0 DVB-T receivers based on reference designs made by
           DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-C/P demodulator.
@@ -73,11 +73,11 @@ config DVB_USB_DIB0700
         select DVB_DIB7000M
         select DVB_DIB3000MC
         select DVB_S5H1411 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_MT2266 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE
         select DVB_TUNER_DIB0070
+       select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
+       select MEDIA_TUNER_MT2266 if !MEDIA_TUNER_CUSTOMIZE
+       select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE
+       select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE
         help
           Support for USB2.0/1.1 DVB receivers based on the DiB0700 USB bridge. The
           USB bridge is also present in devices having the DiB7700 DVB-T-USB
@@ -95,7 +95,7 @@ config DVB_USB_UMT_010
         depends on DVB_USB
         select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_DIB3000MC
-       select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to support the HanfTek UMT-010 USB2.0 stick-sized DVB-T receiver.
  
@@ -107,11 +107,11 @@ config DVB_USB_CXUSB
         select DVB_LGDT330X if !DVB_FE_CUSTOMISE
         select DVB_MT352 if !DVB_FE_CUSTOMISE
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE
         select DVB_DIB7000P if !DVB_FE_CUSTOMISE
         select DVB_TUNER_DIB0070 if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
+       select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE
+       select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to support the Conexant USB2.0 hybrid reference design.
           Currently, only DVB and ATSC modes are supported, analog mode
@@ -124,9 +124,9 @@ config DVB_USB_M920X
         tristate "Uli m920x DVB-T USB2.0 support"
         depends on DVB_USB
         select DVB_MT352 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE
         select DVB_TDA1004X if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE
+       select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to support the MSI Mega Sky 580 USB2.0 DVB-T receiver.
           Currently, only devices with a product id of
@@ -137,7 +137,7 @@ config DVB_USB_GL861
         tristate "Genesys Logic GL861 USB2.0 support"
         depends on DVB_USB
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to support the MSI Megasky 580 (55801) DVB-T USB2.0
           receiver with USB ID 0db0:5581.
@@ -146,7 +146,7 @@ config DVB_USB_AU6610
         tristate "Alcor Micro AU6610 USB2.0 support"
         depends on DVB_USB
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to support the Sigmatek DVB-110 DVB-T USB2.0 receiver.
  
@@ -198,8 +198,8 @@ config DVB_USB_NOVA_T_USB2
         tristate "Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 support"
         depends on DVB_USB
         select DVB_DIB3000MC
-       select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
         select DVB_PLL if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver.
  
@@ -235,8 +235,8 @@ config DVB_USB_OPERA1
  config DVB_USB_AF9005
         tristate "Afatech AF9005 DVB-T USB1.1 support"
         depends on DVB_USB && EXPERIMENTAL
-       select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
+       select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to support the Afatech AF9005 based DVB-T USB1.1 receiver
           and the TerraTec Cinergy T USB XE (Rev.1)
@@ -284,7 +284,7 @@ config DVB_USB_DTV5100
         tristate "AME DTV-5100 USB2.0 DVB-T support"
         depends on DVB_USB
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to support the AME DTV-5100 USB2.0 DVB-T receiver.
  
@@ -293,9 +293,9 @@ config DVB_USB_AF9015
         depends on DVB_USB && EXPERIMENTAL
         select DVB_AF9013
         select DVB_PLL              if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_MT2060   if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_QT1010   if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_MT2060   if !MEDIA_TUNER_CUSTOMIZE
+       select MEDIA_TUNER_QT1010   if !MEDIA_TUNER_CUSTOMIZE
+       select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMIZE
+       select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to support the Afatech AF9015 based DVB-T USB2.0 receiver
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c

index 847d8fdd9ec4deeb60a382a33a9dd8024ec51403..e9ab0249d13305435715bc5b4b7c03d9d9aef888 100644 (file)
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -681,12 +681,6 @@ static int af9015_download_firmware(struct usb_device *udev,
                 goto error;
         }
  
-       /* firmware is running, reconnect device in the usb bus */
-       req.cmd = RECONNECT_USB;
-       ret = af9015_rw_udev(udev, &req);
-       if (ret)
-               err("reconnect failed: %d", ret);
-
  error:
         return ret;
  }
@@ -1208,6 +1202,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                 .usb_ctrl = DEVICE_SPECIFIC,
                 .download_firmware = af9015_download_firmware,
                 .firmware = "dvb-usb-af9015.fw",
+               .no_reconnect = 1,
  
                 .size_of_priv = sizeof(struct af9015_state), \
  
@@ -1306,6 +1301,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                 .usb_ctrl = DEVICE_SPECIFIC,
                 .download_firmware = af9015_download_firmware,
                 .firmware = "dvb-usb-af9015.fw",
+               .no_reconnect = 1,
  
                 .size_of_priv = sizeof(struct af9015_state), \
  
diff --git a/drivers/media/dvb/dvb-usb/dib0700.h b/drivers/media/dvb/dvb-usb/dib0700.h

index 739193943c17ccbabe5c6af9c1b4a1e3d77c4cc8..8b544fe79b0de11842f883c48dc041f9889a968b 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dib0700.h
+++ b/drivers/media/dvb/dvb-usb/dib0700.h
@@ -22,7 +22,7 @@ extern int dvb_usb_dib0700_debug;
  
  #define REQUEST_I2C_READ     0x2
  #define REQUEST_I2C_WRITE    0x3
-#define REQUEST_POLL_RC      0x4
+#define REQUEST_POLL_RC      0x4 /* deprecated in firmware v1.20 */
  #define REQUEST_JUMPRAM      0x8
  #define REQUEST_SET_CLOCK    0xB
  #define REQUEST_SET_GPIO     0xC
@@ -40,11 +40,14 @@ struct dib0700_state {
         u16 mt2060_if1[2];
         u8 rc_toggle;
         u8 rc_counter;
+       u8 rc_func_version;
         u8 is_dib7000pc;
         u8 fw_use_new_i2c_api;
         u8 disable_streaming_master_mode;
  };
  
+extern int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion,
+                              u32 *romversion, u32 *ramversion, u32 *fwtype);
  extern int dib0700_set_gpio(struct dvb_usb_device *, enum dib07x0_gpios gpio, u8 gpio_dir, u8 gpio_val);
  extern int dib0700_ctrl_clock(struct dvb_usb_device *d, u32 clk_MHz, u8 clock_out_gp3);
  extern int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen);
diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c

index dd53cee3896de0d3857569ce08af9d39bc9d308d..200b215f4d8b37f2441bd058b7f9b06f5cb25086 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dib0700_core.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_core.c
@@ -19,6 +19,22 @@ MODULE_PARM_DESC(dvb_usb_dib0700_ir_proto, "set ir protocol (0=NEC, 1=RC5 (defau
  
  DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
  
+
+int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion,
+                       u32 *romversion, u32 *ramversion, u32 *fwtype)
+{
+       u8 b[16];
+       int ret = usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0),
+                                 REQUEST_GET_VERSION,
+                                 USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
+                                 b, sizeof(b), USB_CTRL_GET_TIMEOUT);
+       *hwversion  = (b[0] << 24)  | (b[1] << 16)  | (b[2] << 8)  | b[3];
+       *romversion = (b[4] << 24)  | (b[5] << 16)  | (b[6] << 8)  | b[7];
+       *ramversion = (b[8] << 24)  | (b[9] << 16)  | (b[10] << 8) | b[11];
+       *fwtype     = (b[12] << 24) | (b[13] << 16) | (b[14] << 8) | b[15];
+       return ret;
+}
+
  /* expecting rx buffer: request data[0] data[1] ... data[2] */
  static int dib0700_ctrl_wr(struct dvb_usb_device *d, u8 *tx, u8 txlen)
  {
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c

index 0cfccc24b1907acad9d4db7ea6f3d77b5a6e7a1a..3917327889117bcff8cf27f315c8a3d70fcb27c7 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -38,6 +38,7 @@ static struct mt2060_config bristol_mt2060_config[2] = {
         }
  };
  
+
  static struct dibx000_agc_config bristol_dib3000p_mt2060_agc_config = {
         .band_caps = BAND_VHF | BAND_UHF,
         .setup     = (1 << 8) | (5 << 5) | (0 << 4) | (0 << 3) | (0 << 2) | (2 << 0),
@@ -445,14 +446,19 @@ static int stk7700ph_tuner_attach(struct dvb_usb_adapter *adap)
                 == NULL ? -ENODEV : 0;
  }
  
-#define DEFAULT_RC_INTERVAL 150
+#define DEFAULT_RC_INTERVAL 50
  
  static u8 rc_request[] = { REQUEST_POLL_RC, 0 };
  
  /* Number of keypresses to ignore before start repeating */
-#define RC_REPEAT_DELAY 2
+#define RC_REPEAT_DELAY 6
+#define RC_REPEAT_DELAY_V1_20 10
  
-static int dib0700_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+
+
+/* Used by firmware versions < 1.20 (deprecated) */
+static int dib0700_rc_query_legacy(struct dvb_usb_device *d, u32 *event,
+                                  int *state)
  {
         u8 key[4];
         int i;
@@ -529,6 +535,137 @@ static int dib0700_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
         return 0;
  }
  
+/* This is the structure of the RC response packet starting in firmware 1.20 */
+struct dib0700_rc_response {
+       u8 report_id;
+       u8 data_state;
+       u8 system_msb;
+       u8 system_lsb;
+       u8 data;
+       u8 not_data;
+};
+
+/* This supports the new IR response format for firmware v1.20 */
+static int dib0700_rc_query_v1_20(struct dvb_usb_device *d, u32 *event,
+                                 int *state)
+{
+       struct dvb_usb_rc_key *keymap = d->props.rc_key_map;
+       struct dib0700_state *st = d->priv;
+       struct dib0700_rc_response poll_reply;
+       u8 buf[6];
+       int i;
+       int status;
+       int actlen;
+       int found = 0;
+
+       /* Set initial results in case we exit the function early */
+       *event = 0;
+       *state = REMOTE_NO_KEY_PRESSED;
+
+       /* Firmware v1.20 provides RC data via bulk endpoint 1 */
+       status = usb_bulk_msg(d->udev, usb_rcvbulkpipe(d->udev, 1), buf,
+                             sizeof(buf), &actlen, 50);
+       if (status < 0) {
+               /* No data available (meaning no key press) */
+               return 0;
+       }
+
+       if (actlen != sizeof(buf)) {
+               /* We didn't get back the 6 byte message we expected */
+               err("Unexpected RC response size [%d]", actlen);
+               return -1;
+       }
+
+       poll_reply.report_id  = buf[0];
+       poll_reply.data_state = buf[1];
+       poll_reply.system_msb = buf[2];
+       poll_reply.system_lsb = buf[3];
+       poll_reply.data       = buf[4];
+       poll_reply.not_data   = buf[5];
+
+       /*
+       info("rid=%02x ds=%02x sm=%02x sl=%02x d=%02x nd=%02x\n",
+            poll_reply.report_id, poll_reply.data_state,
+            poll_reply.system_msb, poll_reply.system_lsb,
+            poll_reply.data, poll_reply.not_data);
+       */
+
+       if ((poll_reply.data + poll_reply.not_data) != 0xff) {
+               /* Key failed integrity check */
+               err("key failed integrity check: %02x %02x %02x %02x",
+                   poll_reply.system_msb, poll_reply.system_lsb,
+                   poll_reply.data, poll_reply.not_data);
+               return -1;
+       }
+
+       /* Find the key in the map */
+       for (i = 0; i < d->props.rc_key_map_size; i++) {
+               if (keymap[i].custom == poll_reply.system_lsb &&
+                   keymap[i].data == poll_reply.data) {
+                       *event = keymap[i].event;
+                       found = 1;
+                       break;
+               }
+       }
+
+       if (found == 0) {
+               err("Unknown remote controller key: %02x %02x %02x %02x",
+                   poll_reply.system_msb, poll_reply.system_lsb,
+                   poll_reply.data, poll_reply.not_data);
+               d->last_event = 0;
+               return 0;
+       }
+
+       if (poll_reply.data_state == 1) {
+               /* New key hit */
+               st->rc_counter = 0;
+               *event = keymap[i].event;
+               *state = REMOTE_KEY_PRESSED;
+               d->last_event = keymap[i].event;
+       } else if (poll_reply.data_state == 2) {
+               /* Key repeated */
+               st->rc_counter++;
+
+               /* prevents unwanted double hits */
+               if (st->rc_counter > RC_REPEAT_DELAY_V1_20) {
+                       *event = d->last_event;
+                       *state = REMOTE_KEY_PRESSED;
+                       st->rc_counter = RC_REPEAT_DELAY_V1_20;
+               }
+       } else {
+               err("Unknown data state [%d]", poll_reply.data_state);
+       }
+
+       return 0;
+}
+
+static int dib0700_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+{
+       struct dib0700_state *st = d->priv;
+
+       /* Because some people may have improperly named firmware files,
+          let's figure out whether to use the new firmware call or the legacy
+          call based on the firmware version embedded in the file */
+       if (st->rc_func_version == 0) {
+               u32 hwver, romver, ramver, fwtype;
+               int ret = dib0700_get_version(d, &hwver, &romver, &ramver,
+                                             &fwtype);
+               if (ret < 0) {
+                       err("Could not determine version info");
+                       return -1;
+               }
+               if (ramver < 0x10200)
+                       st->rc_func_version = 1;
+               else
+                       st->rc_func_version = 2;
+       }
+
+       if (st->rc_func_version == 2)
+               return dib0700_rc_query_v1_20(d, event, state);
+       else
+               return dib0700_rc_query_legacy(d, event, state);
+}
+
  static struct dvb_usb_rc_key dib0700_rc_keys[] = {
         /* Key codes for the tiny Pinnacle remote*/
         { 0x07, 0x00, KEY_MUTE },
diff --git a/drivers/media/dvb/dvb-usb/usb-urb.c b/drivers/media/dvb/dvb-usb/usb-urb.c

index 397f51a7b2ada50abe6078540f6f37ae25edef85..da93b9e982c04e3c67dbc0db671d43ca313a41ee 100644 (file)
--- a/drivers/media/dvb/dvb-usb/usb-urb.c
+++ b/drivers/media/dvb/dvb-usb/usb-urb.c
@@ -135,7 +135,7 @@ stream->buf_list[stream->buf_num], (long long)stream->dma_addr[stream->buf_num])
  
  static int usb_bulk_urb_init(struct usb_data_stream *stream)
  {
-       int i;
+       int i, j;
  
         if ((i = usb_allocate_stream_buffers(stream,stream->props.count,
                                         stream->props.u.bulk.buffersize)) < 0)
@@ -143,9 +143,13 @@ static int usb_bulk_urb_init(struct usb_data_stream *stream)
  
         /* allocate the URBs */
         for (i = 0; i < stream->props.count; i++) {
-               if ((stream->urb_list[i] = usb_alloc_urb(0,GFP_ATOMIC)) == NULL)
+               stream->urb_list[i] = usb_alloc_urb(0, GFP_ATOMIC);
+               if (!stream->urb_list[i]) {
+                       deb_mem("not enough memory for urb_alloc_urb!.\n");
+                       for (j = 0; j < i; j++)
+                               usb_free_urb(stream->urb_list[i]);
                         return -ENOMEM;
-
+               }
                 usb_fill_bulk_urb( stream->urb_list[i], stream->udev,
                                 usb_rcvbulkpipe(stream->udev,stream->props.endpoint),
                                 stream->buf_list[i],
@@ -170,9 +174,14 @@ static int usb_isoc_urb_init(struct usb_data_stream *stream)
         for (i = 0; i < stream->props.count; i++) {
                 struct urb *urb;
                 int frame_offset = 0;
-               if ((stream->urb_list[i] =
-                                       usb_alloc_urb(stream->props.u.isoc.framesperurb,GFP_ATOMIC)) == NULL)
+
+               stream->urb_list[i] = usb_alloc_urb(stream->props.u.isoc.framesperurb, GFP_ATOMIC);
+               if (!stream->urb_list[i]) {
+                       deb_mem("not enough memory for urb_alloc_urb!\n");
+                       for (j = 0; j < i; j++)
+                               usb_free_urb(stream->urb_list[i]);
                         return -ENOMEM;
+               }
  
                 urb = stream->urb_list[i];
  
diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c

index 6f9b773604401309191704207a0035cc0892029a..e98d6caf2c233843bad9018842bd87d64cb2170b 100644 (file)
--- a/drivers/media/dvb/siano/sms-cards.c
+++ b/drivers/media/dvb/siano/sms-cards.c
@@ -95,7 +95,7 @@ static struct sms_board sms_boards[] = {
         [SMS1XXX_BOARD_HAUPPAUGE_WINDHAM] = {
                 .name   = "Hauppauge WinTV MiniStick",
                 .type   = SMS_NOVA_B0,
-               .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-01.fw",
+               .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw",
         },
  };
  
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig

index 867027ceab3e71d29ce43b3944104043670eeb99..401a04effc06817befbc4d6772565c430648d78a 100644 (file)
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -106,7 +106,7 @@ config DVB_BUDGET_CI
         select DVB_TDA1004X if !DVB_FE_CUSTOMISE
         select DVB_LNBP21 if !DVB_FE_CUSTOMISE
         select DVB_TDA10023 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE
         select VIDEO_IR
         help
           Support for simple SAA7146 based DVB cards
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c

index 66ab0c6e9783da4f8a99cca3699c3a32dd51ec58..4a3f2b8ea37d448a6cb0f062cc089e2d63114ff7 100644 (file)
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -808,6 +808,12 @@ static int ttusb_alloc_iso_urbs(struct ttusb *ttusb)
                                                  ISO_BUF_COUNT,
                                                  &ttusb->iso_dma_handle);
  
+       if (!ttusb->iso_buffer) {
+               dprintk("%s: pci_alloc_consistent - not enough memory\n",
+                       __func__);
+               return -ENOMEM;
+       }
+
         memset(ttusb->iso_buffer, 0,
                ISO_FRAME_SIZE * FRAMES_PER_ISO_BUF * ISO_BUF_COUNT);
  
@@ -1659,7 +1665,14 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
  
         ttusb_setup_interfaces(ttusb);
  
-       ttusb_alloc_iso_urbs(ttusb);
+       result = ttusb_alloc_iso_urbs(ttusb);
+       if (result < 0) {
+               dprintk("%s: ttusb_alloc_iso_urbs - failed\n", __func__);
+               mutex_unlock(&ttusb->semi2c);
+               kfree(ttusb);
+               return result;
+       }
+
         if (ttusb_init_controller(ttusb))
                 printk("ttusb_init_controller: error\n");
  
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c

index ab33fec8a19fbcef75855786f5dadc44c2bf721f..0aa96df80fc2bad8337263e1c23cc9b234f78885 100644 (file)
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -1157,6 +1157,12 @@ static int ttusb_dec_alloc_iso_urbs(struct ttusb_dec *dec)
                                                 ISO_BUF_COUNT),
                                                &dec->iso_dma_handle);
  
+       if (!dec->iso_buffer) {
+               dprintk("%s: pci_alloc_consistent - not enough memory\n",
+                       __func__);
+               return -ENOMEM;
+       }
+
         memset(dec->iso_buffer, 0,
                ISO_FRAME_SIZE * (FRAMES_PER_ISO_BUF * ISO_BUF_COUNT));
  
@@ -1254,6 +1260,7 @@ static int ttusb_dec_init_usb(struct ttusb_dec *dec)
                 dec->irq_buffer = usb_buffer_alloc(dec->udev,IRQ_PACKET_SIZE,
                                         GFP_ATOMIC, &dec->irq_dma_handle);
                 if(!dec->irq_buffer) {
+                       usb_free_urb(dec->irq_urb);
                         return -ENOMEM;
                 }
                 usb_fill_int_urb(dec->irq_urb, dec->udev,dec->irq_pipe,
diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c

index e6ca4012b5f0f78fab90212e546aa1b6f0cd4946..0ea85a05e5c0d86911d9a62fe3445e472cf1e877 100644 (file)
--- a/drivers/media/video/compat_ioctl32.c
+++ b/drivers/media/video/compat_ioctl32.c
@@ -831,7 +831,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
  {
         int ret = -ENOIOCTLCMD;
  
-       if (!file->f_op->ioctl)
+       if (!file->f_op->ioctl && !file->f_op->unlocked_ioctl)
                 return ret;
  
         switch (cmd) {
diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig

index ef48565de7f1b7c5fdcd61e69fdb6e78b9ca9f83..8940b5387decc4fda02d8f41a3a86189d2380803 100644 (file)
--- a/drivers/media/video/cx18/Kconfig
+++ b/drivers/media/video/cx18/Kconfig
@@ -9,7 +9,7 @@ config VIDEO_CX18
         select VIDEO_CX2341X
         select VIDEO_CS5345
         select DVB_S5H1409 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMIZE
         ---help---
           This is a video4linux driver for Conexant cx23418 based
           PCI combo video recorder devices.
diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig

index 8c1b7fa47a41cc36f35d3f4c763ff65c190e792c..00f1e2e8889e7fe23431827e17ce9f8b862d2714 100644 (file)
--- a/drivers/media/video/cx23885/Kconfig
+++ b/drivers/media/video/cx23885/Kconfig
@@ -11,16 +11,16 @@ config VIDEO_CX23885
         select VIDEO_CX25840
         select VIDEO_CX2341X
         select DVB_DIB7000P if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_MT2131 if !DVB_FE_CUSTOMISE
         select DVB_S5H1409 if !DVB_FE_CUSTOMISE
         select DVB_S5H1411 if !DVB_FE_CUSTOMISE
         select DVB_LGDT330X if !DVB_FE_CUSTOMISE
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
+       select DVB_TDA10048 if !DVB_FE_CUSTOMIZE
+       select MEDIA_TUNER_MT2131 if !MEDIA_TUNER_CUSTOMIZE
         select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMIZE
         select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE
         select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE
         select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE
-       select DVB_TDA10048 if !DVB_FE_CUSTOMIZE
         ---help---
           This is a video4linux driver for Conexant 23885 based
           TV cards.
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig

index 0b9e5fac6239f5783e0f42e24f8eb9d1c700dfed..b0f837588e01ee9bb5a8d4c14f7617958a33be19 100644 (file)
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -56,12 +56,12 @@ config VIDEO_CX88_DVB
         select DVB_NXT200X if !DVB_FE_CUSTOMISE
         select DVB_CX24123 if !DVB_FE_CUSTOMISE
         select DVB_ISL6421 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
         select DVB_S5H1411 if !DVB_FE_CUSTOMISE
         select DVB_CX24116 if !DVB_FE_CUSTOMISE
         select DVB_STV0299 if !DVB_FE_CUSTOMISE
         select DVB_STV0288 if !DVB_FE_CUSTOMISE
         select DVB_STB6000 if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
         ---help---
           This adds support for DVB/ATSC cards based on the
           Conexant 2388x chip.
diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c

index ac3292d7646cb71cc3eb2f229e9b81f352c5c769..7a8d49ef646e62cb22127dd9387070dfcc1db22e 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-audio.c
+++ b/drivers/media/video/em28xx/em28xx-audio.c
@@ -62,7 +62,7 @@ static int em28xx_isoc_audio_deinit(struct em28xx *dev)
  
         dprintk("Stopping isoc\n");
         for (i = 0; i < EM28XX_AUDIO_BUFS; i++) {
-               usb_kill_urb(dev->adev->urb[i]);
+               usb_unlink_urb(dev->adev->urb[i]);
                 usb_free_urb(dev->adev->urb[i]);
                 dev->adev->urb[i] = NULL;
         }
@@ -75,7 +75,6 @@ static void em28xx_audio_isocirq(struct urb *urb)
         struct em28xx            *dev = urb->context;
         int                      i;
         unsigned int             oldptr;
-       unsigned long            flags;
         int                      period_elapsed = 0;
         int                      status;
         unsigned char            *cp;
@@ -96,9 +95,21 @@ static void em28xx_audio_isocirq(struct urb *urb)
                         if (!length)
                                 continue;
  
-                       spin_lock_irqsave(&dev->adev->slock, flags);
-
                         oldptr = dev->adev->hwptr_done_capture;
+                       if (oldptr + length >= runtime->buffer_size) {
+                               unsigned int cnt =
+                                   runtime->buffer_size - oldptr;
+                               memcpy(runtime->dma_area + oldptr * stride, cp,
+                                      cnt * stride);
+                               memcpy(runtime->dma_area, cp + cnt * stride,
+                                      length * stride - cnt * stride);
+                       } else {
+                               memcpy(runtime->dma_area + oldptr * stride, cp,
+                                      length * stride);
+                       }
+
+                       snd_pcm_stream_lock(substream);
+
                         dev->adev->hwptr_done_capture += length;
                         if (dev->adev->hwptr_done_capture >=
                             runtime->buffer_size)
@@ -113,19 +124,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
                                 period_elapsed = 1;
                         }
  
-                       spin_unlock_irqrestore(&dev->adev->slock, flags);
-
-                       if (oldptr + length >= runtime->buffer_size) {
-                               unsigned int cnt =
-                                   runtime->buffer_size - oldptr;
-                               memcpy(runtime->dma_area + oldptr * stride, cp,
-                                      cnt * stride);
-                               memcpy(runtime->dma_area, cp + cnt * stride,
-                                      length * stride - cnt * stride);
-                       } else {
-                               memcpy(runtime->dma_area + oldptr * stride, cp,
-                                      length * stride);
-                       }
+                       snd_pcm_stream_unlock(substream);
                 }
                 if (period_elapsed)
                         snd_pcm_period_elapsed(substream);
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c

index 5d837c16ee22ad10908cce01c0ef0d89768f14ed..15e2b525310db9af34bf6377f573691ed04c1314 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -69,19 +69,33 @@ int em28xx_read_reg_req_len(struct em28xx *dev, u8 req, u16 reg,
         int ret, byte;
  
         if (dev->state & DEV_DISCONNECTED)
-               return(-ENODEV);
+               return -ENODEV;
+
+       if (len > URB_MAX_CTRL_SIZE)
+               return -EINVAL;
  
         em28xx_regdbg("req=%02x, reg=%02x ", req, reg);
  
+       mutex_lock(&dev->ctrl_urb_lock);
         ret = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), req,
                               USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                             0x0000, reg, buf, len, HZ);
+                             0x0000, reg, dev->urb_buf, len, HZ);
+       if (ret < 0) {
+               if (reg_debug)
+                       printk(" failed!\n");
+               mutex_unlock(&dev->ctrl_urb_lock);
+               return ret;
+       }
+
+       if (len)
+               memcpy(buf, dev->urb_buf, len);
+
+       mutex_unlock(&dev->ctrl_urb_lock);
  
         if (reg_debug) {
-               printk(ret < 0 ? " failed!\n" : "%02x values: ", ret);
+               printk("%02x values: ", ret);
                 for (byte = 0; byte < len; byte++)
                         printk(" %02x", (unsigned char)buf[byte]);
-
                 printk("\n");
         }
  
@@ -102,16 +116,20 @@ int em28xx_read_reg_req(struct em28xx *dev, u8 req, u16 reg)
  
         em28xx_regdbg("req=%02x, reg=%02x:", req, reg);
  
+       mutex_lock(&dev->ctrl_urb_lock);
         ret = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), req,
                               USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                             0x0000, reg, &val, 1, HZ);
-
-       if (reg_debug)
-               printk(ret < 0 ? " failed!\n" :
-                                "%02x\n", (unsigned char) val);
+                             0x0000, reg, dev->urb_buf, 1, HZ);
+       val = dev->urb_buf[0];
+       mutex_unlock(&dev->ctrl_urb_lock);
  
-       if (ret < 0)
+       if (ret < 0) {
+               printk(" failed!\n");
                 return ret;
+       }
+
+       if (reg_debug)
+               printk("%02x\n", (unsigned char) val);
  
         return val;
  }
@@ -130,19 +148,13 @@ int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf,
  {
         int ret;
  
-       /*usb_control_msg seems to expect a kmalloced buffer */
-       unsigned char *bufs;
-
         if (dev->state & DEV_DISCONNECTED)
                 return -ENODEV;
  
-       if (len < 1)
+       if ((len < 1) || (len > URB_MAX_CTRL_SIZE))
                 return -EINVAL;
  
-       bufs = kmalloc(len, GFP_KERNEL);
-
         em28xx_regdbg("req=%02x reg=%02x:", req, reg);
-
         if (reg_debug) {
                 int i;
                 for (i = 0; i < len; ++i)
@@ -150,16 +162,16 @@ int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf,
                 printk("\n");
         }
  
-       if (!bufs)
-               return -ENOMEM;
-       memcpy(bufs, buf, len);
+       mutex_lock(&dev->ctrl_urb_lock);
+       memcpy(dev->urb_buf, buf, len);
         ret = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0), req,
                               USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                             0x0000, reg, bufs, len, HZ);
+                             0x0000, reg, dev->urb_buf, len, HZ);
+       mutex_unlock(&dev->ctrl_urb_lock);
+
         if (dev->wait_after_write)
                 msleep(dev->wait_after_write);
  
-       kfree(bufs);
         return ret;
  }
  
@@ -270,6 +282,8 @@ static int em28xx_set_audio_source(struct em28xx *dev)
                         break;
                 case EM28XX_AMUX_LINE_IN:
                         input = EM28XX_AUDIO_SRC_LINE;
+                       video = disable;
+                       line  = enable;
                         break;
                 case EM28XX_AMUX_AC97_VIDEO:
                         input = EM28XX_AUDIO_SRC_LINE;
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c

index 3bab56b997fc391033b47e262f6d72855d11e15b..2360c61ddca97e2930a69ab646648da96337d86a 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -337,9 +337,9 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)
         /* Check if board has eeprom */
         err = i2c_master_recv(&dev->i2c_client, &buf, 0);
         if (err < 0) {
-               em28xx_errdev("%s: i2c_master_recv failed! err [%d]\n",
-                       __func__, err);
-               return err;
+               em28xx_errdev("board has no eeprom\n");
+               memset(eedata, 0, len);
+               return -ENODEV;
         }
  
         buf = 0;
@@ -609,14 +609,16 @@ int em28xx_i2c_register(struct em28xx *dev)
         dev->i2c_client.adapter = &dev->i2c_adap;
  
         retval = em28xx_i2c_eeprom(dev, dev->eedata, sizeof(dev->eedata));
-       if (retval < 0) {
+       if ((retval < 0) && (retval != -ENODEV)) {
                 em28xx_errdev("%s: em28xx_i2_eeprom failed! retval [%d]\n",
                         __func__, retval);
+
                 return retval;
         }
  
         if (i2c_scan)
                 em28xx_do_i2c_scan(dev);
+
         return 0;
  }
  
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c

index a1ab2ef45578d491ea9951ef1ddfe933b85294fb..4ea1f1e048979e51859652d93e24846a7f39fd3e 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -73,6 +73,7 @@ MODULE_DESCRIPTION(DRIVER_DESC);
  MODULE_LICENSE("GPL");
  
  static LIST_HEAD(em28xx_devlist);
+static DEFINE_MUTEX(em28xx_devlist_mutex);
  
  static unsigned int card[]     = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET };
  static unsigned int video_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET };
@@ -548,10 +549,11 @@ static int em28xx_config(struct em28xx *dev)
  static void em28xx_config_i2c(struct em28xx *dev)
  {
         struct v4l2_routing route;
+       int zero = 0;
  
         route.input = INPUT(dev->ctl_input)->vmux;
         route.output = 0;
-       em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, NULL);
+       em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, &zero);
         em28xx_i2c_call_clients(dev, VIDIOC_INT_S_VIDEO_ROUTING, &route);
         em28xx_i2c_call_clients(dev, VIDIOC_STREAMON, NULL);
  }
@@ -1519,7 +1521,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
         struct em28xx_fh *fh;
         enum v4l2_buf_type fh_type = 0;
  
-       lock_kernel();
+       mutex_lock(&em28xx_devlist_mutex);
         list_for_each_entry(h, &em28xx_devlist, devlist) {
                 if (h->vdev->minor == minor) {
                         dev  = h;
@@ -1535,10 +1537,11 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
                         dev   = h;
                 }
         }
-       if (NULL == dev) {
-               unlock_kernel();
+       mutex_unlock(&em28xx_devlist_mutex);
+       if (NULL == dev)
                 return -ENODEV;
-       }
+
+       mutex_lock(&dev->lock);
  
         em28xx_videodbg("open minor=%d type=%s users=%d\n",
                                 minor, v4l2_type_names[fh_type], dev->users);
@@ -1547,10 +1550,9 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
         fh = kzalloc(sizeof(struct em28xx_fh), GFP_KERNEL);
         if (!fh) {
                 em28xx_errdev("em28xx-video.c: Out of memory?!\n");
-               unlock_kernel();
+               mutex_unlock(&dev->lock);
                 return -ENOMEM;
         }
-       mutex_lock(&dev->lock);
         fh->dev = dev;
         fh->radio = radio;
         fh->type = fh_type;
@@ -1584,7 +1586,6 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
                         sizeof(struct em28xx_buffer), fh);
  
         mutex_unlock(&dev->lock);
-       unlock_kernel();
  
         return errCode;
  }
@@ -1871,6 +1872,7 @@ int em28xx_register_extension(struct em28xx_ops *ops)
  {
         struct em28xx *dev = NULL;
  
+       mutex_lock(&em28xx_devlist_mutex);
         mutex_lock(&em28xx_extension_devlist_lock);
         list_add_tail(&ops->next, &em28xx_extension_devlist);
         list_for_each_entry(dev, &em28xx_devlist, devlist) {
@@ -1879,6 +1881,7 @@ int em28xx_register_extension(struct em28xx_ops *ops)
         }
         printk(KERN_INFO "Em28xx: Initialized (%s) extension\n", ops->name);
         mutex_unlock(&em28xx_extension_devlist_lock);
+       mutex_unlock(&em28xx_devlist_mutex);
         return 0;
  }
  EXPORT_SYMBOL(em28xx_register_extension);
@@ -1887,6 +1890,7 @@ void em28xx_unregister_extension(struct em28xx_ops *ops)
  {
         struct em28xx *dev = NULL;
  
+       mutex_lock(&em28xx_devlist_mutex);
         list_for_each_entry(dev, &em28xx_devlist, devlist) {
                 if (dev)
                         ops->fini(dev);
@@ -1896,6 +1900,7 @@ void em28xx_unregister_extension(struct em28xx_ops *ops)
         printk(KERN_INFO "Em28xx: Removed (%s) extension\n", ops->name);
         list_del(&ops->next);
         mutex_unlock(&em28xx_extension_devlist_lock);
+       mutex_unlock(&em28xx_devlist_mutex);
  }
  EXPORT_SYMBOL(em28xx_unregister_extension);
  
@@ -1921,6 +1926,60 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev,
  }
  
  
+static int register_analog_devices(struct em28xx *dev)
+{
+       int ret;
+
+       /* allocate and fill video video_device struct */
+       dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template, "video");
+       if (!dev->vdev) {
+               em28xx_errdev("cannot allocate video_device.\n");
+               return -ENODEV;
+       }
+
+       /* register v4l2 video video_device */
+       ret = video_register_device(dev->vdev, VFL_TYPE_GRABBER,
+                                      video_nr[dev->devno]);
+       if (ret) {
+               em28xx_errdev("unable to register video device (error=%i).\n",
+                             ret);
+               return ret;
+       }
+
+       /* Allocate and fill vbi video_device struct */
+       dev->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template, "vbi");
+
+       /* register v4l2 vbi video_device */
+       ret = video_register_device(dev->vbi_dev, VFL_TYPE_VBI,
+                                       vbi_nr[dev->devno]);
+       if (ret < 0) {
+               em28xx_errdev("unable to register vbi device\n");
+               return ret;
+       }
+
+       if (em28xx_boards[dev->model].radio.type == EM28XX_RADIO) {
+               dev->radio_dev = em28xx_vdev_init(dev, &em28xx_radio_template, "radio");
+               if (!dev->radio_dev) {
+                       em28xx_errdev("cannot allocate video_device.\n");
+                       return -ENODEV;
+               }
+               ret = video_register_device(dev->radio_dev, VFL_TYPE_RADIO,
+                                           radio_nr[dev->devno]);
+               if (ret < 0) {
+                       em28xx_errdev("can't register radio device\n");
+                       return ret;
+               }
+               em28xx_info("Registered radio device as /dev/radio%d\n",
+                           dev->radio_dev->num);
+       }
+
+       em28xx_info("V4L2 device registered as /dev/video%d and /dev/vbi%d\n",
+                               dev->vdev->num, dev->vbi_dev->num);
+
+       return 0;
+}
+
+
  /*
   * em28xx_init_dev()
   * allocates and inits the device structs, registers i2c bus and v4l device
@@ -1936,6 +1995,7 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
  
         dev->udev = udev;
         mutex_init(&dev->lock);
+       mutex_init(&dev->ctrl_urb_lock);
         spin_lock_init(&dev->slock);
         init_waitqueue_head(&dev->open);
         init_waitqueue_head(&dev->wait_frame);
@@ -1953,8 +2013,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         errCode = em28xx_config(dev);
         if (errCode) {
                 em28xx_errdev("error configuring device\n");
-               em28xx_devused &= ~(1<<dev->devno);
-               kfree(dev);
                 return -ENOMEM;
         }
  
@@ -2001,50 +2059,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
                 return errCode;
         }
  
-       list_add_tail(&dev->devlist, &em28xx_devlist);
-
-       /* allocate and fill video video_device struct */
-       dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template, "video");
-       if (NULL == dev->vdev) {
-               em28xx_errdev("cannot allocate video_device.\n");
-               goto fail_unreg;
-       }
-
-       /* register v4l2 video video_device */
-       retval = video_register_device(dev->vdev, VFL_TYPE_GRABBER,
-                                      video_nr[dev->devno]);
-       if (retval) {
-               em28xx_errdev("unable to register video device (error=%i).\n",
-                             retval);
-               goto fail_unreg;
-       }
-
-       /* Allocate and fill vbi video_device struct */
-       dev->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template, "vbi");
-       /* register v4l2 vbi video_device */
-       if (video_register_device(dev->vbi_dev, VFL_TYPE_VBI,
-                                       vbi_nr[dev->devno]) < 0) {
-               em28xx_errdev("unable to register vbi device\n");
-               retval = -ENODEV;
-               goto fail_unreg;
-       }
-
-       if (em28xx_boards[dev->model].radio.type == EM28XX_RADIO) {
-               dev->radio_dev = em28xx_vdev_init(dev, &em28xx_radio_template, "radio");
-               if (NULL == dev->radio_dev) {
-                       em28xx_errdev("cannot allocate video_device.\n");
-                       goto fail_unreg;
-               }
-               retval = video_register_device(dev->radio_dev, VFL_TYPE_RADIO,
-                                           radio_nr[dev->devno]);
-               if (retval < 0) {
-                       em28xx_errdev("can't register radio device\n");
-                       goto fail_unreg;
-               }
-               em28xx_info("Registered radio device as /dev/radio%d\n",
-                           dev->radio_dev->num);
-       }
-
         /* init video dma queues */
         INIT_LIST_HEAD(&dev->vidq.active);
         INIT_LIST_HEAD(&dev->vidq.queued);
@@ -2071,8 +2085,14 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
  
         video_mux(dev, 0);
  
-       em28xx_info("V4L2 device registered as /dev/video%d and /dev/vbi%d\n",
-                               dev->vdev->num, dev->vbi_dev->num);
+       mutex_lock(&em28xx_devlist_mutex);
+       list_add_tail(&dev->devlist, &em28xx_devlist);
+       retval = register_analog_devices(dev);
+       if (retval < 0) {
+               em28xx_release_resources(dev);
+               mutex_unlock(&em28xx_devlist_mutex);
+               goto fail_reg_devices;
+       }
  
         mutex_lock(&em28xx_extension_devlist_lock);
         if (!list_empty(&em28xx_extension_devlist)) {
@@ -2082,13 +2102,12 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
                 }
         }
         mutex_unlock(&em28xx_extension_devlist_lock);
+       mutex_unlock(&em28xx_devlist_mutex);
  
         return 0;
  
-fail_unreg:
-       em28xx_release_resources(dev);
+fail_reg_devices:
         mutex_unlock(&dev->lock);
-       kfree(dev);
         return retval;
  }
  
@@ -2231,8 +2250,12 @@ static int em28xx_usb_probe(struct usb_interface *interface,
  
         /* allocate device struct */
         retval = em28xx_init_dev(&dev, udev, nr);
-       if (retval)
+       if (retval) {
+               em28xx_devused &= ~(1<<dev->devno);
+               kfree(dev);
+
                 return retval;
+       }
  
         em28xx_info("Found %s\n", em28xx_boards[dev->model].name);
  
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h

index 82781178e0a3e23c7514a09bf6600c02d658ae36..5956e9b3062f5147ad34bb354412910a45f2fafe 100644 (file)
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -102,6 +102,9 @@
  #define EM28XX_MIN_BUF 4
  #define EM28XX_DEF_BUF 8
  
+/*Limits the max URB message size */
+#define URB_MAX_CTRL_SIZE 80
+
  /* Params for validated field */
  #define EM28XX_BOARD_NOT_VALIDATED 1
  #define EM28XX_BOARD_VALIDATED    0
@@ -430,6 +433,7 @@ struct em28xx {
  
         /* locks */
         struct mutex lock;
+       struct mutex ctrl_urb_lock;     /* protects urb_buf */
         /* spinlock_t queue_lock; */
         struct list_head inqueue, outqueue;
         wait_queue_head_t open, wait_frame, wait_stream;
@@ -451,6 +455,8 @@ struct em28xx {
         unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */
         struct urb *urb[EM28XX_NUM_BUFS];       /* urb for isoc transfers */
         char *transfer_buffer[EM28XX_NUM_BUFS]; /* transfer buffers for isoc transfer */
+       char urb_buf[URB_MAX_CTRL_SIZE];        /* urb control msg buffer */
+
         /* helper funcs that call usb_control_msg */
         int (*em28xx_write_regs) (struct em28xx *dev, u16 reg,
                                         char *buf, int len);
diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c

index a9d51ba7c57ce7f79f736f3e1cf462afeea75ac3..de28354ea5bac3e0a6a9650ac2266aba2a026ee3 100644 (file)
--- a/drivers/media/video/gspca/conex.c
+++ b/drivers/media/video/gspca/conex.c
@@ -846,10 +846,13 @@ static int sd_start(struct gspca_dev *gspca_dev)
         return 0;
  }
  
+/* called on streamoff with alt 0 and on disconnect */
  static void sd_stop0(struct gspca_dev *gspca_dev)
  {
         int retry = 50;
  
+       if (!gspca_dev->present)
+               return;
         reg_w_val(gspca_dev, 0x0000, 0x00);
         reg_r(gspca_dev, 0x0002, 1);
         reg_w_val(gspca_dev, 0x0053, 0x00);
diff --git a/drivers/media/video/gspca/finepix.c b/drivers/media/video/gspca/finepix.c

index 65d3cbfe6b278e7446038696a2eaa8172d1695f5..607942fd797004cb0737cac2af973e5e21623f9b 100644 (file)
--- a/drivers/media/video/gspca/finepix.c
+++ b/drivers/media/video/gspca/finepix.c
@@ -276,6 +276,12 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         /* Stop the state machine */
         if (dev->state != FPIX_NOP)
                 wait_for_completion(&dev->can_close);
+}
+
+/* called on streamoff with alt 0 and disconnect */
+static void sd_stop0(struct gspca_dev *gspca_dev)
+{
+       struct usb_fpix *dev = (struct usb_fpix *) gspca_dev;
  
         usb_free_urb(dev->control_urb);
         dev->control_urb = NULL;
@@ -385,6 +391,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
  error:
         /* Free the ressources */
         sd_stopN(gspca_dev);
+       sd_stop0(gspca_dev);
         return ret;
  }
  
@@ -425,6 +432,7 @@ static const struct sd_desc sd_desc = {
         .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
+       .stop0 = sd_stop0,
  };
  
  /* -- device connect -- */
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c

index e48fbfc8ad05d72c4065fdf0ae42aa41b298f88d..02a6e9ef033740d7401b6bd1ccd5966552add823 100644 (file)
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -646,15 +646,14 @@ static void gspca_stream_off(struct gspca_dev *gspca_dev)
  {
         gspca_dev->streaming = 0;
         atomic_set(&gspca_dev->nevent, 0);
-       if (gspca_dev->present) {
-               if (gspca_dev->sd_desc->stopN)
-                       gspca_dev->sd_desc->stopN(gspca_dev);
-               destroy_urbs(gspca_dev);
-               gspca_set_alt0(gspca_dev);
-               if (gspca_dev->sd_desc->stop0)
-                       gspca_dev->sd_desc->stop0(gspca_dev);
-               PDEBUG(D_STREAM, "stream off OK");
-       }
+       if (gspca_dev->present
+           && gspca_dev->sd_desc->stopN)
+               gspca_dev->sd_desc->stopN(gspca_dev);
+       destroy_urbs(gspca_dev);
+       gspca_set_alt0(gspca_dev);
+       if (gspca_dev->sd_desc->stop0)
+               gspca_dev->sd_desc->stop0(gspca_dev);
+       PDEBUG(D_STREAM, "stream off OK");
  }
  
  static void gspca_set_default_mode(struct gspca_dev *gspca_dev)
@@ -863,7 +862,7 @@ static int dev_open(struct inode *inode, struct file *file)
         int ret;
  
         PDEBUG(D_STREAM, "%s open", current->comm);
-       gspca_dev = (struct gspca_dev *) video_devdata(file);
+       gspca_dev = video_drvdata(file);
         if (mutex_lock_interruptible(&gspca_dev->queue_lock))
                 return -ERESTARTSYS;
         if (!gspca_dev->present) {
@@ -875,6 +874,13 @@ static int dev_open(struct inode *inode, struct file *file)
                 ret = -EBUSY;
                 goto out;
         }
+
+       /* protect the subdriver against rmmod */
+       if (!try_module_get(gspca_dev->module)) {
+               ret = -ENODEV;
+               goto out;
+       }
+
         gspca_dev->users++;
  
         /* one more user */
@@ -884,10 +890,10 @@ static int dev_open(struct inode *inode, struct file *file)
  #ifdef GSPCA_DEBUG
         /* activate the v4l2 debug */
         if (gspca_debug & D_V4L2)
-               gspca_dev->vdev.debug |= V4L2_DEBUG_IOCTL
+               gspca_dev->vdev->debug |= V4L2_DEBUG_IOCTL
                                         | V4L2_DEBUG_IOCTL_ARG;
         else
-               gspca_dev->vdev.debug &= ~(V4L2_DEBUG_IOCTL
+               gspca_dev->vdev->debug &= ~(V4L2_DEBUG_IOCTL
                                         | V4L2_DEBUG_IOCTL_ARG);
  #endif
         ret = 0;
@@ -921,6 +927,7 @@ static int dev_close(struct inode *inode, struct file *file)
                 gspca_dev->memory = GSPCA_MEMORY_NO;
         }
         file->private_data = NULL;
+       module_put(gspca_dev->module);
         mutex_unlock(&gspca_dev->queue_lock);
  
         PDEBUG(D_STREAM, "close done");
@@ -1257,10 +1264,10 @@ static int vidioc_s_jpegcomp(struct file *file, void *priv,
         struct gspca_dev *gspca_dev = priv;
         int ret;
  
-       if (mutex_lock_interruptible(&gspca_dev->usb_lock))
-               return -ERESTARTSYS;
         if (!gspca_dev->sd_desc->set_jcomp)
                 return -EINVAL;
+       if (mutex_lock_interruptible(&gspca_dev->usb_lock))
+               return -ERESTARTSYS;
         ret = gspca_dev->sd_desc->set_jcomp(gspca_dev, jpegcomp);
         mutex_unlock(&gspca_dev->usb_lock);
         return ret;
@@ -1748,11 +1755,6 @@ out:
         return ret;
  }
  
-static void dev_release(struct video_device *vfd)
-{
-       /* nothing */
-}
-
  static struct file_operations dev_fops = {
         .owner = THIS_MODULE,
         .open = dev_open,
@@ -1800,7 +1802,7 @@ static struct video_device gspca_template = {
         .name = "gspca main driver",
         .fops = &dev_fops,
         .ioctl_ops = &dev_ioctl_ops,
-       .release = dev_release,         /* mandatory */
+       .release = video_device_release,
         .minor = -1,
  };
  
@@ -1869,17 +1871,18 @@ int gspca_dev_probe(struct usb_interface *intf,
         init_waitqueue_head(&gspca_dev->wq);
  
         /* init video stuff */
-       memcpy(&gspca_dev->vdev, &gspca_template, sizeof gspca_template);
-       gspca_dev->vdev.parent = &dev->dev;
-       memcpy(&gspca_dev->fops, &dev_fops, sizeof gspca_dev->fops);
-       gspca_dev->vdev.fops = &gspca_dev->fops;
-       gspca_dev->fops.owner = module;         /* module protection */
+       gspca_dev->vdev = video_device_alloc();
+       memcpy(gspca_dev->vdev, &gspca_template, sizeof gspca_template);
+       gspca_dev->vdev->parent = &dev->dev;
+       gspca_dev->module = module;
         gspca_dev->present = 1;
-       ret = video_register_device(&gspca_dev->vdev,
+       video_set_drvdata(gspca_dev->vdev, gspca_dev);
+       ret = video_register_device(gspca_dev->vdev,
                                   VFL_TYPE_GRABBER,
                                   video_nr);
         if (ret < 0) {
                 err("video_register_device err %d", ret);
+               video_device_release(gspca_dev->vdev);
                 goto out;
         }
  
@@ -1887,7 +1890,8 @@ int gspca_dev_probe(struct usb_interface *intf,
         PDEBUG(D_PROBE, "probe ok");
         return 0;
  out:
-       kref_put(&gspca_dev->kref, gspca_delete);
+       kfree(gspca_dev->usb_buf);
+       kfree(gspca_dev);
         return ret;
  }
  EXPORT_SYMBOL(gspca_dev_probe);
@@ -1905,7 +1909,7 @@ void gspca_disconnect(struct usb_interface *intf)
         usb_set_intfdata(intf, NULL);
  
  /* We don't want people trying to open up the device */
-       video_unregister_device(&gspca_dev->vdev);
+       video_unregister_device(gspca_dev->vdev);
  
         gspca_dev->present = 0;
         gspca_dev->streaming = 0;
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h

index 1d9dc90b479137d87c878fc84a3ee9e022a61e45..d25e8d69373b8d94335579d4d337054e80164f31 100644 (file)
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -97,7 +97,7 @@ struct sd_desc {
         cam_pkt_op pkt_scan;
  /* optional operations */
         cam_v_op stopN;         /* called on stream off - main alt */
-       cam_v_op stop0;         /* called on stream off - alt 0 */
+       cam_v_op stop0;         /* called on stream off & disconnect - alt 0 */
         cam_v_op dq_callback;   /* called when a frame has been dequeued */
         cam_jpg_op get_jcomp;
         cam_jpg_op set_jcomp;
@@ -120,8 +120,8 @@ struct gspca_frame {
  };
  
  struct gspca_dev {
-       struct video_device vdev;       /* !! must be the first item */
-       struct file_operations fops;
+       struct video_device *vdev;
+       struct module *module;          /* subdriver handling the device */
         struct usb_device *dev;
         struct kref kref;
         struct file *capt_file;         /* file doing video capture */
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c

index e5ff9a6199ef16261e85faec7d9ab85d97ebfc49..fbd45e235d970934633132385a081270adbbd5ef 100644 (file)
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
@@ -749,10 +749,13 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_6=LED */
  }
  
+/* called on streamoff with alt 0 and on disconnect */
  static void sd_stop0(struct gspca_dev *gspca_dev)
  {
         struct sd *sd = (struct sd *) gspca_dev;
  
+       if (!gspca_dev->present)
+               return;
         if (sd->sensor == SENSOR_PAC7302) {
                 reg_w(gspca_dev, 0xff, 0x01);
                 reg_w(gspca_dev, 0x78, 0x40);
diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c

index b742f260c7caa6bb4fd8b1769be95c87988bafcb..e29954c1c38c2888dfbc892fbcea07b24c8bf4e3 100644 (file)
--- a/drivers/media/video/gspca/spca501.c
+++ b/drivers/media/video/gspca/spca501.c
@@ -2022,8 +2022,11 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         reg_write(gspca_dev->dev, SPCA501_REG_CTLRL, 0x01, 0x00);
  }
  
+/* called on streamoff with alt 0 and on disconnect */
  static void sd_stop0(struct gspca_dev *gspca_dev)
  {
+       if (!gspca_dev->present)
+               return;
         reg_write(gspca_dev->dev, SPCA501_REG_CTLRL, 0x05, 0x00);
  }
  
diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c

index b345749213cf16e9e0bd9e5cf2703d4cb9c9388f..895b9fe4018c48e8d1bc6b519ed63c7812ffc45c 100644 (file)
--- a/drivers/media/video/gspca/spca505.c
+++ b/drivers/media/video/gspca/spca505.c
@@ -742,8 +742,12 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         reg_write(gspca_dev->dev, 0x02, 0x00, 0x00);
  }
  
+/* called on streamoff with alt 0 and on disconnect */
  static void sd_stop0(struct gspca_dev *gspca_dev)
  {
+       if (!gspca_dev->present)
+               return;
+
         /* This maybe reset or power control */
         reg_write(gspca_dev->dev, 0x03, 0x03, 0x20);
         reg_write(gspca_dev->dev, 0x03, 0x01, 0x0);
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c

index 020a03c466c10f75042fcd090d0f1be7643e7fdc..c3de4e44123dc1dc0df17256eeaf3b1ae88441cc 100644 (file)
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
@@ -766,10 +766,13 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         }
  }
  
+/* called on streamoff with alt 0 and on disconnect */
  static void sd_stop0(struct gspca_dev *gspca_dev)
  {
         struct sd *sd = (struct sd *) gspca_dev;
  
+       if (!gspca_dev->present)
+               return;
         if (sd->chip_revision == Rev012A) {
                 reg_w_val(gspca_dev->dev, 0x8118, 0x29);
                 reg_w_val(gspca_dev->dev, 0x8114, 0x08);
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c

index be46d92325404d66b48c6e527005c736c5102812..17af353ddd1c872226be39550073de968b3d925b 100644 (file)
--- a/drivers/media/video/gspca/vc032x.c
+++ b/drivers/media/video/gspca/vc032x.c
@@ -1633,10 +1633,13 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         reg_w(dev, 0xa0, 0x09, 0xb003);
  }
  
+/* called on streamoff with alt 0 and on disconnect */
  static void sd_stop0(struct gspca_dev *gspca_dev)
  {
         struct usb_device *dev = gspca_dev->dev;
  
+       if (!gspca_dev->present)
+               return;
         reg_w(dev, 0x89, 0xffff, 0xffff);
  }
  
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c

index 8b3101d347c36717d37bedc1564682c7d22295ac..0befacf4985541b833e230c5544ce2fff2ff51db 100644 (file)
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -7336,10 +7336,13 @@ static int sd_start(struct gspca_dev *gspca_dev)
         return 0;
  }
  
+/* called on streamoff with alt 0 and on disconnect */
  static void sd_stop0(struct gspca_dev *gspca_dev)
  {
         struct sd *sd = (struct sd *) gspca_dev;
  
+       if (!gspca_dev->present)
+               return;
         send_unknown(gspca_dev->dev, sd->sensor);
  }
  
diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig

index 19eb274c9cd09d2f361154ed764d152472df709f..854c2a88535880a3e2a6c2d560303c46faaa8f2f 100644 (file)
--- a/drivers/media/video/pvrusb2/Kconfig
+++ b/drivers/media/video/pvrusb2/Kconfig
@@ -42,7 +42,7 @@ config VIDEO_PVRUSB2_DVB
         select DVB_S5H1411 if !DVB_FE_CUSTOMISE
         select DVB_TDA10048 if !DVB_FE_CUSTOMIZE
         select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE
-       select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
         select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE
         ---help---
  
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c

index 5272926db73e93763f21aaf8ecc746fbb88f93f9..3c3f8cf73108a55280fb27bd33118fbe8f4c98e6 100644 (file)
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -192,7 +192,7 @@ struct s2255_dmaqueue {
  #define S2255_FW_FAILED                3
  #define S2255_FW_DISCONNECTING  4
  
-#define S2255_FW_MARKER         0x22552f2f
+#define S2255_FW_MARKER                cpu_to_le32(0x22552f2f)
  /* 2255 read states */
  #define S2255_READ_IDLE         0
  #define S2255_READ_FRAME        1
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig

index 7021bbf5897b3ac6988fd5d42d28bc70a4231c9f..fc2164e28e76d11bbcb12fa60de4cb69d8acb7f3 100644 (file)
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -34,9 +34,9 @@ config VIDEO_SAA7134_DVB
         select DVB_NXT200X if !DVB_FE_CUSTOMISE
         select DVB_TDA10086 if !DVB_FE_CUSTOMISE
         select DVB_TDA826X if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE
         select DVB_ISL6421 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE
+       select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
         ---help---
           This adds support for DVB cards based on the
           Philips saa7134 chip.
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c

index d62fd4f6b52e054db684e2af1e30ac12fa3a9240..ee090413e598e4254cad01d211e465e46e081f48 100644 (file)
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -2008,6 +2008,9 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt)
                 return FAILED;
         }
  
+       /* make sure we have no outstanding commands at this stage */
+       mptscsih_flush_running_cmds(hd);
+
         ioc = hd->ioc;
         printk(MYIOC_s_INFO_FMT "attempting host reset! (sc=%p)\n",
             ioc->name, SCpnt);
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c

index 84bdc2ee69e6bc1239775e27ef263cab8ef89805..a443e136dc41591136aecc1ec9e863ce43b2e35e 100644 (file)
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -354,7 +354,7 @@ static inline void i2o_block_sglist_free(struct i2o_block_request *ireq)
   *     @req: the request to prepare
   *
   *     Allocate the necessary i2o_block_request struct and connect it to
- *     the request. This is needed that we not loose the SG list later on.
+ *     the request. This is needed that we not lose the SG list later on.
   *
   *     Returns BLKPREP_OK on success or BLKPREP_DEFER on failure.
   */
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c

index be2b5926d26c14b34bcbb40fd4db664f50618495..6e53a30bfd38a7809f8bbcb2ce9b0f3966f35413 100644 (file)
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -49,7 +49,6 @@ static int i2o_hrt_get(struct i2o_controller *c);
  /**
   *     i2o_msg_get_wait - obtain an I2O message from the IOP
   *     @c: I2O controller
- *     @msg: pointer to a I2O message pointer
   *     @wait: how long to wait until timeout
   *
   *     This function waits up to wait seconds for a message slot to be
diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c

index 8c389d606c304c8b9b34022c8d2e71ceba4bb6e8..3ee698ad85997cf2f5c32b986689d7c07a0ed607 100644 (file)
--- a/drivers/misc/sgi-gru/grufault.c
+++ b/drivers/misc/sgi-gru/grufault.c
@@ -254,7 +254,11 @@ static int atomic_pte_lookup(struct vm_area_struct *vma, unsigned long vaddr,
                 return 1;
  
         *paddr = pte_pfn(pte) << PAGE_SHIFT;
+#ifdef CONFIG_HUGETLB_PAGE
         *pageshift = is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : PAGE_SHIFT;
+#else
+       *pageshift = PAGE_SHIFT;
+#endif
         return 0;
  
  err:
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c

index 5c027b6b4e5a7438815b290e09a99a0290bf55f5..6509838063924071cfdcfce11cf1d425b2ad170a 100644 (file)
--- a/drivers/misc/sgi-gru/grufile.c
+++ b/drivers/misc/sgi-gru/grufile.c
@@ -481,7 +481,7 @@ struct vm_operations_struct gru_vm_ops = {
         .fault          = gru_fault,
  };
  
-module_init(gru_init);
+fs_initcall(gru_init);
  module_exit(gru_exit);
  
  module_param(gru_options, ulong, 0644);
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c

index 76a76751da3660ce63123844d97eca891d2cbab2..6659b2275c0c6a5ce150906c25ac1d106700065a 100644 (file)
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -37,9 +37,9 @@
  #define        OPCODE_NORM_READ        0x03    /* Read data bytes (low frequency) */
  #define        OPCODE_FAST_READ        0x0b    /* Read data bytes (high frequency) */
  #define        OPCODE_PP               0x02    /* Page program (up to 256 bytes) */
-#define        OPCODE_BE_4K            0x20    /* Erase 4KiB block */
+#define        OPCODE_BE_4K            0x20    /* Erase 4KiB block */
  #define        OPCODE_BE_32K           0x52    /* Erase 32KiB block */
-#define        OPCODE_BE               0xc7    /* Erase whole flash block */
+#define        OPCODE_CHIP_ERASE       0xc7    /* Erase whole flash chip */
  #define        OPCODE_SE               0xd8    /* Sector erase (usually 64KiB) */
  #define        OPCODE_RDID             0x9f    /* Read JEDEC ID */
  
@@ -167,7 +167,7 @@ static int wait_till_ready(struct m25p *flash)
   *
   * Returns 0 if successful, non-zero otherwise.
   */
-static int erase_block(struct m25p *flash)
+static int erase_chip(struct m25p *flash)
  {
         DEBUG(MTD_DEBUG_LEVEL3, "%s: %s %dKiB\n",
                         flash->spi->dev.bus_id, __func__,
@@ -181,7 +181,7 @@ static int erase_block(struct m25p *flash)
         write_enable(flash);
  
         /* Set up command buffer. */
-       flash->command[0] = OPCODE_BE;
+       flash->command[0] = OPCODE_CHIP_ERASE;
  
         spi_write(flash->spi, flash->command, 1);
  
@@ -250,15 +250,18 @@ static int m25p80_erase(struct mtd_info *mtd, struct erase_info *instr)
  
         mutex_lock(&flash->lock);
  
-       /* REVISIT in some cases we could speed up erasing large regions
-        * by using OPCODE_SE instead of OPCODE_BE_4K
-        */
-
-       /* now erase those sectors */
-       if (len == flash->mtd.size && erase_block(flash)) {
+       /* whole-chip erase? */
+       if (len == flash->mtd.size && erase_chip(flash)) {
                 instr->state = MTD_ERASE_FAILED;
                 mutex_unlock(&flash->lock);
                 return -EIO;
+
+       /* REVISIT in some cases we could speed up erasing large regions
+        * by using OPCODE_SE instead of OPCODE_BE_4K.  We may have set up
+        * to use "small sector erase", but that's not always optimal.
+        */
+
+       /* "sector"-at-a-time erase */
         } else {
                 while (len) {
                         if (erase_sector(flash, addr)) {
@@ -574,10 +577,11 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi)
         for (tmp = 0, info = m25p_data;
                         tmp < ARRAY_SIZE(m25p_data);
                         tmp++, info++) {
-               if (info->jedec_id == jedec)
-                       if (ext_jedec != 0 && info->ext_id != ext_jedec)
+               if (info->jedec_id == jedec) {
+                       if (info->ext_id != 0 && info->ext_id != ext_jedec)
                                 continue;
                         return info;
+               }
         }
         dev_err(&spi->dev, "unrecognized JEDEC id %06x\n", jedec);
         return NULL;
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c

index 42d844f8f6bfef79bdfef42ed48b33368ac4ecd0..dfbf3f270cea9441a7261b69ca3c9f8aa9c87770 100644 (file)
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -19,7 +19,7 @@
  #include <linux/mtd/partitions.h>
  #include <linux/mtd/physmap.h>
  #include <linux/mtd/concat.h>
-#include <asm/io.h>
+#include <linux/io.h>
  
  #define MAX_RESOURCES          4
  
@@ -27,7 +27,6 @@ struct physmap_flash_info {
         struct mtd_info         *mtd[MAX_RESOURCES];
         struct mtd_info         *cmtd;
         struct map_info         map[MAX_RESOURCES];
-       struct resource         *res;
  #ifdef CONFIG_MTD_PARTITIONS
         int                     nr_parts;
         struct mtd_partition    *parts;
@@ -70,16 +69,7 @@ static int physmap_flash_remove(struct platform_device *dev)
  #endif
                         map_destroy(info->mtd[i]);
                 }
-
-               if (info->map[i].virt != NULL)
-                       iounmap(info->map[i].virt);
-       }
-
-       if (info->res != NULL) {
-               release_resource(info->res);
-               kfree(info->res);
         }
-
         return 0;
  }
  
@@ -101,7 +91,8 @@ static int physmap_flash_probe(struct platform_device *dev)
         if (physmap_data == NULL)
                 return -ENODEV;
  
-       info = kzalloc(sizeof(struct physmap_flash_info), GFP_KERNEL);
+       info = devm_kzalloc(&dev->dev, sizeof(struct physmap_flash_info),
+                           GFP_KERNEL);
         if (info == NULL) {
                 err = -ENOMEM;
                 goto err_out;
@@ -114,10 +105,10 @@ static int physmap_flash_probe(struct platform_device *dev)
                        (unsigned long long)(dev->resource[i].end - dev->resource[i].start + 1),
                        (unsigned long long)dev->resource[i].start);
  
-               info->res = request_mem_region(dev->resource[i].start,
-                                              dev->resource[i].end - dev->resource[i].start + 1,
-                                              dev->dev.bus_id);
-               if (info->res == NULL) {
+               if (!devm_request_mem_region(&dev->dev,
+                       dev->resource[i].start,
+                       dev->resource[i].end - dev->resource[i].start + 1,
+                       dev->dev.bus_id)) {
                         dev_err(&dev->dev, "Could not reserve memory region\n");
                         err = -ENOMEM;
                         goto err_out;
@@ -129,7 +120,8 @@ static int physmap_flash_probe(struct platform_device *dev)
                 info->map[i].bankwidth = physmap_data->width;
                 info->map[i].set_vpp = physmap_data->set_vpp;
  
-               info->map[i].virt = ioremap(info->map[i].phys, info->map[i].size);
+               info->map[i].virt = devm_ioremap(&dev->dev, info->map[i].phys,
+                                                info->map[i].size);
                 if (info->map[i].virt == NULL) {
                         dev_err(&dev->dev, "Failed to ioremap flash region\n");
                         err = EIO;
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c

index 024e3fffd4bb49b6176af4701c07e344120a3fc2..a83192f80eba5176b6bbad4649bd5996159b086a 100644 (file)
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -163,9 +163,11 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
         ret = parse_mtd_partitions(&fun->mtd, part_types, &fun->parts, 0);
  
  #ifdef CONFIG_MTD_OF_PARTS
-       if (ret == 0)
-               ret = of_mtd_parse_partitions(fun->dev, &fun->mtd,
-                                             flash_np, &fun->parts);
+       if (ret == 0) {
+               ret = of_mtd_parse_partitions(fun->dev, flash_np, &fun->parts);
+               if (ret < 0)
+                       goto err;
+       }
  #endif
         if (ret > 0)
                 ret = add_mtd_partitions(&fun->mtd, fun->parts, ret);
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c

index 75c899039023051e9b0f8dda595d734ff9aebdc0..9bd6c9ac844396553cbbfcf026860ff4420bce25 100644 (file)
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -141,6 +141,7 @@ static int __devinit pasemi_nand_probe(struct of_device *ofdev,
         }
  
         lpcctl = pci_resource_start(pdev, 0);
+       pci_dev_put(pdev);
  
         if (!request_region(lpcctl, 4, driver_name)) {
                 err = -EBUSY;
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c

index c0fa9c9edf089c1a039ded475fb13740cfa52d1f..15f0a26730aea38e4c65708aac43473a8da02122 100644 (file)
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -269,6 +269,7 @@ static struct pxa3xx_nand_timing stm2GbX16_timing = {
  
  static struct pxa3xx_nand_flash stm2GbX16 = {
         .timing = &stm2GbX16_timing,
+       .cmdset = &largepage_cmdset,
         .page_per_block = 64,
         .page_size = 2048,
         .flash_width = 16,
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c

index e39b21d3e168e5bb3cabf1a076193bca3f33bcab..a7e4d985f5ef553892a4fba5890647324f1c156c 100644 (file)
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -32,19 +32,18 @@
  #include <linux/platform_device.h>
  #include <linux/interrupt.h>
  #include <linux/delay.h>
+#include <linux/dma-mapping.h>
+#include <linux/io.h>
  
-#include <asm/io.h>
  #include <asm/mach/flash.h>
-#include <asm/arch/gpmc.h>
-#include <asm/arch/onenand.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/pm.h>
+#include <mach/gpmc.h>
+#include <mach/onenand.h>
+#include <mach/gpio.h>
+#include <mach/pm.h>
  
-#include <linux/dma-mapping.h>
-#include <asm/dma-mapping.h>
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
  
-#include <asm/arch/board.h>
+#include <mach/board.h>
  
  #define DRIVER_NAME "omap2-onenand"
  
diff --git a/drivers/net/Makefile b/drivers/net/Makefile

index f19acf8b9220bf2e152ecae6fdc9727ee8e5fc19..017383ad5ec6e6de671b71c0165d783b525386f2 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -114,7 +114,7 @@ obj-$(CONFIG_EL2) += 3c503.o 8390p.o
  obj-$(CONFIG_NE2000) += ne.o 8390p.o
  obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o
  obj-$(CONFIG_HPLAN) += hp.o 8390p.o
-obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390.o
+obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390p.o
  obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o
  obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o
  obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c

index d07e3f1489510642c0cde8b41b96875fdc115c92..9e8222f9e90ee0f69416ffe985103d0f6b183df5 100644 (file)
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -543,9 +543,9 @@ bnx2_free_rx_mem(struct bnx2 *bp)
                 for (j = 0; j < bp->rx_max_pg_ring; j++) {
                         if (rxr->rx_pg_desc_ring[j])
                                 pci_free_consistent(bp->pdev, RXBD_RING_SIZE,
-                                                   rxr->rx_pg_desc_ring[i],
-                                                   rxr->rx_pg_desc_mapping[i]);
-                       rxr->rx_pg_desc_ring[i] = NULL;
+                                                   rxr->rx_pg_desc_ring[j],
+                                                   rxr->rx_pg_desc_mapping[j]);
+                       rxr->rx_pg_desc_ring[j] = NULL;
                 }
                 if (rxr->rx_pg_ring)
                         vfree(rxr->rx_pg_ring);
@@ -3144,6 +3144,28 @@ bnx2_has_work(struct bnx2_napi *bnapi)
         return 0;
  }
  
+static void
+bnx2_chk_missed_msi(struct bnx2 *bp)
+{
+       struct bnx2_napi *bnapi = &bp->bnx2_napi[0];
+       u32 msi_ctrl;
+
+       if (bnx2_has_work(bnapi)) {
+               msi_ctrl = REG_RD(bp, BNX2_PCICFG_MSI_CONTROL);
+               if (!(msi_ctrl & BNX2_PCICFG_MSI_CONTROL_ENABLE))
+                       return;
+
+               if (bnapi->last_status_idx == bp->idle_chk_status_idx) {
+                       REG_WR(bp, BNX2_PCICFG_MSI_CONTROL, msi_ctrl &
+                              ~BNX2_PCICFG_MSI_CONTROL_ENABLE);
+                       REG_WR(bp, BNX2_PCICFG_MSI_CONTROL, msi_ctrl);
+                       bnx2_msi(bp->irq_tbl[0].vector, bnapi);
+               }
+       }
+
+       bp->idle_chk_status_idx = bnapi->last_status_idx;
+}
+
  static void bnx2_poll_link(struct bnx2 *bp, struct bnx2_napi *bnapi)
  {
         struct status_block *sblk = bnapi->status_blk.msi;
@@ -3218,14 +3240,15 @@ static int bnx2_poll(struct napi_struct *napi, int budget)
  
                 work_done = bnx2_poll_work(bp, bnapi, work_done, budget);
  
-               if (unlikely(work_done >= budget))
-                       break;
-
                 /* bnapi->last_status_idx is used below to tell the hw how
                  * much work has been processed, so we must read it before
                  * checking for more work.
                  */
                 bnapi->last_status_idx = sblk->status_idx;
+
+               if (unlikely(work_done >= budget))
+                       break;
+
                 rmb();
                 if (likely(!bnx2_has_work(bnapi))) {
                         netif_rx_complete(bp->dev, napi);
@@ -4570,6 +4593,8 @@ bnx2_init_chip(struct bnx2 *bp)
         for (i = 0; i < BNX2_MAX_MSIX_VEC; i++)
                 bp->bnx2_napi[i].last_status_idx = 0;
  
+       bp->idle_chk_status_idx = 0xffff;
+
         bp->rx_mode = BNX2_EMAC_RX_MODE_SORT_MODE;
  
         /* Set up how to generate a link change interrupt. */
@@ -5718,6 +5743,10 @@ bnx2_timer(unsigned long data)
         if (atomic_read(&bp->intr_sem) != 0)
                 goto bnx2_restart_timer;
  
+       if ((bp->flags & (BNX2_FLAG_USING_MSI | BNX2_FLAG_ONE_SHOT_MSI)) ==
+            BNX2_FLAG_USING_MSI)
+               bnx2_chk_missed_msi(bp);
+
         bnx2_send_heart_beat(bp);
  
         bp->stats_blk->stat_FwRxDrop =
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h

index 617d953401607e884873cf41a32fdf6dd73c1024..0b032c3c7b611c17cee29b12a62809839a1dae2b 100644 (file)
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -378,6 +378,9 @@ struct l2_fhdr {
   *  pci_config_l definition
   *  offset: 0000
   */
+#define BNX2_PCICFG_MSI_CONTROL                                0x00000058
+#define BNX2_PCICFG_MSI_CONTROL_ENABLE                  (1L<<16)
+
  #define BNX2_PCICFG_MISC_CONFIG                                0x00000068
  #define BNX2_PCICFG_MISC_CONFIG_TARGET_BYTE_SWAP        (1L<<2)
  #define BNX2_PCICFG_MISC_CONFIG_TARGET_MB_WORD_SWAP     (1L<<3)
@@ -6863,6 +6866,9 @@ struct bnx2 {
  
         u8                      num_tx_rings;
         u8                      num_rx_rings;
+
+       u32                     idle_chk_status_idx;
+
  };
  
  #define REG_RD(bp, offset)                                     \
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c

index d6c7d2aa761b503da15a96126ee1f2f3895e4f0a..7092df50ff784007f34f72b74aac85d6a437a42e 100644 (file)
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -1035,10 +1035,6 @@ MODULE_PARM_DESC(copybreak, "Receive copy threshold");
   *     @pdev: the PCI device that received the packet
   *     @fl: the SGE free list holding the packet
   *     @len: the actual packet length, excluding any SGE padding
- *     @dma_pad: padding at beginning of buffer left by SGE DMA
- *     @skb_pad: padding to be used if the packet is copied
- *     @copy_thres: length threshold under which a packet should be copied
- *     @drop_thres: # of remaining buffers before we start dropping packets
   *
   *     Get the next packet from a free list and complete setup of the
   *     sk_buff.  If the packet is small we make a copy and recycle the
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c

index 523b9716a543aec21d923b58a07cd5162b3edab3..d115a6d30f29c0b3acb81c8038c6215993980e8d 100644 (file)
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -1893,12 +1893,17 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
                 ctrl |= E1000_CTRL_PHY_RST;
         }
         ret_val = e1000_acquire_swflag_ich8lan(hw);
+       /* Whether or not the swflag was acquired, we need to reset the part */
         hw_dbg(hw, "Issuing a global reset to ich8lan");
         ew32(CTRL, (ctrl | E1000_CTRL_RST));
         msleep(20);
  
-       /* release the swflag because it is not reset by hardware reset */
-       e1000_release_swflag_ich8lan(hw);
+       if (!ret_val) {
+               /* release the swflag because it is not reset by
+                * hardware reset
+                */
+               e1000_release_swflag_ich8lan(hw);
+       }
  
         ret_val = e1000e_get_auto_rd_done(hw);
         if (ret_val) {
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c

index 91795f78c3e4da0a067378cdc757d8ddb32c138b..122539a0e1feb112f2e4f575f347d78349bb8536 100644 (file)
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -345,7 +345,6 @@ no_buffers:
  /**
   * e1000_alloc_jumbo_rx_buffers - Replace used jumbo receive buffers
   * @adapter: address of board private structure
- * @rx_ring: pointer to receive ring structure
   * @cleaned_count: number of buffers to allocate this pass
   **/
  
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c

index e1b441effbbec15b81de2fe4b2d36992ac993724..36cb6e95b465c2545b822d30c14a675b6bd39e07 100644 (file)
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -568,6 +568,17 @@ static u16 erxrdpt_workaround(u16 next_packet_ptr, u16 start, u16 end)
         return erxrdpt;
  }
  
+/*
+ * Calculate wrap around when reading beyond the end of the RX buffer
+ */
+static u16 rx_packet_start(u16 ptr)
+{
+       if (ptr + RSV_SIZE > RXEND_INIT)
+               return (ptr + RSV_SIZE) - (RXEND_INIT - RXSTART_INIT + 1);
+       else
+               return ptr + RSV_SIZE;
+}
+
  static void nolock_rxfifo_init(struct enc28j60_net *priv, u16 start, u16 end)
  {
         u16 erxrdpt;
@@ -938,8 +949,9 @@ static void enc28j60_hw_rx(struct net_device *ndev)
                         skb->dev = ndev;
                         skb_reserve(skb, NET_IP_ALIGN);
                         /* copy the packet from the receive buffer */
-                       enc28j60_mem_read(priv, priv->next_pk_ptr + sizeof(rsv),
-                                       len, skb_put(skb, len));
+                       enc28j60_mem_read(priv,
+                               rx_packet_start(priv->next_pk_ptr),
+                               len, skb_put(skb, len));
                         if (netif_msg_pktdata(priv))
                                 dump_packet(__func__, skb->len, skb->data);
                         skb->protocol = eth_type_trans(skb, ndev);
@@ -947,7 +959,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
                         ndev->stats.rx_packets++;
                         ndev->stats.rx_bytes += len;
                         ndev->last_rx = jiffies;
-                       netif_rx(skb);
+                       netif_rx_ni(skb);
                 }
         }
         /*
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c

index fbbd3e660c2731800bf6b7e136a62980bc51032f..c01e290d09d28b7e9c1fb240a26a9ba6f92e0900 100644 (file)
--- a/drivers/net/hp-plus.c
+++ b/drivers/net/hp-plus.c
@@ -230,7 +230,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
         dev->open = &hpp_open;
         dev->stop = &hpp_close;
  #ifdef CONFIG_NET_POLL_CONTROLLER
-       dev->poll_controller = ei_poll;
+       dev->poll_controller = eip_poll;
  #endif
  
         ei_status.name = name;
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c

index 1cbae85b142627facb0753ab2513b95587e9cfc2..20d27e622ec10c1fabefdc24e85a67cb443d27a4 100644 (file)
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1980,7 +1980,6 @@ static void igb_configure_rx(struct igb_adapter *adapter)
  
  /**
   * igb_free_tx_resources - Free Tx Resources per Queue
- * @adapter: board private structure
   * @tx_ring: Tx descriptor ring for a specific queue
   *
   * Free all transmit software resources
@@ -2033,7 +2032,6 @@ static void igb_unmap_and_free_tx_resource(struct igb_adapter *adapter,
  
  /**
   * igb_clean_tx_ring - Free Tx Buffers
- * @adapter: board private structure
   * @tx_ring: ring to be cleaned
   **/
  static void igb_clean_tx_ring(struct igb_ring *tx_ring)
@@ -2080,7 +2078,6 @@ static void igb_clean_all_tx_rings(struct igb_adapter *adapter)
  
  /**
   * igb_free_rx_resources - Free Rx Resources
- * @adapter: board private structure
   * @rx_ring: ring to clean the resources from
   *
   * Free all receive software resources
@@ -2120,7 +2117,6 @@ static void igb_free_all_rx_resources(struct igb_adapter *adapter)
  
  /**
   * igb_clean_rx_ring - Free Rx Buffers per Queue
- * @adapter: board private structure
   * @rx_ring: ring to free buffers from
   **/
  static void igb_clean_rx_ring(struct igb_ring *rx_ring)
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c

index 8ed823ae639e6a2a1bcbc1eeabbc8fb1177d2c66..5236f633ee36e3361af138cf3e2c2ae3033e1b53 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1320,7 +1320,6 @@ static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter)
   * ixgbe_intr - legacy mode Interrupt Handler
   * @irq: interrupt number
   * @data: pointer to a network interface device structure
- * @pt_regs: CPU registers structure
   **/
  static irqreturn_t ixgbe_intr(int irq, void *data)
  {
diff --git a/drivers/net/jme.h b/drivers/net/jme.h

index f863aee6648b49b0db38d2cdc077640669a2a424..3f5d91543246c88936d8fc086abf37c2cd3f6686 100644 (file)
--- a/drivers/net/jme.h
+++ b/drivers/net/jme.h
@@ -22,7 +22,7 @@
   */
  
  #ifndef __JME_H_INCLUDED__
-#define __JME_H_INCLUDEE__
+#define __JME_H_INCLUDED__
  
  #define DRV_NAME       "jme"
  #define DRV_VERSION    "1.0.3"
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c

index 42394505bb50b9a006b5d582eaef3378b1a9c5e6..590039cbb146f5a42b888055cc836ea576f23726 100644 (file)
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -70,6 +70,9 @@ static void macvlan_broadcast(struct sk_buff *skb,
         struct sk_buff *nskb;
         unsigned int i;
  
+       if (skb->protocol == htons(ETH_P_PAUSE))
+               return;
+
         for (i = 0; i < MACVLAN_HASH_SIZE; i++) {
                 hlist_for_each_entry_rcu(vlan, n, &port->vlan_hash[i], hlist) {
                         dev = vlan->dev;
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c

index 468921b8f4b68a047abdf2f247e4a1c3e0ed5d41..90a0281d15ea22d96ce788107dee88d0deb77aff 100644 (file)
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -753,6 +753,7 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
         struct mlx4_priv *priv = mlx4_priv(dev);
         int err;
         int port;
+       __be32 ib_port_default_caps;
  
         err = mlx4_init_uar_table(dev);
         if (err) {
@@ -852,6 +853,13 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
         }
  
         for (port = 1; port <= dev->caps.num_ports; port++) {
+               ib_port_default_caps = 0;
+               err = mlx4_get_port_ib_caps(dev, port, &ib_port_default_caps);
+               if (err)
+                       mlx4_warn(dev, "failed to get port %d default "
+                                 "ib capabilities (%d). Continuing with "
+                                 "caps = 0\n", port, err);
+               dev->caps.ib_port_def_cap[port] = ib_port_default_caps;
                 err = mlx4_SET_PORT(dev, port);
                 if (err) {
                         mlx4_err(dev, "Failed to set port %d, aborting\n",
diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h

index 56a2e213fe626870d23211c62916d6610aac5e63..34c909deaff325e9e90573065fa4d4efb45044b8 100644 (file)
--- a/drivers/net/mlx4/mlx4.h
+++ b/drivers/net/mlx4/mlx4.h
@@ -385,5 +385,6 @@ void mlx4_init_mac_table(struct mlx4_dev *dev, struct mlx4_mac_table *table);
  void mlx4_init_vlan_table(struct mlx4_dev *dev, struct mlx4_vlan_table *table);
  
  int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port);
+int mlx4_get_port_ib_caps(struct mlx4_dev *dev, u8 port, __be32 *caps);
  
  #endif /* MLX4_H */
diff --git a/drivers/net/mlx4/port.c b/drivers/net/mlx4/port.c

index e2fdab42c4ceabee3f5eb02c5cd5b53ed8fdce28..0a057e5dc63ba0ed32d0fac4ad6f306d77a8c715 100644 (file)
--- a/drivers/net/mlx4/port.c
+++ b/drivers/net/mlx4/port.c
@@ -258,6 +258,42 @@ out:
  }
  EXPORT_SYMBOL_GPL(mlx4_unregister_vlan);
  
+int mlx4_get_port_ib_caps(struct mlx4_dev *dev, u8 port, __be32 *caps)
+{
+       struct mlx4_cmd_mailbox *inmailbox, *outmailbox;
+       u8 *inbuf, *outbuf;
+       int err;
+
+       inmailbox = mlx4_alloc_cmd_mailbox(dev);
+       if (IS_ERR(inmailbox))
+               return PTR_ERR(inmailbox);
+
+       outmailbox = mlx4_alloc_cmd_mailbox(dev);
+       if (IS_ERR(outmailbox)) {
+               mlx4_free_cmd_mailbox(dev, inmailbox);
+               return PTR_ERR(outmailbox);
+       }
+
+       inbuf = inmailbox->buf;
+       outbuf = outmailbox->buf;
+       memset(inbuf, 0, 256);
+       memset(outbuf, 0, 256);
+       inbuf[0] = 1;
+       inbuf[1] = 1;
+       inbuf[2] = 1;
+       inbuf[3] = 1;
+       *(__be16 *) (&inbuf[16]) = cpu_to_be16(0x0015);
+       *(__be32 *) (&inbuf[20]) = cpu_to_be32(port);
+
+       err = mlx4_cmd_box(dev, inmailbox->dma, outmailbox->dma, port, 3,
+                          MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C);
+       if (!err)
+               *caps = *(__be32 *) (outbuf + 84);
+       mlx4_free_cmd_mailbox(dev, inmailbox);
+       mlx4_free_cmd_mailbox(dev, outmailbox);
+       return err;
+}
+
  int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port)
  {
         struct mlx4_cmd_mailbox *mailbox;
@@ -273,7 +309,8 @@ int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port)
                 ((u8 *) mailbox->buf)[3] = 6;
                 ((__be16 *) mailbox->buf)[4] = cpu_to_be16(1 << 15);
                 ((__be16 *) mailbox->buf)[6] = cpu_to_be16(1 << 15);
-       }
+       } else
+               ((__be32 *) mailbox->buf)[1] = dev->caps.ib_port_def_cap[port];
         err = mlx4_cmd(dev, mailbox->dma, port, is_eth, MLX4_CMD_SET_PORT,
                        MLX4_CMD_TIME_CLASS_B);
  
diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c

index b9bed82e1d214089f5b4e6682a965e11c781d6e5..b289a0a2b94563ea37b910c05deef15b6b61d0b6 100644 (file)
--- a/drivers/net/netx-eth.c
+++ b/drivers/net/netx-eth.c
@@ -401,6 +401,8 @@ static int netx_eth_drv_probe(struct platform_device *pdev)
         priv->xmac_base = priv->xc->xmac_base;
         priv->sram_base = priv->xc->sram_base;
  
+       spin_lock_init(&priv->lock);
+
         ret = pfifo_request(PFIFO_MASK(priv->id));
         if (ret) {
                 printk("unable to request PFIFO\n");
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c

index b37a498939ae7d1a16f6e1a5c0ad8545f6d32380..0418045166c348f15431b94fbfa06af894bf6820 100644 (file)
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -779,6 +779,7 @@ static struct pcmcia_device_id axnet_ids[] = {
         PCMCIA_DEVICE_PROD_ID12("IO DATA", "ETXPCM", 0x547e66dc, 0x233adac2),
         PCMCIA_DEVICE_PROD_ID12("Linksys", "EtherFast 10/100 PC Card (PCMPC100 V3)", 0x0733cc81, 0x232019a8),
         PCMCIA_DEVICE_PROD_ID12("MELCO", "LPC3-TX", 0x481e0094, 0xf91af609),
+       PCMCIA_DEVICE_PROD_ID12("NETGEAR", "FA411", 0x9aa79dc3, 0x40fad875),
         PCMCIA_DEVICE_PROD_ID12("PCMCIA", "100BASE", 0x281f1c5d, 0x7c2add04),
         PCMCIA_DEVICE_PROD_ID12("PCMCIA", "FastEtherCard", 0x281f1c5d, 0x7ef26116),
         PCMCIA_DEVICE_PROD_ID12("PCMCIA", "FEP501", 0x281f1c5d, 0x2e272058),
@@ -1174,7 +1175,6 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
   * ax_interrupt - handle the interrupts from an 8390
   * @irq: interrupt number
   * @dev_id: a pointer to the net_device
- * @regs: unused
   *
   * Handle the ether interface interrupts. We pull packets from
   * the 8390 via the card specific functions and fire them at the networking
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c

index e40d6301aa7aaf1084b9e0cef1bfbf7588d692c3..ce486f09449215dc08baec27aeb723dd0484b371 100644 (file)
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -1693,7 +1693,6 @@ static struct pcmcia_device_id pcnet_ids[] = {
         PCMCIA_DEVICE_PROD_ID12("National Semiconductor", "InfoMover NE4100", 0x36e1191f, 0xa6617ec8),
         PCMCIA_DEVICE_PROD_ID12("NEC", "PC-9801N-J12", 0x18df0ba0, 0xbc912d76),
         PCMCIA_DEVICE_PROD_ID12("NETGEAR", "FA410TX", 0x9aa79dc3, 0x60e5bc0e),
-       PCMCIA_DEVICE_PROD_ID12("NETGEAR", "FA411", 0x9aa79dc3, 0x40fad875),
         PCMCIA_DEVICE_PROD_ID12("Network Everywhere", "Fast Ethernet 10/100 PC Card", 0x820a67b6, 0x31ed1a5f),
         PCMCIA_DEVICE_PROD_ID12("NextCom K.K.", "Next Hawk", 0xaedaec74, 0xad050ef1),
         PCMCIA_DEVICE_PROD_ID12("PCMCIA", "10/100Mbps Ethernet Card", 0x281f1c5d, 0x6e41773b),
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c

index 536bda1f428b6c09360be41448f7b0b7d4c16679..289fc267edf30eb5094d24f416ca644c9494d401 100644 (file)
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -105,8 +105,6 @@ int mdiobus_register(struct mii_bus *bus)
                 return -EINVAL;
         }
  
-       bus->state = MDIOBUS_REGISTERED;
-
         mutex_init(&bus->mdio_lock);
  
         if (bus->reset)
@@ -123,6 +121,9 @@ int mdiobus_register(struct mii_bus *bus)
                 }
         }
  
+       if (!err)
+               bus->state = MDIOBUS_REGISTERED;
+
         pr_info("%s: probed\n", bus->name);
  
         return err;
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c

index 55bc24b234e324899b444298aeb37c847c8a9ba0..25acbbde4a6009f9c34926c0e2f89ca4e8066d6e 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -227,8 +227,17 @@ struct phy_device * get_phy_device(struct mii_bus *bus, int addr)
         if (r)
                 return ERR_PTR(r);
  
-       /* If the phy_id is all Fs or all 0s, there is no device there */
-       if ((0xffff == phy_id) || (0x00 == phy_id))
+       /* If the phy_id is mostly Fs, there is no device there */
+       if ((phy_id & 0x1fffffff) == 0x1fffffff)
+               return NULL;
+
+       /*
+        * Broken hardware is sometimes missing the pull down resistor on the
+        * MDIO line, which results in reads to non-existent devices returning
+        * 0 rather than 0xffff. Catch this here and treat 0 as a non-existent
+        * device as well.
+        */
+       if (phy_id == 0)
                 return NULL;
  
         dev = phy_device_create(bus, addr, phy_id);
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c

index 8874497b6bbfa76384c42bdfc4af9903991af497..dd3b2447e85a63936b49e24d2deaffa7e9ac960d 100644 (file)
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -34,6 +34,8 @@
  #define MII_VSC8244_IMASK_DUPLEX       0x1000
  #define MII_VSC8244_IMASK_MASK         0xf000
  
+#define MII_VSC8221_IMASK_MASK         0xa000
+
  /* Vitesse Interrupt Status Register */
  #define MII_VSC8244_ISTAT              0x1a
  #define MII_VSC8244_ISTAT_STATUS       0x8000
@@ -49,6 +51,12 @@
  #define MII_VSC8244_AUXCONSTAT_GBIT            0x0010
  #define MII_VSC8244_AUXCONSTAT_100             0x0008
  
+#define MII_VSC8221_AUXCONSTAT_INIT    0x0004 /* need to set this bit? */
+#define MII_VSC8221_AUXCONSTAT_RESERVED        0x0004
+
+#define PHY_ID_VSC8244                 0x000fc6c0
+#define PHY_ID_VSC8221                 0x000fc550
+
  MODULE_DESCRIPTION("Vitesse PHY driver");
  MODULE_AUTHOR("Kriston Carson");
  MODULE_LICENSE("GPL");
@@ -95,13 +103,15 @@ static int vsc824x_ack_interrupt(struct phy_device *phydev)
         return (err < 0) ? err : 0;
  }
  
-static int vsc824x_config_intr(struct phy_device *phydev)
+static int vsc82xx_config_intr(struct phy_device *phydev)
  {
         int err;
  
         if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
                 err = phy_write(phydev, MII_VSC8244_IMASK,
-                               MII_VSC8244_IMASK_MASK);
+                       phydev->drv->phy_id == PHY_ID_VSC8244 ?
+                               MII_VSC8244_IMASK_MASK :
+                               MII_VSC8221_IMASK_MASK);
         else {
                 /*
                  * The Vitesse PHY cannot clear the interrupt
@@ -120,7 +130,7 @@ static int vsc824x_config_intr(struct phy_device *phydev)
  
  /* Vitesse 824x */
  static struct phy_driver vsc8244_driver = {
-       .phy_id         = 0x000fc6c0,
+       .phy_id         = PHY_ID_VSC8244,
         .name           = "Vitesse VSC8244",
         .phy_id_mask    = 0x000fffc0,
         .features       = PHY_GBIT_FEATURES,
@@ -129,19 +139,55 @@ static struct phy_driver vsc8244_driver = {
         .config_aneg    = &genphy_config_aneg,
         .read_status    = &genphy_read_status,
         .ack_interrupt  = &vsc824x_ack_interrupt,
-       .config_intr    = &vsc824x_config_intr,
+       .config_intr    = &vsc82xx_config_intr,
         .driver         = { .owner = THIS_MODULE,},
  };
  
-static int __init vsc8244_init(void)
+static int vsc8221_config_init(struct phy_device *phydev)
  {
-       return phy_driver_register(&vsc8244_driver);
+       int err;
+
+       err = phy_write(phydev, MII_VSC8244_AUX_CONSTAT,
+                       MII_VSC8221_AUXCONSTAT_INIT);
+       return err;
+
+       /* Perhaps we should set EXT_CON1 based on the interface?
+          Options are 802.3Z SerDes or SGMII */
+}
+
+/* Vitesse 8221 */
+static struct phy_driver vsc8221_driver = {
+       .phy_id         = PHY_ID_VSC8221,
+       .phy_id_mask    = 0x000ffff0,
+       .name           = "Vitesse VSC8221",
+       .features       = PHY_GBIT_FEATURES,
+       .flags          = PHY_HAS_INTERRUPT,
+       .config_init    = &vsc8221_config_init,
+       .config_aneg    = &genphy_config_aneg,
+       .read_status    = &genphy_read_status,
+       .ack_interrupt  = &vsc824x_ack_interrupt,
+       .config_intr    = &vsc82xx_config_intr,
+       .driver         = { .owner = THIS_MODULE,},
+};
+
+static int __init vsc82xx_init(void)
+{
+       int err;
+
+       err = phy_driver_register(&vsc8244_driver);
+       if (err < 0)
+               return err;
+       err = phy_driver_register(&vsc8221_driver);
+       if (err < 0)
+               phy_driver_unregister(&vsc8244_driver);
+       return err;
  }
  
-static void __exit vsc8244_exit(void)
+static void __exit vsc82xx_exit(void)
  {
         phy_driver_unregister(&vsc8244_driver);
+       phy_driver_unregister(&vsc8221_driver);
  }
  
-module_init(vsc8244_init);
-module_exit(vsc8244_exit);
+module_init(vsc82xx_init);
+module_exit(vsc82xx_exit);
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c

index 7e857e938adb582ae432b26d35114e8099d51eb2..714a23035de1980a968c19a835712d587c007c17 100644 (file)
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -116,6 +116,7 @@ struct ppp {
         unsigned long   last_xmit;      /* jiffies when last pkt sent 9c */
         unsigned long   last_recv;      /* jiffies when last pkt rcvd a0 */
         struct net_device *dev;         /* network interface device a4 */
+       int             closing;        /* is device closing down? a8 */
  #ifdef CONFIG_PPP_MULTILINK
         int             nxchan;         /* next channel to send something on */
         u32             nxseq;          /* next sequence number to send */
@@ -995,7 +996,7 @@ ppp_xmit_process(struct ppp *ppp)
         struct sk_buff *skb;
  
         ppp_xmit_lock(ppp);
-       if (ppp->dev) {
+       if (!ppp->closing) {
                 ppp_push(ppp);
                 while (!ppp->xmit_pending
                        && (skb = skb_dequeue(&ppp->file.xq)))
@@ -1463,8 +1464,7 @@ static inline void
  ppp_do_recv(struct ppp *ppp, struct sk_buff *skb, struct channel *pch)
  {
         ppp_recv_lock(ppp);
-       /* ppp->dev == 0 means interface is closing down */
-       if (ppp->dev)
+       if (!ppp->closing)
                 ppp_receive_frame(ppp, skb, pch);
         else
                 kfree_skb(skb);
@@ -2498,18 +2498,16 @@ init_ppp_file(struct ppp_file *pf, int kind)
   */
  static void ppp_shutdown_interface(struct ppp *ppp)
  {
-       struct net_device *dev;
-
         mutex_lock(&all_ppp_mutex);
-       ppp_lock(ppp);
-       dev = ppp->dev;
-       ppp->dev = NULL;
-       ppp_unlock(ppp);
         /* This will call dev_close() for us. */
-       if (dev) {
-               unregister_netdev(dev);
-               free_netdev(dev);
-       }
+       ppp_lock(ppp);
+       if (!ppp->closing) {
+               ppp->closing = 1;
+               ppp_unlock(ppp);
+               unregister_netdev(ppp->dev);
+       } else
+               ppp_unlock(ppp);
+
         cardmap_set(&all_ppp_units, ppp->file.index, NULL);
         ppp->file.dead = 1;
         ppp->owner = NULL;
@@ -2554,7 +2552,7 @@ static void ppp_destroy_interface(struct ppp *ppp)
         if (ppp->xmit_pending)
                 kfree_skb(ppp->xmit_pending);
  
-       kfree(ppp);
+       free_netdev(ppp->dev);
  }
  
  /*
@@ -2616,7 +2614,7 @@ ppp_connect_channel(struct channel *pch, int unit)
         if (pch->file.hdrlen > ppp->file.hdrlen)
                 ppp->file.hdrlen = pch->file.hdrlen;
         hdrlen = pch->file.hdrlen + 2;  /* for protocol bytes */
-       if (ppp->dev && hdrlen > ppp->dev->hard_header_len)
+       if (hdrlen > ppp->dev->hard_header_len)
                 ppp->dev->hard_header_len = hdrlen;
         list_add_tail(&pch->clist, &ppp->channels);
         ++ppp->n_channels;
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c

index 185b1dff10a8d572494c391aebf515133a56b2ff..e98d9773158d287ba1ae35052dca968fc6cf5735 100644 (file)
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -1353,6 +1353,7 @@ static int pppol2tp_release(struct socket *sock)
                         kfree_skb(skb);
                         sock_put(sk);
                 }
+               sock_put(sk);
         }
  
         release_sock(sk);
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c

index fa3a460f8e2f4ddd08d735c481e12466d86c6dca..8e8337e8b072252d416a497f233c8aa9a6f04ae4 100644 (file)
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -1630,7 +1630,6 @@ sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev)
   *     sis900_interrupt - sis900 interrupt handler
   *     @irq: the irq number
   *     @dev_instance: the client data object
- *     @regs: snapshot of processor context
   *
   *     The interrupt handler does all of the Rx thread work,
   *     and cleans up after the Tx thread
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c

index b6435d0d71f9a067f887f7102159ae0d9a651ed5..07599b492359f16bc348f4271eb32793a3a362e0 100644 (file)
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -672,7 +672,6 @@ write_hash:
  /**
   * spider_net_prepare_tx_descr - fill tx descriptor with skb data
   * @card: card structure
- * @descr: descriptor structure to fill out
   * @skb: packet to use
   *
   * returns 0 on success, <0 on failure.
@@ -867,7 +866,6 @@ spider_net_release_tx_chain(struct spider_net_card *card, int brutal)
  /**
   * spider_net_kick_tx_dma - enables TX DMA processing
   * @card: card structure
- * @descr: descriptor address to enable TX processing at
   *
   * This routine will start the transmit DMA running if
   * it is not already running. This routine ned only be
@@ -1637,7 +1635,6 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg,
   * spider_net_interrupt - interrupt handler for spider_net
   * @irq: interrupt number
   * @ptr: pointer to net_device
- * @regs: PU registers
   *
   * returns IRQ_HANDLED, if interrupt was for driver, or IRQ_NONE, if no
   * interrupt found raised by card.
@@ -2419,7 +2416,6 @@ spider_net_undo_pci_setup(struct spider_net_card *card)
  
  /**
   * spider_net_setup_pci_dev - sets up the device in terms of PCI operations
- * @card: card structure
   * @pdev: PCI device
   *
   * Returns the card structure or NULL if any errors occur
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c

index 1d2ef8f47780904da79f621bf2ac09d284b50753..5a40f2d78beb1a9114478ac9e0385556c29d30bf 100644 (file)
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -1509,6 +1509,11 @@ static int __netdev_rx(struct net_device *dev, int *quota)
                 desc->status = 0;
                 np->rx_done = (np->rx_done + 1) % DONE_Q_SIZE;
         }
+
+       if (*quota == 0) {      /* out of rx quota */
+               retcode = 1;
+               goto out;
+       }
         writew(np->rx_done, np->base + CompletionQConsumerIdx);
  
   out:
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c

index 4291458955ef7ac9ae1cf5201b3e72a998d61bde..fed7eba65ead6268e292eddc66c73905d8e263c7 100644 (file)
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -1142,6 +1142,70 @@ static int gem_start_xmit(struct sk_buff *skb, struct net_device *dev)
         return NETDEV_TX_OK;
  }
  
+static void gem_pcs_reset(struct gem *gp)
+{
+       int limit;
+       u32 val;
+
+       /* Reset PCS unit. */
+       val = readl(gp->regs + PCS_MIICTRL);
+       val |= PCS_MIICTRL_RST;
+       writel(val, gp->regs + PCS_MIICTRL);
+
+       limit = 32;
+       while (readl(gp->regs + PCS_MIICTRL) & PCS_MIICTRL_RST) {
+               udelay(100);
+               if (limit-- <= 0)
+                       break;
+       }
+       if (limit <= 0)
+               printk(KERN_WARNING "%s: PCS reset bit would not clear.\n",
+                      gp->dev->name);
+}
+
+static void gem_pcs_reinit_adv(struct gem *gp)
+{
+       u32 val;
+
+       /* Make sure PCS is disabled while changing advertisement
+        * configuration.
+        */
+       val = readl(gp->regs + PCS_CFG);
+       val &= ~(PCS_CFG_ENABLE | PCS_CFG_TO);
+       writel(val, gp->regs + PCS_CFG);
+
+       /* Advertise all capabilities except assymetric
+        * pause.
+        */
+       val = readl(gp->regs + PCS_MIIADV);
+       val |= (PCS_MIIADV_FD | PCS_MIIADV_HD |
+               PCS_MIIADV_SP | PCS_MIIADV_AP);
+       writel(val, gp->regs + PCS_MIIADV);
+
+       /* Enable and restart auto-negotiation, disable wrapback/loopback,
+        * and re-enable PCS.
+        */
+       val = readl(gp->regs + PCS_MIICTRL);
+       val |= (PCS_MIICTRL_RAN | PCS_MIICTRL_ANE);
+       val &= ~PCS_MIICTRL_WB;
+       writel(val, gp->regs + PCS_MIICTRL);
+
+       val = readl(gp->regs + PCS_CFG);
+       val |= PCS_CFG_ENABLE;
+       writel(val, gp->regs + PCS_CFG);
+
+       /* Make sure serialink loopback is off.  The meaning
+        * of this bit is logically inverted based upon whether
+        * you are in Serialink or SERDES mode.
+        */
+       val = readl(gp->regs + PCS_SCTRL);
+       if (gp->phy_type == phy_serialink)
+               val &= ~PCS_SCTRL_LOOP;
+       else
+               val |= PCS_SCTRL_LOOP;
+       writel(val, gp->regs + PCS_SCTRL);
+}
+
  #define STOP_TRIES 32
  
  /* Must be invoked under gp->lock and gp->tx_lock. */
@@ -1168,6 +1232,9 @@ static void gem_reset(struct gem *gp)
  
         if (limit <= 0)
                 printk(KERN_ERR "%s: SW reset is ghetto.\n", gp->dev->name);
+
+       if (gp->phy_type == phy_serialink || gp->phy_type == phy_serdes)
+               gem_pcs_reinit_adv(gp);
  }
  
  /* Must be invoked under gp->lock and gp->tx_lock. */
@@ -1324,7 +1391,7 @@ static int gem_set_link_modes(struct gem *gp)
                    gp->phy_type == phy_serdes) {
                 u32 pcs_lpa = readl(gp->regs + PCS_MIILP);
  
-               if (pcs_lpa & PCS_MIIADV_FD)
+               if ((pcs_lpa & PCS_MIIADV_FD) || gp->phy_type == phy_serdes)
                         full_duplex = 1;
                 speed = SPEED_1000;
         }
@@ -1488,6 +1555,9 @@ static void gem_link_timer(unsigned long data)
                         val = readl(gp->regs + PCS_MIISTAT);
  
                 if ((val & PCS_MIISTAT_LS) != 0) {
+                       if (gp->lstate == link_up)
+                               goto restart;
+
                         gp->lstate = link_up;
                         netif_carrier_on(gp->dev);
                         (void)gem_set_link_modes(gp);
@@ -1708,61 +1778,8 @@ static void gem_init_phy(struct gem *gp)
                 if (gp->phy_mii.def && gp->phy_mii.def->ops->init)
                         gp->phy_mii.def->ops->init(&gp->phy_mii);
         } else {
-               u32 val;
-               int limit;
-
-               /* Reset PCS unit. */
-               val = readl(gp->regs + PCS_MIICTRL);
-               val |= PCS_MIICTRL_RST;
-               writeb(val, gp->regs + PCS_MIICTRL);
-
-               limit = 32;
-               while (readl(gp->regs + PCS_MIICTRL) & PCS_MIICTRL_RST) {
-                       udelay(100);
-                       if (limit-- <= 0)
-                               break;
-               }
-               if (limit <= 0)
-                       printk(KERN_WARNING "%s: PCS reset bit would not clear.\n",
-                              gp->dev->name);
-
-               /* Make sure PCS is disabled while changing advertisement
-                * configuration.
-                */
-               val = readl(gp->regs + PCS_CFG);
-               val &= ~(PCS_CFG_ENABLE | PCS_CFG_TO);
-               writel(val, gp->regs + PCS_CFG);
-
-               /* Advertise all capabilities except assymetric
-                * pause.
-                */
-               val = readl(gp->regs + PCS_MIIADV);
-               val |= (PCS_MIIADV_FD | PCS_MIIADV_HD |
-                       PCS_MIIADV_SP | PCS_MIIADV_AP);
-               writel(val, gp->regs + PCS_MIIADV);
-
-               /* Enable and restart auto-negotiation, disable wrapback/loopback,
-                * and re-enable PCS.
-                */
-               val = readl(gp->regs + PCS_MIICTRL);
-               val |= (PCS_MIICTRL_RAN | PCS_MIICTRL_ANE);
-               val &= ~PCS_MIICTRL_WB;
-               writel(val, gp->regs + PCS_MIICTRL);
-
-               val = readl(gp->regs + PCS_CFG);
-               val |= PCS_CFG_ENABLE;
-               writel(val, gp->regs + PCS_CFG);
-
-               /* Make sure serialink loopback is off.  The meaning
-                * of this bit is logically inverted based upon whether
-                * you are in Serialink or SERDES mode.
-                */
-               val = readl(gp->regs + PCS_SCTRL);
-               if (gp->phy_type == phy_serialink)
-                       val &= ~PCS_SCTRL_LOOP;
-               else
-                       val |= PCS_SCTRL_LOOP;
-               writel(val, gp->regs + PCS_SCTRL);
+               gem_pcs_reset(gp);
+               gem_pcs_reinit_adv(gp);
         }
  
         /* Default aneg parameters */
@@ -2680,6 +2697,21 @@ static int gem_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                 cmd->speed = 0;
                 cmd->duplex = cmd->port = cmd->phy_address =
                         cmd->transceiver = cmd->autoneg = 0;
+
+               /* serdes means usually a Fibre connector, with most fixed */
+               if (gp->phy_type == phy_serdes) {
+                       cmd->port = PORT_FIBRE;
+                       cmd->supported = (SUPPORTED_1000baseT_Half |
+                               SUPPORTED_1000baseT_Full |
+                               SUPPORTED_FIBRE | SUPPORTED_Autoneg |
+                               SUPPORTED_Pause | SUPPORTED_Asym_Pause);
+                       cmd->advertising = cmd->supported;
+                       cmd->transceiver = XCVR_INTERNAL;
+                       if (gp->lstate == link_up)
+                               cmd->speed = SPEED_1000;
+                       cmd->duplex = DUPLEX_FULL;
+                       cmd->autoneg = 1;
+               }
         }
         cmd->maxtxpkt = cmd->maxrxpkt = 0;
  
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c

index c41d68761364550ebe2d2d8376f2a8c293b5d799..e60498232b94f83dede6c6d4ae153d8d135d7b19 100644 (file)
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -1098,6 +1098,7 @@ static int TLan_StartTx( struct sk_buff *skb, struct net_device *dev )
         dma_addr_t      tail_list_phys;
         u8              *tail_buffer;
         unsigned long   flags;
+       unsigned int    txlen;
  
         if ( ! priv->phyOnline ) {
                 TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  %s PHY is not ready\n",
@@ -1108,6 +1109,7 @@ static int TLan_StartTx( struct sk_buff *skb, struct net_device *dev )
  
         if (skb_padto(skb, TLAN_MIN_FRAME_SIZE))
                 return 0;
+       txlen = max(skb->len, (unsigned int)TLAN_MIN_FRAME_SIZE);
  
         tail_list = priv->txList + priv->txTail;
         tail_list_phys = priv->txListDMA + sizeof(TLanList) * priv->txTail;
@@ -1125,16 +1127,16 @@ static int TLan_StartTx( struct sk_buff *skb, struct net_device *dev )
  
         if ( bbuf ) {
                 tail_buffer = priv->txBuffer + ( priv->txTail * TLAN_MAX_FRAME_SIZE );
-               skb_copy_from_linear_data(skb, tail_buffer, skb->len);
+               skb_copy_from_linear_data(skb, tail_buffer, txlen);
         } else {
                 tail_list->buffer[0].address = pci_map_single(priv->pciDev,
-                                                             skb->data, skb->len,
+                                                             skb->data, txlen,
                                                               PCI_DMA_TODEVICE);
                 TLan_StoreSKB(tail_list, skb);
         }
  
-       tail_list->frameSize = (u16) skb->len;
-       tail_list->buffer[0].count = TLAN_LAST_BUFFER | (u32) skb->len;
+       tail_list->frameSize = (u16) txlen;
+       tail_list->buffer[0].count = TLAN_LAST_BUFFER | (u32) txlen;
         tail_list->buffer[1].count = 0;
         tail_list->buffer[1].address = 0;
  
@@ -1431,7 +1433,9 @@ static u32 TLan_HandleTxEOF( struct net_device *dev, u16 host_int )
                 if ( ! bbuf ) {
                         struct sk_buff *skb = TLan_GetSKB(head_list);
                         pci_unmap_single(priv->pciDev, head_list->buffer[0].address,
-                                        skb->len, PCI_DMA_TODEVICE);
+                                        max(skb->len,
+                                            (unsigned int)TLAN_MIN_FRAME_SIZE),
+                                        PCI_DMA_TODEVICE);
                         dev_kfree_skb_any(skb);
                         head_list->buffer[8].address = 0;
                         head_list->buffer[9].address = 0;
@@ -2055,9 +2059,12 @@ static void TLan_FreeLists( struct net_device *dev )
                         list = priv->txList + i;
                         skb = TLan_GetSKB(list);
                         if ( skb ) {
-                               pci_unmap_single(priv->pciDev,
-                                                list->buffer[0].address, skb->len,
-                                                PCI_DMA_TODEVICE);
+                               pci_unmap_single(
+                                       priv->pciDev,
+                                       list->buffer[0].address,
+                                       max(skb->len,
+                                           (unsigned int)TLAN_MIN_FRAME_SIZE),
+                                       PCI_DMA_TODEVICE);
                                 dev_kfree_skb_any( skb );
                                 list->buffer[8].address = 0;
                                 list->buffer[9].address = 0;
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c

index cfd4d052d666ea8cbda45b37c541cb2592dad3a0..2d14255eb103d60096256eee89c78bbfe68f8550 100644 (file)
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -240,6 +240,10 @@ static u64 ath5k_get_tsf(struct ieee80211_hw *hw);
  static void ath5k_reset_tsf(struct ieee80211_hw *hw);
  static int ath5k_beacon_update(struct ieee80211_hw *hw,
                 struct sk_buff *skb);
+static void ath5k_bss_info_changed(struct ieee80211_hw *hw,
+               struct ieee80211_vif *vif,
+               struct ieee80211_bss_conf *bss_conf,
+               u32 changes);
  
  static struct ieee80211_ops ath5k_hw_ops = {
         .tx             = ath5k_tx,
@@ -256,6 +260,7 @@ static struct ieee80211_ops ath5k_hw_ops = {
         .get_tx_stats   = ath5k_get_tx_stats,
         .get_tsf        = ath5k_get_tsf,
         .reset_tsf      = ath5k_reset_tsf,
+       .bss_info_changed = ath5k_bss_info_changed,
  };
  
  /*
@@ -2942,7 +2947,7 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,
                 sc->opmode != NL80211_IFTYPE_MESH_POINT &&
                 test_bit(ATH_STAT_PROMISC, sc->status))
                 rfilt |= AR5K_RX_FILTER_PROM;
-       if (sc->opmode == NL80211_IFTYPE_STATION ||
+       if ((sc->opmode == NL80211_IFTYPE_STATION && sc->assoc) ||
                 sc->opmode == NL80211_IFTYPE_ADHOC) {
                 rfilt |= AR5K_RX_FILTER_BEACON;
         }
@@ -3083,4 +3088,32 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb)
  end:
         return ret;
  }
+static void
+set_beacon_filter(struct ieee80211_hw *hw, bool enable)
+{
+       struct ath5k_softc *sc = hw->priv;
+       struct ath5k_hw *ah = sc->ah;
+       u32 rfilt;
+       rfilt = ath5k_hw_get_rx_filter(ah);
+       if (enable)
+               rfilt |= AR5K_RX_FILTER_BEACON;
+       else
+               rfilt &= ~AR5K_RX_FILTER_BEACON;
+       ath5k_hw_set_rx_filter(ah, rfilt);
+       sc->filter_flags = rfilt;
+}
  
+static void ath5k_bss_info_changed(struct ieee80211_hw *hw,
+                                   struct ieee80211_vif *vif,
+                                   struct ieee80211_bss_conf *bss_conf,
+                                   u32 changes)
+{
+       struct ath5k_softc *sc = hw->priv;
+       if (changes & BSS_CHANGED_ASSOC) {
+               mutex_lock(&sc->lock);
+               sc->assoc = bss_conf->assoc;
+               if (sc->opmode == NL80211_IFTYPE_STATION)
+                       set_beacon_filter(hw, sc->assoc);
+               mutex_unlock(&sc->lock);
+       }
+}
diff --git a/drivers/net/wireless/ath5k/base.h b/drivers/net/wireless/ath5k/base.h

index 06d1054ca94b9cc525ee4f9516c5363b26d39fa2..facc60ddada2824ceba476c8efcda1a66a398a1d 100644 (file)
--- a/drivers/net/wireless/ath5k/base.h
+++ b/drivers/net/wireless/ath5k/base.h
@@ -179,6 +179,7 @@ struct ath5k_softc {
  
         struct timer_list       calib_tim;      /* calibration timer */
         int                     power_level;    /* Requested tx power in dbm */
+       bool                    assoc;          /* assocate state */
  };
  
  #define ath5k_hw_hasbssidmask(_ah) \
diff --git a/drivers/net/wireless/ath5k/debug.c b/drivers/net/wireless/ath5k/debug.c

index 19980cbd5d5fe6292367733c9423faffe735aaae..ccaeb5c219d2ddda8ea8e7f160a8f9a472c8c89a 100644 (file)
--- a/drivers/net/wireless/ath5k/debug.c
+++ b/drivers/net/wireless/ath5k/debug.c
@@ -417,19 +417,19 @@ ath5k_debug_init_device(struct ath5k_softc *sc)
         sc->debug.debugfs_phydir = debugfs_create_dir(wiphy_name(sc->hw->wiphy),
                                 ath5k_global_debugfs);
  
-       sc->debug.debugfs_debug = debugfs_create_file("debug", 0666,
+       sc->debug.debugfs_debug = debugfs_create_file("debug", S_IWUSR | S_IRUGO,
                                 sc->debug.debugfs_phydir, sc, &fops_debug);
  
-       sc->debug.debugfs_registers = debugfs_create_file("registers", 0444,
+       sc->debug.debugfs_registers = debugfs_create_file("registers", S_IRUGO,
                                 sc->debug.debugfs_phydir, sc, &fops_registers);
  
-       sc->debug.debugfs_tsf = debugfs_create_file("tsf", 0666,
+       sc->debug.debugfs_tsf = debugfs_create_file("tsf", S_IWUSR | S_IRUGO,
                                 sc->debug.debugfs_phydir, sc, &fops_tsf);
  
-       sc->debug.debugfs_beacon = debugfs_create_file("beacon", 0666,
+       sc->debug.debugfs_beacon = debugfs_create_file("beacon", S_IWUSR | S_IRUGO,
                                 sc->debug.debugfs_phydir, sc, &fops_beacon);
  
-       sc->debug.debugfs_reset = debugfs_create_file("reset", 0222,
+       sc->debug.debugfs_reset = debugfs_create_file("reset", S_IWUSR,
                                 sc->debug.debugfs_phydir, sc, &fops_reset);
  }
  
diff --git a/drivers/net/wireless/ath9k/beacon.c b/drivers/net/wireless/ath9k/beacon.c

index 9e15c30bbc065bcb0326ffee6860efda07242f64..4dd1c1bda0fb80958b16066d882d86c7219a3b3e 100644 (file)
--- a/drivers/net/wireless/ath9k/beacon.c
+++ b/drivers/net/wireless/ath9k/beacon.c
@@ -170,7 +170,7 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id)
         skb = (struct sk_buff *)bf->bf_mpdu;
         if (skb) {
                 pci_unmap_single(sc->pdev, bf->bf_dmacontext,
-                                skb_end_pointer(skb) - skb->head,
+                                skb->len,
                                  PCI_DMA_TODEVICE);
         }
  
@@ -193,7 +193,7 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id)
  
         bf->bf_buf_addr = bf->bf_dmacontext =
                 pci_map_single(sc->pdev, skb->data,
-                              skb_end_pointer(skb) - skb->head,
+                              skb->len,
                                PCI_DMA_TODEVICE);
  
         skb = ieee80211_get_buffered_bc(sc->hw, avp->av_if_data);
@@ -352,7 +352,7 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id)
         if (bf->bf_mpdu != NULL) {
                 skb = (struct sk_buff *)bf->bf_mpdu;
                 pci_unmap_single(sc->pdev, bf->bf_dmacontext,
-                                skb_end_pointer(skb) - skb->head,
+                                skb->len,
                                  PCI_DMA_TODEVICE);
                 dev_kfree_skb_any(skb);
                 bf->bf_mpdu = NULL;
@@ -412,7 +412,7 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id)
  
         bf->bf_buf_addr = bf->bf_dmacontext =
                 pci_map_single(sc->pdev, skb->data,
-                              skb_end_pointer(skb) - skb->head,
+                              skb->len,
                                PCI_DMA_TODEVICE);
         bf->bf_mpdu = skb;
  
@@ -439,7 +439,7 @@ void ath_beacon_return(struct ath_softc *sc, struct ath_vap *avp)
                 if (bf->bf_mpdu != NULL) {
                         struct sk_buff *skb = (struct sk_buff *)bf->bf_mpdu;
                         pci_unmap_single(sc->pdev, bf->bf_dmacontext,
-                                        skb_end_pointer(skb) - skb->head,
+                                        skb->len,
                                          PCI_DMA_TODEVICE);
                         dev_kfree_skb_any(skb);
                         bf->bf_mpdu = NULL;
diff --git a/drivers/net/wireless/ath9k/recv.c b/drivers/net/wireless/ath9k/recv.c

index 4983402af559871f8ed526480794235dfc37959e..504a0444d89f853672a4abd71886cc17e3068ff9 100644 (file)
--- a/drivers/net/wireless/ath9k/recv.c
+++ b/drivers/net/wireless/ath9k/recv.c
@@ -49,10 +49,12 @@ static void ath_rx_buf_link(struct ath_softc *sc, struct ath_buf *bf)
         ASSERT(skb != NULL);
         ds->ds_vdata = skb->data;
  
-       /* setup rx descriptors */
+       /* setup rx descriptors. The sc_rxbufsize here tells the harware
+        * how much data it can DMA to us and that we are prepared
+        * to process */
         ath9k_hw_setuprxdesc(ah,
                              ds,
-                            skb_tailroom(skb),   /* buffer size */
+                            sc->sc_rxbufsize,
                              0);
  
         if (sc->sc_rxlink == NULL)
@@ -398,6 +400,13 @@ static struct sk_buff *ath_rxbuf_alloc(struct ath_softc *sc,
          * in rx'd frames.
          */
  
+       /* Note: the kernel can allocate a value greater than
+        * what we ask it to give us. We really only need 4 KB as that
+        * is this hardware supports and in fact we need at least 3849
+        * as that is the MAX AMSDU size this hardware supports.
+        * Unfortunately this means we may get 8 KB here from the
+        * kernel... and that is actually what is observed on some
+        * systems :( */
         skb = dev_alloc_skb(len + sc->sc_cachelsz - 1);
         if (skb != NULL) {
                 off = ((unsigned long) skb->data) % sc->sc_cachelsz;
@@ -456,7 +465,7 @@ static int ath_rx_indicate(struct ath_softc *sc,
         if (nskb != NULL) {
                 bf->bf_mpdu = nskb;
                 bf->bf_buf_addr = pci_map_single(sc->pdev, nskb->data,
-                                        skb_end_pointer(nskb) - nskb->head,
+                                        sc->sc_rxbufsize,
                                          PCI_DMA_FROMDEVICE);
                 bf->bf_dmacontext = bf->bf_buf_addr;
                 ATH_RX_CONTEXT(nskb)->ctx_rxbuf = bf;
@@ -542,7 +551,7 @@ int ath_rx_init(struct ath_softc *sc, int nbufs)
  
                         bf->bf_mpdu = skb;
                         bf->bf_buf_addr = pci_map_single(sc->pdev, skb->data,
-                                        skb_end_pointer(skb) - skb->head,
+                                        sc->sc_rxbufsize,
                                          PCI_DMA_FROMDEVICE);
                         bf->bf_dmacontext = bf->bf_buf_addr;
                         ATH_RX_CONTEXT(skb)->ctx_rxbuf = bf;
@@ -1007,7 +1016,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush)
  
                 pci_dma_sync_single_for_cpu(sc->pdev,
                                             bf->bf_buf_addr,
-                                           skb_tailroom(skb),
+                                           sc->sc_rxbufsize,
                                             PCI_DMA_FROMDEVICE);
                 pci_unmap_single(sc->pdev,
                                  bf->bf_buf_addr,
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c

index dcce3542d5a771d9eb24753d8d464854bb4e6639..7a9f901d4ff6dee5cf15ae78d0f9bb763344bdd7 100644 (file)
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -3897,6 +3897,7 @@ static int ipw_disassociate(void *data)
         if (!(priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)))
                 return 0;
         ipw_send_disassociate(data, 0);
+       netif_carrier_off(priv->net_dev);
         return 1;
  }
  
@@ -10190,6 +10191,9 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
         u16 remaining_bytes;
         int fc;
  
+       if (!(priv->status & STATUS_ASSOCIATED))
+               goto drop;
+
         hdr_len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
         switch (priv->ieee->iw_mode) {
         case IW_MODE_ADHOC:
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c

index 444c5cc05f03c671c2548a4f87ffef55c3c8f0d0..c4c0371c763b5d3b0e1ee13bfd1fcc1a386a6a6f 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1384,9 +1384,11 @@ void iwl_rx_handle(struct iwl_priv *priv)
  
                 rxq->queue[i] = NULL;
  
-               pci_dma_sync_single_for_cpu(priv->pci_dev, rxb->aligned_dma_addr,
-                                           priv->hw_params.rx_buf_size,
-                                           PCI_DMA_FROMDEVICE);
+               dma_sync_single_range_for_cpu(
+                               &priv->pci_dev->dev, rxb->real_dma_addr,
+                               rxb->aligned_dma_addr - rxb->real_dma_addr,
+                               priv->hw_params.rx_buf_size,
+                               PCI_DMA_FROMDEVICE);
                 pkt = (struct iwl_rx_packet *)rxb->skb->data;
  
                 /* Reclaim a command buffer only if this packet is a response
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c

index 4c312c55f90cf49838af8954e0e891a0893af99c..01a84585133834a45c603a0c55763b7864441181 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -290,6 +290,9 @@ void iwl_clear_stations_table(struct iwl_priv *priv)
         priv->num_stations = 0;
         memset(priv->stations, 0, sizeof(priv->stations));
  
+       /* clean ucode key table bit map */
+       priv->ucode_key_table = 0;
+
         spin_unlock_irqrestore(&priv->sta_lock, flags);
  }
  EXPORT_SYMBOL(iwl_clear_stations_table);
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c

index 61797f3f8d5c9a475b85d7fb980fe6a16dbb804a..26f7084d3011b7f8f514a4e23090ddfce33ca62c 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -475,7 +475,7 @@ static int iwl_get_free_ucode_key_index(struct iwl_priv *priv)
                 if (!test_and_set_bit(i, &priv->ucode_key_table))
                         return i;
  
-       return -1;
+       return WEP_INVALID_OFFSET;
  }
  
  int iwl_send_static_wepkey_cmd(struct iwl_priv *priv, u8 send_if_empty)
@@ -620,6 +620,9 @@ static int iwl_set_wep_dynamic_key_info(struct iwl_priv *priv,
         /* else, we are overriding an existing key => no need to allocated room
          * in uCode. */
  
+       WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,
+               "no space for new kew");
+
         priv->stations[sta_id].sta.key.key_flags = key_flags;
         priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
         priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
@@ -637,6 +640,7 @@ static int iwl_set_ccmp_dynamic_key_info(struct iwl_priv *priv,
  {
         unsigned long flags;
         __le16 key_flags = 0;
+       int ret;
  
         key_flags |= (STA_KEY_FLG_CCMP | STA_KEY_FLG_MAP_KEY_MSK);
         key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS);
@@ -664,14 +668,18 @@ static int iwl_set_ccmp_dynamic_key_info(struct iwl_priv *priv,
         /* else, we are overriding an existing key => no need to allocated room
          * in uCode. */
  
+       WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,
+               "no space for new kew");
+
         priv->stations[sta_id].sta.key.key_flags = key_flags;
         priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
         priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
  
+       ret = iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC);
+
         spin_unlock_irqrestore(&priv->sta_lock, flags);
  
-       IWL_DEBUG_INFO("hwcrypto: modify ucode station key info\n");
-       return iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC);
+       return ret;
  }
  
  static int iwl_set_tkip_dynamic_key_info(struct iwl_priv *priv,
@@ -696,6 +704,9 @@ static int iwl_set_tkip_dynamic_key_info(struct iwl_priv *priv,
         /* else, we are overriding an existing key => no need to allocated room
          * in uCode. */
  
+       WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,
+               "no space for new kew");
+
         /* This copy is acutally not needed: we get the key with each TX */
         memcpy(priv->stations[sta_id].keyinfo.key, keyconf->key, 16);
  
@@ -734,6 +745,13 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv,
                 return 0;
         }
  
+       if (priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET) {
+               IWL_WARNING("Removing wrong key %d 0x%x\n",
+                           keyconf->keyidx, key_flags);
+               spin_unlock_irqrestore(&priv->sta_lock, flags);
+               return 0;
+       }
+
         if (!test_and_clear_bit(priv->stations[sta_id].sta.key.key_offset,
                 &priv->ucode_key_table))
                 IWL_ERROR("index %d not used in uCode key table.\n",
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c

index fe1867b25ff7fb522e57927dfa6180f5f0f177bb..cac732f4047f524b3b575a1e86dbee1d7fd68644 100644 (file)
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -615,7 +615,7 @@ static int filter_ack(struct ieee80211_hw *hw, struct ieee80211_hdr *rx_hdr,
                 struct ieee80211_hdr *tx_hdr;
  
                 tx_hdr = (struct ieee80211_hdr *)skb->data;
-               if (likely(!compare_ether_addr(tx_hdr->addr2, rx_hdr->addr1)))
+               if (likely(!memcmp(tx_hdr->addr2, rx_hdr->addr1, ETH_ALEN)))
                 {
                         __skb_unlink(skb, q);
                         tx_status(hw, skb, IEEE80211_TX_STAT_ACK, stats->signal, 1);
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c

index e2e95b36a603e227be8d0d6b03b30996c9f00c6f..101ed49a2d15609937acbcf964274ed3f12d8360 100644 (file)
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -70,6 +70,8 @@ static int __devinit netmos_parallel_init(struct pci_dev *dev, struct parport_pc
          * parallel ports and <S> is the number of serial ports.
          */
         card->numports = (dev->subsystem_device & 0xf0) >> 4;
+       if (card->numports > ARRAY_SIZE(card->addr))
+               card->numports = ARRAY_SIZE(card->addr);
         return 0;
  }
  
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h

index f9e244da30aef9ea9e170c5cce58a524ab5f87a6..9bcb6cbd5aa93988e39bdf2b8c9285512d74df22 100644 (file)
--- a/drivers/pci/hotplug/acpiphp.h
+++ b/drivers/pci/hotplug/acpiphp.h
@@ -113,7 +113,7 @@ struct acpiphp_slot {
  
         u8              device;         /* pci device# */
  
-       u32             sun;            /* ACPI _SUN (slot unique number) */
+       unsigned long long sun;         /* ACPI _SUN (slot unique number) */
         u32             flags;          /* see below */
  };
  
diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c

index 95b536a23d25d8d9f76d5aa757a411540017fef0..43c10bd261b48612b4ec2fa2620fa14207628805 100644 (file)
--- a/drivers/pci/hotplug/acpiphp_core.c
+++ b/drivers/pci/hotplug/acpiphp_core.c
@@ -337,7 +337,7 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot)
         slot->hotplug_slot->info->cur_bus_speed = PCI_SPEED_UNKNOWN;
  
         acpiphp_slot->slot = slot;
-       snprintf(name, SLOT_NAME_SIZE, "%u", slot->acpi_slot->sun);
+       snprintf(name, SLOT_NAME_SIZE, "%llu", slot->acpi_slot->sun);
  
         retval = pci_hp_register(slot->hotplug_slot,
                                         acpiphp_slot->bridge->pci_bus,
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c

index 955aae4071f7a64eeb5cb716aaacf8ebb26c7a11..3affc6472e65253c94b77bcc8aa97061480b85d7 100644 (file)
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -255,13 +255,13 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
  
                 bridge->nr_slots++;
  
-               dbg("found ACPI PCI Hotplug slot %d at PCI %04x:%02x:%02x\n",
+               dbg("found ACPI PCI Hotplug slot %llu at PCI %04x:%02x:%02x\n",
                                 slot->sun, pci_domain_nr(bridge->pci_bus),
                                 bridge->pci_bus->number, slot->device);
                 retval = acpiphp_register_hotplug_slot(slot);
                 if (retval) {
                         if (retval == -EBUSY)
-                               warn("Slot %d already registered by another "
+                               warn("Slot %llu already registered by another "
                                         "hotplug driver\n", slot->sun);
                         else
                                 warn("acpiphp_register_hotplug_slot failed "
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c

index c892daae74d6dc325a77dc9050c0f6cd8a5105c8..633e743442ac711d0b02d6b85a8252a1ee74dbb5 100644 (file)
--- a/drivers/pci/hotplug/ibmphp_core.c
+++ b/drivers/pci/hotplug/ibmphp_core.c
@@ -1402,10 +1402,6 @@ static int __init ibmphp_init(void)
                 goto error;
         }
  
-       /* lock ourselves into memory with a module 
-        * count of -1 so that no one can unload us. */
-       module_put(THIS_MODULE);
-
  exit:
         return rc;
  
@@ -1423,4 +1419,3 @@ static void __exit ibmphp_exit(void)
  }
  
  module_init(ibmphp_init);
-module_exit(ibmphp_exit);
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c

index 4b23bc39b11e513be82a54df9f01db2b268b5bb4..39cf248d24e3cd0592b61dee392f748e441301c0 100644 (file)
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -432,18 +432,19 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
                 goto err_out_release_ctlr;
         }
  
+       /* Check if slot is occupied */
         t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset);
-
-       t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */
-       if (value && pciehp_force) {
-               rc = pciehp_enable_slot(t_slot);
-               if (rc) /* -ENODEV: shouldn't happen, but deal with it */
-                       value = 0;
-       }
-       if ((POWER_CTRL(ctrl)) && !value) {
-               rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot if not occupied*/
-               if (rc)
-                       goto err_out_free_ctrl_slot;
+       t_slot->hpc_ops->get_adapter_status(t_slot, &value);
+       if (value) {
+               if (pciehp_force)
+                       pciehp_enable_slot(t_slot);
+       } else {
+               /* Power off slot if not occupied */
+               if (POWER_CTRL(ctrl)) {
+                       rc = t_slot->hpc_ops->power_off_slot(t_slot);
+                       if (rc)
+                               goto err_out_free_ctrl_slot;
+               }
         }
  
         return 0;
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c

index dfc63d01f20a0a7c072f9a65039f2776537b3e8e..aac7006949f15c9eb52b56968a4dca6ef812e3c2 100644 (file)
--- a/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@ -252,7 +252,7 @@ static void report_resume(struct pci_dev *dev, void *data)
  
         if (!dev->driver ||
                 !dev->driver->err_handler ||
-               !dev->driver->err_handler->slot_reset)
+               !dev->driver->err_handler->resume)
                 return;
  
         err_handler = dev->driver->err_handler;
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c

index 8f63f4c6b85f64e3f4d91d76ca7da90ac142c51e..9aad608bcf3fb947dac183a2153312a6ce5db962 100644 (file)
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -16,6 +16,7 @@
  #include <linux/pm.h>
  #include <linux/init.h>
  #include <linux/slab.h>
+#include <linux/jiffies.h>
  #include <linux/pci-aspm.h>
  #include "../pci.h"
  
@@ -161,11 +162,12 @@ static void pcie_check_clock_pm(struct pci_dev *pdev)
   */
  static void pcie_aspm_configure_common_clock(struct pci_dev *pdev)
  {
-       int pos, child_pos;
+       int pos, child_pos, i = 0;
         u16 reg16 = 0;
         struct pci_dev *child_dev;
         int same_clock = 1;
-
+       unsigned long start_jiffies;
+       u16 child_regs[8], parent_reg;
         /*
          * all functions of a slot should have the same Slot Clock
          * Configuration, so just check one function
@@ -191,16 +193,19 @@ static void pcie_aspm_configure_common_clock(struct pci_dev *pdev)
                 child_pos = pci_find_capability(child_dev, PCI_CAP_ID_EXP);
                 pci_read_config_word(child_dev, child_pos + PCI_EXP_LNKCTL,
                         &reg16);
+               child_regs[i] = reg16;
                 if (same_clock)
                         reg16 |= PCI_EXP_LNKCTL_CCC;
                 else
                         reg16 &= ~PCI_EXP_LNKCTL_CCC;
                 pci_write_config_word(child_dev, child_pos + PCI_EXP_LNKCTL,
                         reg16);
+               i++;
         }
  
         /* Configure upstream component */
         pci_read_config_word(pdev, pos + PCI_EXP_LNKCTL, &reg16);
+       parent_reg = reg16;
         if (same_clock)
                 reg16 |= PCI_EXP_LNKCTL_CCC;
         else
@@ -212,12 +217,30 @@ static void pcie_aspm_configure_common_clock(struct pci_dev *pdev)
         pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, reg16);
  
         /* Wait for link training end */
-       while (1) {
+       /* break out after waiting for 1 second */
+       start_jiffies = jiffies;
+       while ((jiffies - start_jiffies) < HZ) {
                 pci_read_config_word(pdev, pos + PCI_EXP_LNKSTA, &reg16);
                 if (!(reg16 & PCI_EXP_LNKSTA_LT))
                         break;
                 cpu_relax();
         }
+       /* training failed -> recover */
+       if ((jiffies - start_jiffies) >= HZ) {
+               dev_printk (KERN_ERR, &pdev->dev, "ASPM: Could not configure"
+                           " common clock\n");
+               i = 0;
+               list_for_each_entry(child_dev, &pdev->subordinate->devices,
+                                   bus_list) {
+                       child_pos = pci_find_capability(child_dev,
+                                                       PCI_CAP_ID_EXP);
+                       pci_write_config_word(child_dev,
+                                             child_pos + PCI_EXP_LNKCTL,
+                                             child_regs[i]);
+                       i++;
+               }
+               pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, parent_reg);
+       }
  }
  
  /*
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c

index 5049a47030ac9ec0ca84c82ee2f7fb39854602c6..5f4f85f56cb7c7b592f4583f61f7a0d0657ea9d7 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -22,6 +22,7 @@
  #include <linux/delay.h>
  #include <linux/acpi.h>
  #include <linux/kallsyms.h>
+#include <linux/dmi.h>
  #include "pci.h"
  
  int isa_dma_bridge_buggy;
@@ -1828,6 +1829,22 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SERVERWORKS,
                          PCI_DEVICE_ID_SERVERWORKS_HT1000_PXB,
                          ht_enable_msi_mapping);
  
+/* The P5N32-SLI Premium motherboard from Asus has a problem with msi
+ * for the MCP55 NIC. It is not yet determined whether the msi problem
+ * also affects other devices. As for now, turn off msi for this device.
+ */
+static void __devinit nvenet_msi_disable(struct pci_dev *dev)
+{
+       if (dmi_name_in_vendors("P5N32-SLI PREMIUM")) {
+               dev_info(&dev->dev,
+                        "Disabling msi for MCP55 NIC on P5N32-SLI Premium\n");
+               dev->no_msi = 1;
+       }
+}
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NVIDIA,
+                       PCI_DEVICE_ID_NVIDIA_NVENET_15,
+                       nvenet_msi_disable);
+
  static void __devinit nv_msi_ht_cap_quirk(struct pci_dev *dev)
  {
         struct pci_dev *host_bridge;
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c

index 4dd1c3e157aec6d6c136c02255faed19d46c3dc1..5a8ccb4f604deed50495b61ced5ba403e59e9484 100644 (file)
--- a/drivers/pci/slot.c
+++ b/drivers/pci/slot.c
@@ -253,6 +253,7 @@ placeholder:
                  __func__, pci_domain_nr(parent), parent->number, slot_nr);
  
  out:
+       kfree(slot_name);
         up_write(&pci_bus_sem);
         return slot;
  err:
diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c

index bb7338863fb9aabeedfbb941b59f026176919673..b59d4115d20f541e5176ba309cb694687c1c1d17 100644 (file)
--- a/drivers/pcmcia/bfin_cf_pcmcia.c
+++ b/drivers/pcmcia/bfin_cf_pcmcia.c
@@ -334,6 +334,6 @@ static void __exit bfin_cf_exit(void)
  module_init(bfin_cf_init);
  module_exit(bfin_cf_exit);
  
-MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>")
+MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
  MODULE_DESCRIPTION("BFIN CF/PCMCIA Driver");
  MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c

index 341d7a5b45a28c3ecab9de39f9c0e515e5ac4331..4e91419e8911c50bcfbc18aa1d536e88c41178c0 100644 (file)
--- a/drivers/rtc/rtc-ds1672.c
+++ b/drivers/rtc/rtc-ds1672.c
@@ -209,12 +209,18 @@ static int ds1672_probe(struct i2c_client *client,
         return err;
  }
  
+static struct i2c_device_id ds1672_id[] = {
+       { "ds1672", 0 },
+       { }
+};
+
  static struct i2c_driver ds1672_driver = {
         .driver = {
                    .name = "rtc-ds1672",
                    },
         .probe = &ds1672_probe,
         .remove = &ds1672_remove,
+       .id_table = ds1672_id,
  };
  
  static int __init ds1672_init(void)
diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c

index 2cd77ab8fc66b06e43d3b908884a9f4fe8603ca1..054e05294af8566e30d3834fc23c793b615239f9 100644 (file)
--- a/drivers/rtc/rtc-isl1208.c
+++ b/drivers/rtc/rtc-isl1208.c
@@ -328,6 +328,13 @@ isl1208_i2c_set_time(struct i2c_client *client, struct rtc_time const *tm)
         int sr;
         u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
  
+       /* The clock has an 8 bit wide bcd-coded register (they never learn)
+        * for the year. tm_year is an offset from 1900 and we are interested
+        * in the 2000-2099 range, so any value less than 100 is invalid.
+        */
+       if (tm->tm_year < 100)
+               return -EINVAL;
+
         regs[ISL1208_REG_SC] = bin2bcd(tm->tm_sec);
         regs[ISL1208_REG_MN] = bin2bcd(tm->tm_min);
         regs[ISL1208_REG_HR] = bin2bcd(tm->tm_hour) | ISL1208_REG_HR_MIL;
diff --git a/drivers/rtc/rtc-max6900.c b/drivers/rtc/rtc-max6900.c

index 80782798763fa2528993ed652b0cf337e9d79008..a4f6665ab3c56760bbf72f63e05649d69dda3a03 100644 (file)
--- a/drivers/rtc/rtc-max6900.c
+++ b/drivers/rtc/rtc-max6900.c
@@ -247,12 +247,18 @@ max6900_probe(struct i2c_client *client, const struct i2c_device_id *id)
         return 0;
  }
  
+static struct i2c_device_id max6900_id[] = {
+       { "max6900", 0 },
+       { }
+};
+
  static struct i2c_driver max6900_driver = {
         .driver = {
                    .name = "rtc-max6900",
                    },
         .probe = max6900_probe,
         .remove = max6900_remove,
+       .id_table = max6900_id,
  };
  
  static int __init max6900_init(void)
diff --git a/drivers/rtc/rtc-starfire.c b/drivers/rtc/rtc-starfire.c

index 7ccb0dd700af250946f3ad160ddf9237a2c88ca2..5be98bfd7ed3ec6149b89bd6df1a268d52748776 100644 (file)
--- a/drivers/rtc/rtc-starfire.c
+++ b/drivers/rtc/rtc-starfire.c
@@ -6,7 +6,6 @@
  #include <linux/kernel.h>
  #include <linux/module.h>
  #include <linux/init.h>
-#include <linux/time.h>
  #include <linux/rtc.h>
  #include <linux/platform_device.h>
  
@@ -16,11 +15,6 @@ MODULE_AUTHOR("David S. Miller <davem@davemloft.net>");
  MODULE_DESCRIPTION("Starfire RTC driver");
  MODULE_LICENSE("GPL");
  
-struct starfire_rtc {
-       struct rtc_device       *rtc;
-       spinlock_t              lock;
-};
-
  static u32 starfire_get_time(void)
  {
         static char obp_gettod[32];
@@ -35,64 +29,31 @@ static u32 starfire_get_time(void)
  
  static int starfire_read_time(struct device *dev, struct rtc_time *tm)
  {
-       struct starfire_rtc *p = dev_get_drvdata(dev);
-       unsigned long flags, secs;
-
-       spin_lock_irqsave(&p->lock, flags);
-       secs = starfire_get_time();
-       spin_unlock_irqrestore(&p->lock, flags);
-
-       rtc_time_to_tm(secs, tm);
-
-       return 0;
-}
-
-static int starfire_set_time(struct device *dev, struct rtc_time *tm)
-{
-       unsigned long secs;
-       int err;
-
-       err = rtc_tm_to_time(tm, &secs);
-       if (err)
-               return err;
-
-       /* Do nothing, time is set using the service processor
-        * console on this platform.
-        */
-       return 0;
+       rtc_time_to_tm(starfire_get_time(), tm);
+       return rtc_valid_tm(tm);
  }
  
  static const struct rtc_class_ops starfire_rtc_ops = {
         .read_time      = starfire_read_time,
-       .set_time       = starfire_set_time,
  };
  
-static int __devinit starfire_rtc_probe(struct platform_device *pdev)
+static int __init starfire_rtc_probe(struct platform_device *pdev)
  {
-       struct starfire_rtc *p = kzalloc(sizeof(*p), GFP_KERNEL);
-
-       if (!p)
-               return -ENOMEM;
+       struct rtc_device *rtc = rtc_device_register("starfire", &pdev->dev,
+                                    &starfire_rtc_ops, THIS_MODULE);
+       if (IS_ERR(rtc))
+               return PTR_ERR(rtc);
  
-       spin_lock_init(&p->lock);
+       platform_set_drvdata(pdev, rtc);
  
-       p->rtc = rtc_device_register("starfire", &pdev->dev,
-                                    &starfire_rtc_ops, THIS_MODULE);
-       if (IS_ERR(p->rtc)) {
-               int err = PTR_ERR(p->rtc);
-               kfree(p);
-               return err;
-       }
-       platform_set_drvdata(pdev, p);
         return 0;
  }
  
-static int __devexit starfire_rtc_remove(struct platform_device *pdev)
+static int __exit starfire_rtc_remove(struct platform_device *pdev)
  {
-       struct starfire_rtc *p = platform_get_drvdata(pdev);
+       struct rtc_device *rtc = platform_get_drvdata(pdev);
  
-       rtc_device_unregister(p->rtc);
-       kfree(p);
+       rtc_device_unregister(rtc);
  
         return 0;
  }
@@ -102,13 +63,12 @@ static struct platform_driver starfire_rtc_driver = {
                 .name   = "rtc-starfire",
                 .owner  = THIS_MODULE,
         },
-       .probe          = starfire_rtc_probe,
-       .remove         = __devexit_p(starfire_rtc_remove),
+       .remove         = __exit_p(starfire_rtc_remove),
  };
  
  static int __init starfire_rtc_init(void)
  {
-       return platform_driver_register(&starfire_rtc_driver);
+       return platform_driver_probe(&starfire_rtc_driver, starfire_rtc_probe);
  }
  
  static void __exit starfire_rtc_exit(void)
diff --git a/drivers/rtc/rtc-twl4030.c b/drivers/rtc/rtc-twl4030.c

index abe87a4d266520d67976ac7f7620cbdfe07446c2..01d8da9afdc8506f0469a3b8a8c6284b98a235fe 100644 (file)
--- a/drivers/rtc/rtc-twl4030.c
+++ b/drivers/rtc/rtc-twl4030.c
@@ -337,7 +337,7 @@ static int twl4030_rtc_ioctl(struct device *dev, unsigned int cmd,
  }
  
  #else
-#define        omap_rtc_ioctl  NULL
+#define        twl4030_rtc_ioctl       NULL
  #endif
  
  static irqreturn_t twl4030_rtc_interrupt(int irq, void *rtc)
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c

index 35364f64da7ff27ce7c740f3bde2a121df3d8556..c557ba34e1aab5b2c5b7d732e9e076620e9dcc94 100644 (file)
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -720,7 +720,6 @@ static int zfcp_erp_adapter_strategy_generic(struct zfcp_erp_action *act,
                 goto failed_openfcp;
  
         atomic_set_mask(ZFCP_STATUS_COMMON_OPEN, &act->adapter->status);
-       schedule_work(&act->adapter->scan_work);
  
         return ZFCP_ERP_SUCCEEDED;
  
@@ -1186,7 +1185,9 @@ static void zfcp_erp_scsi_scan(struct work_struct *work)
                 container_of(work, struct zfcp_erp_add_work, work);
         struct zfcp_unit *unit = p->unit;
         struct fc_rport *rport = unit->port->rport;
-       scsi_scan_target(&rport->dev, 0, rport->scsi_target_id,
+
+       if (rport && rport->port_state == FC_PORTSTATE_ONLINE)
+               scsi_scan_target(&rport->dev, 0, rport->scsi_target_id,
                          scsilun_to_int((struct scsi_lun *)&unit->fcp_lun), 0);
         atomic_clear_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING, &unit->status);
         zfcp_unit_put(unit);
@@ -1282,6 +1283,8 @@ static void zfcp_erp_action_cleanup(struct zfcp_erp_action *act, int result)
         case ZFCP_ERP_ACTION_REOPEN_ADAPTER:
                 if (result != ZFCP_ERP_SUCCEEDED)
                         zfcp_erp_rports_del(adapter);
+               else
+                       schedule_work(&adapter->scan_work);
                 zfcp_adapter_put(adapter);
                 break;
         }
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c

index 1a7c80a77ff582cf90ed2cf3677a88a50c7ca4a3..8aab3091a7b1045488887b352e4eebcecf23a21c 100644 (file)
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -50,7 +50,8 @@ static int zfcp_wka_port_get(struct zfcp_wka_port *wka_port)
         if (mutex_lock_interruptible(&wka_port->mutex))
                 return -ERESTARTSYS;
  
-       if (wka_port->status != ZFCP_WKA_PORT_ONLINE) {
+       if (wka_port->status == ZFCP_WKA_PORT_OFFLINE ||
+           wka_port->status == ZFCP_WKA_PORT_CLOSING) {
                 wka_port->status = ZFCP_WKA_PORT_OPENING;
                 if (zfcp_fsf_open_wka_port(wka_port))
                         wka_port->status = ZFCP_WKA_PORT_OFFLINE;
@@ -125,8 +126,7 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,
  
         read_lock_irqsave(&zfcp_data.config_lock, flags);
         list_for_each_entry(port, &fsf_req->adapter->port_list_head, list) {
-               /* FIXME: ZFCP_STATUS_PORT_DID_DID check is racy */
-               if (!(atomic_read(&port->status) & ZFCP_STATUS_PORT_DID_DID))
+               if (!(atomic_read(&port->status) & ZFCP_STATUS_PORT_PHYS_OPEN))
                         /* Try to connect to unused ports anyway. */
                         zfcp_erp_port_reopen(port,
                                              ZFCP_STATUS_COMMON_ERP_FAILED,
@@ -610,7 +610,6 @@ int zfcp_scan_ports(struct zfcp_adapter *adapter)
         int ret, i;
         struct zfcp_gpn_ft *gpn_ft;
  
-       zfcp_erp_wait(adapter); /* wait until adapter is finished with ERP */
         if (fc_host_port_type(adapter->scsi_host) != FC_PORTTYPE_NPORT)
                 return 0;
  
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c

index d024442ee128d9ee04ec44c5fe6b43e9ec099959..dc0367690405e864538d33b0d96f088b0047e80a 100644 (file)
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -930,8 +930,10 @@ struct zfcp_fsf_req *zfcp_fsf_abort_fcp_command(unsigned long old_req_id,
                 goto out;
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_ABORT_FCP_CMND,
                                   req_flags, adapter->pool.fsf_req_abort);
-       if (IS_ERR(req))
+       if (IS_ERR(req)) {
+               req = NULL;
                 goto out;
+       }
  
         if (unlikely(!(atomic_read(&unit->status) &
                        ZFCP_STATUS_COMMON_UNBLOCKED)))
@@ -1584,6 +1586,7 @@ static void zfcp_fsf_open_wka_port_handler(struct zfcp_fsf_req *req)
                 wka_port->status = ZFCP_WKA_PORT_OFFLINE;
                 break;
         case FSF_PORT_ALREADY_OPEN:
+               break;
         case FSF_GOOD:
                 wka_port->handle = header->port_handle;
                 wka_port->status = ZFCP_WKA_PORT_ONLINE;
@@ -2113,18 +2116,21 @@ static inline void zfcp_fsf_trace_latency(struct zfcp_fsf_req *fsf_req)
  
  static void zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *req)
  {
-       struct scsi_cmnd *scpnt = req->data;
+       struct scsi_cmnd *scpnt;
         struct fcp_rsp_iu *fcp_rsp_iu = (struct fcp_rsp_iu *)
             &(req->qtcb->bottom.io.fcp_rsp);
         u32 sns_len;
         char *fcp_rsp_info = (unsigned char *) &fcp_rsp_iu[1];
         unsigned long flags;
  
-       if (unlikely(!scpnt))
-               return;
-
         read_lock_irqsave(&req->adapter->abort_lock, flags);
  
+       scpnt = req->data;
+       if (unlikely(!scpnt)) {
+               read_unlock_irqrestore(&req->adapter->abort_lock, flags);
+               return;
+       }
+
         if (unlikely(req->status & ZFCP_STATUS_FSFREQ_ABORTED)) {
                 set_host_byte(scpnt, DID_SOFT_ERROR);
                 set_driver_byte(scpnt, SUGGEST_RETRY);
@@ -2442,8 +2448,10 @@ struct zfcp_fsf_req *zfcp_fsf_send_fcp_ctm(struct zfcp_adapter *adapter,
                 goto out;
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags,
                                   adapter->pool.fsf_req_scsi);
-       if (IS_ERR(req))
+       if (IS_ERR(req)) {
+               req = NULL;
                 goto out;
+       }
  
         req->status |= ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT;
         req->data = unit;
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c

index e46fd3e9f68fb85ff3dc9899e454772b5bb33a39..468c880f8b6d6db3df67ff382855886e2b056a4a 100644 (file)
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -88,7 +88,7 @@ static int zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt,
         ret = zfcp_fsf_send_fcp_command_task(adapter, unit, scpnt, 0,
                                              ZFCP_REQ_AUTO_CLEANUP);
         if (unlikely(ret == -EBUSY))
-               zfcp_scsi_command_fail(scpnt, DID_NO_CONNECT);
+               return SCSI_MLQUEUE_DEVICE_BUSY;
         else if (unlikely(ret < 0))
                 return SCSI_MLQUEUE_HOST_BUSY;
  
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c

index 9aa301c1ed07ac5275ceae2635bdbf8c4ecb650e..94acbeed4e7cfe7bc59ebc8003fdd7ae96e66ec4 100644 (file)
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -175,8 +175,8 @@ static struct aac_driver_ident aac_drivers[] = {
         { aac_rx_init, "percraid", "DELL    ", "PERCRAID        ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* PERC 3/Di (Boxster/PERC3DiB) */
         { aac_rx_init, "aacraid",  "ADAPTEC ", "catapult        ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* catapult */
         { aac_rx_init, "aacraid",  "ADAPTEC ", "tomcat          ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* tomcat */
-       { aac_rx_init, "aacraid",  "ADAPTEC ", "Adaptec 2120S   ", 1, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Adaptec 2120S (Crusader) */
-       { aac_rx_init, "aacraid",  "ADAPTEC ", "Adaptec 2200S   ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Adaptec 2200S (Vulcan) */
+       { aac_rx_init, "aacraid",  "ADAPTEC ", "Adaptec 2120S   ", 1, AAC_QUIRK_31BIT | AAC_QUIRK_34SG },                     /* Adaptec 2120S (Crusader) */
+       { aac_rx_init, "aacraid",  "ADAPTEC ", "Adaptec 2200S   ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG },                     /* Adaptec 2200S (Vulcan) */
         { aac_rx_init, "aacraid",  "ADAPTEC ", "Adaptec 2200S   ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Adaptec 2200S (Vulcan-2m) */
         { aac_rx_init, "aacraid",  "Legend  ", "Legend S220     ", 1, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Legend S220 (Legend Crusader) */
         { aac_rx_init, "aacraid",  "Legend  ", "Legend S230     ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Legend S230 (Legend Vulcan) */
@@ -427,8 +427,8 @@ static int aac_slave_configure(struct scsi_device *sdev)
                  * Firmware has an individual device recovery time typically
                  * of 35 seconds, give us a margin.
                  */
-               if (sdev->timeout < (45 * HZ))
-                       sdev->timeout = 45 * HZ;
+               if (sdev->request_queue->rq_timeout < (45 * HZ))
+                       blk_queue_rq_timeout(sdev->request_queue, 45*HZ);
                 for (cid = 0; cid < aac->maximum_num_containers; ++cid)
                         if (aac->fsa_dev[cid].valid)
                                 ++num_lsu;
diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c

index 9aec4ca64e56cf3f06f102b4860691ce94c12c94..f7da7530875e732a0b8155aa6887f8626ed8decf 100644 (file)
--- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c
+++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
@@ -107,6 +107,7 @@ static int hp_sw_tur(struct scsi_device *sdev, struct hp_sw_dh_data *h)
         struct request *req;
         int ret;
  
+retry:
         req = blk_get_request(sdev->request_queue, WRITE, GFP_NOIO);
         if (!req)
                 return SCSI_DH_RES_TEMP_UNAVAIL;
@@ -121,7 +122,6 @@ static int hp_sw_tur(struct scsi_device *sdev, struct hp_sw_dh_data *h)
         memset(req->sense, 0, SCSI_SENSE_BUFFERSIZE);
         req->sense_len = 0;
  
-retry:
         ret = blk_execute_rq(req->q, NULL, req, 1);
         if (ret == -EIO) {
                 if (req->sense_len > 0) {
@@ -136,8 +136,10 @@ retry:
                 h->path_state = HP_SW_PATH_ACTIVE;
                 ret = SCSI_DH_OK;
         }
-       if (ret == SCSI_DH_IMM_RETRY)
+       if (ret == SCSI_DH_IMM_RETRY) {
+               blk_put_request(req);
                 goto retry;
+       }
         if (ret == SCSI_DH_DEV_OFFLINED) {
                 h->path_state = HP_SW_PATH_PASSIVE;
                 ret = SCSI_DH_OK;
@@ -200,6 +202,7 @@ static int hp_sw_start_stop(struct scsi_device *sdev, struct hp_sw_dh_data *h)
         struct request *req;
         int ret, retry;
  
+retry:
         req = blk_get_request(sdev->request_queue, WRITE, GFP_NOIO);
         if (!req)
                 return SCSI_DH_RES_TEMP_UNAVAIL;
@@ -216,7 +219,6 @@ static int hp_sw_start_stop(struct scsi_device *sdev, struct hp_sw_dh_data *h)
         req->sense_len = 0;
         retry = h->retries;
  
-retry:
         ret = blk_execute_rq(req->q, NULL, req, 1);
         if (ret == -EIO) {
                 if (req->sense_len > 0) {
@@ -231,8 +233,10 @@ retry:
                 ret = SCSI_DH_OK;
  
         if (ret == SCSI_DH_RETRY) {
-               if (--retry)
+               if (--retry) {
+                       blk_put_request(req);
                         goto retry;
+               }
                 ret = SCSI_DH_IO;
         }
  
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c

index 87e09f35d3d4cb2bb50de263098d0a4c9ea2b66b..6cad1758243a5872a63e53eeea9b7a05b6d86507 100644 (file)
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -1442,7 +1442,7 @@ static int ibmvscsi_slave_configure(struct scsi_device *sdev)
         spin_lock_irqsave(shost->host_lock, lock_flags);
         if (sdev->type == TYPE_DISK) {
                 sdev->allow_restart = 1;
-               sdev->timeout = 60 * HZ;
+               blk_queue_rq_timeout(sdev->request_queue, 60 * HZ);
         }
         scsi_adjust_queue_depth(sdev, 0, shost->cmd_per_lun);
         spin_unlock_irqrestore(shost->host_lock, lock_flags);
diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c

index 2a5b29d12172e4a72bb774453d2662b7d29192ee..e2dd6a45924a5f598f6dafa05eff545b2aa5292b 100644 (file)
--- a/drivers/scsi/ibmvscsi/ibmvstgt.c
+++ b/drivers/scsi/ibmvscsi/ibmvstgt.c
@@ -864,21 +864,23 @@ static int ibmvstgt_probe(struct vio_dev *dev, const struct vio_device_id *id)
  
         INIT_WORK(&vport->crq_work, handle_crq);
  
-       err = crq_queue_create(&vport->crq_queue, target);
+       err = scsi_add_host(shost, target->dev);
         if (err)
                 goto free_srp_target;
  
-       err = scsi_add_host(shost, target->dev);
+       err = scsi_tgt_alloc_queue(shost);
         if (err)
-               goto destroy_queue;
+               goto remove_host;
  
-       err = scsi_tgt_alloc_queue(shost);
+       err = crq_queue_create(&vport->crq_queue, target);
         if (err)
-               goto destroy_queue;
+               goto free_queue;
  
         return 0;
-destroy_queue:
-       crq_queue_destroy(target);
+free_queue:
+       scsi_tgt_free_queue(shost);
+remove_host:
+       scsi_remove_host(shost);
  free_srp_target:
         srp_target_free(target);
  put_host:
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c

index 801c7cf54d2ebb29b209fbd692eb7c807514fdc6..3fdee7370cccd235d9ad37aa8482c29cac715b7a 100644 (file)
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -489,12 +489,6 @@ __iscsi_conn_send_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
                 if (!__kfifo_get(session->cmdpool.queue,
                                  (void*)&task, sizeof(void*)))
                         return NULL;
-
-               if ((hdr->opcode == (ISCSI_OP_NOOP_OUT | ISCSI_OP_IMMEDIATE)) &&
-                    hdr->ttt == RESERVED_ITT) {
-                       conn->ping_task = task;
-                       conn->last_ping = jiffies;
-               }
         }
         /*
          * released in complete pdu for task we expect a response for, and
@@ -703,6 +697,11 @@ static void iscsi_send_nopout(struct iscsi_conn *conn, struct iscsi_nopin *rhdr)
         task = __iscsi_conn_send_pdu(conn, (struct iscsi_hdr *)&hdr, NULL, 0);
         if (!task)
                 iscsi_conn_printk(KERN_ERR, conn, "Could not send nopout\n");
+       else if (!rhdr) {
+               /* only track our nops */
+               conn->ping_task = task;
+               conn->last_ping = jiffies;
+       }
  }
  
  static int iscsi_handle_reject(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c

index a454f94623d73348491ccc603070cc55e0866edd..17ce7abe17ee02f7ea47055d296f95917b6e1b92 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -1016,7 +1016,8 @@ static int megasas_slave_configure(struct scsi_device *sdev)
          * The RAID firmware may require extended timeouts.
          */
         if (sdev->channel >= MEGASAS_MAX_PD_CHANNELS)
-               sdev->timeout = MEGASAS_DEFAULT_CMD_TIMEOUT * HZ;
+               blk_queue_rq_timeout(sdev->request_queue,
+                                    MEGASAS_DEFAULT_CMD_TIMEOUT * HZ);
         return 0;
  }
  
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c

index 386361778ebb32d859c6770971329f46d55ae23e..edfaf241c5ba1dca4e3f3b0a75e8b2a6d4bee89f 100644 (file)
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -932,8 +932,7 @@ static int scsi_eh_try_stu(struct scsi_cmnd *scmd)
                 int i, rtn = NEEDS_RETRY;
  
                 for (i = 0; rtn == NEEDS_RETRY && i < 2; i++)
-                       rtn = scsi_send_eh_cmnd(scmd, stu_command, 6,
-                                               scmd->device->timeout, 0);
+                       rtn = scsi_send_eh_cmnd(scmd, stu_command, 6, scmd->device->request_queue->rq_timeout, 0);
  
                 if (rtn == SUCCESS)
                         return 0;
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c

index f5d3b96890dc6d9dd180eb86bb0f2b737a60e7f1..148d3af92aefad04fa42c48780ba4138e8033e59 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -567,15 +567,18 @@ static inline int scsi_host_is_busy(struct Scsi_Host *shost)
   */
  static void scsi_run_queue(struct request_queue *q)
  {
-       struct scsi_device *starved_head = NULL, *sdev = q->queuedata;
+       struct scsi_device *sdev = q->queuedata;
         struct Scsi_Host *shost = sdev->host;
+       LIST_HEAD(starved_list);
         unsigned long flags;
  
         if (scsi_target(sdev)->single_lun)
                 scsi_single_lun_run(sdev);
  
         spin_lock_irqsave(shost->host_lock, flags);
-       while (!list_empty(&shost->starved_list) && !scsi_host_is_busy(shost)) {
+       list_splice_init(&shost->starved_list, &starved_list);
+
+       while (!list_empty(&starved_list)) {
                 int flagset;
  
                 /*
@@ -588,24 +591,18 @@ static void scsi_run_queue(struct request_queue *q)
                  * scsi_request_fn must get the host_lock before checking
                  * or modifying starved_list or starved_entry.
                  */
-               sdev = list_entry(shost->starved_list.next,
-                                         struct scsi_device, starved_entry);
-               /*
-                * The *queue_ready functions can add a device back onto the
-                * starved list's tail, so we must check for a infinite loop.
-                */
-               if (sdev == starved_head)
+               if (scsi_host_is_busy(shost))
                         break;
-               if (!starved_head)
-                       starved_head = sdev;
  
+               sdev = list_entry(starved_list.next,
+                                 struct scsi_device, starved_entry);
+               list_del_init(&sdev->starved_entry);
                 if (scsi_target_is_busy(scsi_target(sdev))) {
                         list_move_tail(&sdev->starved_entry,
                                        &shost->starved_list);
                         continue;
                 }
  
-               list_del_init(&sdev->starved_entry);
                 spin_unlock(shost->host_lock);
  
                 spin_lock(sdev->request_queue->queue_lock);
@@ -621,6 +618,8 @@ static void scsi_run_queue(struct request_queue *q)
  
                 spin_lock(shost->host_lock);
         }
+       /* put any unprocessed entries back */
+       list_splice(&starved_list, &shost->starved_list);
         spin_unlock_irqrestore(shost->host_lock, flags);
  
         blk_run_queue(q);
@@ -649,8 +648,8 @@ static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd)
         struct request *req = cmd->request;
         unsigned long flags;
  
-       scsi_unprep_request(req);
         spin_lock_irqsave(q->queue_lock, flags);
+       scsi_unprep_request(req);
         blk_requeue_request(q, req);
         spin_unlock_irqrestore(q->queue_lock, flags);
  
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c

index c9e1242eaf2511067e122e89b331d438823a0a69..5081b3981d3c241487a9bf4f29be69796eb8e7cb 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -757,7 +757,7 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode,
          * access to the device is prohibited.
          */
         error = scsi_nonblockable_ioctl(sdp, cmd, p,
-                                       (mode & FMODE_NDELAY_NOW) != 0);
+                                       (mode & FMODE_NDELAY) != 0);
         if (!scsi_block_when_processing_errors(sdp) || !error)
                 return error;
  
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c

index 62b6633e3a97b8d27511f1fbc9c9cb5d118abcea..45b66b98a516f492b0e76ea4bb792d1d19925570 100644 (file)
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -521,7 +521,7 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
          * if it doesn't recognise the ioctl
          */
         ret = scsi_nonblockable_ioctl(sdev, cmd, argp,
-                                       (mode & FMODE_NDELAY_NOW) != 0);
+                                       (mode & FMODE_NDELAY) != 0);
         if (ret != -ENODEV)
                 return ret;
         return scsi_ioctl(sdev, cmd, argp);
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c

index 3790906a77d10c06705b3616a22c5650d50f1948..2fa830c0be2790187e17e43cf6dc0ffb35df1da8 100644 (file)
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -477,7 +477,7 @@ stex_slave_config(struct scsi_device *sdev)
  {
         sdev->use_10_for_rw = 1;
         sdev->use_10_for_ms = 1;
-       sdev->timeout = 60 * HZ;
+       blk_queue_rq_timeout(sdev->request_queue, 60 * HZ);
         sdev->tagged_supported = 1;
  
         return 0;
diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c

index 6dd98f9fb89c0f655fbdc07f6c9af24f992250ef..ae3699d77dd0e320edc844f10cbc11c105afdea8 100644 (file)
--- a/drivers/serial/ioc3_serial.c
+++ b/drivers/serial/ioc3_serial.c
@@ -2149,7 +2149,7 @@ out4:
         return ret;
  }
  
-static struct ioc3_submodule ioc3uart_submodule = {
+static struct ioc3_submodule ioc3uart_ops = {
         .name = "IOC3uart",
         .probe = ioc3uart_probe,
         .remove = ioc3uart_remove,
@@ -2173,7 +2173,7 @@ static int __devinit ioc3uart_init(void)
                        __func__);
                 return ret;
         }
-       ret = ioc3_register_submodule(&ioc3uart_submodule);
+       ret = ioc3_register_submodule(&ioc3uart_ops);
         if (ret)
                 uart_unregister_driver(&ioc3_uart);
         return ret;
@@ -2181,7 +2181,7 @@ static int __devinit ioc3uart_init(void)
  
  static void __devexit ioc3uart_exit(void)
  {
-       ioc3_unregister_submodule(&ioc3uart_submodule);
+       ioc3_unregister_submodule(&ioc3uart_ops);
         uart_unregister_driver(&ioc3_uart);
  }
  
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c

index 6117d3db0b668980618991a2f66f578410f6e1a7..28c00c3d58f58273af3e1ab9bacd6f2df9e401c8 100644 (file)
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -591,8 +591,8 @@ mpc52xx_uart_set_termios(struct uart_port *port, struct ktermios *new,
         /* Update the per-port timeout */
         uart_update_timeout(port, new->c_cflag, baud);
  
-       /* Do our best to flush TX & RX, so we don't loose anything */
-       /* But we don't wait indefinitly ! */
+       /* Do our best to flush TX & RX, so we don't lose anything */
+       /* But we don't wait indefinitely ! */
         j = 5000000;    /* Maximum wait */
         /* FIXME Can't receive chars since set_termios might be called at early
          * boot for the console, all stuff is not yet ready to receive at that
diff --git a/drivers/serial/s3c2440.c b/drivers/serial/s3c2440.c

index 317d239ab74043cf10ada65e9329d4da0d3e87fe..29cbb0afef8e735276fe3fb39d6b2da5519ae6b2 100644 (file)
--- a/drivers/serial/s3c2440.c
+++ b/drivers/serial/s3c2440.c
@@ -177,5 +177,5 @@ module_exit(s3c2440_serial_exit);
  
  MODULE_DESCRIPTION("Samsung S3C2440,S3C2442 SoC Serial port driver");
  MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
-MODULE_LICENSE("GPLi v2");
+MODULE_LICENSE("GPL v2");
  MODULE_ALIAS("platform:s3c2440-uart");
diff --git a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c

index d1812d32f47d40c4c5e3c028aae8727c755f451f..63f0de29aa14eeb508645dd0b917e7c4163950c1 100644 (file)
--- a/drivers/sh/maple/maple.c
+++ b/drivers/sh/maple/maple.c
@@ -827,7 +827,7 @@ static int __init maple_bus_init(void)
  
         maple_queue_cache =
             kmem_cache_create("maple_queue_cache", 0x400, 0,
-                             SLAB_POISON|SLAB_HWCACHE_ALIGN, NULL);
+                             SLAB_HWCACHE_ALIGN, NULL);
  
         if (!maple_queue_cache)
                 goto cleanup_bothirqs;
diff --git a/drivers/spi/au1550_spi.c b/drivers/spi/au1550_spi.c

index 87b73e0169c51eb2137d29679ceccbbf179b1568..b02f25c702fd2b2f4c54549a3332bca4da89c8ff 100644 (file)
--- a/drivers/spi/au1550_spi.c
+++ b/drivers/spi/au1550_spi.c
@@ -369,10 +369,23 @@ static int au1550_spi_dma_txrxb(struct spi_device *spi, struct spi_transfer *t)
         dma_rx_addr = t->rx_dma;
  
         /*
-        * check if buffers are already dma mapped, map them otherwise
+        * check if buffers are already dma mapped, map them otherwise:
+        * - first map the TX buffer, so cache data gets written to memory
+        * - then map the RX buffer, so that cache entries (with
+        *   soon-to-be-stale data) get removed
          * use rx buffer in place of tx if tx buffer was not provided
          * use temp rx buffer (preallocated or realloc to fit) for rx dma
          */
+       if (t->tx_buf) {
+               if (t->tx_dma == 0) {   /* if DMA_ADDR_INVALID, map it */
+                       dma_tx_addr = dma_map_single(hw->dev,
+                                       (void *)t->tx_buf,
+                                       t->len, DMA_TO_DEVICE);
+                       if (dma_mapping_error(hw->dev, dma_tx_addr))
+                               dev_err(hw->dev, "tx dma map error\n");
+               }
+       }
+
         if (t->rx_buf) {
                 if (t->rx_dma == 0) {   /* if DMA_ADDR_INVALID, map it */
                         dma_rx_addr = dma_map_single(hw->dev,
@@ -396,15 +409,8 @@ static int au1550_spi_dma_txrxb(struct spi_device *spi, struct spi_transfer *t)
                 dma_sync_single_for_device(hw->dev, dma_rx_addr,
                         t->len, DMA_FROM_DEVICE);
         }
-       if (t->tx_buf) {
-               if (t->tx_dma == 0) {   /* if DMA_ADDR_INVALID, map it */
-                       dma_tx_addr = dma_map_single(hw->dev,
-                                       (void *)t->tx_buf,
-                                       t->len, DMA_TO_DEVICE);
-                       if (dma_mapping_error(hw->dev, dma_tx_addr))
-                               dev_err(hw->dev, "tx dma map error\n");
-               }
-       } else {
+
+       if (!t->tx_buf) {
                 dma_sync_single_for_device(hw->dev, dma_rx_addr,
                                 t->len, DMA_BIDIRECTIONAL);
                 hw->tx = hw->rx;
diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c

index 0debe11b67b494a2f0ea4d49cb95598e43217c3d..3b97803e1d11b0f4114e1104bbfd93c76c932eab 100644 (file)
--- a/drivers/spi/mpc52xx_psc_spi.c
+++ b/drivers/spi/mpc52xx_psc_spi.c
@@ -142,6 +142,7 @@ static int mpc52xx_psc_spi_transfer_rxtx(struct spi_device *spi,
         unsigned rfalarm;
         unsigned send_at_once = MPC52xx_PSC_BUFSIZE;
         unsigned recv_at_once;
+       int last_block = 0;
  
         if (!t->tx_buf && !t->rx_buf && t->len)
                 return -EINVAL;
@@ -151,15 +152,17 @@ static int mpc52xx_psc_spi_transfer_rxtx(struct spi_device *spi,
         while (rb < t->len) {
                 if (t->len - rb > MPC52xx_PSC_BUFSIZE) {
                         rfalarm = MPC52xx_PSC_RFALARM;
+                       last_block = 0;
                 } else {
                         send_at_once = t->len - sb;
                         rfalarm = MPC52xx_PSC_BUFSIZE - (t->len - rb);
+                       last_block = 1;
                 }
  
                 dev_dbg(&spi->dev, "send %d bytes...\n", send_at_once);
                 for (; send_at_once; sb++, send_at_once--) {
                         /* set EOF flag before the last word is sent */
-                       if (send_at_once == 1)
+                       if (send_at_once == 1 && last_block)
                                 out_8(&psc->ircr2, 0x01);
  
                         if (tx_buf)
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c

index 0b4db0ce78d6d08e7d86237461f44339811e0194..269a55ec52ef0e617caff931c448056cc991c32a 100644 (file)
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -1456,7 +1456,7 @@ static int __init spi_imx_probe(struct platform_device *pdev)
         struct device *dev = &pdev->dev;
         struct spi_imx_master *platform_info;
         struct spi_master *master;
-       struct driver_data *drv_data = NULL;
+       struct driver_data *drv_data;
         struct resource *res;
         int irq, status = 0;
  
@@ -1467,14 +1467,6 @@ static int __init spi_imx_probe(struct platform_device *pdev)
                 goto err_no_pdata;
         }
  
-       drv_data->clk = clk_get(&pdev->dev, "perclk2");
-       if (IS_ERR(drv_data->clk)) {
-               dev_err(&pdev->dev, "probe - cannot get get\n");
-               status = PTR_ERR(drv_data->clk);
-               goto err_no_clk;
-       }
-       clk_enable(drv_data->clk);
-
         /* Allocate master with space for drv_data */
         master = spi_alloc_master(dev, sizeof(struct driver_data));
         if (!master) {
@@ -1495,6 +1487,14 @@ static int __init spi_imx_probe(struct platform_device *pdev)
  
         drv_data->dummy_dma_buf = SPI_DUMMY_u32;
  
+       drv_data->clk = clk_get(&pdev->dev, "perclk2");
+       if (IS_ERR(drv_data->clk)) {
+               dev_err(&pdev->dev, "probe - cannot get clock\n");
+               status = PTR_ERR(drv_data->clk);
+               goto err_no_clk;
+       }
+       clk_enable(drv_data->clk);
+
         /* Find and map resources */
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res) {
@@ -1630,12 +1630,13 @@ err_no_iomap:
         kfree(drv_data->ioarea);
  
  err_no_iores:
-       spi_master_put(master);
-
-err_no_pdata:
         clk_disable(drv_data->clk);
         clk_put(drv_data->clk);
+
  err_no_clk:
+       spi_master_put(master);
+
+err_no_pdata:
  err_no_mem:
         return status;
  }
diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c

index cc1f647f579bc3019302a4c430ee71d946afd454..f2447a5476bb8eb29065eab44c2832f2f31a9059 100644 (file)
--- a/drivers/spi/spi_s3c24xx_gpio.c
+++ b/drivers/spi/spi_s3c24xx_gpio.c
@@ -34,7 +34,7 @@ struct s3c2410_spigpio {
  
  static inline struct s3c2410_spigpio *spidev_to_sg(struct spi_device *spi)
  {
-       return spi->controller_data;
+       return spi_master_get_devdata(spi->master);
  }
  
  static inline void setsck(struct spi_device *dev, int on)
@@ -118,6 +118,7 @@ static int s3c2410_spigpio_probe(struct platform_device *dev)
         /* setup spi bitbang adaptor */
         sp->bitbang.master = spi_master_get(master);
         sp->bitbang.master->bus_num = info->bus_num;
+       sp->bitbang.master->num_chipselect = info->num_chipselect;
         sp->bitbang.chipselect = s3c2410_spigpio_chipselect;
  
         sp->bitbang.txrx_word[SPI_MODE_0] = s3c2410_spigpio_txrx_mode0;
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c

index 89a43755a453bb265ebfa789adca222a8cce1ebe..5d869c4d3eb2a2e3dd9f46ae3ebf1cfbd333e61f 100644 (file)
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -597,7 +597,9 @@ static int spidev_probe(struct spi_device *spi)
         }
         mutex_unlock(&device_list_lock);
  
-       if (status != 0)
+       if (status == 0)
+               spi_set_drvdata(spi, spidev);
+       else
                 kfree(spidev);
  
         return status;
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig

index c95b286a1239e8a6cbdb4da4a292e5d85c9079f1..5d457c96bd7ed596bdaab11852fc9ad45acaa635 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -22,6 +22,8 @@ menuconfig STAGING
           If in doubt, say N here.
  
  
+if STAGING
+
  config STAGING_EXCLUDE_BUILD
         bool "Exclude Staging drivers from being built" if STAGING
         default y
@@ -62,3 +64,4 @@ source "drivers/staging/at76_usb/Kconfig"
  source "drivers/staging/poch/Kconfig"
  
  endif # !STAGING_EXCLUDE_BUILD
+endif # STAGING
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c

index 8e74657f106c01d152c8e5244e75100bdd94f682..43a863c5cc430367ad045625eb4c3faecbfba7f9 100644 (file)
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -51,6 +51,7 @@ static struct usb_device_id usbtmc_devices[] = {
         { USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 0), },
         { 0, } /* terminating entry */
  };
+MODULE_DEVICE_TABLE(usb, usbtmc_devices);
  
  /*
   * This structure is the capabilities for the device
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c

index 3d7793d93031525400d3ed746a60639ebed1d52f..8c081308b0e2d8bf2349d6b9e9703de0548213ac 100644 (file)
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -279,7 +279,9 @@ static int usb_unbind_interface(struct device *dev)
          * altsetting means creating new endpoint device entries).
          * When either of these happens, defer the Set-Interface.
          */
-       if (!error && intf->dev.power.status == DPM_ON)
+       if (intf->cur_altsetting->desc.bAlternateSetting == 0)
+               ;       /* Already in altsetting 0 so skip Set-Interface */
+       else if (!error && intf->dev.power.status == DPM_ON)
                 usb_set_interface(udev, intf->altsetting[0].
                                 desc.bInterfaceNumber, 0);
         else
diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c

index 428b5993575a9126104da3ec32ea695e7881c9e8..3a8bb53fc473269e31366d0c11069490a30cb7bf 100644 (file)
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -651,6 +651,8 @@ rndis_bind(struct usb_configuration *c, struct usb_function *f)
                                 fs_in_desc.bEndpointAddress;
                 hs_out_desc.bEndpointAddress =
                                 fs_out_desc.bEndpointAddress;
+               hs_notify_desc.bEndpointAddress =
+                               fs_notify_desc.bEndpointAddress;
  
                 /* copy descriptors, and track endpoint copies */
                 f->hs_descriptors = usb_copy_descriptors(eth_hs_function);
@@ -662,6 +664,8 @@ rndis_bind(struct usb_configuration *c, struct usb_function *f)
                                 f->hs_descriptors, &hs_in_desc);
                 rndis->hs.out = usb_find_endpoint(eth_hs_function,
                                 f->hs_descriptors, &hs_out_desc);
+               rndis->hs.notify = usb_find_endpoint(eth_hs_function,
+                               f->hs_descriptors, &hs_notify_desc);
         }
  
         rndis->port.open = rndis_open;
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c

index 51d7bdea2869ae147953fd10bbd7c3984c360aee..fb6f2933b01badb0075c285078fb6067fc7b6827 100644 (file)
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -143,6 +143,7 @@ static struct ftdi_sio_quirk ftdi_HE_TIRA1_quirk = {
  static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) },
+       { USB_DEVICE(FTDI_VID, FTDI_CANDAPTER_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_0_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_1_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_2_PID) },
@@ -166,6 +167,7 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_PID) },
         { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) },
         { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_MINI_IOBOARD_PID) },
+       { USB_DEVICE(FTDI_VID, FTDI_SPROG_II) },
         { USB_DEVICE(FTDI_VID, FTDI_XF_632_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_XF_634_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_XF_547_PID) },
@@ -1498,7 +1500,7 @@ static int ftdi_open(struct tty_struct *tty,
                         priv->interface, buf, 0, WDR_TIMEOUT);
  
         /* Termios defaults are set by usb_serial_init. We don't change
-          port->tty->termios - this would loose speed settings, etc.
+          port->tty->termios - this would lose speed settings, etc.
            This is same behaviour as serial.c/rs_open() - Kuba */
  
         /* ftdi_set_termios  will send usb control messages */
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h

index 07a3992abad2b546095e35d247a3d7e68aec1eec..373ee09975bbd8c80b2a158aa32b9c6595a3bfbe 100644 (file)
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -40,6 +40,9 @@
  /* AlphaMicro Components AMC-232USB01 device */
  #define FTDI_AMC232_PID 0xFF00 /* Product Id */
  
+/* www.candapter.com Ewert Energy Systems CANdapter device */
+#define FTDI_CANDAPTER_PID 0x9F80 /* Product Id */
+
  /* SCS HF Radio Modems PID's (http://www.scs-ptc.com) */
  /* the VID is the standard ftdi vid (FTDI_VID) */
  #define FTDI_SCS_DEVICE_0_PID 0xD010    /* SCS PTC-IIusb */
@@ -75,6 +78,9 @@
  /* OpenDCC (www.opendcc.de) product id */
  #define FTDI_OPENDCC_PID       0xBFD8
  
+/* Sprog II (Andrew Crosland's SprogII DCC interface) */
+#define FTDI_SPROG_II          0xF0C8
+
  /* www.crystalfontz.com devices - thanx for providing free devices for evaluation ! */
  /* they use the ftdi chipset for the USB interface and the vendor id is the same */
  #define FTDI_XF_632_PID 0xFC08 /* 632: 16x2 Character Display */
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c

index 491c8857b6448277a5cd49c51e88f6ac496233ad..1aed584be5eb9a528d904b3b3209afef29f40383 100644 (file)
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -91,6 +91,8 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(WS002IN_VENDOR_ID, WS002IN_PRODUCT_ID) },
         { USB_DEVICE(COREGA_VENDOR_ID, COREGA_PRODUCT_ID) },
         { USB_DEVICE(YCCABLE_VENDOR_ID, YCCABLE_PRODUCT_ID) },
+       { USB_DEVICE(SUPERIAL_VENDOR_ID, SUPERIAL_PRODUCT_ID) },
+       { USB_DEVICE(HP_VENDOR_ID, HP_LD220_PRODUCT_ID) },
         { }                                     /* Terminating entry */
  };
  
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h

index a3bd039c78e96769beeff504e4da6c32f63daa14..54974f446a8c2f51f213d293d3a2f53bcaf6479d 100644 (file)
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -110,3 +110,11 @@
  /* Y.C. Cable U.S.A., Inc - USB to RS-232 */
  #define YCCABLE_VENDOR_ID      0x05ad
  #define YCCABLE_PRODUCT_ID     0x0fba
+
+/* "Superial" USB - Serial */
+#define SUPERIAL_VENDOR_ID     0x5372
+#define SUPERIAL_PRODUCT_ID    0x2303
+
+/* Hewlett-Packard LD220-HP POS Pole Display */
+#define HP_VENDOR_ID           0x03f0
+#define HP_LD220_PRODUCT_ID    0x3524
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c

index 31c42d1cae13cf746e49cce12c9f588247da2c5c..01d0c70d60e9b41129b44e76893958990f780b10 100644 (file)
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -16,56 +16,6 @@
   * For questions or problems with this driver, contact Texas Instruments
   * technical support, or Al Borchers <alborchers@steinerpoint.com>, or
   * Peter Berger <pberger@brimson.com>.
- *
- * This driver needs this hotplug script in /etc/hotplug/usb/ti_usb_3410_5052
- * or in /etc/hotplug.d/usb/ti_usb_3410_5052.hotplug to set the device
- * configuration.
- *
- * #!/bin/bash
- *
- * BOOT_CONFIG=1
- * ACTIVE_CONFIG=2
- *
- * if [[ "$ACTION" != "add" ]]
- * then
- *     exit
- * fi
- *
- * CONFIG_PATH=/sys${DEVPATH%/?*}/bConfigurationValue
- *
- * if [[ 0`cat $CONFIG_PATH` -ne $BOOT_CONFIG ]]
- * then
- *     exit
- * fi
- *
- * PRODUCT=${PRODUCT%/?*}              # delete version
- * VENDOR_ID=`printf "%d" 0x${PRODUCT%/?*}`
- * PRODUCT_ID=`printf "%d" 0x${PRODUCT#*?/}`
- *
- * PARAM_PATH=/sys/module/ti_usb_3410_5052/parameters
- *
- * function scan() {
- *     s=$1
- *     shift
- *     for i
- *     do
- *             if [[ $s -eq $i ]]
- *             then
- *                     return 0
- *             fi
- *     done
- *     return 1
- * }
- *
- * IFS=$IFS,
- *
- * if (scan $VENDOR_ID 1105 `cat $PARAM_PATH/vendor_3410` &&
- * scan $PRODUCT_ID 13328 `cat $PARAM_PATH/product_3410`) ||
- * (scan $VENDOR_ID 1105 `cat $PARAM_PATH/vendor_5052` &&
- * scan $PRODUCT_ID 20562 20818 20570 20575 `cat $PARAM_PATH/product_5052`)
- * then
- *     echo $ACTIVE_CONFIG > $CONFIG_PATH
- * fi
   */
  
  #include <linux/kernel.h>
@@ -457,9 +407,10 @@ static int ti_startup(struct usb_serial *serial)
                 goto free_tdev;
         }
  
-       /* the second configuration must be set (in sysfs by hotplug script) */
+       /* the second configuration must be set */
         if (dev->actconfig->desc.bConfigurationValue == TI_BOOT_CONFIG) {
-               status = -ENODEV;
+               status = usb_driver_set_configuration(dev, TI_ACTIVE_CONFIG);
+               status = status ? status : -ENODEV;
                 goto free_tdev;
         }
  
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h

index e61f2bfc64add77ab938367c45c08db542c589e0..bfcc1fe82518d0e5739b1e936cf43d1b1430390c 100644 (file)
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -167,8 +167,22 @@ UNUSUAL_DEV(  0x0421, 0x005d, 0x0001, 0x0600,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY ),
  
+/* Reported by Ozan Sener <themgzzy@gmail.com> */
+UNUSUAL_DEV(  0x0421, 0x0060, 0x0551, 0x0551,
+               "Nokia",
+               "3500c",
+               US_SC_DEVICE, US_PR_DEVICE, NULL,
+               US_FL_FIX_CAPACITY ),
+
+/* Reported by CSECSY Laszlo <boobaa@frugalware.org> */
+UNUSUAL_DEV(  0x0421, 0x0063, 0x0001, 0x0601,
+               "Nokia",
+               "Nokia 3109c",
+               US_SC_DEVICE, US_PR_DEVICE, NULL,
+               US_FL_FIX_CAPACITY ),
+
  /* Patch for Nokia 5310 capacity */
-UNUSUAL_DEV(  0x0421, 0x006a, 0x0000, 0x0591,
+UNUSUAL_DEV(  0x0421, 0x006a, 0x0000, 0x0701,
                 "Nokia",
                 "5310",
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
diff --git a/drivers/video/aty/radeon_accel.c b/drivers/video/aty/radeon_accel.c

index 8718f7349d6b8961eb1ed90d3ce8ea13b75a5853..a469a3d6edcbd49abb9897b524f6c25f25b46931 100644 (file)
--- a/drivers/video/aty/radeon_accel.c
+++ b/drivers/video/aty/radeon_accel.c
@@ -5,61 +5,61 @@
   * --dte
   */
  
-#define FLUSH_CACHE_WORKAROUND 1
-
-void radeon_fifo_update_and_wait(struct radeonfb_info *rinfo, int entries)
+static void radeon_fixup_offset(struct radeonfb_info *rinfo)
  {
-       int i;
+       u32 local_base;
+
+       /* *** Ugly workaround *** */
+       /*
+        * On some platforms, the video memory is mapped at 0 in radeon chip space
+        * (like PPCs) by the firmware. X will always move it up so that it's seen
+        * by the chip to be at the same address as the PCI BAR.
+        * That means that when switching back from X, there is a mismatch between
+        * the offsets programmed into the engine. This means that potentially,
+        * accel operations done before radeonfb has a chance to re-init the engine
+        * will have incorrect offsets, and potentially trash system memory !
+        *
+        * The correct fix is for fbcon to never call any accel op before the engine
+        * has properly been re-initialized (by a call to set_var), but this is a
+        * complex fix. This workaround in the meantime, called before every accel
+        * operation, makes sure the offsets are in sync.
+        */
  
-       for (i=0; i<2000000; i++) {
-               rinfo->fifo_free = INREG(RBBM_STATUS) & 0x7f;
-               if (rinfo->fifo_free >= entries)
-                       return;
-               udelay(10);
-       }
-       printk(KERN_ERR "radeonfb: FIFO Timeout !\n");
-       /* XXX Todo: attempt to reset the engine */
-}
+       radeon_fifo_wait (1);
+       local_base = INREG(MC_FB_LOCATION) << 16;
+       if (local_base == rinfo->fb_local_base)
+               return;
  
-static inline void radeon_fifo_wait(struct radeonfb_info *rinfo, int entries)
-{
-       if (entries <= rinfo->fifo_free)
-               rinfo->fifo_free -= entries;
-       else
-               radeon_fifo_update_and_wait(rinfo, entries);
-}
+       rinfo->fb_local_base = local_base;
  
-static inline void radeonfb_set_creg(struct radeonfb_info *rinfo, u32 reg,
-                                    u32 *cache, u32 new_val)
-{
-       if (new_val == *cache)
-               return;
-       *cache = new_val;
-       radeon_fifo_wait(rinfo, 1);
-       OUTREG(reg, new_val);
+       radeon_fifo_wait (3);
+       OUTREG(DEFAULT_PITCH_OFFSET, (rinfo->pitch << 0x16) |
+                                    (rinfo->fb_local_base >> 10));
+       OUTREG(DST_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10));
+       OUTREG(SRC_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10));
  }
  
  static void radeonfb_prim_fillrect(struct radeonfb_info *rinfo, 
                                    const struct fb_fillrect *region)
  {
-       radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache,
-                         rinfo->dp_gui_mc_base | GMC_BRUSH_SOLID_COLOR | ROP3_P);
-       radeonfb_set_creg(rinfo, DP_CNTL, &rinfo->dp_cntl_cache,
-                         DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM);
-       radeonfb_set_creg(rinfo, DP_BRUSH_FRGD_CLR, &rinfo->dp_brush_fg_cache,
-                         region->color);
-
-       /* Ensure the dst cache is flushed and the engine idle before
-        * issuing the operation.
-        *
-        * This works around engine lockups on some cards
-        */
-#if FLUSH_CACHE_WORKAROUND
-       radeon_fifo_wait(rinfo, 2);
+       radeon_fifo_wait(4);  
+  
+       OUTREG(DP_GUI_MASTER_CNTL,  
+               rinfo->dp_gui_master_cntl  /* contains, like GMC_DST_32BPP */
+                | GMC_BRUSH_SOLID_COLOR
+                | ROP3_P);
+       if (radeon_get_dstbpp(rinfo->depth) != DST_8BPP)
+               OUTREG(DP_BRUSH_FRGD_CLR, rinfo->pseudo_palette[region->color]);
+       else
+               OUTREG(DP_BRUSH_FRGD_CLR, region->color);
+       OUTREG(DP_WRITE_MSK, 0xffffffff);
+       OUTREG(DP_CNTL, (DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM));
+
+       radeon_fifo_wait(2);
         OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL);
         OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE));
-#endif
-       radeon_fifo_wait(rinfo, 2);
+
+       radeon_fifo_wait(2);  
         OUTREG(DST_Y_X, (region->dy << 16) | region->dx);
         OUTREG(DST_WIDTH_HEIGHT, (region->width << 16) | region->height);
  }
@@ -70,14 +70,15 @@ void radeonfb_fillrect(struct fb_info *info, const struct fb_fillrect *region)
         struct fb_fillrect modded;
         int vxres, vyres;
    
-       WARN_ON(rinfo->gfx_mode);
-       if (info->state != FBINFO_STATE_RUNNING || rinfo->gfx_mode)
+       if (info->state != FBINFO_STATE_RUNNING)
                 return;
         if (info->flags & FBINFO_HWACCEL_DISABLED) {
                 cfb_fillrect(info, region);
                 return;
         }
  
+       radeon_fixup_offset(rinfo);
+
         vxres = info->var.xres_virtual;
         vyres = info->var.yres_virtual;
  
@@ -90,10 +91,6 @@ void radeonfb_fillrect(struct fb_info *info, const struct fb_fillrect *region)
         if(modded.dx + modded.width  > vxres) modded.width  = vxres - modded.dx;
         if(modded.dy + modded.height > vyres) modded.height = vyres - modded.dy;
  
-       if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
-           info->fix.visual == FB_VISUAL_DIRECTCOLOR )
-               modded.color = ((u32 *) (info->pseudo_palette))[region->color];
-
         radeonfb_prim_fillrect(rinfo, &modded);
  }
  
@@ -112,22 +109,22 @@ static void radeonfb_prim_copyarea(struct radeonfb_info *rinfo,
         if ( xdir < 0 ) { sx += w-1; dx += w-1; }
         if ( ydir < 0 ) { sy += h-1; dy += h-1; }
  
-       radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache,
-                         rinfo->dp_gui_mc_base |
-                         GMC_BRUSH_NONE |
-                         GMC_SRC_DATATYPE_COLOR |
-                         ROP3_S |
-                         DP_SRC_SOURCE_MEMORY);
-       radeonfb_set_creg(rinfo, DP_CNTL, &rinfo->dp_cntl_cache,
-                         (xdir>=0 ? DST_X_LEFT_TO_RIGHT : 0) |
-                         (ydir>=0 ? DST_Y_TOP_TO_BOTTOM : 0));
-
-#if FLUSH_CACHE_WORKAROUND
-       radeon_fifo_wait(rinfo, 2);
+       radeon_fifo_wait(3);
+       OUTREG(DP_GUI_MASTER_CNTL,
+               rinfo->dp_gui_master_cntl /* i.e. GMC_DST_32BPP */
+               | GMC_BRUSH_NONE
+               | GMC_SRC_DSTCOLOR
+               | ROP3_S 
+               | DP_SRC_SOURCE_MEMORY );
+       OUTREG(DP_WRITE_MSK, 0xffffffff);
+       OUTREG(DP_CNTL, (xdir>=0 ? DST_X_LEFT_TO_RIGHT : 0)
+                       | (ydir>=0 ? DST_Y_TOP_TO_BOTTOM : 0));
+
+       radeon_fifo_wait(2);
         OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL);
         OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE));
-#endif
-       radeon_fifo_wait(rinfo, 3);
+
+       radeon_fifo_wait(3);
         OUTREG(SRC_Y_X, (sy << 16) | sx);
         OUTREG(DST_Y_X, (dy << 16) | dx);
         OUTREG(DST_HEIGHT_WIDTH, (h << 16) | w);
@@ -146,14 +143,15 @@ void radeonfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
         modded.width  = area->width;
         modded.height = area->height;
    
-       WARN_ON(rinfo->gfx_mode);
-       if (info->state != FBINFO_STATE_RUNNING || rinfo->gfx_mode)
+       if (info->state != FBINFO_STATE_RUNNING)
                 return;
         if (info->flags & FBINFO_HWACCEL_DISABLED) {
                 cfb_copyarea(info, area);
                 return;
         }
  
+       radeon_fixup_offset(rinfo);
+
         vxres = info->var.xres_virtual;
         vyres = info->var.yres_virtual;
  
@@ -170,112 +168,13 @@ void radeonfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
         radeonfb_prim_copyarea(rinfo, &modded);
  }
  
-static void radeonfb_prim_imageblit(struct radeonfb_info *rinfo,
-                                   const struct fb_image *image,
-                                   u32 fg, u32 bg)
-{
-       unsigned int src_bytes, dwords;
-       u32 *bits;
-
-       radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache,
-                         rinfo->dp_gui_mc_base |
-                         GMC_BRUSH_NONE |
-                         GMC_SRC_DATATYPE_MONO_FG_BG |
-                         ROP3_S |
-                         GMC_BYTE_ORDER_MSB_TO_LSB |
-                         DP_SRC_SOURCE_HOST_DATA);
-       radeonfb_set_creg(rinfo, DP_CNTL, &rinfo->dp_cntl_cache,
-                         DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM);
-       radeonfb_set_creg(rinfo, DP_SRC_FRGD_CLR, &rinfo->dp_src_fg_cache, fg);
-       radeonfb_set_creg(rinfo, DP_SRC_BKGD_CLR, &rinfo->dp_src_bg_cache, bg);
-
-       radeon_fifo_wait(rinfo, 1);
-       OUTREG(DST_Y_X, (image->dy << 16) | image->dx);
-
-       /* Ensure the dst cache is flushed and the engine idle before
-        * issuing the operation.
-        *
-        * This works around engine lockups on some cards
-        */
-#if FLUSH_CACHE_WORKAROUND
-       radeon_fifo_wait(rinfo, 2);
-       OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL);
-       OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE));
-#endif
-
-       /* X here pads width to a multiple of 32 and uses the clipper to
-        * adjust the result. Is that really necessary ? Things seem to
-        * work ok for me without that and the doco doesn't seem to imply
-        * there is such a restriction.
-        */
-       OUTREG(DST_WIDTH_HEIGHT, (image->width << 16) | image->height);
-
-       src_bytes = (((image->width * image->depth) + 7) / 8) * image->height;
-       dwords = (src_bytes + 3) / 4;
-       bits = (u32*)(image->data);
-
-       while(dwords >= 8) {
-               radeon_fifo_wait(rinfo, 8);
-#if BITS_PER_LONG == 64
-               __raw_writeq(*((u64 *)(bits)), rinfo->mmio_base + HOST_DATA0);
-               __raw_writeq(*((u64 *)(bits+2)), rinfo->mmio_base + HOST_DATA2);
-               __raw_writeq(*((u64 *)(bits+4)), rinfo->mmio_base + HOST_DATA4);
-               __raw_writeq(*((u64 *)(bits+6)), rinfo->mmio_base + HOST_DATA6);
-               bits += 8;
-#else
-               __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA0);
-               __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA1);
-               __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA2);
-               __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA3);
-               __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA4);
-               __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA5);
-               __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA6);
-               __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA7);
-#endif
-               dwords -= 8;
-       }
-       while(dwords--) {
-               radeon_fifo_wait(rinfo, 1);
-               __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA0);
-       }
-}
-
  void radeonfb_imageblit(struct fb_info *info, const struct fb_image *image)
  {
         struct radeonfb_info *rinfo = info->par;
-       u32 fg, bg;
-
-       WARN_ON(rinfo->gfx_mode);
-       if (info->state != FBINFO_STATE_RUNNING || rinfo->gfx_mode)
-               return;
  
-       if (!image->width || !image->height)
+       if (info->state != FBINFO_STATE_RUNNING)
                 return;
-
-       /* We only do 1 bpp color expansion for now */
-       if (info->flags & FBINFO_HWACCEL_DISABLED || image->depth != 1)
-               goto fallback;
-
-       /* Fallback if running out of the screen. We may do clipping
-        * in the future */
-       if ((image->dx + image->width) > info->var.xres_virtual ||
-           (image->dy + image->height) > info->var.yres_virtual)
-               goto fallback;
-
-       if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
-           info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
-               fg = ((u32*)(info->pseudo_palette))[image->fg_color];
-               bg = ((u32*)(info->pseudo_palette))[image->bg_color];
-       } else {
-               fg = image->fg_color;
-               bg = image->bg_color;
-       }
-
-       radeonfb_prim_imageblit(rinfo, image, fg, bg);
-       return;
-
- fallback:
-       radeon_engine_idle(rinfo);
+       radeon_engine_idle();
  
         cfb_imageblit(info, image);
  }
@@ -286,8 +185,7 @@ int radeonfb_sync(struct fb_info *info)
  
         if (info->state != FBINFO_STATE_RUNNING)
                 return 0;
-
-       radeon_engine_idle(rinfo);
+       radeon_engine_idle();
  
         return 0;
  }
@@ -363,10 +261,9 @@ void radeonfb_engine_init (struct radeonfb_info *rinfo)
         /* disable 3D engine */
         OUTREG(RB3D_CNTL, 0);
  
-       rinfo->fifo_free = 0;
         radeonfb_engine_reset(rinfo);
  
-       radeon_fifo_wait(rinfo, 1);
+       radeon_fifo_wait (1);
         if (IS_R300_VARIANT(rinfo)) {
                 OUTREG(RB2D_DSTCACHE_MODE, INREG(RB2D_DSTCACHE_MODE) |
                        RB2D_DC_AUTOFLUSH_ENABLE |
@@ -380,7 +277,7 @@ void radeonfb_engine_init (struct radeonfb_info *rinfo)
                 OUTREG(RB2D_DSTCACHE_MODE, 0);
         }
  
-       radeon_fifo_wait(rinfo, 3);
+       radeon_fifo_wait (3);
         /* We re-read MC_FB_LOCATION from card as it can have been
          * modified by XFree drivers (ouch !)
          */
@@ -391,57 +288,41 @@ void radeonfb_engine_init (struct radeonfb_info *rinfo)
         OUTREG(DST_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10));
         OUTREG(SRC_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10));
  
-       radeon_fifo_wait(rinfo, 1);
-#ifdef __BIG_ENDIAN
+       radeon_fifo_wait (1);
+#if defined(__BIG_ENDIAN)
         OUTREGP(DP_DATATYPE, HOST_BIG_ENDIAN_EN, ~HOST_BIG_ENDIAN_EN);
  #else
         OUTREGP(DP_DATATYPE, 0, ~HOST_BIG_ENDIAN_EN);
  #endif
-       radeon_fifo_wait(rinfo, 2);
+       radeon_fifo_wait (2);
         OUTREG(DEFAULT_SC_TOP_LEFT, 0);
         OUTREG(DEFAULT_SC_BOTTOM_RIGHT, (DEFAULT_SC_RIGHT_MAX |
                                          DEFAULT_SC_BOTTOM_MAX));
  
-       /* set default DP_GUI_MASTER_CNTL */
         temp = radeon_get_dstbpp(rinfo->depth);
-       rinfo->dp_gui_mc_base = ((temp << 8) | GMC_CLR_CMP_CNTL_DIS);
+       rinfo->dp_gui_master_cntl = ((temp << 8) | GMC_CLR_CMP_CNTL_DIS);
  
-       rinfo->dp_gui_mc_cache = rinfo->dp_gui_mc_base |
-               GMC_BRUSH_SOLID_COLOR |
-               GMC_SRC_DATATYPE_COLOR;
-       radeon_fifo_wait(rinfo, 1);
-       OUTREG(DP_GUI_MASTER_CNTL, rinfo->dp_gui_mc_cache);
+       radeon_fifo_wait (1);
+       OUTREG(DP_GUI_MASTER_CNTL, (rinfo->dp_gui_master_cntl |
+                                   GMC_BRUSH_SOLID_COLOR |
+                                   GMC_SRC_DATATYPE_COLOR));
  
+       radeon_fifo_wait (7);
  
         /* clear line drawing regs */
-       radeon_fifo_wait(rinfo, 2);
         OUTREG(DST_LINE_START, 0);
         OUTREG(DST_LINE_END, 0);
  
-       /* set brush and source color regs */
-       rinfo->dp_brush_fg_cache = 0xffffffff;
-       rinfo->dp_brush_bg_cache = 0x00000000;
-       rinfo->dp_src_fg_cache = 0xffffffff;
-       rinfo->dp_src_bg_cache = 0x00000000;
-       radeon_fifo_wait(rinfo, 4);
-       OUTREG(DP_BRUSH_FRGD_CLR, rinfo->dp_brush_fg_cache);
-       OUTREG(DP_BRUSH_BKGD_CLR, rinfo->dp_brush_bg_cache);
-       OUTREG(DP_SRC_FRGD_CLR, rinfo->dp_src_fg_cache);
-       OUTREG(DP_SRC_BKGD_CLR, rinfo->dp_src_bg_cache);
-
-       /* Default direction */
-       rinfo->dp_cntl_cache = DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM;
-       radeon_fifo_wait(rinfo, 1);
-       OUTREG(DP_CNTL, rinfo->dp_cntl_cache);
+       /* set brush color regs */
+       OUTREG(DP_BRUSH_FRGD_CLR, 0xffffffff);
+       OUTREG(DP_BRUSH_BKGD_CLR, 0x00000000);
+
+       /* set source color regs */
+       OUTREG(DP_SRC_FRGD_CLR, 0xffffffff);
+       OUTREG(DP_SRC_BKGD_CLR, 0x00000000);
  
         /* default write mask */
-       radeon_fifo_wait(rinfo, 1);
         OUTREG(DP_WRITE_MSK, 0xffffffff);
  
-       /* Default to no swapping of host data */
-       radeon_fifo_wait(rinfo, 1);
-       OUTREG(RBBM_GUICNTL, RBBM_GUICNTL_HOST_DATA_SWAP_NONE);
-
-       /* Make sure it's settled */
-       radeon_engine_idle(rinfo);
+       radeon_engine_idle ();
  }
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c

index f343ba83f0ae0dbb6e50d25aa8ea95239598b1fd..1a056adb61c836784fce99d1c0314e710f4948e8 100644 (file)
--- a/drivers/video/aty/radeon_backlight.c
+++ b/drivers/video/aty/radeon_backlight.c
@@ -66,7 +66,7 @@ static int radeon_bl_update_status(struct backlight_device *bd)
                 level = bd->props.brightness;
  
         del_timer_sync(&rinfo->lvds_timer);
-       radeon_engine_idle(rinfo);
+       radeon_engine_idle();
  
         lvds_gen_cntl = INREG(LVDS_GEN_CNTL);
         if (level > 0) {
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c

index 9a5821c65ebf22fd2d492ee3972002bb2f5cc651..d0f1a7fc2c9df7da492102db83247624c94dac9f 100644 (file)
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -852,6 +852,7 @@ static int radeonfb_pan_display (struct fb_var_screeninfo *var,
          if (rinfo->asleep)
                 return 0;
  
+       radeon_fifo_wait(2);
          OUTREG(CRTC_OFFSET, ((var->yoffset * var->xres_virtual + var->xoffset)
                              * var->bits_per_pixel / 8) & ~7);
          return 0;
@@ -881,6 +882,7 @@ static int radeonfb_ioctl (struct fb_info *info, unsigned int cmd,
                         if (rc)
                                 return rc;
  
+                       radeon_fifo_wait(2);
                         if (value & 0x01) {
                                 tmp = INREG(LVDS_GEN_CNTL);
  
@@ -938,7 +940,7 @@ int radeon_screen_blank(struct radeonfb_info *rinfo, int blank, int mode_switch)
         if (rinfo->lock_blank)
                 return 0;
  
-       radeon_engine_idle(rinfo);
+       radeon_engine_idle();
  
         val = INREG(CRTC_EXT_CNTL);
          val &= ~(CRTC_DISPLAY_DIS | CRTC_HSYNC_DIS |
@@ -1046,7 +1048,7 @@ static int radeonfb_blank (int blank, struct fb_info *info)
  
         if (rinfo->asleep)
                 return 0;
-
+               
         return radeon_screen_blank(rinfo, blank, 0);
  }
  
@@ -1072,6 +1074,8 @@ static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green,
          pindex = regno;
  
          if (!rinfo->asleep) {
+               radeon_fifo_wait(9);
+
                 if (rinfo->bpp == 16) {
                         pindex = regno * 8;
  
@@ -1240,6 +1244,8 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg
  {
         int i;
  
+       radeon_fifo_wait(20);
+
         /* Workaround from XFree */
         if (rinfo->is_mobility) {
                 /* A temporal workaround for the occational blanking on certain laptop
@@ -1335,7 +1341,7 @@ static void radeon_lvds_timer_func(unsigned long data)
  {
         struct radeonfb_info *rinfo = (struct radeonfb_info *)data;
  
-       radeon_engine_idle(rinfo);
+       radeon_engine_idle();
  
         OUTREG(LVDS_GEN_CNTL, rinfo->pending_lvds_gen_cntl);
  }
@@ -1353,11 +1359,10 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode,
         if (nomodeset)
                 return;
  
-       radeon_engine_idle(rinfo);
-
         if (!regs_only)
                 radeon_screen_blank(rinfo, FB_BLANK_NORMAL, 0);
  
+       radeon_fifo_wait(31);
         for (i=0; i<10; i++)
                 OUTREG(common_regs[i].reg, common_regs[i].val);
  
@@ -1385,6 +1390,7 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode,
         radeon_write_pll_regs(rinfo, mode);
  
         if ((primary_mon == MT_DFP) || (primary_mon == MT_LCD)) {
+               radeon_fifo_wait(10);
                 OUTREG(FP_CRTC_H_TOTAL_DISP, mode->fp_crtc_h_total_disp);
                 OUTREG(FP_CRTC_V_TOTAL_DISP, mode->fp_crtc_v_total_disp);
                 OUTREG(FP_H_SYNC_STRT_WID, mode->fp_h_sync_strt_wid);
@@ -1399,6 +1405,7 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode,
         if (!regs_only)
                 radeon_screen_blank(rinfo, FB_BLANK_UNBLANK, 0);
  
+       radeon_fifo_wait(2);
         OUTPLL(VCLK_ECP_CNTL, mode->vclk_ecp_cntl);
         
         return;
@@ -1549,7 +1556,7 @@ static int radeonfb_set_par(struct fb_info *info)
         /* We always want engine to be idle on a mode switch, even
          * if we won't actually change the mode
          */
-       radeon_engine_idle(rinfo);
+       radeon_engine_idle();
  
         hSyncStart = mode->xres + mode->right_margin;
         hSyncEnd = hSyncStart + mode->hsync_len;
@@ -1844,6 +1851,7 @@ static int radeonfb_set_par(struct fb_info *info)
         return 0;
  }
  
+
  static struct fb_ops radeonfb_ops = {
         .owner                  = THIS_MODULE,
         .fb_check_var           = radeonfb_check_var,
@@ -1867,7 +1875,6 @@ static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo)
         info->par = rinfo;
         info->pseudo_palette = rinfo->pseudo_palette;
         info->flags = FBINFO_DEFAULT
-                   | FBINFO_HWACCEL_IMAGEBLIT
                     | FBINFO_HWACCEL_COPYAREA
                     | FBINFO_HWACCEL_FILLRECT
                     | FBINFO_HWACCEL_XPAN
@@ -1999,6 +2006,7 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo)
            u32 tom = INREG(NB_TOM);
            tmp = ((((tom >> 16) - (tom & 0xffff) + 1) << 6) * 1024);
  
+               radeon_fifo_wait(6);
            OUTREG(MC_FB_LOCATION, tom);
            OUTREG(DISPLAY_BASE_ADDR, (tom & 0xffff) << 16);
            OUTREG(CRTC2_DISPLAY_BASE_ADDR, (tom & 0xffff) << 16);
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c

index 3df5015f1d13f540a6bc9b5cbfdd663663604eac..675abdafc2d8d047741ed3b8fdf2c0291343440c 100644 (file)
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -2653,9 +2653,9 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
  
         if (!(info->flags & FBINFO_HWACCEL_DISABLED)) {
                 /* Make sure engine is reset */
-               radeon_engine_idle(rinfo);
+               radeon_engine_idle();
                 radeonfb_engine_reset(rinfo);
-               radeon_engine_idle(rinfo);
+               radeon_engine_idle();
         }
  
         /* Blank display and LCD */
@@ -2767,7 +2767,7 @@ int radeonfb_pci_resume(struct pci_dev *pdev)
  
                 rinfo->asleep = 0;
         } else
-               radeon_engine_idle(rinfo);
+               radeon_engine_idle();
  
         /* Restore display & engine */
         radeon_write_mode (rinfo, &rinfo->state, 1);
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h

index ea0b5b47acaf437027b0a5b153dd6cc4c5d5e1b3..3ea1b00fdd22ae66e882fc764359920ab8a609c5 100644 (file)
--- a/drivers/video/aty/radeonfb.h
+++ b/drivers/video/aty/radeonfb.h
@@ -336,15 +336,7 @@ struct radeonfb_info {
         int                     mon2_type;
         u8                      *mon2_EDID;
  
-       /* accel bits */
-       u32                     dp_gui_mc_base;
-       u32                     dp_gui_mc_cache;
-       u32                     dp_cntl_cache;
-       u32                     dp_brush_fg_cache;
-       u32                     dp_brush_bg_cache;
-       u32                     dp_src_fg_cache;
-       u32                     dp_src_bg_cache;
-       u32                     fifo_free;
+       u32                     dp_gui_master_cntl;
  
         struct pll_info         pll;
  
@@ -356,7 +348,6 @@ struct radeonfb_info {
         int                     lock_blank;
         int                     dynclk;
         int                     no_schedule;
-       int                     gfx_mode;
         enum radeon_pm_mode     pm_mode;
         reinit_function_ptr     reinit_func;
  
@@ -401,14 +392,8 @@ static inline void _radeon_msleep(struct radeonfb_info *rinfo, unsigned long ms)
  #define OUTREG8(addr,val)      writeb(val, (rinfo->mmio_base)+addr)
  #define INREG16(addr)          readw((rinfo->mmio_base)+addr)
  #define OUTREG16(addr,val)     writew(val, (rinfo->mmio_base)+addr)
-
-#ifdef CONFIG_PPC
-#define INREG(addr)            ({ eieio(); ld_le32(rinfo->mmio_base+(addr)); })
-#define OUTREG(addr,val)       do { eieio(); st_le32(rinfo->mmio_base+(addr),(val)); } while(0)
-#else
  #define INREG(addr)            readl((rinfo->mmio_base)+addr)
  #define OUTREG(addr,val)       writel(val, (rinfo->mmio_base)+addr)
-#endif
  
  static inline void _OUTREGP(struct radeonfb_info *rinfo, u32 addr,
                        u32 val, u32 mask)
@@ -550,7 +535,17 @@ static inline u32 radeon_get_dstbpp(u16 depth)
   * 2D Engine helper routines
   */
  
-extern void radeon_fifo_update_and_wait(struct radeonfb_info *rinfo, int entries);
+static inline void _radeon_fifo_wait(struct radeonfb_info *rinfo, int entries)
+{
+       int i;
+
+       for (i=0; i<2000000; i++) {
+               if ((INREG(RBBM_STATUS) & 0x7f) >= entries)
+                       return;
+               udelay(1);
+       }
+       printk(KERN_ERR "radeonfb: FIFO Timeout !\n");
+}
  
  static inline void radeon_engine_flush (struct radeonfb_info *rinfo)
  {
@@ -563,7 +558,7 @@ static inline void radeon_engine_flush (struct radeonfb_info *rinfo)
         /* Ensure FIFO is empty, ie, make sure the flush commands
          * has reached the cache
          */
-       radeon_fifo_update_and_wait(rinfo, 64);
+       _radeon_fifo_wait (rinfo, 64);
  
         /* Wait for the flush to complete */
         for (i=0; i < 2000000; i++) {
@@ -575,12 +570,12 @@ static inline void radeon_engine_flush (struct radeonfb_info *rinfo)
  }
  
  
-static inline void radeon_engine_idle(struct radeonfb_info *rinfo)
+static inline void _radeon_engine_idle(struct radeonfb_info *rinfo)
  {
         int i;
  
         /* ensure FIFO is empty before waiting for idle */
-       radeon_fifo_update_and_wait (rinfo, 64);
+       _radeon_fifo_wait (rinfo, 64);
  
         for (i=0; i<2000000; i++) {
                 if (((INREG(RBBM_STATUS) & GUI_ACTIVE)) == 0) {
@@ -593,6 +588,8 @@ static inline void radeon_engine_idle(struct radeonfb_info *rinfo)
  }
  
  
+#define radeon_engine_idle()           _radeon_engine_idle(rinfo)
+#define radeon_fifo_wait(entries)      _radeon_fifo_wait(rinfo,entries)
  #define radeon_msleep(ms)              _radeon_msleep(rinfo,ms)
  
  
@@ -622,7 +619,6 @@ extern void radeonfb_imageblit(struct fb_info *p, const struct fb_image *image);
  extern int radeonfb_sync(struct fb_info *info);
  extern void radeonfb_engine_init (struct radeonfb_info *rinfo);
  extern void radeonfb_engine_reset(struct radeonfb_info *rinfo);
-extern void radeon_fixup_mem_offset(struct radeonfb_info *rinfo);
  
  /* Other functions */
  extern int radeon_screen_blank(struct radeonfb_info *rinfo, int blank, int mode_switch);
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c

index b92947d62ad6db01d8a2fb17787aec9ebe892d4a..0b2adefe9e3d55f3b20e3e668a8d5e7969058948 100644 (file)
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -2389,16 +2389,13 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
  
         if (!fbcon_is_inactive(vc, info)) {
                 if (ops->blank_state != blank) {
-                       int ret = 1;
-
                         ops->blank_state = blank;
                         fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW);
                         ops->cursor_flash = (!blank);
  
-                       if (info->fbops->fb_blank)
-                               ret = info->fbops->fb_blank(blank, info);
-                       if (ret)
-                               fbcon_generic_blank(vc, info, blank);
+                       if (!(info->flags & FBINFO_MISC_USEREVENT))
+                               if (fb_blank(info, blank))
+                                       fbcon_generic_blank(vc, info, blank);
                 }
  
                 if (!blank)
@@ -3534,12 +3531,18 @@ static void fbcon_exit(void)
         softback_buf = 0UL;
  
         for (i = 0; i < FB_MAX; i++) {
+               int pending;
+
                 mapped = 0;
                 info = registered_fb[i];
  
                 if (info == NULL)
                         continue;
  
+               pending = cancel_work_sync(&info->queue);
+               DPRINTK("fbcon: %s pending work\n", (pending ? "canceled" :
+                       "no"));
+
                 for (j = first_fb_vc; j <= last_fb_vc; j++) {
                         if (con2fb_map[j] == i)
                                 mapped = 1;
diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c

index b790ddff76f9f5f91d70dd181f69699d0f4b613b..ee380d5f34107d0713b582b9a29cd6259a327119 100644 (file)
--- a/drivers/video/macfb.c
+++ b/drivers/video/macfb.c
@@ -164,7 +164,6 @@ static struct fb_var_screeninfo macfb_defined = {
  };
  
  static struct fb_fix_screeninfo macfb_fix = {
-       .id     = "Macintosh ",
         .type   = FB_TYPE_PACKED_PIXELS,
         .accel  = FB_ACCEL_NONE,
  };
@@ -760,22 +759,22 @@ static int __init macfb_init(void)
  
                 switch(ndev->dr_hw) {
                 case NUBUS_DRHW_APPLE_MDC:
-                       strcat( macfb_fix.id, "Display Card" );
+                       strcpy(macfb_fix.id, "Mac Disp. Card");
                         macfb_setpalette = mdc_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
                         break;
                 case NUBUS_DRHW_APPLE_TFB:
-                       strcat( macfb_fix.id, "Toby" );
+                       strcpy(macfb_fix.id, "Toby");
                         macfb_setpalette = toby_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
                         break;
                 case NUBUS_DRHW_APPLE_JET:
-                       strcat( macfb_fix.id, "Jet");
+                       strcpy(macfb_fix.id, "Jet");
                         macfb_setpalette = jet_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
                         break;                  
                 default:
-                       strcat( macfb_fix.id, "Generic NuBus" );
+                       strcpy(macfb_fix.id, "Generic NuBus");
                         break;
                 }
         }
@@ -786,21 +785,11 @@ static int __init macfb_init(void)
         if (!video_is_nubus)
                 switch( mac_bi_data.id )
                 {
-                       /* These don't have onboard video.  Eventually, we may
-                          be able to write separate framebuffer drivers for
-                          them (tobyfb.c, hiresfb.c, etc, etc) */
-               case MAC_MODEL_II:
-               case MAC_MODEL_IIX:
-               case MAC_MODEL_IICX:
-               case MAC_MODEL_IIFX:
-                       strcat( macfb_fix.id, "Generic NuBus" );
-                       break;
-
                         /* Valkyrie Quadras */
                 case MAC_MODEL_Q630:
                         /* I'm not sure about this one */
                 case MAC_MODEL_P588:
-                       strcat( macfb_fix.id, "Valkyrie built-in" );
+                       strcpy(macfb_fix.id, "Valkyrie");
                         macfb_setpalette = valkyrie_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
                         valkyrie_cmap_regs = ioremap(DAC_BASE, 0x1000);
@@ -823,7 +812,7 @@ static int __init macfb_init(void)
                 case MAC_MODEL_Q700:
                 case MAC_MODEL_Q900:
                 case MAC_MODEL_Q950:
-                       strcat( macfb_fix.id, "DAFB built-in" );
+                       strcpy(macfb_fix.id, "DAFB");
                         macfb_setpalette = dafb_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
                         dafb_cmap_regs = ioremap(DAFB_BASE, 0x1000);
@@ -831,7 +820,7 @@ static int __init macfb_init(void)
  
                         /* LC II uses the V8 framebuffer */
                 case MAC_MODEL_LCII:
-                       strcat( macfb_fix.id, "V8 built-in" );
+                       strcpy(macfb_fix.id, "V8");
                         macfb_setpalette = v8_brazil_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
                         v8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000);
@@ -843,7 +832,7 @@ static int __init macfb_init(void)
                 case MAC_MODEL_IIVI:
                 case MAC_MODEL_IIVX:
                 case MAC_MODEL_P600:
-                       strcat( macfb_fix.id, "Brazil built-in" );
+                       strcpy(macfb_fix.id, "Brazil");
                         macfb_setpalette = v8_brazil_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
                         v8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000);
@@ -860,7 +849,7 @@ static int __init macfb_init(void)
                 case MAC_MODEL_P460:
                         macfb_setpalette = v8_brazil_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
-                       strcat( macfb_fix.id, "Sonora built-in" );
+                       strcpy(macfb_fix.id, "Sonora");
                         v8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000);
                         break;
  
@@ -871,7 +860,7 @@ static int __init macfb_init(void)
                 case MAC_MODEL_IISI:
                         macfb_setpalette = rbv_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
-                       strcat( macfb_fix.id, "RBV built-in" );
+                       strcpy(macfb_fix.id, "RBV");
                         rbv_cmap_regs = ioremap(DAC_BASE, 0x1000);
                         break;
  
@@ -880,7 +869,7 @@ static int __init macfb_init(void)
                 case MAC_MODEL_C660:
                         macfb_setpalette = civic_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
-                       strcat( macfb_fix.id, "Civic built-in" );
+                       strcpy(macfb_fix.id, "Civic");
                         civic_cmap_regs = ioremap(CIVIC_BASE, 0x1000);
                         break;
  
@@ -901,7 +890,7 @@ static int __init macfb_init(void)
                                 v8_brazil_cmap_regs =
                                         ioremap(DAC_BASE, 0x1000);
                         }
-                       strcat( macfb_fix.id, "LC built-in" );
+                       strcpy(macfb_fix.id, "LC");
                         break;
                         /* We think this may be like the LC II */
                 case MAC_MODEL_CCL:
@@ -911,18 +900,18 @@ static int __init macfb_init(void)
                                 v8_brazil_cmap_regs =
                                         ioremap(DAC_BASE, 0x1000);
                         }
-                       strcat( macfb_fix.id, "Color Classic built-in" );
+                       strcpy(macfb_fix.id, "Color Classic");
                         break;
  
                         /* And we *do* mean "weirdos" */
                 case MAC_MODEL_TV:
-                       strcat( macfb_fix.id, "Mac TV built-in" );
+                       strcpy(macfb_fix.id, "Mac TV");
                         break;
  
                         /* These don't have colour, so no need to worry */
                 case MAC_MODEL_SE30:
                 case MAC_MODEL_CLII:
-                       strcat( macfb_fix.id, "Monochrome built-in" );
+                       strcpy(macfb_fix.id, "Monochrome");
                         break;
  
                         /* Powerbooks are particularly difficult.  Many of
@@ -935,7 +924,7 @@ static int __init macfb_init(void)
                 case MAC_MODEL_PB140:
                 case MAC_MODEL_PB145:
                 case MAC_MODEL_PB170:
-                       strcat( macfb_fix.id, "DDC built-in" );
+                       strcpy(macfb_fix.id, "DDC");
                         break;
  
                         /* Internal is GSC, External (if present) is ViSC */
@@ -945,13 +934,13 @@ static int __init macfb_init(void)
                 case MAC_MODEL_PB180:
                 case MAC_MODEL_PB210:
                 case MAC_MODEL_PB230:
-                       strcat( macfb_fix.id, "GSC built-in" );
+                       strcpy(macfb_fix.id, "GSC");
                         break;
  
                         /* Internal is TIM, External is ViSC */
                 case MAC_MODEL_PB165C:
                 case MAC_MODEL_PB180C:
-                       strcat( macfb_fix.id, "TIM built-in" );
+                       strcpy(macfb_fix.id, "TIM");
                         break;
  
                         /* Internal is CSC, External is Keystone+Ariel. */
@@ -963,12 +952,12 @@ static int __init macfb_init(void)
                 case MAC_MODEL_PB280C:
                         macfb_setpalette = csc_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
-                       strcat( macfb_fix.id, "CSC built-in" );
+                       strcpy(macfb_fix.id, "CSC");
                         csc_cmap_regs = ioremap(CSC_BASE, 0x1000);
                         break;
                 
                 default:
-                       strcat( macfb_fix.id, "Unknown/Unsupported built-in" );
+                       strcpy(macfb_fix.id, "Unknown");
                         break;
                 }
  
@@ -978,16 +967,23 @@ static int __init macfb_init(void)
         fb_info.pseudo_palette  = pseudo_palette;
         fb_info.flags           = FBINFO_DEFAULT;
  
-       fb_alloc_cmap(&fb_info.cmap, video_cmap_len, 0);
+       err = fb_alloc_cmap(&fb_info.cmap, video_cmap_len, 0);
+       if (err)
+               goto fail_unmap;
         
         err = register_framebuffer(&fb_info);
-       if (!err)
-               printk("fb%d: %s frame buffer device\n",
-                      fb_info.node, fb_info.fix.id);
-       else {
-               iounmap(fb_info.screen_base);
-               iounmap_macfb();
-       }
+       if (err)
+               goto fail_dealloc;
+
+       printk("fb%d: %s frame buffer device\n",
+              fb_info.node, fb_info.fix.id);
+       return 0;
+
+fail_dealloc:
+       fb_dealloc_cmap(&fb_info.cmap);
+fail_unmap:
+       iounmap(fb_info.screen_base);
+       iounmap_macfb();
         return err;
  }
  
diff --git a/drivers/video/mb862xx/mb862xxfb.c b/drivers/video/mb862xx/mb862xxfb.c

index 38718d95fbb9ad3091ba7652e72f1377235bb19a..fb64234a3825a2a9d1ee7f24e52e7cd75b969713 100644 (file)
--- a/drivers/video/mb862xx/mb862xxfb.c
+++ b/drivers/video/mb862xx/mb862xxfb.c
@@ -927,9 +927,9 @@ static int __devinit mb862xx_pci_probe(struct pci_dev *pdev,
         }
  
         dev_dbg(dev, "fb phys 0x%llx 0x%lx\n",
-               (u64)par->fb_base_phys, (ulong)par->mapped_vram);
+               (unsigned long long)par->fb_base_phys, (ulong)par->mapped_vram);
         dev_dbg(dev, "mmio phys 0x%llx 0x%lx\n",
-               (u64)par->mmio_base_phys, (ulong)par->mmio_len);
+               (unsigned long long)par->mmio_base_phys, (ulong)par->mmio_len);
  
         if (mb862xx_pci_gdc_init(par))
                 goto io_unmap;
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c

index 5a5e407dc45f713cc9252f11efcf1ae2b113f2a3..1a49519dafa483b864c992dfb1f92b2f8e02505f 100644 (file)
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -392,7 +392,7 @@ static void set_fb_fix(struct fb_info *fbi)
         int bpp;
  
         rg = &plane->fbdev->mem_desc.region[plane->idx];
-       fbi->screen_base        = (char __iomem *)rg->vaddr;
+       fbi->screen_base        = rg->vaddr;
         fix->smem_start         = rg->paddr;
         fix->smem_len           = rg->size;
  
diff --git a/drivers/w1/w1_io.c b/drivers/w1/w1_io.c

index 0d15b0eaf79a7b5a56eb50bb00efc1a9571280e6..5139c25ca96288474cf976cf5577be12c6d6d30b 100644 (file)
--- a/drivers/w1/w1_io.c
+++ b/drivers/w1/w1_io.c
@@ -356,7 +356,9 @@ int w1_reset_select_slave(struct w1_slave *sl)
                 w1_write_8(sl->master, W1_SKIP_ROM);
         else {
                 u8 match[9] = {W1_MATCH_ROM, };
-               memcpy(&match[1], (u8 *)&sl->reg_num, 8);
+               u64 rn = le64_to_cpu(*((u64*)&sl->reg_num));
+
+               memcpy(&match[1], &rn, 8);
                 w1_write_block(sl->master, match, 9);
         }
         return 0;
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c

index a3765e0be4a82db9bedd1adb9175cc7cef6b08d3..763c1ea5dce54b38ce2a1da262e0a8f39a2688a3 100644 (file)
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -40,6 +40,7 @@
  #include <linux/bootmem.h>
  #include <linux/slab.h>
  #include <asm/desc.h>
+#include <asm/cacheflush.h>
  
  #define PCI_BIOS32_SD_VALUE            0x5F32335F      /* "_32_" */
  #define CRU_BIOS_SIGNATURE_VALUE       0x55524324
@@ -394,6 +395,8 @@ static void __devinit dmi_find_cru(const struct dmi_header *dm)
                                 smbios_cru64_ptr->double_offset;
                         cru_rom_addr = ioremap(cru_physical_address,
                                 smbios_cru64_ptr->double_length);
+                       set_memory_x((unsigned long)cru_rom_addr & PAGE_MASK,
+                               smbios_cru64_ptr->double_length >> PAGE_SHIFT);
                 }
         }
  }
@@ -482,7 +485,7 @@ static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason,
                         "Management Log for details.\n");
         }
  
-       return NOTIFY_STOP;
+       return NOTIFY_OK;
  }
  
  /*
diff --git a/drivers/watchdog/iTCO_vendor_support.c b/drivers/watchdog/iTCO_vendor_support.c

index ca344a85eb9591e450d2aad02a0bcc9736e05e83..2474ebca88f6d816837765b667bdf7e9e4ea087f 100644 (file)
--- a/drivers/watchdog/iTCO_vendor_support.c
+++ b/drivers/watchdog/iTCO_vendor_support.c
@@ -1,7 +1,7 @@
  /*
   *     intel TCO vendor specific watchdog driver support
   *
- *     (c) Copyright 2006 Wim Van Sebroeck <wim@iguana.be>.
+ *     (c) Copyright 2006-2008 Wim Van Sebroeck <wim@iguana.be>.
   *
   *     This program is free software; you can redistribute it and/or
   *     modify it under the terms of the GNU General Public License
@@ -19,8 +19,7 @@
  
  /* Module and version information */
  #define DRV_NAME       "iTCO_vendor_support"
-#define DRV_VERSION    "1.01"
-#define DRV_RELDATE    "11-Nov-2006"
+#define DRV_VERSION    "1.02"
  #define PFX            DRV_NAME ": "
  
  /* Includes */
@@ -78,24 +77,6 @@ MODULE_PARM_DESC(vendorsupport, "iTCO vendor specific support mode, default=0 (n
   *         20.6 seconds.
   */
  
-static void supermicro_old_pre_start(unsigned long acpibase)
-{
-       unsigned long val32;
-
-       val32 = inl(SMI_EN);
-       val32 &= 0xffffdfff;    /* Turn off SMI clearing watchdog */
-       outl(val32, SMI_EN);    /* Needed to activate watchdog */
-}
-
-static void supermicro_old_pre_stop(unsigned long acpibase)
-{
-       unsigned long val32;
-
-       val32 = inl(SMI_EN);
-       val32 &= 0x00002000;    /* Turn on SMI clearing watchdog */
-       outl(val32, SMI_EN);    /* Needed to deactivate watchdog */
-}
-
  static void supermicro_old_pre_keepalive(unsigned long acpibase)
  {
         /* Reload TCO Timer (done in iTCO_wdt_keepalive) + */
@@ -247,18 +228,14 @@ static void supermicro_new_pre_set_heartbeat(unsigned int heartbeat)
  void iTCO_vendor_pre_start(unsigned long acpibase,
                            unsigned int heartbeat)
  {
-       if (vendorsupport == SUPERMICRO_OLD_BOARD)
-               supermicro_old_pre_start(acpibase);
-       else if (vendorsupport == SUPERMICRO_NEW_BOARD)
+       if (vendorsupport == SUPERMICRO_NEW_BOARD)
                 supermicro_new_pre_start(heartbeat);
  }
  EXPORT_SYMBOL(iTCO_vendor_pre_start);
  
  void iTCO_vendor_pre_stop(unsigned long acpibase)
  {
-       if (vendorsupport == SUPERMICRO_OLD_BOARD)
-               supermicro_old_pre_stop(acpibase);
-       else if (vendorsupport == SUPERMICRO_NEW_BOARD)
+       if (vendorsupport == SUPERMICRO_NEW_BOARD)
                 supermicro_new_pre_stop();
  }
  EXPORT_SYMBOL(iTCO_vendor_pre_stop);
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c

index bfb93bc2ca9f50c27278fe8d29384605f8f03e26..5b395a4ddfdfec67dbd4324acbc521258977a855 100644 (file)
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -1,7 +1,7 @@
  /*
   *     intel TCO Watchdog Driver (Used in i82801 and i6300ESB chipsets)
   *
- *     (c) Copyright 2006-2007 Wim Van Sebroeck <wim@iguana.be>.
+ *     (c) Copyright 2006-2008 Wim Van Sebroeck <wim@iguana.be>.
   *
   *     This program is free software; you can redistribute it and/or
   *     modify it under the terms of the GNU General Public License
@@ -20,34 +20,41 @@
   *     82801BAM (ICH2-M)    : document number 290687-002, 298242-027,
   *     82801CA  (ICH3-S)    : document number 290733-003, 290739-013,
   *     82801CAM (ICH3-M)    : document number 290716-001, 290718-007,
- *     82801DB  (ICH4)      : document number 290744-001, 290745-020,
- *     82801DBM (ICH4-M)    : document number 252337-001, 252663-005,
+ *     82801DB  (ICH4)      : document number 290744-001, 290745-025,
+ *     82801DBM (ICH4-M)    : document number 252337-001, 252663-008,
   *     82801E   (C-ICH)     : document number 273599-001, 273645-002,
- *     82801EB  (ICH5)      : document number 252516-001, 252517-003,
- *     82801ER  (ICH5R)     : document number 252516-001, 252517-003,
- *     82801FB  (ICH6)      : document number 301473-002, 301474-007,
- *     82801FR  (ICH6R)     : document number 301473-002, 301474-007,
- *     82801FBM (ICH6-M)    : document number 301473-002, 301474-007,
- *     82801FW  (ICH6W)     : document number 301473-001, 301474-007,
- *     82801FRW (ICH6RW)    : document number 301473-001, 301474-007,
- *     82801GB  (ICH7)      : document number 307013-002, 307014-009,
- *     82801GR  (ICH7R)     : document number 307013-002, 307014-009,
- *     82801GDH (ICH7DH)    : document number 307013-002, 307014-009,
- *     82801GBM (ICH7-M)    : document number 307013-002, 307014-009,
- *     82801GHM (ICH7-M DH) : document number 307013-002, 307014-009,
- *     82801HB  (ICH8)      : document number 313056-003, 313057-009,
- *     82801HR  (ICH8R)     : document number 313056-003, 313057-009,
- *     82801HBM (ICH8M)     : document number 313056-003, 313057-009,
- *     82801HH  (ICH8DH)    : document number 313056-003, 313057-009,
- *     82801HO  (ICH8DO)    : document number 313056-003, 313057-009,
- *     82801HEM (ICH8M-E)   : document number 313056-003, 313057-009,
- *     82801IB  (ICH9)      : document number 316972-001, 316973-006,
- *     82801IR  (ICH9R)     : document number 316972-001, 316973-006,
- *     82801IH  (ICH9DH)    : document number 316972-001, 316973-006,
- *     82801IO  (ICH9DO)    : document number 316972-001, 316973-006,
- *     6300ESB  (6300ESB)   : document number 300641-003, 300884-010,
- *     631xESB  (631xESB)   : document number 313082-001, 313075-005,
- *     632xESB  (632xESB)   : document number 313082-001, 313075-005
+ *     82801EB  (ICH5)      : document number 252516-001, 252517-028,
+ *     82801ER  (ICH5R)     : document number 252516-001, 252517-028,
+ *     6300ESB  (6300ESB)   : document number 300641-004, 300884-013,
+ *     82801FB  (ICH6)      : document number 301473-002, 301474-026,
+ *     82801FR  (ICH6R)     : document number 301473-002, 301474-026,
+ *     82801FBM (ICH6-M)    : document number 301473-002, 301474-026,
+ *     82801FW  (ICH6W)     : document number 301473-001, 301474-026,
+ *     82801FRW (ICH6RW)    : document number 301473-001, 301474-026,
+ *     631xESB  (631xESB)   : document number 313082-001, 313075-006,
+ *     632xESB  (632xESB)   : document number 313082-001, 313075-006,
+ *     82801GB  (ICH7)      : document number 307013-003, 307014-024,
+ *     82801GR  (ICH7R)     : document number 307013-003, 307014-024,
+ *     82801GDH (ICH7DH)    : document number 307013-003, 307014-024,
+ *     82801GBM (ICH7-M)    : document number 307013-003, 307014-024,
+ *     82801GHM (ICH7-M DH) : document number 307013-003, 307014-024,
+ *     82801GU  (ICH7-U)    : document number 307013-003, 307014-024,
+ *     82801HB  (ICH8)      : document number 313056-003, 313057-017,
+ *     82801HR  (ICH8R)     : document number 313056-003, 313057-017,
+ *     82801HBM (ICH8M)     : document number 313056-003, 313057-017,
+ *     82801HH  (ICH8DH)    : document number 313056-003, 313057-017,
+ *     82801HO  (ICH8DO)    : document number 313056-003, 313057-017,
+ *     82801HEM (ICH8M-E)   : document number 313056-003, 313057-017,
+ *     82801IB  (ICH9)      : document number 316972-004, 316973-012,
+ *     82801IR  (ICH9R)     : document number 316972-004, 316973-012,
+ *     82801IH  (ICH9DH)    : document number 316972-004, 316973-012,
+ *     82801IO  (ICH9DO)    : document number 316972-004, 316973-012,
+ *     82801IBM (ICH9M)     : document number 316972-004, 316973-012,
+ *     82801IEM (ICH9M-E)   : document number 316972-004, 316973-012,
+ *     82801JIB (ICH10)     : document number 319973-002, 319974-002,
+ *     82801JIR (ICH10R)    : document number 319973-002, 319974-002,
+ *     82801JD  (ICH10D)    : document number 319973-002, 319974-002,
+ *     82801JDO (ICH10DO)   : document number 319973-002, 319974-002
   */
  
  /*
@@ -56,8 +63,7 @@
  
  /* Module and version information */
  #define DRV_NAME       "iTCO_wdt"
-#define DRV_VERSION    "1.03"
-#define DRV_RELDATE    "30-Apr-2008"
+#define DRV_VERSION    "1.04"
  #define PFX            DRV_NAME ": "
  
  /* Includes */
@@ -96,19 +102,26 @@ enum iTCO_chipsets {
         TCO_ICH6,       /* ICH6 & ICH6R */
         TCO_ICH6M,      /* ICH6-M */
         TCO_ICH6W,      /* ICH6W & ICH6RW */
+       TCO_631XESB,    /* 631xESB/632xESB */
         TCO_ICH7,       /* ICH7 & ICH7R */
-       TCO_ICH7M,      /* ICH7-M */
+       TCO_ICH7DH,     /* ICH7DH */
+       TCO_ICH7M,      /* ICH7-M & ICH7-U */
         TCO_ICH7MDH,    /* ICH7-M DH */
         TCO_ICH8,       /* ICH8 & ICH8R */
-       TCO_ICH8ME,     /* ICH8M-E */
         TCO_ICH8DH,     /* ICH8DH */
         TCO_ICH8DO,     /* ICH8DO */
         TCO_ICH8M,      /* ICH8M */
+       TCO_ICH8ME,     /* ICH8M-E */
         TCO_ICH9,       /* ICH9 */
         TCO_ICH9R,      /* ICH9R */
         TCO_ICH9DH,     /* ICH9DH */
         TCO_ICH9DO,     /* ICH9DO */
-       TCO_631XESB,    /* 631xESB/632xESB */
+       TCO_ICH9M,      /* ICH9M */
+       TCO_ICH9ME,     /* ICH9M-E */
+       TCO_ICH10,      /* ICH10 */
+       TCO_ICH10R,     /* ICH10R */
+       TCO_ICH10D,     /* ICH10D */
+       TCO_ICH10DO,    /* ICH10DO */
  };
  
  static struct {
@@ -129,19 +142,26 @@ static struct {
         {"ICH6 or ICH6R", 2},
         {"ICH6-M", 2},
         {"ICH6W or ICH6RW", 2},
+       {"631xESB/632xESB", 2},
         {"ICH7 or ICH7R", 2},
-       {"ICH7-M", 2},
+       {"ICH7DH", 2},
+       {"ICH7-M or ICH7-U", 2},
         {"ICH7-M DH", 2},
         {"ICH8 or ICH8R", 2},
-       {"ICH8M-E", 2},
         {"ICH8DH", 2},
         {"ICH8DO", 2},
         {"ICH8M", 2},
+       {"ICH8M-E", 2},
         {"ICH9", 2},
         {"ICH9R", 2},
         {"ICH9DH", 2},
         {"ICH9DO", 2},
-       {"631xESB/632xESB", 2},
+       {"ICH9M", 2},
+       {"ICH9M-E", 2},
+       {"ICH10", 2},
+       {"ICH10R", 2},
+       {"ICH10D", 2},
+       {"ICH10DO", 2},
         {NULL, 0}
  };
  
@@ -175,18 +195,6 @@ static struct pci_device_id iTCO_wdt_pci_tbl[] = {
         { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH6_0,           TCO_ICH6)},
         { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH6_1,           TCO_ICH6M)},
         { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH6_2,           TCO_ICH6W)},
-       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_0,           TCO_ICH7)},
-       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_1,           TCO_ICH7M)},
-       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_31,          TCO_ICH7MDH)},
-       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_0,           TCO_ICH8)},
-       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_1,           TCO_ICH8ME)},
-       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_2,           TCO_ICH8DH)},
-       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_3,           TCO_ICH8DO)},
-       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_4,           TCO_ICH8M)},
-       { ITCO_PCI_DEVICE(0x2918,                               TCO_ICH9)},
-       { ITCO_PCI_DEVICE(0x2916,                               TCO_ICH9R)},
-       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_2,           TCO_ICH9DH)},
-       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_4,           TCO_ICH9DO)},
         { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ESB2_0,           TCO_631XESB)},
         { ITCO_PCI_DEVICE(0x2671,                               TCO_631XESB)},
         { ITCO_PCI_DEVICE(0x2672,                               TCO_631XESB)},
@@ -203,6 +211,25 @@ static struct pci_device_id iTCO_wdt_pci_tbl[] = {
         { ITCO_PCI_DEVICE(0x267d,                               TCO_631XESB)},
         { ITCO_PCI_DEVICE(0x267e,                               TCO_631XESB)},
         { ITCO_PCI_DEVICE(0x267f,                               TCO_631XESB)},
+       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_0,           TCO_ICH7)},
+       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_30,          TCO_ICH7DH)},
+       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_1,           TCO_ICH7M)},
+       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_31,          TCO_ICH7MDH)},
+       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_0,           TCO_ICH8)},
+       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_2,           TCO_ICH8DH)},
+       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_3,           TCO_ICH8DO)},
+       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_4,           TCO_ICH8M)},
+       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_1,           TCO_ICH8ME)},
+       { ITCO_PCI_DEVICE(0x2918,                               TCO_ICH9)},
+       { ITCO_PCI_DEVICE(0x2916,                               TCO_ICH9R)},
+       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_2,           TCO_ICH9DH)},
+       { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_4,           TCO_ICH9DO)},
+       { ITCO_PCI_DEVICE(0x2919,                               TCO_ICH9M)},
+       { ITCO_PCI_DEVICE(0x2917,                               TCO_ICH9ME)},
+       { ITCO_PCI_DEVICE(0x3a18,                               TCO_ICH10)},
+       { ITCO_PCI_DEVICE(0x3a16,                               TCO_ICH10R)},
+       { ITCO_PCI_DEVICE(0x3a1a,                               TCO_ICH10D)},
+       { ITCO_PCI_DEVICE(0x3a14,                               TCO_ICH10DO)},
         { 0, },                 /* End of list */
  };
  MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl);
@@ -311,6 +338,7 @@ static int iTCO_wdt_unset_NO_REBOOT_bit(void)
  static int iTCO_wdt_start(void)
  {
         unsigned int val;
+       unsigned long val32;
  
         spin_lock(&iTCO_wdt_private.io_lock);
  
@@ -323,6 +351,18 @@ static int iTCO_wdt_start(void)
                 return -EIO;
         }
  
+       /* Bit 13: TCO_EN -> 0 = Disables TCO logic generating an SMI# */
+       val32 = inl(SMI_EN);
+       val32 &= 0xffffdfff;    /* Turn off SMI clearing watchdog */
+       outl(val32, SMI_EN);
+
+       /* Force the timer to its reload value by writing to the TCO_RLD
+          register */
+       if (iTCO_wdt_private.iTCO_version == 2)
+               outw(0x01, TCO_RLD);
+       else if (iTCO_wdt_private.iTCO_version == 1)
+               outb(0x01, TCO_RLD);
+
         /* Bit 11: TCO Timer Halt -> 0 = The TCO timer is enabled to count */
         val = inw(TCO1_CNT);
         val &= 0xf7ff;
@@ -338,6 +378,7 @@ static int iTCO_wdt_start(void)
  static int iTCO_wdt_stop(void)
  {
         unsigned int val;
+       unsigned long val32;
  
         spin_lock(&iTCO_wdt_private.io_lock);
  
@@ -349,6 +390,11 @@ static int iTCO_wdt_stop(void)
         outw(val, TCO1_CNT);
         val = inw(TCO1_CNT);
  
+       /* Bit 13: TCO_EN -> 1 = Enables the TCO logic to generate SMI# */
+       val32 = inl(SMI_EN);
+       val32 |= 0x00002000;
+       outl(val32, SMI_EN);
+
         /* Set the NO_REBOOT bit to prevent later reboots, just for sure */
         iTCO_wdt_set_NO_REBOOT_bit();
  
@@ -459,7 +505,6 @@ static int iTCO_wdt_open(struct inode *inode, struct file *file)
         /*
          *      Reload and activate timer
          */
-       iTCO_wdt_keepalive();
         iTCO_wdt_start();
         return nonseekable_open(inode, file);
  }
@@ -604,7 +649,6 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
         int ret;
         u32 base_address;
         unsigned long RCBA;
-       unsigned long val32;
  
         /*
          *      Find the ACPI/PM base I/O address which is the base
@@ -644,17 +688,13 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
         /* Set the NO_REBOOT bit to prevent later reboots, just for sure */
         iTCO_wdt_set_NO_REBOOT_bit();
  
-       /* Set the TCO_EN bit in SMI_EN register */
+       /* The TCO logic uses the TCO_EN bit in the SMI_EN register */
         if (!request_region(SMI_EN, 4, "iTCO_wdt")) {
                 printk(KERN_ERR PFX
                         "I/O address 0x%04lx already in use\n", SMI_EN);
                 ret = -EIO;
                 goto out;
         }
-       val32 = inl(SMI_EN);
-       val32 &= 0xffffdfff;    /* Turn off SMI clearing watchdog */
-       outl(val32, SMI_EN);
-       release_region(SMI_EN, 4);
  
         /* The TCO I/O registers reside in a 32-byte range pointed to
            by the TCOBASE value */
@@ -662,7 +702,7 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
                 printk(KERN_ERR PFX "I/O address 0x%04lx already in use\n",
                         TCOBASE);
                 ret = -EIO;
-               goto out;
+               goto unreg_smi_en;
         }
  
         printk(KERN_INFO PFX
@@ -672,8 +712,9 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
                         TCOBASE);
  
         /* Clear out the (probably old) status */
-       outb(0, TCO1_STS);
-       outb(3, TCO2_STS);
+       outb(8, TCO1_STS);      /* Clear the Time Out Status bit */
+       outb(2, TCO2_STS);      /* Clear SECOND_TO_STS bit */
+       outb(4, TCO2_STS);      /* Clear BOOT_STS bit */
  
         /* Make sure the watchdog is not running */
         iTCO_wdt_stop();
@@ -701,6 +742,8 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
  
  unreg_region:
         release_region(TCOBASE, 0x20);
+unreg_smi_en:
+       release_region(SMI_EN, 4);
  out:
         if (iTCO_wdt_private.iTCO_version == 2)
                 iounmap(iTCO_wdt_private.gcs);
@@ -718,6 +761,7 @@ static void __devexit iTCO_wdt_cleanup(void)
         /* Deregister */
         misc_deregister(&iTCO_wdt_miscdev);
         release_region(TCOBASE, 0x20);
+       release_region(SMI_EN, 4);
         if (iTCO_wdt_private.iTCO_version == 2)
                 iounmap(iTCO_wdt_private.gcs);
         pci_dev_put(iTCO_wdt_private.pdev);
@@ -782,8 +826,8 @@ static int __init iTCO_wdt_init_module(void)
  {
         int err;
  
-       printk(KERN_INFO PFX "Intel TCO WatchDog Timer Driver v%s (%s)\n",
-               DRV_VERSION, DRV_RELDATE);
+       printk(KERN_INFO PFX "Intel TCO WatchDog Timer Driver v%s\n",
+               DRV_VERSION);
  
         err = platform_driver_register(&iTCO_wdt_driver);
         if (err)
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c

index b4b7b0a4c119d47aa88675d28c7eefc8f04103a8..3acce623f20918328688b23656f197739bf5194d 100644 (file)
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -98,6 +98,8 @@ static void mtx1_wdt_reset(void)
  
  static void mtx1_wdt_start(void)
  {
+       unsigned long flags;
+
         spin_lock_irqsave(&mtx1_wdt_device.lock, flags);
         if (!mtx1_wdt_device.queue) {
                 mtx1_wdt_device.queue = 1;
@@ -110,6 +112,8 @@ static void mtx1_wdt_start(void)
  
  static int mtx1_wdt_stop(void)
  {
+       unsigned long flags;
+
         spin_lock_irqsave(&mtx1_wdt_device.lock, flags);
         if (mtx1_wdt_device.queue) {
                 mtx1_wdt_device.queue = 0;
diff --git a/fs/9p/fid.c b/fs/9p/fid.c

index 3031e3233dd625302715ff10c3e49ddc4b1aa7f7..2a983d49d19cba78984b5ae317ded774605121c1 100644 (file)
--- a/fs/9p/fid.c
+++ b/fs/9p/fid.c
@@ -45,7 +45,7 @@ int v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid)
         struct v9fs_dentry *dent;
  
         P9_DPRINTK(P9_DEBUG_VFS, "fid %d dentry %s\n",
-                                       fid->fid, dentry->d_iname);
+                                       fid->fid, dentry->d_name.name);
  
         dent = dentry->d_fsdata;
         if (!dent) {
@@ -79,7 +79,7 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, u32 uid, int any)
         struct p9_fid *fid, *ret;
  
         P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p) uid %d any %d\n",
-               dentry->d_iname, dentry, uid, any);
+               dentry->d_name.name, dentry, uid, any);
         dent = (struct v9fs_dentry *) dentry->d_fsdata;
         ret = NULL;
         if (dent) {
diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c

index 24eb01087b6d63313404dff82b4f192177189342..332b5ff02fec11b8e8e43645c93ae09679ac9a61 100644 (file)
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
@@ -160,7 +160,7 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses)
                                 v9ses->flags |= V9FS_ACCESS_ANY;
                         else {
                                 v9ses->flags |= V9FS_ACCESS_SINGLE;
-                               v9ses->uid = simple_strtol(s, &e, 10);
+                               v9ses->uid = simple_strtoul(s, &e, 10);
                                 if (*e != '\0')
                                         v9ses->uid = ~0;
                         }
diff --git a/fs/9p/vfs_dentry.c b/fs/9p/vfs_dentry.c

index f9534f18df0a1a2bafdf70cd1b00466b8c5fb6b7..06dcc7c4f2343ebb9cced85a8da46c880849794f 100644 (file)
--- a/fs/9p/vfs_dentry.c
+++ b/fs/9p/vfs_dentry.c
@@ -52,7 +52,8 @@
  
  static int v9fs_dentry_delete(struct dentry *dentry)
  {
-       P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry);
+       P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name,
+                                                                       dentry);
  
         return 1;
  }
@@ -69,7 +70,8 @@ static int v9fs_dentry_delete(struct dentry *dentry)
  static int v9fs_cached_dentry_delete(struct dentry *dentry)
  {
         struct inode *inode = dentry->d_inode;
-       P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry);
+       P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name,
+                                                                       dentry);
  
         if(!inode)
                 return 1;
@@ -88,7 +90,8 @@ void v9fs_dentry_release(struct dentry *dentry)
         struct v9fs_dentry *dent;
         struct p9_fid *temp, *current_fid;
  
-       P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry);
+       P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name,
+                                                                       dentry);
         dent = dentry->d_fsdata;
         if (dent) {
                 list_for_each_entry_safe(current_fid, temp, &dent->fidlist,
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c

index 8314d3f43b716f41560e4517d42eaade5cfc1459..2dfcf5487efebff886a9f42c23733875d4264608 100644 (file)
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -963,7 +963,8 @@ static int v9fs_vfs_readlink(struct dentry *dentry, char __user * buffer,
         if (buflen > PATH_MAX)
                 buflen = PATH_MAX;
  
-       P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry);
+       P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name,
+                                                                       dentry);
  
         retval = v9fs_readlink(dentry, link, buflen);
  
@@ -1022,7 +1023,8 @@ v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
  {
         char *s = nd_get_link(nd);
  
-       P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, s);
+       P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
+               IS_ERR(s) ? "<error>" : s);
         if (!IS_ERR(s))
                 __putname(s);
  }
diff --git a/fs/block_dev.c b/fs/block_dev.c

index db831efbdbbdcc0d2b1298af4e3055916357fee2..99e0ae1a4c789fff59aae0e32207755e38fa7e41 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1135,12 +1135,15 @@ static int blkdev_open(struct inode * inode, struct file * filp)
         if (res)
                 return res;
  
-       if (!(filp->f_mode & FMODE_EXCL))
-               return 0;
+       if (filp->f_mode & FMODE_EXCL) {
+               res = bd_claim(bdev, filp);
+               if (res)
+                       goto out_blkdev_put;
+       }
  
-       if (!(res = bd_claim(bdev, filp)))
-               return 0;
+       return 0;
  
+ out_blkdev_put:
         blkdev_put(bdev, filp->f_mode);
         return res;
  }
@@ -1203,8 +1206,16 @@ static long block_ioctl(struct file *file, unsigned cmd, unsigned long arg)
  {
         struct block_device *bdev = I_BDEV(file->f_mapping->host);
         fmode_t mode = file->f_mode;
+
+       /*
+        * O_NDELAY can be altered using fcntl(.., F_SETFL, ..), so we have
+        * to updated it before every ioctl.
+        */
         if (file->f_flags & O_NDELAY)
-               mode |= FMODE_NDELAY_NOW;
+               mode |= FMODE_NDELAY;
+       else
+               mode &= ~FMODE_NDELAY;
+
         return blkdev_ioctl(bdev, mode, cmd, arg);
  }
  
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c

index 2af8626ced435c10bea3654e38570f7decaa8a7d..6d51696dc762d3b6656ed027fe2d7ed40d549409 100644 (file)
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -3983,7 +3983,8 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr,
  
                 node->flags = le16_to_cpu(pSMBr->DFSFlags);
                 if (is_unicode) {
-                       __le16 *tmp = kmalloc(strlen(searchName)*2, GFP_KERNEL);
+                       __le16 *tmp = kmalloc(strlen(searchName)*2 + 2,
+                                               GFP_KERNEL);
                         cifsConvertToUCS((__le16 *) tmp, searchName,
                                         PATH_MAX, nls_codepage, remap);
                         node->path_consumed = hostlen_fromUCS(tmp,
diff --git a/fs/eventpoll.c b/fs/eventpoll.c

index aec5c13f634177bab34f108e9f4891e300b873a3..96355d505347414fc67dd1a7cd21503bdffa3c91 100644 (file)
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -102,6 +102,8 @@
  
  #define EP_UNACTIVE_PTR ((void *) -1L)
  
+#define EP_ITEM_COST (sizeof(struct epitem) + sizeof(struct eppoll_entry))
+
  struct epoll_filefd {
         struct file *file;
         int fd;
@@ -200,6 +202,9 @@ struct eventpoll {
          * holding ->lock.
          */
         struct epitem *ovflist;
+
+       /* The user that created the eventpoll descriptor */
+       struct user_struct *user;
  };
  
  /* Wait structure used by the poll hooks */
@@ -226,10 +231,18 @@ struct ep_pqueue {
         struct epitem *epi;
  };
  
+/*
+ * Configuration options available inside /proc/sys/fs/epoll/
+ */
+/* Maximum number of epoll devices, per user */
+static int max_user_instances __read_mostly;
+/* Maximum number of epoll watched descriptors, per user */
+static int max_user_watches __read_mostly;
+
  /*
   * This mutex is used to serialize ep_free() and eventpoll_release_file().
   */
-static struct mutex epmutex;
+static DEFINE_MUTEX(epmutex);
  
  /* Safe wake up implementation */
  static struct poll_safewake psw;
@@ -240,6 +253,33 @@ static struct kmem_cache *epi_cache __read_mostly;
  /* Slab cache used to allocate "struct eppoll_entry" */
  static struct kmem_cache *pwq_cache __read_mostly;
  
+#ifdef CONFIG_SYSCTL
+
+#include <linux/sysctl.h>
+
+static int zero;
+
+ctl_table epoll_table[] = {
+       {
+               .procname       = "max_user_instances",
+               .data           = &max_user_instances,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec_minmax,
+               .extra1         = &zero,
+       },
+       {
+               .procname       = "max_user_watches",
+               .data           = &max_user_watches,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec_minmax,
+               .extra1         = &zero,
+       },
+       { .ctl_name = 0 }
+};
+#endif /* CONFIG_SYSCTL */
+
  
  /* Setup the structure that is used as key for the RB tree */
  static inline void ep_set_ffd(struct epoll_filefd *ffd,
@@ -402,6 +442,8 @@ static int ep_remove(struct eventpoll *ep, struct epitem *epi)
         /* At this point it is safe to free the eventpoll item */
         kmem_cache_free(epi_cache, epi);
  
+       atomic_dec(&ep->user->epoll_watches);
+
         DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_remove(%p, %p)\n",
                      current, ep, file));
  
@@ -449,6 +491,8 @@ static void ep_free(struct eventpoll *ep)
  
         mutex_unlock(&epmutex);
         mutex_destroy(&ep->mtx);
+       atomic_dec(&ep->user->epoll_devs);
+       free_uid(ep->user);
         kfree(ep);
  }
  
@@ -532,10 +576,19 @@ void eventpoll_release_file(struct file *file)
  
  static int ep_alloc(struct eventpoll **pep)
  {
-       struct eventpoll *ep = kzalloc(sizeof(*ep), GFP_KERNEL);
+       int error;
+       struct user_struct *user;
+       struct eventpoll *ep;
  
-       if (!ep)
-               return -ENOMEM;
+       user = get_current_user();
+       error = -EMFILE;
+       if (unlikely(atomic_read(&user->epoll_devs) >=
+                       max_user_instances))
+               goto free_uid;
+       error = -ENOMEM;
+       ep = kzalloc(sizeof(*ep), GFP_KERNEL);
+       if (unlikely(!ep))
+               goto free_uid;
  
         spin_lock_init(&ep->lock);
         mutex_init(&ep->mtx);
@@ -544,12 +597,17 @@ static int ep_alloc(struct eventpoll **pep)
         INIT_LIST_HEAD(&ep->rdllist);
         ep->rbr = RB_ROOT;
         ep->ovflist = EP_UNACTIVE_PTR;
+       ep->user = user;
  
         *pep = ep;
  
         DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_alloc() ep=%p\n",
                      current, ep));
         return 0;
+
+free_uid:
+       free_uid(user);
+       return error;
  }
  
  /*
@@ -703,9 +761,11 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event,
         struct epitem *epi;
         struct ep_pqueue epq;
  
-       error = -ENOMEM;
+       if (unlikely(atomic_read(&ep->user->epoll_watches) >=
+                    max_user_watches))
+               return -ENOSPC;
         if (!(epi = kmem_cache_alloc(epi_cache, GFP_KERNEL)))
-               goto error_return;
+               return -ENOMEM;
  
         /* Item initialization follow here ... */
         INIT_LIST_HEAD(&epi->rdllink);
@@ -735,6 +795,7 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event,
          * install process. Namely an allocation for a wait queue failed due
          * high memory pressure.
          */
+       error = -ENOMEM;
         if (epi->nwait < 0)
                 goto error_unregister;
  
@@ -765,6 +826,8 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event,
  
         spin_unlock_irqrestore(&ep->lock, flags);
  
+       atomic_inc(&ep->user->epoll_watches);
+
         /* We have to call this outside the lock */
         if (pwake)
                 ep_poll_safewake(&psw, &ep->poll_wait);
@@ -789,7 +852,7 @@ error_unregister:
         spin_unlock_irqrestore(&ep->lock, flags);
  
         kmem_cache_free(epi_cache, epi);
-error_return:
+
         return error;
  }
  
@@ -1078,6 +1141,7 @@ asmlinkage long sys_epoll_create1(int flags)
                               flags & O_CLOEXEC);
         if (fd < 0)
                 ep_free(ep);
+       atomic_inc(&ep->user->epoll_devs);
  
  error_return:
         DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_create(%d) = %d\n",
@@ -1299,7 +1363,12 @@ asmlinkage long sys_epoll_pwait(int epfd, struct epoll_event __user *events,
  
  static int __init eventpoll_init(void)
  {
-       mutex_init(&epmutex);
+       struct sysinfo si;
+
+       si_meminfo(&si);
+       max_user_instances = 128;
+       max_user_watches = (((si.totalram - si.totalhigh) / 32) << PAGE_SHIFT) /
+               EP_ITEM_COST;
  
         /* Initialize the structure used to perform safe poll wait head wake ups */
         ep_poll_safewake_init(&psw);
diff --git a/fs/exec.c b/fs/exec.c

index 4e834f16d9da7d49c0f232b9fd46a7db2c680070..ec5df9a38313397565e44173cc434e09f6fc6ec4 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1159,6 +1159,7 @@ EXPORT_SYMBOL(remove_arg_zero);
   */
  int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
  {
+       unsigned int depth = bprm->recursion_depth;
         int try,retval;
         struct linux_binfmt *fmt;
  #ifdef __alpha__
@@ -1219,8 +1220,15 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
                                 continue;
                         read_unlock(&binfmt_lock);
                         retval = fn(bprm, regs);
+                       /*
+                        * Restore the depth counter to its starting value
+                        * in this call, so we don't have to rely on every
+                        * load_binary function to restore it on return.
+                        */
+                       bprm->recursion_depth = depth;
                         if (retval >= 0) {
-                               tracehook_report_exec(fmt, bprm, regs);
+                               if (depth == 0)
+                                       tracehook_report_exec(fmt, bprm, regs);
                                 put_binfmt(fmt);
                                 allow_write_access(bprm->file);
                                 if (bprm->file)
diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c

index 80246bad1b7fe513a7da15f4d6ac057cad3d7e54..890e018288171e90d9991b47e7077dfbaf9c7cf8 100644 (file)
--- a/fs/exportfs/expfs.c
+++ b/fs/exportfs/expfs.c
@@ -367,6 +367,8 @@ struct dentry *exportfs_decode_fh(struct vfsmount *mnt, struct fid *fid,
          * Try to get any dentry for the given file handle from the filesystem.
          */
         result = nop->fh_to_dentry(mnt->mnt_sb, fid, fh_len, fileid_type);
+       if (!result)
+               result = ERR_PTR(-ESTALE);
         if (IS_ERR(result))
                 return result;
  
@@ -420,6 +422,8 @@ struct dentry *exportfs_decode_fh(struct vfsmount *mnt, struct fid *fid,
  
                 target_dir = nop->fh_to_parent(mnt->mnt_sb, fid,
                                 fh_len, fileid_type);
+               if (!target_dir)
+                       goto err_result;
                 err = PTR_ERR(target_dir);
                 if (IS_ERR(target_dir))
                         goto err_result;
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c

index d2003cdc36aa687ab998a8c558144ddcc23ae6bb..db35cfdb3c8b6e25424a78af0aaaa69579cc2a07 100644 (file)
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -609,8 +609,8 @@ int ext4_has_free_blocks(struct ext4_sb_info *sbi, s64 nblocks)
  
         if (free_blocks - (nblocks + root_blocks + dirty_blocks) <
                                                 EXT4_FREEBLOCKS_WATERMARK) {
-               free_blocks  = percpu_counter_sum(fbc);
-               dirty_blocks = percpu_counter_sum(dbc);
+               free_blocks  = percpu_counter_sum_positive(fbc);
+               dirty_blocks = percpu_counter_sum_positive(dbc);
                 if (dirty_blocks < 0) {
                         printk(KERN_CRIT "Dirty block accounting "
                                         "went wrong %lld\n",
diff --git a/fs/fcntl.c b/fs/fcntl.c

index ac4f7db9f13452790e4d41daa8e6fc9633506259..549daf8005fb5da252252d7e5bf0e73185250169 100644 (file)
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -19,6 +19,7 @@
  #include <linux/signal.h>
  #include <linux/rcupdate.h>
  #include <linux/pid_namespace.h>
+#include <linux/smp_lock.h>
  
  #include <asm/poll.h>
  #include <asm/siginfo.h>
@@ -175,6 +176,11 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
         if (error)
                 return error;
  
+       /*
+        * We still need a lock here for now to keep multiple FASYNC calls
+        * from racing with each other.
+        */
+       lock_kernel();
         if ((arg ^ filp->f_flags) & FASYNC) {
                 if (filp->f_op && filp->f_op->fasync) {
                         error = filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0);
@@ -185,6 +191,7 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
  
         filp->f_flags = (arg & SETFL_MASK) | (filp->f_flags & ~SETFL_MASK);
   out:
+       unlock_kernel();
         return error;
  }
  
diff --git a/fs/inotify.c b/fs/inotify.c

index 7bbed1b89825f8b37f4fa753201290d0002bf618..dae3f28f30d4779ee69cc8780d8424818b0fbfa4 100644 (file)
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -428,11 +428,13 @@ void inotify_unmount_inodes(struct list_head *list)
                 watches = &inode->inotify_watches;
                 list_for_each_entry_safe(watch, next_w, watches, i_list) {
                         struct inotify_handle *ih= watch->ih;
+                       get_inotify_watch(watch);
                         mutex_lock(&ih->mutex);
                         ih->in_ops->handle_event(watch, watch->wd, IN_UNMOUNT, 0,
                                                  NULL, NULL);
                         inotify_remove_watch_locked(ih, watch);
                         mutex_unlock(&ih->mutex);
+                       put_inotify_watch(watch);
                 }
                 mutex_unlock(&inode->inotify_mutex);
                 iput(inode);            
diff --git a/fs/ioctl.c b/fs/ioctl.c

index d152856c371be4906b7effec1f3c42842a4cee2d..43e8b2c0664b1b3d302a6d46e3fa40185edb5ae7 100644 (file)
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -400,11 +400,9 @@ static int ioctl_fioasync(unsigned int fd, struct file *filp,
  
         /* Did FASYNC state change ? */
         if ((flag ^ filp->f_flags) & FASYNC) {
-               if (filp->f_op && filp->f_op->fasync) {
-                       lock_kernel();
+               if (filp->f_op && filp->f_op->fasync)
                         error = filp->f_op->fasync(fd, filp, on);
-                       unlock_kernel();
-               } else
+               else
                         error = -ENOTTY;
         }
         if (error)
@@ -440,11 +438,17 @@ int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd,
                 break;
  
         case FIONBIO:
+               /* BKL needed to avoid races tweaking f_flags */
+               lock_kernel();
                 error = ioctl_fionbio(filp, argp);
+               unlock_kernel();
                 break;
  
         case FIOASYNC:
+               /* BKL needed to avoid races tweaking f_flags */
+               lock_kernel();
                 error = ioctl_fioasync(fd, filp, argp);
+               unlock_kernel();
                 break;
  
         case FIOQSIZE:
diff --git a/fs/lockd/host.c b/fs/lockd/host.c

index 9fd8889097b728b735150ff82b1ff123a503dac7..70fc63a1727b131f496bc9a98186d61a022dc975 100644 (file)
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -167,7 +167,8 @@ static struct nlm_host *nlm_lookup_host(struct nlm_lookup_host_info *ni)
                         continue;
                 if (host->h_server != ni->server)
                         continue;
-               if (!nlm_cmp_addr(nlm_srcaddr(host), ni->src_sap))
+               if (ni->server &&
+                   !nlm_cmp_addr(nlm_srcaddr(host), ni->src_sap))
                         continue;
  
                 /* Move to head of hash chain. */
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c

index c631a83931cec9cd56128daf5fc494b8fac9703a..56b076736b56afd054aa91b7585d80257f0f22ac 100644 (file)
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -181,6 +181,7 @@ lockd(void *vrqstp)
         }
         flush_signals(current);
         cancel_delayed_work_sync(&grace_period_end);
+       locks_end_grace(&lockd_manager);
         if (nlmsvc_ops)
                 nlmsvc_invalidate_all();
         nlm_shutdown_hosts();
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c

index bb93946ace2249841dd94a25d4ce0a0582e9dfde..b79ec930d9f1af003ddfb1fd9d130b12f6755f8b 100644 (file)
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -225,12 +225,12 @@ nfsd4_list_rec_dir(struct dentry *dir, recdir_func *f)
                 return 0;
  
         nfs4_save_user(&uid, &gid);
+       INIT_LIST_HEAD(dentries);
  
         filp = dentry_open(dget(dir), mntget(rec_dir.mnt), O_RDONLY);
         status = PTR_ERR(filp);
         if (IS_ERR(filp))
                 goto out;
-       INIT_LIST_HEAD(dentries);
         status = vfs_readdir(filp, nfsd4_build_dentrylist, &dla);
         fput(filp);
         while (!list_empty(dentries)) {
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c

index b0bebc552a11f3cec582b83c80c45c97a7734cdd..1a052ac2bde90b6599194380124c61b1c4054134 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3261,6 +3261,7 @@ nfs4_state_shutdown(void)
  {
         cancel_rearming_delayed_workqueue(laundry_wq, &laundromat_work);
         destroy_workqueue(laundry_wq);
+       locks_end_grace(&nfsd4_manager);
         nfs4_lock_state();
         nfs4_release_reclaim();
         __nfs4_state_shutdown();
diff --git a/fs/ntfs/debug.h b/fs/ntfs/debug.h

index 5e6724c1afd1d0276d7e839c9bfcbd2832fbd600..2142b1c68b618d7de730b26bcf257d7a116e12c1 100644 (file)
--- a/fs/ntfs/debug.h
+++ b/fs/ntfs/debug.h
@@ -30,7 +30,8 @@
  
  extern int debug_msgs;
  
-#if 0 /* Fool kernel-doc since it doesn't do macros yet */
+extern void __ntfs_debug(const char *file, int line, const char *function,
+       const char *format, ...) __attribute__ ((format (printf, 4, 5)));
  /**
   * ntfs_debug - write a debug level message to syslog
   * @f:         a printf format string containing the message
@@ -39,11 +40,6 @@ extern int debug_msgs;
   * ntfs_debug() writes a DEBUG level message to the syslog but only if the
   * driver was compiled with -DDEBUG. Otherwise, the call turns into a NOP.
   */
-static void ntfs_debug(const char *f, ...);
-#endif
-
-extern void __ntfs_debug (const char *file, int line, const char *function,
-       const char *format, ...) __attribute__ ((format (printf, 4, 5)));
  #define ntfs_debug(f, a...)                                            \
         __ntfs_debug(__FILE__, __LINE__, __func__, f, ##a)
  
diff --git a/fs/ocfs2/buffer_head_io.c b/fs/ocfs2/buffer_head_io.c

index 7e947c6724694c74f7a1658392f83e15970fb7cd..3a178ec48d7c760222970e9af62af615a1e5de35 100644 (file)
--- a/fs/ocfs2/buffer_head_io.c
+++ b/fs/ocfs2/buffer_head_io.c
@@ -112,7 +112,7 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block,
                 bh = bhs[i];
  
                 if (buffer_jbd(bh)) {
-                       mlog(ML_ERROR,
+                       mlog(ML_BH_IO,
                              "trying to sync read a jbd "
                              "managed bh (blocknr = %llu), skipping\n",
                              (unsigned long long)bh->b_blocknr);
@@ -147,15 +147,10 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block,
         for (i = nr; i > 0; i--) {
                 bh = bhs[i - 1];
  
-               if (buffer_jbd(bh)) {
-                       mlog(ML_ERROR,
-                            "the journal got the buffer while it was "
-                            "locked for io! (blocknr = %llu)\n",
-                            (unsigned long long)bh->b_blocknr);
-                       BUG();
-               }
+               /* No need to wait on the buffer if it's managed by JBD. */
+               if (!buffer_jbd(bh))
+                       wait_on_buffer(bh);
  
-               wait_on_buffer(bh);
                 if (!buffer_uptodate(bh)) {
                         /* Status won't be cleared from here on out,
                          * so we can safely record this and loop back
@@ -251,8 +246,6 @@ int ocfs2_read_blocks(struct inode *inode, u64 block, int nr,
                         ignore_cache = 1;
                 }
  
-               /* XXX: Can we ever get this and *not* have the cached
-                * flag set? */
                 if (buffer_jbd(bh)) {
                         if (ignore_cache)
                                 mlog(ML_BH_IO, "trying to sync read a jbd "
diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c

index 533a789c3ef8e01872bb44e7a7d989c70e0e0f06..ba962d71b34d15e7e089c741a9d6bd0d14559e79 100644 (file)
--- a/fs/ocfs2/dlm/dlmfs.c
+++ b/fs/ocfs2/dlm/dlmfs.c
@@ -608,8 +608,10 @@ static int __init init_dlmfs_fs(void)
                                 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
                                         SLAB_MEM_SPREAD),
                                 dlmfs_init_once);
-       if (!dlmfs_inode_cache)
+       if (!dlmfs_inode_cache) {
+               status = -ENOMEM;
                 goto bail;
+       }
         cleanup_inode = 1;
  
         user_dlm_worker = create_singlethread_workqueue("user_dlm");
diff --git a/fs/ocfs2/dlm/userdlm.h b/fs/ocfs2/dlm/userdlm.h

index 39ec27738499a783a9d70611f474e75558b07317..0c3cc03c61fa307e0b1ca829aeab3a94268f3a73 100644 (file)
--- a/fs/ocfs2/dlm/userdlm.h
+++ b/fs/ocfs2/dlm/userdlm.h
@@ -33,7 +33,7 @@
  #include <linux/workqueue.h>
  
  /* user_lock_res->l_flags flags. */
-#define USER_LOCK_ATTACHED      (0x00000001) /* have we initialized
+#define USER_LOCK_ATTACHED      (0x00000001) /* we have initialized
                                                * the lvb */
  #define USER_LOCK_BUSY          (0x00000002) /* we are currently in
                                                * dlm_lock */
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c

index ec684426034b6dc39ab2b772acc918d07cce6ccd..6e6cc0a2e5f7a51ed9c5e3b72e4ae90471ea77a7 100644 (file)
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
@@ -2841,9 +2841,8 @@ static void ocfs2_unlock_ast(void *opaque, int error)
  
         lockres_clear_flags(lockres, OCFS2_LOCK_BUSY);
         lockres->l_unlock_action = OCFS2_UNLOCK_INVALID;
-       spin_unlock_irqrestore(&lockres->l_lock, flags);
-
         wake_up(&lockres->l_event);
+       spin_unlock_irqrestore(&lockres->l_lock, flags);
  
         mlog_exit_void();
  }
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h

index fef7ece32376f65ef9af2a455fc4b623519819ec..3fed9e3d89926a90f871a6161c4bea239b2685a7 100644 (file)
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
@@ -85,7 +85,7 @@ enum ocfs2_unlock_action {
  };
  
  /* ocfs2_lock_res->l_flags flags. */
-#define OCFS2_LOCK_ATTACHED      (0x00000001) /* have we initialized
+#define OCFS2_LOCK_ATTACHED      (0x00000001) /* we have initialized
                                                * the lvb */
  #define OCFS2_LOCK_BUSY          (0x00000002) /* we are currently in
                                                * dlm_lock */
diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h

index 5f180cf7abbd6f4e21dc1a662932f06ad56a6407..5e0c0d0aef7dcbcf1c9baae7b108cc47bce1f9cf 100644 (file)
--- a/fs/ocfs2/ocfs2_fs.h
+++ b/fs/ocfs2/ocfs2_fs.h
@@ -86,7 +86,8 @@
  #define OCFS2_CLEAR_INCOMPAT_FEATURE(sb,mask)                  \
         OCFS2_SB(sb)->s_feature_incompat &= ~(mask)
  
-#define OCFS2_FEATURE_COMPAT_SUPP      OCFS2_FEATURE_COMPAT_BACKUP_SB
+#define OCFS2_FEATURE_COMPAT_SUPP      (OCFS2_FEATURE_COMPAT_BACKUP_SB \
+                                        | OCFS2_FEATURE_COMPAT_JBD2_SB)
  #define OCFS2_FEATURE_INCOMPAT_SUPP    (OCFS2_FEATURE_INCOMPAT_LOCAL_MOUNT \
                                          | OCFS2_FEATURE_INCOMPAT_SPARSE_ALLOC \
                                          | OCFS2_FEATURE_INCOMPAT_INLINE_DATA \
@@ -152,6 +153,11 @@
   */
  #define OCFS2_FEATURE_COMPAT_BACKUP_SB         0x0001
  
+/*
+ * The filesystem will correctly handle journal feature bits.
+ */
+#define OCFS2_FEATURE_COMPAT_JBD2_SB           0x0002
+
  /*
   * Unwritten extents support.
   */
diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c

index faec2d879357dbc62f4d85124e2840d26d439be3..9b76d41a8ac6ed2898021bcc255ffa8e159b61cb 100644 (file)
--- a/fs/ocfs2/stack_user.c
+++ b/fs/ocfs2/stack_user.c
@@ -740,6 +740,9 @@ static int user_dlm_lock_status(union ocfs2_dlm_lksb *lksb)
  
  static void *user_dlm_lvb(union ocfs2_dlm_lksb *lksb)
  {
+       if (!lksb->lksb_fsdlm.sb_lvbptr)
+               lksb->lksb_fsdlm.sb_lvbptr = (char *)lksb +
+                                            sizeof(struct dlm_lksb);
         return (void *)(lksb->lksb_fsdlm.sb_lvbptr);
  }
  
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c

index 054e2efb0b7e71f196025c777d61f2cc5954e0f9..74d7367ade13e1e36cb74a13327ca65573fabf86 100644 (file)
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -2645,9 +2645,9 @@ static int ocfs2_xattr_update_xattr_search(struct inode *inode,
                                 return ret;
                         }
  
-                       i = xs->here - old_xh->xh_entries;
-                       xs->here = &xs->header->xh_entries[i];
                 }
+               i = xs->here - old_xh->xh_entries;
+               xs->here = &xs->header->xh_entries[i];
         }
  
         return ret;
diff --git a/fs/proc/base.c b/fs/proc/base.c

index 486cf3fe7139949a0911e0e33f9cb99a06bfb8fb..d4677603c88920b45e14af3d91b71894b2c5b7b2 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -371,7 +371,7 @@ static int lstats_show_proc(struct seq_file *m, void *v)
                                 task->latency_record[i].time,
                                 task->latency_record[i].max);
                         for (q = 0; q < LT_BACKTRACEDEPTH; q++) {
-                               char sym[KSYM_NAME_LEN];
+                               char sym[KSYM_SYMBOL_LEN];
                                 char *c;
                                 if (!task->latency_record[i].backtrace[q])
                                         break;
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c

index b770c095e45c62f86e78da2f9d1524085f9d45fd..3a8bdd7f5756e37d430f15b2b5b76fb672c9b965 100644 (file)
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -557,9 +557,9 @@ static u64 swap_pte_to_pagemap_entry(pte_t pte)
         return swp_type(e) | (swp_offset(e) << MAX_SWAPFILES_SHIFT);
  }
  
-static unsigned long pte_to_pagemap_entry(pte_t pte)
+static u64 pte_to_pagemap_entry(pte_t pte)
  {
-       unsigned long pme = 0;
+       u64 pme = 0;
         if (is_swap_pte(pte))
                 pme = PM_PFRAME(swap_pte_to_pagemap_entry(pte))
                         | PM_PSHIFT(PAGE_SHIFT) | PM_SWAP;
diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c

index 0a6aa2cc78f07eb7e0aa4ce6af2dfe8b5fe32ca5..b49884c8c10e823cbe484e9d5c1fadddf16b5008 100644 (file)
--- a/fs/ubifs/commit.c
+++ b/fs/ubifs/commit.c
@@ -234,8 +234,8 @@ int ubifs_bg_thread(void *info)
         int err;
         struct ubifs_info *c = info;
  
-       ubifs_msg("background thread \"%s\" started, PID %d",
-                 c->bgt_name, current->pid);
+       dbg_msg("background thread \"%s\" started, PID %d",
+               c->bgt_name, current->pid);
         set_freezable();
  
         while (1) {
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c

index 7186400750e775ad18bd2e9975a373ecb7803e62..510ffa0bbda4658559cf682a01145d4ff7f9231e 100644 (file)
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -101,21 +101,24 @@ static void sprintf_key(const struct ubifs_info *c, const union ubifs_key *key,
         if (c->key_fmt == UBIFS_SIMPLE_KEY_FMT) {
                 switch (type) {
                 case UBIFS_INO_KEY:
-                       sprintf(p, "(%lu, %s)", key_inum(c, key),
+                       sprintf(p, "(%lu, %s)", (unsigned long)key_inum(c, key),
                                get_key_type(type));
                         break;
                 case UBIFS_DENT_KEY:
                 case UBIFS_XENT_KEY:
-                       sprintf(p, "(%lu, %s, %#08x)", key_inum(c, key),
+                       sprintf(p, "(%lu, %s, %#08x)",
+                               (unsigned long)key_inum(c, key),
                                 get_key_type(type), key_hash(c, key));
                         break;
                 case UBIFS_DATA_KEY:
-                       sprintf(p, "(%lu, %s, %u)", key_inum(c, key),
+                       sprintf(p, "(%lu, %s, %u)",
+                               (unsigned long)key_inum(c, key),
                                 get_key_type(type), key_block(c, key));
                         break;
                 case UBIFS_TRUN_KEY:
                         sprintf(p, "(%lu, %s)",
-                               key_inum(c, key), get_key_type(type));
+                               (unsigned long)key_inum(c, key),
+                               get_key_type(type));
                         break;
                 default:
                         sprintf(p, "(bad key type: %#08x, %#08x)",
@@ -364,8 +367,8 @@ void dbg_dump_node(const struct ubifs_info *c, const void *node)
                        le32_to_cpu(mst->ihead_lnum));
                 printk(KERN_DEBUG "\tihead_offs     %u\n",
                        le32_to_cpu(mst->ihead_offs));
-               printk(KERN_DEBUG "\tindex_size     %u\n",
-                      le32_to_cpu(mst->index_size));
+               printk(KERN_DEBUG "\tindex_size     %llu\n",
+                      (unsigned long long)le64_to_cpu(mst->index_size));
                 printk(KERN_DEBUG "\tlpt_lnum       %u\n",
                        le32_to_cpu(mst->lpt_lnum));
                 printk(KERN_DEBUG "\tlpt_offs       %u\n",
@@ -1589,7 +1592,7 @@ static struct fsck_inode *add_inode(struct ubifs_info *c,
  
         if (inum > c->highest_inum) {
                 ubifs_err("too high inode number, max. is %lu",
-                         c->highest_inum);
+                         (unsigned long)c->highest_inum);
                 return ERR_PTR(-EINVAL);
         }
  
@@ -1668,16 +1671,18 @@ static struct fsck_inode *read_add_inode(struct ubifs_info *c,
         ino_key_init(c, &key, inum);
         err = ubifs_lookup_level0(c, &key, &znode, &n);
         if (!err) {
-               ubifs_err("inode %lu not found in index", inum);
+               ubifs_err("inode %lu not found in index", (unsigned long)inum);
                 return ERR_PTR(-ENOENT);
         } else if (err < 0) {
-               ubifs_err("error %d while looking up inode %lu", err, inum);
+               ubifs_err("error %d while looking up inode %lu",
+                         err, (unsigned long)inum);
                 return ERR_PTR(err);
         }
  
         zbr = &znode->zbranch[n];
         if (zbr->len < UBIFS_INO_NODE_SZ) {
-               ubifs_err("bad node %lu node length %d", inum, zbr->len);
+               ubifs_err("bad node %lu node length %d",
+                         (unsigned long)inum, zbr->len);
                 return ERR_PTR(-EINVAL);
         }
  
@@ -1697,7 +1702,7 @@ static struct fsck_inode *read_add_inode(struct ubifs_info *c,
         kfree(ino);
         if (IS_ERR(fscki)) {
                 ubifs_err("error %ld while adding inode %lu node",
-                         PTR_ERR(fscki), inum);
+                         PTR_ERR(fscki), (unsigned long)inum);
                 return fscki;
         }
  
@@ -1786,7 +1791,8 @@ static int check_leaf(struct ubifs_info *c, struct ubifs_zbranch *zbr,
                 if (IS_ERR(fscki)) {
                         err = PTR_ERR(fscki);
                         ubifs_err("error %d while processing data node and "
-                                 "trying to find inode node %lu", err, inum);
+                                 "trying to find inode node %lu",
+                                 err, (unsigned long)inum);
                         goto out_dump;
                 }
  
@@ -1819,7 +1825,8 @@ static int check_leaf(struct ubifs_info *c, struct ubifs_zbranch *zbr,
                 if (IS_ERR(fscki)) {
                         err = PTR_ERR(fscki);
                         ubifs_err("error %d while processing entry node and "
-                                 "trying to find inode node %lu", err, inum);
+                                 "trying to find inode node %lu",
+                                 err, (unsigned long)inum);
                         goto out_dump;
                 }
  
@@ -1832,7 +1839,7 @@ static int check_leaf(struct ubifs_info *c, struct ubifs_zbranch *zbr,
                         err = PTR_ERR(fscki);
                         ubifs_err("error %d while processing entry node and "
                                   "trying to find parent inode node %lu",
-                                 err, inum);
+                                 err, (unsigned long)inum);
                         goto out_dump;
                 }
  
@@ -1923,7 +1930,8 @@ static int check_inodes(struct ubifs_info *c, struct fsck_data *fsckd)
                             fscki->references != 1) {
                                 ubifs_err("directory inode %lu has %d "
                                           "direntries which refer it, but "
-                                         "should be 1", fscki->inum,
+                                         "should be 1",
+                                         (unsigned long)fscki->inum,
                                           fscki->references);
                                 goto out_dump;
                         }
@@ -1931,27 +1939,29 @@ static int check_inodes(struct ubifs_info *c, struct fsck_data *fsckd)
                             fscki->references != 0) {
                                 ubifs_err("root inode %lu has non-zero (%d) "
                                           "direntries which refer it",
-                                         fscki->inum, fscki->references);
+                                         (unsigned long)fscki->inum,
+                                         fscki->references);
                                 goto out_dump;
                         }
                         if (fscki->calc_sz != fscki->size) {
                                 ubifs_err("directory inode %lu size is %lld, "
                                           "but calculated size is %lld",
-                                         fscki->inum, fscki->size,
-                                         fscki->calc_sz);
+                                         (unsigned long)fscki->inum,
+                                         fscki->size, fscki->calc_sz);
                                 goto out_dump;
                         }
                         if (fscki->calc_cnt != fscki->nlink) {
                                 ubifs_err("directory inode %lu nlink is %d, "
                                           "but calculated nlink is %d",
-                                         fscki->inum, fscki->nlink,
-                                         fscki->calc_cnt);
+                                         (unsigned long)fscki->inum,
+                                         fscki->nlink, fscki->calc_cnt);
                                 goto out_dump;
                         }
                 } else {
                         if (fscki->references != fscki->nlink) {
                                 ubifs_err("inode %lu nlink is %d, but "
-                                         "calculated nlink is %d", fscki->inum,
+                                         "calculated nlink is %d",
+                                         (unsigned long)fscki->inum,
                                           fscki->nlink, fscki->references);
                                 goto out_dump;
                         }
@@ -1959,20 +1969,21 @@ static int check_inodes(struct ubifs_info *c, struct fsck_data *fsckd)
                 if (fscki->xattr_sz != fscki->calc_xsz) {
                         ubifs_err("inode %lu has xattr size %u, but "
                                   "calculated size is %lld",
-                                 fscki->inum, fscki->xattr_sz,
+                                 (unsigned long)fscki->inum, fscki->xattr_sz,
                                   fscki->calc_xsz);
                         goto out_dump;
                 }
                 if (fscki->xattr_cnt != fscki->calc_xcnt) {
                         ubifs_err("inode %lu has %u xattrs, but "
-                                 "calculated count is %lld", fscki->inum,
+                                 "calculated count is %lld",
+                                 (unsigned long)fscki->inum,
                                   fscki->xattr_cnt, fscki->calc_xcnt);
                         goto out_dump;
                 }
                 if (fscki->xattr_nms != fscki->calc_xnms) {
                         ubifs_err("inode %lu has xattr names' size %u, but "
                                   "calculated names' size is %lld",
-                                 fscki->inum, fscki->xattr_nms,
+                                 (unsigned long)fscki->inum, fscki->xattr_nms,
                                   fscki->calc_xnms);
                         goto out_dump;
                 }
@@ -1985,11 +1996,12 @@ out_dump:
         ino_key_init(c, &key, fscki->inum);
         err = ubifs_lookup_level0(c, &key, &znode, &n);
         if (!err) {
-               ubifs_err("inode %lu not found in index", fscki->inum);
+               ubifs_err("inode %lu not found in index",
+                         (unsigned long)fscki->inum);
                 return -ENOENT;
         } else if (err < 0) {
                 ubifs_err("error %d while looking up inode %lu",
-                         err, fscki->inum);
+                         err, (unsigned long)fscki->inum);
                 return err;
         }
  
@@ -2007,7 +2019,7 @@ out_dump:
         }
  
         ubifs_msg("dump of the inode %lu sitting in LEB %d:%d",
-                 fscki->inum, zbr->lnum, zbr->offs);
+                 (unsigned long)fscki->inum, zbr->lnum, zbr->offs);
         dbg_dump_node(c, ino);
         kfree(ino);
         return -EINVAL;
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c

index 526c01ec80032be9205e6057c48f9188b136b6e8..0422c98e17932e41ecca3f25c6dea8aedb10e133 100644 (file)
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -161,7 +161,7 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, const struct inode *dir,
                         return ERR_PTR(-EINVAL);
                 }
                 ubifs_warn("running out of inode numbers (current %lu, max %d)",
-                          c->highest_inum, INUM_WATERMARK);
+                          (unsigned long)c->highest_inum, INUM_WATERMARK);
         }
  
         inode->i_ino = ++c->highest_inum;
@@ -428,7 +428,8 @@ static int ubifs_readdir(struct file *file, void *dirent, filldir_t filldir)
                 dbg_gen("feed '%s', ino %llu, new f_pos %#x",
                         dent->name, (unsigned long long)le64_to_cpu(dent->inum),
                         key_hash_flash(c, &dent->key));
-               ubifs_assert(dent->ch.sqnum > ubifs_inode(dir)->creat_sqnum);
+               ubifs_assert(le64_to_cpu(dent->ch.sqnum) >
+                            ubifs_inode(dir)->creat_sqnum);
  
                 nm.len = le16_to_cpu(dent->nlen);
                 over = filldir(dirent, dent->name, nm.len, file->f_pos,
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c

index 51cf511d44d918ccef3210c340f55fa7cc90e35b..2624411d9758d11023c938418f8a6a7938066ff5 100644 (file)
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -72,7 +72,7 @@ static int read_block(struct inode *inode, void *addr, unsigned int block,
                 return err;
         }
  
-       ubifs_assert(dn->ch.sqnum > ubifs_inode(inode)->creat_sqnum);
+       ubifs_assert(le64_to_cpu(dn->ch.sqnum) > ubifs_inode(inode)->creat_sqnum);
  
         len = le32_to_cpu(dn->size);
         if (len <= 0 || len > UBIFS_BLOCK_SIZE)
@@ -626,7 +626,7 @@ static int populate_page(struct ubifs_info *c, struct page *page,
  
                         dn = bu->buf + (bu->zbranch[nn].offs - offs);
  
-                       ubifs_assert(dn->ch.sqnum >
+                       ubifs_assert(le64_to_cpu(dn->ch.sqnum) >
                                      ubifs_inode(inode)->creat_sqnum);
  
                         len = le32_to_cpu(dn->size);
@@ -691,32 +691,22 @@ out_err:
  /**
   * ubifs_do_bulk_read - do bulk-read.
   * @c: UBIFS file-system description object
- * @page1: first page
+ * @bu: bulk-read information
+ * @page1: first page to read
   *
   * This function returns %1 if the bulk-read is done, otherwise %0 is returned.
   */
-static int ubifs_do_bulk_read(struct ubifs_info *c, struct page *page1)
+static int ubifs_do_bulk_read(struct ubifs_info *c, struct bu_info *bu,
+                             struct page *page1)
  {
         pgoff_t offset = page1->index, end_index;
         struct address_space *mapping = page1->mapping;
         struct inode *inode = mapping->host;
         struct ubifs_inode *ui = ubifs_inode(inode);
-       struct bu_info *bu;
         int err, page_idx, page_cnt, ret = 0, n = 0;
+       int allocate = bu->buf ? 0 : 1;
         loff_t isize;
  
-       bu = kmalloc(sizeof(struct bu_info), GFP_NOFS);
-       if (!bu)
-               return 0;
-
-       bu->buf_len = c->bulk_read_buf_size;
-       bu->buf = kmalloc(bu->buf_len, GFP_NOFS);
-       if (!bu->buf)
-               goto out_free;
-
-       data_key_init(c, &bu->key, inode->i_ino,
-                     offset << UBIFS_BLOCKS_PER_PAGE_SHIFT);
-
         err = ubifs_tnc_get_bu_keys(c, bu);
         if (err)
                 goto out_warn;
@@ -735,12 +725,25 @@ static int ubifs_do_bulk_read(struct ubifs_info *c, struct page *page1)
                  * together. If all the pages were like this, bulk-read would
                  * reduce performance, so we turn it off for a while.
                  */
-               ui->read_in_a_row = 0;
-               ui->bulk_read = 0;
-               goto out_free;
+               goto out_bu_off;
         }
  
         if (bu->cnt) {
+               if (allocate) {
+                       /*
+                        * Allocate bulk-read buffer depending on how many data
+                        * nodes we are going to read.
+                        */
+                       bu->buf_len = bu->zbranch[bu->cnt - 1].offs +
+                                     bu->zbranch[bu->cnt - 1].len -
+                                     bu->zbranch[0].offs;
+                       ubifs_assert(bu->buf_len > 0);
+                       ubifs_assert(bu->buf_len <= c->leb_size);
+                       bu->buf = kmalloc(bu->buf_len, GFP_NOFS | __GFP_NOWARN);
+                       if (!bu->buf)
+                               goto out_bu_off;
+               }
+
                 err = ubifs_tnc_bulk_read(c, bu);
                 if (err)
                         goto out_warn;
@@ -779,13 +782,17 @@ static int ubifs_do_bulk_read(struct ubifs_info *c, struct page *page1)
         ui->last_page_read = offset + page_idx - 1;
  
  out_free:
-       kfree(bu->buf);
-       kfree(bu);
+       if (allocate)
+               kfree(bu->buf);
         return ret;
  
  out_warn:
         ubifs_warn("ignoring error %d and skipping bulk-read", err);
         goto out_free;
+
+out_bu_off:
+       ui->read_in_a_row = ui->bulk_read = 0;
+       goto out_free;
  }
  
  /**
@@ -803,18 +810,20 @@ static int ubifs_bulk_read(struct page *page)
         struct ubifs_info *c = inode->i_sb->s_fs_info;
         struct ubifs_inode *ui = ubifs_inode(inode);
         pgoff_t index = page->index, last_page_read = ui->last_page_read;
-       int ret = 0;
+       struct bu_info *bu;
+       int err = 0, allocated = 0;
  
         ui->last_page_read = index;
-
         if (!c->bulk_read)
                 return 0;
+
         /*
-        * Bulk-read is protected by ui_mutex, but it is an optimization, so
-        * don't bother if we cannot lock the mutex.
+        * Bulk-read is protected by @ui->ui_mutex, but it is an optimization,
+        * so don't bother if we cannot lock the mutex.
          */
         if (!mutex_trylock(&ui->ui_mutex))
                 return 0;
+
         if (index != last_page_read + 1) {
                 /* Turn off bulk-read if we stop reading sequentially */
                 ui->read_in_a_row = 1;
@@ -822,6 +831,7 @@ static int ubifs_bulk_read(struct page *page)
                         ui->bulk_read = 0;
                 goto out_unlock;
         }
+
         if (!ui->bulk_read) {
                 ui->read_in_a_row += 1;
                 if (ui->read_in_a_row < 3)
@@ -829,10 +839,35 @@ static int ubifs_bulk_read(struct page *page)
                 /* Three reads in a row, so switch on bulk-read */
                 ui->bulk_read = 1;
         }
-       ret = ubifs_do_bulk_read(c, page);
+
+       /*
+        * If possible, try to use pre-allocated bulk-read information, which
+        * is protected by @c->bu_mutex.
+        */
+       if (mutex_trylock(&c->bu_mutex))
+               bu = &c->bu;
+       else {
+               bu = kmalloc(sizeof(struct bu_info), GFP_NOFS | __GFP_NOWARN);
+               if (!bu)
+                       goto out_unlock;
+
+               bu->buf = NULL;
+               allocated = 1;
+       }
+
+       bu->buf_len = c->max_bu_buf_len;
+       data_key_init(c, &bu->key, inode->i_ino,
+                     page->index << UBIFS_BLOCKS_PER_PAGE_SHIFT);
+       err = ubifs_do_bulk_read(c, bu, page);
+
+       if (!allocated)
+               mutex_unlock(&c->bu_mutex);
+       else
+               kfree(bu);
+
  out_unlock:
         mutex_unlock(&ui->ui_mutex);
-       return ret;
+       return err;
  }
  
  static int ubifs_readpage(struct file *file, struct page *page)
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c

index 22993f867d194ffbc3bab30f25675c0fbb22dbb4..f91b745908ea595ac94bd25b86368d5515149be0 100644 (file)
--- a/fs/ubifs/journal.c
+++ b/fs/ubifs/journal.c
@@ -690,8 +690,9 @@ int ubifs_jnl_write_data(struct ubifs_info *c, const struct inode *inode,
         int dlen = UBIFS_DATA_NODE_SZ + UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR;
         struct ubifs_inode *ui = ubifs_inode(inode);
  
-       dbg_jnl("ino %lu, blk %u, len %d, key %s", key_inum(c, key),
-               key_block(c, key), len, DBGKEY(key));
+       dbg_jnl("ino %lu, blk %u, len %d, key %s",
+               (unsigned long)key_inum(c, key), key_block(c, key), len,
+               DBGKEY(key));
         ubifs_assert(len <= UBIFS_BLOCK_SIZE);
  
         data = kmalloc(dlen, GFP_NOFS);
@@ -1128,7 +1129,8 @@ int ubifs_jnl_truncate(struct ubifs_info *c, const struct inode *inode,
         ino_t inum = inode->i_ino;
         unsigned int blk;
  
-       dbg_jnl("ino %lu, size %lld -> %lld", inum, old_size, new_size);
+       dbg_jnl("ino %lu, size %lld -> %lld",
+               (unsigned long)inum, old_size, new_size);
         ubifs_assert(!ui->data_len);
         ubifs_assert(S_ISREG(inode->i_mode));
         ubifs_assert(mutex_is_locked(&ui->ui_mutex));
diff --git a/fs/ubifs/key.h b/fs/ubifs/key.h

index 9ee65086f627eec8d393746bc957fc7538027b66..3f1f16bc25c99ba1e019c940030c1fa48b7217fa 100644 (file)
--- a/fs/ubifs/key.h
+++ b/fs/ubifs/key.h
@@ -345,7 +345,7 @@ static inline int key_type_flash(const struct ubifs_info *c, const void *k)
  {
         const union ubifs_key *key = k;
  
-       return le32_to_cpu(key->u32[1]) >> UBIFS_S_KEY_BLOCK_BITS;
+       return le32_to_cpu(key->j32[1]) >> UBIFS_S_KEY_BLOCK_BITS;
  }
  
  /**
@@ -416,7 +416,7 @@ static inline unsigned int key_block_flash(const struct ubifs_info *c,
  {
         const union ubifs_key *key = k;
  
-       return le32_to_cpu(key->u32[1]) & UBIFS_S_KEY_BLOCK_MASK;
+       return le32_to_cpu(key->j32[1]) & UBIFS_S_KEY_BLOCK_MASK;
  }
  
  /**
diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c

index eed5a0025d63f8b3b4d21dba633f4c9b208cb6be..a41434b427854e66527775ca3e6fdfcb89a332bd 100644 (file)
--- a/fs/ubifs/lpt_commit.c
+++ b/fs/ubifs/lpt_commit.c
@@ -571,8 +571,6 @@ static struct ubifs_pnode *next_pnode(struct ubifs_info *c,
                 /* We assume here that LEB zero is never an LPT LEB */
                 if (nnode->nbranch[iip].lnum)
                         return ubifs_get_pnode(c, nnode, iip);
-               else
-                       return NULL;
         }
  
         /* Go up while can't go right */
diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c

index 02d3462f4d3e99edb907ddaee16ed75300e827b0..9bd5a43d4526c8d7a55d0ae2a1fb4fa37a3fd922 100644 (file)
--- a/fs/ubifs/orphan.c
+++ b/fs/ubifs/orphan.c
@@ -105,7 +105,7 @@ int ubifs_add_orphan(struct ubifs_info *c, ino_t inum)
         list_add_tail(&orphan->list, &c->orph_list);
         list_add_tail(&orphan->new_list, &c->orph_new);
         spin_unlock(&c->orphan_lock);
-       dbg_gen("ino %lu", inum);
+       dbg_gen("ino %lu", (unsigned long)inum);
         return 0;
  }
  
@@ -132,14 +132,16 @@ void ubifs_delete_orphan(struct ubifs_info *c, ino_t inum)
                 else {
                         if (o->dnext) {
                                 spin_unlock(&c->orphan_lock);
-                               dbg_gen("deleted twice ino %lu", inum);
+                               dbg_gen("deleted twice ino %lu",
+                                       (unsigned long)inum);
                                 return;
                         }
                         if (o->cnext) {
                                 o->dnext = c->orph_dnext;
                                 c->orph_dnext = o;
                                 spin_unlock(&c->orphan_lock);
-                               dbg_gen("delete later ino %lu", inum);
+                               dbg_gen("delete later ino %lu",
+                                       (unsigned long)inum);
                                 return;
                         }
                         rb_erase(p, &c->orph_tree);
@@ -151,12 +153,12 @@ void ubifs_delete_orphan(struct ubifs_info *c, ino_t inum)
                         }
                         spin_unlock(&c->orphan_lock);
                         kfree(o);
-                       dbg_gen("inum %lu", inum);
+                       dbg_gen("inum %lu", (unsigned long)inum);
                         return;
                 }
         }
         spin_unlock(&c->orphan_lock);
-       dbg_err("missing orphan ino %lu", inum);
+       dbg_err("missing orphan ino %lu", (unsigned long)inum);
         dbg_dump_stack();
  }
  
@@ -448,7 +450,7 @@ static void erase_deleted(struct ubifs_info *c)
                 rb_erase(&orphan->rb, &c->orph_tree);
                 list_del(&orphan->list);
                 c->tot_orphans -= 1;
-               dbg_gen("deleting orphan ino %lu", orphan->inum);
+               dbg_gen("deleting orphan ino %lu", (unsigned long)orphan->inum);
                 kfree(orphan);
         }
         c->orph_dnext = NULL;
@@ -536,8 +538,8 @@ static int insert_dead_orphan(struct ubifs_info *c, ino_t inum)
         list_add_tail(&orphan->list, &c->orph_list);
         orphan->dnext = c->orph_dnext;
         c->orph_dnext = orphan;
-       dbg_mnt("ino %lu, new %d, tot %d",
-               inum, c->new_orphans, c->tot_orphans);
+       dbg_mnt("ino %lu, new %d, tot %d", (unsigned long)inum,
+               c->new_orphans, c->tot_orphans);
         return 0;
  }
  
@@ -609,7 +611,8 @@ static int do_kill_orphans(struct ubifs_info *c, struct ubifs_scan_leb *sleb,
                 n = (le32_to_cpu(orph->ch.len) - UBIFS_ORPH_NODE_SZ) >> 3;
                 for (i = 0; i < n; i++) {
                         inum = le64_to_cpu(orph->inos[i]);
-                       dbg_rcvry("deleting orphaned inode %lu", inum);
+                       dbg_rcvry("deleting orphaned inode %lu",
+                                 (unsigned long)inum);
                         err = ubifs_tnc_remove_ino(c, inum);
                         if (err)
                                 return err;
@@ -840,8 +843,8 @@ static int dbg_orphan_check(struct ubifs_info *c, struct ubifs_zbranch *zbr,
         if (inum != ci->last_ino) {
                 /* Lowest node type is the inode node, so it comes first */
                 if (key_type(c, &zbr->key) != UBIFS_INO_KEY)
-                       ubifs_err("found orphan node ino %lu, type %d", inum,
-                                 key_type(c, &zbr->key));
+                       ubifs_err("found orphan node ino %lu, type %d",
+                                 (unsigned long)inum, key_type(c, &zbr->key));
                 ci->last_ino = inum;
                 ci->tot_inos += 1;
                 err = ubifs_tnc_read_node(c, zbr, ci->node);
@@ -853,7 +856,8 @@ static int dbg_orphan_check(struct ubifs_info *c, struct ubifs_zbranch *zbr,
                         /* Must be recorded as an orphan */
                         if (!dbg_find_check_orphan(&ci->root, inum) &&
                             !dbg_find_orphan(c, inum)) {
-                               ubifs_err("missing orphan, ino %lu", inum);
+                               ubifs_err("missing orphan, ino %lu",
+                                         (unsigned long)inum);
                                 ci->missing += 1;
                         }
         }
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c

index 77d26c141cf651997082f3be64c98e5a6675bad0..90acac603e635baf82e05037150c85c818a2c738 100644 (file)
--- a/fs/ubifs/recovery.c
+++ b/fs/ubifs/recovery.c
@@ -168,12 +168,12 @@ static int write_rcvrd_mst_node(struct ubifs_info *c,
                                 struct ubifs_mst_node *mst)
  {
         int err = 0, lnum = UBIFS_MST_LNUM, sz = c->mst_node_alsz;
-       uint32_t save_flags;
+       __le32 save_flags;
  
         dbg_rcvry("recovery");
  
         save_flags = mst->flags;
-       mst->flags = cpu_to_le32(le32_to_cpu(mst->flags) | UBIFS_MST_RCVRY);
+       mst->flags |= cpu_to_le32(UBIFS_MST_RCVRY);
  
         ubifs_prepare_node(c, mst, UBIFS_MST_NODE_SZ, 1);
         err = ubi_leb_change(c->ubi, lnum, mst, sz, UBI_SHORTTERM);
@@ -1435,13 +1435,13 @@ static int fix_size_in_place(struct ubifs_info *c, struct size_entry *e)
         err = ubi_leb_change(c->ubi, lnum, c->sbuf, len, UBI_UNKNOWN);
         if (err)
                 goto out;
-       dbg_rcvry("inode %lu at %d:%d size %lld -> %lld ", e->inum, lnum, offs,
-                 i_size, e->d_size);
+       dbg_rcvry("inode %lu at %d:%d size %lld -> %lld ",
+                 (unsigned long)e->inum, lnum, offs, i_size, e->d_size);
         return 0;
  
  out:
         ubifs_warn("inode %lu failed to fix size %lld -> %lld error %d",
-                  e->inum, e->i_size, e->d_size, err);
+                  (unsigned long)e->inum, e->i_size, e->d_size, err);
         return err;
  }
  
@@ -1472,7 +1472,8 @@ int ubifs_recover_size(struct ubifs_info *c)
                                 return err;
                         if (err == -ENOENT) {
                                 /* Remove data nodes that have no inode */
-                               dbg_rcvry("removing ino %lu", e->inum);
+                               dbg_rcvry("removing ino %lu",
+                                         (unsigned long)e->inum);
                                 err = ubifs_tnc_remove_ino(c, e->inum);
                                 if (err)
                                         return err;
@@ -1493,8 +1494,8 @@ int ubifs_recover_size(struct ubifs_info *c)
                                         return PTR_ERR(inode);
                                 if (inode->i_size < e->d_size) {
                                         dbg_rcvry("ino %lu size %lld -> %lld",
-                                                 e->inum, e->d_size,
-                                                 inode->i_size);
+                                                 (unsigned long)e->inum,
+                                                 e->d_size, inode->i_size);
                                         inode->i_size = e->d_size;
                                         ubifs_inode(inode)->ui_size = e->d_size;
                                         e->inode = inode;
diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c

index 7399692af859e2ea62b40c3924e792611745e59e..21f7d047c306be4cc3761deed76ea0de2ff8ea3f 100644 (file)
--- a/fs/ubifs/replay.c
+++ b/fs/ubifs/replay.c
@@ -1065,7 +1065,7 @@ int ubifs_replay_journal(struct ubifs_info *c)
         ubifs_assert(c->bud_bytes <= c->max_bud_bytes || c->need_recovery);
         dbg_mnt("finished, log head LEB %d:%d, max_sqnum %llu, "
                 "highest_inum %lu", c->lhead_lnum, c->lhead_offs, c->max_sqnum,
-               c->highest_inum);
+               (unsigned long)c->highest_inum);
  out:
         destroy_replay_tree(c);
         destroy_bud_list(c);
diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c

index 2bf753b388894e449b894a87c6eaaa152d6e7d56..0f392351dc5a57232c776ccf7577c7d759d5da85 100644 (file)
--- a/fs/ubifs/sb.c
+++ b/fs/ubifs/sb.c
@@ -81,6 +81,7 @@ static int create_default_filesystem(struct ubifs_info *c)
         int lpt_lebs, lpt_first, orph_lebs, big_lpt, ino_waste, sup_flags = 0;
         int min_leb_cnt = UBIFS_MIN_LEB_CNT;
         uint64_t tmp64, main_bytes;
+       __le64 tmp_le64;
  
         /* Some functions called from here depend on the @c->key_len filed */
         c->key_len = UBIFS_SK_LEN;
@@ -295,10 +296,10 @@ static int create_default_filesystem(struct ubifs_info *c)
         ino->ch.node_type = UBIFS_INO_NODE;
         ino->creat_sqnum = cpu_to_le64(++c->max_sqnum);
         ino->nlink = cpu_to_le32(2);
-       tmp = cpu_to_le64(CURRENT_TIME_SEC.tv_sec);
-       ino->atime_sec   = tmp;
-       ino->ctime_sec   = tmp;
-       ino->mtime_sec   = tmp;
+       tmp_le64 = cpu_to_le64(CURRENT_TIME_SEC.tv_sec);
+       ino->atime_sec   = tmp_le64;
+       ino->ctime_sec   = tmp_le64;
+       ino->mtime_sec   = tmp_le64;
         ino->atime_nsec  = 0;
         ino->ctime_nsec  = 0;
         ino->mtime_nsec  = 0;
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c

index 8780efbf40ac64fbf901fd448998361823c38be3..d80b2aef42b661001b2c87ac645f9a8ac29fbfd7 100644 (file)
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -36,6 +36,12 @@
  #include <linux/mount.h>
  #include "ubifs.h"
  
+/*
+ * Maximum amount of memory we may 'kmalloc()' without worrying that we are
+ * allocating too much.
+ */
+#define UBIFS_KMALLOC_OK (128*1024)
+
  /* Slab cache for UBIFS inodes */
  struct kmem_cache *ubifs_inode_slab;
  
@@ -561,18 +567,11 @@ static int init_constants_early(struct ubifs_info *c)
          * calculations when reporting free space.
          */
         c->leb_overhead = c->leb_size % UBIFS_MAX_DATA_NODE_SZ;
-       /* Buffer size for bulk-reads */
-       c->bulk_read_buf_size = UBIFS_MAX_BULK_READ * UBIFS_MAX_DATA_NODE_SZ;
-       if (c->bulk_read_buf_size > c->leb_size)
-               c->bulk_read_buf_size = c->leb_size;
-       if (c->bulk_read_buf_size > 128 * 1024) {
-               /* Check if we can kmalloc more than 128KiB */
-               void *try = kmalloc(c->bulk_read_buf_size, GFP_KERNEL);
  
-               kfree(try);
-               if (!try)
-                       c->bulk_read_buf_size = 128 * 1024;
-       }
+       /* Buffer size for bulk-reads */
+       c->max_bu_buf_len = UBIFS_MAX_BULK_READ * UBIFS_MAX_DATA_NODE_SZ;
+       if (c->max_bu_buf_len > c->leb_size)
+               c->max_bu_buf_len = c->leb_size;
         return 0;
  }
  
@@ -991,6 +990,34 @@ static void destroy_journal(struct ubifs_info *c)
         free_buds(c);
  }
  
+/**
+ * bu_init - initialize bulk-read information.
+ * @c: UBIFS file-system description object
+ */
+static void bu_init(struct ubifs_info *c)
+{
+       ubifs_assert(c->bulk_read == 1);
+
+       if (c->bu.buf)
+               return; /* Already initialized */
+
+again:
+       c->bu.buf = kmalloc(c->max_bu_buf_len, GFP_KERNEL | __GFP_NOWARN);
+       if (!c->bu.buf) {
+               if (c->max_bu_buf_len > UBIFS_KMALLOC_OK) {
+                       c->max_bu_buf_len = UBIFS_KMALLOC_OK;
+                       goto again;
+               }
+
+               /* Just disable bulk-read */
+               ubifs_warn("Cannot allocate %d bytes of memory for bulk-read, "
+                          "disabling it", c->max_bu_buf_len);
+               c->mount_opts.bulk_read = 1;
+               c->bulk_read = 0;
+               return;
+       }
+}
+
  /**
   * mount_ubifs - mount UBIFS file-system.
   * @c: UBIFS file-system description object
@@ -1059,6 +1086,13 @@ static int mount_ubifs(struct ubifs_info *c)
                         goto out_free;
         }
  
+       if (c->bulk_read == 1)
+               bu_init(c);
+
+       /*
+        * We have to check all CRCs, even for data nodes, when we mount the FS
+        * (specifically, when we are replaying).
+        */
         c->always_chk_crc = 1;
  
         err = ubifs_read_superblock(c);
@@ -1289,6 +1323,7 @@ out_cbuf:
  out_dereg:
         dbg_failure_mode_deregistration(c);
  out_free:
+       kfree(c->bu.buf);
         vfree(c->ileb_buf);
         vfree(c->sbuf);
         kfree(c->bottom_up_buf);
@@ -1325,10 +1360,11 @@ static void ubifs_umount(struct ubifs_info *c)
         kfree(c->cbuf);
         kfree(c->rcvrd_mst_node);
         kfree(c->mst_node);
+       kfree(c->bu.buf);
+       vfree(c->ileb_buf);
         vfree(c->sbuf);
         kfree(c->bottom_up_buf);
         UBIFS_DBG(vfree(c->dbg_buf));
-       vfree(c->ileb_buf);
         dbg_failure_mode_deregistration(c);
  }
  
@@ -1626,6 +1662,7 @@ static int ubifs_remount_fs(struct super_block *sb, int *flags, char *data)
                 ubifs_err("invalid or unknown remount parameter");
                 return err;
         }
+
         if ((sb->s_flags & MS_RDONLY) && !(*flags & MS_RDONLY)) {
                 err = ubifs_remount_rw(c);
                 if (err)
@@ -1633,6 +1670,14 @@ static int ubifs_remount_fs(struct super_block *sb, int *flags, char *data)
         } else if (!(sb->s_flags & MS_RDONLY) && (*flags & MS_RDONLY))
                 ubifs_remount_ro(c);
  
+       if (c->bulk_read == 1)
+               bu_init(c);
+       else {
+               dbg_gen("disable bulk-read");
+               kfree(c->bu.buf);
+               c->bu.buf = NULL;
+       }
+
         return 0;
  }
  
@@ -1723,6 +1768,7 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent)
         mutex_init(&c->log_mutex);
         mutex_init(&c->mst_mutex);
         mutex_init(&c->umount_mutex);
+       mutex_init(&c->bu_mutex);
         init_waitqueue_head(&c->cmt_wq);
         c->buds = RB_ROOT;
         c->old_idx = RB_ROOT;
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c

index d27fd918b9c935a1fd115a3f1729576c8c4ae883..6eef5344a145ec845ee17791567ea41ad4db2fa9 100644 (file)
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -1501,7 +1501,12 @@ out:
   * @bu: bulk-read parameters and results
   *
   * Lookup consecutive data node keys for the same inode that reside
- * consecutively in the same LEB.
+ * consecutively in the same LEB. This function returns zero in case of success
+ * and a negative error code in case of failure.
+ *
+ * Note, if the bulk-read buffer length (@bu->buf_len) is known, this function
+ * makes sure bulk-read nodes fit the buffer. Otherwise, this function prepares
+ * maxumum possible amount of nodes for bulk-read.
   */
  int ubifs_tnc_get_bu_keys(struct ubifs_info *c, struct bu_info *bu)
  {
@@ -2677,7 +2682,7 @@ int ubifs_tnc_remove_ino(struct ubifs_info *c, ino_t inum)
         struct ubifs_dent_node *xent, *pxent = NULL;
         struct qstr nm = { .name = NULL };
  
-       dbg_tnc("ino %lu", inum);
+       dbg_tnc("ino %lu", (unsigned long)inum);
  
         /*
          * Walk all extended attribute entries and remove them together with
@@ -2697,7 +2702,8 @@ int ubifs_tnc_remove_ino(struct ubifs_info *c, ino_t inum)
                 }
  
                 xattr_inum = le64_to_cpu(xent->inum);
-               dbg_tnc("xent '%s', ino %lu", xent->name, xattr_inum);
+               dbg_tnc("xent '%s', ino %lu", xent->name,
+                       (unsigned long)xattr_inum);
  
                 nm.name = xent->name;
                 nm.len = le16_to_cpu(xent->nlen);
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h

index a7bd32fa15b987d9510583041a7b3a6e5f6f0998..46b172560a064eb7b4d541359aa9b02e7dd39380 100644 (file)
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -753,7 +753,7 @@ struct ubifs_znode {
  };
  
  /**
- * struct bu_info - bulk-read information
+ * struct bu_info - bulk-read information.
   * @key: first data node key
   * @zbranch: zbranches of data nodes to bulk read
   * @buf: buffer to read into
@@ -969,7 +969,10 @@ struct ubifs_mount_opts {
   * @mst_node: master node
   * @mst_offs: offset of valid master node
   * @mst_mutex: protects the master node area, @mst_node, and @mst_offs
- * @bulk_read_buf_size: buffer size for bulk-reads
+ *
+ * @max_bu_buf_len: maximum bulk-read buffer length
+ * @bu_mutex: protects the pre-allocated bulk-read buffer and @c->bu
+ * @bu: pre-allocated bulk-read information
   *
   * @log_lebs: number of logical eraseblocks in the log
   * @log_bytes: log size in bytes
@@ -1217,7 +1220,10 @@ struct ubifs_info {
         struct ubifs_mst_node *mst_node;
         int mst_offs;
         struct mutex mst_mutex;
-       int bulk_read_buf_size;
+
+       int max_bu_buf_len;
+       struct mutex bu_mutex;
+       struct bu_info bu;
  
         int log_lebs;
         long long log_bytes;
diff --git a/fs/xfs/xfs_rename.c b/fs/xfs/xfs_rename.c

index d700dacdb10e7f68302853945b22ab56a752c7ad..c903130be7fd6f6ec3032067e990bab8582b9886 100644 (file)
--- a/fs/xfs/xfs_rename.c
+++ b/fs/xfs/xfs_rename.c
@@ -212,7 +212,7 @@ xfs_rename(
         if (unlikely((target_dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) &&
                      (target_dp->i_d.di_projid != src_ip->i_d.di_projid))) {
                 error = XFS_ERROR(EXDEV);
-               xfs_rename_unlock4(inodes, XFS_ILOCK_SHARED);
+               xfs_rename_unlock4(inodes, XFS_ILOCK_EXCL);
                 xfs_trans_cancel(tp, cancel_flags);
                 goto std_return;
         }
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h

index 09d33c7740f0bfbf48f195c57bb209a03297baf4..db8852d8bcf7a41c515ef2ec7c19db097026971e 100644 (file)
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
@@ -172,7 +172,7 @@
  
  /* Defaults for debug_level, debug and normal */
  
-#define ACPI_DEBUG_DEFAULT          (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT)
+#define ACPI_DEBUG_DEFAULT          (ACPI_LV_INFO)
  #define ACPI_NORMAL_DEFAULT         (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT)
  #define ACPI_DEBUG_ALL              (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL)
  
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h

index 029c8c06c151ab4f7153d4aeb143bb51ed4d258c..0515e754449d13bd8d10fddb3f6b92ad6f6e5fd0 100644 (file)
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -141,6 +141,10 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
  /*
   * We need to show where it is safe to preempt execution of ACPICA
   */
-#define ACPI_PREEMPTION_POINT()        cond_resched()
+#define ACPI_PREEMPTION_POINT()                \
+       do {                            \
+               if (!irqs_disabled())   \
+                       cond_resched(); \
+       } while (0)
  
  #endif                         /* __ACLINUX_H__ */
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h

index 4ec0a296bdec8413394dbecedbf779bb19bfcf4b..7abdaa91ccd3738ea7e8633f16c78f3031ce15bf 100644 (file)
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
@@ -251,7 +251,7 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
  #define atomic_long_cmpxchg(l, old, new) \
         (atomic_cmpxchg((atomic_t *)(l), (old), (new)))
  #define atomic_long_xchg(v, new) \
-       (atomic_xchg((atomic_t *)(l), (new)))
+       (atomic_xchg((atomic_t *)(v), (new)))
  
  #endif  /*  BITS_PER_LONG == 64  */
  
diff --git a/include/asm-generic/audit_write.h b/include/asm-generic/audit_write.h

index f10d367fb2a5b1f31f4741ddaf58f06a61968f61..c5f1c2c920e26c033761d640a81256b0b13c13eb 100644 (file)
--- a/include/asm-generic/audit_write.h
+++ b/include/asm-generic/audit_write.h
@@ -1,6 +1,8 @@
  #include <asm-generic/audit_dir_write.h>
  __NR_acct,
+#ifdef __NR_swapon
  __NR_swapon,
+#endif
  __NR_quotactl,
  __NR_truncate,
  #ifdef __NR_truncate64
diff --git a/include/asm-mn10300/uaccess.h b/include/asm-mn10300/uaccess.h

index 46b9b647f3c3864540a9a44411f91b9881c0028f..8a3a4dd55763eba744552c46c825831569e90610 100644 (file)
--- a/include/asm-mn10300/uaccess.h
+++ b/include/asm-mn10300/uaccess.h
@@ -266,7 +266,7 @@ extern int __get_user_unknown(void);
                 "       .section        .fixup,\"ax\"   \n"             \
                 "4:                                     \n"             \
                 "       mov             %5,%0           \n"             \
-               "       jmp             2b              \n"             \
+               "       jmp             3b              \n"             \
                 "       .previous                       \n"             \
                 "       .section        __ex_table,\"a\"\n"             \
                 "       .balign         4               \n"             \
diff --git a/include/linux/audit.h b/include/linux/audit.h

index 6272a395d43c0b73a6ef4fd5d0a19062d6154a38..8f0672d13eb1bf8bbddba0d30c6ecdfd30c94ddf 100644 (file)
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -391,6 +391,7 @@ extern int audit_classify_arch(int arch);
  #ifdef CONFIG_AUDITSYSCALL
  /* These are defined in auditsc.c */
                                 /* Public API */
+extern void audit_finish_fork(struct task_struct *child);
  extern int  audit_alloc(struct task_struct *task);
  extern void audit_free(struct task_struct *task);
  extern void audit_syscall_entry(int arch,
@@ -434,7 +435,7 @@ static inline void audit_ptrace(struct task_struct *t)
  
                                 /* Private API (for audit.c only) */
  extern unsigned int audit_serial(void);
-extern void auditsc_get_stamp(struct audit_context *ctx,
+extern int auditsc_get_stamp(struct audit_context *ctx,
                               struct timespec *t, unsigned int *serial);
  extern int  audit_set_loginuid(struct task_struct *task, uid_t loginuid);
  #define audit_get_loginuid(t) ((t)->loginuid)
@@ -504,6 +505,7 @@ static inline int audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat)
  extern int audit_n_rules;
  extern int audit_signals;
  #else
+#define audit_finish_fork(t)
  #define audit_alloc(t) ({ 0; })
  #define audit_free(t) do { ; } while (0)
  #define audit_syscall_entry(ta,a,b,c,d,e) do { ; } while (0)
@@ -516,7 +518,7 @@ extern int audit_signals;
  #define audit_inode(n,d) do { ; } while (0)
  #define audit_inode_child(d,i,p) do { ; } while (0)
  #define audit_core_dumps(i) do { ; } while (0)
-#define auditsc_get_stamp(c,t,s) do { BUG(); } while (0)
+#define auditsc_get_stamp(c,t,s) (0)
  #define audit_get_loginuid(t) (-1)
  #define audit_get_sessionid(t) (-1)
  #define audit_log_task_context(b) do { ; } while (0)
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h

index a135256b272c79f6a7b462826e59735ce3b4d620..031a315c0509e5aa9eaa73c080b7e76a44dc95a0 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -662,6 +662,7 @@ extern unsigned long blk_max_low_pfn, blk_max_pfn;
   * default timeout for SG_IO if none specified
   */
  #define BLK_DEFAULT_SG_TIMEOUT (60 * HZ)
+#define BLK_MIN_SG_TIMEOUT     (7 * HZ)
  
  #ifdef CONFIG_BOUNCE
  extern int init_emergency_isa_pool(void);
@@ -786,6 +787,8 @@ static inline void blk_run_address_space(struct address_space *mapping)
                 blk_run_backing_dev(mapping->backing_dev_info, NULL);
  }
  
+extern void blkdev_dequeue_request(struct request *req);
+
  /*
   * blk_end_request() and friends.
   * __blk_end_request() and end_request() must be called with
@@ -820,11 +823,6 @@ extern void blk_update_request(struct request *rq, int error,
  extern unsigned int blk_rq_bytes(struct request *rq);
  extern unsigned int blk_rq_cur_bytes(struct request *rq);
  
-static inline void blkdev_dequeue_request(struct request *req)
-{
-       elv_dequeue_request(req->q, req);
-}
-
  /*
   * Access functions for manipulating queue properties
   */
@@ -921,6 +919,8 @@ extern void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter);
  
  #define MAX_SEGMENT_SIZE       65536
  
+#define BLK_SEG_BOUNDARY_MASK  0xFFFFFFFFUL
+
  #define blkdev_entry_to_request(entry) list_entry((entry), struct request, queuelist)
  
  static inline int queue_hardsect_size(struct request_queue *q)
diff --git a/include/linux/can/core.h b/include/linux/can/core.h

index e9ca210ffa5b6cf9fd9c0c5f577bbca752fc04d1..f50785ad478147f8b4a80ba017dc1deba70d6368 100644 (file)
--- a/include/linux/can/core.h
+++ b/include/linux/can/core.h
@@ -19,7 +19,7 @@
  #include <linux/skbuff.h>
  #include <linux/netdevice.h>
  
-#define CAN_VERSION "20071116"
+#define CAN_VERSION "20081130"
  
  /* increment this number each time you change some user-space interface */
  #define CAN_ABI_VERSION "8"
diff --git a/include/linux/fs.h b/include/linux/fs.h

index 0dcdd9458f4bcce56d1a89c566892f5d5097e876..4a853ef6fd35076d4aad21b488a97a513fb7bacc 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -63,23 +63,24 @@ extern int dir_notify_enable;
  #define MAY_ACCESS 16
  #define MAY_OPEN 32
  
-#define FMODE_READ ((__force fmode_t)1)
-#define FMODE_WRITE ((__force fmode_t)2)
-
-/* Internal kernel extensions */
-#define FMODE_LSEEK    ((__force fmode_t)4)
-#define FMODE_PREAD    ((__force fmode_t)8)
-#define FMODE_PWRITE   FMODE_PREAD     /* These go hand in hand */
-
-/* File is being opened for execution. Primary users of this flag are
-   distributed filesystems that can use it to achieve correct ETXTBUSY
-   behavior for cross-node execution/opening_for_writing of files */
-#define FMODE_EXEC     ((__force fmode_t)16)
-
-#define FMODE_NDELAY   ((__force fmode_t)32)
-#define FMODE_EXCL     ((__force fmode_t)64)
+/* file is open for reading */
+#define FMODE_READ             ((__force fmode_t)1)
+/* file is open for writing */
+#define FMODE_WRITE            ((__force fmode_t)2)
+/* file is seekable */
+#define FMODE_LSEEK            ((__force fmode_t)4)
+/* file can be accessed using pread/pwrite */
+#define FMODE_PREAD            ((__force fmode_t)8)
+#define FMODE_PWRITE           FMODE_PREAD     /* These go hand in hand */
+/* File is opened for execution with sys_execve / sys_uselib */
+#define FMODE_EXEC             ((__force fmode_t)16)
+/* File is opened with O_NDELAY (only set for block devices) */
+#define FMODE_NDELAY           ((__force fmode_t)32)
+/* File is opened with O_EXCL (only set for block devices) */
+#define FMODE_EXCL             ((__force fmode_t)64)
+/* File is opened using open(.., 3, ..) and is writeable only for ioctls
+   (specialy hack for floppy.c) */
  #define FMODE_WRITE_IOCTL      ((__force fmode_t)128)
-#define FMODE_NDELAY_NOW       ((__force fmode_t)256)
  
  #define RW_MASK                1
  #define RWA_MASK       2
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h

index 703eb53cfa2b2a1512b7ce97d9c1da218ad9ac0f..9c5bc6be2b091274b37b14046f03ebf3db70c194 100644 (file)
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -6,6 +6,7 @@
  #include <linux/ktime.h>
  #include <linux/init.h>
  #include <linux/types.h>
+#include <linux/module.h>
  #include <linux/kallsyms.h>
  
  #ifdef CONFIG_FUNCTION_TRACER
@@ -231,7 +232,7 @@ ftrace_init_module(unsigned long *start, unsigned long *end) { }
  
  struct boot_trace {
         pid_t                   caller;
-       char                    func[KSYM_NAME_LEN];
+       char                    func[KSYM_SYMBOL_LEN];
         int                     result;
         unsigned long long      duration;               /* usecs */
         ktime_t                 calltime;
diff --git a/include/linux/ide.h b/include/linux/ide.h

index 54525be4b5f87f8d0f43d21a40db8efee2ec10f5..010fb26a15796452b4382ad167e58cc4210e0c38 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1296,6 +1296,13 @@ extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *o
  #define ide_pci_register_driver(d) pci_register_driver(d)
  #endif
  
+static inline int ide_pci_is_in_compatibility_mode(struct pci_dev *dev)
+{
+       if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE && (dev->class & 5) != 5)
+               return 1;
+       return 0;
+}
+
  void ide_pci_setup_ports(struct pci_dev *, const struct ide_port_info *, int,
                          hw_regs_t *, hw_regs_t **);
  void ide_setup_pci_noise(struct pci_dev *, const struct ide_port_info *);
@@ -1375,6 +1382,7 @@ enum {
         IDE_HFLAG_IO_32BIT              = (1 << 24),
         /* unmask IRQs */
         IDE_HFLAG_UNMASK_IRQS           = (1 << 25),
+       IDE_HFLAG_BROKEN_ALTSTATUS      = (1 << 26),
         /* serialize ports if DMA is possible (for sl82c105) */
         IDE_HFLAG_SERIALIZE_DMA         = (1 << 27),
         /* force host out of "simplex" mode */
diff --git a/include/linux/idr.h b/include/linux/idr.h

index fa035f96f2a3b340c468e4b58d9010df3b21be69..dd846df8cd32182f6740ea59f6451079deb3060d 100644 (file)
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -52,13 +52,14 @@ struct idr_layer {
         unsigned long            bitmap; /* A zero bit means "space here" */
         struct idr_layer        *ary[1<<IDR_BITS];
         int                      count;  /* When zero, we can release it */
+       int                      layer;  /* distance from leaf */
         struct rcu_head          rcu_head;
  };
  
  struct idr {
         struct idr_layer *top;
         struct idr_layer *id_free;
-       int               layers;
+       int               layers; /* only valid without concurrent changes */
         int               id_free_cnt;
         spinlock_t        lock;
  };
diff --git a/include/linux/libata.h b/include/linux/libata.h

index 59b0f1c807b5bd97580373781fb6028970431657..ed3f26eb5df1421287ea41d17feed10be87cafeb 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -375,6 +375,7 @@ enum {
         ATA_HORKAGE_BRIDGE_OK   = (1 << 10),    /* no bridge limits */
         ATA_HORKAGE_ATAPI_MOD16_DMA = (1 << 11), /* use ATAPI DMA for commands
                                                     not multiple of 16 bytes */
+       ATA_HORKAGE_FIRMWARE_WARN = (1 << 12),  /* firwmare update warning */
  
          /* DMA mask for user DMA control: User visible values; DO NOT
             renumber */
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h

index bd9977b894907f294b06817a01a42b3c29dd25bc..371086fd946f3f13a7cbeecab10354caae5cb15f 100644 (file)
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -179,6 +179,7 @@ struct mlx4_caps {
         int                     num_ports;
         int                     vl_cap[MLX4_MAX_PORTS + 1];
         int                     ib_mtu_cap[MLX4_MAX_PORTS + 1];
+       __be32                  ib_port_def_cap[MLX4_MAX_PORTS + 1];
         u64                     def_mac[MLX4_MAX_PORTS + 1];
         int                     eth_mtu_cap[MLX4_MAX_PORTS + 1];
         int                     gid_table_len[MLX4_MAX_PORTS + 1];
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h

index 9d77b1d7dca806e540838d27bbc632961a340f0e..e26f54952892e9c46be142344e36ceb37f19f6f0 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -319,6 +319,7 @@ enum
  {
         NAPI_STATE_SCHED,       /* Poll is scheduled */
         NAPI_STATE_DISABLE,     /* Disable pending */
+       NAPI_STATE_NPSVC,       /* Netpoll - don't dequeue from poll_list */
  };
  
  extern void __napi_schedule(struct napi_struct *n);
@@ -1497,6 +1498,12 @@ static inline void netif_rx_complete(struct net_device *dev,
  {
         unsigned long flags;
  
+       /*
+        * don't let napi dequeue from the cpu poll list
+        * just in case its running on a different cpu
+        */
+       if (unlikely(test_bit(NAPI_STATE_NPSVC, &napi->state)))
+               return;
         local_irq_save(flags);
         __netif_rx_complete(dev, napi);
         local_irq_restore(flags);
diff --git a/include/linux/netfilter/nfnetlink_conntrack.h b/include/linux/netfilter/nfnetlink_conntrack.h

index c19595c8930491d8e0f64a2795d36cb127ee3b60..29fe9ea1d3463a5964ee158eeb1a39211b1c756f 100644 (file)
--- a/include/linux/netfilter/nfnetlink_conntrack.h
+++ b/include/linux/netfilter/nfnetlink_conntrack.h
@@ -141,6 +141,7 @@ enum ctattr_protonat {
  #define CTA_PROTONAT_MAX (__CTA_PROTONAT_MAX - 1)
  
  enum ctattr_natseq {
+       CTA_NAT_SEQ_UNSPEC,
         CTA_NAT_SEQ_CORRECTION_POS,
         CTA_NAT_SEQ_OFFSET_BEFORE,
         CTA_NAT_SEQ_OFFSET_AFTER,
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h

index be41b609c88fddbe6384ab5e73f3fe393fb56320..e52ce475d19f13796080ba21f24e4464054f0990 100644 (file)
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -251,7 +251,7 @@ struct xt_target_param {
   */
  struct xt_tgchk_param {
         const char *table;
-       void *entryinfo;
+       const void *entryinfo;
         const struct xt_target *target;
         void *targinfo;
         unsigned int hook_mask;
diff --git a/include/linux/sched.h b/include/linux/sched.h

index 644ffbda17cad0ccfc977386ac81be74ef69cc6b..55e30d11447790dd433d0e874285ced3a5499328 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -630,6 +630,10 @@ struct user_struct {
         atomic_t inotify_watches; /* How many inotify watches does this user have? */
         atomic_t inotify_devs;  /* How many inotify devs does this user have opened? */
  #endif
+#ifdef CONFIG_EPOLL
+       atomic_t epoll_devs;    /* The number of epoll descriptors currently open */
+       atomic_t epoll_watches; /* The number of file descriptors currently watched */
+#endif
  #ifdef CONFIG_POSIX_MQUEUE
         /* protected by mq_lock */
         unsigned long mq_bytes; /* How many bytes can be allocated to mqueue? */
diff --git a/include/linux/security.h b/include/linux/security.h

index c13f1cec9abb154e24296216d91d225d245166b2..e3d4ecda267381d85da5697b2ad681c1da749fe3 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1818,17 +1818,21 @@ static inline int security_settime(struct timespec *ts, struct timezone *tz)
  
  static inline int security_vm_enough_memory(long pages)
  {
+       WARN_ON(current->mm == NULL);
         return cap_vm_enough_memory(current->mm, pages);
  }
  
-static inline int security_vm_enough_memory_kern(long pages)
+static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)
  {
-       return cap_vm_enough_memory(current->mm, pages);
+       WARN_ON(mm == NULL);
+       return cap_vm_enough_memory(mm, pages);
  }
  
-static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)
+static inline int security_vm_enough_memory_kern(long pages)
  {
-       return cap_vm_enough_memory(mm, pages);
+       /* If current->mm is a kernel thread then we will pass NULL,
+          for this specific case that is fine */
+       return cap_vm_enough_memory(current->mm, pages);
  }
  
  static inline int security_bprm_alloc(struct linux_binprm *bprm)
diff --git a/include/linux/smp.h b/include/linux/smp.h

index 3f9a60043a975617a3b8217f8e69b24751c13e01..6e7ba16ff454f878d28315c02f66572b9734bd09 100644 (file)
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -146,6 +146,8 @@ static inline void smp_send_reschedule(int cpu) { }
  })
  #define smp_call_function_mask(mask, func, info, wait) \
                         (up_smp_call_function(func, info))
+#define smp_call_function_many(mask, func, info, wait) \
+                       (up_smp_call_function(func, info))
  static inline void init_call_single_data(void)
  {
  }
diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h

index 73a2f4eb1f7ae1a6f9c23131a56f5d1d6d631d58..9b42baed39009c75c8e3932a8c9be3cfbb0984f0 100644 (file)
--- a/include/linux/usb/ch9.h
+++ b/include/linux/usb/ch9.h
@@ -158,8 +158,12 @@ struct usb_ctrlrequest {
   * (rarely) accepted by SET_DESCRIPTOR.
   *
   * Note that all multi-byte values here are encoded in little endian
- * byte order "on the wire".  But when exposed through Linux-USB APIs,
- * they've been converted to cpu byte order.
+ * byte order "on the wire".  Within the kernel and when exposed
+ * through the Linux-USB APIs, they are not converted to cpu byte
+ * order; it is the responsibility of the client code to do this.
+ * The single exception is when device and configuration descriptors (but
+ * not other descriptors) are read from usbfs (i.e. /proc/bus/usb/BBB/DDD);
+ * in this case the fields are converted to host endianness by the kernel.
   */
  
  /*
diff --git a/include/net/af_unix.h b/include/net/af_unix.h

index c29ff1da8a18ac2dbf905f6bd83a27066e2283e4..1614d78c60ed2c4b616b530b89f8247addbcc17f 100644 (file)
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@ -9,6 +9,7 @@
  extern void unix_inflight(struct file *fp);
  extern void unix_notinflight(struct file *fp);
  extern void unix_gc(void);
+extern void wait_for_unix_gc(void);
  
  #define UNIX_HASH_SIZE 256
  
diff --git a/include/net/irda/irda_device.h b/include/net/irda/irda_device.h

index 3025ae17ddbeb46207ca71e88b3d31d6aaad44a8..94c852d47d0f8d5c7d033279bf2f67ca3fd861dd 100644 (file)
--- a/include/net/irda/irda_device.h
+++ b/include/net/irda/irda_device.h
@@ -135,9 +135,11 @@ struct dongle_reg {
  
  /* 
   * Per-packet information we need to hide inside sk_buff 
- * (must not exceed 48 bytes, check with struct sk_buff) 
+ * (must not exceed 48 bytes, check with struct sk_buff)
+ * The default_qdisc_pad field is a temporary hack.
   */
  struct irda_skb_cb {
+       unsigned int default_qdisc_pad;
         magic_t magic;       /* Be sure that we can trust the information */
         __u32   next_speed;  /* The Speed to be set *after* this frame */
         __u16   mtt;         /* Minimum turn around time */
diff --git a/include/net/request_sock.h b/include/net/request_sock.h

index cac811e51f6dc0ef78ebc9ac124c1c42637b3f02..c7190846e128e21221106379e619589b3d7f0603 100644 (file)
--- a/include/net/request_sock.h
+++ b/include/net/request_sock.h
@@ -31,6 +31,7 @@ struct request_sock_ops {
         int             family;
         int             obj_size;
         struct kmem_cache       *slab;
+       char            *slab_name;
         int             (*rtx_syn_ack)(struct sock *sk,
                                        struct request_sock *req);
         void            (*send_ack)(struct sock *sk, struct sk_buff *skb,
diff --git a/include/net/timewait_sock.h b/include/net/timewait_sock.h

index 1e1ee3253fd8fd9a46d24778f9534e7c042f98a4..97c3b14da55df2e655ac8ceade98da1e4d77682d 100644 (file)
--- a/include/net/timewait_sock.h
+++ b/include/net/timewait_sock.h
@@ -16,6 +16,7 @@
  
  struct timewait_sock_ops {
         struct kmem_cache       *twsk_slab;
+       char            *twsk_slab_name;
         unsigned int    twsk_obj_size;
         int             (*twsk_unique)(struct sock *sk,
                                        struct sock *sktw, void *twp);
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h

index 49d8913c4f860ad97dab941dd6538edbe08b6420..6e04e6fe79c70dfdcba023c8457405ed1e4a0e13 100644 (file)
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -357,7 +357,7 @@ struct fc_rport {   /* aka fc_starget_attrs */
  /* bit field values for struct fc_rport "flags" field: */
  #define FC_RPORT_DEVLOSS_PENDING       0x01
  #define FC_RPORT_SCAN_PENDING          0x02
-#define FC_RPORT_FAST_FAIL_TIMEDOUT    0x03
+#define FC_RPORT_FAST_FAIL_TIMEDOUT    0x04
  
  #define        dev_to_rport(d)                         \
         container_of(d, struct fc_rport, dev)
diff --git a/include/video/radeon.h b/include/video/radeon.h

index d5dcaf154ba4092412cb45e59bebebe5c6d23c5f..1cd09cc5b169460609ca91f7d71edaba6a32f284 100644 (file)
--- a/include/video/radeon.h
+++ b/include/video/radeon.h
@@ -525,9 +525,6 @@
  #define CRTC_DISPLAY_DIS                          (1 << 10)
  #define CRTC_CRT_ON                               (1 << 15)
  
-/* DSTCACHE_MODE bits constants */
-#define RB2D_DC_AUTOFLUSH_ENABLE                   (1 << 8)
-#define RB2D_DC_DC_DISABLE_IGNORE_PE               (1 << 17)
  
  /* DSTCACHE_CTLSTAT bit constants */
  #define RB2D_DC_FLUSH_2D                          (1 << 0)
@@ -869,10 +866,15 @@
  #define GMC_DST_16BPP_YVYU422                      0x00000c00
  #define GMC_DST_32BPP_AYUV444                      0x00000e00
  #define GMC_DST_16BPP_ARGB4444                     0x00000f00
+#define GMC_SRC_MONO                               0x00000000
+#define GMC_SRC_MONO_LBKGD                         0x00001000
+#define GMC_SRC_DSTCOLOR                           0x00003000
  #define GMC_BYTE_ORDER_MSB_TO_LSB                  0x00000000
  #define GMC_BYTE_ORDER_LSB_TO_MSB                  0x00004000
  #define GMC_DP_CONVERSION_TEMP_9300                0x00008000
  #define GMC_DP_CONVERSION_TEMP_6500                0x00000000
+#define GMC_DP_SRC_RECT                            0x02000000
+#define GMC_DP_SRC_HOST                            0x03000000
  #define GMC_DP_SRC_HOST_BYTEALIGN                  0x04000000
  #define GMC_3D_FCN_EN_CLR                          0x00000000
  #define GMC_3D_FCN_EN_SET                          0x08000000
@@ -883,9 +885,6 @@
  #define GMC_WRITE_MASK_LEAVE                       0x00000000
  #define GMC_WRITE_MASK_SET                         0x40000000
  #define GMC_CLR_CMP_CNTL_DIS                      (1 << 28)
-#define GMC_SRC_DATATYPE_MASK                     (3 << 12)
-#define GMC_SRC_DATATYPE_MONO_FG_BG               (0 << 12)
-#define GMC_SRC_DATATYPE_MONO_FG_LA               (1 << 12)
  #define GMC_SRC_DATATYPE_COLOR                    (3 << 12)
  #define ROP3_S                                    0x00cc0000
  #define ROP3_SRCCOPY                              0x00cc0000
@@ -894,7 +893,6 @@
  #define DP_SRC_SOURCE_MASK                        (7    << 24)
  #define GMC_BRUSH_NONE                            (15   <<  4)
  #define DP_SRC_SOURCE_MEMORY                      (2    << 24)
-#define DP_SRC_SOURCE_HOST_DATA                           (3    << 24)
  #define GMC_BRUSH_SOLIDCOLOR                      0x000000d0
  
  /* DP_MIX bit constants */
@@ -980,12 +978,6 @@
  #define DISP_PWR_MAN_TV_ENABLE_RST                 (1 << 25)
  #define DISP_PWR_MAN_AUTO_PWRUP_EN                 (1 << 26)
  
-/* RBBM_GUICNTL constants */
-#define RBBM_GUICNTL_HOST_DATA_SWAP_NONE          (0 << 0)
-#define RBBM_GUICNTL_HOST_DATA_SWAP_16BIT          (1 << 0)
-#define RBBM_GUICNTL_HOST_DATA_SWAP_32BIT         (2 << 0)
-#define RBBM_GUICNTL_HOST_DATA_SWAP_HDW                   (3 << 0)
-
  /* masks */
  
  #define CONFIG_MEMSIZE_MASK            0x1f000000
diff --git a/kernel/audit.c b/kernel/audit.c

index 4414e93d875018b89b6363e2821093c38600d776..ce6d8ea3131e78136b3b50803c424c0fffbeb20a 100644 (file)
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -61,8 +61,11 @@
  
  #include "audit.h"
  
-/* No auditing will take place until audit_initialized != 0.
+/* No auditing will take place until audit_initialized == AUDIT_INITIALIZED.
   * (Initialization happens after skb_init is called.) */
+#define AUDIT_DISABLED         -1
+#define AUDIT_UNINITIALIZED    0
+#define AUDIT_INITIALIZED      1
  static int     audit_initialized;
  
  #define AUDIT_OFF      0
@@ -965,6 +968,9 @@ static int __init audit_init(void)
  {
         int i;
  
+       if (audit_initialized == AUDIT_DISABLED)
+               return 0;
+
         printk(KERN_INFO "audit: initializing netlink socket (%s)\n",
                audit_default ? "enabled" : "disabled");
         audit_sock = netlink_kernel_create(&init_net, NETLINK_AUDIT, 0,
@@ -976,7 +982,7 @@ static int __init audit_init(void)
  
         skb_queue_head_init(&audit_skb_queue);
         skb_queue_head_init(&audit_skb_hold_queue);
-       audit_initialized = 1;
+       audit_initialized = AUDIT_INITIALIZED;
         audit_enabled = audit_default;
         audit_ever_enabled |= !!audit_default;
  
@@ -999,13 +1005,21 @@ __initcall(audit_init);
  static int __init audit_enable(char *str)
  {
         audit_default = !!simple_strtol(str, NULL, 0);
-       printk(KERN_INFO "audit: %s%s\n",
-              audit_default ? "enabled" : "disabled",
-              audit_initialized ? "" : " (after initialization)");
-       if (audit_initialized) {
+       if (!audit_default)
+               audit_initialized = AUDIT_DISABLED;
+
+       printk(KERN_INFO "audit: %s", audit_default ? "enabled" : "disabled");
+
+       if (audit_initialized == AUDIT_INITIALIZED) {
                 audit_enabled = audit_default;
                 audit_ever_enabled |= !!audit_default;
+       } else if (audit_initialized == AUDIT_UNINITIALIZED) {
+               printk(" (after initialization)");
+       } else {
+               printk(" (until reboot)");
         }
+       printk("\n");
+
         return 1;
  }
  
@@ -1107,9 +1121,7 @@ unsigned int audit_serial(void)
  static inline void audit_get_stamp(struct audit_context *ctx,
                                    struct timespec *t, unsigned int *serial)
  {
-       if (ctx)
-               auditsc_get_stamp(ctx, t, serial);
-       else {
+       if (!ctx || !auditsc_get_stamp(ctx, t, serial)) {
                 *t = CURRENT_TIME;
                 *serial = audit_serial();
         }
@@ -1146,7 +1158,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
         int reserve;
         unsigned long timeout_start = jiffies;
  
-       if (!audit_initialized)
+       if (audit_initialized != AUDIT_INITIALIZED)
                 return NULL;
  
         if (unlikely(audit_filter_type(type)))
diff --git a/kernel/auditsc.c b/kernel/auditsc.c

index cf5bc2f5f9c3e527ac2ea72ec019d156be72ecb6..2a3f0afc4d2ac191835c39988506dfd84d1e4737 100644 (file)
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1459,7 +1459,6 @@ void audit_free(struct task_struct *tsk)
  
  /**
   * audit_syscall_entry - fill in an audit record at syscall entry
- * @tsk: task being audited
   * @arch: architecture type
   * @major: major syscall type (function)
   * @a1: additional syscall register 1
@@ -1548,9 +1547,25 @@ void audit_syscall_entry(int arch, int major,
         context->ppid       = 0;
  }
  
+void audit_finish_fork(struct task_struct *child)
+{
+       struct audit_context *ctx = current->audit_context;
+       struct audit_context *p = child->audit_context;
+       if (!p || !ctx || !ctx->auditable)
+               return;
+       p->arch = ctx->arch;
+       p->major = ctx->major;
+       memcpy(p->argv, ctx->argv, sizeof(ctx->argv));
+       p->ctime = ctx->ctime;
+       p->dummy = ctx->dummy;
+       p->auditable = ctx->auditable;
+       p->in_syscall = ctx->in_syscall;
+       p->filterkey = kstrdup(ctx->filterkey, GFP_KERNEL);
+       p->ppid = current->pid;
+}
+
  /**
   * audit_syscall_exit - deallocate audit context after a system call
- * @tsk: task being audited
   * @valid: success/failure flag
   * @return_code: syscall return value
   *
@@ -1942,15 +1957,18 @@ EXPORT_SYMBOL_GPL(__audit_inode_child);
   *
   * Also sets the context as auditable.
   */
-void auditsc_get_stamp(struct audit_context *ctx,
+int auditsc_get_stamp(struct audit_context *ctx,
                        struct timespec *t, unsigned int *serial)
  {
+       if (!ctx->in_syscall)
+               return 0;
         if (!ctx->serial)
                 ctx->serial = audit_serial();
         t->tv_sec  = ctx->ctime.tv_sec;
         t->tv_nsec = ctx->ctime.tv_nsec;
         *serial    = ctx->serial;
         ctx->auditable = 1;
+       return 1;
  }
  
  /* global counter which is incremented every time something logs in */
diff --git a/kernel/cgroup.c b/kernel/cgroup.c

index fe00b3b983a86387332234703217abb1d28ca202..2606d0fb4e54e8f120618328c7b72c01634dc35d 100644 (file)
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -702,7 +702,7 @@ static int rebind_subsystems(struct cgroupfs_root *root,
          * any child cgroups exist. This is theoretically supportable
          * but involves complex error handling, so it's being left until
          * later */
-       if (!list_empty(&cgrp->children))
+       if (root->number_of_cgroups > 1)
                 return -EBUSY;
  
         /* Process each subsystem */
@@ -1024,7 +1024,7 @@ static int cgroup_get_sb(struct file_system_type *fs_type,
                 if (ret == -EBUSY) {
                         mutex_unlock(&cgroup_mutex);
                         mutex_unlock(&inode->i_mutex);
-                       goto drop_new_super;
+                       goto free_cg_links;
                 }
  
                 /* EBUSY should be the only error here */
@@ -1073,10 +1073,11 @@ static int cgroup_get_sb(struct file_system_type *fs_type,
  
         return simple_set_mnt(mnt, sb);
  
+ free_cg_links:
+       free_cg_links(&tmp_cg_links);
   drop_new_super:
         up_write(&sb->s_umount);
         deactivate_super(sb);
-       free_cg_links(&tmp_cg_links);
         return ret;
  }
  
@@ -2934,9 +2935,6 @@ int cgroup_clone(struct task_struct *tsk, struct cgroup_subsys *subsys,
   again:
         root = subsys->root;
         if (root == &rootnode) {
-               printk(KERN_INFO
-                      "Not cloning cgroup for unused subsystem %s\n",
-                      subsys->name);
                 mutex_unlock(&cgroup_mutex);
                 return 0;
         }
diff --git a/kernel/fork.c b/kernel/fork.c

index 2a372a0e206fa2de99dbfdd594f86f6eb927bf40..495da2e9a8b4d92a1b464b98196228f818c892e7 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -315,17 +315,20 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
                 file = tmp->vm_file;
                 if (file) {
                         struct inode *inode = file->f_path.dentry->d_inode;
+                       struct address_space *mapping = file->f_mapping;
+
                         get_file(file);
                         if (tmp->vm_flags & VM_DENYWRITE)
                                 atomic_dec(&inode->i_writecount);
-
-                       /* insert tmp into the share list, just after mpnt */
-                       spin_lock(&file->f_mapping->i_mmap_lock);
+                       spin_lock(&mapping->i_mmap_lock);
+                       if (tmp->vm_flags & VM_SHARED)
+                               mapping->i_mmap_writable++;
                         tmp->vm_truncate_count = mpnt->vm_truncate_count;
-                       flush_dcache_mmap_lock(file->f_mapping);
+                       flush_dcache_mmap_lock(mapping);
+                       /* insert tmp into the share list, just after mpnt */
                         vma_prio_tree_add(tmp, mpnt);
-                       flush_dcache_mmap_unlock(file->f_mapping);
-                       spin_unlock(&file->f_mapping->i_mmap_lock);
+                       flush_dcache_mmap_unlock(mapping);
+                       spin_unlock(&mapping->i_mmap_lock);
                 }
  
                 /*
@@ -1398,6 +1401,7 @@ long do_fork(unsigned long clone_flags,
                         init_completion(&vfork);
                 }
  
+               audit_finish_fork(p);
                 tracehook_report_clone(trace, regs, clone_flags, nr, p);
  
                 /*
diff --git a/kernel/latencytop.c b/kernel/latencytop.c

index 5e7b45c569233536ef23dadfafd90e40d20b7f62..449db466bdbc280f1509dad905a72a6a1407d9cb 100644 (file)
--- a/kernel/latencytop.c
+++ b/kernel/latencytop.c
@@ -191,7 +191,7 @@ static int lstats_show(struct seq_file *m, void *v)
                                 latency_record[i].time,
                                 latency_record[i].max);
                         for (q = 0; q < LT_BACKTRACEDEPTH; q++) {
-                               char sym[KSYM_NAME_LEN];
+                               char sym[KSYM_SYMBOL_LEN];
                                 char *c;
                                 if (!latency_record[i].backtrace[q])
                                         break;
diff --git a/kernel/panic.c b/kernel/panic.c

index 6513aac8e9924017bb82fa58a2c8285f7328097b..4d5088355bfefba8956ff5c91cbc4b932d23eff6 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -167,6 +167,7 @@ static const struct tnt tnts[] = {
   *  'M' - System experienced a machine check exception.
   *  'B' - System has hit bad_page.
   *  'U' - Userspace-defined naughtiness.
+ *  'D' - Kernel has oopsed before
   *  'A' - ACPI table overridden.
   *  'W' - Taint on warning.
   *  'C' - modules from drivers/staging are loaded.
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c

index 895337b16a24e7b9df95e8a9306b224bbe000971..4e5288a831de2e696260c12f97d60fdbcfc551a3 100644 (file)
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -311,7 +311,7 @@ static int cpu_clock_sample_group(const clockid_t which_clock,
         struct task_cputime cputime;
  
         thread_group_cputime(p, &cputime);
-       switch (which_clock) {
+       switch (CPUCLOCK_WHICH(which_clock)) {
         default:
                 return -EINVAL;
         case CPUCLOCK_PROF:
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c

index 5e79c662294bf542750af232be67a1e92bed858d..a140e44eebbacbe88b989e98b1bbdc744a99c94f 100644 (file)
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -197,6 +197,11 @@ static int common_timer_create(struct k_itimer *new_timer)
         return 0;
  }
  
+static int no_timer_create(struct k_itimer *new_timer)
+{
+       return -EOPNOTSUPP;
+}
+
  /*
   * Return nonzero if we know a priori this clockid_t value is bogus.
   */
@@ -248,6 +253,7 @@ static __init int init_posix_timers(void)
                 .clock_getres = hrtimer_get_res,
                 .clock_get = posix_get_monotonic_raw,
                 .clock_set = do_posix_clock_nosettime,
+               .timer_create = no_timer_create,
         };
  
         register_posix_clock(CLOCK_REALTIME, &clock_realtime);
diff --git a/kernel/power/swap.c b/kernel/power/swap.c

index b7713b53d07a7a17a97130b81bf9b5946e8f1d29..6da14358537c8779db14f4ccab91a64365270d16 100644 (file)
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -633,7 +633,7 @@ void swsusp_close(fmode_t mode)
                 return;
         }
  
-       blkdev_put(resume_bdev, mode); /* move up */
+       blkdev_put(resume_bdev, mode);
  }
  
  static int swsusp_header_init(void)
diff --git a/kernel/relay.c b/kernel/relay.c

index 32b0befdcb6a6cba585cb555d9db4a87246d9468..09ac2008f77b419a5c169e41f3ddcbab6aa90746 100644 (file)
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -1317,12 +1317,9 @@ static ssize_t relay_file_splice_read(struct file *in,
                 if (ret < 0)
                         break;
                 else if (!ret) {
-                       if (spliced)
-                               break;
-                       if (flags & SPLICE_F_NONBLOCK) {
+                       if (flags & SPLICE_F_NONBLOCK)
                                 ret = -EAGAIN;
-                               break;
-                       }
+                       break;
                 }
  
                 *ppos += ret;
diff --git a/kernel/sched.c b/kernel/sched.c

index b7480fb5c3dc21a7bf6513a978cf0ed2e8c19a8f..e4bb1dd7b308fce6f47e736b70425f4bc3482c0a 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -6587,7 +6587,9 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
                         req = list_entry(rq->migration_queue.next,
                                          struct migration_req, list);
                         list_del_init(&req->list);
+                       spin_unlock_irq(&rq->lock);
                         complete(&req->done);
+                       spin_lock_irq(&rq->lock);
                 }
                 spin_unlock_irq(&rq->lock);
                 break;
diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c

index 81787248b60fda5bc58b6231be84a6a54a763cb0..e8ab096ddfe399dc3007e32b169b46d02ed9cb48 100644 (file)
--- a/kernel/sched_clock.c
+++ b/kernel/sched_clock.c
@@ -118,13 +118,13 @@ static u64 __update_sched_clock(struct sched_clock_data *scd, u64 now)
  
         /*
          * scd->clock = clamp(scd->tick_gtod + delta,
-        *                    max(scd->tick_gtod, scd->clock),
-        *                    max(scd->clock, scd->tick_gtod + TICK_NSEC));
+        *                    max(scd->tick_gtod, scd->clock),
+        *                    scd->tick_gtod + TICK_NSEC);
          */
  
         clock = scd->tick_gtod + delta;
         min_clock = wrap_max(scd->tick_gtod, scd->clock);
-       max_clock = wrap_max(scd->clock, scd->tick_gtod + TICK_NSEC);
+       max_clock = scd->tick_gtod + TICK_NSEC;
  
         clock = wrap_max(clock, min_clock);
         clock = wrap_min(clock, max_clock);
diff --git a/kernel/softlockup.c b/kernel/softlockup.c

index 3953e4aed733d32284f48ecfffa1fbff05e234c6..dc0b3be6b7d52cb98bd84d599bfbb7e7d85b1e85 100644 (file)
--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
@@ -188,7 +188,7 @@ static void check_hung_task(struct task_struct *t, unsigned long now)
         if ((long)(now - t->last_switch_timestamp) <
                                         sysctl_hung_task_timeout_secs)
                 return;
-       if (sysctl_hung_task_warnings < 0)
+       if (!sysctl_hung_task_warnings)
                 return;
         sysctl_hung_task_warnings--;
  
diff --git a/kernel/sysctl.c b/kernel/sysctl.c

index 9d048fa2d902ec2b768633afd4ecbaaafc01ec03..3d56fe7570daede300fe01f2e6571416107b081b 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -176,6 +176,9 @@ extern struct ctl_table random_table[];
  #ifdef CONFIG_INOTIFY_USER
  extern struct ctl_table inotify_table[];
  #endif
+#ifdef CONFIG_EPOLL
+extern struct ctl_table epoll_table[];
+#endif
  
  #ifdef HAVE_ARCH_PICK_MMAP_LAYOUT
  int sysctl_legacy_va_layout;
@@ -1325,6 +1328,13 @@ static struct ctl_table fs_table[] = {
                 .child          = inotify_table,
         },
  #endif 
+#ifdef CONFIG_EPOLL
+       {
+               .procname       = "epoll",
+               .mode           = 0555,
+               .child          = epoll_table,
+       },
+#endif
  #endif
         {
                 .ctl_name       = KERN_SETUID_DUMPABLE,
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c

index e7acfb482a680ea248f5268fbb7f158868938e56..fa05e88aa76f36af2dc5cb0cc26f737466d0a423 100644 (file)
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -518,6 +518,28 @@ void update_wall_time(void)
         /* correct the clock when NTP error is too big */
         clocksource_adjust(offset);
  
+       /*
+        * Since in the loop above, we accumulate any amount of time
+        * in xtime_nsec over a second into xtime.tv_sec, its possible for
+        * xtime_nsec to be fairly small after the loop. Further, if we're
+        * slightly speeding the clocksource up in clocksource_adjust(),
+        * its possible the required corrective factor to xtime_nsec could
+        * cause it to underflow.
+        *
+        * Now, we cannot simply roll the accumulated second back, since
+        * the NTP subsystem has been notified via second_overflow. So
+        * instead we push xtime_nsec forward by the amount we underflowed,
+        * and add that amount into the error.
+        *
+        * We'll correct this error next time through this function, when
+        * xtime_nsec is not as small.
+        */
+       if (unlikely((s64)clock->xtime_nsec < 0)) {
+               s64 neg = -(s64)clock->xtime_nsec;
+               clock->xtime_nsec = 0;
+               clock->error += neg << (NTP_SCALE_SHIFT - clock->shift);
+       }
+
         /* store full nanoseconds into xtime after rounding it up and
          * add the remainder to the error difference.
          */
diff --git a/lib/dynamic_printk.c b/lib/dynamic_printk.c

index d83660fd6fdde53617121f3f72e38b58158126b9..8e30295e8566579515ca8126a694150e290107aa 100644 (file)
--- a/lib/dynamic_printk.c
+++ b/lib/dynamic_printk.c
@@ -135,7 +135,7 @@ int unregister_dynamic_debug_module(char *mod_name)
         nr_entries--;
  out:
         up(&debug_list_mutex);
-       return 0;
+       return ret;
  }
  EXPORT_SYMBOL_GPL(unregister_dynamic_debug_module);
  
@@ -289,7 +289,7 @@ static ssize_t pr_debug_write(struct file *file, const char __user *buf,
                                         dynamic_enabled = DYNAMIC_ENABLED_SOME;
                                         err = 0;
                                         printk(KERN_DEBUG
-                                              "debugging enabled for module %s",
+                                              "debugging enabled for module %s\n",
                                                elem->name);
                                 } else if (!value && (elem->enable == 1)) {
                                         elem->enable = 0;
@@ -309,7 +309,7 @@ static ssize_t pr_debug_write(struct file *file, const char __user *buf,
                                         err = 0;
                                         printk(KERN_DEBUG
                                                "debugging disabled for module "
-                                              "%s", elem->name);
+                                              "%s\n", elem->name);
                                 }
                         }
                 }
diff --git a/lib/idr.c b/lib/idr.c

index e728c7fccc4de0884263cd8055aee977fe748522..1c4f9281f412db349d3a80e0ed51e51f6102027c 100644 (file)
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -185,6 +185,7 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa)
                         new = get_from_free_list(idp);
                         if (!new)
                                 return -1;
+                       new->layer = l-1;
                         rcu_assign_pointer(p->ary[m], new);
                         p->count++;
                 }
@@ -210,6 +211,7 @@ build_up:
         if (unlikely(!p)) {
                 if (!(p = get_from_free_list(idp)))
                         return -1;
+               p->layer = 0;
                 layers = 1;
         }
         /*
@@ -218,8 +220,14 @@ build_up:
          */
         while ((layers < (MAX_LEVEL - 1)) && (id >= (1 << (layers*IDR_BITS)))) {
                 layers++;
-               if (!p->count)
+               if (!p->count) {
+                       /* special case: if the tree is currently empty,
+                        * then we grow the tree by moving the top node
+                        * upwards.
+                        */
+                       p->layer++;
                         continue;
+               }
                 if (!(new = get_from_free_list(idp))) {
                         /*
                          * The allocation failed.  If we built part of
@@ -237,6 +245,7 @@ build_up:
                 }
                 new->ary[0] = p;
                 new->count = 1;
+               new->layer = layers-1;
                 if (p->bitmap == IDR_FULL)
                         __set_bit(0, &new->bitmap);
                 p = new;
@@ -493,17 +502,21 @@ void *idr_find(struct idr *idp, int id)
         int n;
         struct idr_layer *p;
  
-       n = idp->layers * IDR_BITS;
         p = rcu_dereference(idp->top);
+       if (!p)
+               return NULL;
+       n = (p->layer+1) * IDR_BITS;
  
         /* Mask off upper bits we don't use for the search. */
         id &= MAX_ID_MASK;
  
         if (id >= (1 << n))
                 return NULL;
+       BUG_ON(n == 0);
  
         while (n > 0 && p) {
                 n -= IDR_BITS;
+               BUG_ON(n != p->layer*IDR_BITS);
                 p = rcu_dereference(p->ary[(id >> n) & IDR_MASK]);
         }
         return((void *)p);
@@ -582,8 +595,11 @@ void *idr_replace(struct idr *idp, void *ptr, int id)
         int n;
         struct idr_layer *p, *old_p;
  
-       n = idp->layers * IDR_BITS;
         p = idp->top;
+       if (!p)
+               return ERR_PTR(-EINVAL);
+
+       n = (p->layer+1) * IDR_BITS;
  
         id &= MAX_ID_MASK;
  
diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c

index a8663890a88c2e358f21b8cdc6f23a8ebb9d77e5..b255b939bc1b85bd4fc385df4e1322e9472b2b26 100644 (file)
--- a/lib/percpu_counter.c
+++ b/lib/percpu_counter.c
@@ -62,10 +62,7 @@ s64 __percpu_counter_sum(struct percpu_counter *fbc)
         for_each_online_cpu(cpu) {
                 s32 *pcount = per_cpu_ptr(fbc->counters, cpu);
                 ret += *pcount;
-               *pcount = 0;
         }
-       fbc->count = ret;
-
         spin_unlock(&fbc->lock);
         return ret;
  }
@@ -104,13 +101,13 @@ void percpu_counter_destroy(struct percpu_counter *fbc)
         if (!fbc->counters)
                 return;
  
-       free_percpu(fbc->counters);
-       fbc->counters = NULL;
  #ifdef CONFIG_HOTPLUG_CPU
         mutex_lock(&percpu_counters_lock);
         list_del(&fbc->list);
         mutex_unlock(&percpu_counters_lock);
  #endif
+       free_percpu(fbc->counters);
+       fbc->counters = NULL;
  }
  EXPORT_SYMBOL(percpu_counter_destroy);
  
diff --git a/mm/backing-dev.c b/mm/backing-dev.c

index f2e574dbc30089d778880d2ad178d5dd48174034..801c08b046e6cc0f1a12740dc74fed16ff018fe6 100644 (file)
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -176,6 +176,9 @@ int bdi_register(struct backing_dev_info *bdi, struct device *parent,
         int ret = 0;
         struct device *dev;
  
+       if (bdi->dev)   /* The driver needs to use separate queues per device */
+               goto exit;
+
         va_start(args, fmt);
         dev = device_create_vargs(bdi_class, parent, MKDEV(0, 0), bdi, fmt, args);
         va_end(args);
diff --git a/mm/migrate.c b/mm/migrate.c

index 1e0d6b237f4418c2f8b8ca50e88d85a787adc0a7..037b0967c1e3b40cda18e57a775d61867bafb95f 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -987,25 +987,18 @@ out:
  /*
   * Determine the nodes of an array of pages and store it in an array of status.
   */
-static int do_pages_stat(struct mm_struct *mm, unsigned long nr_pages,
-                        const void __user * __user *pages,
-                        int __user *status)
+static void do_pages_stat_array(struct mm_struct *mm, unsigned long nr_pages,
+                               const void __user **pages, int *status)
  {
         unsigned long i;
-       int err;
  
         down_read(&mm->mmap_sem);
  
         for (i = 0; i < nr_pages; i++) {
-               const void __user *p;
-               unsigned long addr;
+               unsigned long addr = (unsigned long)(*pages);
                 struct vm_area_struct *vma;
                 struct page *page;
-
-               err = -EFAULT;
-               if (get_user(p, pages+i))
-                       goto out;
-               addr = (unsigned long) p;
+               int err = -EFAULT;
  
                 vma = find_vma(mm, addr);
                 if (!vma)
@@ -1024,12 +1017,52 @@ static int do_pages_stat(struct mm_struct *mm, unsigned long nr_pages,
  
                 err = page_to_nid(page);
  set_status:
-               put_user(err, status+i);
+               *status = err;
+
+               pages++;
+               status++;
+       }
+
+       up_read(&mm->mmap_sem);
+}
+
+/*
+ * Determine the nodes of a user array of pages and store it in
+ * a user array of status.
+ */
+static int do_pages_stat(struct mm_struct *mm, unsigned long nr_pages,
+                        const void __user * __user *pages,
+                        int __user *status)
+{
+#define DO_PAGES_STAT_CHUNK_NR 16
+       const void __user *chunk_pages[DO_PAGES_STAT_CHUNK_NR];
+       int chunk_status[DO_PAGES_STAT_CHUNK_NR];
+       unsigned long i, chunk_nr = DO_PAGES_STAT_CHUNK_NR;
+       int err;
+
+       for (i = 0; i < nr_pages; i += chunk_nr) {
+               if (chunk_nr + i > nr_pages)
+                       chunk_nr = nr_pages - i;
+
+               err = copy_from_user(chunk_pages, &pages[i],
+                                    chunk_nr * sizeof(*chunk_pages));
+               if (err) {
+                       err = -EFAULT;
+                       goto out;
+               }
+
+               do_pages_stat_array(mm, chunk_nr, chunk_pages, chunk_status);
+
+               err = copy_to_user(&status[i], chunk_status,
+                                  chunk_nr * sizeof(*chunk_status));
+               if (err) {
+                       err = -EFAULT;
+                       goto out;
+               }
         }
         err = 0;
  
  out:
-       up_read(&mm->mmap_sem);
         return err;
  }
  
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c

index 436c00229e703f2d588e5064cb13592b9df014b3..ab27ff75051958fb992417ddcf675a296b96176e 100644 (file)
--- a/mm/page_cgroup.c
+++ b/mm/page_cgroup.c
@@ -49,6 +49,9 @@ static int __init alloc_node_page_cgroup(int nid)
         start_pfn = NODE_DATA(nid)->node_start_pfn;
         nr_pages = NODE_DATA(nid)->node_spanned_pages;
  
+       if (!nr_pages)
+               return 0;
+
         table_size = sizeof(struct page_cgroup) * nr_pages;
  
         base = __alloc_bootmem_node_nopanic(NODE_DATA(nid),
@@ -107,19 +110,29 @@ int __init_refok init_section_page_cgroup(unsigned long pfn)
  
         section = __pfn_to_section(pfn);
  
-       if (section->page_cgroup)
-               return 0;
-
-       nid = page_to_nid(pfn_to_page(pfn));
-
-       table_size = sizeof(struct page_cgroup) * PAGES_PER_SECTION;
-       if (slab_is_available()) {
-               base = kmalloc_node(table_size, GFP_KERNEL, nid);
-               if (!base)
-                       base = vmalloc_node(table_size, nid);
-       } else {
-               base = __alloc_bootmem_node_nopanic(NODE_DATA(nid), table_size,
+       if (!section->page_cgroup) {
+               nid = page_to_nid(pfn_to_page(pfn));
+               table_size = sizeof(struct page_cgroup) * PAGES_PER_SECTION;
+               if (slab_is_available()) {
+                       base = kmalloc_node(table_size, GFP_KERNEL, nid);
+                       if (!base)
+                               base = vmalloc_node(table_size, nid);
+               } else {
+                       base = __alloc_bootmem_node_nopanic(NODE_DATA(nid),
+                               table_size,
                                 PAGE_SIZE, __pa(MAX_DMA_ADDRESS));
+               }
+       } else {
+               /*
+                * We don't have to allocate page_cgroup again, but
+                * address of memmap may be changed. So, we have to initialize
+                * again.
+                */
+               base = section->page_cgroup + pfn;
+               table_size = 0;
+               /* check address of memmap is changed or not. */
+               if (base->page == pfn_to_page(pfn))
+                       return 0;
         }
  
         if (!base) {
@@ -208,18 +221,23 @@ static int __meminit page_cgroup_callback(struct notifier_block *self,
                 ret = online_page_cgroup(mn->start_pfn,
                                    mn->nr_pages, mn->status_change_nid);
                 break;
-       case MEM_CANCEL_ONLINE:
         case MEM_OFFLINE:
                 offline_page_cgroup(mn->start_pfn,
                                 mn->nr_pages, mn->status_change_nid);
                 break;
+       case MEM_CANCEL_ONLINE:
         case MEM_GOING_OFFLINE:
                 break;
         case MEM_ONLINE:
         case MEM_CANCEL_OFFLINE:
                 break;
         }
-       ret = notifier_from_errno(ret);
+
+       if (ret)
+               ret = notifier_from_errno(ret);
+       else
+               ret = NOTIFY_OK;
+
         return ret;
  }
  
diff --git a/mm/slob.c b/mm/slob.c

index cb675d1267914dc263100b9c4a9ea5eb20fefa48..bf7e8fc3aed806542e44cc7b1d222d9e2b56dc3a 100644 (file)
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -535,7 +535,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
         struct kmem_cache *c;
  
         c = slob_alloc(sizeof(struct kmem_cache),
-               flags, ARCH_KMALLOC_MINALIGN, -1);
+               GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);
  
         if (c) {
                 c->name = name;
diff --git a/mm/slub.c b/mm/slub.c

index 7ad489af95614602a2f5fec8756460108a1f6be1..a2cd47d89e0aa1f159d8e9e6ed2dcee32969068f 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2931,8 +2931,10 @@ static int slab_memory_callback(struct notifier_block *self,
         case MEM_CANCEL_OFFLINE:
                 break;
         }
-
-       ret = notifier_from_errno(ret);
+       if (ret)
+               ret = notifier_from_errno(ret);
+       else
+               ret = NOTIFY_OK;
         return ret;
  }
  
@@ -3595,7 +3597,7 @@ static int list_locations(struct kmem_cache *s, char *buf,
         for (i = 0; i < t.count; i++) {
                 struct location *l = &t.loc[i];
  
-               if (len > PAGE_SIZE - 100)
+               if (len > PAGE_SIZE - KSYM_SYMBOL_LEN - 100)
                         break;
                 len += sprintf(buf + len, "%7ld ", l->count);
  
diff --git a/mm/swap.c b/mm/swap.c

index 2152e48a7b8f0726f06a88c516d82a0becf3c19d..b135ec90cdeb92673e2e97389f7cf9afc3ae80c9 100644 (file)
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -299,7 +299,6 @@ void lru_add_drain(void)
         put_cpu();
  }
  
-#if defined(CONFIG_NUMA) || defined(CONFIG_UNEVICTABLE_LRU)
  static void lru_add_drain_per_cpu(struct work_struct *dummy)
  {
         lru_add_drain();
@@ -313,18 +312,6 @@ int lru_add_drain_all(void)
         return schedule_on_each_cpu(lru_add_drain_per_cpu);
  }
  
-#else
-
-/*
- * Returns 0 for success
- */
-int lru_add_drain_all(void)
-{
-       lru_add_drain();
-       return 0;
-}
-#endif
-
  /*
   * Batched page_cache_release().  Decrement the reference count on all the
   * passed pages.  If it fell to zero then remove the page from the LRU and
@@ -445,6 +432,7 @@ void ____pagevec_lru_add(struct pagevec *pvec, enum lru_list lru)
         for (i = 0; i < pagevec_count(pvec); i++) {
                 struct page *page = pvec->pages[i];
                 struct zone *pagezone = page_zone(page);
+               int file;
  
                 if (pagezone != zone) {
                         if (zone)
@@ -456,8 +444,12 @@ void ____pagevec_lru_add(struct pagevec *pvec, enum lru_list lru)
                 VM_BUG_ON(PageUnevictable(page));
                 VM_BUG_ON(PageLRU(page));
                 SetPageLRU(page);
-               if (is_active_lru(lru))
+               file = is_file_lru(lru);
+               zone->recent_scanned[file]++;
+               if (is_active_lru(lru)) {
                         SetPageActive(page);
+                       zone->recent_rotated[file]++;
+               }
                 add_page_to_lru_list(zone, page, lru);
         }
         if (zone)
diff --git a/mm/vmalloc.c b/mm/vmalloc.c

index 30f826d484f0b935af18a793f7fe49b65903025e..1ddb77ba3995c2d8f486baf32c1409b3daf8093f 100644 (file)
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -77,7 +77,6 @@ static void vunmap_page_range(unsigned long addr, unsigned long end)
  
         BUG_ON(addr >= end);
         pgd = pgd_offset_k(addr);
-       flush_cache_vunmap(addr, end);
         do {
                 next = pgd_addr_end(addr, end);
                 if (pgd_none_or_clear_bad(pgd))
@@ -543,9 +542,10 @@ static void purge_vmap_area_lazy(void)
  }
  
  /*
- * Free and unmap a vmap area
+ * Free and unmap a vmap area, caller ensuring flush_cache_vunmap had been
+ * called for the correct range previously.
   */
-static void free_unmap_vmap_area(struct vmap_area *va)
+static void free_unmap_vmap_area_noflush(struct vmap_area *va)
  {
         va->flags |= VM_LAZY_FREE;
         atomic_add((va->va_end - va->va_start) >> PAGE_SHIFT, &vmap_lazy_nr);
@@ -553,6 +553,15 @@ static void free_unmap_vmap_area(struct vmap_area *va)
                 try_purge_vmap_area_lazy();
  }
  
+/*
+ * Free and unmap a vmap area
+ */
+static void free_unmap_vmap_area(struct vmap_area *va)
+{
+       flush_cache_vunmap(va->va_start, va->va_end);
+       free_unmap_vmap_area_noflush(va);
+}
+
  static struct vmap_area *find_vmap_area(unsigned long addr)
  {
         struct vmap_area *va;
@@ -734,7 +743,7 @@ static void free_vmap_block(struct vmap_block *vb)
         spin_unlock(&vmap_block_tree_lock);
         BUG_ON(tmp != vb);
  
-       free_unmap_vmap_area(vb->va);
+       free_unmap_vmap_area_noflush(vb->va);
         call_rcu(&vb->rcu_head, rcu_free_vb);
  }
  
@@ -796,6 +805,9 @@ static void vb_free(const void *addr, unsigned long size)
  
         BUG_ON(size & ~PAGE_MASK);
         BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC);
+
+       flush_cache_vunmap((unsigned long)addr, (unsigned long)addr + size);
+
         order = get_order(size);
  
         offset = (unsigned long)addr & (VMAP_BLOCK_SIZE - 1);
@@ -1705,7 +1717,7 @@ static int s_show(struct seq_file *m, void *p)
                 v->addr, v->addr + v->size, v->size);
  
         if (v->caller) {
-               char buff[2 * KSYM_NAME_LEN];
+               char buff[KSYM_SYMBOL_LEN];
  
                 seq_putc(m, ' ');
                 sprint_symbol(buff, (unsigned long)v->caller);
diff --git a/net/atm/svc.c b/net/atm/svc.c

index de1e4f2f3a43ea983f9a4eef973618772b69cc82..8fb54dc870b393d61373e308dfa8bec722d591a5 100644 (file)
--- a/net/atm/svc.c
+++ b/net/atm/svc.c
@@ -293,7 +293,10 @@ static int svc_listen(struct socket *sock,int backlog)
                 error = -EINVAL;
                 goto out;
         }
-       vcc_insert_socket(sk);
+       if (test_bit(ATM_VF_LISTEN, &vcc->flags)) {
+               error = -EADDRINUSE;
+               goto out;
+        }
         set_bit(ATM_VF_WAITING, &vcc->flags);
         prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE);
         sigd_enq(vcc,as_listen,NULL,NULL,&vcc->local);
@@ -307,6 +310,7 @@ static int svc_listen(struct socket *sock,int backlog)
                 goto out;
         }
         set_bit(ATM_VF_LISTEN,&vcc->flags);
+       vcc_insert_socket(sk);
         sk->sk_max_ack_backlog = backlog > 0 ? backlog : ATM_BACKLOG_DEFAULT;
         error = -sk->sk_err;
  out:
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c

index ba537fae0a4ca653b4a7eedb7b941deb8aef613b..ce68e046d963840e4a3822972ed33f2a30a86244 100644 (file)
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -1786,8 +1786,6 @@ static inline void rfcomm_accept_connection(struct rfcomm_session *s)
         if (err < 0)
                 return;
  
-       __module_get(nsock->ops->owner);
-
         /* Set our callbacks */
         nsock->sk->sk_data_ready   = rfcomm_l2data_ready;
         nsock->sk->sk_state_change = rfcomm_l2state_change;
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c

index fa5cda4e552ab0088901a2820f4267d31b303030..45f61c348e369c7a78d2fd91d8a14fb1ea75b7e5 100644 (file)
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -101,6 +101,18 @@ static inline __be16 pppoe_proto(const struct sk_buff *skb)
          pppoe_proto(skb) == htons(PPP_IPV6) && \
          brnf_filter_pppoe_tagged)
  
+static void fake_update_pmtu(struct dst_entry *dst, u32 mtu)
+{
+}
+
+static struct dst_ops fake_dst_ops = {
+       .family =               AF_INET,
+       .protocol =             __constant_htons(ETH_P_IP),
+       .update_pmtu =          fake_update_pmtu,
+       .entry_size =           sizeof(struct rtable),
+       .entries =              ATOMIC_INIT(0),
+};
+
  /*
   * Initialize bogus route table used to keep netfilter happy.
   * Currently, we fill in the PMTU entry because netfilter
@@ -117,6 +129,7 @@ void br_netfilter_rtable_init(struct net_bridge *br)
         rt->u.dst.path = &rt->u.dst;
         rt->u.dst.metrics[RTAX_MTU - 1] = 1500;
         rt->u.dst.flags = DST_NOXFRM;
+       rt->u.dst.ops = &fake_dst_ops;
  }
  
  static inline struct rtable *bridge_parent_rtable(const struct net_device *dev)
diff --git a/net/can/af_can.c b/net/can/af_can.c

index 7d4d2b3c137ef6b84598d9bebd50b1a69dfaf707..3dadb338addd3ab36212333281ab377362a7e56f 100644 (file)
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -319,23 +319,52 @@ static struct dev_rcv_lists *find_dev_rcv_lists(struct net_device *dev)
         return n ? d : NULL;
  }
  
+/**
+ * find_rcv_list - determine optimal filterlist inside device filter struct
+ * @can_id: pointer to CAN identifier of a given can_filter
+ * @mask: pointer to CAN mask of a given can_filter
+ * @d: pointer to the device filter struct
+ *
+ * Description:
+ *  Returns the optimal filterlist to reduce the filter handling in the
+ *  receive path. This function is called by service functions that need
+ *  to register or unregister a can_filter in the filter lists.
+ *
+ *  A filter matches in general, when
+ *
+ *          <received_can_id> & mask == can_id & mask
+ *
+ *  so every bit set in the mask (even CAN_EFF_FLAG, CAN_RTR_FLAG) describe
+ *  relevant bits for the filter.
+ *
+ *  The filter can be inverted (CAN_INV_FILTER bit set in can_id) or it can
+ *  filter for error frames (CAN_ERR_FLAG bit set in mask). For error frames
+ *  there is a special filterlist and a special rx path filter handling.
+ *
+ * Return:
+ *  Pointer to optimal filterlist for the given can_id/mask pair.
+ *  Constistency checked mask.
+ *  Reduced can_id to have a preprocessed filter compare value.
+ */
  static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask,
                                         struct dev_rcv_lists *d)
  {
         canid_t inv = *can_id & CAN_INV_FILTER; /* save flag before masking */
  
-       /* filter error frames */
+       /* filter for error frames in extra filterlist */
         if (*mask & CAN_ERR_FLAG) {
-               /* clear CAN_ERR_FLAG in list entry */
+               /* clear CAN_ERR_FLAG in filter entry */
                 *mask &= CAN_ERR_MASK;
                 return &d->rx[RX_ERR];
         }
  
-       /* ensure valid values in can_mask */
-       if (*mask & CAN_EFF_FLAG)
-               *mask &= (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG);
-       else
-               *mask &= (CAN_SFF_MASK | CAN_RTR_FLAG);
+       /* with cleared CAN_ERR_FLAG we have a simple mask/value filterpair */
+
+#define CAN_EFF_RTR_FLAGS (CAN_EFF_FLAG | CAN_RTR_FLAG)
+
+       /* ensure valid values in can_mask for 'SFF only' frame filtering */
+       if ((*mask & CAN_EFF_FLAG) && !(*can_id & CAN_EFF_FLAG))
+               *mask &= (CAN_SFF_MASK | CAN_EFF_RTR_FLAGS);
  
         /* reduce condition testing at receive time */
         *can_id &= *mask;
@@ -348,15 +377,19 @@ static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask,
         if (!(*mask))
                 return &d->rx[RX_ALL];
  
-       /* use extra filterset for the subscription of exactly *ONE* can_id */
-       if (*can_id & CAN_EFF_FLAG) {
-               if (*mask == (CAN_EFF_MASK | CAN_EFF_FLAG)) {
-                       /* RFC: a use-case for hash-tables in the future? */
-                       return &d->rx[RX_EFF];
+       /* extra filterlists for the subscription of a single non-RTR can_id */
+       if (((*mask & CAN_EFF_RTR_FLAGS) == CAN_EFF_RTR_FLAGS)
+           && !(*can_id & CAN_RTR_FLAG)) {
+
+               if (*can_id & CAN_EFF_FLAG) {
+                       if (*mask == (CAN_EFF_MASK | CAN_EFF_RTR_FLAGS)) {
+                               /* RFC: a future use-case for hash-tables? */
+                               return &d->rx[RX_EFF];
+                       }
+               } else {
+                       if (*mask == (CAN_SFF_MASK | CAN_EFF_RTR_FLAGS))
+                               return &d->rx_sff[*can_id];
                 }
-       } else {
-               if (*mask == CAN_SFF_MASK)
-                       return &d->rx_sff[*can_id];
         }
  
         /* default: filter via can_id/can_mask */
@@ -589,7 +622,10 @@ static int can_rcv_filter(struct dev_rcv_lists *d, struct sk_buff *skb)
                 }
         }
  
-       /* check CAN_ID specific entries */
+       /* check filterlists for single non-RTR can_ids */
+       if (can_id & CAN_RTR_FLAG)
+               return matches;
+
         if (can_id & CAN_EFF_FLAG) {
                 hlist_for_each_entry_rcu(r, n, &d->rx[RX_EFF], list) {
                         if (r->can_id == can_id) {
diff --git a/net/can/bcm.c b/net/can/bcm.c

index d0dd382001e210c052e2fcb1ca6ae304d72b46a1..da0d426c0ce473f53450c65690a7bfe4a3e79f42 100644 (file)
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -64,10 +64,11 @@
  #define BCM_CAN_DLC_MASK 0x0F /* clean private flags in can_dlc by masking */
  
  /* get best masking value for can_rx_register() for a given single can_id */
-#define REGMASK(id) ((id & CAN_RTR_FLAG) | ((id & CAN_EFF_FLAG) ? \
-                       (CAN_EFF_MASK | CAN_EFF_FLAG) : CAN_SFF_MASK))
+#define REGMASK(id) ((id & CAN_EFF_FLAG) ? \
+                    (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG) : \
+                    (CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG))
  
-#define CAN_BCM_VERSION "20080415"
+#define CAN_BCM_VERSION CAN_VERSION
  static __initdata const char banner[] = KERN_INFO
         "can: broadcast manager protocol (rev " CAN_BCM_VERSION ")\n";
  
diff --git a/net/core/netpoll.c b/net/core/netpoll.c

index 6c7af390be0a515cfb1d09d2db79f16776e0dbe4..dadac6281f20392d0431d80a9001a6169ab94ca7 100644 (file)
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -133,9 +133,11 @@ static int poll_one_napi(struct netpoll_info *npinfo,
  
         npinfo->rx_flags |= NETPOLL_RX_DROP;
         atomic_inc(&trapped);
+       set_bit(NAPI_STATE_NPSVC, &napi->state);
  
         work = napi->poll(napi, budget);
  
+       clear_bit(NAPI_STATE_NPSVC, &napi->state);
         atomic_dec(&trapped);
         npinfo->rx_flags &= ~NETPOLL_RX_DROP;
  
diff --git a/net/core/skbuff.c b/net/core/skbuff.c

index d49ef8301b5bd5de20d1b8a6e57aa5144ffff28a..65f7757465bd2ed8b99c2a0934c8e5dc32c73b00 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -149,7 +149,7 @@ void skb_under_panic(struct sk_buff *skb, int sz, void *here)
  
  void skb_truesize_bug(struct sk_buff *skb)
  {
-       printk(KERN_ERR "SKB BUG: Invalid truesize (%u) "
+       WARN(net_ratelimit(), KERN_ERR "SKB BUG: Invalid truesize (%u) "
                "len=%u, sizeof(sk_buff)=%Zd\n",
                skb->truesize, skb->len, sizeof(struct sk_buff));
  }
diff --git a/net/core/sock.c b/net/core/sock.c

index 341e39456952abc106b9b7c9ec5eaa04e8de208f..edf7220889a4b75f1e1671c39aeef8c31351387b 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2035,9 +2035,6 @@ static inline void release_proto_idx(struct proto *prot)
  
  int proto_register(struct proto *prot, int alloc_slab)
  {
-       char *request_sock_slab_name = NULL;
-       char *timewait_sock_slab_name;
-
         if (alloc_slab) {
                 prot->slab = kmem_cache_create(prot->name, prot->obj_size, 0,
                                                SLAB_HWCACHE_ALIGN, NULL);
@@ -2051,12 +2048,12 @@ int proto_register(struct proto *prot, int alloc_slab)
                 if (prot->rsk_prot != NULL) {
                         static const char mask[] = "request_sock_%s";
  
-                       request_sock_slab_name = kmalloc(strlen(prot->name) + sizeof(mask) - 1, GFP_KERNEL);
-                       if (request_sock_slab_name == NULL)
+                       prot->rsk_prot->slab_name = kmalloc(strlen(prot->name) + sizeof(mask) - 1, GFP_KERNEL);
+                       if (prot->rsk_prot->slab_name == NULL)
                                 goto out_free_sock_slab;
  
-                       sprintf(request_sock_slab_name, mask, prot->name);
-                       prot->rsk_prot->slab = kmem_cache_create(request_sock_slab_name,
+                       sprintf(prot->rsk_prot->slab_name, mask, prot->name);
+                       prot->rsk_prot->slab = kmem_cache_create(prot->rsk_prot->slab_name,
                                                                  prot->rsk_prot->obj_size, 0,
                                                                  SLAB_HWCACHE_ALIGN, NULL);
  
@@ -2070,14 +2067,14 @@ int proto_register(struct proto *prot, int alloc_slab)
                 if (prot->twsk_prot != NULL) {
                         static const char mask[] = "tw_sock_%s";
  
-                       timewait_sock_slab_name = kmalloc(strlen(prot->name) + sizeof(mask) - 1, GFP_KERNEL);
+                       prot->twsk_prot->twsk_slab_name = kmalloc(strlen(prot->name) + sizeof(mask) - 1, GFP_KERNEL);
  
-                       if (timewait_sock_slab_name == NULL)
+                       if (prot->twsk_prot->twsk_slab_name == NULL)
                                 goto out_free_request_sock_slab;
  
-                       sprintf(timewait_sock_slab_name, mask, prot->name);
+                       sprintf(prot->twsk_prot->twsk_slab_name, mask, prot->name);
                         prot->twsk_prot->twsk_slab =
-                               kmem_cache_create(timewait_sock_slab_name,
+                               kmem_cache_create(prot->twsk_prot->twsk_slab_name,
                                                   prot->twsk_prot->twsk_obj_size,
                                                   0, SLAB_HWCACHE_ALIGN,
                                                   NULL);
@@ -2093,14 +2090,14 @@ int proto_register(struct proto *prot, int alloc_slab)
         return 0;
  
  out_free_timewait_sock_slab_name:
-       kfree(timewait_sock_slab_name);
+       kfree(prot->twsk_prot->twsk_slab_name);
  out_free_request_sock_slab:
         if (prot->rsk_prot && prot->rsk_prot->slab) {
                 kmem_cache_destroy(prot->rsk_prot->slab);
                 prot->rsk_prot->slab = NULL;
         }
  out_free_request_sock_slab_name:
-       kfree(request_sock_slab_name);
+       kfree(prot->rsk_prot->slab_name);
  out_free_sock_slab:
         kmem_cache_destroy(prot->slab);
         prot->slab = NULL;
@@ -2123,18 +2120,14 @@ void proto_unregister(struct proto *prot)
         }
  
         if (prot->rsk_prot != NULL && prot->rsk_prot->slab != NULL) {
-               const char *name = kmem_cache_name(prot->rsk_prot->slab);
-
                 kmem_cache_destroy(prot->rsk_prot->slab);
-               kfree(name);
+               kfree(prot->rsk_prot->slab_name);
                 prot->rsk_prot->slab = NULL;
         }
  
         if (prot->twsk_prot != NULL && prot->twsk_prot->twsk_slab != NULL) {
-               const char *name = kmem_cache_name(prot->twsk_prot->twsk_slab);
-
                 kmem_cache_destroy(prot->twsk_prot->twsk_slab);
-               kfree(name);
+               kfree(prot->twsk_prot->twsk_slab_name);
                 prot->twsk_prot->twsk_slab = NULL;
         }
  }
diff --git a/net/ipv4/netfilter/nf_nat_rule.c b/net/ipv4/netfilter/nf_nat_rule.c

index bea54a685109ed3b6fa1fe3f621fb7522ceb2de8..8d489e746b21cb513d0d1b49b3984b514f6e634c 100644 (file)
--- a/net/ipv4/netfilter/nf_nat_rule.c
+++ b/net/ipv4/netfilter/nf_nat_rule.c
@@ -61,7 +61,7 @@ static struct
  static struct xt_table nat_table = {
         .name           = "nat",
         .valid_hooks    = NAT_VALID_HOOKS,
-       .lock           = __RW_LOCK_UNLOCKED(__nat_table.lock),
+       .lock           = __RW_LOCK_UNLOCKED(nat_table.lock),
         .me             = THIS_MODULE,
         .af             = AF_INET,
  };
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c

index ba85d8831893183b6f72053f5b4952a54cdf0ba5..fe3b4bdfd2516d6cfd5297354b7046bf4c97d8e3 100644 (file)
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1028,10 +1028,6 @@ unsigned int tcp_sync_mss(struct sock *sk, u32 pmtu)
  
  /* Compute the current effective MSS, taking SACKs and IP options,
   * and even PMTU discovery events into account.
- *
- * LARGESEND note: !tcp_urg_mode is overkill, only frames up to snd_up
- * cannot be large. However, taking into account rare use of URG, this
- * is not a big flaw.
   */
  unsigned int tcp_current_mss(struct sock *sk, int large_allowed)
  {
@@ -1046,7 +1042,7 @@ unsigned int tcp_current_mss(struct sock *sk, int large_allowed)
  
         mss_now = tp->mss_cache;
  
-       if (large_allowed && sk_can_gso(sk) && !tcp_urg_mode(tp))
+       if (large_allowed && sk_can_gso(sk))
                 doing_tso = 1;
  
         if (dst) {
@@ -1516,6 +1512,10 @@ static int tcp_mtu_probe(struct sock *sk)
   * send_head.  This happens as incoming acks open up the remote
   * window for us.
   *
+ * LARGESEND note: !tcp_urg_mode is overkill, only frames between
+ * snd_up-64k-mss .. snd_up cannot be large. However, taking into
+ * account rare use of URG, this is not a big flaw.
+ *
   * Returns 1, if no segments are in flight and we have queued segments, but
   * cannot send anything now because of SWS or another problem.
   */
@@ -1567,7 +1567,7 @@ static int tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle)
                 }
  
                 limit = mss_now;
-               if (tso_segs > 1)
+               if (tso_segs > 1 && !tcp_urg_mode(tp))
                         limit = tcp_mss_split_point(sk, skb, mss_now,
                                                     cwnd_quota);
  
@@ -1616,6 +1616,7 @@ void __tcp_push_pending_frames(struct sock *sk, unsigned int cur_mss,
   */
  void tcp_push_one(struct sock *sk, unsigned int mss_now)
  {
+       struct tcp_sock *tp = tcp_sk(sk);
         struct sk_buff *skb = tcp_send_head(sk);
         unsigned int tso_segs, cwnd_quota;
  
@@ -1630,7 +1631,7 @@ void tcp_push_one(struct sock *sk, unsigned int mss_now)
                 BUG_ON(!tso_segs);
  
                 limit = mss_now;
-               if (tso_segs > 1)
+               if (tso_segs > 1 && !tcp_urg_mode(tp))
                         limit = tcp_mss_split_point(sk, skb, mss_now,
                                                     cwnd_quota);
  
diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c

index 14504dada1166d57f36f3f603c5fbe5fbd0bfc95..a453aac91bd3b740ef44363ef10e5be5390bf6dc 100644 (file)
--- a/net/ipv4/tcp_vegas.c
+++ b/net/ipv4/tcp_vegas.c
@@ -40,18 +40,14 @@
  
  #include "tcp_vegas.h"
  
-/* Default values of the Vegas variables, in fixed-point representation
- * with V_PARAM_SHIFT bits to the right of the binary point.
- */
-#define V_PARAM_SHIFT 1
-static int alpha = 2<<V_PARAM_SHIFT;
-static int beta  = 4<<V_PARAM_SHIFT;
-static int gamma = 1<<V_PARAM_SHIFT;
+static int alpha = 2;
+static int beta  = 4;
+static int gamma = 1;
  
  module_param(alpha, int, 0644);
-MODULE_PARM_DESC(alpha, "lower bound of packets in network (scale by 2)");
+MODULE_PARM_DESC(alpha, "lower bound of packets in network");
  module_param(beta, int, 0644);
-MODULE_PARM_DESC(beta, "upper bound of packets in network (scale by 2)");
+MODULE_PARM_DESC(beta, "upper bound of packets in network");
  module_param(gamma, int, 0644);
  MODULE_PARM_DESC(gamma, "limit on increase (scale by 2)");
  
@@ -172,49 +168,13 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
                 return;
         }
  
-       /* The key players are v_beg_snd_una and v_beg_snd_nxt.
-        *
-        * These are so named because they represent the approximate values
-        * of snd_una and snd_nxt at the beginning of the current RTT. More
-        * precisely, they represent the amount of data sent during the RTT.
-        * At the end of the RTT, when we receive an ACK for v_beg_snd_nxt,
-        * we will calculate that (v_beg_snd_nxt - v_beg_snd_una) outstanding
-        * bytes of data have been ACKed during the course of the RTT, giving
-        * an "actual" rate of:
-        *
-        *     (v_beg_snd_nxt - v_beg_snd_una) / (rtt duration)
-        *
-        * Unfortunately, v_beg_snd_una is not exactly equal to snd_una,
-        * because delayed ACKs can cover more than one segment, so they
-        * don't line up nicely with the boundaries of RTTs.
-        *
-        * Another unfortunate fact of life is that delayed ACKs delay the
-        * advance of the left edge of our send window, so that the number
-        * of bytes we send in an RTT is often less than our cwnd will allow.
-        * So we keep track of our cwnd separately, in v_beg_snd_cwnd.
-        */
-
         if (after(ack, vegas->beg_snd_nxt)) {
                 /* Do the Vegas once-per-RTT cwnd adjustment. */
-               u32 old_wnd, old_snd_cwnd;
-
-
-               /* Here old_wnd is essentially the window of data that was
-                * sent during the previous RTT, and has all
-                * been acknowledged in the course of the RTT that ended
-                * with the ACK we just received. Likewise, old_snd_cwnd
-                * is the cwnd during the previous RTT.
-                */
-               old_wnd = (vegas->beg_snd_nxt - vegas->beg_snd_una) /
-                       tp->mss_cache;
-               old_snd_cwnd = vegas->beg_snd_cwnd;
  
                 /* Save the extent of the current window so we can use this
                  * at the end of the next RTT.
                  */
-               vegas->beg_snd_una  = vegas->beg_snd_nxt;
                 vegas->beg_snd_nxt  = tp->snd_nxt;
-               vegas->beg_snd_cwnd = tp->snd_cwnd;
  
                 /* We do the Vegas calculations only if we got enough RTT
                  * samples that we can be reasonably sure that we got
@@ -252,22 +212,14 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
                          *
                          * This is:
                          *     (actual rate in segments) * baseRTT
-                        * We keep it as a fixed point number with
-                        * V_PARAM_SHIFT bits to the right of the binary point.
                          */
-                       target_cwnd = ((u64)old_wnd * vegas->baseRTT);
-                       target_cwnd <<= V_PARAM_SHIFT;
-                       do_div(target_cwnd, rtt);
+                       target_cwnd = tp->snd_cwnd * vegas->baseRTT / rtt;
  
                         /* Calculate the difference between the window we had,
                          * and the window we would like to have. This quantity
                          * is the "Diff" from the Arizona Vegas papers.
-                        *
-                        * Again, this is a fixed point number with
-                        * V_PARAM_SHIFT bits to the right of the binary
-                        * point.
                          */
-                       diff = (old_wnd << V_PARAM_SHIFT) - target_cwnd;
+                       diff = tp->snd_cwnd * (rtt-vegas->baseRTT) / vegas->baseRTT;
  
                         if (diff > gamma && tp->snd_ssthresh > 2 ) {
                                 /* Going too fast. Time to slow down
@@ -282,16 +234,13 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
                                  * truncation robs us of full link
                                  * utilization.
                                  */
-                               tp->snd_cwnd = min(tp->snd_cwnd,
-                                                  ((u32)target_cwnd >>
-                                                   V_PARAM_SHIFT)+1);
+                               tp->snd_cwnd = min(tp->snd_cwnd, (u32)target_cwnd+1);
  
                         } else if (tp->snd_cwnd <= tp->snd_ssthresh) {
                                 /* Slow start.  */
                                 tcp_slow_start(tp);
                         } else {
                                 /* Congestion avoidance. */
-                               u32 next_snd_cwnd;
  
                                 /* Figure out where we would like cwnd
                                  * to be.
@@ -300,32 +249,25 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
                                         /* The old window was too fast, so
                                          * we slow down.
                                          */
-                                       next_snd_cwnd = old_snd_cwnd - 1;
+                                       tp->snd_cwnd--;
                                 } else if (diff < alpha) {
                                         /* We don't have enough extra packets
                                          * in the network, so speed up.
                                          */
-                                       next_snd_cwnd = old_snd_cwnd + 1;
+                                       tp->snd_cwnd++;
                                 } else {
                                         /* Sending just as fast as we
                                          * should be.
                                          */
-                                       next_snd_cwnd = old_snd_cwnd;
                                 }
-
-                               /* Adjust cwnd upward or downward, toward the
-                                * desired value.
-                                */
-                               if (next_snd_cwnd > tp->snd_cwnd)
-                                       tp->snd_cwnd++;
-                               else if (next_snd_cwnd < tp->snd_cwnd)
-                                       tp->snd_cwnd--;
                         }
  
                         if (tp->snd_cwnd < 2)
                                 tp->snd_cwnd = 2;
                         else if (tp->snd_cwnd > tp->snd_cwnd_clamp)
                                 tp->snd_cwnd = tp->snd_cwnd_clamp;
+
+                       tp->snd_ssthresh = tcp_current_ssthresh(sk);
                 }
  
                 /* Wipe the slate clean for the next RTT. */
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c

index 172438320eec74287b045cd6b784bb3de0b38b0f..d0f54d18e19b92de1407eb9a36fed5344363d01d 100644 (file)
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -912,8 +912,13 @@ static void ndisc_recv_na(struct sk_buff *skb)
                    is invalid, but ndisc specs say nothing
                    about it. It could be misconfiguration, or
                    an smart proxy agent tries to help us :-)
+
+                  We should not print the error if NA has been
+                  received from loopback - it is just our own
+                  unsolicited advertisement.
                  */
-               ND_PRINTK1(KERN_WARNING
+               if (skb->pkt_type != PACKET_LOOPBACK)
+                       ND_PRINTK1(KERN_WARNING
                            "ICMPv6 NA: someone advertises our address on %s!\n",
                            ifp->idev->dev->name);
                 in6_ifa_put(ifp);
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c

index 7fef8ea1f5ecf53eaf5b1596479ef1d8a834b348..d254446b85b59d76bf3d940fce4364270a2d5bb0 100644 (file)
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -99,7 +99,7 @@ struct sta_info *sta_info_get(struct ieee80211_local *local, const u8 *addr)
  
         sta = rcu_dereference(local->sta_hash[STA_HASH(addr)]);
         while (sta) {
-               if (compare_ether_addr(sta->sta.addr, addr) == 0)
+               if (memcmp(sta->sta.addr, addr, ETH_ALEN) == 0)
                         break;
                 sta = rcu_dereference(sta->hnext);
         }
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c

index 742f811ca416e5b16701ce2ae49f582ed32317a6..ab4ddba874be5ce73cb4ffc0b5e7e1da77053dac 100644 (file)
--- a/net/mac80211/wext.c
+++ b/net/mac80211/wext.c
@@ -271,6 +271,7 @@ static int ieee80211_ioctl_siwmode(struct net_device *dev,
                                    __u32 *mode, char *extra)
  {
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+       struct ieee80211_local *local = sdata->local;
         int type;
  
         if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
@@ -281,6 +282,13 @@ static int ieee80211_ioctl_siwmode(struct net_device *dev,
                 type = NL80211_IFTYPE_STATION;
                 break;
         case IW_MODE_ADHOC:
+               /* Setting ad-hoc mode on non ibss channel is not
+                * supported.
+                */
+               if (local->oper_channel &&
+                   (local->oper_channel->flags & IEEE80211_CHAN_NO_IBSS))
+                       return -EOPNOTSUPP;
+
                 type = NL80211_IFTYPE_ADHOC;
                 break;
         case IW_MODE_REPEAT:
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c

index 622d7c671cb78533082f9bf0b655a3bbffcd2f92..233fdd2d7d2186b03fd6bac169d4090dbab562a3 100644 (file)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -305,9 +305,7 @@ void nf_conntrack_hash_insert(struct nf_conn *ct)
         hash = hash_conntrack(&ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple);
         repl_hash = hash_conntrack(&ct->tuplehash[IP_CT_DIR_REPLY].tuple);
  
-       spin_lock_bh(&nf_conntrack_lock);
         __nf_conntrack_hash_insert(ct, hash, repl_hash);
-       spin_unlock_bh(&nf_conntrack_lock);
  }
  EXPORT_SYMBOL_GPL(nf_conntrack_hash_insert);
  
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c

index a040d46f85d6c8967f88af6c549f23206e6416c7..5f4a6516b3b6b6f935e677f774c22de1c038dccb 100644 (file)
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1090,7 +1090,7 @@ ctnetlink_create_conntrack(struct nlattr *cda[],
         struct nf_conn_help *help;
         struct nf_conntrack_helper *helper;
  
-       ct = nf_conntrack_alloc(&init_net, otuple, rtuple, GFP_KERNEL);
+       ct = nf_conntrack_alloc(&init_net, otuple, rtuple, GFP_ATOMIC);
         if (ct == NULL || IS_ERR(ct))
                 return -ENOMEM;
  
@@ -1138,7 +1138,7 @@ ctnetlink_create_conntrack(struct nlattr *cda[],
                 }
         }
  
-       nf_ct_acct_ext_add(ct, GFP_KERNEL);
+       nf_ct_acct_ext_add(ct, GFP_ATOMIC);
  
  #if defined(CONFIG_NF_CONNTRACK_MARK)
         if (cda[CTA_MARK])
@@ -1212,13 +1212,14 @@ ctnetlink_new_conntrack(struct sock *ctnl, struct sk_buff *skb,
                         atomic_inc(&master_ct->ct_general.use);
                 }
  
-               spin_unlock_bh(&nf_conntrack_lock);
                 err = -ENOENT;
                 if (nlh->nlmsg_flags & NLM_F_CREATE)
                         err = ctnetlink_create_conntrack(cda,
                                                          &otuple,
                                                          &rtuple,
                                                          master_ct);
+               spin_unlock_bh(&nf_conntrack_lock);
+
                 if (err < 0 && master_ct)
                         nf_ct_put(master_ct);
  
diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c

index 02a8fed210820879d5b6026041626c7816cc5612..1acc089be7e94b6e8570d9529895402d3e5a75df 100644 (file)
--- a/net/netfilter/xt_socket.c
+++ b/net/netfilter/xt_socket.c
@@ -141,7 +141,7 @@ socket_mt(const struct sk_buff *skb, const struct xt_match_param *par)
         sk = nf_tproxy_get_sock_v4(dev_net(skb->dev), protocol,
                                    saddr, daddr, sport, dport, par->in, false);
         if (sk != NULL) {
-               bool wildcard = (inet_sk(sk)->rcv_saddr == 0);
+               bool wildcard = (sk->sk_state != TCP_TIME_WAIT && inet_sk(sk)->rcv_saddr == 0);
  
                 nf_tproxy_put_sock(sk);
                 if (wildcard)
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c

index e8a5c32b0f106042c82790c2e1c924837bfe0b64..8c03080321784fe7fee76ec1ea2ebd3d85187765 100644 (file)
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
@@ -562,7 +562,6 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,
                                       const struct in_addr *mask,
                                       struct netlbl_audit *audit_info)
  {
-       int ret_val = 0;
         struct netlbl_af4list *list_entry;
         struct netlbl_unlhsh_addr4 *entry;
         struct audit_buffer *audit_buf;
@@ -574,9 +573,10 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,
         list_entry = netlbl_af4list_remove(addr->s_addr, mask->s_addr,
                                            &iface->addr4_list);
         spin_unlock(&netlbl_unlhsh_lock);
-       if (list_entry == NULL)
-               ret_val = -ENOENT;
-       entry = netlbl_unlhsh_addr4_entry(list_entry);
+       if (list_entry != NULL)
+               entry = netlbl_unlhsh_addr4_entry(list_entry);
+       else
+               entry = NULL;
  
         audit_buf = netlbl_audit_start_common(AUDIT_MAC_UNLBL_STCDEL,
                                               audit_info);
@@ -587,19 +587,21 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,
                                           addr->s_addr, mask->s_addr);
                 if (dev != NULL)
                         dev_put(dev);
-               if (entry && security_secid_to_secctx(entry->secid,
-                                                     &secctx,
-                                                     &secctx_len) == 0) {
+               if (entry != NULL &&
+                   security_secid_to_secctx(entry->secid,
+                                            &secctx, &secctx_len) == 0) {
                         audit_log_format(audit_buf, " sec_obj=%s", secctx);
                         security_release_secctx(secctx, secctx_len);
                 }
-               audit_log_format(audit_buf, " res=%u", ret_val == 0 ? 1 : 0);
+               audit_log_format(audit_buf, " res=%u", entry != NULL ? 1 : 0);
                 audit_log_end(audit_buf);
         }
  
-       if (ret_val == 0)
-               call_rcu(&entry->rcu, netlbl_unlhsh_free_addr4);
-       return ret_val;
+       if (entry == NULL)
+               return -ENOENT;
+
+       call_rcu(&entry->rcu, netlbl_unlhsh_free_addr4);
+       return 0;
  }
  
  #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
@@ -623,7 +625,6 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,
                                       const struct in6_addr *mask,
                                       struct netlbl_audit *audit_info)
  {
-       int ret_val = 0;
         struct netlbl_af6list *list_entry;
         struct netlbl_unlhsh_addr6 *entry;
         struct audit_buffer *audit_buf;
@@ -634,9 +635,10 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,
         spin_lock(&netlbl_unlhsh_lock);
         list_entry = netlbl_af6list_remove(addr, mask, &iface->addr6_list);
         spin_unlock(&netlbl_unlhsh_lock);
-       if (list_entry == NULL)
-               ret_val = -ENOENT;
-       entry = netlbl_unlhsh_addr6_entry(list_entry);
+       if (list_entry != NULL)
+               entry = netlbl_unlhsh_addr6_entry(list_entry);
+       else
+               entry = NULL;
  
         audit_buf = netlbl_audit_start_common(AUDIT_MAC_UNLBL_STCDEL,
                                               audit_info);
@@ -647,19 +649,21 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,
                                           addr, mask);
                 if (dev != NULL)
                         dev_put(dev);
-               if (entry && security_secid_to_secctx(entry->secid,
-                                                     &secctx,
-                                                     &secctx_len) == 0) {
+               if (entry != NULL &&
+                   security_secid_to_secctx(entry->secid,
+                                            &secctx, &secctx_len) == 0) {
                         audit_log_format(audit_buf, " sec_obj=%s", secctx);
                         security_release_secctx(secctx, secctx_len);
                 }
-               audit_log_format(audit_buf, " res=%u", ret_val == 0 ? 1 : 0);
+               audit_log_format(audit_buf, " res=%u", entry != NULL ? 1 : 0);
                 audit_log_end(audit_buf);
         }
  
-       if (ret_val == 0)
-               call_rcu(&entry->rcu, netlbl_unlhsh_free_addr6);
-       return ret_val;
+       if (entry == NULL)
+               return -ENOENT;
+
+       call_rcu(&entry->rcu, netlbl_unlhsh_free_addr6);
+       return 0;
  }
  #endif /* IPv6 */
  
diff --git a/net/phonet/pep-gprs.c b/net/phonet/pep-gprs.c

index 9978afbd9f2ad5033375df896358f88b929ecfcc..803eeef0aa856877ddced0e45fc283f4641da2ab 100644 (file)
--- a/net/phonet/pep-gprs.c
+++ b/net/phonet/pep-gprs.c
@@ -155,12 +155,13 @@ static void gprs_data_ready(struct sock *sk, int len)
  static void gprs_write_space(struct sock *sk)
  {
         struct gprs_dev *dev = sk->sk_user_data;
+       struct net_device *net = dev->net;
         unsigned credits = pep_writeable(sk);
  
         spin_lock_bh(&dev->tx_lock);
         dev->tx_max = credits;
-       if (credits > skb_queue_len(&dev->tx_queue))
-               netif_wake_queue(dev->net);
+       if (credits > skb_queue_len(&dev->tx_queue) && netif_running(net))
+               netif_wake_queue(net);
         spin_unlock_bh(&dev->tx_lock);
  }
  
@@ -168,6 +169,23 @@ static void gprs_write_space(struct sock *sk)
   * Network device callbacks
   */
  
+static int gprs_open(struct net_device *dev)
+{
+       struct gprs_dev *gp = netdev_priv(dev);
+
+       gprs_write_space(gp->sk);
+       return 0;
+}
+
+static int gprs_close(struct net_device *dev)
+{
+       struct gprs_dev *gp = netdev_priv(dev);
+
+       netif_stop_queue(dev);
+       flush_work(&gp->tx_work);
+       return 0;
+}
+
  static int gprs_xmit(struct sk_buff *skb, struct net_device *net)
  {
         struct gprs_dev *dev = netdev_priv(net);
@@ -254,6 +272,8 @@ static void gprs_setup(struct net_device *net)
         net->tx_queue_len       = 10;
  
         net->destructor         = free_netdev;
+       net->open               = gprs_open;
+       net->stop               = gprs_close;
         net->hard_start_xmit    = gprs_xmit; /* mandatory */
         net->change_mtu         = gprs_set_mtu;
         net->get_stats          = gprs_get_stats;
@@ -318,7 +338,6 @@ int gprs_attach(struct sock *sk)
         dev->sk = sk;
  
         printk(KERN_DEBUG"%s: attached\n", net->name);
-       gprs_write_space(sk); /* kick off TX */
         return net->ifindex;
  
  out_rel:
@@ -341,7 +360,5 @@ void gprs_detach(struct sock *sk)
  
         printk(KERN_DEBUG"%s: detached\n", net->name);
         unregister_netdev(net);
-       flush_scheduled_work();
         sock_put(sk);
-       skb_queue_purge(&dev->tx_queue);
  }
diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c

index 53be9fc82aaadb2a0aa588974b13d603491ee0b0..f93ff8ef47d0f8d47635af976c4fab46b8fcd1ce 100644 (file)
--- a/net/phonet/pn_dev.c
+++ b/net/phonet/pn_dev.c
@@ -115,7 +115,7 @@ int phonet_address_del(struct net_device *dev, u8 addr)
         pnd = __phonet_get(dev);
         if (!pnd || !test_and_clear_bit(addr >> 2, pnd->addrs))
                 err = -EADDRNOTAVAIL;
-       if (bitmap_empty(pnd->addrs, 64))
+       else if (bitmap_empty(pnd->addrs, 64))
                 __phonet_device_free(pnd);
         spin_unlock_bh(&pndevs.lock);
         return err;
diff --git a/net/phonet/pn_netlink.c b/net/phonet/pn_netlink.c

index b1770d66bc8d68fc3c9ede8fd2408f813994dd93..242fe8f8c322d5fb048d737a46d36b99797f47aa 100644 (file)
--- a/net/phonet/pn_netlink.c
+++ b/net/phonet/pn_netlink.c
@@ -123,6 +123,7 @@ nla_put_failure:
  
  static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
  {
+       struct net *net = sock_net(skb->sk);
         struct phonet_device *pnd;
         int dev_idx = 0, dev_start_idx = cb->args[0];
         int addr_idx = 0, addr_start_idx = cb->args[1];
@@ -131,6 +132,8 @@ static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
         list_for_each_entry(pnd, &pndevs.list, list) {
                 u8 addr;
  
+               if (!net_eq(dev_net(pnd->netdev), net))
+                       continue;
                 if (dev_idx > dev_start_idx)
                         addr_start_idx = 0;
                 if (dev_idx++ < dev_start_idx)
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c

index a7f1ce11bc22d140d52526c11816973d05683729..0c1cc76128006e81d39b663f994de9e78f8539f5 100644 (file)
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1072,6 +1072,10 @@ static int rose_sendmsg(struct kiocb *iocb, struct socket *sock,
         unsigned char *asmptr;
         int n, size, qbit = 0;
  
+       /* ROSE empty frame has no meaning : don't send */
+       if (len == 0)
+               return 0;
+
         if (msg->msg_flags & ~(MSG_DONTWAIT|MSG_EOR|MSG_CMSG_COMPAT))
                 return -EINVAL;
  
@@ -1265,6 +1269,12 @@ static int rose_recvmsg(struct kiocb *iocb, struct socket *sock,
         skb_reset_transport_header(skb);
         copied     = skb->len;
  
+       /* ROSE empty frame has no meaning : ignore it */
+       if (copied == 0) {
+               skb_free_datagram(sk, skb);
+               return copied;
+       }
+
         if (copied > size) {
                 copied = size;
                 msg->msg_flags |= MSG_TRUNC;
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c

index a11959908d9a68c405114d56c5073c0d77647402..98402f0efa47727677b8d57acfe2ecd7cb9441b2 100644 (file)
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -46,9 +46,6 @@
          layering other disciplines.  It does not need to do bandwidth
          control either since that can be handled by using token
          bucket or other rate control.
-
-        The simulator is limited by the Linux timer resolution
-        and will create packet bursts on the HZ boundary (1ms).
  */
  
  struct netem_sched_data {
diff --git a/net/socket.c b/net/socket.c

index 92764d836891833e1cb7f8255a38edacad1f3b7f..76ba80aeac1a86217ae77edc0e239084840f90d6 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -2307,6 +2307,7 @@ int kernel_accept(struct socket *sock, struct socket **newsock, int flags)
         }
  
         (*newsock)->ops = sock->ops;
+       __module_get((*newsock)->ops->owner);
  
  done:
         return err;
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c

index 95293f549e9c2b371b82ce32af4ca43be00b5ada..a1951dcc577614df63fc0a3ab1e5ce92dce9d7ab 100644 (file)
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1183,7 +1183,11 @@ int svc_addsock(struct svc_serv *serv,
         else if (so->state > SS_UNCONNECTED)
                 err = -EISCONN;
         else {
-               svsk = svc_setup_socket(serv, so, &err, SVC_SOCK_DEFAULTS);
+               if (!try_module_get(THIS_MODULE))
+                       err = -ENOENT;
+               else
+                       svsk = svc_setup_socket(serv, so, &err,
+                                               SVC_SOCK_DEFAULTS);
                 if (svsk) {
                         struct sockaddr_storage addr;
                         struct sockaddr *sin = (struct sockaddr *)&addr;
@@ -1196,7 +1200,8 @@ int svc_addsock(struct svc_serv *serv,
                         spin_unlock_bh(&serv->sv_lock);
                         svc_xprt_received(&svsk->sk_xprt);
                         err = 0;
-               }
+               } else
+                       module_put(THIS_MODULE);
         }
         if (err) {
                 sockfd_put(so);
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c

index eb90f77bb0e294b6358db3361740deaa0bec969e..66d5ac4773abac12f517c84b25916dc078cda007 100644 (file)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1343,6 +1343,7 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock,
  
         if (NULL == siocb->scm)
                 siocb->scm = &tmp_scm;
+       wait_for_unix_gc();
         err = scm_send(sock, msg, siocb->scm);
         if (err < 0)
                 return err;
@@ -1493,6 +1494,7 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
  
         if (NULL == siocb->scm)
                 siocb->scm = &tmp_scm;
+       wait_for_unix_gc();
         err = scm_send(sock, msg, siocb->scm);
         if (err < 0)
                 return err;
diff --git a/net/unix/garbage.c b/net/unix/garbage.c

index 6d4a9a8de5ef1d8974a4f8fe17956dfd31b63fe6..abb3ab34cb1ece8f357819c8124430996e15d443 100644 (file)
--- a/net/unix/garbage.c
+++ b/net/unix/garbage.c
@@ -80,6 +80,7 @@
  #include <linux/file.h>
  #include <linux/proc_fs.h>
  #include <linux/mutex.h>
+#include <linux/wait.h>
  
  #include <net/sock.h>
  #include <net/af_unix.h>
@@ -91,6 +92,7 @@
  static LIST_HEAD(gc_inflight_list);
  static LIST_HEAD(gc_candidates);
  static DEFINE_SPINLOCK(unix_gc_lock);
+static DECLARE_WAIT_QUEUE_HEAD(unix_gc_wait);
  
  unsigned int unix_tot_inflight;
  
@@ -266,12 +268,16 @@ static void inc_inflight_move_tail(struct unix_sock *u)
                 list_move_tail(&u->link, &gc_candidates);
  }
  
-/* The external entry point: unix_gc() */
+static bool gc_in_progress = false;
  
-void unix_gc(void)
+void wait_for_unix_gc(void)
  {
-       static bool gc_in_progress = false;
+       wait_event(unix_gc_wait, gc_in_progress == false);
+}
  
+/* The external entry point: unix_gc() */
+void unix_gc(void)
+{
         struct unix_sock *u;
         struct unix_sock *next;
         struct sk_buff_head hitlist;
@@ -376,6 +382,7 @@ void unix_gc(void)
         /* All candidates should have been detached by now. */
         BUG_ON(!list_empty(&gc_candidates));
         gc_in_progress = false;
+       wake_up(&unix_gc_wait);
  
   out:
         spin_unlock(&unix_gc_lock);
diff --git a/net/wireless/reg.c b/net/wireless/reg.c

index 626dbb688499bd9dafa0b963305df65d3ac0c04a..eb3b1a9f9b12477d5a2562916491e9d73c6a7792 100644 (file)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -343,9 +343,9 @@ static int ignore_request(struct wiphy *wiphy, enum reg_set_by set_by,
                                 return 0;
                         return -EALREADY;
                 }
-               if (WARN_ON(!is_alpha2_set(alpha2) || !is_an_alpha2(alpha2)),
+               if (WARN(!is_alpha2_set(alpha2) || !is_an_alpha2(alpha2),
                                 "Invalid Country IE regulatory hint passed "
-                               "to the wireless core\n")
+                               "to the wireless core\n"))
                         return -EINVAL;
                 /* We ignore Country IE hints for now, as we haven't yet
                  * added the dot11MultiDomainCapabilityEnabled flag
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c

index 058f04f54b9024857eb418321d6842bd448c744a..fb216c9adf86722bc81079fd25f4ed4b908e642c 100644 (file)
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -817,6 +817,7 @@ int xfrm_policy_flush(u8 type, struct xfrm_audit *audit_info)
                                 continue;
                         hlist_del(&pol->bydst);
                         hlist_del(&pol->byidx);
+                       list_del(&pol->walk.all);
                         write_unlock_bh(&xfrm_policy_lock);
  
                         xfrm_audit_policy_delete(pol, 1, audit_info->loginuid,
diff --git a/scripts/kernel-doc b/scripts/kernel-doc

index a53e2fc8dfb539575fa2e6f2001cb79b83251b8a..d27aad78e1d83f21a4c0f8140b0aa87be05ad4b4 100755 (executable)
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -378,6 +378,10 @@ sub dump_section {
  #      print STDERR "parameter def '$1' = '$contents'\n";
         $name = $1;
         $parameterdescs{$name} = $contents;
+    } elsif ($name eq "@\.\.\.") {
+#      print STDERR "parameter def '...' = '$contents'\n";
+       $name = "...";
+       $parameterdescs{$name} = $contents;
      } else {
  #      print STDERR "other section '$name' = '$contents'\n";
         if (defined($sections{$name}) && ($sections{$name} ne "")) {
@@ -1588,12 +1592,12 @@ sub push_parameter($$$) {
  
         if ($type eq "" && $param =~ /\.\.\.$/)
         {
-           $type="";
-           $parameterdescs{$param} = "variable arguments";
+           if (!defined $parameterdescs{$param} || $parameterdescs{$param} eq "") {
+               $parameterdescs{$param} = "variable arguments";
+           }
         }
         elsif ($type eq "" && ($param eq "" or $param eq "void"))
         {
-           $type="";
             $param="void";
             $parameterdescs{void} = "no arguments";
         }
diff --git a/sound/aoa/codecs/Makefile b/sound/aoa/codecs/Makefile

index 31cbe68fd42f172eebdc36bdc755996c462a3940..c3ee77fc4b2dc4bb5ae60191bea60705edcc4c36 100644 (file)
--- a/sound/aoa/codecs/Makefile
+++ b/sound/aoa/codecs/Makefile
@@ -1,3 +1,7 @@
+snd-aoa-codec-onyx-objs := onyx.o
+snd-aoa-codec-tas-objs := tas.o
+snd-aoa-codec-toonie-objs := toonie.o
+
  obj-$(CONFIG_SND_AOA_ONYX) += snd-aoa-codec-onyx.o
  obj-$(CONFIG_SND_AOA_TAS) += snd-aoa-codec-tas.o
  obj-$(CONFIG_SND_AOA_TOONIE) += snd-aoa-codec-toonie.o
diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c

new file mode 100644 (file)

index 0000000..15500b9
--- /dev/null
+++ b/sound/aoa/codecs/onyx.c
@@ -0,0 +1,1118 @@
+/*
+ * Apple Onboard Audio driver for Onyx codec
+ *
+ * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
+ *
+ * GPL v2, can be found in COPYING.
+ *
+ *
+ * This is a driver for the pcm3052 codec chip (codenamed Onyx)
+ * that is present in newer Apple hardware (with digital output).
+ *
+ * The Onyx codec has the following connections (listed by the bit
+ * to be used in aoa_codec.connected):
+ *  0: analog output
+ *  1: digital output
+ *  2: line input
+ *  3: microphone input
+ * Note that even though I know of no machine that has for example
+ * the digital output connected but not the analog, I have handled
+ * all the different cases in the code so that this driver may serve
+ * as a good example of what to do.
+ *
+ * NOTE: This driver assumes that there's at most one chip to be
+ *      used with one alsa card, in form of creating all kinds
+ *      of mixer elements without regard for their existence.
+ *      But snd-aoa assumes that there's at most one card, so
+ *      this means you can only have one onyx on a system. This
+ *      should probably be fixed by changing the assumption of
+ *      having just a single card on a system, and making the
+ *      'card' pointer accessible to anyone who needs it instead
+ *      of hiding it in the aoa_snd_* functions...
+ *
+ */
+#include <linux/delay.h>
+#include <linux/module.h>
+MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("pcm3052 (onyx) codec driver for snd-aoa");
+
+#include "onyx.h"
+#include "../aoa.h"
+#include "../soundbus/soundbus.h"
+
+
+#define PFX "snd-aoa-codec-onyx: "
+
+struct onyx {
+       /* cache registers 65 to 80, they are write-only! */
+       u8                      cache[16];
+       struct i2c_client       i2c;
+       struct aoa_codec        codec;
+       u32                     initialised:1,
+                               spdif_locked:1,
+                               analog_locked:1,
+                               original_mute:2;
+       int                     open_count;
+       struct codec_info       *codec_info;
+
+       /* mutex serializes concurrent access to the device
+        * and this structure.
+        */
+       struct mutex mutex;
+};
+#define codec_to_onyx(c) container_of(c, struct onyx, codec)
+
+/* both return 0 if all ok, else on error */
+static int onyx_read_register(struct onyx *onyx, u8 reg, u8 *value)
+{
+       s32 v;
+
+       if (reg != ONYX_REG_CONTROL) {
+               *value = onyx->cache[reg-FIRSTREGISTER];
+               return 0;
+       }
+       v = i2c_smbus_read_byte_data(&onyx->i2c, reg);
+       if (v < 0)
+               return -1;
+       *value = (u8)v;
+       onyx->cache[ONYX_REG_CONTROL-FIRSTREGISTER] = *value;
+       return 0;
+}
+
+static int onyx_write_register(struct onyx *onyx, u8 reg, u8 value)
+{
+       int result;
+
+       result = i2c_smbus_write_byte_data(&onyx->i2c, reg, value);
+       if (!result)
+               onyx->cache[reg-FIRSTREGISTER] = value;
+       return result;
+}
+
+/* alsa stuff */
+
+static int onyx_dev_register(struct snd_device *dev)
+{
+       return 0;
+}
+
+static struct snd_device_ops ops = {
+       .dev_register = onyx_dev_register,
+};
+
+/* this is necessary because most alsa mixer programs
+ * can't properly handle the negative range */
+#define VOLUME_RANGE_SHIFT     128
+
+static int onyx_snd_vol_info(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_info *uinfo)
+{
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+       uinfo->count = 2;
+       uinfo->value.integer.min = -128 + VOLUME_RANGE_SHIFT;
+       uinfo->value.integer.max = -1 + VOLUME_RANGE_SHIFT;
+       return 0;
+}
+
+static int onyx_snd_vol_get(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
+       s8 l, r;
+
+       mutex_lock(&onyx->mutex);
+       onyx_read_register(onyx, ONYX_REG_DAC_ATTEN_LEFT, &l);
+       onyx_read_register(onyx, ONYX_REG_DAC_ATTEN_RIGHT, &r);
+       mutex_unlock(&onyx->mutex);
+
+       ucontrol->value.integer.value[0] = l + VOLUME_RANGE_SHIFT;
+       ucontrol->value.integer.value[1] = r + VOLUME_RANGE_SHIFT;
+
+       return 0;
+}
+
+static int onyx_snd_vol_put(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
+       s8 l, r;
+
+       if (ucontrol->value.integer.value[0] < -128 + VOLUME_RANGE_SHIFT ||
+           ucontrol->value.integer.value[0] > -1 + VOLUME_RANGE_SHIFT)
+               return -EINVAL;
+       if (ucontrol->value.integer.value[1] < -128 + VOLUME_RANGE_SHIFT ||
+           ucontrol->value.integer.value[1] > -1 + VOLUME_RANGE_SHIFT)
+               return -EINVAL;
+
+       mutex_lock(&onyx->mutex);
+       onyx_read_register(onyx, ONYX_REG_DAC_ATTEN_LEFT, &l);
+       onyx_read_register(onyx, ONYX_REG_DAC_ATTEN_RIGHT, &r);
+
+       if (l + VOLUME_RANGE_SHIFT == ucontrol->value.integer.value[0] &&
+           r + VOLUME_RANGE_SHIFT == ucontrol->value.integer.value[1]) {
+               mutex_unlock(&onyx->mutex);
+               return 0;
+       }
+
+       onyx_write_register(onyx, ONYX_REG_DAC_ATTEN_LEFT,
+                           ucontrol->value.integer.value[0]
+                            - VOLUME_RANGE_SHIFT);
+       onyx_write_register(onyx, ONYX_REG_DAC_ATTEN_RIGHT,
+                           ucontrol->value.integer.value[1]
+                            - VOLUME_RANGE_SHIFT);
+       mutex_unlock(&onyx->mutex);
+
+       return 1;
+}
+
+static struct snd_kcontrol_new volume_control = {
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name = "Master Playback Volume",
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+       .info = onyx_snd_vol_info,
+       .get = onyx_snd_vol_get,
+       .put = onyx_snd_vol_put,
+};
+
+/* like above, this is necessary because a lot
+ * of alsa mixer programs don't handle ranges
+ * that don't start at 0 properly.
+ * even alsamixer is one of them... */
+#define INPUTGAIN_RANGE_SHIFT  (-3)
+
+static int onyx_snd_inputgain_info(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_info *uinfo)
+{
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+       uinfo->count = 1;
+       uinfo->value.integer.min = 3 + INPUTGAIN_RANGE_SHIFT;
+       uinfo->value.integer.max = 28 + INPUTGAIN_RANGE_SHIFT;
+       return 0;
+}
+
+static int onyx_snd_inputgain_get(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
+       u8 ig;
+
+       mutex_lock(&onyx->mutex);
+       onyx_read_register(onyx, ONYX_REG_ADC_CONTROL, &ig);
+       mutex_unlock(&onyx->mutex);
+
+       ucontrol->value.integer.value[0] =
+               (ig & ONYX_ADC_PGA_GAIN_MASK) + INPUTGAIN_RANGE_SHIFT;
+
+       return 0;
+}
+
+static int onyx_snd_inputgain_put(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
+       u8 v, n;
+
+       if (ucontrol->value.integer.value[0] < 3 + INPUTGAIN_RANGE_SHIFT ||
+           ucontrol->value.integer.value[0] > 28 + INPUTGAIN_RANGE_SHIFT)
+               return -EINVAL;
+       mutex_lock(&onyx->mutex);
+       onyx_read_register(onyx, ONYX_REG_ADC_CONTROL, &v);
+       n = v;
+       n &= ~ONYX_ADC_PGA_GAIN_MASK;
+       n |= (ucontrol->value.integer.value[0] - INPUTGAIN_RANGE_SHIFT)
+               & ONYX_ADC_PGA_GAIN_MASK;
+       onyx_write_register(onyx, ONYX_REG_ADC_CONTROL, n);
+       mutex_unlock(&onyx->mutex);
+
+       return n != v;
+}
+
+static struct snd_kcontrol_new inputgain_control = {
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name = "Master Capture Volume",
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+       .info = onyx_snd_inputgain_info,
+       .get = onyx_snd_inputgain_get,
+       .put = onyx_snd_inputgain_put,
+};
+
+static int onyx_snd_capture_source_info(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_info *uinfo)
+{
+       static char *texts[] = { "Line-In", "Microphone" };
+
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+       uinfo->count = 1;
+       uinfo->value.enumerated.items = 2;
+       if (uinfo->value.enumerated.item > 1)
+               uinfo->value.enumerated.item = 1;
+       strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+       return 0;
+}
+
+static int onyx_snd_capture_source_get(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
+       s8 v;
+
+       mutex_lock(&onyx->mutex);
+       onyx_read_register(onyx, ONYX_REG_ADC_CONTROL, &v);
+       mutex_unlock(&onyx->mutex);
+
+       ucontrol->value.enumerated.item[0] = !!(v&ONYX_ADC_INPUT_MIC);
+
+       return 0;
+}
+
+static void onyx_set_capture_source(struct onyx *onyx, int mic)
+{
+       s8 v;
+
+       mutex_lock(&onyx->mutex);
+       onyx_read_register(onyx, ONYX_REG_ADC_CONTROL, &v);
+       v &= ~ONYX_ADC_INPUT_MIC;
+       if (mic)
+               v |= ONYX_ADC_INPUT_MIC;
+       onyx_write_register(onyx, ONYX_REG_ADC_CONTROL, v);
+       mutex_unlock(&onyx->mutex);
+}
+
+static int onyx_snd_capture_source_put(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       if (ucontrol->value.enumerated.item[0] > 1)
+               return -EINVAL;
+       onyx_set_capture_source(snd_kcontrol_chip(kcontrol),
+                               ucontrol->value.enumerated.item[0]);
+       return 1;
+}
+
+static struct snd_kcontrol_new capture_source_control = {
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       /* If we name this 'Input Source', it properly shows up in
+        * alsamixer as a selection, * but it's shown under the
+        * 'Playback' category.
+        * If I name it 'Capture Source', it shows up in strange
+        * ways (two bools of which one can be selected at a
+        * time) but at least it's shown in the 'Capture'
+        * category.
+        * I was told that this was due to backward compatibility,
+        * but I don't understand then why the mangling is *not*
+        * done when I name it "Input Source".....
+        */
+       .name = "Capture Source",
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+       .info = onyx_snd_capture_source_info,
+       .get = onyx_snd_capture_source_get,
+       .put = onyx_snd_capture_source_put,
+};
+
+#define onyx_snd_mute_info     snd_ctl_boolean_stereo_info
+
+static int onyx_snd_mute_get(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
+       u8 c;
+
+       mutex_lock(&onyx->mutex);
+       onyx_read_register(onyx, ONYX_REG_DAC_CONTROL, &c);
+       mutex_unlock(&onyx->mutex);
+
+       ucontrol->value.integer.value[0] = !(c & ONYX_MUTE_LEFT);
+       ucontrol->value.integer.value[1] = !(c & ONYX_MUTE_RIGHT);
+
+       return 0;
+}
+
+static int onyx_snd_mute_put(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
+       u8 v = 0, c = 0;
+       int err = -EBUSY;
+
+       mutex_lock(&onyx->mutex);
+       if (onyx->analog_locked)
+               goto out_unlock;
+
+       onyx_read_register(onyx, ONYX_REG_DAC_CONTROL, &v);
+       c = v;
+       c &= ~(ONYX_MUTE_RIGHT | ONYX_MUTE_LEFT);
+       if (!ucontrol->value.integer.value[0])
+               c |= ONYX_MUTE_LEFT;
+       if (!ucontrol->value.integer.value[1])
+               c |= ONYX_MUTE_RIGHT;
+       err = onyx_write_register(onyx, ONYX_REG_DAC_CONTROL, c);
+
+ out_unlock:
+       mutex_unlock(&onyx->mutex);
+
+       return !err ? (v != c) : err;
+}
+
+static struct snd_kcontrol_new mute_control = {
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name = "Master Playback Switch",
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+       .info = onyx_snd_mute_info,
+       .get = onyx_snd_mute_get,
+       .put = onyx_snd_mute_put,
+};
+
+
+#define onyx_snd_single_bit_info       snd_ctl_boolean_mono_info
+
+#define FLAG_POLARITY_INVERT   1
+#define FLAG_SPDIFLOCK         2
+
+static int onyx_snd_single_bit_get(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
+       u8 c;
+       long int pv = kcontrol->private_value;
+       u8 polarity = (pv >> 16) & FLAG_POLARITY_INVERT;
+       u8 address = (pv >> 8) & 0xff;
+       u8 mask = pv & 0xff;
+
+       mutex_lock(&onyx->mutex);
+       onyx_read_register(onyx, address, &c);
+       mutex_unlock(&onyx->mutex);
+
+       ucontrol->value.integer.value[0] = !!(c & mask) ^ polarity;
+
+       return 0;
+}
+
+static int onyx_snd_single_bit_put(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
+       u8 v = 0, c = 0;
+       int err;
+       long int pv = kcontrol->private_value;
+       u8 polarity = (pv >> 16) & FLAG_POLARITY_INVERT;
+       u8 spdiflock = (pv >> 16) & FLAG_SPDIFLOCK;
+       u8 address = (pv >> 8) & 0xff;
+       u8 mask = pv & 0xff;
+
+       mutex_lock(&onyx->mutex);
+       if (spdiflock && onyx->spdif_locked) {
+               /* even if alsamixer doesn't care.. */
+               err = -EBUSY;
+               goto out_unlock;
+       }
+       onyx_read_register(onyx, address, &v);
+       c = v;
+       c &= ~(mask);
+       if (!!ucontrol->value.integer.value[0] ^ polarity)
+               c |= mask;
+       err = onyx_write_register(onyx, address, c);
+
+ out_unlock:
+       mutex_unlock(&onyx->mutex);
+
+       return !err ? (v != c) : err;
+}
+
+#define SINGLE_BIT(n, type, description, address, mask, flags)         \
+static struct snd_kcontrol_new n##_control = {                         \
+       .iface = SNDRV_CTL_ELEM_IFACE_##type,                           \
+       .name = description,                                            \
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,                      \
+       .info = onyx_snd_single_bit_info,                               \
+       .get = onyx_snd_single_bit_get,                                 \
+       .put = onyx_snd_single_bit_put,                                 \
+       .private_value = (flags << 16) | (address << 8) | mask          \
+}
+
+SINGLE_BIT(spdif,
+          MIXER,
+          SNDRV_CTL_NAME_IEC958("", PLAYBACK, SWITCH),
+          ONYX_REG_DIG_INFO4,
+          ONYX_SPDIF_ENABLE,
+          FLAG_SPDIFLOCK);
+SINGLE_BIT(ovr1,
+          MIXER,
+          "Oversampling Rate",
+          ONYX_REG_DAC_CONTROL,
+          ONYX_OVR1,
+          0);
+SINGLE_BIT(flt0,
+          MIXER,
+          "Fast Digital Filter Rolloff",
+          ONYX_REG_DAC_FILTER,
+          ONYX_ROLLOFF_FAST,
+          FLAG_POLARITY_INVERT);
+SINGLE_BIT(hpf,
+          MIXER,
+          "Highpass Filter",
+          ONYX_REG_ADC_HPF_BYPASS,
+          ONYX_HPF_DISABLE,
+          FLAG_POLARITY_INVERT);
+SINGLE_BIT(dm12,
+          MIXER,
+          "Digital De-Emphasis",
+          ONYX_REG_DAC_DEEMPH,
+          ONYX_DIGDEEMPH_CTRL,
+          0);
+
+static int onyx_spdif_info(struct snd_kcontrol *kcontrol,
+                          struct snd_ctl_elem_info *uinfo)
+{
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
+       uinfo->count = 1;
+       return 0;
+}
+
+static int onyx_spdif_mask_get(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_value *ucontrol)
+{
+       /* datasheet page 30, all others are 0 */
+       ucontrol->value.iec958.status[0] = 0x3e;
+       ucontrol->value.iec958.status[1] = 0xff;
+
+       ucontrol->value.iec958.status[3] = 0x3f;
+       ucontrol->value.iec958.status[4] = 0x0f;
+
+       return 0;
+}
+
+static struct snd_kcontrol_new onyx_spdif_mask = {
+       .access =       SNDRV_CTL_ELEM_ACCESS_READ,
+       .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+       .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
+       .info =         onyx_spdif_info,
+       .get =          onyx_spdif_mask_get,
+};
+
+static int onyx_spdif_get(struct snd_kcontrol *kcontrol,
+                         struct snd_ctl_elem_value *ucontrol)
+{
+       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
+       u8 v;
+
+       mutex_lock(&onyx->mutex);
+       onyx_read_register(onyx, ONYX_REG_DIG_INFO1, &v);
+       ucontrol->value.iec958.status[0] = v & 0x3e;
+
+       onyx_read_register(onyx, ONYX_REG_DIG_INFO2, &v);
+       ucontrol->value.iec958.status[1] = v;
+
+       onyx_read_register(onyx, ONYX_REG_DIG_INFO3, &v);
+       ucontrol->value.iec958.status[3] = v & 0x3f;
+
+       onyx_read_register(onyx, ONYX_REG_DIG_INFO4, &v);
+       ucontrol->value.iec958.status[4] = v & 0x0f;
+       mutex_unlock(&onyx->mutex);
+
+       return 0;
+}
+
+static int onyx_spdif_put(struct snd_kcontrol *kcontrol,
+                         struct snd_ctl_elem_value *ucontrol)
+{
+       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
+       u8 v;
+
+       mutex_lock(&onyx->mutex);
+       onyx_read_register(onyx, ONYX_REG_DIG_INFO1, &v);
+       v = (v & ~0x3e) | (ucontrol->value.iec958.status[0] & 0x3e);
+       onyx_write_register(onyx, ONYX_REG_DIG_INFO1, v);
+
+       v = ucontrol->value.iec958.status[1];
+       onyx_write_register(onyx, ONYX_REG_DIG_INFO2, v);
+
+       onyx_read_register(onyx, ONYX_REG_DIG_INFO3, &v);
+       v = (v & ~0x3f) | (ucontrol->value.iec958.status[3] & 0x3f);
+       onyx_write_register(onyx, ONYX_REG_DIG_INFO3, v);
+
+       onyx_read_register(onyx, ONYX_REG_DIG_INFO4, &v);
+       v = (v & ~0x0f) | (ucontrol->value.iec958.status[4] & 0x0f);
+       onyx_write_register(onyx, ONYX_REG_DIG_INFO4, v);
+       mutex_unlock(&onyx->mutex);
+
+       return 1;
+}
+
+static struct snd_kcontrol_new onyx_spdif_ctrl = {
+       .access =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
+       .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+       .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+       .info =         onyx_spdif_info,
+       .get =          onyx_spdif_get,
+       .put =          onyx_spdif_put,
+};
+
+/* our registers */
+
+static u8 register_map[] = {
+       ONYX_REG_DAC_ATTEN_LEFT,
+       ONYX_REG_DAC_ATTEN_RIGHT,
+       ONYX_REG_CONTROL,
+       ONYX_REG_DAC_CONTROL,
+       ONYX_REG_DAC_DEEMPH,
+       ONYX_REG_DAC_FILTER,
+       ONYX_REG_DAC_OUTPHASE,
+       ONYX_REG_ADC_CONTROL,
+       ONYX_REG_ADC_HPF_BYPASS,
+       ONYX_REG_DIG_INFO1,
+       ONYX_REG_DIG_INFO2,
+       ONYX_REG_DIG_INFO3,
+       ONYX_REG_DIG_INFO4
+};
+
+static u8 initial_values[ARRAY_SIZE(register_map)] = {
+       0x80, 0x80, /* muted */
+       ONYX_MRST | ONYX_SRST, /* but handled specially! */
+       ONYX_MUTE_LEFT | ONYX_MUTE_RIGHT,
+       0, /* no deemphasis */
+       ONYX_DAC_FILTER_ALWAYS,
+       ONYX_OUTPHASE_INVERTED,
+       (-1 /*dB*/ + 8) & 0xF, /* line in selected, -1 dB gain*/
+       ONYX_ADC_HPF_ALWAYS,
+       (1<<2), /* pcm audio */
+       2,      /* category: pcm coder */
+       0,      /* sampling frequency 44.1 kHz, clock accuracy level II */
+       1       /* 24 bit depth */
+};
+
+/* reset registers of chip, either to initial or to previous values */
+static int onyx_register_init(struct onyx *onyx)
+{
+       int i;
+       u8 val;
+       u8 regs[sizeof(initial_values)];
+
+       if (!onyx->initialised) {
+               memcpy(regs, initial_values, sizeof(initial_values));
+               if (onyx_read_register(onyx, ONYX_REG_CONTROL, &val))
+                       return -1;
+               val &= ~ONYX_SILICONVERSION;
+               val |= initial_values[3];
+               regs[3] = val;
+       } else {
+               for (i=0; i<sizeof(register_map); i++)
+                       regs[i] = onyx->cache[register_map[i]-FIRSTREGISTER];
+       }
+
+       for (i=0; i<sizeof(register_map); i++) {
+               if (onyx_write_register(onyx, register_map[i], regs[i]))
+                       return -1;
+       }
+       onyx->initialised = 1;
+       return 0;
+}
+
+static struct transfer_info onyx_transfers[] = {
+       /* this is first so we can skip it if no input is present...
+        * No hardware exists with that, but it's here as an example
+        * of what to do :) */
+       {
+               /* analog input */
+               .formats = SNDRV_PCM_FMTBIT_S8 |
+                          SNDRV_PCM_FMTBIT_S16_BE |
+                          SNDRV_PCM_FMTBIT_S24_BE,
+               .rates = SNDRV_PCM_RATE_8000_96000,
+               .transfer_in = 1,
+               .must_be_clock_source = 0,
+               .tag = 0,
+       },
+       {
+               /* if analog and digital are currently off, anything should go,
+                * so this entry describes everything we can do... */
+               .formats = SNDRV_PCM_FMTBIT_S8 |
+                          SNDRV_PCM_FMTBIT_S16_BE |
+                          SNDRV_PCM_FMTBIT_S24_BE
+#ifdef SNDRV_PCM_FMTBIT_COMPRESSED_16BE
+                          | SNDRV_PCM_FMTBIT_COMPRESSED_16BE
+#endif
+               ,
+               .rates = SNDRV_PCM_RATE_8000_96000,
+               .tag = 0,
+       },
+       {
+               /* analog output */
+               .formats = SNDRV_PCM_FMTBIT_S8 |
+                          SNDRV_PCM_FMTBIT_S16_BE |
+                          SNDRV_PCM_FMTBIT_S24_BE,
+               .rates = SNDRV_PCM_RATE_8000_96000,
+               .transfer_in = 0,
+               .must_be_clock_source = 0,
+               .tag = 1,
+       },
+       {
+               /* digital pcm output, also possible for analog out */
+               .formats = SNDRV_PCM_FMTBIT_S8 |
+                          SNDRV_PCM_FMTBIT_S16_BE |
+                          SNDRV_PCM_FMTBIT_S24_BE,
+               .rates = SNDRV_PCM_RATE_32000 |
+                        SNDRV_PCM_RATE_44100 |
+                        SNDRV_PCM_RATE_48000,
+               .transfer_in = 0,
+               .must_be_clock_source = 0,
+               .tag = 2,
+       },
+#ifdef SNDRV_PCM_FMTBIT_COMPRESSED_16BE
+       /* Once alsa gets supports for this kind of thing we can add it... */
+       {
+               /* digital compressed output */
+               .formats =  SNDRV_PCM_FMTBIT_COMPRESSED_16BE,
+               .rates = SNDRV_PCM_RATE_32000 |
+                        SNDRV_PCM_RATE_44100 |
+                        SNDRV_PCM_RATE_48000,
+               .tag = 2,
+       },
+#endif
+       {}
+};
+
+static int onyx_usable(struct codec_info_item *cii,
+                      struct transfer_info *ti,
+                      struct transfer_info *out)
+{
+       u8 v;
+       struct onyx *onyx = cii->codec_data;
+       int spdif_enabled, analog_enabled;
+
+       mutex_lock(&onyx->mutex);
+       onyx_read_register(onyx, ONYX_REG_DIG_INFO4, &v);
+       spdif_enabled = !!(v & ONYX_SPDIF_ENABLE);
+       onyx_read_register(onyx, ONYX_REG_DAC_CONTROL, &v);
+       analog_enabled =
+               (v & (ONYX_MUTE_RIGHT|ONYX_MUTE_LEFT))
+                != (ONYX_MUTE_RIGHT|ONYX_MUTE_LEFT);
+       mutex_unlock(&onyx->mutex);
+
+       switch (ti->tag) {
+       case 0: return 1;
+       case 1: return analog_enabled;
+       case 2: return spdif_enabled;
+       }
+       return 1;
+}
+
+static int onyx_prepare(struct codec_info_item *cii,
+                       struct bus_info *bi,
+                       struct snd_pcm_substream *substream)
+{
+       u8 v;
+       struct onyx *onyx = cii->codec_data;
+       int err = -EBUSY;
+
+       mutex_lock(&onyx->mutex);
+
+#ifdef SNDRV_PCM_FMTBIT_COMPRESSED_16BE
+       if (substream->runtime->format == SNDRV_PCM_FMTBIT_COMPRESSED_16BE) {
+               /* mute and lock analog output */
+               onyx_read_register(onyx, ONYX_REG_DAC_CONTROL, &v);
+               if (onyx_write_register(onyx,
+                                       ONYX_REG_DAC_CONTROL,
+                                       v | ONYX_MUTE_RIGHT | ONYX_MUTE_LEFT))
+                       goto out_unlock;
+               onyx->analog_locked = 1;
+               err = 0;
+               goto out_unlock;
+       }
+#endif
+       switch (substream->runtime->rate) {
+       case 32000:
+       case 44100:
+       case 48000:
+               /* these rates are ok for all outputs */
+               /* FIXME: program spdif channel control bits here so that
+                *        userspace doesn't have to if it only plays pcm! */
+               err = 0;
+               goto out_unlock;
+       default:
+               /* got some rate that the digital output can't do,
+                * so disable and lock it */
+               onyx_read_register(cii->codec_data, ONYX_REG_DIG_INFO4, &v);
+               if (onyx_write_register(onyx,
+                                       ONYX_REG_DIG_INFO4,
+                                       v & ~ONYX_SPDIF_ENABLE))
+                       goto out_unlock;
+               onyx->spdif_locked = 1;
+               err = 0;
+               goto out_unlock;
+       }
+
+ out_unlock:
+       mutex_unlock(&onyx->mutex);
+
+       return err;
+}
+
+static int onyx_open(struct codec_info_item *cii,
+                    struct snd_pcm_substream *substream)
+{
+       struct onyx *onyx = cii->codec_data;
+
+       mutex_lock(&onyx->mutex);
+       onyx->open_count++;
+       mutex_unlock(&onyx->mutex);
+
+       return 0;
+}
+
+static int onyx_close(struct codec_info_item *cii,
+                     struct snd_pcm_substream *substream)
+{
+       struct onyx *onyx = cii->codec_data;
+
+       mutex_lock(&onyx->mutex);
+       onyx->open_count--;
+       if (!onyx->open_count)
+               onyx->spdif_locked = onyx->analog_locked = 0;
+       mutex_unlock(&onyx->mutex);
+
+       return 0;
+}
+
+static int onyx_switch_clock(struct codec_info_item *cii,
+                            enum clock_switch what)
+{
+       struct onyx *onyx = cii->codec_data;
+
+       mutex_lock(&onyx->mutex);
+       /* this *MUST* be more elaborate later... */
+       switch (what) {
+       case CLOCK_SWITCH_PREPARE_SLAVE:
+               onyx->codec.gpio->methods->all_amps_off(onyx->codec.gpio);
+               break;
+       case CLOCK_SWITCH_SLAVE:
+               onyx->codec.gpio->methods->all_amps_restore(onyx->codec.gpio);
+               break;
+       default: /* silence warning */
+               break;
+       }
+       mutex_unlock(&onyx->mutex);
+
+       return 0;
+}
+
+#ifdef CONFIG_PM
+
+static int onyx_suspend(struct codec_info_item *cii, pm_message_t state)
+{
+       struct onyx *onyx = cii->codec_data;
+       u8 v;
+       int err = -ENXIO;
+
+       mutex_lock(&onyx->mutex);
+       if (onyx_read_register(onyx, ONYX_REG_CONTROL, &v))
+               goto out_unlock;
+       onyx_write_register(onyx, ONYX_REG_CONTROL, v | ONYX_ADPSV | ONYX_DAPSV);
+       /* Apple does a sleep here but the datasheet says to do it on resume */
+       err = 0;
+ out_unlock:
+       mutex_unlock(&onyx->mutex);
+
+       return err;
+}
+
+static int onyx_resume(struct codec_info_item *cii)
+{
+       struct onyx *onyx = cii->codec_data;
+       u8 v;
+       int err = -ENXIO;
+
+       mutex_lock(&onyx->mutex);
+
+       /* reset codec */
+       onyx->codec.gpio->methods->set_hw_reset(onyx->codec.gpio, 0);
+       msleep(1);
+       onyx->codec.gpio->methods->set_hw_reset(onyx->codec.gpio, 1);
+       msleep(1);
+       onyx->codec.gpio->methods->set_hw_reset(onyx->codec.gpio, 0);
+       msleep(1);
+
+       /* take codec out of suspend (if it still is after reset) */
+       if (onyx_read_register(onyx, ONYX_REG_CONTROL, &v))
+               goto out_unlock;
+       onyx_write_register(onyx, ONYX_REG_CONTROL, v & ~(ONYX_ADPSV | ONYX_DAPSV));
+       /* FIXME: should divide by sample rate, but 8k is the lowest we go */
+       msleep(2205000/8000);
+       /* reset all values */
+       onyx_register_init(onyx);
+       err = 0;
+ out_unlock:
+       mutex_unlock(&onyx->mutex);
+
+       return err;
+}
+
+#endif /* CONFIG_PM */
+
+static struct codec_info onyx_codec_info = {
+       .transfers = onyx_transfers,
+       .sysclock_factor = 256,
+       .bus_factor = 64,
+       .owner = THIS_MODULE,
+       .usable = onyx_usable,
+       .prepare = onyx_prepare,
+       .open = onyx_open,
+       .close = onyx_close,
+       .switch_clock = onyx_switch_clock,
+#ifdef CONFIG_PM
+       .suspend = onyx_suspend,
+       .resume = onyx_resume,
+#endif
+};
+
+static int onyx_init_codec(struct aoa_codec *codec)
+{
+       struct onyx *onyx = codec_to_onyx(codec);
+       struct snd_kcontrol *ctl;
+       struct codec_info *ci = &onyx_codec_info;
+       u8 v;
+       int err;
+
+       if (!onyx->codec.gpio || !onyx->codec.gpio->methods) {
+               printk(KERN_ERR PFX "gpios not assigned!!\n");
+               return -EINVAL;
+       }
+
+       onyx->codec.gpio->methods->set_hw_reset(onyx->codec.gpio, 0);
+       msleep(1);
+       onyx->codec.gpio->methods->set_hw_reset(onyx->codec.gpio, 1);
+       msleep(1);
+       onyx->codec.gpio->methods->set_hw_reset(onyx->codec.gpio, 0);
+       msleep(1);
+
+       if (onyx_register_init(onyx)) {
+               printk(KERN_ERR PFX "failed to initialise onyx registers\n");
+               return -ENODEV;
+       }
+
+       if (aoa_snd_device_new(SNDRV_DEV_LOWLEVEL, onyx, &ops)) {
+               printk(KERN_ERR PFX "failed to create onyx snd device!\n");
+               return -ENODEV;
+       }
+
+       /* nothing connected? what a joke! */
+       if ((onyx->codec.connected & 0xF) == 0)
+               return -ENOTCONN;
+
+       /* if no inputs are present... */
+       if ((onyx->codec.connected & 0xC) == 0) {
+               if (!onyx->codec_info)
+                       onyx->codec_info = kmalloc(sizeof(struct codec_info), GFP_KERNEL);
+               if (!onyx->codec_info)
+                       return -ENOMEM;
+               ci = onyx->codec_info;
+               *ci = onyx_codec_info;
+               ci->transfers++;
+       }
+
+       /* if no outputs are present... */
+       if ((onyx->codec.connected & 3) == 0) {
+               if (!onyx->codec_info)
+                       onyx->codec_info = kmalloc(sizeof(struct codec_info), GFP_KERNEL);
+               if (!onyx->codec_info)
+                       return -ENOMEM;
+               ci = onyx->codec_info;
+               /* this is fine as there have to be inputs
+                * if we end up in this part of the code */
+               *ci = onyx_codec_info;
+               ci->transfers[1].formats = 0;
+       }
+
+       if (onyx->codec.soundbus_dev->attach_codec(onyx->codec.soundbus_dev,
+                                                  aoa_get_card(),
+                                                  ci, onyx)) {
+               printk(KERN_ERR PFX "error creating onyx pcm\n");
+               return -ENODEV;
+       }
+#define ADDCTL(n)                                                      \
+       do {                                                            \
+               ctl = snd_ctl_new1(&n, onyx);                           \
+               if (ctl) {                                              \
+                       ctl->id.device =                                \
+                               onyx->codec.soundbus_dev->pcm->device;  \
+                       err = aoa_snd_ctl_add(ctl);                     \
+                       if (err)                                        \
+                               goto error;                             \
+               }                                                       \
+       } while (0)
+
+       if (onyx->codec.soundbus_dev->pcm) {
+               /* give the user appropriate controls
+                * depending on what inputs are connected */
+               if ((onyx->codec.connected & 0xC) == 0xC)
+                       ADDCTL(capture_source_control);
+               else if (onyx->codec.connected & 4)
+                       onyx_set_capture_source(onyx, 0);
+               else
+                       onyx_set_capture_source(onyx, 1);
+               if (onyx->codec.connected & 0xC)
+                       ADDCTL(inputgain_control);
+
+               /* depending on what output is connected,
+                * give the user appropriate controls */
+               if (onyx->codec.connected & 1) {
+                       ADDCTL(volume_control);
+                       ADDCTL(mute_control);
+                       ADDCTL(ovr1_control);
+                       ADDCTL(flt0_control);
+                       ADDCTL(hpf_control);
+                       ADDCTL(dm12_control);
+                       /* spdif control defaults to off */
+               }
+               if (onyx->codec.connected & 2) {
+                       ADDCTL(onyx_spdif_mask);
+                       ADDCTL(onyx_spdif_ctrl);
+               }
+               if ((onyx->codec.connected & 3) == 3)
+                       ADDCTL(spdif_control);
+               /* if only S/PDIF is connected, enable it unconditionally */
+               if ((onyx->codec.connected & 3) == 2) {
+                       onyx_read_register(onyx, ONYX_REG_DIG_INFO4, &v);
+                       v |= ONYX_SPDIF_ENABLE;
+                       onyx_write_register(onyx, ONYX_REG_DIG_INFO4, v);
+               }
+       }
+#undef ADDCTL
+       printk(KERN_INFO PFX "attached to onyx codec via i2c\n");
+
+       return 0;
+ error:
+       onyx->codec.soundbus_dev->detach_codec(onyx->codec.soundbus_dev, onyx);
+       snd_device_free(aoa_get_card(), onyx);
+       return err;
+}
+
+static void onyx_exit_codec(struct aoa_codec *codec)
+{
+       struct onyx *onyx = codec_to_onyx(codec);
+
+       if (!onyx->codec.soundbus_dev) {
+               printk(KERN_ERR PFX "onyx_exit_codec called without soundbus_dev!\n");
+               return;
+       }
+       onyx->codec.soundbus_dev->detach_codec(onyx->codec.soundbus_dev, onyx);
+}
+
+static struct i2c_driver onyx_driver;
+
+static int onyx_create(struct i2c_adapter *adapter,
+                      struct device_node *node,
+                      int addr)
+{
+       struct onyx *onyx;
+       u8 dummy;
+
+       onyx = kzalloc(sizeof(struct onyx), GFP_KERNEL);
+
+       if (!onyx)
+               return -ENOMEM;
+
+       mutex_init(&onyx->mutex);
+       onyx->i2c.driver = &onyx_driver;
+       onyx->i2c.adapter = adapter;
+       onyx->i2c.addr = addr & 0x7f;
+       strlcpy(onyx->i2c.name, "onyx audio codec", I2C_NAME_SIZE);
+
+       if (i2c_attach_client(&onyx->i2c)) {
+               printk(KERN_ERR PFX "failed to attach to i2c\n");
+               goto fail;
+       }
+
+       /* we try to read from register ONYX_REG_CONTROL
+        * to check if the codec is present */
+       if (onyx_read_register(onyx, ONYX_REG_CONTROL, &dummy) != 0) {
+               i2c_detach_client(&onyx->i2c);
+               printk(KERN_ERR PFX "failed to read control register\n");
+               goto fail;
+       }
+
+       strlcpy(onyx->codec.name, "onyx", MAX_CODEC_NAME_LEN);
+       onyx->codec.owner = THIS_MODULE;
+       onyx->codec.init = onyx_init_codec;
+       onyx->codec.exit = onyx_exit_codec;
+       onyx->codec.node = of_node_get(node);
+
+       if (aoa_codec_register(&onyx->codec)) {
+               i2c_detach_client(&onyx->i2c);
+               goto fail;
+       }
+       printk(KERN_DEBUG PFX "created and attached onyx instance\n");
+       return 0;
+ fail:
+       kfree(onyx);
+       return -EINVAL;
+}
+
+static int onyx_i2c_attach(struct i2c_adapter *adapter)
+{
+       struct device_node *busnode, *dev = NULL;
+       struct pmac_i2c_bus *bus;
+
+       bus = pmac_i2c_adapter_to_bus(adapter);
+       if (bus == NULL)
+               return -ENODEV;
+       busnode = pmac_i2c_get_bus_node(bus);
+
+       while ((dev = of_get_next_child(busnode, dev)) != NULL) {
+               if (of_device_is_compatible(dev, "pcm3052")) {
+                       const u32 *addr;
+                       printk(KERN_DEBUG PFX "found pcm3052\n");
+                       addr = of_get_property(dev, "reg", NULL);
+                       if (!addr)
+                               return -ENODEV;
+                       return onyx_create(adapter, dev, (*addr)>>1);
+               }
+       }
+
+       /* if that didn't work, try desperate mode for older
+        * machines that have stuff missing from the device tree */
+
+       if (!of_device_is_compatible(busnode, "k2-i2c"))
+               return -ENODEV;
+
+       printk(KERN_DEBUG PFX "found k2-i2c, checking if onyx chip is on it\n");
+       /* probe both possible addresses for the onyx chip */
+       if (onyx_create(adapter, NULL, 0x46) == 0)
+               return 0;
+       return onyx_create(adapter, NULL, 0x47);
+}
+
+static int onyx_i2c_detach(struct i2c_client *client)
+{
+       struct onyx *onyx = container_of(client, struct onyx, i2c);
+       int err;
+
+       if ((err = i2c_detach_client(client)))
+               return err;
+       aoa_codec_unregister(&onyx->codec);
+       of_node_put(onyx->codec.node);
+       if (onyx->codec_info)
+               kfree(onyx->codec_info);
+       kfree(onyx);
+       return 0;
+}
+
+static struct i2c_driver onyx_driver = {
+       .driver = {
+               .name = "aoa_codec_onyx",
+               .owner = THIS_MODULE,
+       },
+       .attach_adapter = onyx_i2c_attach,
+       .detach_client = onyx_i2c_detach,
+};
+
+static int __init onyx_init(void)
+{
+       return i2c_add_driver(&onyx_driver);
+}
+
+static void __exit onyx_exit(void)
+{
+       i2c_del_driver(&onyx_driver);
+}
+
+module_init(onyx_init);
+module_exit(onyx_exit);
diff --git a/sound/aoa/codecs/onyx.h b/sound/aoa/codecs/onyx.h

new file mode 100644 (file)

index 0000000..ffd2025
--- /dev/null
+++ b/sound/aoa/codecs/onyx.h
@@ -0,0 +1,75 @@
+/*
+ * Apple Onboard Audio driver for Onyx codec (header)
+ *
+ * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
+ *
+ * GPL v2, can be found in COPYING.
+ */
+#ifndef __SND_AOA_CODEC_ONYX_H
+#define __SND_AOA_CODEC_ONYX_H
+#include <stddef.h>
+#include <linux/i2c.h>
+#include <asm/pmac_low_i2c.h>
+#include <asm/prom.h>
+
+/* PCM3052 register definitions */
+
+/* the attenuation registers take values from
+ * -1 (0dB) to -127 (-63.0 dB) or others (muted) */
+#define ONYX_REG_DAC_ATTEN_LEFT                65
+#define FIRSTREGISTER                  ONYX_REG_DAC_ATTEN_LEFT
+#define ONYX_REG_DAC_ATTEN_RIGHT       66
+
+#define ONYX_REG_CONTROL               67
+#      define ONYX_MRST                (1<<7)
+#      define ONYX_SRST                (1<<6)
+#      define ONYX_ADPSV               (1<<5)
+#      define ONYX_DAPSV               (1<<4)
+#      define ONYX_SILICONVERSION      (1<<0)
+/* all others reserved */
+
+#define ONYX_REG_DAC_CONTROL           68
+#      define ONYX_OVR1                (1<<6)
+#      define ONYX_MUTE_RIGHT          (1<<1)
+#      define ONYX_MUTE_LEFT           (1<<0)
+
+#define ONYX_REG_DAC_DEEMPH            69
+#      define ONYX_DIGDEEMPH_SHIFT     5
+#      define ONYX_DIGDEEMPH_MASK      (3<<ONYX_DIGDEEMPH_SHIFT)
+#      define ONYX_DIGDEEMPH_CTRL      (1<<4)
+
+#define ONYX_REG_DAC_FILTER            70
+#      define ONYX_ROLLOFF_FAST        (1<<5)
+#      define ONYX_DAC_FILTER_ALWAYS   (1<<2)
+
+#define        ONYX_REG_DAC_OUTPHASE           71
+#      define ONYX_OUTPHASE_INVERTED   (1<<0)
+
+#define ONYX_REG_ADC_CONTROL           72
+#      define ONYX_ADC_INPUT_MIC       (1<<5)
+/* 8 + input gain in dB, valid range for input gain is -4 .. 20 dB */
+#      define ONYX_ADC_PGA_GAIN_MASK   0x1f
+
+#define ONYX_REG_ADC_HPF_BYPASS                75
+#      define ONYX_HPF_DISABLE         (1<<3)
+#      define ONYX_ADC_HPF_ALWAYS      (1<<2)
+
+#define ONYX_REG_DIG_INFO1             77
+#      define ONYX_MASK_DIN_TO_BPZ     (1<<7)
+/* bits 1-5 control channel bits 1-5 */
+#      define ONYX_DIGOUT_DISABLE      (1<<0)
+
+#define ONYX_REG_DIG_INFO2             78
+/* controls channel bits 8-15 */
+
+#define ONYX_REG_DIG_INFO3             79
+/* control channel bits 24-29, high 2 bits reserved */
+
+#define ONYX_REG_DIG_INFO4             80
+#      define ONYX_VALIDL              (1<<7)
+#      define ONYX_VALIDR              (1<<6)
+#      define ONYX_SPDIF_ENABLE        (1<<5)
+/* lower 4 bits control bits 32-35 of channel control and word length */
+#      define ONYX_WORDLEN_MASK        (0xF)
+
+#endif /* __SND_AOA_CODEC_ONYX_H */
diff --git a/sound/aoa/codecs/snd-aoa-codec-onyx.c b/sound/aoa/codecs/snd-aoa-codec-onyx.c

deleted file mode 100644 (file)

index 6a3837d..0000000
--- a/sound/aoa/codecs/snd-aoa-codec-onyx.c
+++ /dev/null
@@ -1,1118 +0,0 @@
-/*
- * Apple Onboard Audio driver for Onyx codec
- *
- * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
- *
- * GPL v2, can be found in COPYING.
- *
- *
- * This is a driver for the pcm3052 codec chip (codenamed Onyx)
- * that is present in newer Apple hardware (with digital output).
- *
- * The Onyx codec has the following connections (listed by the bit
- * to be used in aoa_codec.connected):
- *  0: analog output
- *  1: digital output
- *  2: line input
- *  3: microphone input
- * Note that even though I know of no machine that has for example
- * the digital output connected but not the analog, I have handled
- * all the different cases in the code so that this driver may serve
- * as a good example of what to do.
- *
- * NOTE: This driver assumes that there's at most one chip to be
- *      used with one alsa card, in form of creating all kinds
- *      of mixer elements without regard for their existence.
- *      But snd-aoa assumes that there's at most one card, so
- *      this means you can only have one onyx on a system. This
- *      should probably be fixed by changing the assumption of
- *      having just a single card on a system, and making the
- *      'card' pointer accessible to anyone who needs it instead
- *      of hiding it in the aoa_snd_* functions...
- *
- */
-#include <linux/delay.h>
-#include <linux/module.h>
-MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("pcm3052 (onyx) codec driver for snd-aoa");
-
-#include "snd-aoa-codec-onyx.h"
-#include "../aoa.h"
-#include "../soundbus/soundbus.h"
-
-
-#define PFX "snd-aoa-codec-onyx: "
-
-struct onyx {
-       /* cache registers 65 to 80, they are write-only! */
-       u8                      cache[16];
-       struct i2c_client       i2c;
-       struct aoa_codec        codec;
-       u32                     initialised:1,
-                               spdif_locked:1,
-                               analog_locked:1,
-                               original_mute:2;
-       int                     open_count;
-       struct codec_info       *codec_info;
-
-       /* mutex serializes concurrent access to the device
-        * and this structure.
-        */
-       struct mutex mutex;
-};
-#define codec_to_onyx(c) container_of(c, struct onyx, codec)
-
-/* both return 0 if all ok, else on error */
-static int onyx_read_register(struct onyx *onyx, u8 reg, u8 *value)
-{
-       s32 v;
-
-       if (reg != ONYX_REG_CONTROL) {
-               *value = onyx->cache[reg-FIRSTREGISTER];
-               return 0;
-       }
-       v = i2c_smbus_read_byte_data(&onyx->i2c, reg);
-       if (v < 0)
-               return -1;
-       *value = (u8)v;
-       onyx->cache[ONYX_REG_CONTROL-FIRSTREGISTER] = *value;
-       return 0;
-}
-
-static int onyx_write_register(struct onyx *onyx, u8 reg, u8 value)
-{
-       int result;
-
-       result = i2c_smbus_write_byte_data(&onyx->i2c, reg, value);
-       if (!result)
-               onyx->cache[reg-FIRSTREGISTER] = value;
-       return result;
-}
-
-/* alsa stuff */
-
-static int onyx_dev_register(struct snd_device *dev)
-{
-       return 0;
-}
-
-static struct snd_device_ops ops = {
-       .dev_register = onyx_dev_register,
-};
-
-/* this is necessary because most alsa mixer programs
- * can't properly handle the negative range */
-#define VOLUME_RANGE_SHIFT     128
-
-static int onyx_snd_vol_info(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_info *uinfo)
-{
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-       uinfo->count = 2;
-       uinfo->value.integer.min = -128 + VOLUME_RANGE_SHIFT;
-       uinfo->value.integer.max = -1 + VOLUME_RANGE_SHIFT;
-       return 0;
-}
-
-static int onyx_snd_vol_get(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
-       s8 l, r;
-
-       mutex_lock(&onyx->mutex);
-       onyx_read_register(onyx, ONYX_REG_DAC_ATTEN_LEFT, &l);
-       onyx_read_register(onyx, ONYX_REG_DAC_ATTEN_RIGHT, &r);
-       mutex_unlock(&onyx->mutex);
-
-       ucontrol->value.integer.value[0] = l + VOLUME_RANGE_SHIFT;
-       ucontrol->value.integer.value[1] = r + VOLUME_RANGE_SHIFT;
-
-       return 0;
-}
-
-static int onyx_snd_vol_put(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
-       s8 l, r;
-
-       if (ucontrol->value.integer.value[0] < -128 + VOLUME_RANGE_SHIFT ||
-           ucontrol->value.integer.value[0] > -1 + VOLUME_RANGE_SHIFT)
-               return -EINVAL;
-       if (ucontrol->value.integer.value[1] < -128 + VOLUME_RANGE_SHIFT ||
-           ucontrol->value.integer.value[1] > -1 + VOLUME_RANGE_SHIFT)
-               return -EINVAL;
-
-       mutex_lock(&onyx->mutex);
-       onyx_read_register(onyx, ONYX_REG_DAC_ATTEN_LEFT, &l);
-       onyx_read_register(onyx, ONYX_REG_DAC_ATTEN_RIGHT, &r);
-
-       if (l + VOLUME_RANGE_SHIFT == ucontrol->value.integer.value[0] &&
-           r + VOLUME_RANGE_SHIFT == ucontrol->value.integer.value[1]) {
-               mutex_unlock(&onyx->mutex);
-               return 0;
-       }
-
-       onyx_write_register(onyx, ONYX_REG_DAC_ATTEN_LEFT,
-                           ucontrol->value.integer.value[0]
-                            - VOLUME_RANGE_SHIFT);
-       onyx_write_register(onyx, ONYX_REG_DAC_ATTEN_RIGHT,
-                           ucontrol->value.integer.value[1]
-                            - VOLUME_RANGE_SHIFT);
-       mutex_unlock(&onyx->mutex);
-
-       return 1;
-}
-
-static struct snd_kcontrol_new volume_control = {
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-       .name = "Master Playback Volume",
-       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
-       .info = onyx_snd_vol_info,
-       .get = onyx_snd_vol_get,
-       .put = onyx_snd_vol_put,
-};
-
-/* like above, this is necessary because a lot
- * of alsa mixer programs don't handle ranges
- * that don't start at 0 properly.
- * even alsamixer is one of them... */
-#define INPUTGAIN_RANGE_SHIFT  (-3)
-
-static int onyx_snd_inputgain_info(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_info *uinfo)
-{
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-       uinfo->count = 1;
-       uinfo->value.integer.min = 3 + INPUTGAIN_RANGE_SHIFT;
-       uinfo->value.integer.max = 28 + INPUTGAIN_RANGE_SHIFT;
-       return 0;
-}
-
-static int onyx_snd_inputgain_get(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
-       u8 ig;
-
-       mutex_lock(&onyx->mutex);
-       onyx_read_register(onyx, ONYX_REG_ADC_CONTROL, &ig);
-       mutex_unlock(&onyx->mutex);
-
-       ucontrol->value.integer.value[0] =
-               (ig & ONYX_ADC_PGA_GAIN_MASK) + INPUTGAIN_RANGE_SHIFT;
-
-       return 0;
-}
-
-static int onyx_snd_inputgain_put(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
-       u8 v, n;
-
-       if (ucontrol->value.integer.value[0] < 3 + INPUTGAIN_RANGE_SHIFT ||
-           ucontrol->value.integer.value[0] > 28 + INPUTGAIN_RANGE_SHIFT)
-               return -EINVAL;
-       mutex_lock(&onyx->mutex);
-       onyx_read_register(onyx, ONYX_REG_ADC_CONTROL, &v);
-       n = v;
-       n &= ~ONYX_ADC_PGA_GAIN_MASK;
-       n |= (ucontrol->value.integer.value[0] - INPUTGAIN_RANGE_SHIFT)
-               & ONYX_ADC_PGA_GAIN_MASK;
-       onyx_write_register(onyx, ONYX_REG_ADC_CONTROL, n);
-       mutex_unlock(&onyx->mutex);
-
-       return n != v;
-}
-
-static struct snd_kcontrol_new inputgain_control = {
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-       .name = "Master Capture Volume",
-       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
-       .info = onyx_snd_inputgain_info,
-       .get = onyx_snd_inputgain_get,
-       .put = onyx_snd_inputgain_put,
-};
-
-static int onyx_snd_capture_source_info(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_info *uinfo)
-{
-       static char *texts[] = { "Line-In", "Microphone" };
-
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-       uinfo->count = 1;
-       uinfo->value.enumerated.items = 2;
-       if (uinfo->value.enumerated.item > 1)
-               uinfo->value.enumerated.item = 1;
-       strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
-       return 0;
-}
-
-static int onyx_snd_capture_source_get(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
-       s8 v;
-
-       mutex_lock(&onyx->mutex);
-       onyx_read_register(onyx, ONYX_REG_ADC_CONTROL, &v);
-       mutex_unlock(&onyx->mutex);
-
-       ucontrol->value.enumerated.item[0] = !!(v&ONYX_ADC_INPUT_MIC);
-
-       return 0;
-}
-
-static void onyx_set_capture_source(struct onyx *onyx, int mic)
-{
-       s8 v;
-
-       mutex_lock(&onyx->mutex);
-       onyx_read_register(onyx, ONYX_REG_ADC_CONTROL, &v);
-       v &= ~ONYX_ADC_INPUT_MIC;
-       if (mic)
-               v |= ONYX_ADC_INPUT_MIC;
-       onyx_write_register(onyx, ONYX_REG_ADC_CONTROL, v);
-       mutex_unlock(&onyx->mutex);
-}
-
-static int onyx_snd_capture_source_put(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       if (ucontrol->value.enumerated.item[0] > 1)
-               return -EINVAL;
-       onyx_set_capture_source(snd_kcontrol_chip(kcontrol),
-                               ucontrol->value.enumerated.item[0]);
-       return 1;
-}
-
-static struct snd_kcontrol_new capture_source_control = {
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-       /* If we name this 'Input Source', it properly shows up in
-        * alsamixer as a selection, * but it's shown under the 
-        * 'Playback' category.
-        * If I name it 'Capture Source', it shows up in strange
-        * ways (two bools of which one can be selected at a
-        * time) but at least it's shown in the 'Capture'
-        * category.
-        * I was told that this was due to backward compatibility,
-        * but I don't understand then why the mangling is *not*
-        * done when I name it "Input Source".....
-        */
-       .name = "Capture Source",
-       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
-       .info = onyx_snd_capture_source_info,
-       .get = onyx_snd_capture_source_get,
-       .put = onyx_snd_capture_source_put,
-};
-
-#define onyx_snd_mute_info     snd_ctl_boolean_stereo_info
-
-static int onyx_snd_mute_get(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
-       u8 c;
-
-       mutex_lock(&onyx->mutex);
-       onyx_read_register(onyx, ONYX_REG_DAC_CONTROL, &c);
-       mutex_unlock(&onyx->mutex);
-
-       ucontrol->value.integer.value[0] = !(c & ONYX_MUTE_LEFT);
-       ucontrol->value.integer.value[1] = !(c & ONYX_MUTE_RIGHT);
-
-       return 0;
-}
-
-static int onyx_snd_mute_put(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
-       u8 v = 0, c = 0;
-       int err = -EBUSY;
-
-       mutex_lock(&onyx->mutex);
-       if (onyx->analog_locked)
-               goto out_unlock;
-
-       onyx_read_register(onyx, ONYX_REG_DAC_CONTROL, &v);
-       c = v;
-       c &= ~(ONYX_MUTE_RIGHT | ONYX_MUTE_LEFT);
-       if (!ucontrol->value.integer.value[0])
-               c |= ONYX_MUTE_LEFT;
-       if (!ucontrol->value.integer.value[1])
-               c |= ONYX_MUTE_RIGHT;
-       err = onyx_write_register(onyx, ONYX_REG_DAC_CONTROL, c);
-
- out_unlock:
-       mutex_unlock(&onyx->mutex);
-
-       return !err ? (v != c) : err;
-}
-
-static struct snd_kcontrol_new mute_control = {
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-       .name = "Master Playback Switch",
-       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
-       .info = onyx_snd_mute_info,
-       .get = onyx_snd_mute_get,
-       .put = onyx_snd_mute_put,
-};
-
-
-#define onyx_snd_single_bit_info       snd_ctl_boolean_mono_info
-
-#define FLAG_POLARITY_INVERT   1
-#define FLAG_SPDIFLOCK         2
-
-static int onyx_snd_single_bit_get(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
-       u8 c;
-       long int pv = kcontrol->private_value;
-       u8 polarity = (pv >> 16) & FLAG_POLARITY_INVERT;
-       u8 address = (pv >> 8) & 0xff;
-       u8 mask = pv & 0xff;
-
-       mutex_lock(&onyx->mutex);
-       onyx_read_register(onyx, address, &c);
-       mutex_unlock(&onyx->mutex);
-
-       ucontrol->value.integer.value[0] = !!(c & mask) ^ polarity;
-
-       return 0;
-}
-
-static int onyx_snd_single_bit_put(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
-       u8 v = 0, c = 0;
-       int err;
-       long int pv = kcontrol->private_value;
-       u8 polarity = (pv >> 16) & FLAG_POLARITY_INVERT;
-       u8 spdiflock = (pv >> 16) & FLAG_SPDIFLOCK;
-       u8 address = (pv >> 8) & 0xff;
-       u8 mask = pv & 0xff;
-
-       mutex_lock(&onyx->mutex);
-       if (spdiflock && onyx->spdif_locked) {
-               /* even if alsamixer doesn't care.. */
-               err = -EBUSY;
-               goto out_unlock;
-       }
-       onyx_read_register(onyx, address, &v);
-       c = v;
-       c &= ~(mask);
-       if (!!ucontrol->value.integer.value[0] ^ polarity)
-               c |= mask;
-       err = onyx_write_register(onyx, address, c);
-
- out_unlock:
-       mutex_unlock(&onyx->mutex);
-
-       return !err ? (v != c) : err;
-}
-
-#define SINGLE_BIT(n, type, description, address, mask, flags)         \
-static struct snd_kcontrol_new n##_control = {                         \
-       .iface = SNDRV_CTL_ELEM_IFACE_##type,                           \
-       .name = description,                                            \
-       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,                      \
-       .info = onyx_snd_single_bit_info,                               \
-       .get = onyx_snd_single_bit_get,                                 \
-       .put = onyx_snd_single_bit_put,                                 \
-       .private_value = (flags << 16) | (address << 8) | mask          \
-}
-
-SINGLE_BIT(spdif,
-          MIXER,
-          SNDRV_CTL_NAME_IEC958("", PLAYBACK, SWITCH),
-          ONYX_REG_DIG_INFO4,
-          ONYX_SPDIF_ENABLE,
-          FLAG_SPDIFLOCK);
-SINGLE_BIT(ovr1,
-          MIXER,
-          "Oversampling Rate",
-          ONYX_REG_DAC_CONTROL,
-          ONYX_OVR1,
-          0);
-SINGLE_BIT(flt0,
-          MIXER,
-          "Fast Digital Filter Rolloff",
-          ONYX_REG_DAC_FILTER,
-          ONYX_ROLLOFF_FAST,
-          FLAG_POLARITY_INVERT);
-SINGLE_BIT(hpf,
-          MIXER,
-          "Highpass Filter",
-          ONYX_REG_ADC_HPF_BYPASS,
-          ONYX_HPF_DISABLE,
-          FLAG_POLARITY_INVERT);
-SINGLE_BIT(dm12,
-          MIXER,
-          "Digital De-Emphasis",
-          ONYX_REG_DAC_DEEMPH,
-          ONYX_DIGDEEMPH_CTRL,
-          0);
-
-static int onyx_spdif_info(struct snd_kcontrol *kcontrol,
-                          struct snd_ctl_elem_info *uinfo)
-{
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
-       uinfo->count = 1;
-       return 0;
-}
-
-static int onyx_spdif_mask_get(struct snd_kcontrol *kcontrol,
-                              struct snd_ctl_elem_value *ucontrol)
-{
-       /* datasheet page 30, all others are 0 */
-       ucontrol->value.iec958.status[0] = 0x3e;
-       ucontrol->value.iec958.status[1] = 0xff;
-
-       ucontrol->value.iec958.status[3] = 0x3f;
-       ucontrol->value.iec958.status[4] = 0x0f;
-       
-       return 0;
-}
-
-static struct snd_kcontrol_new onyx_spdif_mask = {
-       .access =       SNDRV_CTL_ELEM_ACCESS_READ,
-       .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
-       .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
-       .info =         onyx_spdif_info,
-       .get =          onyx_spdif_mask_get,
-};
-
-static int onyx_spdif_get(struct snd_kcontrol *kcontrol,
-                         struct snd_ctl_elem_value *ucontrol)
-{
-       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
-       u8 v;
-
-       mutex_lock(&onyx->mutex);
-       onyx_read_register(onyx, ONYX_REG_DIG_INFO1, &v);
-       ucontrol->value.iec958.status[0] = v & 0x3e;
-
-       onyx_read_register(onyx, ONYX_REG_DIG_INFO2, &v);
-       ucontrol->value.iec958.status[1] = v;
-
-       onyx_read_register(onyx, ONYX_REG_DIG_INFO3, &v);
-       ucontrol->value.iec958.status[3] = v & 0x3f;
-
-       onyx_read_register(onyx, ONYX_REG_DIG_INFO4, &v);
-       ucontrol->value.iec958.status[4] = v & 0x0f;
-       mutex_unlock(&onyx->mutex);
-
-       return 0;
-}
-
-static int onyx_spdif_put(struct snd_kcontrol *kcontrol,
-                         struct snd_ctl_elem_value *ucontrol)
-{
-       struct onyx *onyx = snd_kcontrol_chip(kcontrol);
-       u8 v;
-
-       mutex_lock(&onyx->mutex);
-       onyx_read_register(onyx, ONYX_REG_DIG_INFO1, &v);
-       v = (v & ~0x3e) | (ucontrol->value.iec958.status[0] & 0x3e);
-       onyx_write_register(onyx, ONYX_REG_DIG_INFO1, v);
-
-       v = ucontrol->value.iec958.status[1];
-       onyx_write_register(onyx, ONYX_REG_DIG_INFO2, v);
-
-       onyx_read_register(onyx, ONYX_REG_DIG_INFO3, &v);
-       v = (v & ~0x3f) | (ucontrol->value.iec958.status[3] & 0x3f);
-       onyx_write_register(onyx, ONYX_REG_DIG_INFO3, v);
-
-       onyx_read_register(onyx, ONYX_REG_DIG_INFO4, &v);
-       v = (v & ~0x0f) | (ucontrol->value.iec958.status[4] & 0x0f);
-       onyx_write_register(onyx, ONYX_REG_DIG_INFO4, v);
-       mutex_unlock(&onyx->mutex);
-
-       return 1;
-}
-
-static struct snd_kcontrol_new onyx_spdif_ctrl = {
-       .access =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
-       .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
-       .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
-       .info =         onyx_spdif_info,
-       .get =          onyx_spdif_get,
-       .put =          onyx_spdif_put,
-};
-
-/* our registers */
-
-static u8 register_map[] = {
-       ONYX_REG_DAC_ATTEN_LEFT,
-       ONYX_REG_DAC_ATTEN_RIGHT,
-       ONYX_REG_CONTROL,
-       ONYX_REG_DAC_CONTROL,
-       ONYX_REG_DAC_DEEMPH,
-       ONYX_REG_DAC_FILTER,
-       ONYX_REG_DAC_OUTPHASE,
-       ONYX_REG_ADC_CONTROL,
-       ONYX_REG_ADC_HPF_BYPASS,
-       ONYX_REG_DIG_INFO1,
-       ONYX_REG_DIG_INFO2,
-       ONYX_REG_DIG_INFO3,
-       ONYX_REG_DIG_INFO4
-};
-
-static u8 initial_values[ARRAY_SIZE(register_map)] = {
-       0x80, 0x80, /* muted */
-       ONYX_MRST | ONYX_SRST, /* but handled specially! */
-       ONYX_MUTE_LEFT | ONYX_MUTE_RIGHT,
-       0, /* no deemphasis */
-       ONYX_DAC_FILTER_ALWAYS,
-       ONYX_OUTPHASE_INVERTED,
-       (-1 /*dB*/ + 8) & 0xF, /* line in selected, -1 dB gain*/
-       ONYX_ADC_HPF_ALWAYS,
-       (1<<2), /* pcm audio */
-       2,      /* category: pcm coder */
-       0,      /* sampling frequency 44.1 kHz, clock accuracy level II */
-       1       /* 24 bit depth */
-};
-
-/* reset registers of chip, either to initial or to previous values */
-static int onyx_register_init(struct onyx *onyx)
-{
-       int i;
-       u8 val;
-       u8 regs[sizeof(initial_values)];
-
-       if (!onyx->initialised) {
-               memcpy(regs, initial_values, sizeof(initial_values));
-               if (onyx_read_register(onyx, ONYX_REG_CONTROL, &val))
-                       return -1;
-               val &= ~ONYX_SILICONVERSION;
-               val |= initial_values[3];
-               regs[3] = val;
-       } else {
-               for (i=0; i<sizeof(register_map); i++)
-                       regs[i] = onyx->cache[register_map[i]-FIRSTREGISTER];
-       }
-
-       for (i=0; i<sizeof(register_map); i++) {
-               if (onyx_write_register(onyx, register_map[i], regs[i]))
-                       return -1;
-       }
-       onyx->initialised = 1;
-       return 0;
-}
-
-static struct transfer_info onyx_transfers[] = {
-       /* this is first so we can skip it if no input is present...
-        * No hardware exists with that, but it's here as an example
-        * of what to do :) */
-       {
-               /* analog input */
-               .formats = SNDRV_PCM_FMTBIT_S8 |
-                          SNDRV_PCM_FMTBIT_S16_BE |
-                          SNDRV_PCM_FMTBIT_S24_BE,
-               .rates = SNDRV_PCM_RATE_8000_96000,
-               .transfer_in = 1,
-               .must_be_clock_source = 0,
-               .tag = 0,
-       },
-       {
-               /* if analog and digital are currently off, anything should go,
-                * so this entry describes everything we can do... */
-               .formats = SNDRV_PCM_FMTBIT_S8 |
-                          SNDRV_PCM_FMTBIT_S16_BE |
-                          SNDRV_PCM_FMTBIT_S24_BE
-#ifdef SNDRV_PCM_FMTBIT_COMPRESSED_16BE
-                          | SNDRV_PCM_FMTBIT_COMPRESSED_16BE
-#endif
-               ,
-               .rates = SNDRV_PCM_RATE_8000_96000,
-               .tag = 0,
-       },
-       {
-               /* analog output */
-               .formats = SNDRV_PCM_FMTBIT_S8 |
-                          SNDRV_PCM_FMTBIT_S16_BE |
-                          SNDRV_PCM_FMTBIT_S24_BE,
-               .rates = SNDRV_PCM_RATE_8000_96000,
-               .transfer_in = 0,
-               .must_be_clock_source = 0,
-               .tag = 1,
-       },
-       {
-               /* digital pcm output, also possible for analog out */
-               .formats = SNDRV_PCM_FMTBIT_S8 |
-                          SNDRV_PCM_FMTBIT_S16_BE |
-                          SNDRV_PCM_FMTBIT_S24_BE,
-               .rates = SNDRV_PCM_RATE_32000 |
-                        SNDRV_PCM_RATE_44100 |
-                        SNDRV_PCM_RATE_48000,
-               .transfer_in = 0,
-               .must_be_clock_source = 0,
-               .tag = 2,
-       },
-#ifdef SNDRV_PCM_FMTBIT_COMPRESSED_16BE
-       /* Once alsa gets supports for this kind of thing we can add it... */
-       {
-               /* digital compressed output */
-               .formats =  SNDRV_PCM_FMTBIT_COMPRESSED_16BE,
-               .rates = SNDRV_PCM_RATE_32000 |
-                        SNDRV_PCM_RATE_44100 |
-                        SNDRV_PCM_RATE_48000,
-               .tag = 2,
-       },
-#endif
-       {}
-};
-
-static int onyx_usable(struct codec_info_item *cii,
-                      struct transfer_info *ti,
-                      struct transfer_info *out)
-{
-       u8 v;
-       struct onyx *onyx = cii->codec_data;
-       int spdif_enabled, analog_enabled;
-
-       mutex_lock(&onyx->mutex);
-       onyx_read_register(onyx, ONYX_REG_DIG_INFO4, &v);
-       spdif_enabled = !!(v & ONYX_SPDIF_ENABLE);
-       onyx_read_register(onyx, ONYX_REG_DAC_CONTROL, &v);
-       analog_enabled = 
-               (v & (ONYX_MUTE_RIGHT|ONYX_MUTE_LEFT))
-                != (ONYX_MUTE_RIGHT|ONYX_MUTE_LEFT);
-       mutex_unlock(&onyx->mutex);
-
-       switch (ti->tag) {
-       case 0: return 1;
-       case 1: return analog_enabled;
-       case 2: return spdif_enabled;
-       }
-       return 1;
-}
-
-static int onyx_prepare(struct codec_info_item *cii,
-                       struct bus_info *bi,
-                       struct snd_pcm_substream *substream)
-{
-       u8 v;
-       struct onyx *onyx = cii->codec_data;
-       int err = -EBUSY;
-
-       mutex_lock(&onyx->mutex);
-
-#ifdef SNDRV_PCM_FMTBIT_COMPRESSED_16BE
-       if (substream->runtime->format == SNDRV_PCM_FMTBIT_COMPRESSED_16BE) {
-               /* mute and lock analog output */
-               onyx_read_register(onyx, ONYX_REG_DAC_CONTROL, &v);
-               if (onyx_write_register(onyx,
-                                       ONYX_REG_DAC_CONTROL,
-                                       v | ONYX_MUTE_RIGHT | ONYX_MUTE_LEFT))
-                       goto out_unlock;
-               onyx->analog_locked = 1;
-               err = 0;
-               goto out_unlock;
-       }
-#endif
-       switch (substream->runtime->rate) {
-       case 32000:
-       case 44100:
-       case 48000:
-               /* these rates are ok for all outputs */
-               /* FIXME: program spdif channel control bits here so that
-                *        userspace doesn't have to if it only plays pcm! */
-               err = 0;
-               goto out_unlock;
-       default:
-               /* got some rate that the digital output can't do,
-                * so disable and lock it */
-               onyx_read_register(cii->codec_data, ONYX_REG_DIG_INFO4, &v);
-               if (onyx_write_register(onyx,
-                                       ONYX_REG_DIG_INFO4,
-                                       v & ~ONYX_SPDIF_ENABLE))
-                       goto out_unlock;
-               onyx->spdif_locked = 1;
-               err = 0;
-               goto out_unlock;
-       }
-
- out_unlock:
-       mutex_unlock(&onyx->mutex);
-
-       return err;
-}
-
-static int onyx_open(struct codec_info_item *cii,
-                    struct snd_pcm_substream *substream)
-{
-       struct onyx *onyx = cii->codec_data;
-
-       mutex_lock(&onyx->mutex);
-       onyx->open_count++;
-       mutex_unlock(&onyx->mutex);
-
-       return 0;
-}
-
-static int onyx_close(struct codec_info_item *cii,
-                     struct snd_pcm_substream *substream)
-{
-       struct onyx *onyx = cii->codec_data;
-
-       mutex_lock(&onyx->mutex);
-       onyx->open_count--;
-       if (!onyx->open_count)
-               onyx->spdif_locked = onyx->analog_locked = 0;
-       mutex_unlock(&onyx->mutex);
-
-       return 0;
-}
-
-static int onyx_switch_clock(struct codec_info_item *cii,
-                            enum clock_switch what)
-{
-       struct onyx *onyx = cii->codec_data;
-
-       mutex_lock(&onyx->mutex);
-       /* this *MUST* be more elaborate later... */
-       switch (what) {
-       case CLOCK_SWITCH_PREPARE_SLAVE:
-               onyx->codec.gpio->methods->all_amps_off(onyx->codec.gpio);
-               break;
-       case CLOCK_SWITCH_SLAVE:
-               onyx->codec.gpio->methods->all_amps_restore(onyx->codec.gpio);
-               break;
-       default: /* silence warning */
-               break;
-       }
-       mutex_unlock(&onyx->mutex);
-
-       return 0;
-}
-
-#ifdef CONFIG_PM
-
-static int onyx_suspend(struct codec_info_item *cii, pm_message_t state)
-{
-       struct onyx *onyx = cii->codec_data;
-       u8 v;
-       int err = -ENXIO;
-
-       mutex_lock(&onyx->mutex);
-       if (onyx_read_register(onyx, ONYX_REG_CONTROL, &v))
-               goto out_unlock;
-       onyx_write_register(onyx, ONYX_REG_CONTROL, v | ONYX_ADPSV | ONYX_DAPSV);
-       /* Apple does a sleep here but the datasheet says to do it on resume */
-       err = 0;
- out_unlock:
-       mutex_unlock(&onyx->mutex);
-
-       return err;
-}
-
-static int onyx_resume(struct codec_info_item *cii)
-{
-       struct onyx *onyx = cii->codec_data;
-       u8 v;
-       int err = -ENXIO;
-
-       mutex_lock(&onyx->mutex);
-
-       /* reset codec */
-       onyx->codec.gpio->methods->set_hw_reset(onyx->codec.gpio, 0);
-       msleep(1);
-       onyx->codec.gpio->methods->set_hw_reset(onyx->codec.gpio, 1);
-       msleep(1);
-       onyx->codec.gpio->methods->set_hw_reset(onyx->codec.gpio, 0);
-       msleep(1);
-
-       /* take codec out of suspend (if it still is after reset) */
-       if (onyx_read_register(onyx, ONYX_REG_CONTROL, &v))
-               goto out_unlock;
-       onyx_write_register(onyx, ONYX_REG_CONTROL, v & ~(ONYX_ADPSV | ONYX_DAPSV));
-       /* FIXME: should divide by sample rate, but 8k is the lowest we go */
-       msleep(2205000/8000);
-       /* reset all values */
-       onyx_register_init(onyx);
-       err = 0;
- out_unlock:
-       mutex_unlock(&onyx->mutex);
-
-       return err;
-}
-
-#endif /* CONFIG_PM */
-
-static struct codec_info onyx_codec_info = {
-       .transfers = onyx_transfers,
-       .sysclock_factor = 256,
-       .bus_factor = 64,
-       .owner = THIS_MODULE,
-       .usable = onyx_usable,
-       .prepare = onyx_prepare,
-       .open = onyx_open,
-       .close = onyx_close,
-       .switch_clock = onyx_switch_clock,
-#ifdef CONFIG_PM
-       .suspend = onyx_suspend,
-       .resume = onyx_resume,
-#endif
-};
-
-static int onyx_init_codec(struct aoa_codec *codec)
-{
-       struct onyx *onyx = codec_to_onyx(codec);
-       struct snd_kcontrol *ctl;
-       struct codec_info *ci = &onyx_codec_info;
-       u8 v;
-       int err;
-
-       if (!onyx->codec.gpio || !onyx->codec.gpio->methods) {
-               printk(KERN_ERR PFX "gpios not assigned!!\n");
-               return -EINVAL;
-       }
-
-       onyx->codec.gpio->methods->set_hw_reset(onyx->codec.gpio, 0);
-       msleep(1);
-       onyx->codec.gpio->methods->set_hw_reset(onyx->codec.gpio, 1);
-       msleep(1);
-       onyx->codec.gpio->methods->set_hw_reset(onyx->codec.gpio, 0);
-       msleep(1);
-       
-       if (onyx_register_init(onyx)) {
-               printk(KERN_ERR PFX "failed to initialise onyx registers\n");
-               return -ENODEV;
-       }
-
-       if (aoa_snd_device_new(SNDRV_DEV_LOWLEVEL, onyx, &ops)) {
-               printk(KERN_ERR PFX "failed to create onyx snd device!\n");
-               return -ENODEV;
-       }
-
-       /* nothing connected? what a joke! */
-       if ((onyx->codec.connected & 0xF) == 0)
-               return -ENOTCONN;
-
-       /* if no inputs are present... */
-       if ((onyx->codec.connected & 0xC) == 0) {
-               if (!onyx->codec_info)
-                       onyx->codec_info = kmalloc(sizeof(struct codec_info), GFP_KERNEL);
-               if (!onyx->codec_info)
-                       return -ENOMEM;
-               ci = onyx->codec_info;
-               *ci = onyx_codec_info;
-               ci->transfers++;
-       }
-
-       /* if no outputs are present... */
-       if ((onyx->codec.connected & 3) == 0) {
-               if (!onyx->codec_info)
-                       onyx->codec_info = kmalloc(sizeof(struct codec_info), GFP_KERNEL);
-               if (!onyx->codec_info)
-                       return -ENOMEM;
-               ci = onyx->codec_info;
-               /* this is fine as there have to be inputs
-                * if we end up in this part of the code */
-               *ci = onyx_codec_info;
-               ci->transfers[1].formats = 0;
-       }
-
-       if (onyx->codec.soundbus_dev->attach_codec(onyx->codec.soundbus_dev,
-                                                  aoa_get_card(),
-                                                  ci, onyx)) {
-               printk(KERN_ERR PFX "error creating onyx pcm\n");
-               return -ENODEV;
-       }
-#define ADDCTL(n)                                                      \
-       do {                                                            \
-               ctl = snd_ctl_new1(&n, onyx);                           \
-               if (ctl) {                                              \
-                       ctl->id.device =                                \
-                               onyx->codec.soundbus_dev->pcm->device;  \
-                       err = aoa_snd_ctl_add(ctl);                     \
-                       if (err)                                        \
-                               goto error;                             \
-               }                                                       \
-       } while (0)
-
-       if (onyx->codec.soundbus_dev->pcm) {
-               /* give the user appropriate controls
-                * depending on what inputs are connected */
-               if ((onyx->codec.connected & 0xC) == 0xC)
-                       ADDCTL(capture_source_control);
-               else if (onyx->codec.connected & 4)
-                       onyx_set_capture_source(onyx, 0);
-               else
-                       onyx_set_capture_source(onyx, 1);
-               if (onyx->codec.connected & 0xC)
-                       ADDCTL(inputgain_control);
-
-               /* depending on what output is connected,
-                * give the user appropriate controls */
-               if (onyx->codec.connected & 1) {
-                       ADDCTL(volume_control);
-                       ADDCTL(mute_control);
-                       ADDCTL(ovr1_control);
-                       ADDCTL(flt0_control);
-                       ADDCTL(hpf_control);
-                       ADDCTL(dm12_control);
-                       /* spdif control defaults to off */
-               }
-               if (onyx->codec.connected & 2) {
-                       ADDCTL(onyx_spdif_mask);
-                       ADDCTL(onyx_spdif_ctrl);
-               }
-               if ((onyx->codec.connected & 3) == 3)
-                       ADDCTL(spdif_control);
-               /* if only S/PDIF is connected, enable it unconditionally */
-               if ((onyx->codec.connected & 3) == 2) {
-                       onyx_read_register(onyx, ONYX_REG_DIG_INFO4, &v);
-                       v |= ONYX_SPDIF_ENABLE;
-                       onyx_write_register(onyx, ONYX_REG_DIG_INFO4, v);
-               }
-       }
-#undef ADDCTL
-       printk(KERN_INFO PFX "attached to onyx codec via i2c\n");
-
-       return 0;
- error:
-       onyx->codec.soundbus_dev->detach_codec(onyx->codec.soundbus_dev, onyx);
-       snd_device_free(aoa_get_card(), onyx);
-       return err;
-}
-
-static void onyx_exit_codec(struct aoa_codec *codec)
-{
-       struct onyx *onyx = codec_to_onyx(codec);
-
-       if (!onyx->codec.soundbus_dev) {
-               printk(KERN_ERR PFX "onyx_exit_codec called without soundbus_dev!\n");
-               return;
-       }
-       onyx->codec.soundbus_dev->detach_codec(onyx->codec.soundbus_dev, onyx);
-}
-
-static struct i2c_driver onyx_driver;
-
-static int onyx_create(struct i2c_adapter *adapter,
-                      struct device_node *node,
-                      int addr)
-{
-       struct onyx *onyx;
-       u8 dummy;
-
-       onyx = kzalloc(sizeof(struct onyx), GFP_KERNEL);
-
-       if (!onyx)
-               return -ENOMEM;
-
-       mutex_init(&onyx->mutex);
-       onyx->i2c.driver = &onyx_driver;
-       onyx->i2c.adapter = adapter;
-       onyx->i2c.addr = addr & 0x7f;
-       strlcpy(onyx->i2c.name, "onyx audio codec", I2C_NAME_SIZE);
-
-       if (i2c_attach_client(&onyx->i2c)) {
-               printk(KERN_ERR PFX "failed to attach to i2c\n");
-               goto fail;
-       }
-
-       /* we try to read from register ONYX_REG_CONTROL
-        * to check if the codec is present */
-       if (onyx_read_register(onyx, ONYX_REG_CONTROL, &dummy) != 0) {
-               i2c_detach_client(&onyx->i2c);
-               printk(KERN_ERR PFX "failed to read control register\n");
-               goto fail;
-       }
-
-       strlcpy(onyx->codec.name, "onyx", MAX_CODEC_NAME_LEN);
-       onyx->codec.owner = THIS_MODULE;
-       onyx->codec.init = onyx_init_codec;
-       onyx->codec.exit = onyx_exit_codec;
-       onyx->codec.node = of_node_get(node);
-
-       if (aoa_codec_register(&onyx->codec)) {
-               i2c_detach_client(&onyx->i2c);
-               goto fail;
-       }
-       printk(KERN_DEBUG PFX "created and attached onyx instance\n");
-       return 0;
- fail:
-       kfree(onyx);
-       return -EINVAL;
-}
-
-static int onyx_i2c_attach(struct i2c_adapter *adapter)
-{
-       struct device_node *busnode, *dev = NULL;
-       struct pmac_i2c_bus *bus;
-
-       bus = pmac_i2c_adapter_to_bus(adapter);
-       if (bus == NULL)
-               return -ENODEV;
-       busnode = pmac_i2c_get_bus_node(bus);
-
-       while ((dev = of_get_next_child(busnode, dev)) != NULL) {
-               if (of_device_is_compatible(dev, "pcm3052")) {
-                       const u32 *addr;
-                       printk(KERN_DEBUG PFX "found pcm3052\n");
-                       addr = of_get_property(dev, "reg", NULL);
-                       if (!addr)
-                               return -ENODEV;
-                       return onyx_create(adapter, dev, (*addr)>>1);
-               }
-       }
-
-       /* if that didn't work, try desperate mode for older
-        * machines that have stuff missing from the device tree */
-       
-       if (!of_device_is_compatible(busnode, "k2-i2c"))
-               return -ENODEV;
-
-       printk(KERN_DEBUG PFX "found k2-i2c, checking if onyx chip is on it\n");
-       /* probe both possible addresses for the onyx chip */
-       if (onyx_create(adapter, NULL, 0x46) == 0)
-               return 0;
-       return onyx_create(adapter, NULL, 0x47);
-}
-
-static int onyx_i2c_detach(struct i2c_client *client)
-{
-       struct onyx *onyx = container_of(client, struct onyx, i2c);
-       int err;
-
-       if ((err = i2c_detach_client(client)))
-               return err;
-       aoa_codec_unregister(&onyx->codec);
-       of_node_put(onyx->codec.node);
-       if (onyx->codec_info)
-               kfree(onyx->codec_info);
-       kfree(onyx);
-       return 0;
-}
-
-static struct i2c_driver onyx_driver = {
-       .driver = {
-               .name = "aoa_codec_onyx",
-               .owner = THIS_MODULE,
-       },
-       .attach_adapter = onyx_i2c_attach,
-       .detach_client = onyx_i2c_detach,
-};
-
-static int __init onyx_init(void)
-{
-       return i2c_add_driver(&onyx_driver);
-}
-
-static void __exit onyx_exit(void)
-{
-       i2c_del_driver(&onyx_driver);
-}
-
-module_init(onyx_init);
-module_exit(onyx_exit);
diff --git a/sound/aoa/codecs/snd-aoa-codec-onyx.h b/sound/aoa/codecs/snd-aoa-codec-onyx.h

deleted file mode 100644 (file)

index ffd2025..0000000
--- a/sound/aoa/codecs/snd-aoa-codec-onyx.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Apple Onboard Audio driver for Onyx codec (header)
- *
- * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
- *
- * GPL v2, can be found in COPYING.
- */
-#ifndef __SND_AOA_CODEC_ONYX_H
-#define __SND_AOA_CODEC_ONYX_H
-#include <stddef.h>
-#include <linux/i2c.h>
-#include <asm/pmac_low_i2c.h>
-#include <asm/prom.h>
-
-/* PCM3052 register definitions */
-
-/* the attenuation registers take values from
- * -1 (0dB) to -127 (-63.0 dB) or others (muted) */
-#define ONYX_REG_DAC_ATTEN_LEFT                65
-#define FIRSTREGISTER                  ONYX_REG_DAC_ATTEN_LEFT
-#define ONYX_REG_DAC_ATTEN_RIGHT       66
-
-#define ONYX_REG_CONTROL               67
-#      define ONYX_MRST                (1<<7)
-#      define ONYX_SRST                (1<<6)
-#      define ONYX_ADPSV               (1<<5)
-#      define ONYX_DAPSV               (1<<4)
-#      define ONYX_SILICONVERSION      (1<<0)
-/* all others reserved */
-
-#define ONYX_REG_DAC_CONTROL           68
-#      define ONYX_OVR1                (1<<6)
-#      define ONYX_MUTE_RIGHT          (1<<1)
-#      define ONYX_MUTE_LEFT           (1<<0)
-
-#define ONYX_REG_DAC_DEEMPH            69
-#      define ONYX_DIGDEEMPH_SHIFT     5
-#      define ONYX_DIGDEEMPH_MASK      (3<<ONYX_DIGDEEMPH_SHIFT)
-#      define ONYX_DIGDEEMPH_CTRL      (1<<4)
-
-#define ONYX_REG_DAC_FILTER            70
-#      define ONYX_ROLLOFF_FAST        (1<<5)
-#      define ONYX_DAC_FILTER_ALWAYS   (1<<2)
-
-#define        ONYX_REG_DAC_OUTPHASE           71
-#      define ONYX_OUTPHASE_INVERTED   (1<<0)
-
-#define ONYX_REG_ADC_CONTROL           72
-#      define ONYX_ADC_INPUT_MIC       (1<<5)
-/* 8 + input gain in dB, valid range for input gain is -4 .. 20 dB */
-#      define ONYX_ADC_PGA_GAIN_MASK   0x1f
-
-#define ONYX_REG_ADC_HPF_BYPASS                75
-#      define ONYX_HPF_DISABLE         (1<<3)
-#      define ONYX_ADC_HPF_ALWAYS      (1<<2)
-
-#define ONYX_REG_DIG_INFO1             77
-#      define ONYX_MASK_DIN_TO_BPZ     (1<<7)
-/* bits 1-5 control channel bits 1-5 */
-#      define ONYX_DIGOUT_DISABLE      (1<<0)
-
-#define ONYX_REG_DIG_INFO2             78
-/* controls channel bits 8-15 */
-
-#define ONYX_REG_DIG_INFO3             79
-/* control channel bits 24-29, high 2 bits reserved */
-
-#define ONYX_REG_DIG_INFO4             80
-#      define ONYX_VALIDL              (1<<7)
-#      define ONYX_VALIDR              (1<<6)
-#      define ONYX_SPDIF_ENABLE        (1<<5)
-/* lower 4 bits control bits 32-35 of channel control and word length */
-#      define ONYX_WORDLEN_MASK        (0xF)
-
-#endif /* __SND_AOA_CODEC_ONYX_H */
diff --git a/sound/aoa/codecs/snd-aoa-codec-tas-basstreble.h b/sound/aoa/codecs/snd-aoa-codec-tas-basstreble.h

deleted file mode 100644 (file)

index 69b6113..0000000
--- a/sound/aoa/codecs/snd-aoa-codec-tas-basstreble.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * This file is only included exactly once!
- *
- * The tables here are derived from the tas3004 datasheet,
- * modulo typo corrections and some smoothing...
- */
-
-#define TAS3004_TREBLE_MIN     0
-#define TAS3004_TREBLE_MAX     72
-#define TAS3004_BASS_MIN       0
-#define TAS3004_BASS_MAX       72
-#define TAS3004_TREBLE_ZERO    36
-#define TAS3004_BASS_ZERO      36
-
-static u8 tas3004_treble_table[] = {
-       150, /* -18 dB */
-       149,
-       148,
-       147,
-       146,
-       145,
-       144,
-       143,
-       142,
-       141,
-       140,
-       139,
-       138,
-       137,
-       136,
-       135,
-       134,
-       133,
-       132,
-       131,
-       130,
-       129,
-       128,
-       127,
-       126,
-       125,
-       124,
-       123,
-       122,
-       121,
-       120,
-       119,
-       118,
-       117,
-       116,
-       115,
-       114, /* 0 dB */
-       113,
-       112,
-       111,
-       109,
-       108,
-       107,
-       105,
-       104,
-       103,
-       101,
-       99,
-       98,
-       96,
-       93,
-       91,
-       89,
-       86,
-       83,
-       81,
-       77,
-       74,
-       71,
-       67,
-       63,
-       59,
-       54,
-       49,
-       44,
-       38,
-       32,
-       26,
-       19,
-       10,
-       4,
-       2,
-       1, /* +18 dB */
-};
-
-static inline u8 tas3004_treble(int idx)
-{
-       return tas3004_treble_table[idx];
-}
-
-/* I only save the difference here to the treble table
- * so that the binary is smaller...
- * I have also ignored completely differences of
- * +/- 1
- */
-static s8 tas3004_bass_diff_to_treble[] = {
-       2, /* 7 dB, offset 50 */
-       2,
-       2,
-       2,
-       2,
-       1,
-       2,
-       2,
-       2,
-       3,
-       4,
-       4,
-       5,
-       6,
-       7,
-       8,
-       9,
-       10,
-       11,
-       14,
-       13,
-       8,
-       1, /* 18 dB */
-};
-
-static inline u8 tas3004_bass(int idx)
-{
-       u8 result = tas3004_treble_table[idx];
-
-       if (idx >= 50)
-               result += tas3004_bass_diff_to_treble[idx-50];
-       return result;
-}
diff --git a/sound/aoa/codecs/snd-aoa-codec-tas-gain-table.h b/sound/aoa/codecs/snd-aoa-codec-tas-gain-table.h

deleted file mode 100644 (file)

index 4cfa675..0000000
--- a/sound/aoa/codecs/snd-aoa-codec-tas-gain-table.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- This is the program used to generate below table.
-
-#include <stdio.h>
-#include <math.h>
-int main() {
-  int dB2;
-  printf("/" "* This file is only included exactly once!\n");
-  printf(" *\n");
-  printf(" * If they'd only tell us that generating this table was\n");
-  printf(" * as easy as calculating\n");
-  printf(" *      hwvalue = 1048576.0*exp(0.057564628*dB*2)\n");
-  printf(" * :) *" "/\n");
-  printf("static int tas_gaintable[] = {\n");
-  printf("     0x000000, /" "* -infinity dB *" "/\n");
-  for (dB2=-140;dB2<=36;dB2++)
-    printf("   0x%.6x, /" "* %-02.1f dB *" "/\n", (int)(1048576.0*exp(0.057564628*dB2)), dB2/2.0);
-  printf("};\n\n");
-}
-
-*/
-
-/* This file is only included exactly once!
- *
- * If they'd only tell us that generating this table was
- * as easy as calculating
- *      hwvalue = 1048576.0*exp(0.057564628*dB*2)
- * :) */
-static int tas_gaintable[] = {
-       0x000000, /* -infinity dB */
-       0x00014b, /* -70.0 dB */
-       0x00015f, /* -69.5 dB */
-       0x000174, /* -69.0 dB */
-       0x00018a, /* -68.5 dB */
-       0x0001a1, /* -68.0 dB */
-       0x0001ba, /* -67.5 dB */
-       0x0001d4, /* -67.0 dB */
-       0x0001f0, /* -66.5 dB */
-       0x00020d, /* -66.0 dB */
-       0x00022c, /* -65.5 dB */
-       0x00024d, /* -65.0 dB */
-       0x000270, /* -64.5 dB */
-       0x000295, /* -64.0 dB */
-       0x0002bc, /* -63.5 dB */
-       0x0002e6, /* -63.0 dB */
-       0x000312, /* -62.5 dB */
-       0x000340, /* -62.0 dB */
-       0x000372, /* -61.5 dB */
-       0x0003a6, /* -61.0 dB */
-       0x0003dd, /* -60.5 dB */
-       0x000418, /* -60.0 dB */
-       0x000456, /* -59.5 dB */
-       0x000498, /* -59.0 dB */
-       0x0004de, /* -58.5 dB */
-       0x000528, /* -58.0 dB */
-       0x000576, /* -57.5 dB */
-       0x0005c9, /* -57.0 dB */
-       0x000620, /* -56.5 dB */
-       0x00067d, /* -56.0 dB */
-       0x0006e0, /* -55.5 dB */
-       0x000748, /* -55.0 dB */
-       0x0007b7, /* -54.5 dB */
-       0x00082c, /* -54.0 dB */
-       0x0008a8, /* -53.5 dB */
-       0x00092b, /* -53.0 dB */
-       0x0009b6, /* -52.5 dB */
-       0x000a49, /* -52.0 dB */
-       0x000ae5, /* -51.5 dB */
-       0x000b8b, /* -51.0 dB */
-       0x000c3a, /* -50.5 dB */
-       0x000cf3, /* -50.0 dB */
-       0x000db8, /* -49.5 dB */
-       0x000e88, /* -49.0 dB */
-       0x000f64, /* -48.5 dB */
-       0x00104e, /* -48.0 dB */
-       0x001145, /* -47.5 dB */
-       0x00124b, /* -47.0 dB */
-       0x001361, /* -46.5 dB */
-       0x001487, /* -46.0 dB */
-       0x0015be, /* -45.5 dB */
-       0x001708, /* -45.0 dB */
-       0x001865, /* -44.5 dB */
-       0x0019d8, /* -44.0 dB */
-       0x001b60, /* -43.5 dB */
-       0x001cff, /* -43.0 dB */
-       0x001eb7, /* -42.5 dB */
-       0x002089, /* -42.0 dB */
-       0x002276, /* -41.5 dB */
-       0x002481, /* -41.0 dB */
-       0x0026ab, /* -40.5 dB */
-       0x0028f5, /* -40.0 dB */
-       0x002b63, /* -39.5 dB */
-       0x002df5, /* -39.0 dB */
-       0x0030ae, /* -38.5 dB */
-       0x003390, /* -38.0 dB */
-       0x00369e, /* -37.5 dB */
-       0x0039db, /* -37.0 dB */
-       0x003d49, /* -36.5 dB */
-       0x0040ea, /* -36.0 dB */
-       0x0044c3, /* -35.5 dB */
-       0x0048d6, /* -35.0 dB */
-       0x004d27, /* -34.5 dB */
-       0x0051b9, /* -34.0 dB */
-       0x005691, /* -33.5 dB */
-       0x005bb2, /* -33.0 dB */
-       0x006121, /* -32.5 dB */
-       0x0066e3, /* -32.0 dB */
-       0x006cfb, /* -31.5 dB */
-       0x007370, /* -31.0 dB */
-       0x007a48, /* -30.5 dB */
-       0x008186, /* -30.0 dB */
-       0x008933, /* -29.5 dB */
-       0x009154, /* -29.0 dB */
-       0x0099f1, /* -28.5 dB */
-       0x00a310, /* -28.0 dB */
-       0x00acba, /* -27.5 dB */
-       0x00b6f6, /* -27.0 dB */
-       0x00c1cd, /* -26.5 dB */
-       0x00cd49, /* -26.0 dB */
-       0x00d973, /* -25.5 dB */
-       0x00e655, /* -25.0 dB */
-       0x00f3fb, /* -24.5 dB */
-       0x010270, /* -24.0 dB */
-       0x0111c0, /* -23.5 dB */
-       0x0121f9, /* -23.0 dB */
-       0x013328, /* -22.5 dB */
-       0x01455b, /* -22.0 dB */
-       0x0158a2, /* -21.5 dB */
-       0x016d0e, /* -21.0 dB */
-       0x0182af, /* -20.5 dB */
-       0x019999, /* -20.0 dB */
-       0x01b1de, /* -19.5 dB */
-       0x01cb94, /* -19.0 dB */
-       0x01e6cf, /* -18.5 dB */
-       0x0203a7, /* -18.0 dB */
-       0x022235, /* -17.5 dB */
-       0x024293, /* -17.0 dB */
-       0x0264db, /* -16.5 dB */
-       0x02892c, /* -16.0 dB */
-       0x02afa3, /* -15.5 dB */
-       0x02d862, /* -15.0 dB */
-       0x03038a, /* -14.5 dB */
-       0x033142, /* -14.0 dB */
-       0x0361af, /* -13.5 dB */
-       0x0394fa, /* -13.0 dB */
-       0x03cb50, /* -12.5 dB */
-       0x0404de, /* -12.0 dB */
-       0x0441d5, /* -11.5 dB */
-       0x048268, /* -11.0 dB */
-       0x04c6d0, /* -10.5 dB */
-       0x050f44, /* -10.0 dB */
-       0x055c04, /* -9.5 dB */
-       0x05ad50, /* -9.0 dB */
-       0x06036e, /* -8.5 dB */
-       0x065ea5, /* -8.0 dB */
-       0x06bf44, /* -7.5 dB */
-       0x07259d, /* -7.0 dB */
-       0x079207, /* -6.5 dB */
-       0x0804dc, /* -6.0 dB */
-       0x087e80, /* -5.5 dB */
-       0x08ff59, /* -5.0 dB */
-       0x0987d5, /* -4.5 dB */
-       0x0a1866, /* -4.0 dB */
-       0x0ab189, /* -3.5 dB */
-       0x0b53be, /* -3.0 dB */
-       0x0bff91, /* -2.5 dB */
-       0x0cb591, /* -2.0 dB */
-       0x0d765a, /* -1.5 dB */
-       0x0e4290, /* -1.0 dB */
-       0x0f1adf, /* -0.5 dB */
-       0x100000, /* 0.0 dB */
-       0x10f2b4, /* 0.5 dB */
-       0x11f3c9, /* 1.0 dB */
-       0x13041a, /* 1.5 dB */
-       0x14248e, /* 2.0 dB */
-       0x15561a, /* 2.5 dB */
-       0x1699c0, /* 3.0 dB */
-       0x17f094, /* 3.5 dB */
-       0x195bb8, /* 4.0 dB */
-       0x1adc61, /* 4.5 dB */
-       0x1c73d5, /* 5.0 dB */
-       0x1e236d, /* 5.5 dB */
-       0x1fec98, /* 6.0 dB */
-       0x21d0d9, /* 6.5 dB */
-       0x23d1cd, /* 7.0 dB */
-       0x25f125, /* 7.5 dB */
-       0x2830af, /* 8.0 dB */
-       0x2a9254, /* 8.5 dB */
-       0x2d1818, /* 9.0 dB */
-       0x2fc420, /* 9.5 dB */
-       0x3298b0, /* 10.0 dB */
-       0x35982f, /* 10.5 dB */
-       0x38c528, /* 11.0 dB */
-       0x3c224c, /* 11.5 dB */
-       0x3fb278, /* 12.0 dB */
-       0x4378b0, /* 12.5 dB */
-       0x477829, /* 13.0 dB */
-       0x4bb446, /* 13.5 dB */
-       0x5030a1, /* 14.0 dB */
-       0x54f106, /* 14.5 dB */
-       0x59f980, /* 15.0 dB */
-       0x5f4e52, /* 15.5 dB */
-       0x64f403, /* 16.0 dB */
-       0x6aef5e, /* 16.5 dB */
-       0x714575, /* 17.0 dB */
-       0x77fbaa, /* 17.5 dB */
-       0x7f17af, /* 18.0 dB */
-};
-
diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.c b/sound/aoa/codecs/snd-aoa-codec-tas.c

deleted file mode 100644 (file)

index 6c515b2..0000000
--- a/sound/aoa/codecs/snd-aoa-codec-tas.c
+++ /dev/null
@@ -1,1012 +0,0 @@
-/*
- * Apple Onboard Audio driver for tas codec
- *
- * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
- *
- * GPL v2, can be found in COPYING.
- *
- * Open questions:
- *  - How to distinguish between 3004 and versions?
- *
- * FIXMEs:
- *  - This codec driver doesn't honour the 'connected'
- *    property of the aoa_codec struct, hence if
- *    it is used in machines where not everything is
- *    connected it will display wrong mixer elements.
- *  - Driver assumes that the microphone is always
- *    monaureal and connected to the right channel of
- *    the input. This should also be a codec-dependent
- *    flag, maybe the codec should have 3 different
- *    bits for the three different possibilities how
- *    it can be hooked up...
- *    But as long as I don't see any hardware hooked
- *    up that way...
- *  - As Apple notes in their code, the tas3004 seems
- *    to delay the right channel by one sample. You can
- *    see this when for example recording stereo in
- *    audacity, or recording the tas output via cable
- *    on another machine (use a sinus generator or so).
- *    I tried programming the BiQuads but couldn't
- *    make the delay work, maybe someone can read the
- *    datasheet and fix it. The relevant Apple comment
- *    is in AppleTAS3004Audio.cpp lines 1637 ff. Note
- *    that their comment describing how they program
- *    the filters sucks...
- *
- * Other things:
- *  - this should actually register *two* aoa_codec
- *    structs since it has two inputs. Then it must
- *    use the prepare callback to forbid running the
- *    secondary output on a different clock.
- *    Also, whatever bus knows how to do this must
- *    provide two soundbus_dev devices and the fabric
- *    must be able to link them correctly.
- *
- *    I don't even know if Apple ever uses the second
- *    port on the tas3004 though, I don't think their
- *    i2s controllers can even do it. OTOH, they all
- *    derive the clocks from common clocks, so it
- *    might just be possible. The framework allows the
- *    codec to refine the transfer_info items in the
- *    usable callback, so we can simply remove the
- *    rates the second instance is not using when it
- *    actually is in use.
- *    Maybe we'll need to make the sound busses have
- *    a 'clock group id' value so the codec can
- *    determine if the two outputs can be driven at
- *    the same time. But that is likely overkill, up
- *    to the fabric to not link them up incorrectly,
- *    and up to the hardware designer to not wire
- *    them up in some weird unusable way.
- */
-#include <stddef.h>
-#include <linux/i2c.h>
-#include <asm/pmac_low_i2c.h>
-#include <asm/prom.h>
-#include <linux/delay.h>
-#include <linux/module.h>
-#include <linux/mutex.h>
-
-MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("tas codec driver for snd-aoa");
-
-#include "snd-aoa-codec-tas.h"
-#include "snd-aoa-codec-tas-gain-table.h"
-#include "snd-aoa-codec-tas-basstreble.h"
-#include "../aoa.h"
-#include "../soundbus/soundbus.h"
-
-#define PFX "snd-aoa-codec-tas: "
-
-
-struct tas {
-       struct aoa_codec        codec;
-       struct i2c_client       i2c;
-       u32                     mute_l:1, mute_r:1 ,
-                               controls_created:1 ,
-                               drc_enabled:1,
-                               hw_enabled:1;
-       u8                      cached_volume_l, cached_volume_r;
-       u8                      mixer_l[3], mixer_r[3];
-       u8                      bass, treble;
-       u8                      acr;
-       int                     drc_range;
-       /* protects hardware access against concurrency from
-        * userspace when hitting controls and during
-        * codec init/suspend/resume */
-       struct mutex            mtx;
-};
-
-static int tas_reset_init(struct tas *tas);
-
-static struct tas *codec_to_tas(struct aoa_codec *codec)
-{
-       return container_of(codec, struct tas, codec);
-}
-
-static inline int tas_write_reg(struct tas *tas, u8 reg, u8 len, u8 *data)
-{
-       if (len == 1)
-               return i2c_smbus_write_byte_data(&tas->i2c, reg, *data);
-       else
-               return i2c_smbus_write_i2c_block_data(&tas->i2c, reg, len, data);
-}
-
-static void tas3004_set_drc(struct tas *tas)
-{
-       unsigned char val[6];
-
-       if (tas->drc_enabled)
-               val[0] = 0x50; /* 3:1 above threshold */
-       else
-               val[0] = 0x51; /* disabled */
-       val[1] = 0x02; /* 1:1 below threshold */
-       if (tas->drc_range > 0xef)
-               val[2] = 0xef;
-       else if (tas->drc_range < 0)
-               val[2] = 0x00;
-       else
-               val[2] = tas->drc_range;
-       val[3] = 0xb0;
-       val[4] = 0x60;
-       val[5] = 0xa0;
-
-       tas_write_reg(tas, TAS_REG_DRC, 6, val);
-}
-
-static void tas_set_treble(struct tas *tas)
-{
-       u8 tmp;
-
-       tmp = tas3004_treble(tas->treble);
-       tas_write_reg(tas, TAS_REG_TREBLE, 1, &tmp);
-}
-
-static void tas_set_bass(struct tas *tas)
-{
-       u8 tmp;
-
-       tmp = tas3004_bass(tas->bass);
-       tas_write_reg(tas, TAS_REG_BASS, 1, &tmp);
-}
-
-static void tas_set_volume(struct tas *tas)
-{
-       u8 block[6];
-       int tmp;
-       u8 left, right;
-
-       left = tas->cached_volume_l;
-       right = tas->cached_volume_r;
-
-       if (left > 177) left = 177;
-       if (right > 177) right = 177;
-
-       if (tas->mute_l) left = 0;
-       if (tas->mute_r) right = 0;
-
-       /* analysing the volume and mixer tables shows
-        * that they are similar enough when we shift
-        * the mixer table down by 4 bits. The error
-        * is miniscule, in just one item the error
-        * is 1, at a value of 0x07f17b (mixer table
-        * value is 0x07f17a) */
-       tmp = tas_gaintable[left];
-       block[0] = tmp>>20;
-       block[1] = tmp>>12;
-       block[2] = tmp>>4;
-       tmp = tas_gaintable[right];
-       block[3] = tmp>>20;
-       block[4] = tmp>>12;
-       block[5] = tmp>>4;
-       tas_write_reg(tas, TAS_REG_VOL, 6, block);
-}
-
-static void tas_set_mixer(struct tas *tas)
-{
-       u8 block[9];
-       int tmp, i;
-       u8 val;
-
-       for (i=0;i<3;i++) {
-               val = tas->mixer_l[i];
-               if (val > 177) val = 177;
-               tmp = tas_gaintable[val];
-               block[3*i+0] = tmp>>16;
-               block[3*i+1] = tmp>>8;
-               block[3*i+2] = tmp;
-       }
-       tas_write_reg(tas, TAS_REG_LMIX, 9, block);
-
-       for (i=0;i<3;i++) {
-               val = tas->mixer_r[i];
-               if (val > 177) val = 177;
-               tmp = tas_gaintable[val];
-               block[3*i+0] = tmp>>16;
-               block[3*i+1] = tmp>>8;
-               block[3*i+2] = tmp;
-       }
-       tas_write_reg(tas, TAS_REG_RMIX, 9, block);
-}
-
-/* alsa stuff */
-
-static int tas_dev_register(struct snd_device *dev)
-{
-       return 0;
-}
-
-static struct snd_device_ops ops = {
-       .dev_register = tas_dev_register,
-};
-
-static int tas_snd_vol_info(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_info *uinfo)
-{
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-       uinfo->count = 2;
-       uinfo->value.integer.min = 0;
-       uinfo->value.integer.max = 177;
-       return 0;
-}
-
-static int tas_snd_vol_get(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct tas *tas = snd_kcontrol_chip(kcontrol);
-
-       mutex_lock(&tas->mtx);
-       ucontrol->value.integer.value[0] = tas->cached_volume_l;
-       ucontrol->value.integer.value[1] = tas->cached_volume_r;
-       mutex_unlock(&tas->mtx);
-       return 0;
-}
-
-static int tas_snd_vol_put(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct tas *tas = snd_kcontrol_chip(kcontrol);
-
-       if (ucontrol->value.integer.value[0] < 0 ||
-           ucontrol->value.integer.value[0] > 177)
-               return -EINVAL;
-       if (ucontrol->value.integer.value[1] < 0 ||
-           ucontrol->value.integer.value[1] > 177)
-               return -EINVAL;
-
-       mutex_lock(&tas->mtx);
-       if (tas->cached_volume_l == ucontrol->value.integer.value[0]
-        && tas->cached_volume_r == ucontrol->value.integer.value[1]) {
-               mutex_unlock(&tas->mtx);
-               return 0;
-       }
-
-       tas->cached_volume_l = ucontrol->value.integer.value[0];
-       tas->cached_volume_r = ucontrol->value.integer.value[1];
-       if (tas->hw_enabled)
-               tas_set_volume(tas);
-       mutex_unlock(&tas->mtx);
-       return 1;
-}
-
-static struct snd_kcontrol_new volume_control = {
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-       .name = "Master Playback Volume",
-       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
-       .info = tas_snd_vol_info,
-       .get = tas_snd_vol_get,
-       .put = tas_snd_vol_put,
-};
-
-#define tas_snd_mute_info      snd_ctl_boolean_stereo_info
-
-static int tas_snd_mute_get(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct tas *tas = snd_kcontrol_chip(kcontrol);
-
-       mutex_lock(&tas->mtx);
-       ucontrol->value.integer.value[0] = !tas->mute_l;
-       ucontrol->value.integer.value[1] = !tas->mute_r;
-       mutex_unlock(&tas->mtx);
-       return 0;
-}
-
-static int tas_snd_mute_put(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct tas *tas = snd_kcontrol_chip(kcontrol);
-
-       mutex_lock(&tas->mtx);
-       if (tas->mute_l == !ucontrol->value.integer.value[0]
-        && tas->mute_r == !ucontrol->value.integer.value[1]) {
-               mutex_unlock(&tas->mtx);
-               return 0;
-       }
-
-       tas->mute_l = !ucontrol->value.integer.value[0];
-       tas->mute_r = !ucontrol->value.integer.value[1];
-       if (tas->hw_enabled)
-               tas_set_volume(tas);
-       mutex_unlock(&tas->mtx);
-       return 1;
-}
-
-static struct snd_kcontrol_new mute_control = {
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-       .name = "Master Playback Switch",
-       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
-       .info = tas_snd_mute_info,
-       .get = tas_snd_mute_get,
-       .put = tas_snd_mute_put,
-};
-
-static int tas_snd_mixer_info(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_info *uinfo)
-{
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-       uinfo->count = 2;
-       uinfo->value.integer.min = 0;
-       uinfo->value.integer.max = 177;
-       return 0;
-}
-
-static int tas_snd_mixer_get(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct tas *tas = snd_kcontrol_chip(kcontrol);
-       int idx = kcontrol->private_value;
-
-       mutex_lock(&tas->mtx);
-       ucontrol->value.integer.value[0] = tas->mixer_l[idx];
-       ucontrol->value.integer.value[1] = tas->mixer_r[idx];
-       mutex_unlock(&tas->mtx);
-
-       return 0;
-}
-
-static int tas_snd_mixer_put(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct tas *tas = snd_kcontrol_chip(kcontrol);
-       int idx = kcontrol->private_value;
-
-       mutex_lock(&tas->mtx);
-       if (tas->mixer_l[idx] == ucontrol->value.integer.value[0]
-        && tas->mixer_r[idx] == ucontrol->value.integer.value[1]) {
-               mutex_unlock(&tas->mtx);
-               return 0;
-       }
-
-       tas->mixer_l[idx] = ucontrol->value.integer.value[0];
-       tas->mixer_r[idx] = ucontrol->value.integer.value[1];
-
-       if (tas->hw_enabled)
-               tas_set_mixer(tas);
-       mutex_unlock(&tas->mtx);
-       return 1;
-}
-
-#define MIXER_CONTROL(n,descr,idx)                     \
-static struct snd_kcontrol_new n##_control = {         \
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,            \
-       .name = descr " Playback Volume",               \
-       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,      \
-       .info = tas_snd_mixer_info,                     \
-       .get = tas_snd_mixer_get,                       \
-       .put = tas_snd_mixer_put,                       \
-       .private_value = idx,                           \
-}
-
-MIXER_CONTROL(pcm1, "PCM", 0);
-MIXER_CONTROL(monitor, "Monitor", 2);
-
-static int tas_snd_drc_range_info(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_info *uinfo)
-{
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-       uinfo->count = 1;
-       uinfo->value.integer.min = 0;
-       uinfo->value.integer.max = TAS3004_DRC_MAX;
-       return 0;
-}
-
-static int tas_snd_drc_range_get(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct tas *tas = snd_kcontrol_chip(kcontrol);
-
-       mutex_lock(&tas->mtx);
-       ucontrol->value.integer.value[0] = tas->drc_range;
-       mutex_unlock(&tas->mtx);
-       return 0;
-}
-
-static int tas_snd_drc_range_put(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct tas *tas = snd_kcontrol_chip(kcontrol);
-
-       if (ucontrol->value.integer.value[0] < 0 ||
-           ucontrol->value.integer.value[0] > TAS3004_DRC_MAX)
-               return -EINVAL;
-
-       mutex_lock(&tas->mtx);
-       if (tas->drc_range == ucontrol->value.integer.value[0]) {
-               mutex_unlock(&tas->mtx);
-               return 0;
-       }
-
-       tas->drc_range = ucontrol->value.integer.value[0];
-       if (tas->hw_enabled)
-               tas3004_set_drc(tas);
-       mutex_unlock(&tas->mtx);
-       return 1;
-}
-
-static struct snd_kcontrol_new drc_range_control = {
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-       .name = "DRC Range",
-       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
-       .info = tas_snd_drc_range_info,
-       .get = tas_snd_drc_range_get,
-       .put = tas_snd_drc_range_put,
-};
-
-#define tas_snd_drc_switch_info                snd_ctl_boolean_mono_info
-
-static int tas_snd_drc_switch_get(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct tas *tas = snd_kcontrol_chip(kcontrol);
-
-       mutex_lock(&tas->mtx);
-       ucontrol->value.integer.value[0] = tas->drc_enabled;
-       mutex_unlock(&tas->mtx);
-       return 0;
-}
-
-static int tas_snd_drc_switch_put(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct tas *tas = snd_kcontrol_chip(kcontrol);
-
-       mutex_lock(&tas->mtx);
-       if (tas->drc_enabled == ucontrol->value.integer.value[0]) {
-               mutex_unlock(&tas->mtx);
-               return 0;
-       }
-
-       tas->drc_enabled = !!ucontrol->value.integer.value[0];
-       if (tas->hw_enabled)
-               tas3004_set_drc(tas);
-       mutex_unlock(&tas->mtx);
-       return 1;
-}
-
-static struct snd_kcontrol_new drc_switch_control = {
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-       .name = "DRC Range Switch",
-       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
-       .info = tas_snd_drc_switch_info,
-       .get = tas_snd_drc_switch_get,
-       .put = tas_snd_drc_switch_put,
-};
-
-static int tas_snd_capture_source_info(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_info *uinfo)
-{
-       static char *texts[] = { "Line-In", "Microphone" };
-
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-       uinfo->count = 1;
-       uinfo->value.enumerated.items = 2;
-       if (uinfo->value.enumerated.item > 1)
-               uinfo->value.enumerated.item = 1;
-       strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
-       return 0;
-}
-
-static int tas_snd_capture_source_get(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct tas *tas = snd_kcontrol_chip(kcontrol);
-
-       mutex_lock(&tas->mtx);
-       ucontrol->value.enumerated.item[0] = !!(tas->acr & TAS_ACR_INPUT_B);
-       mutex_unlock(&tas->mtx);
-       return 0;
-}
-
-static int tas_snd_capture_source_put(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct tas *tas = snd_kcontrol_chip(kcontrol);
-       int oldacr;
-
-       if (ucontrol->value.enumerated.item[0] > 1)
-               return -EINVAL;
-       mutex_lock(&tas->mtx);
-       oldacr = tas->acr;
-
-       /*
-        * Despite what the data sheet says in one place, the
-        * TAS_ACR_B_MONAUREAL bit forces mono output even when
-        * input A (line in) is selected.
-        */
-       tas->acr &= ~(TAS_ACR_INPUT_B | TAS_ACR_B_MONAUREAL);
-       if (ucontrol->value.enumerated.item[0])
-               tas->acr |= TAS_ACR_INPUT_B | TAS_ACR_B_MONAUREAL |
-                     TAS_ACR_B_MON_SEL_RIGHT;
-       if (oldacr == tas->acr) {
-               mutex_unlock(&tas->mtx);
-               return 0;
-       }
-       if (tas->hw_enabled)
-               tas_write_reg(tas, TAS_REG_ACR, 1, &tas->acr);
-       mutex_unlock(&tas->mtx);
-       return 1;
-}
-
-static struct snd_kcontrol_new capture_source_control = {
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-       /* If we name this 'Input Source', it properly shows up in
-        * alsamixer as a selection, * but it's shown under the
-        * 'Playback' category.
-        * If I name it 'Capture Source', it shows up in strange
-        * ways (two bools of which one can be selected at a
-        * time) but at least it's shown in the 'Capture'
-        * category.
-        * I was told that this was due to backward compatibility,
-        * but I don't understand then why the mangling is *not*
-        * done when I name it "Input Source".....
-        */
-       .name = "Capture Source",
-       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
-       .info = tas_snd_capture_source_info,
-       .get = tas_snd_capture_source_get,
-       .put = tas_snd_capture_source_put,
-};
-
-static int tas_snd_treble_info(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_info *uinfo)
-{
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-       uinfo->count = 1;
-       uinfo->value.integer.min = TAS3004_TREBLE_MIN;
-       uinfo->value.integer.max = TAS3004_TREBLE_MAX;
-       return 0;
-}
-
-static int tas_snd_treble_get(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct tas *tas = snd_kcontrol_chip(kcontrol);
-
-       mutex_lock(&tas->mtx);
-       ucontrol->value.integer.value[0] = tas->treble;
-       mutex_unlock(&tas->mtx);
-       return 0;
-}
-
-static int tas_snd_treble_put(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct tas *tas = snd_kcontrol_chip(kcontrol);
-
-       if (ucontrol->value.integer.value[0] < TAS3004_TREBLE_MIN ||
-           ucontrol->value.integer.value[0] > TAS3004_TREBLE_MAX)
-               return -EINVAL;
-       mutex_lock(&tas->mtx);
-       if (tas->treble == ucontrol->value.integer.value[0]) {
-               mutex_unlock(&tas->mtx);
-               return 0;
-       }
-
-       tas->treble = ucontrol->value.integer.value[0];
-       if (tas->hw_enabled)
-               tas_set_treble(tas);
-       mutex_unlock(&tas->mtx);
-       return 1;
-}
-
-static struct snd_kcontrol_new treble_control = {
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-       .name = "Treble",
-       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
-       .info = tas_snd_treble_info,
-       .get = tas_snd_treble_get,
-       .put = tas_snd_treble_put,
-};
-
-static int tas_snd_bass_info(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_info *uinfo)
-{
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-       uinfo->count = 1;
-       uinfo->value.integer.min = TAS3004_BASS_MIN;
-       uinfo->value.integer.max = TAS3004_BASS_MAX;
-       return 0;
-}
-
-static int tas_snd_bass_get(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct tas *tas = snd_kcontrol_chip(kcontrol);
-
-       mutex_lock(&tas->mtx);
-       ucontrol->value.integer.value[0] = tas->bass;
-       mutex_unlock(&tas->mtx);
-       return 0;
-}
-
-static int tas_snd_bass_put(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct tas *tas = snd_kcontrol_chip(kcontrol);
-
-       if (ucontrol->value.integer.value[0] < TAS3004_BASS_MIN ||
-           ucontrol->value.integer.value[0] > TAS3004_BASS_MAX)
-               return -EINVAL;
-       mutex_lock(&tas->mtx);
-       if (tas->bass == ucontrol->value.integer.value[0]) {
-               mutex_unlock(&tas->mtx);
-               return 0;
-       }
-
-       tas->bass = ucontrol->value.integer.value[0];
-       if (tas->hw_enabled)
-               tas_set_bass(tas);
-       mutex_unlock(&tas->mtx);
-       return 1;
-}
-
-static struct snd_kcontrol_new bass_control = {
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-       .name = "Bass",
-       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
-       .info = tas_snd_bass_info,
-       .get = tas_snd_bass_get,
-       .put = tas_snd_bass_put,
-};
-
-static struct transfer_info tas_transfers[] = {
-       {
-               /* input */
-               .formats = SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S24_BE,
-               .rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
-               .transfer_in = 1,
-       },
-       {
-               /* output */
-               .formats = SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S24_BE,
-               .rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
-               .transfer_in = 0,
-       },
-       {}
-};
-
-static int tas_usable(struct codec_info_item *cii,
-                     struct transfer_info *ti,
-                     struct transfer_info *out)
-{
-       return 1;
-}
-
-static int tas_reset_init(struct tas *tas)
-{
-       u8 tmp;
-
-       tas->codec.gpio->methods->all_amps_off(tas->codec.gpio);
-       msleep(5);
-       tas->codec.gpio->methods->set_hw_reset(tas->codec.gpio, 0);
-       msleep(5);
-       tas->codec.gpio->methods->set_hw_reset(tas->codec.gpio, 1);
-       msleep(20);
-       tas->codec.gpio->methods->set_hw_reset(tas->codec.gpio, 0);
-       msleep(10);
-       tas->codec.gpio->methods->all_amps_restore(tas->codec.gpio);
-
-       tmp = TAS_MCS_SCLK64 | TAS_MCS_SPORT_MODE_I2S | TAS_MCS_SPORT_WL_24BIT;
-       if (tas_write_reg(tas, TAS_REG_MCS, 1, &tmp))
-               goto outerr;
-
-       tas->acr |= TAS_ACR_ANALOG_PDOWN;
-       if (tas_write_reg(tas, TAS_REG_ACR, 1, &tas->acr))
-               goto outerr;
-
-       tmp = 0;
-       if (tas_write_reg(tas, TAS_REG_MCS2, 1, &tmp))
-               goto outerr;
-
-       tas3004_set_drc(tas);
-
-       /* Set treble & bass to 0dB */
-       tas->treble = TAS3004_TREBLE_ZERO;
-       tas->bass = TAS3004_BASS_ZERO;
-       tas_set_treble(tas);
-       tas_set_bass(tas);
-
-       tas->acr &= ~TAS_ACR_ANALOG_PDOWN;
-       if (tas_write_reg(tas, TAS_REG_ACR, 1, &tas->acr))
-               goto outerr;
-
-       return 0;
- outerr:
-       return -ENODEV;
-}
-
-static int tas_switch_clock(struct codec_info_item *cii, enum clock_switch clock)
-{
-       struct tas *tas = cii->codec_data;
-
-       switch(clock) {
-       case CLOCK_SWITCH_PREPARE_SLAVE:
-               /* Clocks are going away, mute mute mute */
-               tas->codec.gpio->methods->all_amps_off(tas->codec.gpio);
-               tas->hw_enabled = 0;
-               break;
-       case CLOCK_SWITCH_SLAVE:
-               /* Clocks are back, re-init the codec */
-               mutex_lock(&tas->mtx);
-               tas_reset_init(tas);
-               tas_set_volume(tas);
-               tas_set_mixer(tas);
-               tas->hw_enabled = 1;
-               tas->codec.gpio->methods->all_amps_restore(tas->codec.gpio);
-               mutex_unlock(&tas->mtx);
-               break;
-       default:
-               /* doesn't happen as of now */
-               return -EINVAL;
-       }
-       return 0;
-}
-
-#ifdef CONFIG_PM
-/* we are controlled via i2c and assume that is always up
- * If that wasn't the case, we'd have to suspend once
- * our i2c device is suspended, and then take note of that! */
-static int tas_suspend(struct tas *tas)
-{
-       mutex_lock(&tas->mtx);
-       tas->hw_enabled = 0;
-       tas->acr |= TAS_ACR_ANALOG_PDOWN;
-       tas_write_reg(tas, TAS_REG_ACR, 1, &tas->acr);
-       mutex_unlock(&tas->mtx);
-       return 0;
-}
-
-static int tas_resume(struct tas *tas)
-{
-       /* reset codec */
-       mutex_lock(&tas->mtx);
-       tas_reset_init(tas);
-       tas_set_volume(tas);
-       tas_set_mixer(tas);
-       tas->hw_enabled = 1;
-       mutex_unlock(&tas->mtx);
-       return 0;
-}
-
-static int _tas_suspend(struct codec_info_item *cii, pm_message_t state)
-{
-       return tas_suspend(cii->codec_data);
-}
-
-static int _tas_resume(struct codec_info_item *cii)
-{
-       return tas_resume(cii->codec_data);
-}
-#else /* CONFIG_PM */
-#define _tas_suspend   NULL
-#define _tas_resume    NULL
-#endif /* CONFIG_PM */
-
-static struct codec_info tas_codec_info = {
-       .transfers = tas_transfers,
-       /* in theory, we can drive it at 512 too...
-        * but so far the framework doesn't allow
-        * for that and I don't see much point in it. */
-       .sysclock_factor = 256,
-       /* same here, could be 32 for just one 16 bit format */
-       .bus_factor = 64,
-       .owner = THIS_MODULE,
-       .usable = tas_usable,
-       .switch_clock = tas_switch_clock,
-       .suspend = _tas_suspend,
-       .resume = _tas_resume,
-};
-
-static int tas_init_codec(struct aoa_codec *codec)
-{
-       struct tas *tas = codec_to_tas(codec);
-       int err;
-
-       if (!tas->codec.gpio || !tas->codec.gpio->methods) {
-               printk(KERN_ERR PFX "gpios not assigned!!\n");
-               return -EINVAL;
-       }
-
-       mutex_lock(&tas->mtx);
-       if (tas_reset_init(tas)) {
-               printk(KERN_ERR PFX "tas failed to initialise\n");
-               mutex_unlock(&tas->mtx);
-               return -ENXIO;
-       }
-       tas->hw_enabled = 1;
-       mutex_unlock(&tas->mtx);
-
-       if (tas->codec.soundbus_dev->attach_codec(tas->codec.soundbus_dev,
-                                                  aoa_get_card(),
-                                                  &tas_codec_info, tas)) {
-               printk(KERN_ERR PFX "error attaching tas to soundbus\n");
-               return -ENODEV;
-       }
-
-       if (aoa_snd_device_new(SNDRV_DEV_LOWLEVEL, tas, &ops)) {
-               printk(KERN_ERR PFX "failed to create tas snd device!\n");
-               return -ENODEV;
-       }
-       err = aoa_snd_ctl_add(snd_ctl_new1(&volume_control, tas));
-       if (err)
-               goto error;
-
-       err = aoa_snd_ctl_add(snd_ctl_new1(&mute_control, tas));
-       if (err)
-               goto error;
-
-       err = aoa_snd_ctl_add(snd_ctl_new1(&pcm1_control, tas));
-       if (err)
-               goto error;
-
-       err = aoa_snd_ctl_add(snd_ctl_new1(&monitor_control, tas));
-       if (err)
-               goto error;
-
-       err = aoa_snd_ctl_add(snd_ctl_new1(&capture_source_control, tas));
-       if (err)
-               goto error;
-
-       err = aoa_snd_ctl_add(snd_ctl_new1(&drc_range_control, tas));
-       if (err)
-               goto error;
-
-       err = aoa_snd_ctl_add(snd_ctl_new1(&drc_switch_control, tas));
-       if (err)
-               goto error;
-
-       err = aoa_snd_ctl_add(snd_ctl_new1(&treble_control, tas));
-       if (err)
-               goto error;
-
-       err = aoa_snd_ctl_add(snd_ctl_new1(&bass_control, tas));
-       if (err)
-               goto error;
-
-       return 0;
- error:
-       tas->codec.soundbus_dev->detach_codec(tas->codec.soundbus_dev, tas);
-       snd_device_free(aoa_get_card(), tas);
-       return err;
-}
-
-static void tas_exit_codec(struct aoa_codec *codec)
-{
-       struct tas *tas = codec_to_tas(codec);
-
-       if (!tas->codec.soundbus_dev)
-               return;
-       tas->codec.soundbus_dev->detach_codec(tas->codec.soundbus_dev, tas);
-}
-       
-
-static struct i2c_driver tas_driver;
-
-static int tas_create(struct i2c_adapter *adapter,
-                      struct device_node *node,
-                      int addr)
-{
-       struct tas *tas;
-
-       tas = kzalloc(sizeof(struct tas), GFP_KERNEL);
-
-       if (!tas)
-               return -ENOMEM;
-
-       mutex_init(&tas->mtx);
-       tas->i2c.driver = &tas_driver;
-       tas->i2c.adapter = adapter;
-       tas->i2c.addr = addr;
-       /* seems that half is a saner default */
-       tas->drc_range = TAS3004_DRC_MAX / 2;
-       strlcpy(tas->i2c.name, "tas audio codec", I2C_NAME_SIZE);
-
-       if (i2c_attach_client(&tas->i2c)) {
-               printk(KERN_ERR PFX "failed to attach to i2c\n");
-               goto fail;
-       }
-
-       strlcpy(tas->codec.name, "tas", MAX_CODEC_NAME_LEN);
-       tas->codec.owner = THIS_MODULE;
-       tas->codec.init = tas_init_codec;
-       tas->codec.exit = tas_exit_codec;
-       tas->codec.node = of_node_get(node);
-
-       if (aoa_codec_register(&tas->codec)) {
-               goto detach;
-       }
-       printk(KERN_DEBUG
-              "snd-aoa-codec-tas: tas found, addr 0x%02x on %s\n",
-              addr, node->full_name);
-       return 0;
- detach:
-       i2c_detach_client(&tas->i2c);
- fail:
-       mutex_destroy(&tas->mtx);
-       kfree(tas);
-       return -EINVAL;
-}
-
-static int tas_i2c_attach(struct i2c_adapter *adapter)
-{
-       struct device_node *busnode, *dev = NULL;
-       struct pmac_i2c_bus *bus;
-
-       bus = pmac_i2c_adapter_to_bus(adapter);
-       if (bus == NULL)
-               return -ENODEV;
-       busnode = pmac_i2c_get_bus_node(bus);
-
-       while ((dev = of_get_next_child(busnode, dev)) != NULL) {
-               if (of_device_is_compatible(dev, "tas3004")) {
-                       const u32 *addr;
-                       printk(KERN_DEBUG PFX "found tas3004\n");
-                       addr = of_get_property(dev, "reg", NULL);
-                       if (!addr)
-                               continue;
-                       return tas_create(adapter, dev, ((*addr) >> 1) & 0x7f);
-               }
-               /* older machines have no 'codec' node with a 'compatible'
-                * property that says 'tas3004', they just have a 'deq'
-                * node without any such property... */
-               if (strcmp(dev->name, "deq") == 0) {
-                       const u32 *_addr;
-                       u32 addr;
-                       printk(KERN_DEBUG PFX "found 'deq' node\n");
-                       _addr = of_get_property(dev, "i2c-address", NULL);
-                       if (!_addr)
-                               continue;
-                       addr = ((*_addr) >> 1) & 0x7f;
-                       /* now, if the address doesn't match any of the two
-                        * that a tas3004 can have, we cannot handle this.
-                        * I doubt it ever happens but hey. */
-                       if (addr != 0x34 && addr != 0x35)
-                               continue;
-                       return tas_create(adapter, dev, addr);
-               }
-       }
-       return -ENODEV;
-}
-
-static int tas_i2c_detach(struct i2c_client *client)
-{
-       struct tas *tas = container_of(client, struct tas, i2c);
-       int err;
-       u8 tmp = TAS_ACR_ANALOG_PDOWN;
-
-       if ((err = i2c_detach_client(client)))
-               return err;
-       aoa_codec_unregister(&tas->codec);
-       of_node_put(tas->codec.node);
-
-       /* power down codec chip */
-       tas_write_reg(tas, TAS_REG_ACR, 1, &tmp);
-
-       mutex_destroy(&tas->mtx);
-       kfree(tas);
-       return 0;
-}
-
-static struct i2c_driver tas_driver = {
-       .driver = {
-               .name = "aoa_codec_tas",
-               .owner = THIS_MODULE,
-       },
-       .attach_adapter = tas_i2c_attach,
-       .detach_client = tas_i2c_detach,
-};
-
-static int __init tas_init(void)
-{
-       return i2c_add_driver(&tas_driver);
-}
-
-static void __exit tas_exit(void)
-{
-       i2c_del_driver(&tas_driver);
-}
-
-module_init(tas_init);
-module_exit(tas_exit);
diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.h b/sound/aoa/codecs/snd-aoa-codec-tas.h

deleted file mode 100644 (file)

index ae177e3..0000000
--- a/sound/aoa/codecs/snd-aoa-codec-tas.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Apple Onboard Audio driver for tas codec (header)
- *
- * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
- *
- * GPL v2, can be found in COPYING.
- */
-#ifndef __SND_AOA_CODECTASH
-#define __SND_AOA_CODECTASH
-
-#define TAS_REG_MCS    0x01    /* main control */
-#      define TAS_MCS_FASTLOAD         (1<<7)
-#      define TAS_MCS_SCLK64           (1<<6)
-#      define TAS_MCS_SPORT_MODE_MASK  (3<<4)
-#      define TAS_MCS_SPORT_MODE_I2S   (2<<4)
-#      define TAS_MCS_SPORT_MODE_RJ    (1<<4)
-#      define TAS_MCS_SPORT_MODE_LJ    (0<<4)
-#      define TAS_MCS_SPORT_WL_MASK    (3<<0)
-#      define TAS_MCS_SPORT_WL_16BIT   (0<<0)
-#      define TAS_MCS_SPORT_WL_18BIT   (1<<0)
-#      define TAS_MCS_SPORT_WL_20BIT   (2<<0)
-#      define TAS_MCS_SPORT_WL_24BIT   (3<<0)
-
-#define TAS_REG_DRC    0x02
-#define TAS_REG_VOL    0x04
-#define TAS_REG_TREBLE 0x05
-#define TAS_REG_BASS   0x06
-#define TAS_REG_LMIX   0x07
-#define TAS_REG_RMIX   0x08
-
-#define TAS_REG_ACR    0x40    /* analog control */
-#      define TAS_ACR_B_MONAUREAL      (1<<7)
-#      define TAS_ACR_B_MON_SEL_RIGHT  (1<<6)
-#      define TAS_ACR_DEEMPH_MASK      (3<<2)
-#      define TAS_ACR_DEEMPH_OFF       (0<<2)
-#      define TAS_ACR_DEEMPH_48KHz     (1<<2)
-#      define TAS_ACR_DEEMPH_44KHz     (2<<2)
-#      define TAS_ACR_INPUT_B          (1<<1)
-#      define TAS_ACR_ANALOG_PDOWN     (1<<0)
-
-#define TAS_REG_MCS2   0x43    /* main control 2 */
-#      define TAS_MCS2_ALLPASS         (1<<1)
-
-#define TAS_REG_LEFT_BIQUAD6   0x10
-#define TAS_REG_RIGHT_BIQUAD6  0x19
-
-#define TAS_REG_LEFT_LOUDNESS          0x21
-#define TAS_REG_RIGHT_LOUDNESS         0x22
-#define TAS_REG_LEFT_LOUDNESS_GAIN     0x23
-#define TAS_REG_RIGHT_LOUDNESS_GAIN    0x24
-
-#define TAS3001_DRC_MAX                0x5f
-#define TAS3004_DRC_MAX                0xef
-
-#endif /* __SND_AOA_CODECTASH */
diff --git a/sound/aoa/codecs/snd-aoa-codec-toonie.c b/sound/aoa/codecs/snd-aoa-codec-toonie.c

deleted file mode 100644 (file)

index 3c7d1d8..0000000
--- a/sound/aoa/codecs/snd-aoa-codec-toonie.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Apple Onboard Audio driver for Toonie codec
- *
- * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
- *
- * GPL v2, can be found in COPYING.
- *
- *
- * This is a driver for the toonie codec chip. This chip is present
- * on the Mac Mini and is nothing but a DAC.
- */
-#include <linux/delay.h>
-#include <linux/module.h>
-MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("toonie codec driver for snd-aoa");
-
-#include "../aoa.h"
-#include "../soundbus/soundbus.h"
-
-
-#define PFX "snd-aoa-codec-toonie: "
-
-struct toonie {
-       struct aoa_codec        codec;
-};
-#define codec_to_toonie(c) container_of(c, struct toonie, codec)
-
-static int toonie_dev_register(struct snd_device *dev)
-{
-       return 0;
-}
-
-static struct snd_device_ops ops = {
-       .dev_register = toonie_dev_register,
-};
-
-static struct transfer_info toonie_transfers[] = {
-       /* This thing *only* has analog output,
-        * the rates are taken from Info.plist
-        * from Darwin. */
-       {
-               .formats = SNDRV_PCM_FMTBIT_S16_BE |
-                          SNDRV_PCM_FMTBIT_S24_BE,
-               .rates = SNDRV_PCM_RATE_32000 |
-                        SNDRV_PCM_RATE_44100 |
-                        SNDRV_PCM_RATE_48000 |
-                        SNDRV_PCM_RATE_88200 |
-                        SNDRV_PCM_RATE_96000,
-       },
-       {}
-};
-
-static int toonie_usable(struct codec_info_item *cii,
-                        struct transfer_info *ti,
-                        struct transfer_info *out)
-{
-       return 1;
-}
-
-#ifdef CONFIG_PM
-static int toonie_suspend(struct codec_info_item *cii, pm_message_t state)
-{
-       /* can we turn it off somehow? */
-       return 0;
-}
-
-static int toonie_resume(struct codec_info_item *cii)
-{
-       return 0;
-}
-#endif /* CONFIG_PM */
-
-static struct codec_info toonie_codec_info = {
-       .transfers = toonie_transfers,
-       .sysclock_factor = 256,
-       .bus_factor = 64,
-       .owner = THIS_MODULE,
-       .usable = toonie_usable,
-#ifdef CONFIG_PM
-       .suspend = toonie_suspend,
-       .resume = toonie_resume,
-#endif
-};
-
-static int toonie_init_codec(struct aoa_codec *codec)
-{
-       struct toonie *toonie = codec_to_toonie(codec);
-
-       /* nothing connected? what a joke! */
-       if (toonie->codec.connected != 1)
-               return -ENOTCONN;
-
-       if (aoa_snd_device_new(SNDRV_DEV_LOWLEVEL, toonie, &ops)) {
-               printk(KERN_ERR PFX "failed to create toonie snd device!\n");
-               return -ENODEV;
-       }
-
-       if (toonie->codec.soundbus_dev->attach_codec(toonie->codec.soundbus_dev,
-                                                    aoa_get_card(),
-                                                    &toonie_codec_info, toonie)) {
-               printk(KERN_ERR PFX "error creating toonie pcm\n");
-               snd_device_free(aoa_get_card(), toonie);
-               return -ENODEV;
-       }
-
-       return 0;
-}
-
-static void toonie_exit_codec(struct aoa_codec *codec)
-{
-       struct toonie *toonie = codec_to_toonie(codec);
-
-       if (!toonie->codec.soundbus_dev) {
-               printk(KERN_ERR PFX "toonie_exit_codec called without soundbus_dev!\n");
-               return;
-       }
-       toonie->codec.soundbus_dev->detach_codec(toonie->codec.soundbus_dev, toonie);
-}
-
-static struct toonie *toonie;
-
-static int __init toonie_init(void)
-{
-       toonie = kzalloc(sizeof(struct toonie), GFP_KERNEL);
-
-       if (!toonie)
-               return -ENOMEM;
-
-       strlcpy(toonie->codec.name, "toonie", sizeof(toonie->codec.name));
-       toonie->codec.owner = THIS_MODULE;
-       toonie->codec.init = toonie_init_codec;
-       toonie->codec.exit = toonie_exit_codec;
-                                        
-       if (aoa_codec_register(&toonie->codec)) {
-               kfree(toonie);
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-static void __exit toonie_exit(void)
-{
-       aoa_codec_unregister(&toonie->codec);
-       kfree(toonie);
-}
-
-module_init(toonie_init);
-module_exit(toonie_exit);
diff --git a/sound/aoa/codecs/tas-basstreble.h b/sound/aoa/codecs/tas-basstreble.h

new file mode 100644 (file)

index 0000000..69b6113
--- /dev/null
+++ b/sound/aoa/codecs/tas-basstreble.h
@@ -0,0 +1,134 @@
+/*
+ * This file is only included exactly once!
+ *
+ * The tables here are derived from the tas3004 datasheet,
+ * modulo typo corrections and some smoothing...
+ */
+
+#define TAS3004_TREBLE_MIN     0
+#define TAS3004_TREBLE_MAX     72
+#define TAS3004_BASS_MIN       0
+#define TAS3004_BASS_MAX       72
+#define TAS3004_TREBLE_ZERO    36
+#define TAS3004_BASS_ZERO      36
+
+static u8 tas3004_treble_table[] = {
+       150, /* -18 dB */
+       149,
+       148,
+       147,
+       146,
+       145,
+       144,
+       143,
+       142,
+       141,
+       140,
+       139,
+       138,
+       137,
+       136,
+       135,
+       134,
+       133,
+       132,
+       131,
+       130,
+       129,
+       128,
+       127,
+       126,
+       125,
+       124,
+       123,
+       122,
+       121,
+       120,
+       119,
+       118,
+       117,
+       116,
+       115,
+       114, /* 0 dB */
+       113,
+       112,
+       111,
+       109,
+       108,
+       107,
+       105,
+       104,
+       103,
+       101,
+       99,
+       98,
+       96,
+       93,
+       91,
+       89,
+       86,
+       83,
+       81,
+       77,
+       74,
+       71,
+       67,
+       63,
+       59,
+       54,
+       49,
+       44,
+       38,
+       32,
+       26,
+       19,
+       10,
+       4,
+       2,
+       1, /* +18 dB */
+};
+
+static inline u8 tas3004_treble(int idx)
+{
+       return tas3004_treble_table[idx];
+}
+
+/* I only save the difference here to the treble table
+ * so that the binary is smaller...
+ * I have also ignored completely differences of
+ * +/- 1
+ */
+static s8 tas3004_bass_diff_to_treble[] = {
+       2, /* 7 dB, offset 50 */
+       2,
+       2,
+       2,
+       2,
+       1,
+       2,
+       2,
+       2,
+       3,
+       4,
+       4,
+       5,
+       6,
+       7,
+       8,
+       9,
+       10,
+       11,
+       14,
+       13,
+       8,
+       1, /* 18 dB */
+};
+
+static inline u8 tas3004_bass(int idx)
+{
+       u8 result = tas3004_treble_table[idx];
+
+       if (idx >= 50)
+               result += tas3004_bass_diff_to_treble[idx-50];
+       return result;
+}
diff --git a/sound/aoa/codecs/tas-gain-table.h b/sound/aoa/codecs/tas-gain-table.h

new file mode 100644 (file)

index 0000000..4cfa675
--- /dev/null
+++ b/sound/aoa/codecs/tas-gain-table.h
@@ -0,0 +1,209 @@
+/*
+ This is the program used to generate below table.
+
+#include <stdio.h>
+#include <math.h>
+int main() {
+  int dB2;
+  printf("/" "* This file is only included exactly once!\n");
+  printf(" *\n");
+  printf(" * If they'd only tell us that generating this table was\n");
+  printf(" * as easy as calculating\n");
+  printf(" *      hwvalue = 1048576.0*exp(0.057564628*dB*2)\n");
+  printf(" * :) *" "/\n");
+  printf("static int tas_gaintable[] = {\n");
+  printf("     0x000000, /" "* -infinity dB *" "/\n");
+  for (dB2=-140;dB2<=36;dB2++)
+    printf("   0x%.6x, /" "* %-02.1f dB *" "/\n", (int)(1048576.0*exp(0.057564628*dB2)), dB2/2.0);
+  printf("};\n\n");
+}
+
+*/
+
+/* This file is only included exactly once!
+ *
+ * If they'd only tell us that generating this table was
+ * as easy as calculating
+ *      hwvalue = 1048576.0*exp(0.057564628*dB*2)
+ * :) */
+static int tas_gaintable[] = {
+       0x000000, /* -infinity dB */
+       0x00014b, /* -70.0 dB */
+       0x00015f, /* -69.5 dB */
+       0x000174, /* -69.0 dB */
+       0x00018a, /* -68.5 dB */
+       0x0001a1, /* -68.0 dB */
+       0x0001ba, /* -67.5 dB */
+       0x0001d4, /* -67.0 dB */
+       0x0001f0, /* -66.5 dB */
+       0x00020d, /* -66.0 dB */
+       0x00022c, /* -65.5 dB */
+       0x00024d, /* -65.0 dB */
+       0x000270, /* -64.5 dB */
+       0x000295, /* -64.0 dB */
+       0x0002bc, /* -63.5 dB */
+       0x0002e6, /* -63.0 dB */
+       0x000312, /* -62.5 dB */
+       0x000340, /* -62.0 dB */
+       0x000372, /* -61.5 dB */
+       0x0003a6, /* -61.0 dB */
+       0x0003dd, /* -60.5 dB */
+       0x000418, /* -60.0 dB */
+       0x000456, /* -59.5 dB */
+       0x000498, /* -59.0 dB */
+       0x0004de, /* -58.5 dB */
+       0x000528, /* -58.0 dB */
+       0x000576, /* -57.5 dB */
+       0x0005c9, /* -57.0 dB */
+       0x000620, /* -56.5 dB */
+       0x00067d, /* -56.0 dB */
+       0x0006e0, /* -55.5 dB */
+       0x000748, /* -55.0 dB */
+       0x0007b7, /* -54.5 dB */
+       0x00082c, /* -54.0 dB */
+       0x0008a8, /* -53.5 dB */
+       0x00092b, /* -53.0 dB */
+       0x0009b6, /* -52.5 dB */
+       0x000a49, /* -52.0 dB */
+       0x000ae5, /* -51.5 dB */
+       0x000b8b, /* -51.0 dB */
+       0x000c3a, /* -50.5 dB */
+       0x000cf3, /* -50.0 dB */
+       0x000db8, /* -49.5 dB */
+       0x000e88, /* -49.0 dB */
+       0x000f64, /* -48.5 dB */
+       0x00104e, /* -48.0 dB */
+       0x001145, /* -47.5 dB */
+       0x00124b, /* -47.0 dB */
+       0x001361, /* -46.5 dB */
+       0x001487, /* -46.0 dB */
+       0x0015be, /* -45.5 dB */
+       0x001708, /* -45.0 dB */
+       0x001865, /* -44.5 dB */
+       0x0019d8, /* -44.0 dB */
+       0x001b60, /* -43.5 dB */
+       0x001cff, /* -43.0 dB */
+       0x001eb7, /* -42.5 dB */
+       0x002089, /* -42.0 dB */
+       0x002276, /* -41.5 dB */
+       0x002481, /* -41.0 dB */
+       0x0026ab, /* -40.5 dB */
+       0x0028f5, /* -40.0 dB */
+       0x002b63, /* -39.5 dB */
+       0x002df5, /* -39.0 dB */
+       0x0030ae, /* -38.5 dB */
+       0x003390, /* -38.0 dB */
+       0x00369e, /* -37.5 dB */
+       0x0039db, /* -37.0 dB */
+       0x003d49, /* -36.5 dB */
+       0x0040ea, /* -36.0 dB */
+       0x0044c3, /* -35.5 dB */
+       0x0048d6, /* -35.0 dB */
+       0x004d27, /* -34.5 dB */
+       0x0051b9, /* -34.0 dB */
+       0x005691, /* -33.5 dB */
+       0x005bb2, /* -33.0 dB */
+       0x006121, /* -32.5 dB */
+       0x0066e3, /* -32.0 dB */
+       0x006cfb, /* -31.5 dB */
+       0x007370, /* -31.0 dB */
+       0x007a48, /* -30.5 dB */
+       0x008186, /* -30.0 dB */
+       0x008933, /* -29.5 dB */
+       0x009154, /* -29.0 dB */
+       0x0099f1, /* -28.5 dB */
+       0x00a310, /* -28.0 dB */
+       0x00acba, /* -27.5 dB */
+       0x00b6f6, /* -27.0 dB */
+       0x00c1cd, /* -26.5 dB */
+       0x00cd49, /* -26.0 dB */
+       0x00d973, /* -25.5 dB */
+       0x00e655, /* -25.0 dB */
+       0x00f3fb, /* -24.5 dB */
+       0x010270, /* -24.0 dB */
+       0x0111c0, /* -23.5 dB */
+       0x0121f9, /* -23.0 dB */
+       0x013328, /* -22.5 dB */
+       0x01455b, /* -22.0 dB */
+       0x0158a2, /* -21.5 dB */
+       0x016d0e, /* -21.0 dB */
+       0x0182af, /* -20.5 dB */
+       0x019999, /* -20.0 dB */
+       0x01b1de, /* -19.5 dB */
+       0x01cb94, /* -19.0 dB */
+       0x01e6cf, /* -18.5 dB */
+       0x0203a7, /* -18.0 dB */
+       0x022235, /* -17.5 dB */
+       0x024293, /* -17.0 dB */
+       0x0264db, /* -16.5 dB */
+       0x02892c, /* -16.0 dB */
+       0x02afa3, /* -15.5 dB */
+       0x02d862, /* -15.0 dB */
+       0x03038a, /* -14.5 dB */
+       0x033142, /* -14.0 dB */
+       0x0361af, /* -13.5 dB */
+       0x0394fa, /* -13.0 dB */
+       0x03cb50, /* -12.5 dB */
+       0x0404de, /* -12.0 dB */
+       0x0441d5, /* -11.5 dB */
+       0x048268, /* -11.0 dB */
+       0x04c6d0, /* -10.5 dB */
+       0x050f44, /* -10.0 dB */
+       0x055c04, /* -9.5 dB */
+       0x05ad50, /* -9.0 dB */
+       0x06036e, /* -8.5 dB */
+       0x065ea5, /* -8.0 dB */
+       0x06bf44, /* -7.5 dB */
+       0x07259d, /* -7.0 dB */
+       0x079207, /* -6.5 dB */
+       0x0804dc, /* -6.0 dB */
+       0x087e80, /* -5.5 dB */
+       0x08ff59, /* -5.0 dB */
+       0x0987d5, /* -4.5 dB */
+       0x0a1866, /* -4.0 dB */
+       0x0ab189, /* -3.5 dB */
+       0x0b53be, /* -3.0 dB */
+       0x0bff91, /* -2.5 dB */
+       0x0cb591, /* -2.0 dB */
+       0x0d765a, /* -1.5 dB */
+       0x0e4290, /* -1.0 dB */
+       0x0f1adf, /* -0.5 dB */
+       0x100000, /* 0.0 dB */
+       0x10f2b4, /* 0.5 dB */
+       0x11f3c9, /* 1.0 dB */
+       0x13041a, /* 1.5 dB */
+       0x14248e, /* 2.0 dB */
+       0x15561a, /* 2.5 dB */
+       0x1699c0, /* 3.0 dB */
+       0x17f094, /* 3.5 dB */
+       0x195bb8, /* 4.0 dB */
+       0x1adc61, /* 4.5 dB */
+       0x1c73d5, /* 5.0 dB */
+       0x1e236d, /* 5.5 dB */
+       0x1fec98, /* 6.0 dB */
+       0x21d0d9, /* 6.5 dB */
+       0x23d1cd, /* 7.0 dB */
+       0x25f125, /* 7.5 dB */
+       0x2830af, /* 8.0 dB */
+       0x2a9254, /* 8.5 dB */
+       0x2d1818, /* 9.0 dB */
+       0x2fc420, /* 9.5 dB */
+       0x3298b0, /* 10.0 dB */
+       0x35982f, /* 10.5 dB */
+       0x38c528, /* 11.0 dB */
+       0x3c224c, /* 11.5 dB */
+       0x3fb278, /* 12.0 dB */
+       0x4378b0, /* 12.5 dB */
+       0x477829, /* 13.0 dB */
+       0x4bb446, /* 13.5 dB */
+       0x5030a1, /* 14.0 dB */
+       0x54f106, /* 14.5 dB */
+       0x59f980, /* 15.0 dB */
+       0x5f4e52, /* 15.5 dB */
+       0x64f403, /* 16.0 dB */
+       0x6aef5e, /* 16.5 dB */
+       0x714575, /* 17.0 dB */
+       0x77fbaa, /* 17.5 dB */
+       0x7f17af, /* 18.0 dB */
+};
+
diff --git a/sound/aoa/codecs/tas.c b/sound/aoa/codecs/tas.c

new file mode 100644 (file)

index 0000000..008e0f8
--- /dev/null
+++ b/sound/aoa/codecs/tas.c
@@ -0,0 +1,1012 @@
+/*
+ * Apple Onboard Audio driver for tas codec
+ *
+ * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
+ *
+ * GPL v2, can be found in COPYING.
+ *
+ * Open questions:
+ *  - How to distinguish between 3004 and versions?
+ *
+ * FIXMEs:
+ *  - This codec driver doesn't honour the 'connected'
+ *    property of the aoa_codec struct, hence if
+ *    it is used in machines where not everything is
+ *    connected it will display wrong mixer elements.
+ *  - Driver assumes that the microphone is always
+ *    monaureal and connected to the right channel of
+ *    the input. This should also be a codec-dependent
+ *    flag, maybe the codec should have 3 different
+ *    bits for the three different possibilities how
+ *    it can be hooked up...
+ *    But as long as I don't see any hardware hooked
+ *    up that way...
+ *  - As Apple notes in their code, the tas3004 seems
+ *    to delay the right channel by one sample. You can
+ *    see this when for example recording stereo in
+ *    audacity, or recording the tas output via cable
+ *    on another machine (use a sinus generator or so).
+ *    I tried programming the BiQuads but couldn't
+ *    make the delay work, maybe someone can read the
+ *    datasheet and fix it. The relevant Apple comment
+ *    is in AppleTAS3004Audio.cpp lines 1637 ff. Note
+ *    that their comment describing how they program
+ *    the filters sucks...
+ *
+ * Other things:
+ *  - this should actually register *two* aoa_codec
+ *    structs since it has two inputs. Then it must
+ *    use the prepare callback to forbid running the
+ *    secondary output on a different clock.
+ *    Also, whatever bus knows how to do this must
+ *    provide two soundbus_dev devices and the fabric
+ *    must be able to link them correctly.
+ *
+ *    I don't even know if Apple ever uses the second
+ *    port on the tas3004 though, I don't think their
+ *    i2s controllers can even do it. OTOH, they all
+ *    derive the clocks from common clocks, so it
+ *    might just be possible. The framework allows the
+ *    codec to refine the transfer_info items in the
+ *    usable callback, so we can simply remove the
+ *    rates the second instance is not using when it
+ *    actually is in use.
+ *    Maybe we'll need to make the sound busses have
+ *    a 'clock group id' value so the codec can
+ *    determine if the two outputs can be driven at
+ *    the same time. But that is likely overkill, up
+ *    to the fabric to not link them up incorrectly,
+ *    and up to the hardware designer to not wire
+ *    them up in some weird unusable way.
+ */
+#include <stddef.h>
+#include <linux/i2c.h>
+#include <asm/pmac_low_i2c.h>
+#include <asm/prom.h>
+#include <linux/delay.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+
+MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("tas codec driver for snd-aoa");
+
+#include "tas.h"
+#include "tas-gain-table.h"
+#include "tas-basstreble.h"
+#include "../aoa.h"
+#include "../soundbus/soundbus.h"
+
+#define PFX "snd-aoa-codec-tas: "
+
+
+struct tas {
+       struct aoa_codec        codec;
+       struct i2c_client       i2c;
+       u32                     mute_l:1, mute_r:1 ,
+                               controls_created:1 ,
+                               drc_enabled:1,
+                               hw_enabled:1;
+       u8                      cached_volume_l, cached_volume_r;
+       u8                      mixer_l[3], mixer_r[3];
+       u8                      bass, treble;
+       u8                      acr;
+       int                     drc_range;
+       /* protects hardware access against concurrency from
+        * userspace when hitting controls and during
+        * codec init/suspend/resume */
+       struct mutex            mtx;
+};
+
+static int tas_reset_init(struct tas *tas);
+
+static struct tas *codec_to_tas(struct aoa_codec *codec)
+{
+       return container_of(codec, struct tas, codec);
+}
+
+static inline int tas_write_reg(struct tas *tas, u8 reg, u8 len, u8 *data)
+{
+       if (len == 1)
+               return i2c_smbus_write_byte_data(&tas->i2c, reg, *data);
+       else
+               return i2c_smbus_write_i2c_block_data(&tas->i2c, reg, len, data);
+}
+
+static void tas3004_set_drc(struct tas *tas)
+{
+       unsigned char val[6];
+
+       if (tas->drc_enabled)
+               val[0] = 0x50; /* 3:1 above threshold */
+       else
+               val[0] = 0x51; /* disabled */
+       val[1] = 0x02; /* 1:1 below threshold */
+       if (tas->drc_range > 0xef)
+               val[2] = 0xef;
+       else if (tas->drc_range < 0)
+               val[2] = 0x00;
+       else
+               val[2] = tas->drc_range;
+       val[3] = 0xb0;
+       val[4] = 0x60;
+       val[5] = 0xa0;
+
+       tas_write_reg(tas, TAS_REG_DRC, 6, val);
+}
+
+static void tas_set_treble(struct tas *tas)
+{
+       u8 tmp;
+
+       tmp = tas3004_treble(tas->treble);
+       tas_write_reg(tas, TAS_REG_TREBLE, 1, &tmp);
+}
+
+static void tas_set_bass(struct tas *tas)
+{
+       u8 tmp;
+
+       tmp = tas3004_bass(tas->bass);
+       tas_write_reg(tas, TAS_REG_BASS, 1, &tmp);
+}
+
+static void tas_set_volume(struct tas *tas)
+{
+       u8 block[6];
+       int tmp;
+       u8 left, right;
+
+       left = tas->cached_volume_l;
+       right = tas->cached_volume_r;
+
+       if (left > 177) left = 177;
+       if (right > 177) right = 177;
+
+       if (tas->mute_l) left = 0;
+       if (tas->mute_r) right = 0;
+
+       /* analysing the volume and mixer tables shows
+        * that they are similar enough when we shift
+        * the mixer table down by 4 bits. The error
+        * is miniscule, in just one item the error
+        * is 1, at a value of 0x07f17b (mixer table
+        * value is 0x07f17a) */
+       tmp = tas_gaintable[left];
+       block[0] = tmp>>20;
+       block[1] = tmp>>12;
+       block[2] = tmp>>4;
+       tmp = tas_gaintable[right];
+       block[3] = tmp>>20;
+       block[4] = tmp>>12;
+       block[5] = tmp>>4;
+       tas_write_reg(tas, TAS_REG_VOL, 6, block);
+}
+
+static void tas_set_mixer(struct tas *tas)
+{
+       u8 block[9];
+       int tmp, i;
+       u8 val;
+
+       for (i=0;i<3;i++) {
+               val = tas->mixer_l[i];
+               if (val > 177) val = 177;
+               tmp = tas_gaintable[val];
+               block[3*i+0] = tmp>>16;
+               block[3*i+1] = tmp>>8;
+               block[3*i+2] = tmp;
+       }
+       tas_write_reg(tas, TAS_REG_LMIX, 9, block);
+
+       for (i=0;i<3;i++) {
+               val = tas->mixer_r[i];
+               if (val > 177) val = 177;
+               tmp = tas_gaintable[val];
+               block[3*i+0] = tmp>>16;
+               block[3*i+1] = tmp>>8;
+               block[3*i+2] = tmp;
+       }
+       tas_write_reg(tas, TAS_REG_RMIX, 9, block);
+}
+
+/* alsa stuff */
+
+static int tas_dev_register(struct snd_device *dev)
+{
+       return 0;
+}
+
+static struct snd_device_ops ops = {
+       .dev_register = tas_dev_register,
+};
+
+static int tas_snd_vol_info(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_info *uinfo)
+{
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+       uinfo->count = 2;
+       uinfo->value.integer.min = 0;
+       uinfo->value.integer.max = 177;
+       return 0;
+}
+
+static int tas_snd_vol_get(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct tas *tas = snd_kcontrol_chip(kcontrol);
+
+       mutex_lock(&tas->mtx);
+       ucontrol->value.integer.value[0] = tas->cached_volume_l;
+       ucontrol->value.integer.value[1] = tas->cached_volume_r;
+       mutex_unlock(&tas->mtx);
+       return 0;
+}
+
+static int tas_snd_vol_put(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct tas *tas = snd_kcontrol_chip(kcontrol);
+
+       if (ucontrol->value.integer.value[0] < 0 ||
+           ucontrol->value.integer.value[0] > 177)
+               return -EINVAL;
+       if (ucontrol->value.integer.value[1] < 0 ||
+           ucontrol->value.integer.value[1] > 177)
+               return -EINVAL;
+
+       mutex_lock(&tas->mtx);
+       if (tas->cached_volume_l == ucontrol->value.integer.value[0]
+        && tas->cached_volume_r == ucontrol->value.integer.value[1]) {
+               mutex_unlock(&tas->mtx);
+               return 0;
+       }
+
+       tas->cached_volume_l = ucontrol->value.integer.value[0];
+       tas->cached_volume_r = ucontrol->value.integer.value[1];
+       if (tas->hw_enabled)
+               tas_set_volume(tas);
+       mutex_unlock(&tas->mtx);
+       return 1;
+}
+
+static struct snd_kcontrol_new volume_control = {
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name = "Master Playback Volume",
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+       .info = tas_snd_vol_info,
+       .get = tas_snd_vol_get,
+       .put = tas_snd_vol_put,
+};
+
+#define tas_snd_mute_info      snd_ctl_boolean_stereo_info
+
+static int tas_snd_mute_get(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct tas *tas = snd_kcontrol_chip(kcontrol);
+
+       mutex_lock(&tas->mtx);
+       ucontrol->value.integer.value[0] = !tas->mute_l;
+       ucontrol->value.integer.value[1] = !tas->mute_r;
+       mutex_unlock(&tas->mtx);
+       return 0;
+}
+
+static int tas_snd_mute_put(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct tas *tas = snd_kcontrol_chip(kcontrol);
+
+       mutex_lock(&tas->mtx);
+       if (tas->mute_l == !ucontrol->value.integer.value[0]
+        && tas->mute_r == !ucontrol->value.integer.value[1]) {
+               mutex_unlock(&tas->mtx);
+               return 0;
+       }
+
+       tas->mute_l = !ucontrol->value.integer.value[0];
+       tas->mute_r = !ucontrol->value.integer.value[1];
+       if (tas->hw_enabled)
+               tas_set_volume(tas);
+       mutex_unlock(&tas->mtx);
+       return 1;
+}
+
+static struct snd_kcontrol_new mute_control = {
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name = "Master Playback Switch",
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+       .info = tas_snd_mute_info,
+       .get = tas_snd_mute_get,
+       .put = tas_snd_mute_put,
+};
+
+static int tas_snd_mixer_info(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_info *uinfo)
+{
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+       uinfo->count = 2;
+       uinfo->value.integer.min = 0;
+       uinfo->value.integer.max = 177;
+       return 0;
+}
+
+static int tas_snd_mixer_get(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct tas *tas = snd_kcontrol_chip(kcontrol);
+       int idx = kcontrol->private_value;
+
+       mutex_lock(&tas->mtx);
+       ucontrol->value.integer.value[0] = tas->mixer_l[idx];
+       ucontrol->value.integer.value[1] = tas->mixer_r[idx];
+       mutex_unlock(&tas->mtx);
+
+       return 0;
+}
+
+static int tas_snd_mixer_put(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct tas *tas = snd_kcontrol_chip(kcontrol);
+       int idx = kcontrol->private_value;
+
+       mutex_lock(&tas->mtx);
+       if (tas->mixer_l[idx] == ucontrol->value.integer.value[0]
+        && tas->mixer_r[idx] == ucontrol->value.integer.value[1]) {
+               mutex_unlock(&tas->mtx);
+               return 0;
+       }
+
+       tas->mixer_l[idx] = ucontrol->value.integer.value[0];
+       tas->mixer_r[idx] = ucontrol->value.integer.value[1];
+
+       if (tas->hw_enabled)
+               tas_set_mixer(tas);
+       mutex_unlock(&tas->mtx);
+       return 1;
+}
+
+#define MIXER_CONTROL(n,descr,idx)                     \
+static struct snd_kcontrol_new n##_control = {         \
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,            \
+       .name = descr " Playback Volume",               \
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,      \
+       .info = tas_snd_mixer_info,                     \
+       .get = tas_snd_mixer_get,                       \
+       .put = tas_snd_mixer_put,                       \
+       .private_value = idx,                           \
+}
+
+MIXER_CONTROL(pcm1, "PCM", 0);
+MIXER_CONTROL(monitor, "Monitor", 2);
+
+static int tas_snd_drc_range_info(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_info *uinfo)
+{
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+       uinfo->count = 1;
+       uinfo->value.integer.min = 0;
+       uinfo->value.integer.max = TAS3004_DRC_MAX;
+       return 0;
+}
+
+static int tas_snd_drc_range_get(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct tas *tas = snd_kcontrol_chip(kcontrol);
+
+       mutex_lock(&tas->mtx);
+       ucontrol->value.integer.value[0] = tas->drc_range;
+       mutex_unlock(&tas->mtx);
+       return 0;
+}
+
+static int tas_snd_drc_range_put(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct tas *tas = snd_kcontrol_chip(kcontrol);
+
+       if (ucontrol->value.integer.value[0] < 0 ||
+           ucontrol->value.integer.value[0] > TAS3004_DRC_MAX)
+               return -EINVAL;
+
+       mutex_lock(&tas->mtx);
+       if (tas->drc_range == ucontrol->value.integer.value[0]) {
+               mutex_unlock(&tas->mtx);
+               return 0;
+       }
+
+       tas->drc_range = ucontrol->value.integer.value[0];
+       if (tas->hw_enabled)
+               tas3004_set_drc(tas);
+       mutex_unlock(&tas->mtx);
+       return 1;
+}
+
+static struct snd_kcontrol_new drc_range_control = {
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name = "DRC Range",
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+       .info = tas_snd_drc_range_info,
+       .get = tas_snd_drc_range_get,
+       .put = tas_snd_drc_range_put,
+};
+
+#define tas_snd_drc_switch_info                snd_ctl_boolean_mono_info
+
+static int tas_snd_drc_switch_get(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct tas *tas = snd_kcontrol_chip(kcontrol);
+
+       mutex_lock(&tas->mtx);
+       ucontrol->value.integer.value[0] = tas->drc_enabled;
+       mutex_unlock(&tas->mtx);
+       return 0;
+}
+
+static int tas_snd_drc_switch_put(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct tas *tas = snd_kcontrol_chip(kcontrol);
+
+       mutex_lock(&tas->mtx);
+       if (tas->drc_enabled == ucontrol->value.integer.value[0]) {
+               mutex_unlock(&tas->mtx);
+               return 0;
+       }
+
+       tas->drc_enabled = !!ucontrol->value.integer.value[0];
+       if (tas->hw_enabled)
+               tas3004_set_drc(tas);
+       mutex_unlock(&tas->mtx);
+       return 1;
+}
+
+static struct snd_kcontrol_new drc_switch_control = {
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name = "DRC Range Switch",
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+       .info = tas_snd_drc_switch_info,
+       .get = tas_snd_drc_switch_get,
+       .put = tas_snd_drc_switch_put,
+};
+
+static int tas_snd_capture_source_info(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_info *uinfo)
+{
+       static char *texts[] = { "Line-In", "Microphone" };
+
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+       uinfo->count = 1;
+       uinfo->value.enumerated.items = 2;
+       if (uinfo->value.enumerated.item > 1)
+               uinfo->value.enumerated.item = 1;
+       strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+       return 0;
+}
+
+static int tas_snd_capture_source_get(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct tas *tas = snd_kcontrol_chip(kcontrol);
+
+       mutex_lock(&tas->mtx);
+       ucontrol->value.enumerated.item[0] = !!(tas->acr & TAS_ACR_INPUT_B);
+       mutex_unlock(&tas->mtx);
+       return 0;
+}
+
+static int tas_snd_capture_source_put(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct tas *tas = snd_kcontrol_chip(kcontrol);
+       int oldacr;
+
+       if (ucontrol->value.enumerated.item[0] > 1)
+               return -EINVAL;
+       mutex_lock(&tas->mtx);
+       oldacr = tas->acr;
+
+       /*
+        * Despite what the data sheet says in one place, the
+        * TAS_ACR_B_MONAUREAL bit forces mono output even when
+        * input A (line in) is selected.
+        */
+       tas->acr &= ~(TAS_ACR_INPUT_B | TAS_ACR_B_MONAUREAL);
+       if (ucontrol->value.enumerated.item[0])
+               tas->acr |= TAS_ACR_INPUT_B | TAS_ACR_B_MONAUREAL |
+                     TAS_ACR_B_MON_SEL_RIGHT;
+       if (oldacr == tas->acr) {
+               mutex_unlock(&tas->mtx);
+               return 0;
+       }
+       if (tas->hw_enabled)
+               tas_write_reg(tas, TAS_REG_ACR, 1, &tas->acr);
+       mutex_unlock(&tas->mtx);
+       return 1;
+}
+
+static struct snd_kcontrol_new capture_source_control = {
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       /* If we name this 'Input Source', it properly shows up in
+        * alsamixer as a selection, * but it's shown under the
+        * 'Playback' category.
+        * If I name it 'Capture Source', it shows up in strange
+        * ways (two bools of which one can be selected at a
+        * time) but at least it's shown in the 'Capture'
+        * category.
+        * I was told that this was due to backward compatibility,
+        * but I don't understand then why the mangling is *not*
+        * done when I name it "Input Source".....
+        */
+       .name = "Capture Source",
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+       .info = tas_snd_capture_source_info,
+       .get = tas_snd_capture_source_get,
+       .put = tas_snd_capture_source_put,
+};
+
+static int tas_snd_treble_info(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_info *uinfo)
+{
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+       uinfo->count = 1;
+       uinfo->value.integer.min = TAS3004_TREBLE_MIN;
+       uinfo->value.integer.max = TAS3004_TREBLE_MAX;
+       return 0;
+}
+
+static int tas_snd_treble_get(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct tas *tas = snd_kcontrol_chip(kcontrol);
+
+       mutex_lock(&tas->mtx);
+       ucontrol->value.integer.value[0] = tas->treble;
+       mutex_unlock(&tas->mtx);
+       return 0;
+}
+
+static int tas_snd_treble_put(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct tas *tas = snd_kcontrol_chip(kcontrol);
+
+       if (ucontrol->value.integer.value[0] < TAS3004_TREBLE_MIN ||
+           ucontrol->value.integer.value[0] > TAS3004_TREBLE_MAX)
+               return -EINVAL;
+       mutex_lock(&tas->mtx);
+       if (tas->treble == ucontrol->value.integer.value[0]) {
+               mutex_unlock(&tas->mtx);
+               return 0;
+       }
+
+       tas->treble = ucontrol->value.integer.value[0];
+       if (tas->hw_enabled)
+               tas_set_treble(tas);
+       mutex_unlock(&tas->mtx);
+       return 1;
+}
+
+static struct snd_kcontrol_new treble_control = {
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name = "Treble",
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+       .info = tas_snd_treble_info,
+       .get = tas_snd_treble_get,
+       .put = tas_snd_treble_put,
+};
+
+static int tas_snd_bass_info(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_info *uinfo)
+{
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+       uinfo->count = 1;
+       uinfo->value.integer.min = TAS3004_BASS_MIN;
+       uinfo->value.integer.max = TAS3004_BASS_MAX;
+       return 0;
+}
+
+static int tas_snd_bass_get(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct tas *tas = snd_kcontrol_chip(kcontrol);
+
+       mutex_lock(&tas->mtx);
+       ucontrol->value.integer.value[0] = tas->bass;
+       mutex_unlock(&tas->mtx);
+       return 0;
+}
+
+static int tas_snd_bass_put(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct tas *tas = snd_kcontrol_chip(kcontrol);
+
+       if (ucontrol->value.integer.value[0] < TAS3004_BASS_MIN ||
+           ucontrol->value.integer.value[0] > TAS3004_BASS_MAX)
+               return -EINVAL;
+       mutex_lock(&tas->mtx);
+       if (tas->bass == ucontrol->value.integer.value[0]) {
+               mutex_unlock(&tas->mtx);
+               return 0;
+       }
+
+       tas->bass = ucontrol->value.integer.value[0];
+       if (tas->hw_enabled)
+               tas_set_bass(tas);
+       mutex_unlock(&tas->mtx);
+       return 1;
+}
+
+static struct snd_kcontrol_new bass_control = {
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name = "Bass",
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+       .info = tas_snd_bass_info,
+       .get = tas_snd_bass_get,
+       .put = tas_snd_bass_put,
+};
+
+static struct transfer_info tas_transfers[] = {
+       {
+               /* input */
+               .formats = SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S24_BE,
+               .rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
+               .transfer_in = 1,
+       },
+       {
+               /* output */
+               .formats = SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S24_BE,
+               .rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
+               .transfer_in = 0,
+       },
+       {}
+};
+
+static int tas_usable(struct codec_info_item *cii,
+                     struct transfer_info *ti,
+                     struct transfer_info *out)
+{
+       return 1;
+}
+
+static int tas_reset_init(struct tas *tas)
+{
+       u8 tmp;
+
+       tas->codec.gpio->methods->all_amps_off(tas->codec.gpio);
+       msleep(5);
+       tas->codec.gpio->methods->set_hw_reset(tas->codec.gpio, 0);
+       msleep(5);
+       tas->codec.gpio->methods->set_hw_reset(tas->codec.gpio, 1);
+       msleep(20);
+       tas->codec.gpio->methods->set_hw_reset(tas->codec.gpio, 0);
+       msleep(10);
+       tas->codec.gpio->methods->all_amps_restore(tas->codec.gpio);
+
+       tmp = TAS_MCS_SCLK64 | TAS_MCS_SPORT_MODE_I2S | TAS_MCS_SPORT_WL_24BIT;
+       if (tas_write_reg(tas, TAS_REG_MCS, 1, &tmp))
+               goto outerr;
+
+       tas->acr |= TAS_ACR_ANALOG_PDOWN;
+       if (tas_write_reg(tas, TAS_REG_ACR, 1, &tas->acr))
+               goto outerr;
+
+       tmp = 0;
+       if (tas_write_reg(tas, TAS_REG_MCS2, 1, &tmp))
+               goto outerr;
+
+       tas3004_set_drc(tas);
+
+       /* Set treble & bass to 0dB */
+       tas->treble = TAS3004_TREBLE_ZERO;
+       tas->bass = TAS3004_BASS_ZERO;
+       tas_set_treble(tas);
+       tas_set_bass(tas);
+
+       tas->acr &= ~TAS_ACR_ANALOG_PDOWN;
+       if (tas_write_reg(tas, TAS_REG_ACR, 1, &tas->acr))
+               goto outerr;
+
+       return 0;
+ outerr:
+       return -ENODEV;
+}
+
+static int tas_switch_clock(struct codec_info_item *cii, enum clock_switch clock)
+{
+       struct tas *tas = cii->codec_data;
+
+       switch(clock) {
+       case CLOCK_SWITCH_PREPARE_SLAVE:
+               /* Clocks are going away, mute mute mute */
+               tas->codec.gpio->methods->all_amps_off(tas->codec.gpio);
+               tas->hw_enabled = 0;
+               break;
+       case CLOCK_SWITCH_SLAVE:
+               /* Clocks are back, re-init the codec */
+               mutex_lock(&tas->mtx);
+               tas_reset_init(tas);
+               tas_set_volume(tas);
+               tas_set_mixer(tas);
+               tas->hw_enabled = 1;
+               tas->codec.gpio->methods->all_amps_restore(tas->codec.gpio);
+               mutex_unlock(&tas->mtx);
+               break;
+       default:
+               /* doesn't happen as of now */
+               return -EINVAL;
+       }
+       return 0;
+}
+
+#ifdef CONFIG_PM
+/* we are controlled via i2c and assume that is always up
+ * If that wasn't the case, we'd have to suspend once
+ * our i2c device is suspended, and then take note of that! */
+static int tas_suspend(struct tas *tas)
+{
+       mutex_lock(&tas->mtx);
+       tas->hw_enabled = 0;
+       tas->acr |= TAS_ACR_ANALOG_PDOWN;
+       tas_write_reg(tas, TAS_REG_ACR, 1, &tas->acr);
+       mutex_unlock(&tas->mtx);
+       return 0;
+}
+
+static int tas_resume(struct tas *tas)
+{
+       /* reset codec */
+       mutex_lock(&tas->mtx);
+       tas_reset_init(tas);
+       tas_set_volume(tas);
+       tas_set_mixer(tas);
+       tas->hw_enabled = 1;
+       mutex_unlock(&tas->mtx);
+       return 0;
+}
+
+static int _tas_suspend(struct codec_info_item *cii, pm_message_t state)
+{
+       return tas_suspend(cii->codec_data);
+}
+
+static int _tas_resume(struct codec_info_item *cii)
+{
+       return tas_resume(cii->codec_data);
+}
+#else /* CONFIG_PM */
+#define _tas_suspend   NULL
+#define _tas_resume    NULL
+#endif /* CONFIG_PM */
+
+static struct codec_info tas_codec_info = {
+       .transfers = tas_transfers,
+       /* in theory, we can drive it at 512 too...
+        * but so far the framework doesn't allow
+        * for that and I don't see much point in it. */
+       .sysclock_factor = 256,
+       /* same here, could be 32 for just one 16 bit format */
+       .bus_factor = 64,
+       .owner = THIS_MODULE,
+       .usable = tas_usable,
+       .switch_clock = tas_switch_clock,
+       .suspend = _tas_suspend,
+       .resume = _tas_resume,
+};
+
+static int tas_init_codec(struct aoa_codec *codec)
+{
+       struct tas *tas = codec_to_tas(codec);
+       int err;
+
+       if (!tas->codec.gpio || !tas->codec.gpio->methods) {
+               printk(KERN_ERR PFX "gpios not assigned!!\n");
+               return -EINVAL;
+       }
+
+       mutex_lock(&tas->mtx);
+       if (tas_reset_init(tas)) {
+               printk(KERN_ERR PFX "tas failed to initialise\n");
+               mutex_unlock(&tas->mtx);
+               return -ENXIO;
+       }
+       tas->hw_enabled = 1;
+       mutex_unlock(&tas->mtx);
+
+       if (tas->codec.soundbus_dev->attach_codec(tas->codec.soundbus_dev,
+                                                  aoa_get_card(),
+                                                  &tas_codec_info, tas)) {
+               printk(KERN_ERR PFX "error attaching tas to soundbus\n");
+               return -ENODEV;
+       }
+
+       if (aoa_snd_device_new(SNDRV_DEV_LOWLEVEL, tas, &ops)) {
+               printk(KERN_ERR PFX "failed to create tas snd device!\n");
+               return -ENODEV;
+       }
+       err = aoa_snd_ctl_add(snd_ctl_new1(&volume_control, tas));
+       if (err)
+               goto error;
+
+       err = aoa_snd_ctl_add(snd_ctl_new1(&mute_control, tas));
+       if (err)
+               goto error;
+
+       err = aoa_snd_ctl_add(snd_ctl_new1(&pcm1_control, tas));
+       if (err)
+               goto error;
+
+       err = aoa_snd_ctl_add(snd_ctl_new1(&monitor_control, tas));
+       if (err)
+               goto error;
+
+       err = aoa_snd_ctl_add(snd_ctl_new1(&capture_source_control, tas));
+       if (err)
+               goto error;
+
+       err = aoa_snd_ctl_add(snd_ctl_new1(&drc_range_control, tas));
+       if (err)
+               goto error;
+
+       err = aoa_snd_ctl_add(snd_ctl_new1(&drc_switch_control, tas));
+       if (err)
+               goto error;
+
+       err = aoa_snd_ctl_add(snd_ctl_new1(&treble_control, tas));
+       if (err)
+               goto error;
+
+       err = aoa_snd_ctl_add(snd_ctl_new1(&bass_control, tas));
+       if (err)
+               goto error;
+
+       return 0;
+ error:
+       tas->codec.soundbus_dev->detach_codec(tas->codec.soundbus_dev, tas);
+       snd_device_free(aoa_get_card(), tas);
+       return err;
+}
+
+static void tas_exit_codec(struct aoa_codec *codec)
+{
+       struct tas *tas = codec_to_tas(codec);
+
+       if (!tas->codec.soundbus_dev)
+               return;
+       tas->codec.soundbus_dev->detach_codec(tas->codec.soundbus_dev, tas);
+}
+
+
+static struct i2c_driver tas_driver;
+
+static int tas_create(struct i2c_adapter *adapter,
+                      struct device_node *node,
+                      int addr)
+{
+       struct tas *tas;
+
+       tas = kzalloc(sizeof(struct tas), GFP_KERNEL);
+
+       if (!tas)
+               return -ENOMEM;
+
+       mutex_init(&tas->mtx);
+       tas->i2c.driver = &tas_driver;
+       tas->i2c.adapter = adapter;
+       tas->i2c.addr = addr;
+       /* seems that half is a saner default */
+       tas->drc_range = TAS3004_DRC_MAX / 2;
+       strlcpy(tas->i2c.name, "tas audio codec", I2C_NAME_SIZE);
+
+       if (i2c_attach_client(&tas->i2c)) {
+               printk(KERN_ERR PFX "failed to attach to i2c\n");
+               goto fail;
+       }
+
+       strlcpy(tas->codec.name, "tas", MAX_CODEC_NAME_LEN);
+       tas->codec.owner = THIS_MODULE;
+       tas->codec.init = tas_init_codec;
+       tas->codec.exit = tas_exit_codec;
+       tas->codec.node = of_node_get(node);
+
+       if (aoa_codec_register(&tas->codec)) {
+               goto detach;
+       }
+       printk(KERN_DEBUG
+              "snd-aoa-codec-tas: tas found, addr 0x%02x on %s\n",
+              addr, node->full_name);
+       return 0;
+ detach:
+       i2c_detach_client(&tas->i2c);
+ fail:
+       mutex_destroy(&tas->mtx);
+       kfree(tas);
+       return -EINVAL;
+}
+
+static int tas_i2c_attach(struct i2c_adapter *adapter)
+{
+       struct device_node *busnode, *dev = NULL;
+       struct pmac_i2c_bus *bus;
+
+       bus = pmac_i2c_adapter_to_bus(adapter);
+       if (bus == NULL)
+               return -ENODEV;
+       busnode = pmac_i2c_get_bus_node(bus);
+
+       while ((dev = of_get_next_child(busnode, dev)) != NULL) {
+               if (of_device_is_compatible(dev, "tas3004")) {
+                       const u32 *addr;
+                       printk(KERN_DEBUG PFX "found tas3004\n");
+                       addr = of_get_property(dev, "reg", NULL);
+                       if (!addr)
+                               continue;
+                       return tas_create(adapter, dev, ((*addr) >> 1) & 0x7f);
+               }
+               /* older machines have no 'codec' node with a 'compatible'
+                * property that says 'tas3004', they just have a 'deq'
+                * node without any such property... */
+               if (strcmp(dev->name, "deq") == 0) {
+                       const u32 *_addr;
+                       u32 addr;
+                       printk(KERN_DEBUG PFX "found 'deq' node\n");
+                       _addr = of_get_property(dev, "i2c-address", NULL);
+                       if (!_addr)
+                               continue;
+                       addr = ((*_addr) >> 1) & 0x7f;
+                       /* now, if the address doesn't match any of the two
+                        * that a tas3004 can have, we cannot handle this.
+                        * I doubt it ever happens but hey. */
+                       if (addr != 0x34 && addr != 0x35)
+                               continue;
+                       return tas_create(adapter, dev, addr);
+               }
+       }
+       return -ENODEV;
+}
+
+static int tas_i2c_detach(struct i2c_client *client)
+{
+       struct tas *tas = container_of(client, struct tas, i2c);
+       int err;
+       u8 tmp = TAS_ACR_ANALOG_PDOWN;
+
+       if ((err = i2c_detach_client(client)))
+               return err;
+       aoa_codec_unregister(&tas->codec);
+       of_node_put(tas->codec.node);
+
+       /* power down codec chip */
+       tas_write_reg(tas, TAS_REG_ACR, 1, &tmp);
+
+       mutex_destroy(&tas->mtx);
+       kfree(tas);
+       return 0;
+}
+
+static struct i2c_driver tas_driver = {
+       .driver = {
+               .name = "aoa_codec_tas",
+               .owner = THIS_MODULE,
+       },
+       .attach_adapter = tas_i2c_attach,
+       .detach_client = tas_i2c_detach,
+};
+
+static int __init tas_init(void)
+{
+       return i2c_add_driver(&tas_driver);
+}
+
+static void __exit tas_exit(void)
+{
+       i2c_del_driver(&tas_driver);
+}
+
+module_init(tas_init);
+module_exit(tas_exit);
diff --git a/sound/aoa/codecs/tas.h b/sound/aoa/codecs/tas.h

new file mode 100644 (file)

index 0000000..ae177e3
--- /dev/null
+++ b/sound/aoa/codecs/tas.h
@@ -0,0 +1,55 @@
+/*
+ * Apple Onboard Audio driver for tas codec (header)
+ *
+ * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
+ *
+ * GPL v2, can be found in COPYING.
+ */
+#ifndef __SND_AOA_CODECTASH
+#define __SND_AOA_CODECTASH
+
+#define TAS_REG_MCS    0x01    /* main control */
+#      define TAS_MCS_FASTLOAD         (1<<7)
+#      define TAS_MCS_SCLK64           (1<<6)
+#      define TAS_MCS_SPORT_MODE_MASK  (3<<4)
+#      define TAS_MCS_SPORT_MODE_I2S   (2<<4)
+#      define TAS_MCS_SPORT_MODE_RJ    (1<<4)
+#      define TAS_MCS_SPORT_MODE_LJ    (0<<4)
+#      define TAS_MCS_SPORT_WL_MASK    (3<<0)
+#      define TAS_MCS_SPORT_WL_16BIT   (0<<0)
+#      define TAS_MCS_SPORT_WL_18BIT   (1<<0)
+#      define TAS_MCS_SPORT_WL_20BIT   (2<<0)
+#      define TAS_MCS_SPORT_WL_24BIT   (3<<0)
+
+#define TAS_REG_DRC    0x02
+#define TAS_REG_VOL    0x04
+#define TAS_REG_TREBLE 0x05
+#define TAS_REG_BASS   0x06
+#define TAS_REG_LMIX   0x07
+#define TAS_REG_RMIX   0x08
+
+#define TAS_REG_ACR    0x40    /* analog control */
+#      define TAS_ACR_B_MONAUREAL      (1<<7)
+#      define TAS_ACR_B_MON_SEL_RIGHT  (1<<6)
+#      define TAS_ACR_DEEMPH_MASK      (3<<2)
+#      define TAS_ACR_DEEMPH_OFF       (0<<2)
+#      define TAS_ACR_DEEMPH_48KHz     (1<<2)
+#      define TAS_ACR_DEEMPH_44KHz     (2<<2)
+#      define TAS_ACR_INPUT_B          (1<<1)
+#      define TAS_ACR_ANALOG_PDOWN     (1<<0)
+
+#define TAS_REG_MCS2   0x43    /* main control 2 */
+#      define TAS_MCS2_ALLPASS         (1<<1)
+
+#define TAS_REG_LEFT_BIQUAD6   0x10
+#define TAS_REG_RIGHT_BIQUAD6  0x19
+
+#define TAS_REG_LEFT_LOUDNESS          0x21
+#define TAS_REG_RIGHT_LOUDNESS         0x22
+#define TAS_REG_LEFT_LOUDNESS_GAIN     0x23
+#define TAS_REG_RIGHT_LOUDNESS_GAIN    0x24
+
+#define TAS3001_DRC_MAX                0x5f
+#define TAS3004_DRC_MAX                0xef
+
+#endif /* __SND_AOA_CODECTASH */
diff --git a/sound/aoa/codecs/toonie.c b/sound/aoa/codecs/toonie.c

new file mode 100644 (file)

index 0000000..f13827e
--- /dev/null
+++ b/sound/aoa/codecs/toonie.c
@@ -0,0 +1,150 @@
+/*
+ * Apple Onboard Audio driver for Toonie codec
+ *
+ * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
+ *
+ * GPL v2, can be found in COPYING.
+ *
+ *
+ * This is a driver for the toonie codec chip. This chip is present
+ * on the Mac Mini and is nothing but a DAC.
+ */
+#include <linux/delay.h>
+#include <linux/module.h>
+MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("toonie codec driver for snd-aoa");
+
+#include "../aoa.h"
+#include "../soundbus/soundbus.h"
+
+
+#define PFX "snd-aoa-codec-toonie: "
+
+struct toonie {
+       struct aoa_codec        codec;
+};
+#define codec_to_toonie(c) container_of(c, struct toonie, codec)
+
+static int toonie_dev_register(struct snd_device *dev)
+{
+       return 0;
+}
+
+static struct snd_device_ops ops = {
+       .dev_register = toonie_dev_register,
+};
+
+static struct transfer_info toonie_transfers[] = {
+       /* This thing *only* has analog output,
+        * the rates are taken from Info.plist
+        * from Darwin. */
+       {
+               .formats = SNDRV_PCM_FMTBIT_S16_BE |
+                          SNDRV_PCM_FMTBIT_S24_BE,
+               .rates = SNDRV_PCM_RATE_32000 |
+                        SNDRV_PCM_RATE_44100 |
+                        SNDRV_PCM_RATE_48000 |
+                        SNDRV_PCM_RATE_88200 |
+                        SNDRV_PCM_RATE_96000,
+       },
+       {}
+};
+
+static int toonie_usable(struct codec_info_item *cii,
+                        struct transfer_info *ti,
+                        struct transfer_info *out)
+{
+       return 1;
+}
+
+#ifdef CONFIG_PM
+static int toonie_suspend(struct codec_info_item *cii, pm_message_t state)
+{
+       /* can we turn it off somehow? */
+       return 0;
+}
+
+static int toonie_resume(struct codec_info_item *cii)
+{
+       return 0;
+}
+#endif /* CONFIG_PM */
+
+static struct codec_info toonie_codec_info = {
+       .transfers = toonie_transfers,
+       .sysclock_factor = 256,
+       .bus_factor = 64,
+       .owner = THIS_MODULE,
+       .usable = toonie_usable,
+#ifdef CONFIG_PM
+       .suspend = toonie_suspend,
+       .resume = toonie_resume,
+#endif
+};
+
+static int toonie_init_codec(struct aoa_codec *codec)
+{
+       struct toonie *toonie = codec_to_toonie(codec);
+
+       /* nothing connected? what a joke! */
+       if (toonie->codec.connected != 1)
+               return -ENOTCONN;
+
+       if (aoa_snd_device_new(SNDRV_DEV_LOWLEVEL, toonie, &ops)) {
+               printk(KERN_ERR PFX "failed to create toonie snd device!\n");
+               return -ENODEV;
+       }
+
+       if (toonie->codec.soundbus_dev->attach_codec(toonie->codec.soundbus_dev,
+                                                    aoa_get_card(),
+                                                    &toonie_codec_info, toonie)) {
+               printk(KERN_ERR PFX "error creating toonie pcm\n");
+               snd_device_free(aoa_get_card(), toonie);
+               return -ENODEV;
+       }
+
+       return 0;
+}
+
+static void toonie_exit_codec(struct aoa_codec *codec)
+{
+       struct toonie *toonie = codec_to_toonie(codec);
+
+       if (!toonie->codec.soundbus_dev) {
+               printk(KERN_ERR PFX "toonie_exit_codec called without soundbus_dev!\n");
+               return;
+       }
+       toonie->codec.soundbus_dev->detach_codec(toonie->codec.soundbus_dev, toonie);
+}
+
+static struct toonie *toonie;
+
+static int __init toonie_init(void)
+{
+       toonie = kzalloc(sizeof(struct toonie), GFP_KERNEL);
+
+       if (!toonie)
+               return -ENOMEM;
+
+       strlcpy(toonie->codec.name, "toonie", sizeof(toonie->codec.name));
+       toonie->codec.owner = THIS_MODULE;
+       toonie->codec.init = toonie_init_codec;
+       toonie->codec.exit = toonie_exit_codec;
+
+       if (aoa_codec_register(&toonie->codec)) {
+               kfree(toonie);
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static void __exit toonie_exit(void)
+{
+       aoa_codec_unregister(&toonie->codec);
+       kfree(toonie);
+}
+
+module_init(toonie_init);
+module_exit(toonie_exit);
diff --git a/sound/aoa/core/Makefile b/sound/aoa/core/Makefile

index 62dc7287f66315382b5dd4918e9b28027857bd82..a1596e88c718ceb808c15765229a0ddee00cfc51 100644 (file)
--- a/sound/aoa/core/Makefile
+++ b/sound/aoa/core/Makefile
@@ -1,5 +1,5 @@
  obj-$(CONFIG_SND_AOA) += snd-aoa.o
-snd-aoa-objs := snd-aoa-core.o \
-               snd-aoa-alsa.o \
-               snd-aoa-gpio-pmf.o \
-               snd-aoa-gpio-feature.o
+snd-aoa-objs := core.o \
+               alsa.o \
+               gpio-pmf.o \
+               gpio-feature.o
diff --git a/sound/aoa/core/alsa.c b/sound/aoa/core/alsa.c

new file mode 100644 (file)

index 0000000..6178504
--- /dev/null
+++ b/sound/aoa/core/alsa.c
@@ -0,0 +1,99 @@
+/*
+ * Apple Onboard Audio Alsa helpers
+ *
+ * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
+ *
+ * GPL v2, can be found in COPYING.
+ */
+#include <linux/module.h>
+#include "alsa.h"
+
+static int index = -1;
+module_param(index, int, 0444);
+MODULE_PARM_DESC(index, "index for AOA sound card.");
+
+static struct aoa_card *aoa_card;
+
+int aoa_alsa_init(char *name, struct module *mod, struct device *dev)
+{
+       struct snd_card *alsa_card;
+       int err;
+
+       if (aoa_card)
+               /* cannot be EEXIST due to usage in aoa_fabric_register */
+               return -EBUSY;
+
+       alsa_card = snd_card_new(index, name, mod, sizeof(struct aoa_card));
+       if (!alsa_card)
+               return -ENOMEM;
+       aoa_card = alsa_card->private_data;
+       aoa_card->alsa_card = alsa_card;
+       alsa_card->dev = dev;
+       strlcpy(alsa_card->driver, "AppleOnbdAudio", sizeof(alsa_card->driver));
+       strlcpy(alsa_card->shortname, name, sizeof(alsa_card->shortname));
+       strlcpy(alsa_card->longname, name, sizeof(alsa_card->longname));
+       strlcpy(alsa_card->mixername, name, sizeof(alsa_card->mixername));
+       err = snd_card_register(aoa_card->alsa_card);
+       if (err < 0) {
+               printk(KERN_ERR "snd-aoa: couldn't register alsa card\n");
+               snd_card_free(aoa_card->alsa_card);
+               aoa_card = NULL;
+               return err;
+       }
+       return 0;
+}
+
+struct snd_card *aoa_get_card(void)
+{
+       if (aoa_card)
+               return aoa_card->alsa_card;
+       return NULL;
+}
+EXPORT_SYMBOL_GPL(aoa_get_card);
+
+void aoa_alsa_cleanup(void)
+{
+       if (aoa_card) {
+               snd_card_free(aoa_card->alsa_card);
+               aoa_card = NULL;
+       }
+}
+
+int aoa_snd_device_new(snd_device_type_t type,
+                      void * device_data, struct snd_device_ops * ops)
+{
+       struct snd_card *card = aoa_get_card();
+       int err;
+
+       if (!card) return -ENOMEM;
+
+       err = snd_device_new(card, type, device_data, ops);
+       if (err) {
+               printk(KERN_ERR "snd-aoa: failed to create snd device (%d)\n", err);
+               return err;
+       }
+       err = snd_device_register(card, device_data);
+       if (err) {
+               printk(KERN_ERR "snd-aoa: failed to register "
+                               "snd device (%d)\n", err);
+               printk(KERN_ERR "snd-aoa: have you forgotten the "
+                               "dev_register callback?\n");
+               snd_device_free(card, device_data);
+       }
+       return err;
+}
+EXPORT_SYMBOL_GPL(aoa_snd_device_new);
+
+int aoa_snd_ctl_add(struct snd_kcontrol* control)
+{
+       int err;
+
+       if (!aoa_card) return -ENODEV;
+
+       err = snd_ctl_add(aoa_card->alsa_card, control);
+       if (err)
+               printk(KERN_ERR "snd-aoa: failed to add alsa control (%d)\n",
+                      err);
+       return err;
+}
+EXPORT_SYMBOL_GPL(aoa_snd_ctl_add);
diff --git a/sound/aoa/core/alsa.h b/sound/aoa/core/alsa.h

new file mode 100644 (file)

index 0000000..9669e44
--- /dev/null
+++ b/sound/aoa/core/alsa.h
@@ -0,0 +1,16 @@
+/*
+ * Apple Onboard Audio Alsa private helpers
+ *
+ * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
+ *
+ * GPL v2, can be found in COPYING.
+ */
+
+#ifndef __SND_AOA_ALSA_H
+#define __SND_AOA_ALSA_H
+#include "../aoa.h"
+
+extern int aoa_alsa_init(char *name, struct module *mod, struct device *dev);
+extern void aoa_alsa_cleanup(void);
+
+#endif /* __SND_AOA_ALSA_H */
diff --git a/sound/aoa/core/core.c b/sound/aoa/core/core.c

new file mode 100644 (file)

index 0000000..10bec6c
--- /dev/null
+++ b/sound/aoa/core/core.c
@@ -0,0 +1,162 @@
+/*
+ * Apple Onboard Audio driver core
+ *
+ * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
+ *
+ * GPL v2, can be found in COPYING.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/list.h>
+#include "../aoa.h"
+#include "alsa.h"
+
+MODULE_DESCRIPTION("Apple Onboard Audio Sound Driver");
+MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
+MODULE_LICENSE("GPL");
+
+/* We allow only one fabric. This simplifies things,
+ * and more don't really make that much sense */
+static struct aoa_fabric *fabric;
+static LIST_HEAD(codec_list);
+
+static int attach_codec_to_fabric(struct aoa_codec *c)
+{
+       int err;
+
+       if (!try_module_get(c->owner))
+               return -EBUSY;
+       /* found_codec has to be assigned */
+       err = -ENOENT;
+       if (fabric->found_codec)
+               err = fabric->found_codec(c);
+       if (err) {
+               module_put(c->owner);
+               printk(KERN_ERR "snd-aoa: fabric didn't like codec %s\n",
+                               c->name);
+               return err;
+       }
+       c->fabric = fabric;
+
+       err = 0;
+       if (c->init)
+               err = c->init(c);
+       if (err) {
+               printk(KERN_ERR "snd-aoa: codec %s didn't init\n", c->name);
+               c->fabric = NULL;
+               if (fabric->remove_codec)
+                       fabric->remove_codec(c);
+               module_put(c->owner);
+               return err;
+       }
+       if (fabric->attached_codec)
+               fabric->attached_codec(c);
+       return 0;
+}
+
+int aoa_codec_register(struct aoa_codec *codec)
+{
+       int err = 0;
+
+       /* if there's a fabric already, we can tell if we
+        * will want to have this codec, so propagate error
+        * through. Otherwise, this will happen later... */
+       if (fabric)
+               err = attach_codec_to_fabric(codec);
+       if (!err)
+               list_add(&codec->list, &codec_list);
+       return err;
+}
+EXPORT_SYMBOL_GPL(aoa_codec_register);
+
+void aoa_codec_unregister(struct aoa_codec *codec)
+{
+       list_del(&codec->list);
+       if (codec->fabric && codec->exit)
+               codec->exit(codec);
+       if (fabric && fabric->remove_codec)
+               fabric->remove_codec(codec);
+       codec->fabric = NULL;
+       module_put(codec->owner);
+}
+EXPORT_SYMBOL_GPL(aoa_codec_unregister);
+
+int aoa_fabric_register(struct aoa_fabric *new_fabric, struct device *dev)
+{
+       struct aoa_codec *c;
+       int err;
+
+       /* allow querying for presence of fabric
+        * (i.e. do this test first!) */
+       if (new_fabric == fabric) {
+               err = -EALREADY;
+               goto attach;
+       }
+       if (fabric)
+               return -EEXIST;
+       if (!new_fabric)
+               return -EINVAL;
+
+       err = aoa_alsa_init(new_fabric->name, new_fabric->owner, dev);
+       if (err)
+               return err;
+
+       fabric = new_fabric;
+
+ attach:
+       list_for_each_entry(c, &codec_list, list) {
+               if (c->fabric != fabric)
+                       attach_codec_to_fabric(c);
+       }
+       return err;
+}
+EXPORT_SYMBOL_GPL(aoa_fabric_register);
+
+void aoa_fabric_unregister(struct aoa_fabric *old_fabric)
+{
+       struct aoa_codec *c;
+
+       if (fabric != old_fabric)
+               return;
+
+       list_for_each_entry(c, &codec_list, list) {
+               if (c->fabric)
+                       aoa_fabric_unlink_codec(c);
+       }
+
+       aoa_alsa_cleanup();
+
+       fabric = NULL;
+}
+EXPORT_SYMBOL_GPL(aoa_fabric_unregister);
+
+void aoa_fabric_unlink_codec(struct aoa_codec *codec)
+{
+       if (!codec->fabric) {
+               printk(KERN_ERR "snd-aoa: fabric unassigned "
+                               "in aoa_fabric_unlink_codec\n");
+               dump_stack();
+               return;
+       }
+       if (codec->exit)
+               codec->exit(codec);
+       if (codec->fabric->remove_codec)
+               codec->fabric->remove_codec(codec);
+       codec->fabric = NULL;
+       module_put(codec->owner);
+}
+EXPORT_SYMBOL_GPL(aoa_fabric_unlink_codec);
+
+static int __init aoa_init(void)
+{
+       return 0;
+}
+
+static void __exit aoa_exit(void)
+{
+       aoa_alsa_cleanup();
+}
+
+module_init(aoa_init);
+module_exit(aoa_exit);
diff --git a/sound/aoa/core/gpio-feature.c b/sound/aoa/core/gpio-feature.c

new file mode 100644 (file)

index 0000000..c93ad5d
--- /dev/null
+++ b/sound/aoa/core/gpio-feature.c
@@ -0,0 +1,408 @@
+/*
+ * Apple Onboard Audio feature call GPIO control
+ *
+ * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
+ *
+ * GPL v2, can be found in COPYING.
+ *
+ * This file contains the GPIO control routines for
+ * direct (through feature calls) access to the GPIO
+ * registers.
+ */
+
+#include <asm/pmac_feature.h>
+#include <linux/interrupt.h>
+#include "../aoa.h"
+
+/* TODO: these are 20 global variables
+ * that aren't used on most machines...
+ * Move them into a dynamically allocated
+ * structure and use that.
+ */
+
+/* these are the GPIO numbers (register addresses as offsets into
+ * the GPIO space) */
+static int headphone_mute_gpio;
+static int amp_mute_gpio;
+static int lineout_mute_gpio;
+static int hw_reset_gpio;
+static int lineout_detect_gpio;
+static int headphone_detect_gpio;
+static int linein_detect_gpio;
+
+/* see the SWITCH_GPIO macro */
+static int headphone_mute_gpio_activestate;
+static int amp_mute_gpio_activestate;
+static int lineout_mute_gpio_activestate;
+static int hw_reset_gpio_activestate;
+static int lineout_detect_gpio_activestate;
+static int headphone_detect_gpio_activestate;
+static int linein_detect_gpio_activestate;
+
+/* node pointers that we save when getting the GPIO number
+ * to get the interrupt later */
+static struct device_node *lineout_detect_node;
+static struct device_node *linein_detect_node;
+static struct device_node *headphone_detect_node;
+
+static int lineout_detect_irq;
+static int linein_detect_irq;
+static int headphone_detect_irq;
+
+static struct device_node *get_gpio(char *name,
+                                   char *altname,
+                                   int *gpioptr,
+                                   int *gpioactiveptr)
+{
+       struct device_node *np, *gpio;
+       const u32 *reg;
+       const char *audio_gpio;
+
+       *gpioptr = -1;
+
+       /* check if we can get it the easy way ... */
+       np = of_find_node_by_name(NULL, name);
+       if (!np) {
+               /* some machines have only gpioX/extint-gpioX nodes,
+                * and an audio-gpio property saying what it is ...
+                * So what we have to do is enumerate all children
+                * of the gpio node and check them all. */
+               gpio = of_find_node_by_name(NULL, "gpio");
+               if (!gpio)
+                       return NULL;
+               while ((np = of_get_next_child(gpio, np))) {
+                       audio_gpio = of_get_property(np, "audio-gpio", NULL);
+                       if (!audio_gpio)
+                               continue;
+                       if (strcmp(audio_gpio, name) == 0)
+                               break;
+                       if (altname && (strcmp(audio_gpio, altname) == 0))
+                               break;
+               }
+               /* still not found, assume not there */
+               if (!np)
+                       return NULL;
+       }
+
+       reg = of_get_property(np, "reg", NULL);
+       if (!reg)
+               return NULL;
+
+       *gpioptr = *reg;
+
+       /* this is a hack, usually the GPIOs 'reg' property
+        * should have the offset based from the GPIO space
+        * which is at 0x50, but apparently not always... */
+       if (*gpioptr < 0x50)
+               *gpioptr += 0x50;
+
+       reg = of_get_property(np, "audio-gpio-active-state", NULL);
+       if (!reg)
+               /* Apple seems to default to 1, but
+                * that doesn't seem right at least on most
+                * machines. So until proven that the opposite
+                * is necessary, we default to 0
+                * (which, incidentally, snd-powermac also does...) */
+               *gpioactiveptr = 0;
+       else
+               *gpioactiveptr = *reg;
+
+       return np;
+}
+
+static void get_irq(struct device_node * np, int *irqptr)
+{
+       if (np)
+               *irqptr = irq_of_parse_and_map(np, 0);
+       else
+               *irqptr = NO_IRQ;
+}
+
+/* 0x4 is outenable, 0x1 is out, thus 4 or 5 */
+#define SWITCH_GPIO(name, v, on)                               \
+       (((v)&~1) | ((on)?                                      \
+                       (name##_gpio_activestate==0?4:5):       \
+                       (name##_gpio_activestate==0?5:4)))
+
+#define FTR_GPIO(name, bit)                                    \
+static void ftr_gpio_set_##name(struct gpio_runtime *rt, int on)\
+{                                                              \
+       int v;                                                  \
+                                                               \
+       if (unlikely(!rt)) return;                              \
+                                                               \
+       if (name##_mute_gpio < 0)                               \
+               return;                                         \
+                                                               \
+       v = pmac_call_feature(PMAC_FTR_READ_GPIO, NULL,         \
+                             name##_mute_gpio,                 \
+                             0);                               \
+                                                               \
+       /* muted = !on... */                                    \
+       v = SWITCH_GPIO(name##_mute, v, !on);                   \
+                                                               \
+       pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL,            \
+                         name##_mute_gpio, v);                 \
+                                                               \
+       rt->implementation_private &= ~(1<<bit);                \
+       rt->implementation_private |= (!!on << bit);            \
+}                                                              \
+static int ftr_gpio_get_##name(struct gpio_runtime *rt)                \
+{                                                              \
+       if (unlikely(!rt)) return 0;                            \
+       return (rt->implementation_private>>bit)&1;             \
+}
+
+FTR_GPIO(headphone, 0);
+FTR_GPIO(amp, 1);
+FTR_GPIO(lineout, 2);
+
+static void ftr_gpio_set_hw_reset(struct gpio_runtime *rt, int on)
+{
+       int v;
+
+       if (unlikely(!rt)) return;
+       if (hw_reset_gpio < 0)
+               return;
+
+       v = pmac_call_feature(PMAC_FTR_READ_GPIO, NULL,
+                             hw_reset_gpio, 0);
+       v = SWITCH_GPIO(hw_reset, v, on);
+       pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL,
+                         hw_reset_gpio, v);
+}
+
+static void ftr_gpio_all_amps_off(struct gpio_runtime *rt)
+{
+       int saved;
+
+       if (unlikely(!rt)) return;
+       saved = rt->implementation_private;
+       ftr_gpio_set_headphone(rt, 0);
+       ftr_gpio_set_amp(rt, 0);
+       ftr_gpio_set_lineout(rt, 0);
+       rt->implementation_private = saved;
+}
+
+static void ftr_gpio_all_amps_restore(struct gpio_runtime *rt)
+{
+       int s;
+
+       if (unlikely(!rt)) return;
+       s = rt->implementation_private;
+       ftr_gpio_set_headphone(rt, (s>>0)&1);
+       ftr_gpio_set_amp(rt, (s>>1)&1);
+       ftr_gpio_set_lineout(rt, (s>>2)&1);
+}
+
+static void ftr_handle_notify(struct work_struct *work)
+{
+       struct gpio_notification *notif =
+               container_of(work, struct gpio_notification, work.work);
+
+       mutex_lock(&notif->mutex);
+       if (notif->notify)
+               notif->notify(notif->data);
+       mutex_unlock(&notif->mutex);
+}
+
+static void gpio_enable_dual_edge(int gpio)
+{
+       int v;
+
+       if (gpio == -1)
+               return;
+       v = pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, gpio, 0);
+       v |= 0x80; /* enable dual edge */
+       pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, gpio, v);
+}
+
+static void ftr_gpio_init(struct gpio_runtime *rt)
+{
+       get_gpio("headphone-mute", NULL,
+                &headphone_mute_gpio,
+                &headphone_mute_gpio_activestate);
+       get_gpio("amp-mute", NULL,
+                &amp_mute_gpio,
+                &amp_mute_gpio_activestate);
+       get_gpio("lineout-mute", NULL,
+                &lineout_mute_gpio,
+                &lineout_mute_gpio_activestate);
+       get_gpio("hw-reset", "audio-hw-reset",
+                &hw_reset_gpio,
+                &hw_reset_gpio_activestate);
+
+       headphone_detect_node = get_gpio("headphone-detect", NULL,
+                                        &headphone_detect_gpio,
+                                        &headphone_detect_gpio_activestate);
+       /* go Apple, and thanks for giving these different names
+        * across the board... */
+       lineout_detect_node = get_gpio("lineout-detect", "line-output-detect",
+                                      &lineout_detect_gpio,
+                                      &lineout_detect_gpio_activestate);
+       linein_detect_node = get_gpio("linein-detect", "line-input-detect",
+                                     &linein_detect_gpio,
+                                     &linein_detect_gpio_activestate);
+
+       gpio_enable_dual_edge(headphone_detect_gpio);
+       gpio_enable_dual_edge(lineout_detect_gpio);
+       gpio_enable_dual_edge(linein_detect_gpio);
+
+       get_irq(headphone_detect_node, &headphone_detect_irq);
+       get_irq(lineout_detect_node, &lineout_detect_irq);
+       get_irq(linein_detect_node, &linein_detect_irq);
+
+       ftr_gpio_all_amps_off(rt);
+       rt->implementation_private = 0;
+       INIT_DELAYED_WORK(&rt->headphone_notify.work, ftr_handle_notify);
+       INIT_DELAYED_WORK(&rt->line_in_notify.work, ftr_handle_notify);
+       INIT_DELAYED_WORK(&rt->line_out_notify.work, ftr_handle_notify);
+       mutex_init(&rt->headphone_notify.mutex);
+       mutex_init(&rt->line_in_notify.mutex);
+       mutex_init(&rt->line_out_notify.mutex);
+}
+
+static void ftr_gpio_exit(struct gpio_runtime *rt)
+{
+       ftr_gpio_all_amps_off(rt);
+       rt->implementation_private = 0;
+       if (rt->headphone_notify.notify)
+               free_irq(headphone_detect_irq, &rt->headphone_notify);
+       if (rt->line_in_notify.gpio_private)
+               free_irq(linein_detect_irq, &rt->line_in_notify);
+       if (rt->line_out_notify.gpio_private)
+               free_irq(lineout_detect_irq, &rt->line_out_notify);
+       cancel_delayed_work(&rt->headphone_notify.work);
+       cancel_delayed_work(&rt->line_in_notify.work);
+       cancel_delayed_work(&rt->line_out_notify.work);
+       flush_scheduled_work();
+       mutex_destroy(&rt->headphone_notify.mutex);
+       mutex_destroy(&rt->line_in_notify.mutex);
+       mutex_destroy(&rt->line_out_notify.mutex);
+}
+
+static irqreturn_t ftr_handle_notify_irq(int xx, void *data)
+{
+       struct gpio_notification *notif = data;
+
+       schedule_delayed_work(&notif->work, 0);
+
+       return IRQ_HANDLED;
+}
+
+static int ftr_set_notify(struct gpio_runtime *rt,
+                         enum notify_type type,
+                         notify_func_t notify,
+                         void *data)
+{
+       struct gpio_notification *notif;
+       notify_func_t old;
+       int irq;
+       char *name;
+       int err = -EBUSY;
+
+       switch (type) {
+       case AOA_NOTIFY_HEADPHONE:
+               notif = &rt->headphone_notify;
+               name = "headphone-detect";
+               irq = headphone_detect_irq;
+               break;
+       case AOA_NOTIFY_LINE_IN:
+               notif = &rt->line_in_notify;
+               name = "linein-detect";
+               irq = linein_detect_irq;
+               break;
+       case AOA_NOTIFY_LINE_OUT:
+               notif = &rt->line_out_notify;
+               name = "lineout-detect";
+               irq = lineout_detect_irq;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       if (irq == NO_IRQ)
+               return -ENODEV;
+
+       mutex_lock(&notif->mutex);
+
+       old = notif->notify;
+
+       if (!old && !notify) {
+               err = 0;
+               goto out_unlock;
+       }
+
+       if (old && notify) {
+               if (old == notify && notif->data == data)
+                       err = 0;
+               goto out_unlock;
+       }
+
+       if (old && !notify)
+               free_irq(irq, notif);
+
+       if (!old && notify) {
+               err = request_irq(irq, ftr_handle_notify_irq, 0, name, notif);
+               if (err)
+                       goto out_unlock;
+       }
+
+       notif->notify = notify;
+       notif->data = data;
+
+       err = 0;
+ out_unlock:
+       mutex_unlock(&notif->mutex);
+       return err;
+}
+
+static int ftr_get_detect(struct gpio_runtime *rt,
+                         enum notify_type type)
+{
+       int gpio, ret, active;
+
+       switch (type) {
+       case AOA_NOTIFY_HEADPHONE:
+               gpio = headphone_detect_gpio;
+               active = headphone_detect_gpio_activestate;
+               break;
+       case AOA_NOTIFY_LINE_IN:
+               gpio = linein_detect_gpio;
+               active = linein_detect_gpio_activestate;
+               break;
+       case AOA_NOTIFY_LINE_OUT:
+               gpio = lineout_detect_gpio;
+               active = lineout_detect_gpio_activestate;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       if (gpio == -1)
+               return -ENODEV;
+
+       ret = pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, gpio, 0);
+       if (ret < 0)
+               return ret;
+       return ((ret >> 1) & 1) == active;
+}
+
+static struct gpio_methods methods = {
+       .init                   = ftr_gpio_init,
+       .exit                   = ftr_gpio_exit,
+       .all_amps_off           = ftr_gpio_all_amps_off,
+       .all_amps_restore       = ftr_gpio_all_amps_restore,
+       .set_headphone          = ftr_gpio_set_headphone,
+       .set_speakers           = ftr_gpio_set_amp,
+       .set_lineout            = ftr_gpio_set_lineout,
+       .set_hw_reset           = ftr_gpio_set_hw_reset,
+       .get_headphone          = ftr_gpio_get_headphone,
+       .get_speakers           = ftr_gpio_get_amp,
+       .get_lineout            = ftr_gpio_get_lineout,
+       .set_notify             = ftr_set_notify,
+       .get_detect             = ftr_get_detect,
+};
+
+struct gpio_methods *ftr_gpio_methods = &methods;
+EXPORT_SYMBOL_GPL(ftr_gpio_methods);
diff --git a/sound/aoa/core/gpio-pmf.c b/sound/aoa/core/gpio-pmf.c

new file mode 100644 (file)

index 0000000..5ca2220
--- /dev/null
+++ b/sound/aoa/core/gpio-pmf.c
@@ -0,0 +1,252 @@
+/*
+ * Apple Onboard Audio pmf GPIOs
+ *
+ * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
+ *
+ * GPL v2, can be found in COPYING.
+ */
+
+#include <asm/pmac_feature.h>
+#include <asm/pmac_pfunc.h>
+#include "../aoa.h"
+
+#define PMF_GPIO(name, bit)                                    \
+static void pmf_gpio_set_##name(struct gpio_runtime *rt, int on)\
+{                                                              \
+       struct pmf_args args = { .count = 1, .u[0].v = !on };   \
+       int rc;                                                 \
+                                                       \
+       if (unlikely(!rt)) return;                              \
+       rc = pmf_call_function(rt->node, #name "-mute", &args); \
+       if (rc && rc != -ENODEV)                                \
+               printk(KERN_WARNING "pmf_gpio_set_" #name       \
+               " failed, rc: %d\n", rc);                       \
+       rt->implementation_private &= ~(1<<bit);                \
+       rt->implementation_private |= (!!on << bit);            \
+}                                                              \
+static int pmf_gpio_get_##name(struct gpio_runtime *rt)                \
+{                                                              \
+       if (unlikely(!rt)) return 0;                            \
+       return (rt->implementation_private>>bit)&1;             \
+}
+
+PMF_GPIO(headphone, 0);
+PMF_GPIO(amp, 1);
+PMF_GPIO(lineout, 2);
+
+static void pmf_gpio_set_hw_reset(struct gpio_runtime *rt, int on)
+{
+       struct pmf_args args = { .count = 1, .u[0].v = !!on };
+       int rc;
+
+       if (unlikely(!rt)) return;
+       rc = pmf_call_function(rt->node, "hw-reset", &args);
+       if (rc)
+               printk(KERN_WARNING "pmf_gpio_set_hw_reset"
+                      " failed, rc: %d\n", rc);
+}
+
+static void pmf_gpio_all_amps_off(struct gpio_runtime *rt)
+{
+       int saved;
+
+       if (unlikely(!rt)) return;
+       saved = rt->implementation_private;
+       pmf_gpio_set_headphone(rt, 0);
+       pmf_gpio_set_amp(rt, 0);
+       pmf_gpio_set_lineout(rt, 0);
+       rt->implementation_private = saved;
+}
+
+static void pmf_gpio_all_amps_restore(struct gpio_runtime *rt)
+{
+       int s;
+
+       if (unlikely(!rt)) return;
+       s = rt->implementation_private;
+       pmf_gpio_set_headphone(rt, (s>>0)&1);
+       pmf_gpio_set_amp(rt, (s>>1)&1);
+       pmf_gpio_set_lineout(rt, (s>>2)&1);
+}
+
+static void pmf_handle_notify(struct work_struct *work)
+{
+       struct gpio_notification *notif =
+               container_of(work, struct gpio_notification, work.work);
+
+       mutex_lock(&notif->mutex);
+       if (notif->notify)
+               notif->notify(notif->data);
+       mutex_unlock(&notif->mutex);
+}
+
+static void pmf_gpio_init(struct gpio_runtime *rt)
+{
+       pmf_gpio_all_amps_off(rt);
+       rt->implementation_private = 0;
+       INIT_DELAYED_WORK(&rt->headphone_notify.work, pmf_handle_notify);
+       INIT_DELAYED_WORK(&rt->line_in_notify.work, pmf_handle_notify);
+       INIT_DELAYED_WORK(&rt->line_out_notify.work, pmf_handle_notify);
+       mutex_init(&rt->headphone_notify.mutex);
+       mutex_init(&rt->line_in_notify.mutex);
+       mutex_init(&rt->line_out_notify.mutex);
+}
+
+static void pmf_gpio_exit(struct gpio_runtime *rt)
+{
+       pmf_gpio_all_amps_off(rt);
+       rt->implementation_private = 0;
+
+       if (rt->headphone_notify.gpio_private)
+               pmf_unregister_irq_client(rt->headphone_notify.gpio_private);
+       if (rt->line_in_notify.gpio_private)
+               pmf_unregister_irq_client(rt->line_in_notify.gpio_private);
+       if (rt->line_out_notify.gpio_private)
+               pmf_unregister_irq_client(rt->line_out_notify.gpio_private);
+
+       /* make sure no work is pending before freeing
+        * all things */
+       cancel_delayed_work(&rt->headphone_notify.work);
+       cancel_delayed_work(&rt->line_in_notify.work);
+       cancel_delayed_work(&rt->line_out_notify.work);
+       flush_scheduled_work();
+
+       mutex_destroy(&rt->headphone_notify.mutex);
+       mutex_destroy(&rt->line_in_notify.mutex);
+       mutex_destroy(&rt->line_out_notify.mutex);
+
+       if (rt->headphone_notify.gpio_private)
+               kfree(rt->headphone_notify.gpio_private);
+       if (rt->line_in_notify.gpio_private)
+               kfree(rt->line_in_notify.gpio_private);
+       if (rt->line_out_notify.gpio_private)
+               kfree(rt->line_out_notify.gpio_private);
+}
+
+static void pmf_handle_notify_irq(void *data)
+{
+       struct gpio_notification *notif = data;
+
+       schedule_delayed_work(&notif->work, 0);
+}
+
+static int pmf_set_notify(struct gpio_runtime *rt,
+                         enum notify_type type,
+                         notify_func_t notify,
+                         void *data)
+{
+       struct gpio_notification *notif;
+       notify_func_t old;
+       struct pmf_irq_client *irq_client;
+       char *name;
+       int err = -EBUSY;
+
+       switch (type) {
+       case AOA_NOTIFY_HEADPHONE:
+               notif = &rt->headphone_notify;
+               name = "headphone-detect";
+               break;
+       case AOA_NOTIFY_LINE_IN:
+               notif = &rt->line_in_notify;
+               name = "linein-detect";
+               break;
+       case AOA_NOTIFY_LINE_OUT:
+               notif = &rt->line_out_notify;
+               name = "lineout-detect";
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       mutex_lock(&notif->mutex);
+
+       old = notif->notify;
+
+       if (!old && !notify) {
+               err = 0;
+               goto out_unlock;
+       }
+
+       if (old && notify) {
+               if (old == notify && notif->data == data)
+                       err = 0;
+               goto out_unlock;
+       }
+
+       if (old && !notify) {
+               irq_client = notif->gpio_private;
+               pmf_unregister_irq_client(irq_client);
+               kfree(irq_client);
+               notif->gpio_private = NULL;
+       }
+       if (!old && notify) {
+               irq_client = kzalloc(sizeof(struct pmf_irq_client),
+                                    GFP_KERNEL);
+               irq_client->data = notif;
+               irq_client->handler = pmf_handle_notify_irq;
+               irq_client->owner = THIS_MODULE;
+               err = pmf_register_irq_client(rt->node,
+                                             name,
+                                             irq_client);
+               if (err) {
+                       printk(KERN_ERR "snd-aoa: gpio layer failed to"
+                                       " register %s irq (%d)\n", name, err);
+                       kfree(irq_client);
+                       goto out_unlock;
+               }
+               notif->gpio_private = irq_client;
+       }
+       notif->notify = notify;
+       notif->data = data;
+
+       err = 0;
+ out_unlock:
+       mutex_unlock(&notif->mutex);
+       return err;
+}
+
+static int pmf_get_detect(struct gpio_runtime *rt,
+                         enum notify_type type)
+{
+       char *name;
+       int err = -EBUSY, ret;
+       struct pmf_args args = { .count = 1, .u[0].p = &ret };
+
+       switch (type) {
+       case AOA_NOTIFY_HEADPHONE:
+               name = "headphone-detect";
+               break;
+       case AOA_NOTIFY_LINE_IN:
+               name = "linein-detect";
+               break;
+       case AOA_NOTIFY_LINE_OUT:
+               name = "lineout-detect";
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       err = pmf_call_function(rt->node, name, &args);
+       if (err)
+               return err;
+       return ret;
+}
+
+static struct gpio_methods methods = {
+       .init                   = pmf_gpio_init,
+       .exit                   = pmf_gpio_exit,
+       .all_amps_off           = pmf_gpio_all_amps_off,
+       .all_amps_restore       = pmf_gpio_all_amps_restore,
+       .set_headphone          = pmf_gpio_set_headphone,
+       .set_speakers           = pmf_gpio_set_amp,
+       .set_lineout            = pmf_gpio_set_lineout,
+       .set_hw_reset           = pmf_gpio_set_hw_reset,
+       .get_headphone          = pmf_gpio_get_headphone,
+       .get_speakers           = pmf_gpio_get_amp,
+       .get_lineout            = pmf_gpio_get_lineout,
+       .set_notify             = pmf_set_notify,
+       .get_detect             = pmf_get_detect,
+};
+
+struct gpio_methods *pmf_gpio_methods = &methods;
+EXPORT_SYMBOL_GPL(pmf_gpio_methods);
diff --git a/sound/aoa/core/snd-aoa-alsa.c b/sound/aoa/core/snd-aoa-alsa.c

deleted file mode 100644 (file)

index 17fe689..0000000
--- a/sound/aoa/core/snd-aoa-alsa.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Apple Onboard Audio Alsa helpers
- *
- * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
- *
- * GPL v2, can be found in COPYING.
- */
-#include <linux/module.h>
-#include "snd-aoa-alsa.h"
-
-static int index = -1;
-module_param(index, int, 0444);
-MODULE_PARM_DESC(index, "index for AOA sound card.");
-
-static struct aoa_card *aoa_card;
-
-int aoa_alsa_init(char *name, struct module *mod, struct device *dev)
-{
-       struct snd_card *alsa_card;
-       int err;
-
-       if (aoa_card)
-               /* cannot be EEXIST due to usage in aoa_fabric_register */
-               return -EBUSY;
-
-       alsa_card = snd_card_new(index, name, mod, sizeof(struct aoa_card));
-       if (!alsa_card)
-               return -ENOMEM;
-       aoa_card = alsa_card->private_data;
-       aoa_card->alsa_card = alsa_card;
-       alsa_card->dev = dev;
-       strlcpy(alsa_card->driver, "AppleOnbdAudio", sizeof(alsa_card->driver));
-       strlcpy(alsa_card->shortname, name, sizeof(alsa_card->shortname));
-       strlcpy(alsa_card->longname, name, sizeof(alsa_card->longname));
-       strlcpy(alsa_card->mixername, name, sizeof(alsa_card->mixername));
-       err = snd_card_register(aoa_card->alsa_card);
-       if (err < 0) {
-               printk(KERN_ERR "snd-aoa: couldn't register alsa card\n");
-               snd_card_free(aoa_card->alsa_card);
-               aoa_card = NULL;
-               return err;
-       }
-       return 0;
-}
-
-struct snd_card *aoa_get_card(void)
-{
-       if (aoa_card)
-               return aoa_card->alsa_card;
-       return NULL;
-}
-EXPORT_SYMBOL_GPL(aoa_get_card);
-
-void aoa_alsa_cleanup(void)
-{
-       if (aoa_card) {
-               snd_card_free(aoa_card->alsa_card);
-               aoa_card = NULL;
-       }
-}
-
-int aoa_snd_device_new(snd_device_type_t type,
-                      void * device_data, struct snd_device_ops * ops)
-{
-       struct snd_card *card = aoa_get_card();
-       int err;
-       
-       if (!card) return -ENOMEM;
-
-       err = snd_device_new(card, type, device_data, ops);
-       if (err) {
-               printk(KERN_ERR "snd-aoa: failed to create snd device (%d)\n", err);
-               return err;
-       }
-       err = snd_device_register(card, device_data);
-       if (err) {
-               printk(KERN_ERR "snd-aoa: failed to register "
-                               "snd device (%d)\n", err);
-               printk(KERN_ERR "snd-aoa: have you forgotten the "
-                               "dev_register callback?\n");
-               snd_device_free(card, device_data);
-       }
-       return err;
-}
-EXPORT_SYMBOL_GPL(aoa_snd_device_new);
-
-int aoa_snd_ctl_add(struct snd_kcontrol* control)
-{
-       int err;
-
-       if (!aoa_card) return -ENODEV;
-
-       err = snd_ctl_add(aoa_card->alsa_card, control);
-       if (err)
-               printk(KERN_ERR "snd-aoa: failed to add alsa control (%d)\n",
-                      err);
-       return err;
-}
-EXPORT_SYMBOL_GPL(aoa_snd_ctl_add);
diff --git a/sound/aoa/core/snd-aoa-alsa.h b/sound/aoa/core/snd-aoa-alsa.h

deleted file mode 100644 (file)

index 9669e44..0000000
--- a/sound/aoa/core/snd-aoa-alsa.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Apple Onboard Audio Alsa private helpers
- *
- * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
- *
- * GPL v2, can be found in COPYING.
- */
-
-#ifndef __SND_AOA_ALSA_H
-#define __SND_AOA_ALSA_H
-#include "../aoa.h"
-
-extern int aoa_alsa_init(char *name, struct module *mod, struct device *dev);
-extern void aoa_alsa_cleanup(void);
-
-#endif /* __SND_AOA_ALSA_H */
diff --git a/sound/aoa/core/snd-aoa-core.c b/sound/aoa/core/snd-aoa-core.c

deleted file mode 100644 (file)

index 19fdae4..0000000
--- a/sound/aoa/core/snd-aoa-core.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Apple Onboard Audio driver core
- *
- * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
- *
- * GPL v2, can be found in COPYING.
- */
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/list.h>
-#include "../aoa.h"
-#include "snd-aoa-alsa.h"
-
-MODULE_DESCRIPTION("Apple Onboard Audio Sound Driver");
-MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
-MODULE_LICENSE("GPL");
-
-/* We allow only one fabric. This simplifies things,
- * and more don't really make that much sense */
-static struct aoa_fabric *fabric;
-static LIST_HEAD(codec_list);
-
-static int attach_codec_to_fabric(struct aoa_codec *c)
-{
-       int err;
-
-       if (!try_module_get(c->owner))
-               return -EBUSY;
-       /* found_codec has to be assigned */
-       err = -ENOENT;
-       if (fabric->found_codec)
-               err = fabric->found_codec(c);
-       if (err) {
-               module_put(c->owner);
-               printk(KERN_ERR "snd-aoa: fabric didn't like codec %s\n",
-                               c->name);
-               return err;
-       }
-       c->fabric = fabric;
-
-       err = 0;
-       if (c->init)
-               err = c->init(c);
-       if (err) {
-               printk(KERN_ERR "snd-aoa: codec %s didn't init\n", c->name);
-               c->fabric = NULL;
-               if (fabric->remove_codec)
-                       fabric->remove_codec(c);
-               module_put(c->owner);
-               return err;
-       }
-       if (fabric->attached_codec)
-               fabric->attached_codec(c);
-       return 0;
-}
-
-int aoa_codec_register(struct aoa_codec *codec)
-{
-       int err = 0;
-
-       /* if there's a fabric already, we can tell if we
-        * will want to have this codec, so propagate error
-        * through. Otherwise, this will happen later... */
-       if (fabric)
-               err = attach_codec_to_fabric(codec);
-       if (!err)
-               list_add(&codec->list, &codec_list);
-       return err;
-}
-EXPORT_SYMBOL_GPL(aoa_codec_register);
-
-void aoa_codec_unregister(struct aoa_codec *codec)
-{
-       list_del(&codec->list);
-       if (codec->fabric && codec->exit)
-               codec->exit(codec);
-       if (fabric && fabric->remove_codec)
-               fabric->remove_codec(codec);
-       codec->fabric = NULL;
-       module_put(codec->owner);
-}
-EXPORT_SYMBOL_GPL(aoa_codec_unregister);
-
-int aoa_fabric_register(struct aoa_fabric *new_fabric, struct device *dev)
-{
-       struct aoa_codec *c;
-       int err;
-
-       /* allow querying for presence of fabric
-        * (i.e. do this test first!) */
-       if (new_fabric == fabric) {
-               err = -EALREADY;
-               goto attach;
-       }
-       if (fabric)
-               return -EEXIST;
-       if (!new_fabric)
-               return -EINVAL;
-
-       err = aoa_alsa_init(new_fabric->name, new_fabric->owner, dev);
-       if (err)
-               return err;
-
-       fabric = new_fabric;
-
- attach:
-       list_for_each_entry(c, &codec_list, list) {
-               if (c->fabric != fabric)
-                       attach_codec_to_fabric(c);
-       }
-       return err;
-}
-EXPORT_SYMBOL_GPL(aoa_fabric_register);
-
-void aoa_fabric_unregister(struct aoa_fabric *old_fabric)
-{
-       struct aoa_codec *c;
-
-       if (fabric != old_fabric)
-               return;
-
-       list_for_each_entry(c, &codec_list, list) {
-               if (c->fabric)
-                       aoa_fabric_unlink_codec(c);
-       }
-
-       aoa_alsa_cleanup();
-
-       fabric = NULL;
-}
-EXPORT_SYMBOL_GPL(aoa_fabric_unregister);
-
-void aoa_fabric_unlink_codec(struct aoa_codec *codec)
-{
-       if (!codec->fabric) {
-               printk(KERN_ERR "snd-aoa: fabric unassigned "
-                               "in aoa_fabric_unlink_codec\n");
-               dump_stack();
-               return;
-       }
-       if (codec->exit)
-               codec->exit(codec);
-       if (codec->fabric->remove_codec)
-               codec->fabric->remove_codec(codec);
-       codec->fabric = NULL;
-       module_put(codec->owner);
-}
-EXPORT_SYMBOL_GPL(aoa_fabric_unlink_codec);
-
-static int __init aoa_init(void)
-{
-       return 0;
-}
-
-static void __exit aoa_exit(void)
-{
-       aoa_alsa_cleanup();
-}
-
-module_init(aoa_init);
-module_exit(aoa_exit);
diff --git a/sound/aoa/core/snd-aoa-gpio-feature.c b/sound/aoa/core/snd-aoa-gpio-feature.c

deleted file mode 100644 (file)

index 805dcbf..0000000
--- a/sound/aoa/core/snd-aoa-gpio-feature.c
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- * Apple Onboard Audio feature call GPIO control
- *
- * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
- *
- * GPL v2, can be found in COPYING.
- *
- * This file contains the GPIO control routines for 
- * direct (through feature calls) access to the GPIO
- * registers.
- */
-
-#include <asm/pmac_feature.h>
-#include <linux/interrupt.h>
-#include "../aoa.h"
-
-/* TODO: these are 20 global variables
- * that aren't used on most machines...
- * Move them into a dynamically allocated
- * structure and use that.
- */
-
-/* these are the GPIO numbers (register addresses as offsets into
- * the GPIO space) */
-static int headphone_mute_gpio;
-static int amp_mute_gpio;
-static int lineout_mute_gpio;
-static int hw_reset_gpio;
-static int lineout_detect_gpio;
-static int headphone_detect_gpio;
-static int linein_detect_gpio;
-
-/* see the SWITCH_GPIO macro */
-static int headphone_mute_gpio_activestate;
-static int amp_mute_gpio_activestate;
-static int lineout_mute_gpio_activestate;
-static int hw_reset_gpio_activestate;
-static int lineout_detect_gpio_activestate;
-static int headphone_detect_gpio_activestate;
-static int linein_detect_gpio_activestate;
-
-/* node pointers that we save when getting the GPIO number
- * to get the interrupt later */
-static struct device_node *lineout_detect_node;
-static struct device_node *linein_detect_node;
-static struct device_node *headphone_detect_node;
-
-static int lineout_detect_irq;
-static int linein_detect_irq;
-static int headphone_detect_irq;
-
-static struct device_node *get_gpio(char *name,
-                                   char *altname,
-                                   int *gpioptr,
-                                   int *gpioactiveptr)
-{
-       struct device_node *np, *gpio;
-       const u32 *reg;
-       const char *audio_gpio;
-
-       *gpioptr = -1;
-
-       /* check if we can get it the easy way ... */
-       np = of_find_node_by_name(NULL, name);
-       if (!np) {
-               /* some machines have only gpioX/extint-gpioX nodes,
-                * and an audio-gpio property saying what it is ...
-                * So what we have to do is enumerate all children
-                * of the gpio node and check them all. */
-               gpio = of_find_node_by_name(NULL, "gpio");
-               if (!gpio)
-                       return NULL;
-               while ((np = of_get_next_child(gpio, np))) {
-                       audio_gpio = of_get_property(np, "audio-gpio", NULL);
-                       if (!audio_gpio)
-                               continue;
-                       if (strcmp(audio_gpio, name) == 0)
-                               break;
-                       if (altname && (strcmp(audio_gpio, altname) == 0))
-                               break;
-               }
-               /* still not found, assume not there */
-               if (!np)
-                       return NULL;
-       }
-
-       reg = of_get_property(np, "reg", NULL);
-       if (!reg)
-               return NULL;
-
-       *gpioptr = *reg;
-
-       /* this is a hack, usually the GPIOs 'reg' property
-        * should have the offset based from the GPIO space
-        * which is at 0x50, but apparently not always... */
-       if (*gpioptr < 0x50)
-               *gpioptr += 0x50;
-
-       reg = of_get_property(np, "audio-gpio-active-state", NULL);
-       if (!reg)
-               /* Apple seems to default to 1, but
-                * that doesn't seem right at least on most
-                * machines. So until proven that the opposite
-                * is necessary, we default to 0
-                * (which, incidentally, snd-powermac also does...) */
-               *gpioactiveptr = 0;
-       else
-               *gpioactiveptr = *reg;
-
-       return np;
-}
-
-static void get_irq(struct device_node * np, int *irqptr)
-{
-       if (np)
-               *irqptr = irq_of_parse_and_map(np, 0);
-       else
-               *irqptr = NO_IRQ;
-}
-
-/* 0x4 is outenable, 0x1 is out, thus 4 or 5 */
-#define SWITCH_GPIO(name, v, on)                               \
-       (((v)&~1) | ((on)?                                      \
-                       (name##_gpio_activestate==0?4:5):       \
-                       (name##_gpio_activestate==0?5:4)))
-
-#define FTR_GPIO(name, bit)                                    \
-static void ftr_gpio_set_##name(struct gpio_runtime *rt, int on)\
-{                                                              \
-       int v;                                                  \
-                                                               \
-       if (unlikely(!rt)) return;                              \
-                                                               \
-       if (name##_mute_gpio < 0)                               \
-               return;                                         \
-                                                               \
-       v = pmac_call_feature(PMAC_FTR_READ_GPIO, NULL,         \
-                             name##_mute_gpio,                 \
-                             0);                               \
-                                                               \
-       /* muted = !on... */                                    \
-       v = SWITCH_GPIO(name##_mute, v, !on);                   \
-                                                               \
-       pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL,            \
-                         name##_mute_gpio, v);                 \
-                                                               \
-       rt->implementation_private &= ~(1<<bit);                \
-       rt->implementation_private |= (!!on << bit);            \
-}                                                              \
-static int ftr_gpio_get_##name(struct gpio_runtime *rt)                \
-{                                                              \
-       if (unlikely(!rt)) return 0;                            \
-       return (rt->implementation_private>>bit)&1;             \
-}
-
-FTR_GPIO(headphone, 0);
-FTR_GPIO(amp, 1);
-FTR_GPIO(lineout, 2);
-
-static void ftr_gpio_set_hw_reset(struct gpio_runtime *rt, int on)
-{
-       int v;
-
-       if (unlikely(!rt)) return;
-       if (hw_reset_gpio < 0)
-               return;
-
-       v = pmac_call_feature(PMAC_FTR_READ_GPIO, NULL,
-                             hw_reset_gpio, 0);
-       v = SWITCH_GPIO(hw_reset, v, on);
-       pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL,
-                         hw_reset_gpio, v);
-}
-
-static void ftr_gpio_all_amps_off(struct gpio_runtime *rt)
-{
-       int saved;
-
-       if (unlikely(!rt)) return;
-       saved = rt->implementation_private;
-       ftr_gpio_set_headphone(rt, 0);
-       ftr_gpio_set_amp(rt, 0);
-       ftr_gpio_set_lineout(rt, 0);
-       rt->implementation_private = saved;
-}
-
-static void ftr_gpio_all_amps_restore(struct gpio_runtime *rt)
-{
-       int s;
-
-       if (unlikely(!rt)) return;
-       s = rt->implementation_private;
-       ftr_gpio_set_headphone(rt, (s>>0)&1);
-       ftr_gpio_set_amp(rt, (s>>1)&1);
-       ftr_gpio_set_lineout(rt, (s>>2)&1);
-}
-
-static void ftr_handle_notify(struct work_struct *work)
-{
-       struct gpio_notification *notif =
-               container_of(work, struct gpio_notification, work.work);
-
-       mutex_lock(&notif->mutex);
-       if (notif->notify)
-               notif->notify(notif->data);
-       mutex_unlock(&notif->mutex);
-}
-
-static void gpio_enable_dual_edge(int gpio)
-{
-       int v;
-
-       if (gpio == -1)
-               return;
-       v = pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, gpio, 0);
-       v |= 0x80; /* enable dual edge */
-       pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, gpio, v);
-}
-
-static void ftr_gpio_init(struct gpio_runtime *rt)
-{
-       get_gpio("headphone-mute", NULL,
-                &headphone_mute_gpio,
-                &headphone_mute_gpio_activestate);
-       get_gpio("amp-mute", NULL,
-                &amp_mute_gpio,
-                &amp_mute_gpio_activestate);
-       get_gpio("lineout-mute", NULL,
-                &lineout_mute_gpio,
-                &lineout_mute_gpio_activestate);
-       get_gpio("hw-reset", "audio-hw-reset",
-                &hw_reset_gpio,
-                &hw_reset_gpio_activestate);
-
-       headphone_detect_node = get_gpio("headphone-detect", NULL,
-                                        &headphone_detect_gpio,
-                                        &headphone_detect_gpio_activestate);
-       /* go Apple, and thanks for giving these different names
-        * across the board... */
-       lineout_detect_node = get_gpio("lineout-detect", "line-output-detect",
-                                      &lineout_detect_gpio,
-                                      &lineout_detect_gpio_activestate);
-       linein_detect_node = get_gpio("linein-detect", "line-input-detect",
-                                     &linein_detect_gpio,
-                                     &linein_detect_gpio_activestate);
-
-       gpio_enable_dual_edge(headphone_detect_gpio);
-       gpio_enable_dual_edge(lineout_detect_gpio);
-       gpio_enable_dual_edge(linein_detect_gpio);
-
-       get_irq(headphone_detect_node, &headphone_detect_irq);
-       get_irq(lineout_detect_node, &lineout_detect_irq);
-       get_irq(linein_detect_node, &linein_detect_irq);
-
-       ftr_gpio_all_amps_off(rt);
-       rt->implementation_private = 0;
-       INIT_DELAYED_WORK(&rt->headphone_notify.work, ftr_handle_notify);
-       INIT_DELAYED_WORK(&rt->line_in_notify.work, ftr_handle_notify);
-       INIT_DELAYED_WORK(&rt->line_out_notify.work, ftr_handle_notify);
-       mutex_init(&rt->headphone_notify.mutex);
-       mutex_init(&rt->line_in_notify.mutex);
-       mutex_init(&rt->line_out_notify.mutex);
-}
-
-static void ftr_gpio_exit(struct gpio_runtime *rt)
-{
-       ftr_gpio_all_amps_off(rt);
-       rt->implementation_private = 0;
-       if (rt->headphone_notify.notify)
-               free_irq(headphone_detect_irq, &rt->headphone_notify);
-       if (rt->line_in_notify.gpio_private)
-               free_irq(linein_detect_irq, &rt->line_in_notify);
-       if (rt->line_out_notify.gpio_private)
-               free_irq(lineout_detect_irq, &rt->line_out_notify);
-       cancel_delayed_work(&rt->headphone_notify.work);
-       cancel_delayed_work(&rt->line_in_notify.work);
-       cancel_delayed_work(&rt->line_out_notify.work);
-       flush_scheduled_work();
-       mutex_destroy(&rt->headphone_notify.mutex);
-       mutex_destroy(&rt->line_in_notify.mutex);
-       mutex_destroy(&rt->line_out_notify.mutex);
-}
-
-static irqreturn_t ftr_handle_notify_irq(int xx, void *data)
-{
-       struct gpio_notification *notif = data;
-
-       schedule_delayed_work(&notif->work, 0);
-
-       return IRQ_HANDLED;
-}
-
-static int ftr_set_notify(struct gpio_runtime *rt,
-                         enum notify_type type,
-                         notify_func_t notify,
-                         void *data)
-{
-       struct gpio_notification *notif;
-       notify_func_t old;
-       int irq;
-       char *name;
-       int err = -EBUSY;
-
-       switch (type) {
-       case AOA_NOTIFY_HEADPHONE:
-               notif = &rt->headphone_notify;
-               name = "headphone-detect";
-               irq = headphone_detect_irq;
-               break;
-       case AOA_NOTIFY_LINE_IN:
-               notif = &rt->line_in_notify;
-               name = "linein-detect";
-               irq = linein_detect_irq;
-               break;
-       case AOA_NOTIFY_LINE_OUT:
-               notif = &rt->line_out_notify;
-               name = "lineout-detect";
-               irq = lineout_detect_irq;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       if (irq == NO_IRQ)
-               return -ENODEV;
-
-       mutex_lock(&notif->mutex);
-
-       old = notif->notify;
-
-       if (!old && !notify) {
-               err = 0;
-               goto out_unlock;
-       }
-
-       if (old && notify) {
-               if (old == notify && notif->data == data)
-                       err = 0;
-               goto out_unlock;
-       }
-
-       if (old && !notify)
-               free_irq(irq, notif);
-
-       if (!old && notify) {
-               err = request_irq(irq, ftr_handle_notify_irq, 0, name, notif);
-               if (err)
-                       goto out_unlock;
-       }
-
-       notif->notify = notify;
-       notif->data = data;
-
-       err = 0;
- out_unlock:
-       mutex_unlock(&notif->mutex);
-       return err;
-}
-
-static int ftr_get_detect(struct gpio_runtime *rt,
-                         enum notify_type type)
-{
-       int gpio, ret, active;
-
-       switch (type) {
-       case AOA_NOTIFY_HEADPHONE:
-               gpio = headphone_detect_gpio;
-               active = headphone_detect_gpio_activestate;
-               break;
-       case AOA_NOTIFY_LINE_IN:
-               gpio = linein_detect_gpio;
-               active = linein_detect_gpio_activestate;
-               break;
-       case AOA_NOTIFY_LINE_OUT:
-               gpio = lineout_detect_gpio;
-               active = lineout_detect_gpio_activestate;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       if (gpio == -1)
-               return -ENODEV;
-
-       ret = pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, gpio, 0);
-       if (ret < 0)
-               return ret;
-       return ((ret >> 1) & 1) == active;
-}
-
-static struct gpio_methods methods = {
-       .init                   = ftr_gpio_init,
-       .exit                   = ftr_gpio_exit,
-       .all_amps_off           = ftr_gpio_all_amps_off,
-       .all_amps_restore       = ftr_gpio_all_amps_restore,
-       .set_headphone          = ftr_gpio_set_headphone,
-       .set_speakers           = ftr_gpio_set_amp,
-       .set_lineout            = ftr_gpio_set_lineout,
-       .set_hw_reset           = ftr_gpio_set_hw_reset,
-       .get_headphone          = ftr_gpio_get_headphone,
-       .get_speakers           = ftr_gpio_get_amp,
-       .get_lineout            = ftr_gpio_get_lineout,
-       .set_notify             = ftr_set_notify,
-       .get_detect             = ftr_get_detect,
-};
-
-struct gpio_methods *ftr_gpio_methods = &methods;
-EXPORT_SYMBOL_GPL(ftr_gpio_methods);
diff --git a/sound/aoa/core/snd-aoa-gpio-pmf.c b/sound/aoa/core/snd-aoa-gpio-pmf.c

deleted file mode 100644 (file)

index 5ca2220..0000000
--- a/sound/aoa/core/snd-aoa-gpio-pmf.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Apple Onboard Audio pmf GPIOs
- *
- * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
- *
- * GPL v2, can be found in COPYING.
- */
-
-#include <asm/pmac_feature.h>
-#include <asm/pmac_pfunc.h>
-#include "../aoa.h"
-
-#define PMF_GPIO(name, bit)                                    \
-static void pmf_gpio_set_##name(struct gpio_runtime *rt, int on)\
-{                                                              \
-       struct pmf_args args = { .count = 1, .u[0].v = !on };   \
-       int rc;                                                 \
-                                                       \
-       if (unlikely(!rt)) return;                              \
-       rc = pmf_call_function(rt->node, #name "-mute", &args); \
-       if (rc && rc != -ENODEV)                                \
-               printk(KERN_WARNING "pmf_gpio_set_" #name       \
-               " failed, rc: %d\n", rc);                       \
-       rt->implementation_private &= ~(1<<bit);                \
-       rt->implementation_private |= (!!on << bit);            \
-}                                                              \
-static int pmf_gpio_get_##name(struct gpio_runtime *rt)                \
-{                                                              \
-       if (unlikely(!rt)) return 0;                            \
-       return (rt->implementation_private>>bit)&1;             \
-}
-
-PMF_GPIO(headphone, 0);
-PMF_GPIO(amp, 1);
-PMF_GPIO(lineout, 2);
-
-static void pmf_gpio_set_hw_reset(struct gpio_runtime *rt, int on)
-{
-       struct pmf_args args = { .count = 1, .u[0].v = !!on };
-       int rc;
-
-       if (unlikely(!rt)) return;
-       rc = pmf_call_function(rt->node, "hw-reset", &args);
-       if (rc)
-               printk(KERN_WARNING "pmf_gpio_set_hw_reset"
-                      " failed, rc: %d\n", rc);
-}
-
-static void pmf_gpio_all_amps_off(struct gpio_runtime *rt)
-{
-       int saved;
-
-       if (unlikely(!rt)) return;
-       saved = rt->implementation_private;
-       pmf_gpio_set_headphone(rt, 0);
-       pmf_gpio_set_amp(rt, 0);
-       pmf_gpio_set_lineout(rt, 0);
-       rt->implementation_private = saved;
-}
-
-static void pmf_gpio_all_amps_restore(struct gpio_runtime *rt)
-{
-       int s;
-
-       if (unlikely(!rt)) return;
-       s = rt->implementation_private;
-       pmf_gpio_set_headphone(rt, (s>>0)&1);
-       pmf_gpio_set_amp(rt, (s>>1)&1);
-       pmf_gpio_set_lineout(rt, (s>>2)&1);
-}
-
-static void pmf_handle_notify(struct work_struct *work)
-{
-       struct gpio_notification *notif =
-               container_of(work, struct gpio_notification, work.work);
-
-       mutex_lock(&notif->mutex);
-       if (notif->notify)
-               notif->notify(notif->data);
-       mutex_unlock(&notif->mutex);
-}
-
-static void pmf_gpio_init(struct gpio_runtime *rt)
-{
-       pmf_gpio_all_amps_off(rt);
-       rt->implementation_private = 0;
-       INIT_DELAYED_WORK(&rt->headphone_notify.work, pmf_handle_notify);
-       INIT_DELAYED_WORK(&rt->line_in_notify.work, pmf_handle_notify);
-       INIT_DELAYED_WORK(&rt->line_out_notify.work, pmf_handle_notify);
-       mutex_init(&rt->headphone_notify.mutex);
-       mutex_init(&rt->line_in_notify.mutex);
-       mutex_init(&rt->line_out_notify.mutex);
-}
-
-static void pmf_gpio_exit(struct gpio_runtime *rt)
-{
-       pmf_gpio_all_amps_off(rt);
-       rt->implementation_private = 0;
-
-       if (rt->headphone_notify.gpio_private)
-               pmf_unregister_irq_client(rt->headphone_notify.gpio_private);
-       if (rt->line_in_notify.gpio_private)
-               pmf_unregister_irq_client(rt->line_in_notify.gpio_private);
-       if (rt->line_out_notify.gpio_private)
-               pmf_unregister_irq_client(rt->line_out_notify.gpio_private);
-
-       /* make sure no work is pending before freeing
-        * all things */
-       cancel_delayed_work(&rt->headphone_notify.work);
-       cancel_delayed_work(&rt->line_in_notify.work);
-       cancel_delayed_work(&rt->line_out_notify.work);
-       flush_scheduled_work();
-
-       mutex_destroy(&rt->headphone_notify.mutex);
-       mutex_destroy(&rt->line_in_notify.mutex);
-       mutex_destroy(&rt->line_out_notify.mutex);
-
-       if (rt->headphone_notify.gpio_private)
-               kfree(rt->headphone_notify.gpio_private);
-       if (rt->line_in_notify.gpio_private)
-               kfree(rt->line_in_notify.gpio_private);
-       if (rt->line_out_notify.gpio_private)
-               kfree(rt->line_out_notify.gpio_private);
-}
-
-static void pmf_handle_notify_irq(void *data)
-{
-       struct gpio_notification *notif = data;
-
-       schedule_delayed_work(&notif->work, 0);
-}
-
-static int pmf_set_notify(struct gpio_runtime *rt,
-                         enum notify_type type,
-                         notify_func_t notify,
-                         void *data)
-{
-       struct gpio_notification *notif;
-       notify_func_t old;
-       struct pmf_irq_client *irq_client;
-       char *name;
-       int err = -EBUSY;
-
-       switch (type) {
-       case AOA_NOTIFY_HEADPHONE:
-               notif = &rt->headphone_notify;
-               name = "headphone-detect";
-               break;
-       case AOA_NOTIFY_LINE_IN:
-               notif = &rt->line_in_notify;
-               name = "linein-detect";
-               break;
-       case AOA_NOTIFY_LINE_OUT:
-               notif = &rt->line_out_notify;
-               name = "lineout-detect";
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       mutex_lock(&notif->mutex);
-
-       old = notif->notify;
-
-       if (!old && !notify) {
-               err = 0;
-               goto out_unlock;
-       }
-
-       if (old && notify) {
-               if (old == notify && notif->data == data)
-                       err = 0;
-               goto out_unlock;
-       }
-
-       if (old && !notify) {
-               irq_client = notif->gpio_private;
-               pmf_unregister_irq_client(irq_client);
-               kfree(irq_client);
-               notif->gpio_private = NULL;
-       }
-       if (!old && notify) {
-               irq_client = kzalloc(sizeof(struct pmf_irq_client),
-                                    GFP_KERNEL);
-               irq_client->data = notif;
-               irq_client->handler = pmf_handle_notify_irq;
-               irq_client->owner = THIS_MODULE;
-               err = pmf_register_irq_client(rt->node,
-                                             name,
-                                             irq_client);
-               if (err) {
-                       printk(KERN_ERR "snd-aoa: gpio layer failed to"
-                                       " register %s irq (%d)\n", name, err);
-                       kfree(irq_client);
-                       goto out_unlock;
-               }
-               notif->gpio_private = irq_client;
-       }
-       notif->notify = notify;
-       notif->data = data;
-
-       err = 0;
- out_unlock:
-       mutex_unlock(&notif->mutex);
-       return err;
-}
-
-static int pmf_get_detect(struct gpio_runtime *rt,
-                         enum notify_type type)
-{
-       char *name;
-       int err = -EBUSY, ret;
-       struct pmf_args args = { .count = 1, .u[0].p = &ret };
-
-       switch (type) {
-       case AOA_NOTIFY_HEADPHONE:
-               name = "headphone-detect";
-               break;
-       case AOA_NOTIFY_LINE_IN:
-               name = "linein-detect";
-               break;
-       case AOA_NOTIFY_LINE_OUT:
-               name = "lineout-detect";
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       err = pmf_call_function(rt->node, name, &args);
-       if (err)
-               return err;
-       return ret;
-}
-
-static struct gpio_methods methods = {
-       .init                   = pmf_gpio_init,
-       .exit                   = pmf_gpio_exit,
-       .all_amps_off           = pmf_gpio_all_amps_off,
-       .all_amps_restore       = pmf_gpio_all_amps_restore,
-       .set_headphone          = pmf_gpio_set_headphone,
-       .set_speakers           = pmf_gpio_set_amp,
-       .set_lineout            = pmf_gpio_set_lineout,
-       .set_hw_reset           = pmf_gpio_set_hw_reset,
-       .get_headphone          = pmf_gpio_get_headphone,
-       .get_speakers           = pmf_gpio_get_amp,
-       .get_lineout            = pmf_gpio_get_lineout,
-       .set_notify             = pmf_set_notify,
-       .get_detect             = pmf_get_detect,
-};
-
-struct gpio_methods *pmf_gpio_methods = &methods;
-EXPORT_SYMBOL_GPL(pmf_gpio_methods);
diff --git a/sound/aoa/fabrics/Makefile b/sound/aoa/fabrics/Makefile

index 55fc5e7e52cfa0da563e1987c38494c35d63402c..da37c10eca51087bac1d08e5984f13720f29bd25 100644 (file)
--- a/sound/aoa/fabrics/Makefile
+++ b/sound/aoa/fabrics/Makefile
@@ -1 +1,3 @@
+snd-aoa-fabric-layout-objs += layout.o
+
  obj-$(CONFIG_SND_AOA_FABRIC_LAYOUT) += snd-aoa-fabric-layout.o
diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c

new file mode 100644 (file)

index 0000000..ad60f5d
--- /dev/null
+++ b/sound/aoa/fabrics/layout.c
@@ -0,0 +1,1120 @@
+/*
+ * Apple Onboard Audio driver -- layout fabric
+ *
+ * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
+ *
+ * GPL v2, can be found in COPYING.
+ *
+ *
+ * This fabric module looks for sound codecs
+ * based on the layout-id property in the device tree.
+ *
+ */
+
+#include <asm/prom.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include "../aoa.h"
+#include "../soundbus/soundbus.h"
+
+MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Layout-ID fabric for snd-aoa");
+
+#define MAX_CODECS_PER_BUS     2
+
+/* These are the connections the layout fabric
+ * knows about. It doesn't really care about the
+ * input ones, but I thought I'd separate them
+ * to give them proper names. The thing is that
+ * Apple usually will distinguish the active output
+ * by GPIOs, while the active input is set directly
+ * on the codec. Hence we here tell the codec what
+ * we think is connected. This information is hard-
+ * coded below ... */
+#define CC_SPEAKERS    (1<<0)
+#define CC_HEADPHONE   (1<<1)
+#define CC_LINEOUT     (1<<2)
+#define CC_DIGITALOUT  (1<<3)
+#define CC_LINEIN      (1<<4)
+#define CC_MICROPHONE  (1<<5)
+#define CC_DIGITALIN   (1<<6)
+/* pretty bogus but users complain...
+ * This is a flag saying that the LINEOUT
+ * should be renamed to HEADPHONE.
+ * be careful with input detection! */
+#define CC_LINEOUT_LABELLED_HEADPHONE  (1<<7)
+
+struct codec_connection {
+       /* CC_ flags from above */
+       int connected;
+       /* codec dependent bit to be set in the aoa_codec.connected field.
+        * This intentionally doesn't have any generic flags because the
+        * fabric has to know the codec anyway and all codecs might have
+        * different connectors */
+       int codec_bit;
+};
+
+struct codec_connect_info {
+       char *name;
+       struct codec_connection *connections;
+};
+
+#define LAYOUT_FLAG_COMBO_LINEOUT_SPDIF        (1<<0)
+
+struct layout {
+       unsigned int layout_id;
+       struct codec_connect_info codecs[MAX_CODECS_PER_BUS];
+       int flags;
+
+       /* if busname is not assigned, we use 'Master' below,
+        * so that our layout table doesn't need to be filled
+        * too much.
+        * We only assign these two if we expect to find more
+        * than one soundbus, i.e. on those machines with
+        * multiple layout-ids */
+       char *busname;
+       int pcmid;
+};
+
+MODULE_ALIAS("sound-layout-36");
+MODULE_ALIAS("sound-layout-41");
+MODULE_ALIAS("sound-layout-45");
+MODULE_ALIAS("sound-layout-47");
+MODULE_ALIAS("sound-layout-48");
+MODULE_ALIAS("sound-layout-49");
+MODULE_ALIAS("sound-layout-50");
+MODULE_ALIAS("sound-layout-51");
+MODULE_ALIAS("sound-layout-56");
+MODULE_ALIAS("sound-layout-57");
+MODULE_ALIAS("sound-layout-58");
+MODULE_ALIAS("sound-layout-60");
+MODULE_ALIAS("sound-layout-61");
+MODULE_ALIAS("sound-layout-62");
+MODULE_ALIAS("sound-layout-64");
+MODULE_ALIAS("sound-layout-65");
+MODULE_ALIAS("sound-layout-66");
+MODULE_ALIAS("sound-layout-67");
+MODULE_ALIAS("sound-layout-68");
+MODULE_ALIAS("sound-layout-69");
+MODULE_ALIAS("sound-layout-70");
+MODULE_ALIAS("sound-layout-72");
+MODULE_ALIAS("sound-layout-76");
+MODULE_ALIAS("sound-layout-80");
+MODULE_ALIAS("sound-layout-82");
+MODULE_ALIAS("sound-layout-84");
+MODULE_ALIAS("sound-layout-86");
+MODULE_ALIAS("sound-layout-90");
+MODULE_ALIAS("sound-layout-92");
+MODULE_ALIAS("sound-layout-94");
+MODULE_ALIAS("sound-layout-96");
+MODULE_ALIAS("sound-layout-98");
+MODULE_ALIAS("sound-layout-100");
+
+/* onyx with all but microphone connected */
+static struct codec_connection onyx_connections_nomic[] = {
+       {
+               .connected = CC_SPEAKERS | CC_HEADPHONE | CC_LINEOUT,
+               .codec_bit = 0,
+       },
+       {
+               .connected = CC_DIGITALOUT,
+               .codec_bit = 1,
+       },
+       {
+               .connected = CC_LINEIN,
+               .codec_bit = 2,
+       },
+       {} /* terminate array by .connected == 0 */
+};
+
+/* onyx on machines without headphone */
+static struct codec_connection onyx_connections_noheadphones[] = {
+       {
+               .connected = CC_SPEAKERS | CC_LINEOUT |
+                            CC_LINEOUT_LABELLED_HEADPHONE,
+               .codec_bit = 0,
+       },
+       {
+               .connected = CC_DIGITALOUT,
+               .codec_bit = 1,
+       },
+       /* FIXME: are these correct? probably not for all the machines
+        * below ... If not this will need separating. */
+       {
+               .connected = CC_LINEIN,
+               .codec_bit = 2,
+       },
+       {
+               .connected = CC_MICROPHONE,
+               .codec_bit = 3,
+       },
+       {} /* terminate array by .connected == 0 */
+};
+
+/* onyx on machines with real line-out */
+static struct codec_connection onyx_connections_reallineout[] = {
+       {
+               .connected = CC_SPEAKERS | CC_LINEOUT | CC_HEADPHONE,
+               .codec_bit = 0,
+       },
+       {
+               .connected = CC_DIGITALOUT,
+               .codec_bit = 1,
+       },
+       {
+               .connected = CC_LINEIN,
+               .codec_bit = 2,
+       },
+       {} /* terminate array by .connected == 0 */
+};
+
+/* tas on machines without line out */
+static struct codec_connection tas_connections_nolineout[] = {
+       {
+               .connected = CC_SPEAKERS | CC_HEADPHONE,
+               .codec_bit = 0,
+       },
+       {
+               .connected = CC_LINEIN,
+               .codec_bit = 2,
+       },
+       {
+               .connected = CC_MICROPHONE,
+               .codec_bit = 3,
+       },
+       {} /* terminate array by .connected == 0 */
+};
+
+/* tas on machines with neither line out nor line in */
+static struct codec_connection tas_connections_noline[] = {
+       {
+               .connected = CC_SPEAKERS | CC_HEADPHONE,
+               .codec_bit = 0,
+       },
+       {
+               .connected = CC_MICROPHONE,
+               .codec_bit = 3,
+       },
+       {} /* terminate array by .connected == 0 */
+};
+
+/* tas on machines without microphone */
+static struct codec_connection tas_connections_nomic[] = {
+       {
+               .connected = CC_SPEAKERS | CC_HEADPHONE | CC_LINEOUT,
+               .codec_bit = 0,
+       },
+       {
+               .connected = CC_LINEIN,
+               .codec_bit = 2,
+       },
+       {} /* terminate array by .connected == 0 */
+};
+
+/* tas on machines with everything connected */
+static struct codec_connection tas_connections_all[] = {
+       {
+               .connected = CC_SPEAKERS | CC_HEADPHONE | CC_LINEOUT,
+               .codec_bit = 0,
+       },
+       {
+               .connected = CC_LINEIN,
+               .codec_bit = 2,
+       },
+       {
+               .connected = CC_MICROPHONE,
+               .codec_bit = 3,
+       },
+       {} /* terminate array by .connected == 0 */
+};
+
+static struct codec_connection toonie_connections[] = {
+       {
+               .connected = CC_SPEAKERS | CC_HEADPHONE,
+               .codec_bit = 0,
+       },
+       {} /* terminate array by .connected == 0 */
+};
+
+static struct codec_connection topaz_input[] = {
+       {
+               .connected = CC_DIGITALIN,
+               .codec_bit = 0,
+       },
+       {} /* terminate array by .connected == 0 */
+};
+
+static struct codec_connection topaz_output[] = {
+       {
+               .connected = CC_DIGITALOUT,
+               .codec_bit = 1,
+       },
+       {} /* terminate array by .connected == 0 */
+};
+
+static struct codec_connection topaz_inout[] = {
+       {
+               .connected = CC_DIGITALIN,
+               .codec_bit = 0,
+       },
+       {
+               .connected = CC_DIGITALOUT,
+               .codec_bit = 1,
+       },
+       {} /* terminate array by .connected == 0 */
+};
+
+static struct layout layouts[] = {
+       /* last PowerBooks (15" Oct 2005) */
+       { .layout_id = 82,
+         .flags = LAYOUT_FLAG_COMBO_LINEOUT_SPDIF,
+         .codecs[0] = {
+               .name = "onyx",
+               .connections = onyx_connections_noheadphones,
+         },
+         .codecs[1] = {
+               .name = "topaz",
+               .connections = topaz_input,
+         },
+       },
+       /* PowerMac9,1 */
+       { .layout_id = 60,
+         .codecs[0] = {
+               .name = "onyx",
+               .connections = onyx_connections_reallineout,
+         },
+       },
+       /* PowerMac9,1 */
+       { .layout_id = 61,
+         .codecs[0] = {
+               .name = "topaz",
+               .connections = topaz_input,
+         },
+       },
+       /* PowerBook5,7 */
+       { .layout_id = 64,
+         .flags = LAYOUT_FLAG_COMBO_LINEOUT_SPDIF,
+         .codecs[0] = {
+               .name = "onyx",
+               .connections = onyx_connections_noheadphones,
+         },
+       },
+       /* PowerBook5,7 */
+       { .layout_id = 65,
+         .codecs[0] = {
+               .name = "topaz",
+               .connections = topaz_input,
+         },
+       },
+       /* PowerBook5,9 [17" Oct 2005] */
+       { .layout_id = 84,
+         .flags = LAYOUT_FLAG_COMBO_LINEOUT_SPDIF,
+         .codecs[0] = {
+               .name = "onyx",
+               .connections = onyx_connections_noheadphones,
+         },
+         .codecs[1] = {
+               .name = "topaz",
+               .connections = topaz_input,
+         },
+       },
+       /* PowerMac8,1 */
+       { .layout_id = 45,
+         .codecs[0] = {
+               .name = "onyx",
+               .connections = onyx_connections_noheadphones,
+         },
+         .codecs[1] = {
+               .name = "topaz",
+               .connections = topaz_input,
+         },
+       },
+       /* Quad PowerMac (analog in, analog/digital out) */
+       { .layout_id = 68,
+         .codecs[0] = {
+               .name = "onyx",
+               .connections = onyx_connections_nomic,
+         },
+       },
+       /* Quad PowerMac (digital in) */
+       { .layout_id = 69,
+         .codecs[0] = {
+               .name = "topaz",
+               .connections = topaz_input,
+         },
+         .busname = "digital in", .pcmid = 1 },
+       /* Early 2005 PowerBook (PowerBook 5,6) */
+       { .layout_id = 70,
+         .codecs[0] = {
+               .name = "tas",
+               .connections = tas_connections_nolineout,
+         },
+       },
+       /* PowerBook 5,4 */
+       { .layout_id = 51,
+         .codecs[0] = {
+               .name = "tas",
+               .connections = tas_connections_nolineout,
+         },
+       },
+       /* PowerBook6,7 */
+       { .layout_id = 80,
+         .codecs[0] = {
+               .name = "tas",
+               .connections = tas_connections_noline,
+         },
+       },
+       /* PowerBook6,8 */
+       { .layout_id = 72,
+         .codecs[0] = {
+               .name = "tas",
+               .connections = tas_connections_nolineout,
+         },
+       },
+       /* PowerMac8,2 */
+       { .layout_id = 86,
+         .codecs[0] = {
+               .name = "onyx",
+               .connections = onyx_connections_nomic,
+         },
+         .codecs[1] = {
+               .name = "topaz",
+               .connections = topaz_input,
+         },
+       },
+       /* PowerBook6,7 */
+       { .layout_id = 92,
+         .codecs[0] = {
+               .name = "tas",
+               .connections = tas_connections_nolineout,
+         },
+       },
+       /* PowerMac10,1 (Mac Mini) */
+       { .layout_id = 58,
+         .codecs[0] = {
+               .name = "toonie",
+               .connections = toonie_connections,
+         },
+       },
+       {
+         .layout_id = 96,
+         .codecs[0] = {
+               .name = "onyx",
+               .connections = onyx_connections_noheadphones,
+         },
+       },
+       /* unknown, untested, but this comes from Apple */
+       { .layout_id = 41,
+         .codecs[0] = {
+               .name = "tas",
+               .connections = tas_connections_all,
+         },
+       },
+       { .layout_id = 36,
+         .codecs[0] = {
+               .name = "tas",
+               .connections = tas_connections_nomic,
+         },
+         .codecs[1] = {
+               .name = "topaz",
+               .connections = topaz_inout,
+         },
+       },
+       { .layout_id = 47,
+         .codecs[0] = {
+               .name = "onyx",
+               .connections = onyx_connections_noheadphones,
+         },
+       },
+       { .layout_id = 48,
+         .codecs[0] = {
+               .name = "topaz",
+               .connections = topaz_input,
+         },
+       },
+       { .layout_id = 49,
+         .codecs[0] = {
+               .name = "onyx",
+               .connections = onyx_connections_nomic,
+         },
+       },
+       { .layout_id = 50,
+         .codecs[0] = {
+               .name = "topaz",
+               .connections = topaz_input,
+         },
+       },
+       { .layout_id = 56,
+         .codecs[0] = {
+               .name = "onyx",
+               .connections = onyx_connections_noheadphones,
+         },
+       },
+       { .layout_id = 57,
+         .codecs[0] = {
+               .name = "topaz",
+               .connections = topaz_input,
+         },
+       },
+       { .layout_id = 62,
+         .codecs[0] = {
+               .name = "onyx",
+               .connections = onyx_connections_noheadphones,
+         },
+         .codecs[1] = {
+               .name = "topaz",
+               .connections = topaz_output,
+         },
+       },
+       { .layout_id = 66,
+         .codecs[0] = {
+               .name = "onyx",
+               .connections = onyx_connections_noheadphones,
+         },
+       },
+       { .layout_id = 67,
+         .codecs[0] = {
+               .name = "topaz",
+               .connections = topaz_input,
+         },
+       },
+       { .layout_id = 76,
+         .codecs[0] = {
+               .name = "tas",
+               .connections = tas_connections_nomic,
+         },
+         .codecs[1] = {
+               .name = "topaz",
+               .connections = topaz_inout,
+         },
+       },
+       { .layout_id = 90,
+         .codecs[0] = {
+               .name = "tas",
+               .connections = tas_connections_noline,
+         },
+       },
+       { .layout_id = 94,
+         .codecs[0] = {
+               .name = "onyx",
+               /* but it has an external mic?? how to select? */
+               .connections = onyx_connections_noheadphones,
+         },
+       },
+       { .layout_id = 98,
+         .codecs[0] = {
+               .name = "toonie",
+               .connections = toonie_connections,
+         },
+       },
+       { .layout_id = 100,
+         .codecs[0] = {
+               .name = "topaz",
+               .connections = topaz_input,
+         },
+         .codecs[1] = {
+               .name = "onyx",
+               .connections = onyx_connections_noheadphones,
+         },
+       },
+       {}
+};
+
+static struct layout *find_layout_by_id(unsigned int id)
+{
+       struct layout *l;
+
+       l = layouts;
+       while (l->layout_id) {
+               if (l->layout_id == id)
+                       return l;
+               l++;
+       }
+       return NULL;
+}
+
+static void use_layout(struct layout *l)
+{
+       int i;
+
+       for (i=0; i<MAX_CODECS_PER_BUS; i++) {
+               if (l->codecs[i].name) {
+                       request_module("snd-aoa-codec-%s", l->codecs[i].name);
+               }
+       }
+       /* now we wait for the codecs to call us back */
+}
+
+struct layout_dev;
+
+struct layout_dev_ptr {
+       struct layout_dev *ptr;
+};
+
+struct layout_dev {
+       struct list_head list;
+       struct soundbus_dev *sdev;
+       struct device_node *sound;
+       struct aoa_codec *codecs[MAX_CODECS_PER_BUS];
+       struct layout *layout;
+       struct gpio_runtime gpio;
+
+       /* we need these for headphone/lineout detection */
+       struct snd_kcontrol *headphone_ctrl;
+       struct snd_kcontrol *lineout_ctrl;
+       struct snd_kcontrol *speaker_ctrl;
+       struct snd_kcontrol *headphone_detected_ctrl;
+       struct snd_kcontrol *lineout_detected_ctrl;
+
+       struct layout_dev_ptr selfptr_headphone;
+       struct layout_dev_ptr selfptr_lineout;
+
+       u32 have_lineout_detect:1,
+           have_headphone_detect:1,
+           switch_on_headphone:1,
+           switch_on_lineout:1;
+};
+
+static LIST_HEAD(layouts_list);
+static int layouts_list_items;
+/* this can go away but only if we allow multiple cards,
+ * make the fabric handle all the card stuff, etc... */
+static struct layout_dev *layout_device;
+
+#define control_info   snd_ctl_boolean_mono_info
+
+#define AMP_CONTROL(n, description)                                    \
+static int n##_control_get(struct snd_kcontrol *kcontrol,              \
+                          struct snd_ctl_elem_value *ucontrol)         \
+{                                                                      \
+       struct gpio_runtime *gpio = snd_kcontrol_chip(kcontrol);        \
+       if (gpio->methods && gpio->methods->get_##n)                    \
+               ucontrol->value.integer.value[0] =                      \
+                       gpio->methods->get_##n(gpio);                   \
+       return 0;                                                       \
+}                                                                      \
+static int n##_control_put(struct snd_kcontrol *kcontrol,              \
+                          struct snd_ctl_elem_value *ucontrol)         \
+{                                                                      \
+       struct gpio_runtime *gpio = snd_kcontrol_chip(kcontrol);        \
+       if (gpio->methods && gpio->methods->get_##n)                    \
+               gpio->methods->set_##n(gpio,                            \
+                       !!ucontrol->value.integer.value[0]);            \
+       return 1;                                                       \
+}                                                                      \
+static struct snd_kcontrol_new n##_ctl = {                             \
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,                            \
+       .name = description,                                            \
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,                      \
+       .info = control_info,                                           \
+       .get = n##_control_get,                                         \
+       .put = n##_control_put,                                         \
+}
+
+AMP_CONTROL(headphone, "Headphone Switch");
+AMP_CONTROL(speakers, "Speakers Switch");
+AMP_CONTROL(lineout, "Line-Out Switch");
+
+static int detect_choice_get(struct snd_kcontrol *kcontrol,
+                            struct snd_ctl_elem_value *ucontrol)
+{
+       struct layout_dev *ldev = snd_kcontrol_chip(kcontrol);
+
+       switch (kcontrol->private_value) {
+       case 0:
+               ucontrol->value.integer.value[0] = ldev->switch_on_headphone;
+               break;
+       case 1:
+               ucontrol->value.integer.value[0] = ldev->switch_on_lineout;
+               break;
+       default:
+               return -ENODEV;
+       }
+       return 0;
+}
+
+static int detect_choice_put(struct snd_kcontrol *kcontrol,
+                            struct snd_ctl_elem_value *ucontrol)
+{
+       struct layout_dev *ldev = snd_kcontrol_chip(kcontrol);
+
+       switch (kcontrol->private_value) {
+       case 0:
+               ldev->switch_on_headphone = !!ucontrol->value.integer.value[0];
+               break;
+       case 1:
+               ldev->switch_on_lineout = !!ucontrol->value.integer.value[0];
+               break;
+       default:
+               return -ENODEV;
+       }
+       return 1;
+}
+
+static struct snd_kcontrol_new headphone_detect_choice = {
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name = "Headphone Detect Autoswitch",
+       .info = control_info,
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+       .get = detect_choice_get,
+       .put = detect_choice_put,
+       .private_value = 0,
+};
+
+static struct snd_kcontrol_new lineout_detect_choice = {
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name = "Line-Out Detect Autoswitch",
+       .info = control_info,
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+       .get = detect_choice_get,
+       .put = detect_choice_put,
+       .private_value = 1,
+};
+
+static int detected_get(struct snd_kcontrol *kcontrol,
+                       struct snd_ctl_elem_value *ucontrol)
+{
+       struct layout_dev *ldev = snd_kcontrol_chip(kcontrol);
+       int v;
+
+       switch (kcontrol->private_value) {
+       case 0:
+               v = ldev->gpio.methods->get_detect(&ldev->gpio,
+                                                  AOA_NOTIFY_HEADPHONE);
+               break;
+       case 1:
+               v = ldev->gpio.methods->get_detect(&ldev->gpio,
+                                                  AOA_NOTIFY_LINE_OUT);
+               break;
+       default:
+               return -ENODEV;
+       }
+       ucontrol->value.integer.value[0] = v;
+       return 0;
+}
+
+static struct snd_kcontrol_new headphone_detected = {
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name = "Headphone Detected",
+       .info = control_info,
+       .access = SNDRV_CTL_ELEM_ACCESS_READ,
+       .get = detected_get,
+       .private_value = 0,
+};
+
+static struct snd_kcontrol_new lineout_detected = {
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name = "Line-Out Detected",
+       .info = control_info,
+       .access = SNDRV_CTL_ELEM_ACCESS_READ,
+       .get = detected_get,
+       .private_value = 1,
+};
+
+static int check_codec(struct aoa_codec *codec,
+                      struct layout_dev *ldev,
+                      struct codec_connect_info *cci)
+{
+       const u32 *ref;
+       char propname[32];
+       struct codec_connection *cc;
+
+       /* if the codec has a 'codec' node, we require a reference */
+       if (codec->node && (strcmp(codec->node->name, "codec") == 0)) {
+               snprintf(propname, sizeof(propname),
+                        "platform-%s-codec-ref", codec->name);
+               ref = of_get_property(ldev->sound, propname, NULL);
+               if (!ref) {
+                       printk(KERN_INFO "snd-aoa-fabric-layout: "
+                               "required property %s not present\n", propname);
+                       return -ENODEV;
+               }
+               if (*ref != codec->node->linux_phandle) {
+                       printk(KERN_INFO "snd-aoa-fabric-layout: "
+                               "%s doesn't match!\n", propname);
+                       return -ENODEV;
+               }
+       } else {
+               if (layouts_list_items != 1) {
+                       printk(KERN_INFO "snd-aoa-fabric-layout: "
+                               "more than one soundbus, but no references.\n");
+                       return -ENODEV;
+               }
+       }
+       codec->soundbus_dev = ldev->sdev;
+       codec->gpio = &ldev->gpio;
+
+       cc = cci->connections;
+       if (!cc)
+               return -EINVAL;
+
+       printk(KERN_INFO "snd-aoa-fabric-layout: can use this codec\n");
+
+       codec->connected = 0;
+       codec->fabric_data = cc;
+
+       while (cc->connected) {
+               codec->connected |= 1<<cc->codec_bit;
+               cc++;
+       }
+
+       return 0;
+}
+
+static int layout_found_codec(struct aoa_codec *codec)
+{
+       struct layout_dev *ldev;
+       int i;
+
+       list_for_each_entry(ldev, &layouts_list, list) {
+               for (i=0; i<MAX_CODECS_PER_BUS; i++) {
+                       if (!ldev->layout->codecs[i].name)
+                               continue;
+                       if (strcmp(ldev->layout->codecs[i].name, codec->name) == 0) {
+                               if (check_codec(codec,
+                                               ldev,
+                                               &ldev->layout->codecs[i]) == 0)
+                                       return 0;
+                       }
+               }
+       }
+       return -ENODEV;
+}
+
+static void layout_remove_codec(struct aoa_codec *codec)
+{
+       int i;
+       /* here remove the codec from the layout dev's
+        * codec reference */
+
+       codec->soundbus_dev = NULL;
+       codec->gpio = NULL;
+       for (i=0; i<MAX_CODECS_PER_BUS; i++) {
+       }
+}
+
+static void layout_notify(void *data)
+{
+       struct layout_dev_ptr *dptr = data;
+       struct layout_dev *ldev;
+       int v, update;
+       struct snd_kcontrol *detected, *c;
+       struct snd_card *card = aoa_get_card();
+
+       ldev = dptr->ptr;
+       if (data == &ldev->selfptr_headphone) {
+               v = ldev->gpio.methods->get_detect(&ldev->gpio, AOA_NOTIFY_HEADPHONE);
+               detected = ldev->headphone_detected_ctrl;
+               update = ldev->switch_on_headphone;
+               if (update) {
+                       ldev->gpio.methods->set_speakers(&ldev->gpio, !v);
+                       ldev->gpio.methods->set_headphone(&ldev->gpio, v);
+                       ldev->gpio.methods->set_lineout(&ldev->gpio, 0);
+               }
+       } else if (data == &ldev->selfptr_lineout) {
+               v = ldev->gpio.methods->get_detect(&ldev->gpio, AOA_NOTIFY_LINE_OUT);
+               detected = ldev->lineout_detected_ctrl;
+               update = ldev->switch_on_lineout;
+               if (update) {
+                       ldev->gpio.methods->set_speakers(&ldev->gpio, !v);
+                       ldev->gpio.methods->set_headphone(&ldev->gpio, 0);
+                       ldev->gpio.methods->set_lineout(&ldev->gpio, v);
+               }
+       } else
+               return;
+
+       if (detected)
+               snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &detected->id);
+       if (update) {
+               c = ldev->headphone_ctrl;
+               if (c)
+                       snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &c->id);
+               c = ldev->speaker_ctrl;
+               if (c)
+                       snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &c->id);
+               c = ldev->lineout_ctrl;
+               if (c)
+                       snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &c->id);
+       }
+}
+
+static void layout_attached_codec(struct aoa_codec *codec)
+{
+       struct codec_connection *cc;
+       struct snd_kcontrol *ctl;
+       int headphones, lineout;
+       struct layout_dev *ldev = layout_device;
+
+       /* need to add this codec to our codec array! */
+
+       cc = codec->fabric_data;
+
+       headphones = codec->gpio->methods->get_detect(codec->gpio,
+                                                     AOA_NOTIFY_HEADPHONE);
+       lineout = codec->gpio->methods->get_detect(codec->gpio,
+                                                  AOA_NOTIFY_LINE_OUT);
+
+       while (cc->connected) {
+               if (cc->connected & CC_SPEAKERS) {
+                       if (headphones <= 0 && lineout <= 0)
+                               ldev->gpio.methods->set_speakers(codec->gpio, 1);
+                       ctl = snd_ctl_new1(&speakers_ctl, codec->gpio);
+                       ldev->speaker_ctrl = ctl;
+                       aoa_snd_ctl_add(ctl);
+               }
+               if (cc->connected & CC_HEADPHONE) {
+                       if (headphones == 1)
+                               ldev->gpio.methods->set_headphone(codec->gpio, 1);
+                       ctl = snd_ctl_new1(&headphone_ctl, codec->gpio);
+                       ldev->headphone_ctrl = ctl;
+                       aoa_snd_ctl_add(ctl);
+                       ldev->have_headphone_detect =
+                               !ldev->gpio.methods
+                                       ->set_notify(&ldev->gpio,
+                                                    AOA_NOTIFY_HEADPHONE,
+                                                    layout_notify,
+                                                    &ldev->selfptr_headphone);
+                       if (ldev->have_headphone_detect) {
+                               ctl = snd_ctl_new1(&headphone_detect_choice,
+                                                  ldev);
+                               aoa_snd_ctl_add(ctl);
+                               ctl = snd_ctl_new1(&headphone_detected,
+                                                  ldev);
+                               ldev->headphone_detected_ctrl = ctl;
+                               aoa_snd_ctl_add(ctl);
+                       }
+               }
+               if (cc->connected & CC_LINEOUT) {
+                       if (lineout == 1)
+                               ldev->gpio.methods->set_lineout(codec->gpio, 1);
+                       ctl = snd_ctl_new1(&lineout_ctl, codec->gpio);
+                       if (cc->connected & CC_LINEOUT_LABELLED_HEADPHONE)
+                               strlcpy(ctl->id.name,
+                                       "Headphone Switch", sizeof(ctl->id.name));
+                       ldev->lineout_ctrl = ctl;
+                       aoa_snd_ctl_add(ctl);
+                       ldev->have_lineout_detect =
+                               !ldev->gpio.methods
+                                       ->set_notify(&ldev->gpio,
+                                                    AOA_NOTIFY_LINE_OUT,
+                                                    layout_notify,
+                                                    &ldev->selfptr_lineout);
+                       if (ldev->have_lineout_detect) {
+                               ctl = snd_ctl_new1(&lineout_detect_choice,
+                                                  ldev);
+                               if (cc->connected & CC_LINEOUT_LABELLED_HEADPHONE)
+                                       strlcpy(ctl->id.name,
+                                               "Headphone Detect Autoswitch",
+                                               sizeof(ctl->id.name));
+                               aoa_snd_ctl_add(ctl);
+                               ctl = snd_ctl_new1(&lineout_detected,
+                                                  ldev);
+                               if (cc->connected & CC_LINEOUT_LABELLED_HEADPHONE)
+                                       strlcpy(ctl->id.name,
+                                               "Headphone Detected",
+                                               sizeof(ctl->id.name));
+                               ldev->lineout_detected_ctrl = ctl;
+                               aoa_snd_ctl_add(ctl);
+                       }
+               }
+               cc++;
+       }
+       /* now update initial state */
+       if (ldev->have_headphone_detect)
+               layout_notify(&ldev->selfptr_headphone);
+       if (ldev->have_lineout_detect)
+               layout_notify(&ldev->selfptr_lineout);
+}
+
+static struct aoa_fabric layout_fabric = {
+       .name = "SoundByLayout",
+       .owner = THIS_MODULE,
+       .found_codec = layout_found_codec,
+       .remove_codec = layout_remove_codec,
+       .attached_codec = layout_attached_codec,
+};
+
+static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
+{
+       struct device_node *sound = NULL;
+       const unsigned int *layout_id;
+       struct layout *layout;
+       struct layout_dev *ldev = NULL;
+       int err;
+
+       /* hm, currently we can only have one ... */
+       if (layout_device)
+               return -ENODEV;
+
+       /* by breaking out we keep a reference */
+       while ((sound = of_get_next_child(sdev->ofdev.node, sound))) {
+               if (sound->type && strcasecmp(sound->type, "soundchip") == 0)
+                       break;
+       }
+       if (!sound) return -ENODEV;
+
+       layout_id = of_get_property(sound, "layout-id", NULL);
+       if (!layout_id)
+               goto outnodev;
+       printk(KERN_INFO "snd-aoa-fabric-layout: found bus with layout %d\n",
+              *layout_id);
+
+       layout = find_layout_by_id(*layout_id);
+       if (!layout) {
+               printk(KERN_ERR "snd-aoa-fabric-layout: unknown layout\n");
+               goto outnodev;
+       }
+
+       ldev = kzalloc(sizeof(struct layout_dev), GFP_KERNEL);
+       if (!ldev)
+               goto outnodev;
+
+       layout_device = ldev;
+       ldev->sdev = sdev;
+       ldev->sound = sound;
+       ldev->layout = layout;
+       ldev->gpio.node = sound->parent;
+       switch (layout->layout_id) {
+       case 41: /* that unknown machine no one seems to have */
+       case 51: /* PowerBook5,4 */
+       case 58: /* Mac Mini */
+               ldev->gpio.methods = ftr_gpio_methods;
+               printk(KERN_DEBUG
+                      "snd-aoa-fabric-layout: Using direct GPIOs\n");
+               break;
+       default:
+               ldev->gpio.methods = pmf_gpio_methods;
+               printk(KERN_DEBUG
+                      "snd-aoa-fabric-layout: Using PMF GPIOs\n");
+       }
+       ldev->selfptr_headphone.ptr = ldev;
+       ldev->selfptr_lineout.ptr = ldev;
+       sdev->ofdev.dev.driver_data = ldev;
+       list_add(&ldev->list, &layouts_list);
+       layouts_list_items++;
+
+       /* assign these before registering ourselves, so
+        * callbacks that are done during registration
+        * already have the values */
+       sdev->pcmid = ldev->layout->pcmid;
+       if (ldev->layout->busname) {
+               sdev->pcmname = ldev->layout->busname;
+       } else {
+               sdev->pcmname = "Master";
+       }
+
+       ldev->gpio.methods->init(&ldev->gpio);
+
+       err = aoa_fabric_register(&layout_fabric, &sdev->ofdev.dev);
+       if (err && err != -EALREADY) {
+               printk(KERN_INFO "snd-aoa-fabric-layout: can't use,"
+                                " another fabric is active!\n");
+               goto outlistdel;
+       }
+
+       use_layout(layout);
+       ldev->switch_on_headphone = 1;
+       ldev->switch_on_lineout = 1;
+       return 0;
+ outlistdel:
+       /* we won't be using these then... */
+       ldev->gpio.methods->exit(&ldev->gpio);
+       /* reset if we didn't use it */
+       sdev->pcmname = NULL;
+       sdev->pcmid = -1;
+       list_del(&ldev->list);
+       layouts_list_items--;
+ outnodev:
+       of_node_put(sound);
+       layout_device = NULL;
+       kfree(ldev);
+       return -ENODEV;
+}
+
+static int aoa_fabric_layout_remove(struct soundbus_dev *sdev)
+{
+       struct layout_dev *ldev = sdev->ofdev.dev.driver_data;
+       int i;
+
+       for (i=0; i<MAX_CODECS_PER_BUS; i++) {
+               if (ldev->codecs[i]) {
+                       aoa_fabric_unlink_codec(ldev->codecs[i]);
+               }
+               ldev->codecs[i] = NULL;
+       }
+       list_del(&ldev->list);
+       layouts_list_items--;
+       of_node_put(ldev->sound);
+
+       ldev->gpio.methods->set_notify(&ldev->gpio,
+                                      AOA_NOTIFY_HEADPHONE,
+                                      NULL,
+                                      NULL);
+       ldev->gpio.methods->set_notify(&ldev->gpio,
+                                      AOA_NOTIFY_LINE_OUT,
+                                      NULL,
+                                      NULL);
+
+       ldev->gpio.methods->exit(&ldev->gpio);
+       layout_device = NULL;
+       kfree(ldev);
+       sdev->pcmid = -1;
+       sdev->pcmname = NULL;
+       return 0;
+}
+
+#ifdef CONFIG_PM
+static int aoa_fabric_layout_suspend(struct soundbus_dev *sdev, pm_message_t state)
+{
+       struct layout_dev *ldev = sdev->ofdev.dev.driver_data;
+
+       if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off)
+               ldev->gpio.methods->all_amps_off(&ldev->gpio);
+
+       return 0;
+}
+
+static int aoa_fabric_layout_resume(struct soundbus_dev *sdev)
+{
+       struct layout_dev *ldev = sdev->ofdev.dev.driver_data;
+
+       if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off)
+               ldev->gpio.methods->all_amps_restore(&ldev->gpio);
+
+       return 0;
+}
+#endif
+
+static struct soundbus_driver aoa_soundbus_driver = {
+       .name = "snd_aoa_soundbus_drv",
+       .owner = THIS_MODULE,
+       .probe = aoa_fabric_layout_probe,
+       .remove = aoa_fabric_layout_remove,
+#ifdef CONFIG_PM
+       .suspend = aoa_fabric_layout_suspend,
+       .resume = aoa_fabric_layout_resume,
+#endif
+       .driver = {
+               .owner = THIS_MODULE,
+       }
+};
+
+static int __init aoa_fabric_layout_init(void)
+{
+       int err;
+
+       err = soundbus_register_driver(&aoa_soundbus_driver);
+       if (err)
+               return err;
+       return 0;
+}
+
+static void __exit aoa_fabric_layout_exit(void)
+{
+       soundbus_unregister_driver(&aoa_soundbus_driver);
+       aoa_fabric_unregister(&layout_fabric);
+}
+
+module_init(aoa_fabric_layout_init);
+module_exit(aoa_fabric_layout_exit);
diff --git a/sound/aoa/fabrics/snd-aoa-fabric-layout.c b/sound/aoa/fabrics/snd-aoa-fabric-layout.c

deleted file mode 100644 (file)

index dea7abb..0000000
--- a/sound/aoa/fabrics/snd-aoa-fabric-layout.c
+++ /dev/null
@@ -1,1120 +0,0 @@
-/*
- * Apple Onboard Audio driver -- layout fabric
- *
- * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
- *
- * GPL v2, can be found in COPYING.
- *
- *
- * This fabric module looks for sound codecs
- * based on the layout-id property in the device tree.
- *
- */
-
-#include <asm/prom.h>
-#include <linux/list.h>
-#include <linux/module.h>
-#include "../aoa.h"
-#include "../soundbus/soundbus.h"
-
-MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Layout-ID fabric for snd-aoa");
-
-#define MAX_CODECS_PER_BUS     2
-
-/* These are the connections the layout fabric
- * knows about. It doesn't really care about the
- * input ones, but I thought I'd separate them
- * to give them proper names. The thing is that
- * Apple usually will distinguish the active output
- * by GPIOs, while the active input is set directly
- * on the codec. Hence we here tell the codec what
- * we think is connected. This information is hard-
- * coded below ... */
-#define CC_SPEAKERS    (1<<0)
-#define CC_HEADPHONE   (1<<1)
-#define CC_LINEOUT     (1<<2)
-#define CC_DIGITALOUT  (1<<3)
-#define CC_LINEIN      (1<<4)
-#define CC_MICROPHONE  (1<<5)
-#define CC_DIGITALIN   (1<<6)
-/* pretty bogus but users complain...
- * This is a flag saying that the LINEOUT
- * should be renamed to HEADPHONE.
- * be careful with input detection! */
-#define CC_LINEOUT_LABELLED_HEADPHONE  (1<<7)
-
-struct codec_connection {
-       /* CC_ flags from above */
-       int connected;
-       /* codec dependent bit to be set in the aoa_codec.connected field.
-        * This intentionally doesn't have any generic flags because the
-        * fabric has to know the codec anyway and all codecs might have
-        * different connectors */
-       int codec_bit;
-};
-
-struct codec_connect_info {
-       char *name;
-       struct codec_connection *connections;
-};
-
-#define LAYOUT_FLAG_COMBO_LINEOUT_SPDIF        (1<<0)
-
-struct layout {
-       unsigned int layout_id;
-       struct codec_connect_info codecs[MAX_CODECS_PER_BUS];
-       int flags;
-       
-       /* if busname is not assigned, we use 'Master' below,
-        * so that our layout table doesn't need to be filled
-        * too much.
-        * We only assign these two if we expect to find more
-        * than one soundbus, i.e. on those machines with
-        * multiple layout-ids */
-       char *busname;
-       int pcmid;
-};
-
-MODULE_ALIAS("sound-layout-36");
-MODULE_ALIAS("sound-layout-41");
-MODULE_ALIAS("sound-layout-45");
-MODULE_ALIAS("sound-layout-47");
-MODULE_ALIAS("sound-layout-48");
-MODULE_ALIAS("sound-layout-49");
-MODULE_ALIAS("sound-layout-50");
-MODULE_ALIAS("sound-layout-51");
-MODULE_ALIAS("sound-layout-56");
-MODULE_ALIAS("sound-layout-57");
-MODULE_ALIAS("sound-layout-58");
-MODULE_ALIAS("sound-layout-60");
-MODULE_ALIAS("sound-layout-61");
-MODULE_ALIAS("sound-layout-62");
-MODULE_ALIAS("sound-layout-64");
-MODULE_ALIAS("sound-layout-65");
-MODULE_ALIAS("sound-layout-66");
-MODULE_ALIAS("sound-layout-67");
-MODULE_ALIAS("sound-layout-68");
-MODULE_ALIAS("sound-layout-69");
-MODULE_ALIAS("sound-layout-70");
-MODULE_ALIAS("sound-layout-72");
-MODULE_ALIAS("sound-layout-76");
-MODULE_ALIAS("sound-layout-80");
-MODULE_ALIAS("sound-layout-82");
-MODULE_ALIAS("sound-layout-84");
-MODULE_ALIAS("sound-layout-86");
-MODULE_ALIAS("sound-layout-90");
-MODULE_ALIAS("sound-layout-92");
-MODULE_ALIAS("sound-layout-94");
-MODULE_ALIAS("sound-layout-96");
-MODULE_ALIAS("sound-layout-98");
-MODULE_ALIAS("sound-layout-100");
-
-/* onyx with all but microphone connected */
-static struct codec_connection onyx_connections_nomic[] = {
-       {
-               .connected = CC_SPEAKERS | CC_HEADPHONE | CC_LINEOUT,
-               .codec_bit = 0,
-       },
-       {
-               .connected = CC_DIGITALOUT,
-               .codec_bit = 1,
-       },
-       {
-               .connected = CC_LINEIN,
-               .codec_bit = 2,
-       },
-       {} /* terminate array by .connected == 0 */
-};
-
-/* onyx on machines without headphone */
-static struct codec_connection onyx_connections_noheadphones[] = {
-       {
-               .connected = CC_SPEAKERS | CC_LINEOUT |
-                            CC_LINEOUT_LABELLED_HEADPHONE,
-               .codec_bit = 0,
-       },
-       {
-               .connected = CC_DIGITALOUT,
-               .codec_bit = 1,
-       },
-       /* FIXME: are these correct? probably not for all the machines
-        * below ... If not this will need separating. */
-       {
-               .connected = CC_LINEIN,
-               .codec_bit = 2,
-       },
-       {
-               .connected = CC_MICROPHONE,
-               .codec_bit = 3,
-       },
-       {} /* terminate array by .connected == 0 */
-};
-
-/* onyx on machines with real line-out */
-static struct codec_connection onyx_connections_reallineout[] = {
-       {
-               .connected = CC_SPEAKERS | CC_LINEOUT | CC_HEADPHONE,
-               .codec_bit = 0,
-       },
-       {
-               .connected = CC_DIGITALOUT,
-               .codec_bit = 1,
-       },
-       {
-               .connected = CC_LINEIN,
-               .codec_bit = 2,
-       },
-       {} /* terminate array by .connected == 0 */
-};
-
-/* tas on machines without line out */
-static struct codec_connection tas_connections_nolineout[] = {
-       {
-               .connected = CC_SPEAKERS | CC_HEADPHONE,
-               .codec_bit = 0,
-       },
-       {
-               .connected = CC_LINEIN,
-               .codec_bit = 2,
-       },
-       {
-               .connected = CC_MICROPHONE,
-               .codec_bit = 3,
-       },
-       {} /* terminate array by .connected == 0 */
-};
-
-/* tas on machines with neither line out nor line in */
-static struct codec_connection tas_connections_noline[] = {
-       {
-               .connected = CC_SPEAKERS | CC_HEADPHONE,
-               .codec_bit = 0,
-       },
-       {
-               .connected = CC_MICROPHONE,
-               .codec_bit = 3,
-       },
-       {} /* terminate array by .connected == 0 */
-};
-
-/* tas on machines without microphone */
-static struct codec_connection tas_connections_nomic[] = {
-       {
-               .connected = CC_SPEAKERS | CC_HEADPHONE | CC_LINEOUT,
-               .codec_bit = 0,
-       },
-       {
-               .connected = CC_LINEIN,
-               .codec_bit = 2,
-       },
-       {} /* terminate array by .connected == 0 */
-};
-
-/* tas on machines with everything connected */
-static struct codec_connection tas_connections_all[] = {
-       {
-               .connected = CC_SPEAKERS | CC_HEADPHONE | CC_LINEOUT,
-               .codec_bit = 0,
-       },
-       {
-               .connected = CC_LINEIN,
-               .codec_bit = 2,
-       },
-       {
-               .connected = CC_MICROPHONE,
-               .codec_bit = 3,
-       },
-       {} /* terminate array by .connected == 0 */
-};
-
-static struct codec_connection toonie_connections[] = {
-       {
-               .connected = CC_SPEAKERS | CC_HEADPHONE,
-               .codec_bit = 0,
-       },
-       {} /* terminate array by .connected == 0 */
-};
-
-static struct codec_connection topaz_input[] = {
-       {
-               .connected = CC_DIGITALIN,
-               .codec_bit = 0,
-       },
-       {} /* terminate array by .connected == 0 */
-};
-
-static struct codec_connection topaz_output[] = {
-       {
-               .connected = CC_DIGITALOUT,
-               .codec_bit = 1,
-       },
-       {} /* terminate array by .connected == 0 */
-};
-
-static struct codec_connection topaz_inout[] = {
-       {
-               .connected = CC_DIGITALIN,
-               .codec_bit = 0,
-       },
-       {
-               .connected = CC_DIGITALOUT,
-               .codec_bit = 1,
-       },
-       {} /* terminate array by .connected == 0 */
-};
-
-static struct layout layouts[] = {
-       /* last PowerBooks (15" Oct 2005) */
-       { .layout_id = 82,
-         .flags = LAYOUT_FLAG_COMBO_LINEOUT_SPDIF,
-         .codecs[0] = {
-               .name = "onyx",
-               .connections = onyx_connections_noheadphones,
-         },
-         .codecs[1] = {
-               .name = "topaz",
-               .connections = topaz_input,
-         },
-       },
-       /* PowerMac9,1 */
-       { .layout_id = 60,
-         .codecs[0] = {
-               .name = "onyx",
-               .connections = onyx_connections_reallineout,
-         },
-       },
-       /* PowerMac9,1 */
-       { .layout_id = 61,
-         .codecs[0] = {
-               .name = "topaz",
-               .connections = topaz_input,
-         },
-       },
-       /* PowerBook5,7 */
-       { .layout_id = 64,
-         .flags = LAYOUT_FLAG_COMBO_LINEOUT_SPDIF,
-         .codecs[0] = {
-               .name = "onyx",
-               .connections = onyx_connections_noheadphones,
-         },
-       },
-       /* PowerBook5,7 */
-       { .layout_id = 65,
-         .codecs[0] = {
-               .name = "topaz",
-               .connections = topaz_input,
-         },
-       },
-       /* PowerBook5,9 [17" Oct 2005] */
-       { .layout_id = 84,
-         .flags = LAYOUT_FLAG_COMBO_LINEOUT_SPDIF,
-         .codecs[0] = {
-               .name = "onyx",
-               .connections = onyx_connections_noheadphones,
-         },
-         .codecs[1] = {
-               .name = "topaz",
-               .connections = topaz_input,
-         },
-       },
-       /* PowerMac8,1 */
-       { .layout_id = 45,
-         .codecs[0] = {
-               .name = "onyx",
-               .connections = onyx_connections_noheadphones,
-         },
-         .codecs[1] = {
-               .name = "topaz",
-               .connections = topaz_input,
-         },
-       },
-       /* Quad PowerMac (analog in, analog/digital out) */
-       { .layout_id = 68,
-         .codecs[0] = {
-               .name = "onyx",
-               .connections = onyx_connections_nomic,
-         },
-       },
-       /* Quad PowerMac (digital in) */
-       { .layout_id = 69,
-         .codecs[0] = {
-               .name = "topaz",
-               .connections = topaz_input,
-         },
-         .busname = "digital in", .pcmid = 1 },
-       /* Early 2005 PowerBook (PowerBook 5,6) */
-       { .layout_id = 70,
-         .codecs[0] = {
-               .name = "tas",
-               .connections = tas_connections_nolineout,
-         },
-       },
-       /* PowerBook 5,4 */
-       { .layout_id = 51,
-         .codecs[0] = {
-               .name = "tas",
-               .connections = tas_connections_nolineout,
-         },
-       },
-       /* PowerBook6,7 */
-       { .layout_id = 80,
-         .codecs[0] = {
-               .name = "tas",
-               .connections = tas_connections_noline,
-         },
-       },
-       /* PowerBook6,8 */
-       { .layout_id = 72,
-         .codecs[0] = {
-               .name = "tas",
-               .connections = tas_connections_nolineout,
-         },
-       },
-       /* PowerMac8,2 */
-       { .layout_id = 86,
-         .codecs[0] = {
-               .name = "onyx",
-               .connections = onyx_connections_nomic,
-         },
-         .codecs[1] = {
-               .name = "topaz",
-               .connections = topaz_input,
-         },
-       },
-       /* PowerBook6,7 */
-       { .layout_id = 92,
-         .codecs[0] = {
-               .name = "tas",
-               .connections = tas_connections_nolineout,
-         },
-       },
-       /* PowerMac10,1 (Mac Mini) */
-       { .layout_id = 58,
-         .codecs[0] = {
-               .name = "toonie",
-               .connections = toonie_connections,
-         },
-       },
-       {
-         .layout_id = 96,
-         .codecs[0] = {
-               .name = "onyx",
-               .connections = onyx_connections_noheadphones,
-         },
-       },
-       /* unknown, untested, but this comes from Apple */
-       { .layout_id = 41,
-         .codecs[0] = {
-               .name = "tas",
-               .connections = tas_connections_all,
-         },
-       },
-       { .layout_id = 36,
-         .codecs[0] = {
-               .name = "tas",
-               .connections = tas_connections_nomic,
-         },
-         .codecs[1] = {
-               .name = "topaz",
-               .connections = topaz_inout,
-         },
-       },
-       { .layout_id = 47,
-         .codecs[0] = {
-               .name = "onyx",
-               .connections = onyx_connections_noheadphones,
-         },
-       },
-       { .layout_id = 48,
-         .codecs[0] = {
-               .name = "topaz",
-               .connections = topaz_input,
-         },
-       },
-       { .layout_id = 49,
-         .codecs[0] = {
-               .name = "onyx",
-               .connections = onyx_connections_nomic,
-         },
-       },
-       { .layout_id = 50,
-         .codecs[0] = {
-               .name = "topaz",
-               .connections = topaz_input,
-         },
-       },
-       { .layout_id = 56,
-         .codecs[0] = {
-               .name = "onyx",
-               .connections = onyx_connections_noheadphones,
-         },
-       },
-       { .layout_id = 57,
-         .codecs[0] = {
-               .name = "topaz",
-               .connections = topaz_input,
-         },
-       },
-       { .layout_id = 62,
-         .codecs[0] = {
-               .name = "onyx",
-               .connections = onyx_connections_noheadphones,
-         },
-         .codecs[1] = {
-               .name = "topaz",
-               .connections = topaz_output,
-         },
-       },
-       { .layout_id = 66,
-         .codecs[0] = {
-               .name = "onyx",
-               .connections = onyx_connections_noheadphones,
-         },
-       },
-       { .layout_id = 67,
-         .codecs[0] = {
-               .name = "topaz",
-               .connections = topaz_input,
-         },
-       },
-       { .layout_id = 76,
-         .codecs[0] = {
-               .name = "tas",
-               .connections = tas_connections_nomic,
-         },
-         .codecs[1] = {
-               .name = "topaz",
-               .connections = topaz_inout,
-         },
-       },
-       { .layout_id = 90,
-         .codecs[0] = {
-               .name = "tas",
-               .connections = tas_connections_noline,
-         },
-       },
-       { .layout_id = 94,
-         .codecs[0] = {
-               .name = "onyx",
-               /* but it has an external mic?? how to select? */
-               .connections = onyx_connections_noheadphones,
-         },
-       },
-       { .layout_id = 98,
-         .codecs[0] = {
-               .name = "toonie",
-               .connections = toonie_connections,
-         },
-       },
-       { .layout_id = 100,
-         .codecs[0] = {
-               .name = "topaz",
-               .connections = topaz_input,
-         },
-         .codecs[1] = {
-               .name = "onyx",
-               .connections = onyx_connections_noheadphones,
-         },
-       },
-       {}
-};
-
-static struct layout *find_layout_by_id(unsigned int id)
-{
-       struct layout *l;
-
-       l = layouts;
-       while (l->layout_id) {
-               if (l->layout_id == id)
-                       return l;
-               l++;
-       }
-       return NULL;
-}
-
-static void use_layout(struct layout *l)
-{
-       int i;
-
-       for (i=0; i<MAX_CODECS_PER_BUS; i++) {
-               if (l->codecs[i].name) {
-                       request_module("snd-aoa-codec-%s", l->codecs[i].name);
-               }
-       }
-       /* now we wait for the codecs to call us back */
-}
-
-struct layout_dev;
-
-struct layout_dev_ptr {
-       struct layout_dev *ptr;
-};
-
-struct layout_dev {
-       struct list_head list;
-       struct soundbus_dev *sdev;
-       struct device_node *sound;
-       struct aoa_codec *codecs[MAX_CODECS_PER_BUS];
-       struct layout *layout;
-       struct gpio_runtime gpio;
-
-       /* we need these for headphone/lineout detection */
-       struct snd_kcontrol *headphone_ctrl;
-       struct snd_kcontrol *lineout_ctrl;
-       struct snd_kcontrol *speaker_ctrl;
-       struct snd_kcontrol *headphone_detected_ctrl;
-       struct snd_kcontrol *lineout_detected_ctrl;
-
-       struct layout_dev_ptr selfptr_headphone;
-       struct layout_dev_ptr selfptr_lineout;
-
-       u32 have_lineout_detect:1,
-           have_headphone_detect:1,
-           switch_on_headphone:1,
-           switch_on_lineout:1;
-};
-
-static LIST_HEAD(layouts_list);
-static int layouts_list_items;
-/* this can go away but only if we allow multiple cards,
- * make the fabric handle all the card stuff, etc... */
-static struct layout_dev *layout_device;
-
-#define control_info   snd_ctl_boolean_mono_info
-
-#define AMP_CONTROL(n, description)                                    \
-static int n##_control_get(struct snd_kcontrol *kcontrol,              \
-                          struct snd_ctl_elem_value *ucontrol)         \
-{                                                                      \
-       struct gpio_runtime *gpio = snd_kcontrol_chip(kcontrol);        \
-       if (gpio->methods && gpio->methods->get_##n)                    \
-               ucontrol->value.integer.value[0] =                      \
-                       gpio->methods->get_##n(gpio);                   \
-       return 0;                                                       \
-}                                                                      \
-static int n##_control_put(struct snd_kcontrol *kcontrol,              \
-                          struct snd_ctl_elem_value *ucontrol)         \
-{                                                                      \
-       struct gpio_runtime *gpio = snd_kcontrol_chip(kcontrol);        \
-       if (gpio->methods && gpio->methods->get_##n)                    \
-               gpio->methods->set_##n(gpio,                            \
-                       !!ucontrol->value.integer.value[0]);            \
-       return 1;                                                       \
-}                                                                      \
-static struct snd_kcontrol_new n##_ctl = {                             \
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,                            \
-       .name = description,                                            \
-       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,                      \
-       .info = control_info,                                           \
-       .get = n##_control_get,                                         \
-       .put = n##_control_put,                                         \
-}
-
-AMP_CONTROL(headphone, "Headphone Switch");
-AMP_CONTROL(speakers, "Speakers Switch");
-AMP_CONTROL(lineout, "Line-Out Switch");
-
-static int detect_choice_get(struct snd_kcontrol *kcontrol,
-                            struct snd_ctl_elem_value *ucontrol)
-{
-       struct layout_dev *ldev = snd_kcontrol_chip(kcontrol);
-
-       switch (kcontrol->private_value) {
-       case 0:
-               ucontrol->value.integer.value[0] = ldev->switch_on_headphone;
-               break;
-       case 1:
-               ucontrol->value.integer.value[0] = ldev->switch_on_lineout;
-               break;
-       default:
-               return -ENODEV;
-       }
-       return 0;
-}
-
-static int detect_choice_put(struct snd_kcontrol *kcontrol,
-                            struct snd_ctl_elem_value *ucontrol)
-{
-       struct layout_dev *ldev = snd_kcontrol_chip(kcontrol);
-
-       switch (kcontrol->private_value) {
-       case 0:
-               ldev->switch_on_headphone = !!ucontrol->value.integer.value[0];
-               break;
-       case 1:
-               ldev->switch_on_lineout = !!ucontrol->value.integer.value[0];
-               break;
-       default:
-               return -ENODEV;
-       }
-       return 1;
-}
-
-static struct snd_kcontrol_new headphone_detect_choice = {
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-       .name = "Headphone Detect Autoswitch",
-       .info = control_info,
-       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
-       .get = detect_choice_get,
-       .put = detect_choice_put,
-       .private_value = 0,
-};
-
-static struct snd_kcontrol_new lineout_detect_choice = {
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-       .name = "Line-Out Detect Autoswitch",
-       .info = control_info,
-       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
-       .get = detect_choice_get,
-       .put = detect_choice_put,
-       .private_value = 1,
-};
-
-static int detected_get(struct snd_kcontrol *kcontrol,
-                       struct snd_ctl_elem_value *ucontrol)
-{
-       struct layout_dev *ldev = snd_kcontrol_chip(kcontrol);
-       int v;
-
-       switch (kcontrol->private_value) {
-       case 0:
-               v = ldev->gpio.methods->get_detect(&ldev->gpio,
-                                                  AOA_NOTIFY_HEADPHONE);
-               break;
-       case 1:
-               v = ldev->gpio.methods->get_detect(&ldev->gpio,
-                                                  AOA_NOTIFY_LINE_OUT);
-               break;
-       default:
-               return -ENODEV;
-       }
-       ucontrol->value.integer.value[0] = v;
-       return 0;
-}
-
-static struct snd_kcontrol_new headphone_detected = {
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-       .name = "Headphone Detected",
-       .info = control_info,
-       .access = SNDRV_CTL_ELEM_ACCESS_READ,
-       .get = detected_get,
-       .private_value = 0,
-};
-
-static struct snd_kcontrol_new lineout_detected = {
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-       .name = "Line-Out Detected",
-       .info = control_info,
-       .access = SNDRV_CTL_ELEM_ACCESS_READ,
-       .get = detected_get,
-       .private_value = 1,
-};
-
-static int check_codec(struct aoa_codec *codec,
-                      struct layout_dev *ldev,
-                      struct codec_connect_info *cci)
-{
-       const u32 *ref;
-       char propname[32];
-       struct codec_connection *cc;
-
-       /* if the codec has a 'codec' node, we require a reference */
-       if (codec->node && (strcmp(codec->node->name, "codec") == 0)) {
-               snprintf(propname, sizeof(propname),
-                        "platform-%s-codec-ref", codec->name);
-               ref = of_get_property(ldev->sound, propname, NULL);
-               if (!ref) {
-                       printk(KERN_INFO "snd-aoa-fabric-layout: "
-                               "required property %s not present\n", propname);
-                       return -ENODEV;
-               }
-               if (*ref != codec->node->linux_phandle) {
-                       printk(KERN_INFO "snd-aoa-fabric-layout: "
-                               "%s doesn't match!\n", propname);
-                       return -ENODEV;
-               }
-       } else {
-               if (layouts_list_items != 1) {
-                       printk(KERN_INFO "snd-aoa-fabric-layout: "
-                               "more than one soundbus, but no references.\n");
-                       return -ENODEV;
-               }
-       }
-       codec->soundbus_dev = ldev->sdev;
-       codec->gpio = &ldev->gpio;
-
-       cc = cci->connections;
-       if (!cc)
-               return -EINVAL;
-
-       printk(KERN_INFO "snd-aoa-fabric-layout: can use this codec\n");
-
-       codec->connected = 0;
-       codec->fabric_data = cc;
-
-       while (cc->connected) {
-               codec->connected |= 1<<cc->codec_bit;
-               cc++;
-       }
-
-       return 0;
-}
-
-static int layout_found_codec(struct aoa_codec *codec)
-{
-       struct layout_dev *ldev;
-       int i;
-
-       list_for_each_entry(ldev, &layouts_list, list) {
-               for (i=0; i<MAX_CODECS_PER_BUS; i++) {
-                       if (!ldev->layout->codecs[i].name)
-                               continue;
-                       if (strcmp(ldev->layout->codecs[i].name, codec->name) == 0) {
-                               if (check_codec(codec,
-                                               ldev,
-                                               &ldev->layout->codecs[i]) == 0)
-                                       return 0;
-                       }
-               }
-       }
-       return -ENODEV;
-}
-
-static void layout_remove_codec(struct aoa_codec *codec)
-{
-       int i;
-       /* here remove the codec from the layout dev's
-        * codec reference */
-
-       codec->soundbus_dev = NULL;
-       codec->gpio = NULL;
-       for (i=0; i<MAX_CODECS_PER_BUS; i++) {
-       }
-}
-
-static void layout_notify(void *data)
-{
-       struct layout_dev_ptr *dptr = data;
-       struct layout_dev *ldev;
-       int v, update;
-       struct snd_kcontrol *detected, *c;
-       struct snd_card *card = aoa_get_card();
-
-       ldev = dptr->ptr;
-       if (data == &ldev->selfptr_headphone) {
-               v = ldev->gpio.methods->get_detect(&ldev->gpio, AOA_NOTIFY_HEADPHONE);
-               detected = ldev->headphone_detected_ctrl;
-               update = ldev->switch_on_headphone;
-               if (update) {
-                       ldev->gpio.methods->set_speakers(&ldev->gpio, !v);
-                       ldev->gpio.methods->set_headphone(&ldev->gpio, v);
-                       ldev->gpio.methods->set_lineout(&ldev->gpio, 0);
-               }
-       } else if (data == &ldev->selfptr_lineout) {
-               v = ldev->gpio.methods->get_detect(&ldev->gpio, AOA_NOTIFY_LINE_OUT);
-               detected = ldev->lineout_detected_ctrl;
-               update = ldev->switch_on_lineout;
-               if (update) {
-                       ldev->gpio.methods->set_speakers(&ldev->gpio, !v);
-                       ldev->gpio.methods->set_headphone(&ldev->gpio, 0);
-                       ldev->gpio.methods->set_lineout(&ldev->gpio, v);
-               }
-       } else
-               return;
-
-       if (detected)
-               snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &detected->id);
-       if (update) {
-               c = ldev->headphone_ctrl;
-               if (c)
-                       snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &c->id);
-               c = ldev->speaker_ctrl;
-               if (c)
-                       snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &c->id);
-               c = ldev->lineout_ctrl;
-               if (c)
-                       snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &c->id);
-       }
-}
-
-static void layout_attached_codec(struct aoa_codec *codec)
-{
-       struct codec_connection *cc;
-       struct snd_kcontrol *ctl;
-       int headphones, lineout;
-       struct layout_dev *ldev = layout_device;
-
-       /* need to add this codec to our codec array! */
-
-       cc = codec->fabric_data;
-
-       headphones = codec->gpio->methods->get_detect(codec->gpio,
-                                                     AOA_NOTIFY_HEADPHONE);
-       lineout = codec->gpio->methods->get_detect(codec->gpio,
-                                                  AOA_NOTIFY_LINE_OUT);
-
-       while (cc->connected) {
-               if (cc->connected & CC_SPEAKERS) {
-                       if (headphones <= 0 && lineout <= 0)
-                               ldev->gpio.methods->set_speakers(codec->gpio, 1);
-                       ctl = snd_ctl_new1(&speakers_ctl, codec->gpio);
-                       ldev->speaker_ctrl = ctl;
-                       aoa_snd_ctl_add(ctl);
-               }
-               if (cc->connected & CC_HEADPHONE) {
-                       if (headphones == 1)
-                               ldev->gpio.methods->set_headphone(codec->gpio, 1);
-                       ctl = snd_ctl_new1(&headphone_ctl, codec->gpio);
-                       ldev->headphone_ctrl = ctl;
-                       aoa_snd_ctl_add(ctl);
-                       ldev->have_headphone_detect =
-                               !ldev->gpio.methods
-                                       ->set_notify(&ldev->gpio,
-                                                    AOA_NOTIFY_HEADPHONE,
-                                                    layout_notify,
-                                                    &ldev->selfptr_headphone);
-                       if (ldev->have_headphone_detect) {
-                               ctl = snd_ctl_new1(&headphone_detect_choice,
-                                                  ldev);
-                               aoa_snd_ctl_add(ctl);
-                               ctl = snd_ctl_new1(&headphone_detected,
-                                                  ldev);
-                               ldev->headphone_detected_ctrl = ctl;
-                               aoa_snd_ctl_add(ctl);
-                       }
-               }
-               if (cc->connected & CC_LINEOUT) {
-                       if (lineout == 1)
-                               ldev->gpio.methods->set_lineout(codec->gpio, 1);
-                       ctl = snd_ctl_new1(&lineout_ctl, codec->gpio);
-                       if (cc->connected & CC_LINEOUT_LABELLED_HEADPHONE)
-                               strlcpy(ctl->id.name,
-                                       "Headphone Switch", sizeof(ctl->id.name));
-                       ldev->lineout_ctrl = ctl;
-                       aoa_snd_ctl_add(ctl);
-                       ldev->have_lineout_detect =
-                               !ldev->gpio.methods
-                                       ->set_notify(&ldev->gpio,
-                                                    AOA_NOTIFY_LINE_OUT,
-                                                    layout_notify,
-                                                    &ldev->selfptr_lineout);
-                       if (ldev->have_lineout_detect) {
-                               ctl = snd_ctl_new1(&lineout_detect_choice,
-                                                  ldev);
-                               if (cc->connected & CC_LINEOUT_LABELLED_HEADPHONE)
-                                       strlcpy(ctl->id.name,
-                                               "Headphone Detect Autoswitch",
-                                               sizeof(ctl->id.name));
-                               aoa_snd_ctl_add(ctl);
-                               ctl = snd_ctl_new1(&lineout_detected,
-                                                  ldev);
-                               if (cc->connected & CC_LINEOUT_LABELLED_HEADPHONE)
-                                       strlcpy(ctl->id.name,
-                                               "Headphone Detected",
-                                               sizeof(ctl->id.name));
-                               ldev->lineout_detected_ctrl = ctl;
-                               aoa_snd_ctl_add(ctl);
-                       }
-               }
-               cc++;
-       }
-       /* now update initial state */
-       if (ldev->have_headphone_detect)
-               layout_notify(&ldev->selfptr_headphone);
-       if (ldev->have_lineout_detect)
-               layout_notify(&ldev->selfptr_lineout);
-}
-
-static struct aoa_fabric layout_fabric = {
-       .name = "SoundByLayout",
-       .owner = THIS_MODULE,
-       .found_codec = layout_found_codec,
-       .remove_codec = layout_remove_codec,
-       .attached_codec = layout_attached_codec,
-};
-
-static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
-{
-       struct device_node *sound = NULL;
-       const unsigned int *layout_id;
-       struct layout *layout;
-       struct layout_dev *ldev = NULL;
-       int err;
-
-       /* hm, currently we can only have one ... */
-       if (layout_device)
-               return -ENODEV;
-
-       /* by breaking out we keep a reference */
-       while ((sound = of_get_next_child(sdev->ofdev.node, sound))) {
-               if (sound->type && strcasecmp(sound->type, "soundchip") == 0)
-                       break;
-       }
-       if (!sound) return -ENODEV;
-
-       layout_id = of_get_property(sound, "layout-id", NULL);
-       if (!layout_id)
-               goto outnodev;
-       printk(KERN_INFO "snd-aoa-fabric-layout: found bus with layout %d\n",
-              *layout_id);
-
-       layout = find_layout_by_id(*layout_id);
-       if (!layout) {
-               printk(KERN_ERR "snd-aoa-fabric-layout: unknown layout\n");
-               goto outnodev;
-       }
-
-       ldev = kzalloc(sizeof(struct layout_dev), GFP_KERNEL);
-       if (!ldev)
-               goto outnodev;
-
-       layout_device = ldev;
-       ldev->sdev = sdev;
-       ldev->sound = sound;
-       ldev->layout = layout;
-       ldev->gpio.node = sound->parent;
-       switch (layout->layout_id) {
-       case 41: /* that unknown machine no one seems to have */
-       case 51: /* PowerBook5,4 */
-       case 58: /* Mac Mini */
-               ldev->gpio.methods = ftr_gpio_methods;
-               printk(KERN_DEBUG
-                      "snd-aoa-fabric-layout: Using direct GPIOs\n");
-               break;
-       default:
-               ldev->gpio.methods = pmf_gpio_methods;
-               printk(KERN_DEBUG
-                      "snd-aoa-fabric-layout: Using PMF GPIOs\n");
-       }
-       ldev->selfptr_headphone.ptr = ldev;
-       ldev->selfptr_lineout.ptr = ldev;
-       sdev->ofdev.dev.driver_data = ldev;
-       list_add(&ldev->list, &layouts_list);
-       layouts_list_items++;
-
-       /* assign these before registering ourselves, so
-        * callbacks that are done during registration
-        * already have the values */
-       sdev->pcmid = ldev->layout->pcmid;
-       if (ldev->layout->busname) {
-               sdev->pcmname = ldev->layout->busname;
-       } else {
-               sdev->pcmname = "Master";
-       }
-
-       ldev->gpio.methods->init(&ldev->gpio);
-
-       err = aoa_fabric_register(&layout_fabric, &sdev->ofdev.dev);
-       if (err && err != -EALREADY) {
-               printk(KERN_INFO "snd-aoa-fabric-layout: can't use,"
-                                " another fabric is active!\n");
-               goto outlistdel;
-       }
-
-       use_layout(layout);
-       ldev->switch_on_headphone = 1;
-       ldev->switch_on_lineout = 1;
-       return 0;
- outlistdel:
-       /* we won't be using these then... */
-       ldev->gpio.methods->exit(&ldev->gpio);
-       /* reset if we didn't use it */
-       sdev->pcmname = NULL;
-       sdev->pcmid = -1;
-       list_del(&ldev->list);
-       layouts_list_items--;
- outnodev:
-       of_node_put(sound);
-       layout_device = NULL;
-       kfree(ldev);
-       return -ENODEV;
-}
-
-static int aoa_fabric_layout_remove(struct soundbus_dev *sdev)
-{
-       struct layout_dev *ldev = sdev->ofdev.dev.driver_data;
-       int i;
-
-       for (i=0; i<MAX_CODECS_PER_BUS; i++) {
-               if (ldev->codecs[i]) {
-                       aoa_fabric_unlink_codec(ldev->codecs[i]);
-               }
-               ldev->codecs[i] = NULL;
-       }
-       list_del(&ldev->list);
-       layouts_list_items--;
-       of_node_put(ldev->sound);
-
-       ldev->gpio.methods->set_notify(&ldev->gpio,
-                                      AOA_NOTIFY_HEADPHONE,
-                                      NULL,
-                                      NULL);
-       ldev->gpio.methods->set_notify(&ldev->gpio,
-                                      AOA_NOTIFY_LINE_OUT,
-                                      NULL,
-                                      NULL);
-
-       ldev->gpio.methods->exit(&ldev->gpio);
-       layout_device = NULL;
-       kfree(ldev);
-       sdev->pcmid = -1;
-       sdev->pcmname = NULL;
-       return 0;
-}
-
-#ifdef CONFIG_PM
-static int aoa_fabric_layout_suspend(struct soundbus_dev *sdev, pm_message_t state)
-{
-       struct layout_dev *ldev = sdev->ofdev.dev.driver_data;
-
-       if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off)
-               ldev->gpio.methods->all_amps_off(&ldev->gpio);
-
-       return 0;
-}
-
-static int aoa_fabric_layout_resume(struct soundbus_dev *sdev)
-{
-       struct layout_dev *ldev = sdev->ofdev.dev.driver_data;
-
-       if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off)
-               ldev->gpio.methods->all_amps_restore(&ldev->gpio);
-
-       return 0;
-}
-#endif
-
-static struct soundbus_driver aoa_soundbus_driver = {
-       .name = "snd_aoa_soundbus_drv",
-       .owner = THIS_MODULE,
-       .probe = aoa_fabric_layout_probe,
-       .remove = aoa_fabric_layout_remove,
-#ifdef CONFIG_PM
-       .suspend = aoa_fabric_layout_suspend,
-       .resume = aoa_fabric_layout_resume,
-#endif
-       .driver = {
-               .owner = THIS_MODULE,
-       }
-};
-
-static int __init aoa_fabric_layout_init(void)
-{
-       int err;
-
-       err = soundbus_register_driver(&aoa_soundbus_driver);
-       if (err)
-               return err;
-       return 0;
-}
-
-static void __exit aoa_fabric_layout_exit(void)
-{
-       soundbus_unregister_driver(&aoa_soundbus_driver);
-       aoa_fabric_unregister(&layout_fabric);
-}
-
-module_init(aoa_fabric_layout_init);
-module_exit(aoa_fabric_layout_exit);
diff --git a/sound/aoa/soundbus/i2sbus/Makefile b/sound/aoa/soundbus/i2sbus/Makefile

index e57a5cf65655b4eee4f4a2f162c77a0a3380c0ba..1b949b2a402814d021febb71349a43370a6f5af4 100644 (file)
--- a/sound/aoa/soundbus/i2sbus/Makefile
+++ b/sound/aoa/soundbus/i2sbus/Makefile
@@ -1,2 +1,2 @@
  obj-$(CONFIG_SND_AOA_SOUNDBUS_I2S) += snd-aoa-i2sbus.o
-snd-aoa-i2sbus-objs := i2sbus-core.o i2sbus-pcm.o i2sbus-control.o
+snd-aoa-i2sbus-objs := core.o pcm.o control.o
diff --git a/sound/aoa/soundbus/i2sbus/control.c b/sound/aoa/soundbus/i2sbus/control.c

new file mode 100644 (file)

index 0000000..87beb4a
--- /dev/null
+++ b/sound/aoa/soundbus/i2sbus/control.c
@@ -0,0 +1,193 @@
+/*
+ * i2sbus driver -- bus control routines
+ *
+ * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
+ *
+ * GPL v2, can be found in COPYING.
+ */
+
+#include <linux/kernel.h>
+#include <linux/delay.h>
+
+#include <asm/io.h>
+#include <asm/prom.h>
+#include <asm/macio.h>
+#include <asm/pmac_feature.h>
+#include <asm/pmac_pfunc.h>
+#include <asm/keylargo.h>
+
+#include "i2sbus.h"
+
+int i2sbus_control_init(struct macio_dev* dev, struct i2sbus_control **c)
+{
+       *c = kzalloc(sizeof(struct i2sbus_control), GFP_KERNEL);
+       if (!*c)
+               return -ENOMEM;
+
+       INIT_LIST_HEAD(&(*c)->list);
+
+       (*c)->macio = dev->bus->chip;
+       return 0;
+}
+
+void i2sbus_control_destroy(struct i2sbus_control *c)
+{
+       kfree(c);
+}
+
+/* this is serialised externally */
+int i2sbus_control_add_dev(struct i2sbus_control *c,
+                          struct i2sbus_dev *i2sdev)
+{
+       struct device_node *np;
+
+       np = i2sdev->sound.ofdev.node;
+       i2sdev->enable = pmf_find_function(np, "enable");
+       i2sdev->cell_enable = pmf_find_function(np, "cell-enable");
+       i2sdev->clock_enable = pmf_find_function(np, "clock-enable");
+       i2sdev->cell_disable = pmf_find_function(np, "cell-disable");
+       i2sdev->clock_disable = pmf_find_function(np, "clock-disable");
+
+       /* if the bus number is not 0 or 1 we absolutely need to use
+        * the platform functions -- there's nothing in Darwin that
+        * would allow seeing a system behind what the FCRs are then,
+        * and I don't want to go parsing a bunch of platform functions
+        * by hand to try finding a system... */
+       if (i2sdev->bus_number != 0 && i2sdev->bus_number != 1 &&
+           (!i2sdev->enable ||
+            !i2sdev->cell_enable || !i2sdev->clock_enable ||
+            !i2sdev->cell_disable || !i2sdev->clock_disable)) {
+               pmf_put_function(i2sdev->enable);
+               pmf_put_function(i2sdev->cell_enable);
+               pmf_put_function(i2sdev->clock_enable);
+               pmf_put_function(i2sdev->cell_disable);
+               pmf_put_function(i2sdev->clock_disable);
+               return -ENODEV;
+       }
+
+       list_add(&i2sdev->item, &c->list);
+
+       return 0;
+}
+
+void i2sbus_control_remove_dev(struct i2sbus_control *c,
+                              struct i2sbus_dev *i2sdev)
+{
+       /* this is serialised externally */
+       list_del(&i2sdev->item);
+       if (list_empty(&c->list))
+               i2sbus_control_destroy(c);
+}
+
+int i2sbus_control_enable(struct i2sbus_control *c,
+                         struct i2sbus_dev *i2sdev)
+{
+       struct pmf_args args = { .count = 0 };
+       struct macio_chip *macio = c->macio;
+
+       if (i2sdev->enable)
+               return pmf_call_one(i2sdev->enable, &args);
+
+       if (macio == NULL || macio->base == NULL)
+               return -ENODEV;
+
+       switch (i2sdev->bus_number) {
+       case 0:
+               /* these need to be locked or done through
+                * newly created feature calls! */
+               MACIO_BIS(KEYLARGO_FCR1, KL1_I2S0_ENABLE);
+               break;
+       case 1:
+               MACIO_BIS(KEYLARGO_FCR1, KL1_I2S1_ENABLE);
+               break;
+       default:
+               return -ENODEV;
+       }
+       return 0;
+}
+
+int i2sbus_control_cell(struct i2sbus_control *c,
+                       struct i2sbus_dev *i2sdev,
+                       int enable)
+{
+       struct pmf_args args = { .count = 0 };
+       struct macio_chip *macio = c->macio;
+
+       switch (enable) {
+       case 0:
+               if (i2sdev->cell_disable)
+                       return pmf_call_one(i2sdev->cell_disable, &args);
+               break;
+       case 1:
+               if (i2sdev->cell_enable)
+                       return pmf_call_one(i2sdev->cell_enable, &args);
+               break;
+       default:
+               printk(KERN_ERR "i2sbus: INVALID CELL ENABLE VALUE\n");
+               return -ENODEV;
+       }
+
+       if (macio == NULL || macio->base == NULL)
+               return -ENODEV;
+
+       switch (i2sdev->bus_number) {
+       case 0:
+               if (enable)
+                       MACIO_BIS(KEYLARGO_FCR1, KL1_I2S0_CELL_ENABLE);
+               else
+                       MACIO_BIC(KEYLARGO_FCR1, KL1_I2S0_CELL_ENABLE);
+               break;
+       case 1:
+               if (enable)
+                       MACIO_BIS(KEYLARGO_FCR1, KL1_I2S1_CELL_ENABLE);
+               else
+                       MACIO_BIC(KEYLARGO_FCR1, KL1_I2S1_CELL_ENABLE);
+               break;
+       default:
+               return -ENODEV;
+       }
+       return 0;
+}
+
+int i2sbus_control_clock(struct i2sbus_control *c,
+                        struct i2sbus_dev *i2sdev,
+                        int enable)
+{
+       struct pmf_args args = { .count = 0 };
+       struct macio_chip *macio = c->macio;
+
+       switch (enable) {
+       case 0:
+               if (i2sdev->clock_disable)
+                       return pmf_call_one(i2sdev->clock_disable, &args);
+               break;
+       case 1:
+               if (i2sdev->clock_enable)
+                       return pmf_call_one(i2sdev->clock_enable, &args);
+               break;
+       default:
+               printk(KERN_ERR "i2sbus: INVALID CLOCK ENABLE VALUE\n");
+               return -ENODEV;
+       }
+
+       if (macio == NULL || macio->base == NULL)
+               return -ENODEV;
+
+       switch (i2sdev->bus_number) {
+       case 0:
+               if (enable)
+                       MACIO_BIS(KEYLARGO_FCR1, KL1_I2S0_CLK_ENABLE_BIT);
+               else
+                       MACIO_BIC(KEYLARGO_FCR1, KL1_I2S0_CLK_ENABLE_BIT);
+               break;
+       case 1:
+               if (enable)
+                       MACIO_BIS(KEYLARGO_FCR1, KL1_I2S1_CLK_ENABLE_BIT);
+               else
+                       MACIO_BIC(KEYLARGO_FCR1, KL1_I2S1_CLK_ENABLE_BIT);
+               break;
+       default:
+               return -ENODEV;
+       }
+       return 0;
+}
diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c

new file mode 100644 (file)

index 0000000..be468ed
--- /dev/null
+++ b/sound/aoa/soundbus/i2sbus/core.c
@@ -0,0 +1,450 @@
+/*
+ * i2sbus driver
+ *
+ * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
+ *
+ * GPL v2, can be found in COPYING.
+ */
+
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
+
+#include <sound/core.h>
+
+#include <asm/macio.h>
+#include <asm/dbdma.h>
+
+#include "../soundbus.h"
+#include "i2sbus.h"
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
+MODULE_DESCRIPTION("Apple Soundbus: I2S support");
+
+static int force;
+module_param(force, int, 0444);
+MODULE_PARM_DESC(force, "Force loading i2sbus even when"
+                       " no layout-id property is present");
+
+static struct of_device_id i2sbus_match[] = {
+       { .name = "i2s" },
+       { }
+};
+
+MODULE_DEVICE_TABLE(of, i2sbus_match);
+
+static int alloc_dbdma_descriptor_ring(struct i2sbus_dev *i2sdev,
+                                      struct dbdma_command_mem *r,
+                                      int numcmds)
+{
+       /* one more for rounding, one for branch back, one for stop command */
+       r->size = (numcmds + 3) * sizeof(struct dbdma_cmd);
+       /* We use the PCI APIs for now until the generic one gets fixed
+        * enough or until we get some macio-specific versions
+        */
+       r->space = dma_alloc_coherent(
+                       &macio_get_pci_dev(i2sdev->macio)->dev,
+                       r->size,
+                       &r->bus_addr,
+                       GFP_KERNEL);
+
+       if (!r->space) return -ENOMEM;
+
+       memset(r->space, 0, r->size);
+       r->cmds = (void*)DBDMA_ALIGN(r->space);
+       r->bus_cmd_start = r->bus_addr +
+                          (dma_addr_t)((char*)r->cmds - (char*)r->space);
+
+       return 0;
+}
+
+static void free_dbdma_descriptor_ring(struct i2sbus_dev *i2sdev,
+                                      struct dbdma_command_mem *r)
+{
+       if (!r->space) return;
+
+       dma_free_coherent(&macio_get_pci_dev(i2sdev->macio)->dev,
+                           r->size, r->space, r->bus_addr);
+}
+
+static void i2sbus_release_dev(struct device *dev)
+{
+       struct i2sbus_dev *i2sdev;
+       int i;
+
+       i2sdev = container_of(dev, struct i2sbus_dev, sound.ofdev.dev);
+
+       if (i2sdev->intfregs) iounmap(i2sdev->intfregs);
+       if (i2sdev->out.dbdma) iounmap(i2sdev->out.dbdma);
+       if (i2sdev->in.dbdma) iounmap(i2sdev->in.dbdma);
+       for (i = aoa_resource_i2smmio; i <= aoa_resource_rxdbdma; i++)
+               if (i2sdev->allocated_resource[i])
+                       release_and_free_resource(i2sdev->allocated_resource[i]);
+       free_dbdma_descriptor_ring(i2sdev, &i2sdev->out.dbdma_ring);
+       free_dbdma_descriptor_ring(i2sdev, &i2sdev->in.dbdma_ring);
+       for (i = aoa_resource_i2smmio; i <= aoa_resource_rxdbdma; i++)
+               free_irq(i2sdev->interrupts[i], i2sdev);
+       i2sbus_control_remove_dev(i2sdev->control, i2sdev);
+       mutex_destroy(&i2sdev->lock);
+       kfree(i2sdev);
+}
+
+static irqreturn_t i2sbus_bus_intr(int irq, void *devid)
+{
+       struct i2sbus_dev *dev = devid;
+       u32 intreg;
+
+       spin_lock(&dev->low_lock);
+       intreg = in_le32(&dev->intfregs->intr_ctl);
+
+       /* acknowledge interrupt reasons */
+       out_le32(&dev->intfregs->intr_ctl, intreg);
+
+       spin_unlock(&dev->low_lock);
+
+       return IRQ_HANDLED;
+}
+
+
+/*
+ * XXX FIXME: We test the layout_id's here to get the proper way of
+ * mapping in various registers, thanks to bugs in Apple device-trees.
+ * We could instead key off the machine model and the name of the i2s
+ * node (i2s-a). This we'll do when we move it all to macio_asic.c
+ * and have that export items for each sub-node too.
+ */
+static int i2sbus_get_and_fixup_rsrc(struct device_node *np, int index,
+                                    int layout, struct resource *res)
+{
+       struct device_node *parent;
+       int pindex, rc = -ENXIO;
+       const u32 *reg;
+
+       /* Machines with layout 76 and 36 (K2 based) have a weird device
+        * tree what we need to special case.
+        * Normal machines just fetch the resource from the i2s-X node.
+        * Darwin further divides normal machines into old and new layouts
+        * with a subtely different code path but that doesn't seem necessary
+        * in practice, they just bloated it. In addition, even on our K2
+        * case the i2s-modem node, if we ever want to handle it, uses the
+        * normal layout
+        */
+       if (layout != 76 && layout != 36)
+               return of_address_to_resource(np, index, res);
+
+       parent = of_get_parent(np);
+       pindex = (index == aoa_resource_i2smmio) ? 0 : 1;
+       rc = of_address_to_resource(parent, pindex, res);
+       if (rc)
+               goto bail;
+       reg = of_get_property(np, "reg", NULL);
+       if (reg == NULL) {
+               rc = -ENXIO;
+               goto bail;
+       }
+       res->start += reg[index * 2];
+       res->end = res->start + reg[index * 2 + 1] - 1;
+ bail:
+       of_node_put(parent);
+       return rc;
+}
+
+/* FIXME: look at device node refcounting */
+static int i2sbus_add_dev(struct macio_dev *macio,
+                         struct i2sbus_control *control,
+                         struct device_node *np)
+{
+       struct i2sbus_dev *dev;
+       struct device_node *child = NULL, *sound = NULL;
+       struct resource *r;
+       int i, layout = 0, rlen, ok = force;
+       static const char *rnames[] = { "i2sbus: %s (control)",
+                                       "i2sbus: %s (tx)",
+                                       "i2sbus: %s (rx)" };
+       static irq_handler_t ints[] = {
+               i2sbus_bus_intr,
+               i2sbus_tx_intr,
+               i2sbus_rx_intr
+       };
+
+       if (strlen(np->name) != 5)
+               return 0;
+       if (strncmp(np->name, "i2s-", 4))
+               return 0;
+
+       dev = kzalloc(sizeof(struct i2sbus_dev), GFP_KERNEL);
+       if (!dev)
+               return 0;
+
+       i = 0;
+       while ((child = of_get_next_child(np, child))) {
+               if (strcmp(child->name, "sound") == 0) {
+                       i++;
+                       sound = child;
+               }
+       }
+       if (i == 1) {
+               const u32 *layout_id =
+                       of_get_property(sound, "layout-id", NULL);
+               if (layout_id) {
+                       layout = *layout_id;
+                       snprintf(dev->sound.modalias, 32,
+                                "sound-layout-%d", layout);
+                       ok = 1;
+               }
+       }
+       /* for the time being, until we can handle non-layout-id
+        * things in some fabric, refuse to attach if there is no
+        * layout-id property or we haven't been forced to attach.
+        * When there are two i2s busses and only one has a layout-id,
+        * then this depends on the order, but that isn't important
+        * either as the second one in that case is just a modem. */
+       if (!ok) {
+               kfree(dev);
+               return -ENODEV;
+       }
+
+       mutex_init(&dev->lock);
+       spin_lock_init(&dev->low_lock);
+       dev->sound.ofdev.node = np;
+       dev->sound.ofdev.dma_mask = macio->ofdev.dma_mask;
+       dev->sound.ofdev.dev.dma_mask = &dev->sound.ofdev.dma_mask;
+       dev->sound.ofdev.dev.parent = &macio->ofdev.dev;
+       dev->sound.ofdev.dev.release = i2sbus_release_dev;
+       dev->sound.attach_codec = i2sbus_attach_codec;
+       dev->sound.detach_codec = i2sbus_detach_codec;
+       dev->sound.pcmid = -1;
+       dev->macio = macio;
+       dev->control = control;
+       dev->bus_number = np->name[4] - 'a';
+       INIT_LIST_HEAD(&dev->sound.codec_list);
+
+       for (i = aoa_resource_i2smmio; i <= aoa_resource_rxdbdma; i++) {
+               dev->interrupts[i] = -1;
+               snprintf(dev->rnames[i], sizeof(dev->rnames[i]),
+                        rnames[i], np->name);
+       }
+       for (i = aoa_resource_i2smmio; i <= aoa_resource_rxdbdma; i++) {
+               int irq = irq_of_parse_and_map(np, i);
+               if (request_irq(irq, ints[i], 0, dev->rnames[i], dev))
+                       goto err;
+               dev->interrupts[i] = irq;
+       }
+
+
+       /* Resource handling is problematic as some device-trees contain
+        * useless crap (ugh ugh ugh). We work around that here by calling
+        * specific functions for calculating the appropriate resources.
+        *
+        * This will all be moved to macio_asic.c at one point
+        */
+       for (i = aoa_resource_i2smmio; i <= aoa_resource_rxdbdma; i++) {
+               if (i2sbus_get_and_fixup_rsrc(np,i,layout,&dev->resources[i]))
+                       goto err;
+               /* If only we could use our resource dev->resources[i]...
+                * but request_resource doesn't know about parents and
+                * contained resources...
+                */
+               dev->allocated_resource[i] =
+                       request_mem_region(dev->resources[i].start,
+                                          dev->resources[i].end -
+                                          dev->resources[i].start + 1,
+                                          dev->rnames[i]);
+               if (!dev->allocated_resource[i]) {
+                       printk(KERN_ERR "i2sbus: failed to claim resource %d!\n", i);
+                       goto err;
+               }
+       }
+
+       r = &dev->resources[aoa_resource_i2smmio];
+       rlen = r->end - r->start + 1;
+       if (rlen < sizeof(struct i2s_interface_regs))
+               goto err;
+       dev->intfregs = ioremap(r->start, rlen);
+
+       r = &dev->resources[aoa_resource_txdbdma];
+       rlen = r->end - r->start + 1;
+       if (rlen < sizeof(struct dbdma_regs))
+               goto err;
+       dev->out.dbdma = ioremap(r->start, rlen);
+
+       r = &dev->resources[aoa_resource_rxdbdma];
+       rlen = r->end - r->start + 1;
+       if (rlen < sizeof(struct dbdma_regs))
+               goto err;
+       dev->in.dbdma = ioremap(r->start, rlen);
+
+       if (!dev->intfregs || !dev->out.dbdma || !dev->in.dbdma)
+               goto err;
+
+       if (alloc_dbdma_descriptor_ring(dev, &dev->out.dbdma_ring,
+                                       MAX_DBDMA_COMMANDS))
+               goto err;
+       if (alloc_dbdma_descriptor_ring(dev, &dev->in.dbdma_ring,
+                                       MAX_DBDMA_COMMANDS))
+               goto err;
+
+       if (i2sbus_control_add_dev(dev->control, dev)) {
+               printk(KERN_ERR "i2sbus: control layer didn't like bus\n");
+               goto err;
+       }
+
+       if (soundbus_add_one(&dev->sound)) {
+               printk(KERN_DEBUG "i2sbus: device registration error!\n");
+               goto err;
+       }
+
+       /* enable this cell */
+       i2sbus_control_cell(dev->control, dev, 1);
+       i2sbus_control_enable(dev->control, dev);
+       i2sbus_control_clock(dev->control, dev, 1);
+
+       return 1;
+ err:
+       for (i=0;i<3;i++)
+               if (dev->interrupts[i] != -1)
+                       free_irq(dev->interrupts[i], dev);
+       free_dbdma_descriptor_ring(dev, &dev->out.dbdma_ring);
+       free_dbdma_descriptor_ring(dev, &dev->in.dbdma_ring);
+       if (dev->intfregs) iounmap(dev->intfregs);
+       if (dev->out.dbdma) iounmap(dev->out.dbdma);
+       if (dev->in.dbdma) iounmap(dev->in.dbdma);
+       for (i=0;i<3;i++)
+               if (dev->allocated_resource[i])
+                       release_and_free_resource(dev->allocated_resource[i]);
+       mutex_destroy(&dev->lock);
+       kfree(dev);
+       return 0;
+}
+
+static int i2sbus_probe(struct macio_dev* dev, const struct of_device_id *match)
+{
+       struct device_node *np = NULL;
+       int got = 0, err;
+       struct i2sbus_control *control = NULL;
+
+       err = i2sbus_control_init(dev, &control);
+       if (err)
+               return err;
+       if (!control) {
+               printk(KERN_ERR "i2sbus_control_init API breakage\n");
+               return -ENODEV;
+       }
+
+       while ((np = of_get_next_child(dev->ofdev.node, np))) {
+               if (of_device_is_compatible(np, "i2sbus") ||
+                   of_device_is_compatible(np, "i2s-modem")) {
+                       got += i2sbus_add_dev(dev, control, np);
+               }
+       }
+
+       if (!got) {
+               /* found none, clean up */
+               i2sbus_control_destroy(control);
+               return -ENODEV;
+       }
+
+       dev->ofdev.dev.driver_data = control;
+
+       return 0;
+}
+
+static int i2sbus_remove(struct macio_dev* dev)
+{
+       struct i2sbus_control *control = dev->ofdev.dev.driver_data;
+       struct i2sbus_dev *i2sdev, *tmp;
+
+       list_for_each_entry_safe(i2sdev, tmp, &control->list, item)
+               soundbus_remove_one(&i2sdev->sound);
+
+       return 0;
+}
+
+#ifdef CONFIG_PM
+static int i2sbus_suspend(struct macio_dev* dev, pm_message_t state)
+{
+       struct i2sbus_control *control = dev->ofdev.dev.driver_data;
+       struct codec_info_item *cii;
+       struct i2sbus_dev* i2sdev;
+       int err, ret = 0;
+
+       list_for_each_entry(i2sdev, &control->list, item) {
+               /* Notify Alsa */
+               if (i2sdev->sound.pcm) {
+                       /* Suspend PCM streams */
+                       snd_pcm_suspend_all(i2sdev->sound.pcm);
+               }
+
+               /* Notify codecs */
+               list_for_each_entry(cii, &i2sdev->sound.codec_list, list) {
+                       err = 0;
+                       if (cii->codec->suspend)
+                               err = cii->codec->suspend(cii, state);
+                       if (err)
+                               ret = err;
+               }
+
+               /* wait until streams are stopped */
+               i2sbus_wait_for_stop_both(i2sdev);
+       }
+
+       return ret;
+}
+
+static int i2sbus_resume(struct macio_dev* dev)
+{
+       struct i2sbus_control *control = dev->ofdev.dev.driver_data;
+       struct codec_info_item *cii;
+       struct i2sbus_dev* i2sdev;
+       int err, ret = 0;
+
+       list_for_each_entry(i2sdev, &control->list, item) {
+               /* reset i2s bus format etc. */
+               i2sbus_pcm_prepare_both(i2sdev);
+
+               /* Notify codecs so they can re-initialize */
+               list_for_each_entry(cii, &i2sdev->sound.codec_list, list) {
+                       err = 0;
+                       if (cii->codec->resume)
+                               err = cii->codec->resume(cii);
+                       if (err)
+                               ret = err;
+               }
+       }
+
+       return ret;
+}
+#endif /* CONFIG_PM */
+
+static int i2sbus_shutdown(struct macio_dev* dev)
+{
+       return 0;
+}
+
+static struct macio_driver i2sbus_drv = {
+       .name = "soundbus-i2s",
+       .owner = THIS_MODULE,
+       .match_table = i2sbus_match,
+       .probe = i2sbus_probe,
+       .remove = i2sbus_remove,
+#ifdef CONFIG_PM
+       .suspend = i2sbus_suspend,
+       .resume = i2sbus_resume,
+#endif
+       .shutdown = i2sbus_shutdown,
+};
+
+static int __init soundbus_i2sbus_init(void)
+{
+       return macio_register_driver(&i2sbus_drv);
+}
+
+static void __exit soundbus_i2sbus_exit(void)
+{
+       macio_unregister_driver(&i2sbus_drv);
+}
+
+module_init(soundbus_i2sbus_init);
+module_exit(soundbus_i2sbus_exit);
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-control.c b/sound/aoa/soundbus/i2sbus/i2sbus-control.c

deleted file mode 100644 (file)

index 87beb4a..0000000
--- a/sound/aoa/soundbus/i2sbus/i2sbus-control.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * i2sbus driver -- bus control routines
- *
- * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
- *
- * GPL v2, can be found in COPYING.
- */
-
-#include <linux/kernel.h>
-#include <linux/delay.h>
-
-#include <asm/io.h>
-#include <asm/prom.h>
-#include <asm/macio.h>
-#include <asm/pmac_feature.h>
-#include <asm/pmac_pfunc.h>
-#include <asm/keylargo.h>
-
-#include "i2sbus.h"
-
-int i2sbus_control_init(struct macio_dev* dev, struct i2sbus_control **c)
-{
-       *c = kzalloc(sizeof(struct i2sbus_control), GFP_KERNEL);
-       if (!*c)
-               return -ENOMEM;
-
-       INIT_LIST_HEAD(&(*c)->list);
-
-       (*c)->macio = dev->bus->chip;
-       return 0;
-}
-
-void i2sbus_control_destroy(struct i2sbus_control *c)
-{
-       kfree(c);
-}
-
-/* this is serialised externally */
-int i2sbus_control_add_dev(struct i2sbus_control *c,
-                          struct i2sbus_dev *i2sdev)
-{
-       struct device_node *np;
-
-       np = i2sdev->sound.ofdev.node;
-       i2sdev->enable = pmf_find_function(np, "enable");
-       i2sdev->cell_enable = pmf_find_function(np, "cell-enable");
-       i2sdev->clock_enable = pmf_find_function(np, "clock-enable");
-       i2sdev->cell_disable = pmf_find_function(np, "cell-disable");
-       i2sdev->clock_disable = pmf_find_function(np, "clock-disable");
-
-       /* if the bus number is not 0 or 1 we absolutely need to use
-        * the platform functions -- there's nothing in Darwin that
-        * would allow seeing a system behind what the FCRs are then,
-        * and I don't want to go parsing a bunch of platform functions
-        * by hand to try finding a system... */
-       if (i2sdev->bus_number != 0 && i2sdev->bus_number != 1 &&
-           (!i2sdev->enable ||
-            !i2sdev->cell_enable || !i2sdev->clock_enable ||
-            !i2sdev->cell_disable || !i2sdev->clock_disable)) {
-               pmf_put_function(i2sdev->enable);
-               pmf_put_function(i2sdev->cell_enable);
-               pmf_put_function(i2sdev->clock_enable);
-               pmf_put_function(i2sdev->cell_disable);
-               pmf_put_function(i2sdev->clock_disable);
-               return -ENODEV;
-       }
-
-       list_add(&i2sdev->item, &c->list);
-
-       return 0;
-}
-
-void i2sbus_control_remove_dev(struct i2sbus_control *c,
-                              struct i2sbus_dev *i2sdev)
-{
-       /* this is serialised externally */
-       list_del(&i2sdev->item);
-       if (list_empty(&c->list))
-               i2sbus_control_destroy(c);
-}
-
-int i2sbus_control_enable(struct i2sbus_control *c,
-                         struct i2sbus_dev *i2sdev)
-{
-       struct pmf_args args = { .count = 0 };
-       struct macio_chip *macio = c->macio;
-
-       if (i2sdev->enable)
-               return pmf_call_one(i2sdev->enable, &args);
-
-       if (macio == NULL || macio->base == NULL)
-               return -ENODEV;
-
-       switch (i2sdev->bus_number) {
-       case 0:
-               /* these need to be locked or done through
-                * newly created feature calls! */
-               MACIO_BIS(KEYLARGO_FCR1, KL1_I2S0_ENABLE);
-               break;
-       case 1:
-               MACIO_BIS(KEYLARGO_FCR1, KL1_I2S1_ENABLE);
-               break;
-       default:
-               return -ENODEV;
-       }
-       return 0;
-}
-
-int i2sbus_control_cell(struct i2sbus_control *c,
-                       struct i2sbus_dev *i2sdev,
-                       int enable)
-{
-       struct pmf_args args = { .count = 0 };
-       struct macio_chip *macio = c->macio;
-
-       switch (enable) {
-       case 0:
-               if (i2sdev->cell_disable)
-                       return pmf_call_one(i2sdev->cell_disable, &args);
-               break;
-       case 1:
-               if (i2sdev->cell_enable)
-                       return pmf_call_one(i2sdev->cell_enable, &args);
-               break;
-       default:
-               printk(KERN_ERR "i2sbus: INVALID CELL ENABLE VALUE\n");
-               return -ENODEV;
-       }
-
-       if (macio == NULL || macio->base == NULL)
-               return -ENODEV;
-
-       switch (i2sdev->bus_number) {
-       case 0:
-               if (enable)
-                       MACIO_BIS(KEYLARGO_FCR1, KL1_I2S0_CELL_ENABLE);
-               else
-                       MACIO_BIC(KEYLARGO_FCR1, KL1_I2S0_CELL_ENABLE);
-               break;
-       case 1:
-               if (enable)
-                       MACIO_BIS(KEYLARGO_FCR1, KL1_I2S1_CELL_ENABLE);
-               else
-                       MACIO_BIC(KEYLARGO_FCR1, KL1_I2S1_CELL_ENABLE);
-               break;
-       default:
-               return -ENODEV;
-       }
-       return 0;
-}
-
-int i2sbus_control_clock(struct i2sbus_control *c,
-                        struct i2sbus_dev *i2sdev,
-                        int enable)
-{
-       struct pmf_args args = { .count = 0 };
-       struct macio_chip *macio = c->macio;
-
-       switch (enable) {
-       case 0:
-               if (i2sdev->clock_disable)
-                       return pmf_call_one(i2sdev->clock_disable, &args);
-               break;
-       case 1:
-               if (i2sdev->clock_enable)
-                       return pmf_call_one(i2sdev->clock_enable, &args);
-               break;
-       default:
-               printk(KERN_ERR "i2sbus: INVALID CLOCK ENABLE VALUE\n");
-               return -ENODEV;
-       }
-
-       if (macio == NULL || macio->base == NULL)
-               return -ENODEV;
-
-       switch (i2sdev->bus_number) {
-       case 0:
-               if (enable)
-                       MACIO_BIS(KEYLARGO_FCR1, KL1_I2S0_CLK_ENABLE_BIT);
-               else
-                       MACIO_BIC(KEYLARGO_FCR1, KL1_I2S0_CLK_ENABLE_BIT);
-               break;
-       case 1:
-               if (enable)
-                       MACIO_BIS(KEYLARGO_FCR1, KL1_I2S1_CLK_ENABLE_BIT);
-               else
-                       MACIO_BIC(KEYLARGO_FCR1, KL1_I2S1_CLK_ENABLE_BIT);
-               break;
-       default:
-               return -ENODEV;
-       }
-       return 0;
-}
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-core.c b/sound/aoa/soundbus/i2sbus/i2sbus-core.c

deleted file mode 100644 (file)

index b4590df..0000000
--- a/sound/aoa/soundbus/i2sbus/i2sbus-core.c
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
- * i2sbus driver
- *
- * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
- *
- * GPL v2, can be found in COPYING.
- */
-
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/interrupt.h>
-#include <linux/dma-mapping.h>
-
-#include <sound/core.h>
-
-#include <asm/macio.h>
-#include <asm/dbdma.h>
-
-#include "../soundbus.h"
-#include "i2sbus.h"
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
-MODULE_DESCRIPTION("Apple Soundbus: I2S support");
-
-static int force;
-module_param(force, int, 0444);
-MODULE_PARM_DESC(force, "Force loading i2sbus even when"
-                       " no layout-id property is present");
-
-static struct of_device_id i2sbus_match[] = {
-       { .name = "i2s" },
-       { }
-};
-
-MODULE_DEVICE_TABLE(of, i2sbus_match);
-
-static int alloc_dbdma_descriptor_ring(struct i2sbus_dev *i2sdev,
-                                      struct dbdma_command_mem *r,
-                                      int numcmds)
-{
-       /* one more for rounding, one for branch back, one for stop command */
-       r->size = (numcmds + 3) * sizeof(struct dbdma_cmd);
-       /* We use the PCI APIs for now until the generic one gets fixed
-        * enough or until we get some macio-specific versions
-        */
-       r->space = dma_alloc_coherent(
-                       &macio_get_pci_dev(i2sdev->macio)->dev,
-                       r->size,
-                       &r->bus_addr,
-                       GFP_KERNEL);
-
-       if (!r->space) return -ENOMEM;
-
-       memset(r->space, 0, r->size);
-       r->cmds = (void*)DBDMA_ALIGN(r->space);
-       r->bus_cmd_start = r->bus_addr +
-                          (dma_addr_t)((char*)r->cmds - (char*)r->space);
-
-       return 0;
-}
-
-static void free_dbdma_descriptor_ring(struct i2sbus_dev *i2sdev,
-                                      struct dbdma_command_mem *r)
-{
-       if (!r->space) return;
-       
-       dma_free_coherent(&macio_get_pci_dev(i2sdev->macio)->dev,
-                           r->size, r->space, r->bus_addr);
-}
-
-static void i2sbus_release_dev(struct device *dev)
-{
-       struct i2sbus_dev *i2sdev;
-       int i;
-
-       i2sdev = container_of(dev, struct i2sbus_dev, sound.ofdev.dev);
-
-       if (i2sdev->intfregs) iounmap(i2sdev->intfregs);
-       if (i2sdev->out.dbdma) iounmap(i2sdev->out.dbdma);
-       if (i2sdev->in.dbdma) iounmap(i2sdev->in.dbdma);
-       for (i = aoa_resource_i2smmio; i <= aoa_resource_rxdbdma; i++)
-               if (i2sdev->allocated_resource[i])
-                       release_and_free_resource(i2sdev->allocated_resource[i]);
-       free_dbdma_descriptor_ring(i2sdev, &i2sdev->out.dbdma_ring);
-       free_dbdma_descriptor_ring(i2sdev, &i2sdev->in.dbdma_ring);
-       for (i = aoa_resource_i2smmio; i <= aoa_resource_rxdbdma; i++)
-               free_irq(i2sdev->interrupts[i], i2sdev);
-       i2sbus_control_remove_dev(i2sdev->control, i2sdev);
-       mutex_destroy(&i2sdev->lock);
-       kfree(i2sdev);
-}
-
-static irqreturn_t i2sbus_bus_intr(int irq, void *devid)
-{
-       struct i2sbus_dev *dev = devid;
-       u32 intreg;
-
-       spin_lock(&dev->low_lock);
-       intreg = in_le32(&dev->intfregs->intr_ctl);
-
-       /* acknowledge interrupt reasons */
-       out_le32(&dev->intfregs->intr_ctl, intreg);
-
-       spin_unlock(&dev->low_lock);
-
-       return IRQ_HANDLED;
-}
-
-
-/*
- * XXX FIXME: We test the layout_id's here to get the proper way of
- * mapping in various registers, thanks to bugs in Apple device-trees.
- * We could instead key off the machine model and the name of the i2s
- * node (i2s-a). This we'll do when we move it all to macio_asic.c
- * and have that export items for each sub-node too.
- */
-static int i2sbus_get_and_fixup_rsrc(struct device_node *np, int index,
-                                    int layout, struct resource *res)
-{
-       struct device_node *parent;
-       int pindex, rc = -ENXIO;
-       const u32 *reg;
-
-       /* Machines with layout 76 and 36 (K2 based) have a weird device
-        * tree what we need to special case.
-        * Normal machines just fetch the resource from the i2s-X node.
-        * Darwin further divides normal machines into old and new layouts
-        * with a subtely different code path but that doesn't seem necessary
-        * in practice, they just bloated it. In addition, even on our K2
-        * case the i2s-modem node, if we ever want to handle it, uses the
-        * normal layout
-        */
-       if (layout != 76 && layout != 36)
-               return of_address_to_resource(np, index, res);
-
-       parent = of_get_parent(np);
-       pindex = (index == aoa_resource_i2smmio) ? 0 : 1;
-       rc = of_address_to_resource(parent, pindex, res);
-       if (rc)
-               goto bail;
-       reg = of_get_property(np, "reg", NULL);
-       if (reg == NULL) {
-               rc = -ENXIO;
-               goto bail;
-       }
-       res->start += reg[index * 2];
-       res->end = res->start + reg[index * 2 + 1] - 1;
- bail:
-       of_node_put(parent);
-       return rc;
-}
-
-/* FIXME: look at device node refcounting */
-static int i2sbus_add_dev(struct macio_dev *macio,
-                         struct i2sbus_control *control,
-                         struct device_node *np)
-{
-       struct i2sbus_dev *dev;
-       struct device_node *child = NULL, *sound = NULL;
-       struct resource *r;
-       int i, layout = 0, rlen, ok = force;
-       static const char *rnames[] = { "i2sbus: %s (control)",
-                                       "i2sbus: %s (tx)",
-                                       "i2sbus: %s (rx)" };
-       static irq_handler_t ints[] = {
-               i2sbus_bus_intr,
-               i2sbus_tx_intr,
-               i2sbus_rx_intr
-       };
-
-       if (strlen(np->name) != 5)
-               return 0;
-       if (strncmp(np->name, "i2s-", 4))
-               return 0;
-
-       dev = kzalloc(sizeof(struct i2sbus_dev), GFP_KERNEL);
-       if (!dev)
-               return 0;
-
-       i = 0;
-       while ((child = of_get_next_child(np, child))) {
-               if (strcmp(child->name, "sound") == 0) {
-                       i++;
-                       sound = child;
-               }
-       }
-       if (i == 1) {
-               const u32 *layout_id =
-                       of_get_property(sound, "layout-id", NULL);
-               if (layout_id) {
-                       layout = *layout_id;
-                       snprintf(dev->sound.modalias, 32,
-                                "sound-layout-%d", layout);
-                       ok = 1;
-               }
-       }
-       /* for the time being, until we can handle non-layout-id
-        * things in some fabric, refuse to attach if there is no
-        * layout-id property or we haven't been forced to attach.
-        * When there are two i2s busses and only one has a layout-id,
-        * then this depends on the order, but that isn't important
-        * either as the second one in that case is just a modem. */
-       if (!ok) {
-               kfree(dev);
-               return -ENODEV;
-       }
-
-       mutex_init(&dev->lock);
-       spin_lock_init(&dev->low_lock);
-       dev->sound.ofdev.node = np;
-       dev->sound.ofdev.dma_mask = macio->ofdev.dma_mask;
-       dev->sound.ofdev.dev.dma_mask = &dev->sound.ofdev.dma_mask;
-       dev->sound.ofdev.dev.parent = &macio->ofdev.dev;
-       dev->sound.ofdev.dev.release = i2sbus_release_dev;
-       dev->sound.attach_codec = i2sbus_attach_codec;
-       dev->sound.detach_codec = i2sbus_detach_codec;
-       dev->sound.pcmid = -1;
-       dev->macio = macio;
-       dev->control = control;
-       dev->bus_number = np->name[4] - 'a';
-       INIT_LIST_HEAD(&dev->sound.codec_list);
-
-       for (i = aoa_resource_i2smmio; i <= aoa_resource_rxdbdma; i++) {
-               dev->interrupts[i] = -1;
-               snprintf(dev->rnames[i], sizeof(dev->rnames[i]),
-                        rnames[i], np->name);
-       }
-       for (i = aoa_resource_i2smmio; i <= aoa_resource_rxdbdma; i++) {
-               int irq = irq_of_parse_and_map(np, i);
-               if (request_irq(irq, ints[i], 0, dev->rnames[i], dev))
-                       goto err;
-               dev->interrupts[i] = irq;
-       }
-
-
-       /* Resource handling is problematic as some device-trees contain
-        * useless crap (ugh ugh ugh). We work around that here by calling
-        * specific functions for calculating the appropriate resources.
-        *
-        * This will all be moved to macio_asic.c at one point
-        */
-       for (i = aoa_resource_i2smmio; i <= aoa_resource_rxdbdma; i++) {
-               if (i2sbus_get_and_fixup_rsrc(np,i,layout,&dev->resources[i]))
-                       goto err;
-               /* If only we could use our resource dev->resources[i]...
-                * but request_resource doesn't know about parents and
-                * contained resources...
-                */
-               dev->allocated_resource[i] = 
-                       request_mem_region(dev->resources[i].start,
-                                          dev->resources[i].end -
-                                          dev->resources[i].start + 1,
-                                          dev->rnames[i]);
-               if (!dev->allocated_resource[i]) {
-                       printk(KERN_ERR "i2sbus: failed to claim resource %d!\n", i);
-                       goto err;
-               }
-       }
-
-       r = &dev->resources[aoa_resource_i2smmio];
-       rlen = r->end - r->start + 1;
-       if (rlen < sizeof(struct i2s_interface_regs))
-               goto err;
-       dev->intfregs = ioremap(r->start, rlen);
-
-       r = &dev->resources[aoa_resource_txdbdma];
-       rlen = r->end - r->start + 1;
-       if (rlen < sizeof(struct dbdma_regs))
-               goto err;
-       dev->out.dbdma = ioremap(r->start, rlen);
-
-       r = &dev->resources[aoa_resource_rxdbdma];
-       rlen = r->end - r->start + 1;
-       if (rlen < sizeof(struct dbdma_regs))
-               goto err;
-       dev->in.dbdma = ioremap(r->start, rlen);
-
-       if (!dev->intfregs || !dev->out.dbdma || !dev->in.dbdma)
-               goto err;
-
-       if (alloc_dbdma_descriptor_ring(dev, &dev->out.dbdma_ring,
-                                       MAX_DBDMA_COMMANDS))
-               goto err;
-       if (alloc_dbdma_descriptor_ring(dev, &dev->in.dbdma_ring,
-                                       MAX_DBDMA_COMMANDS))
-               goto err;
-
-       if (i2sbus_control_add_dev(dev->control, dev)) {
-               printk(KERN_ERR "i2sbus: control layer didn't like bus\n");
-               goto err;
-       }
-
-       if (soundbus_add_one(&dev->sound)) {
-               printk(KERN_DEBUG "i2sbus: device registration error!\n");
-               goto err;
-       }
-
-       /* enable this cell */
-       i2sbus_control_cell(dev->control, dev, 1);
-       i2sbus_control_enable(dev->control, dev);
-       i2sbus_control_clock(dev->control, dev, 1);
-
-       return 1;
- err:
-       for (i=0;i<3;i++)
-               if (dev->interrupts[i] != -1)
-                       free_irq(dev->interrupts[i], dev);
-       free_dbdma_descriptor_ring(dev, &dev->out.dbdma_ring);
-       free_dbdma_descriptor_ring(dev, &dev->in.dbdma_ring);
-       if (dev->intfregs) iounmap(dev->intfregs);
-       if (dev->out.dbdma) iounmap(dev->out.dbdma);
-       if (dev->in.dbdma) iounmap(dev->in.dbdma);
-       for (i=0;i<3;i++)
-               if (dev->allocated_resource[i])
-                       release_and_free_resource(dev->allocated_resource[i]);
-       mutex_destroy(&dev->lock);
-       kfree(dev);
-       return 0;
-}
-
-static int i2sbus_probe(struct macio_dev* dev, const struct of_device_id *match)
-{
-       struct device_node *np = NULL;
-       int got = 0, err;
-       struct i2sbus_control *control = NULL;
-
-       err = i2sbus_control_init(dev, &control);
-       if (err)
-               return err;
-       if (!control) {
-               printk(KERN_ERR "i2sbus_control_init API breakage\n");
-               return -ENODEV;
-       }
-
-       while ((np = of_get_next_child(dev->ofdev.node, np))) {
-               if (of_device_is_compatible(np, "i2sbus") ||
-                   of_device_is_compatible(np, "i2s-modem")) {
-                       got += i2sbus_add_dev(dev, control, np);
-               }
-       }
-
-       if (!got) {
-               /* found none, clean up */
-               i2sbus_control_destroy(control);
-               return -ENODEV;
-       }
-
-       dev->ofdev.dev.driver_data = control;
-
-       return 0;
-}
-
-static int i2sbus_remove(struct macio_dev* dev)
-{
-       struct i2sbus_control *control = dev->ofdev.dev.driver_data;
-       struct i2sbus_dev *i2sdev, *tmp;
-
-       list_for_each_entry_safe(i2sdev, tmp, &control->list, item)
-               soundbus_remove_one(&i2sdev->sound);
-
-       return 0;
-}
-
-#ifdef CONFIG_PM
-static int i2sbus_suspend(struct macio_dev* dev, pm_message_t state)
-{
-       struct i2sbus_control *control = dev->ofdev.dev.driver_data;
-       struct codec_info_item *cii;
-       struct i2sbus_dev* i2sdev;
-       int err, ret = 0;
-
-       list_for_each_entry(i2sdev, &control->list, item) {
-               /* Notify Alsa */
-               if (i2sdev->sound.pcm) {
-                       /* Suspend PCM streams */
-                       snd_pcm_suspend_all(i2sdev->sound.pcm);
-               }
-
-               /* Notify codecs */
-               list_for_each_entry(cii, &i2sdev->sound.codec_list, list) {
-                       err = 0;
-                       if (cii->codec->suspend)
-                               err = cii->codec->suspend(cii, state);
-                       if (err)
-                               ret = err;
-               }
-
-               /* wait until streams are stopped */
-               i2sbus_wait_for_stop_both(i2sdev);
-       }
-
-       return ret;
-}
-
-static int i2sbus_resume(struct macio_dev* dev)
-{
-       struct i2sbus_control *control = dev->ofdev.dev.driver_data;
-       struct codec_info_item *cii;
-       struct i2sbus_dev* i2sdev;
-       int err, ret = 0;
-
-       list_for_each_entry(i2sdev, &control->list, item) {
-               /* reset i2s bus format etc. */
-               i2sbus_pcm_prepare_both(i2sdev);
-
-               /* Notify codecs so they can re-initialize */
-               list_for_each_entry(cii, &i2sdev->sound.codec_list, list) {
-                       err = 0;
-                       if (cii->codec->resume)
-                               err = cii->codec->resume(cii);
-                       if (err)
-                               ret = err;
-               }
-       }
-
-       return ret;
-}
-#endif /* CONFIG_PM */
-
-static int i2sbus_shutdown(struct macio_dev* dev)
-{
-       return 0;
-}
-
-static struct macio_driver i2sbus_drv = {
-       .name = "soundbus-i2s",
-       .owner = THIS_MODULE,
-       .match_table = i2sbus_match,
-       .probe = i2sbus_probe,
-       .remove = i2sbus_remove,
-#ifdef CONFIG_PM
-       .suspend = i2sbus_suspend,
-       .resume = i2sbus_resume,
-#endif
-       .shutdown = i2sbus_shutdown,
-};
-
-static int __init soundbus_i2sbus_init(void)
-{
-       return macio_register_driver(&i2sbus_drv);
-}
-
-static void __exit soundbus_i2sbus_exit(void)
-{
-       macio_unregister_driver(&i2sbus_drv);
-}
-
-module_init(soundbus_i2sbus_init);
-module_exit(soundbus_i2sbus_exit);
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-interface.h b/sound/aoa/soundbus/i2sbus/i2sbus-interface.h

deleted file mode 100644 (file)

index c6b5f54..0000000
--- a/sound/aoa/soundbus/i2sbus/i2sbus-interface.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * i2sbus driver -- interface register definitions
- *
- * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
- *
- * GPL v2, can be found in COPYING.
- */
-#ifndef __I2SBUS_INTERFACE_H
-#define __I2SBUS_INTERFACE_H
-
-/* i2s bus control registers, at least what we know about them */
-
-#define __PAD(m,n) u8 __pad##m[n]
-#define _PAD(line, n) __PAD(line, n)
-#define PAD(n) _PAD(__LINE__, (n))
-struct i2s_interface_regs {
-       __le32 intr_ctl;        /* 0x00 */
-       PAD(12);
-       __le32 serial_format;   /* 0x10 */
-       PAD(12);
-       __le32 codec_msg_out;   /* 0x20 */
-       PAD(12);
-       __le32 codec_msg_in;    /* 0x30 */
-       PAD(12);
-       __le32 frame_count;     /* 0x40 */
-       PAD(12);
-       __le32 frame_match;     /* 0x50 */
-       PAD(12);
-       __le32 data_word_sizes; /* 0x60 */
-       PAD(12);
-       __le32 peak_level_sel;  /* 0x70 */
-       PAD(12);
-       __le32 peak_level_in0;  /* 0x80 */
-       PAD(12);
-       __le32 peak_level_in1;  /* 0x90 */
-       PAD(12);
-       /* total size: 0x100 bytes */
-}  __attribute__((__packed__));
-
-/* interrupt register is just a bitfield with
- * interrupt enable and pending bits */
-#define I2S_REG_INTR_CTL               0x00
-#      define I2S_INT_FRAME_COUNT              (1<<31)
-#      define I2S_PENDING_FRAME_COUNT          (1<<30)
-#      define I2S_INT_MESSAGE_FLAG             (1<<29)
-#      define I2S_PENDING_MESSAGE_FLAG         (1<<28)
-#      define I2S_INT_NEW_PEAK                 (1<<27)
-#      define I2S_PENDING_NEW_PEAK             (1<<26)
-#      define I2S_INT_CLOCKS_STOPPED           (1<<25)
-#      define I2S_PENDING_CLOCKS_STOPPED       (1<<24)
-#      define I2S_INT_EXTERNAL_SYNC_ERROR      (1<<23)
-#      define I2S_PENDING_EXTERNAL_SYNC_ERROR  (1<<22)
-#      define I2S_INT_EXTERNAL_SYNC_OK         (1<<21)
-#      define I2S_PENDING_EXTERNAL_SYNC_OK     (1<<20)
-#      define I2S_INT_NEW_SAMPLE_RATE          (1<<19)
-#      define I2S_PENDING_NEW_SAMPLE_RATE      (1<<18)
-#      define I2S_INT_STATUS_FLAG              (1<<17)
-#      define I2S_PENDING_STATUS_FLAG          (1<<16)
-
-/* serial format register is more interesting :)
- * It contains:
- *  - clock source
- *  - MClk divisor
- *  - SClk divisor
- *  - SClk master flag
- *  - serial format (sony, i2s 64x, i2s 32x, dav, silabs)
- *  - external sample frequency interrupt (don't understand)
- *  - external sample frequency
- */
-#define I2S_REG_SERIAL_FORMAT          0x10
-/* clock source. You get either 18.432, 45.1584 or 49.1520 MHz */
-#      define I2S_SF_CLOCK_SOURCE_SHIFT        30
-#      define I2S_SF_CLOCK_SOURCE_MASK         (3<<I2S_SF_CLOCK_SOURCE_SHIFT)
-#      define I2S_SF_CLOCK_SOURCE_18MHz        (0<<I2S_SF_CLOCK_SOURCE_SHIFT)
-#      define I2S_SF_CLOCK_SOURCE_45MHz        (1<<I2S_SF_CLOCK_SOURCE_SHIFT)
-#      define I2S_SF_CLOCK_SOURCE_49MHz        (2<<I2S_SF_CLOCK_SOURCE_SHIFT)
-/* also, let's define the exact clock speeds here, in Hz */
-#define I2S_CLOCK_SPEED_18MHz  18432000
-#define I2S_CLOCK_SPEED_45MHz  45158400
-#define I2S_CLOCK_SPEED_49MHz  49152000
-/* MClk is the clock that drives the codec, usually called its 'system clock'.
- * It is derived by taking only every 'divisor' tick of the clock.
- */
-#      define I2S_SF_MCLKDIV_SHIFT             24
-#      define I2S_SF_MCLKDIV_MASK              (0x1F<<I2S_SF_MCLKDIV_SHIFT)
-#      define I2S_SF_MCLKDIV_1                 (0x14<<I2S_SF_MCLKDIV_SHIFT)
-#      define I2S_SF_MCLKDIV_3                 (0x13<<I2S_SF_MCLKDIV_SHIFT)
-#      define I2S_SF_MCLKDIV_5                 (0x12<<I2S_SF_MCLKDIV_SHIFT)
-#      define I2S_SF_MCLKDIV_14                (0x0E<<I2S_SF_MCLKDIV_SHIFT)
-#      define I2S_SF_MCLKDIV_OTHER(div)        (((div/2-1)<<I2S_SF_MCLKDIV_SHIFT)&I2S_SF_MCLKDIV_MASK)
-static inline int i2s_sf_mclkdiv(int div, int *out)
-{
-       int d;
-
-       switch(div) {
-       case 1: *out |= I2S_SF_MCLKDIV_1; return 0;
-       case 3: *out |= I2S_SF_MCLKDIV_3; return 0;
-       case 5: *out |= I2S_SF_MCLKDIV_5; return 0;
-       case 14: *out |= I2S_SF_MCLKDIV_14; return 0;
-       default:
-               if (div%2) return -1;
-               d = div/2-1;
-               if (d == 0x14 || d == 0x13 || d == 0x12 || d == 0x0E)
-                       return -1;
-               *out |= I2S_SF_MCLKDIV_OTHER(div);
-               return 0;
-       }
-}
-/* SClk is the clock that drives the i2s wire bus. Note that it is
- * derived from the MClk above by taking only every 'divisor' tick
- * of MClk.
- */
-#      define I2S_SF_SCLKDIV_SHIFT             20
-#      define I2S_SF_SCLKDIV_MASK              (0xF<<I2S_SF_SCLKDIV_SHIFT)
-#      define I2S_SF_SCLKDIV_1                 (8<<I2S_SF_SCLKDIV_SHIFT)
-#      define I2S_SF_SCLKDIV_3                 (9<<I2S_SF_SCLKDIV_SHIFT)
-#      define I2S_SF_SCLKDIV_OTHER(div)        (((div/2-1)<<I2S_SF_SCLKDIV_SHIFT)&I2S_SF_SCLKDIV_MASK)
-static inline int i2s_sf_sclkdiv(int div, int *out)
-{
-       int d;
-
-       switch(div) {
-       case 1: *out |= I2S_SF_SCLKDIV_1; return 0;
-       case 3: *out |= I2S_SF_SCLKDIV_3; return 0;
-       default:
-               if (div%2) return -1;
-               d = div/2-1;
-               if (d == 8 || d == 9) return -1;
-               *out |= I2S_SF_SCLKDIV_OTHER(div);
-               return 0;
-       }
-}
-#      define I2S_SF_SCLK_MASTER               (1<<19)
-/* serial format is the way the data is put to the i2s wire bus */
-#      define I2S_SF_SERIAL_FORMAT_SHIFT       16
-#      define I2S_SF_SERIAL_FORMAT_MASK        (7<<I2S_SF_SERIAL_FORMAT_SHIFT)
-#      define I2S_SF_SERIAL_FORMAT_SONY        (0<<I2S_SF_SERIAL_FORMAT_SHIFT)
-#      define I2S_SF_SERIAL_FORMAT_I2S_64X     (1<<I2S_SF_SERIAL_FORMAT_SHIFT)
-#      define I2S_SF_SERIAL_FORMAT_I2S_32X     (2<<I2S_SF_SERIAL_FORMAT_SHIFT)
-#      define I2S_SF_SERIAL_FORMAT_I2S_DAV     (4<<I2S_SF_SERIAL_FORMAT_SHIFT)
-#      define I2S_SF_SERIAL_FORMAT_I2S_SILABS  (5<<I2S_SF_SERIAL_FORMAT_SHIFT)
-/* unknown */
-#      define I2S_SF_EXT_SAMPLE_FREQ_INT_SHIFT 12
-#      define I2S_SF_EXT_SAMPLE_FREQ_INT_MASK  (0xF<<I2S_SF_SAMPLE_FREQ_INT_SHIFT)
-/* probably gives external frequency? */
-#      define I2S_SF_EXT_SAMPLE_FREQ_MASK      0xFFF
-
-/* used to send codec messages, but how isn't clear */
-#define I2S_REG_CODEC_MSG_OUT          0x20
-
-/* used to receive codec messages, but how isn't clear */
-#define I2S_REG_CODEC_MSG_IN           0x30
-
-/* frame count reg isn't clear to me yet, but probably useful */
-#define I2S_REG_FRAME_COUNT            0x40
-
-/* program to some value, and get interrupt if frame count reaches it */
-#define I2S_REG_FRAME_MATCH            0x50
-
-/* this register describes how the bus transfers data */
-#define I2S_REG_DATA_WORD_SIZES                0x60
-/* number of interleaved input channels */
-#      define I2S_DWS_NUM_CHANNELS_IN_SHIFT    24
-#      define I2S_DWS_NUM_CHANNELS_IN_MASK     (0x1F<<I2S_DWS_NUM_CHANNELS_IN_SHIFT)
-/* word size of input data */
-#      define I2S_DWS_DATA_IN_SIZE_SHIFT       16
-#      define I2S_DWS_DATA_IN_16BIT            (0<<I2S_DWS_DATA_IN_SIZE_SHIFT)
-#      define I2S_DWS_DATA_IN_24BIT            (3<<I2S_DWS_DATA_IN_SIZE_SHIFT)
-/* number of interleaved output channels */
-#      define I2S_DWS_NUM_CHANNELS_OUT_SHIFT   8
-#      define I2S_DWS_NUM_CHANNELS_OUT_MASK    (0x1F<<I2S_DWS_NUM_CHANNELS_OUT_SHIFT)
-/* word size of output data */
-#      define I2S_DWS_DATA_OUT_SIZE_SHIFT      0
-#      define I2S_DWS_DATA_OUT_16BIT           (0<<I2S_DWS_DATA_OUT_SIZE_SHIFT)
-#      define I2S_DWS_DATA_OUT_24BIT           (3<<I2S_DWS_DATA_OUT_SIZE_SHIFT)
-
-
-/* unknown */
-#define I2S_REG_PEAK_LEVEL_SEL         0x70
-
-/* unknown */
-#define I2S_REG_PEAK_LEVEL_IN0         0x80
-
-/* unknown */
-#define I2S_REG_PEAK_LEVEL_IN1         0x90
-
-#endif /* __I2SBUS_INTERFACE_H */
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c b/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c

deleted file mode 100644 (file)

index 59bacd3..0000000
--- a/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c
+++ /dev/null
@@ -1,1062 +0,0 @@
-/*
- * i2sbus driver -- pcm routines
- *
- * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
- *
- * GPL v2, can be found in COPYING.
- */
-
-#include <asm/io.h>
-#include <linux/delay.h>
-#include <sound/core.h>
-#include <asm/macio.h>
-#include <linux/pci.h>
-#include "../soundbus.h"
-#include "i2sbus.h"
-
-static inline void get_pcm_info(struct i2sbus_dev *i2sdev, int in,
-                               struct pcm_info **pi, struct pcm_info **other)
-{
-       if (in) {
-               if (pi)
-                       *pi = &i2sdev->in;
-               if (other)
-                       *other = &i2sdev->out;
-       } else {
-               if (pi)
-                       *pi = &i2sdev->out;
-               if (other)
-                       *other = &i2sdev->in;
-       }
-}
-
-static int clock_and_divisors(int mclk, int sclk, int rate, int *out)
-{
-       /* sclk must be derived from mclk! */
-       if (mclk % sclk)
-               return -1;
-       /* derive sclk register value */
-       if (i2s_sf_sclkdiv(mclk / sclk, out))
-               return -1;
-
-       if (I2S_CLOCK_SPEED_18MHz % (rate * mclk) == 0) {
-               if (!i2s_sf_mclkdiv(I2S_CLOCK_SPEED_18MHz / (rate * mclk), out)) {
-                       *out |= I2S_SF_CLOCK_SOURCE_18MHz;
-                       return 0;
-               }
-       }
-       if (I2S_CLOCK_SPEED_45MHz % (rate * mclk) == 0) {
-               if (!i2s_sf_mclkdiv(I2S_CLOCK_SPEED_45MHz / (rate * mclk), out)) {
-                       *out |= I2S_SF_CLOCK_SOURCE_45MHz;
-                       return 0;
-               }
-       }
-       if (I2S_CLOCK_SPEED_49MHz % (rate * mclk) == 0) {
-               if (!i2s_sf_mclkdiv(I2S_CLOCK_SPEED_49MHz / (rate * mclk), out)) {
-                       *out |= I2S_SF_CLOCK_SOURCE_49MHz;
-                       return 0;
-               }
-       }
-       return -1;
-}
-
-#define CHECK_RATE(rate)                                               \
-       do { if (rates & SNDRV_PCM_RATE_ ##rate) {                      \
-               int dummy;                                              \
-               if (clock_and_divisors(sysclock_factor,                 \
-                                      bus_factor, rate, &dummy))       \
-                       rates &= ~SNDRV_PCM_RATE_ ##rate;               \
-       } } while (0)
-
-static int i2sbus_pcm_open(struct i2sbus_dev *i2sdev, int in)
-{
-       struct pcm_info *pi, *other;
-       struct soundbus_dev *sdev;
-       int masks_inited = 0, err;
-       struct codec_info_item *cii, *rev;
-       struct snd_pcm_hardware *hw;
-       u64 formats = 0;
-       unsigned int rates = 0;
-       struct transfer_info v;
-       int result = 0;
-       int bus_factor = 0, sysclock_factor = 0;
-       int found_this;
-
-       mutex_lock(&i2sdev->lock);
-
-       get_pcm_info(i2sdev, in, &pi, &other);
-
-       hw = &pi->substream->runtime->hw;
-       sdev = &i2sdev->sound;
-
-       if (pi->active) {
-               /* alsa messed up */
-               result = -EBUSY;
-               goto out_unlock;
-       }
-
-       /* we now need to assign the hw */
-       list_for_each_entry(cii, &sdev->codec_list, list) {
-               struct transfer_info *ti = cii->codec->transfers;
-               bus_factor = cii->codec->bus_factor;
-               sysclock_factor = cii->codec->sysclock_factor;
-               while (ti->formats && ti->rates) {
-                       v = *ti;
-                       if (ti->transfer_in == in
-                           && cii->codec->usable(cii, ti, &v)) {
-                               if (masks_inited) {
-                                       formats &= v.formats;
-                                       rates &= v.rates;
-                               } else {
-                                       formats = v.formats;
-                                       rates = v.rates;
-                                       masks_inited = 1;
-                               }
-                       }
-                       ti++;
-               }
-       }
-       if (!masks_inited || !bus_factor || !sysclock_factor) {
-               result = -ENODEV;
-               goto out_unlock;
-       }
-       /* bus dependent stuff */
-       hw->info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
-                  SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_RESUME |
-                  SNDRV_PCM_INFO_JOINT_DUPLEX;
-
-       CHECK_RATE(5512);
-       CHECK_RATE(8000);
-       CHECK_RATE(11025);
-       CHECK_RATE(16000);
-       CHECK_RATE(22050);
-       CHECK_RATE(32000);
-       CHECK_RATE(44100);
-       CHECK_RATE(48000);
-       CHECK_RATE(64000);
-       CHECK_RATE(88200);
-       CHECK_RATE(96000);
-       CHECK_RATE(176400);
-       CHECK_RATE(192000);
-       hw->rates = rates;
-
-       /* well. the codec might want 24 bits only, and we'll
-        * ever only transfer 24 bits, but they are top-aligned!
-        * So for alsa, we claim that we're doing full 32 bit
-        * while in reality we'll ignore the lower 8 bits of
-        * that when doing playback (they're transferred as 0
-        * as far as I know, no codecs we have are 32-bit capable
-        * so I can't really test) and when doing recording we'll
-        * always have those lower 8 bits recorded as 0 */
-       if (formats & SNDRV_PCM_FMTBIT_S24_BE)
-               formats |= SNDRV_PCM_FMTBIT_S32_BE;
-       if (formats & SNDRV_PCM_FMTBIT_U24_BE)
-               formats |= SNDRV_PCM_FMTBIT_U32_BE;
-       /* now mask off what we can support. I suppose we could
-        * also support S24_3LE and some similar formats, but I
-        * doubt there's a codec that would be able to use that,
-        * so we don't support it here. */
-       hw->formats = formats & (SNDRV_PCM_FMTBIT_S16_BE |
-                                SNDRV_PCM_FMTBIT_U16_BE |
-                                SNDRV_PCM_FMTBIT_S32_BE |
-                                SNDRV_PCM_FMTBIT_U32_BE);
-
-       /* we need to set the highest and lowest rate possible.
-        * These are the highest and lowest rates alsa can
-        * support properly in its bitfield.
-        * Below, we'll use that to restrict to the rate
-        * currently in use (if any). */
-       hw->rate_min = 5512;
-       hw->rate_max = 192000;
-       /* if the other stream is active, then we can only
-        * support what it is currently using.
-        * FIXME: I lied. This comment is wrong. We can support
-        * anything that works with the same serial format, ie.
-        * when recording 24 bit sound we can well play 16 bit
-        * sound at the same time iff using the same transfer mode.
-        */
-       if (other->active) {
-               /* FIXME: is this guaranteed by the alsa api? */
-               hw->formats &= (1ULL << i2sdev->format);
-               /* see above, restrict rates to the one we already have */
-               hw->rate_min = i2sdev->rate;
-               hw->rate_max = i2sdev->rate;
-       }
-
-       hw->channels_min = 2;
-       hw->channels_max = 2;
-       /* these are somewhat arbitrary */
-       hw->buffer_bytes_max = 131072;
-       hw->period_bytes_min = 256;
-       hw->period_bytes_max = 16384;
-       hw->periods_min = 3;
-       hw->periods_max = MAX_DBDMA_COMMANDS;
-       err = snd_pcm_hw_constraint_integer(pi->substream->runtime,
-                                           SNDRV_PCM_HW_PARAM_PERIODS);
-       if (err < 0) {
-               result = err;
-               goto out_unlock;
-       }
-       list_for_each_entry(cii, &sdev->codec_list, list) {
-               if (cii->codec->open) {
-                       err = cii->codec->open(cii, pi->substream);
-                       if (err) {
-                               result = err;
-                               /* unwind */
-                               found_this = 0;
-                               list_for_each_entry_reverse(rev,
-                                   &sdev->codec_list, list) {
-                                       if (found_this && rev->codec->close) {
-                                               rev->codec->close(rev,
-                                                               pi->substream);
-                                       }
-                                       if (rev == cii)
-                                               found_this = 1;
-                               }
-                               goto out_unlock;
-                       }
-               }
-       }
-
- out_unlock:
-       mutex_unlock(&i2sdev->lock);
-       return result;
-}
-
-#undef CHECK_RATE
-
-static int i2sbus_pcm_close(struct i2sbus_dev *i2sdev, int in)
-{
-       struct codec_info_item *cii;
-       struct pcm_info *pi;
-       int err = 0, tmp;
-
-       mutex_lock(&i2sdev->lock);
-
-       get_pcm_info(i2sdev, in, &pi, NULL);
-
-       list_for_each_entry(cii, &i2sdev->sound.codec_list, list) {
-               if (cii->codec->close) {
-                       tmp = cii->codec->close(cii, pi->substream);
-                       if (tmp)
-                               err = tmp;
-               }
-       }
-
-       pi->substream = NULL;
-       pi->active = 0;
-       mutex_unlock(&i2sdev->lock);
-       return err;
-}
-
-static void i2sbus_wait_for_stop(struct i2sbus_dev *i2sdev,
-                                struct pcm_info *pi)
-{
-       unsigned long flags;
-       struct completion done;
-       long timeout;
-
-       spin_lock_irqsave(&i2sdev->low_lock, flags);
-       if (pi->dbdma_ring.stopping) {
-               init_completion(&done);
-               pi->stop_completion = &done;
-               spin_unlock_irqrestore(&i2sdev->low_lock, flags);
-               timeout = wait_for_completion_timeout(&done, HZ);
-               spin_lock_irqsave(&i2sdev->low_lock, flags);
-               pi->stop_completion = NULL;
-               if (timeout == 0) {
-                       /* timeout expired, stop dbdma forcefully */
-                       printk(KERN_ERR "i2sbus_wait_for_stop: timed out\n");
-                       /* make sure RUN, PAUSE and S0 bits are cleared */
-                       out_le32(&pi->dbdma->control, (RUN | PAUSE | 1) << 16);
-                       pi->dbdma_ring.stopping = 0;
-                       timeout = 10;
-                       while (in_le32(&pi->dbdma->status) & ACTIVE) {
-                               if (--timeout <= 0)
-                                       break;
-                               udelay(1);
-                       }
-               }
-       }
-       spin_unlock_irqrestore(&i2sdev->low_lock, flags);
-}
-
-#ifdef CONFIG_PM
-void i2sbus_wait_for_stop_both(struct i2sbus_dev *i2sdev)
-{
-       struct pcm_info *pi;
-
-       get_pcm_info(i2sdev, 0, &pi, NULL);
-       i2sbus_wait_for_stop(i2sdev, pi);
-       get_pcm_info(i2sdev, 1, &pi, NULL);
-       i2sbus_wait_for_stop(i2sdev, pi);
-}
-#endif
-
-static int i2sbus_hw_params(struct snd_pcm_substream *substream,
-                           struct snd_pcm_hw_params *params)
-{
-       return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
-}
-
-static inline int i2sbus_hw_free(struct snd_pcm_substream *substream, int in)
-{
-       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
-       struct pcm_info *pi;
-
-       get_pcm_info(i2sdev, in, &pi, NULL);
-       if (pi->dbdma_ring.stopping)
-               i2sbus_wait_for_stop(i2sdev, pi);
-       snd_pcm_lib_free_pages(substream);
-       return 0;
-}
-
-static int i2sbus_playback_hw_free(struct snd_pcm_substream *substream)
-{
-       return i2sbus_hw_free(substream, 0);
-}
-
-static int i2sbus_record_hw_free(struct snd_pcm_substream *substream)
-{
-       return i2sbus_hw_free(substream, 1);
-}
-
-static int i2sbus_pcm_prepare(struct i2sbus_dev *i2sdev, int in)
-{
-       /* whee. Hard work now. The user has selected a bitrate
-        * and bit format, so now we have to program our
-        * I2S controller appropriately. */
-       struct snd_pcm_runtime *runtime;
-       struct dbdma_cmd *command;
-       int i, periodsize, nperiods;
-       dma_addr_t offset;
-       struct bus_info bi;
-       struct codec_info_item *cii;
-       int sfr = 0;            /* serial format register */
-       int dws = 0;            /* data word sizes reg */
-       int input_16bit;
-       struct pcm_info *pi, *other;
-       int cnt;
-       int result = 0;
-       unsigned int cmd, stopaddr;
-
-       mutex_lock(&i2sdev->lock);
-
-       get_pcm_info(i2sdev, in, &pi, &other);
-
-       if (pi->dbdma_ring.running) {
-               result = -EBUSY;
-               goto out_unlock;
-       }
-       if (pi->dbdma_ring.stopping)
-               i2sbus_wait_for_stop(i2sdev, pi);
-
-       if (!pi->substream || !pi->substream->runtime) {
-               result = -EINVAL;
-               goto out_unlock;
-       }
-
-       runtime = pi->substream->runtime;
-       pi->active = 1;
-       if (other->active &&
-           ((i2sdev->format != runtime->format)
-            || (i2sdev->rate != runtime->rate))) {
-               result = -EINVAL;
-               goto out_unlock;
-       }
-
-       i2sdev->format = runtime->format;
-       i2sdev->rate = runtime->rate;
-
-       periodsize = snd_pcm_lib_period_bytes(pi->substream);
-       nperiods = pi->substream->runtime->periods;
-       pi->current_period = 0;
-
-       /* generate dbdma command ring first */
-       command = pi->dbdma_ring.cmds;
-       memset(command, 0, (nperiods + 2) * sizeof(struct dbdma_cmd));
-
-       /* commands to DMA to/from the ring */
-       /*
-        * For input, we need to do a graceful stop; if we abort
-        * the DMA, we end up with leftover bytes that corrupt
-        * the next recording.  To do this we set the S0 status
-        * bit and wait for the DMA controller to stop.  Each
-        * command has a branch condition to
-        * make it branch to a stop command if S0 is set.
-        * On input we also need to wait for the S7 bit to be
-        * set before turning off the DMA controller.
-        * In fact we do the graceful stop for output as well.
-        */
-       offset = runtime->dma_addr;
-       cmd = (in? INPUT_MORE: OUTPUT_MORE) | BR_IFSET | INTR_ALWAYS;
-       stopaddr = pi->dbdma_ring.bus_cmd_start +
-               (nperiods + 1) * sizeof(struct dbdma_cmd);
-       for (i = 0; i < nperiods; i++, command++, offset += periodsize) {
-               command->command = cpu_to_le16(cmd);
-               command->cmd_dep = cpu_to_le32(stopaddr);
-               command->phy_addr = cpu_to_le32(offset);
-               command->req_count = cpu_to_le16(periodsize);
-       }
-
-       /* branch back to beginning of ring */
-       command->command = cpu_to_le16(DBDMA_NOP | BR_ALWAYS);
-       command->cmd_dep = cpu_to_le32(pi->dbdma_ring.bus_cmd_start);
-       command++;
-
-       /* set stop command */
-       command->command = cpu_to_le16(DBDMA_STOP);
-
-       /* ok, let's set the serial format and stuff */
-       switch (runtime->format) {
-       /* 16 bit formats */
-       case SNDRV_PCM_FORMAT_S16_BE:
-       case SNDRV_PCM_FORMAT_U16_BE:
-               /* FIXME: if we add different bus factors we need to
-                * do more here!! */
-               bi.bus_factor = 0;
-               list_for_each_entry(cii, &i2sdev->sound.codec_list, list) {
-                       bi.bus_factor = cii->codec->bus_factor;
-                       break;
-               }
-               if (!bi.bus_factor) {
-                       result = -ENODEV;
-                       goto out_unlock;
-               }
-               input_16bit = 1;
-               break;
-       case SNDRV_PCM_FORMAT_S32_BE:
-       case SNDRV_PCM_FORMAT_U32_BE:
-               /* force 64x bus speed, otherwise the data cannot be
-                * transferred quickly enough! */
-               bi.bus_factor = 64;
-               input_16bit = 0;
-               break;
-       default:
-               result = -EINVAL;
-               goto out_unlock;
-       }
-       /* we assume all sysclocks are the same! */
-       list_for_each_entry(cii, &i2sdev->sound.codec_list, list) {
-               bi.sysclock_factor = cii->codec->sysclock_factor;
-               break;
-       }
-
-       if (clock_and_divisors(bi.sysclock_factor,
-                              bi.bus_factor,
-                              runtime->rate,
-                              &sfr) < 0) {
-               result = -EINVAL;
-               goto out_unlock;
-       }
-       switch (bi.bus_factor) {
-       case 32:
-               sfr |= I2S_SF_SERIAL_FORMAT_I2S_32X;
-               break;
-       case 64:
-               sfr |= I2S_SF_SERIAL_FORMAT_I2S_64X;
-               break;
-       }
-       /* FIXME: THIS ASSUMES MASTER ALL THE TIME */
-       sfr |= I2S_SF_SCLK_MASTER;
-
-       list_for_each_entry(cii, &i2sdev->sound.codec_list, list) {
-               int err = 0;
-               if (cii->codec->prepare)
-                       err = cii->codec->prepare(cii, &bi, pi->substream);
-               if (err) {
-                       result = err;
-                       goto out_unlock;
-               }
-       }
-       /* codecs are fine with it, so set our clocks */
-       if (input_16bit)
-               dws =   (2 << I2S_DWS_NUM_CHANNELS_IN_SHIFT) |
-                       (2 << I2S_DWS_NUM_CHANNELS_OUT_SHIFT) |
-                       I2S_DWS_DATA_IN_16BIT | I2S_DWS_DATA_OUT_16BIT;
-       else
-               dws =   (2 << I2S_DWS_NUM_CHANNELS_IN_SHIFT) |
-                       (2 << I2S_DWS_NUM_CHANNELS_OUT_SHIFT) |
-                       I2S_DWS_DATA_IN_24BIT | I2S_DWS_DATA_OUT_24BIT;
-
-       /* early exit if already programmed correctly */
-       /* not locking these is fine since we touch them only in this function */
-       if (in_le32(&i2sdev->intfregs->serial_format) == sfr
-        && in_le32(&i2sdev->intfregs->data_word_sizes) == dws)
-               goto out_unlock;
-
-       /* let's notify the codecs about clocks going away.
-        * For now we only do mastering on the i2s cell... */
-       list_for_each_entry(cii, &i2sdev->sound.codec_list, list)
-               if (cii->codec->switch_clock)
-                       cii->codec->switch_clock(cii, CLOCK_SWITCH_PREPARE_SLAVE);
-
-       i2sbus_control_enable(i2sdev->control, i2sdev);
-       i2sbus_control_cell(i2sdev->control, i2sdev, 1);
-
-       out_le32(&i2sdev->intfregs->intr_ctl, I2S_PENDING_CLOCKS_STOPPED);
-
-       i2sbus_control_clock(i2sdev->control, i2sdev, 0);
-
-       msleep(1);
-
-       /* wait for clock stopped. This can apparently take a while... */
-       cnt = 100;
-       while (cnt-- &&
-           !(in_le32(&i2sdev->intfregs->intr_ctl) & I2S_PENDING_CLOCKS_STOPPED)) {
-               msleep(5);
-       }
-       out_le32(&i2sdev->intfregs->intr_ctl, I2S_PENDING_CLOCKS_STOPPED);
-
-       /* not locking these is fine since we touch them only in this function */
-       out_le32(&i2sdev->intfregs->serial_format, sfr);
-       out_le32(&i2sdev->intfregs->data_word_sizes, dws);
-
-        i2sbus_control_enable(i2sdev->control, i2sdev);
-        i2sbus_control_cell(i2sdev->control, i2sdev, 1);
-        i2sbus_control_clock(i2sdev->control, i2sdev, 1);
-       msleep(1);
-
-       list_for_each_entry(cii, &i2sdev->sound.codec_list, list)
-               if (cii->codec->switch_clock)
-                       cii->codec->switch_clock(cii, CLOCK_SWITCH_SLAVE);
-
- out_unlock:
-       mutex_unlock(&i2sdev->lock);
-       return result;
-}
-
-#ifdef CONFIG_PM
-void i2sbus_pcm_prepare_both(struct i2sbus_dev *i2sdev)
-{
-       i2sbus_pcm_prepare(i2sdev, 0);
-       i2sbus_pcm_prepare(i2sdev, 1);
-}
-#endif
-
-static int i2sbus_pcm_trigger(struct i2sbus_dev *i2sdev, int in, int cmd)
-{
-       struct codec_info_item *cii;
-       struct pcm_info *pi;
-       int result = 0;
-       unsigned long flags;
-
-       spin_lock_irqsave(&i2sdev->low_lock, flags);
-
-       get_pcm_info(i2sdev, in, &pi, NULL);
-
-       switch (cmd) {
-       case SNDRV_PCM_TRIGGER_START:
-       case SNDRV_PCM_TRIGGER_RESUME:
-               if (pi->dbdma_ring.running) {
-                       result = -EALREADY;
-                       goto out_unlock;
-               }
-               list_for_each_entry(cii, &i2sdev->sound.codec_list, list)
-                       if (cii->codec->start)
-                               cii->codec->start(cii, pi->substream);
-               pi->dbdma_ring.running = 1;
-
-               if (pi->dbdma_ring.stopping) {
-                       /* Clear the S0 bit, then see if we stopped yet */
-                       out_le32(&pi->dbdma->control, 1 << 16);
-                       if (in_le32(&pi->dbdma->status) & ACTIVE) {
-                               /* possible race here? */
-                               udelay(10);
-                               if (in_le32(&pi->dbdma->status) & ACTIVE) {
-                                       pi->dbdma_ring.stopping = 0;
-                                       goto out_unlock; /* keep running */
-                               }
-                       }
-               }
-
-               /* make sure RUN, PAUSE and S0 bits are cleared */
-               out_le32(&pi->dbdma->control, (RUN | PAUSE | 1) << 16);
-
-               /* set branch condition select register */
-               out_le32(&pi->dbdma->br_sel, (1 << 16) | 1);
-
-               /* write dma command buffer address to the dbdma chip */
-               out_le32(&pi->dbdma->cmdptr, pi->dbdma_ring.bus_cmd_start);
-
-               /* initialize the frame count and current period */
-               pi->current_period = 0;
-               pi->frame_count = in_le32(&i2sdev->intfregs->frame_count);
-
-               /* set the DMA controller running */
-               out_le32(&pi->dbdma->control, (RUN << 16) | RUN);
-
-               /* off you go! */
-               break;
-
-       case SNDRV_PCM_TRIGGER_STOP:
-       case SNDRV_PCM_TRIGGER_SUSPEND:
-               if (!pi->dbdma_ring.running) {
-                       result = -EALREADY;
-                       goto out_unlock;
-               }
-               pi->dbdma_ring.running = 0;
-
-               /* Set the S0 bit to make the DMA branch to the stop cmd */
-               out_le32(&pi->dbdma->control, (1 << 16) | 1);
-               pi->dbdma_ring.stopping = 1;
-
-               list_for_each_entry(cii, &i2sdev->sound.codec_list, list)
-                       if (cii->codec->stop)
-                               cii->codec->stop(cii, pi->substream);
-               break;
-       default:
-               result = -EINVAL;
-               goto out_unlock;
-       }
-
- out_unlock:
-       spin_unlock_irqrestore(&i2sdev->low_lock, flags);
-       return result;
-}
-
-static snd_pcm_uframes_t i2sbus_pcm_pointer(struct i2sbus_dev *i2sdev, int in)
-{
-       struct pcm_info *pi;
-       u32 fc;
-
-       get_pcm_info(i2sdev, in, &pi, NULL);
-
-       fc = in_le32(&i2sdev->intfregs->frame_count);
-       fc = fc - pi->frame_count;
-
-       if (fc >= pi->substream->runtime->buffer_size)
-               fc %= pi->substream->runtime->buffer_size;
-       return fc;
-}
-
-static inline void handle_interrupt(struct i2sbus_dev *i2sdev, int in)
-{
-       struct pcm_info *pi;
-       u32 fc, nframes;
-       u32 status;
-       int timeout, i;
-       int dma_stopped = 0;
-       struct snd_pcm_runtime *runtime;
-
-       spin_lock(&i2sdev->low_lock);
-       get_pcm_info(i2sdev, in, &pi, NULL);
-       if (!pi->dbdma_ring.running && !pi->dbdma_ring.stopping)
-               goto out_unlock;
-
-       i = pi->current_period;
-       runtime = pi->substream->runtime;
-       while (pi->dbdma_ring.cmds[i].xfer_status) {
-               if (le16_to_cpu(pi->dbdma_ring.cmds[i].xfer_status) & BT)
-                       /*
-                        * BT is the branch taken bit.  If it took a branch
-                        * it is because we set the S0 bit to make it
-                        * branch to the stop command.
-                        */
-                       dma_stopped = 1;
-               pi->dbdma_ring.cmds[i].xfer_status = 0;
-
-               if (++i >= runtime->periods) {
-                       i = 0;
-                       pi->frame_count += runtime->buffer_size;
-               }
-               pi->current_period = i;
-
-               /*
-                * Check the frame count.  The DMA tends to get a bit
-                * ahead of the frame counter, which confuses the core.
-                */
-               fc = in_le32(&i2sdev->intfregs->frame_count);
-               nframes = i * runtime->period_size;
-               if (fc < pi->frame_count + nframes)
-                       pi->frame_count = fc - nframes;
-       }
-
-       if (dma_stopped) {
-               timeout = 1000;
-               for (;;) {
-                       status = in_le32(&pi->dbdma->status);
-                       if (!(status & ACTIVE) && (!in || (status & 0x80)))
-                               break;
-                       if (--timeout <= 0) {
-                               printk(KERN_ERR "i2sbus: timed out "
-                                      "waiting for DMA to stop!\n");
-                               break;
-                       }
-                       udelay(1);
-               }
-
-               /* Turn off DMA controller, clear S0 bit */
-               out_le32(&pi->dbdma->control, (RUN | PAUSE | 1) << 16);
-
-               pi->dbdma_ring.stopping = 0;
-               if (pi->stop_completion)
-                       complete(pi->stop_completion);
-       }
-
-       if (!pi->dbdma_ring.running)
-               goto out_unlock;
-       spin_unlock(&i2sdev->low_lock);
-       /* may call _trigger again, hence needs to be unlocked */
-       snd_pcm_period_elapsed(pi->substream);
-       return;
-
- out_unlock:
-       spin_unlock(&i2sdev->low_lock);
-}
-
-irqreturn_t i2sbus_tx_intr(int irq, void *devid)
-{
-       handle_interrupt((struct i2sbus_dev *)devid, 0);
-       return IRQ_HANDLED;
-}
-
-irqreturn_t i2sbus_rx_intr(int irq, void *devid)
-{
-       handle_interrupt((struct i2sbus_dev *)devid, 1);
-       return IRQ_HANDLED;
-}
-
-static int i2sbus_playback_open(struct snd_pcm_substream *substream)
-{
-       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
-
-       if (!i2sdev)
-               return -EINVAL;
-       i2sdev->out.substream = substream;
-       return i2sbus_pcm_open(i2sdev, 0);
-}
-
-static int i2sbus_playback_close(struct snd_pcm_substream *substream)
-{
-       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
-       int err;
-
-       if (!i2sdev)
-               return -EINVAL;
-       if (i2sdev->out.substream != substream)
-               return -EINVAL;
-       err = i2sbus_pcm_close(i2sdev, 0);
-       if (!err)
-               i2sdev->out.substream = NULL;
-       return err;
-}
-
-static int i2sbus_playback_prepare(struct snd_pcm_substream *substream)
-{
-       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
-
-       if (!i2sdev)
-               return -EINVAL;
-       if (i2sdev->out.substream != substream)
-               return -EINVAL;
-       return i2sbus_pcm_prepare(i2sdev, 0);
-}
-
-static int i2sbus_playback_trigger(struct snd_pcm_substream *substream, int cmd)
-{
-       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
-
-       if (!i2sdev)
-               return -EINVAL;
-       if (i2sdev->out.substream != substream)
-               return -EINVAL;
-       return i2sbus_pcm_trigger(i2sdev, 0, cmd);
-}
-
-static snd_pcm_uframes_t i2sbus_playback_pointer(struct snd_pcm_substream
-                                                *substream)
-{
-       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
-
-       if (!i2sdev)
-               return -EINVAL;
-       if (i2sdev->out.substream != substream)
-               return 0;
-       return i2sbus_pcm_pointer(i2sdev, 0);
-}
-
-static struct snd_pcm_ops i2sbus_playback_ops = {
-       .open =         i2sbus_playback_open,
-       .close =        i2sbus_playback_close,
-       .ioctl =        snd_pcm_lib_ioctl,
-       .hw_params =    i2sbus_hw_params,
-       .hw_free =      i2sbus_playback_hw_free,
-       .prepare =      i2sbus_playback_prepare,
-       .trigger =      i2sbus_playback_trigger,
-       .pointer =      i2sbus_playback_pointer,
-};
-
-static int i2sbus_record_open(struct snd_pcm_substream *substream)
-{
-       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
-
-       if (!i2sdev)
-               return -EINVAL;
-       i2sdev->in.substream = substream;
-       return i2sbus_pcm_open(i2sdev, 1);
-}
-
-static int i2sbus_record_close(struct snd_pcm_substream *substream)
-{
-       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
-       int err;
-
-       if (!i2sdev)
-               return -EINVAL;
-       if (i2sdev->in.substream != substream)
-               return -EINVAL;
-       err = i2sbus_pcm_close(i2sdev, 1);
-       if (!err)
-               i2sdev->in.substream = NULL;
-       return err;
-}
-
-static int i2sbus_record_prepare(struct snd_pcm_substream *substream)
-{
-       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
-
-       if (!i2sdev)
-               return -EINVAL;
-       if (i2sdev->in.substream != substream)
-               return -EINVAL;
-       return i2sbus_pcm_prepare(i2sdev, 1);
-}
-
-static int i2sbus_record_trigger(struct snd_pcm_substream *substream, int cmd)
-{
-       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
-
-       if (!i2sdev)
-               return -EINVAL;
-       if (i2sdev->in.substream != substream)
-               return -EINVAL;
-       return i2sbus_pcm_trigger(i2sdev, 1, cmd);
-}
-
-static snd_pcm_uframes_t i2sbus_record_pointer(struct snd_pcm_substream
-                                              *substream)
-{
-       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
-
-       if (!i2sdev)
-               return -EINVAL;
-       if (i2sdev->in.substream != substream)
-               return 0;
-       return i2sbus_pcm_pointer(i2sdev, 1);
-}
-
-static struct snd_pcm_ops i2sbus_record_ops = {
-       .open =         i2sbus_record_open,
-       .close =        i2sbus_record_close,
-       .ioctl =        snd_pcm_lib_ioctl,
-       .hw_params =    i2sbus_hw_params,
-       .hw_free =      i2sbus_record_hw_free,
-       .prepare =      i2sbus_record_prepare,
-       .trigger =      i2sbus_record_trigger,
-       .pointer =      i2sbus_record_pointer,
-};
-
-static void i2sbus_private_free(struct snd_pcm *pcm)
-{
-       struct i2sbus_dev *i2sdev = snd_pcm_chip(pcm);
-       struct codec_info_item *p, *tmp;
-
-       i2sdev->sound.pcm = NULL;
-       i2sdev->out.created = 0;
-       i2sdev->in.created = 0;
-       list_for_each_entry_safe(p, tmp, &i2sdev->sound.codec_list, list) {
-               printk(KERN_ERR "i2sbus: a codec didn't unregister!\n");
-               list_del(&p->list);
-               module_put(p->codec->owner);
-               kfree(p);
-       }
-       soundbus_dev_put(&i2sdev->sound);
-       module_put(THIS_MODULE);
-}
-
-int
-i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card,
-                   struct codec_info *ci, void *data)
-{
-       int err, in = 0, out = 0;
-       struct transfer_info *tmp;
-       struct i2sbus_dev *i2sdev = soundbus_dev_to_i2sbus_dev(dev);
-       struct codec_info_item *cii;
-
-       if (!dev->pcmname || dev->pcmid == -1) {
-               printk(KERN_ERR "i2sbus: pcm name and id must be set!\n");
-               return -EINVAL;
-       }
-
-       list_for_each_entry(cii, &dev->codec_list, list) {
-               if (cii->codec_data == data)
-                       return -EALREADY;
-       }
-
-       if (!ci->transfers || !ci->transfers->formats
-           || !ci->transfers->rates || !ci->usable)
-               return -EINVAL;
-
-       /* we currently code the i2s transfer on the clock, and support only
-        * 32 and 64 */
-       if (ci->bus_factor != 32 && ci->bus_factor != 64)
-               return -EINVAL;
-
-       /* If you want to fix this, you need to keep track of what transport infos
-        * are to be used, which codecs they belong to, and then fix all the
-        * sysclock/busclock stuff above to depend on which is usable */
-       list_for_each_entry(cii, &dev->codec_list, list) {
-               if (cii->codec->sysclock_factor != ci->sysclock_factor) {
-                       printk(KERN_DEBUG
-                              "cannot yet handle multiple different sysclocks!\n");
-                       return -EINVAL;
-               }
-               if (cii->codec->bus_factor != ci->bus_factor) {
-                       printk(KERN_DEBUG
-                              "cannot yet handle multiple different bus clocks!\n");
-                       return -EINVAL;
-               }
-       }
-
-       tmp = ci->transfers;
-       while (tmp->formats && tmp->rates) {
-               if (tmp->transfer_in)
-                       in = 1;
-               else
-                       out = 1;
-               tmp++;
-       }
-
-       cii = kzalloc(sizeof(struct codec_info_item), GFP_KERNEL);
-       if (!cii) {
-               printk(KERN_DEBUG "i2sbus: failed to allocate cii\n");
-               return -ENOMEM;
-       }
-
-       /* use the private data to point to the codec info */
-       cii->sdev = soundbus_dev_get(dev);
-       cii->codec = ci;
-       cii->codec_data = data;
-
-       if (!cii->sdev) {
-               printk(KERN_DEBUG
-                      "i2sbus: failed to get soundbus dev reference\n");
-               err = -ENODEV;
-               goto out_free_cii;
-       }
-
-       if (!try_module_get(THIS_MODULE)) {
-               printk(KERN_DEBUG "i2sbus: failed to get module reference!\n");
-               err = -EBUSY;
-               goto out_put_sdev;
-       }
-
-       if (!try_module_get(ci->owner)) {
-               printk(KERN_DEBUG
-                      "i2sbus: failed to get module reference to codec owner!\n");
-               err = -EBUSY;
-               goto out_put_this_module;
-       }
-
-       if (!dev->pcm) {
-               err = snd_pcm_new(card, dev->pcmname, dev->pcmid, 0, 0,
-                                 &dev->pcm);
-               if (err) {
-                       printk(KERN_DEBUG "i2sbus: failed to create pcm\n");
-                       goto out_put_ci_module;
-               }
-               dev->pcm->dev = &dev->ofdev.dev;
-       }
-
-       /* ALSA yet again sucks.
-        * If it is ever fixed, remove this line. See below. */
-       out = in = 1;
-
-       if (!i2sdev->out.created && out) {
-               if (dev->pcm->card != card) {
-                       /* eh? */
-                       printk(KERN_ERR
-                              "Can't attach same bus to different cards!\n");
-                       err = -EINVAL;
-                       goto out_put_ci_module;
-               }
-               err = snd_pcm_new_stream(dev->pcm, SNDRV_PCM_STREAM_PLAYBACK, 1);
-               if (err)
-                       goto out_put_ci_module;
-               snd_pcm_set_ops(dev->pcm, SNDRV_PCM_STREAM_PLAYBACK,
-                               &i2sbus_playback_ops);
-               i2sdev->out.created = 1;
-       }
-
-       if (!i2sdev->in.created && in) {
-               if (dev->pcm->card != card) {
-                       printk(KERN_ERR
-                              "Can't attach same bus to different cards!\n");
-                       err = -EINVAL;
-                       goto out_put_ci_module;
-               }
-               err = snd_pcm_new_stream(dev->pcm, SNDRV_PCM_STREAM_CAPTURE, 1);
-               if (err)
-                       goto out_put_ci_module;
-               snd_pcm_set_ops(dev->pcm, SNDRV_PCM_STREAM_CAPTURE,
-                               &i2sbus_record_ops);
-               i2sdev->in.created = 1;
-       }
-
-       /* so we have to register the pcm after adding any substream
-        * to it because alsa doesn't create the devices for the
-        * substreams when we add them later.
-        * Therefore, force in and out on both busses (above) and
-        * register the pcm now instead of just after creating it.
-        */
-       err = snd_device_register(card, dev->pcm);
-       if (err) {
-               printk(KERN_ERR "i2sbus: error registering new pcm\n");
-               goto out_put_ci_module;
-       }
-       /* no errors any more, so let's add this to our list */
-       list_add(&cii->list, &dev->codec_list);
-
-       dev->pcm->private_data = i2sdev;
-       dev->pcm->private_free = i2sbus_private_free;
-
-       /* well, we really should support scatter/gather DMA */
-       snd_pcm_lib_preallocate_pages_for_all(
-               dev->pcm, SNDRV_DMA_TYPE_DEV,
-               snd_dma_pci_data(macio_get_pci_dev(i2sdev->macio)),
-               64 * 1024, 64 * 1024);
-
-       return 0;
- out_put_ci_module:
-       module_put(ci->owner);
- out_put_this_module:
-       module_put(THIS_MODULE);
- out_put_sdev:
-       soundbus_dev_put(dev);
- out_free_cii:
-       kfree(cii);
-       return err;
-}
-
-void i2sbus_detach_codec(struct soundbus_dev *dev, void *data)
-{
-       struct codec_info_item *cii = NULL, *i;
-
-       list_for_each_entry(i, &dev->codec_list, list) {
-               if (i->codec_data == data) {
-                       cii = i;
-                       break;
-               }
-       }
-       if (cii) {
-               list_del(&cii->list);
-               module_put(cii->codec->owner);
-               kfree(cii);
-       }
-       /* no more codecs, but still a pcm? */
-       if (list_empty(&dev->codec_list) && dev->pcm) {
-               /* the actual cleanup is done by the callback above! */
-               snd_device_free(dev->pcm->card, dev->pcm);
-       }
-}
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus.h b/sound/aoa/soundbus/i2sbus/i2sbus.h

index ff29654782c96efdee2c3f9ba21064ea49bba393..befefd99e271a525a9a5175768501d199aa64887 100644 (file)
--- a/sound/aoa/soundbus/i2sbus/i2sbus.h
+++ b/sound/aoa/soundbus/i2sbus/i2sbus.h
@@ -18,7 +18,7 @@
  #include <asm/pmac_feature.h>
  #include <asm/dbdma.h>
  
-#include "i2sbus-interface.h"
+#include "interface.h"
  #include "../soundbus.h"
  
  struct i2sbus_control {
diff --git a/sound/aoa/soundbus/i2sbus/interface.h b/sound/aoa/soundbus/i2sbus/interface.h

new file mode 100644 (file)

index 0000000..c6b5f54
--- /dev/null
+++ b/sound/aoa/soundbus/i2sbus/interface.h
@@ -0,0 +1,187 @@
+/*
+ * i2sbus driver -- interface register definitions
+ *
+ * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
+ *
+ * GPL v2, can be found in COPYING.
+ */
+#ifndef __I2SBUS_INTERFACE_H
+#define __I2SBUS_INTERFACE_H
+
+/* i2s bus control registers, at least what we know about them */
+
+#define __PAD(m,n) u8 __pad##m[n]
+#define _PAD(line, n) __PAD(line, n)
+#define PAD(n) _PAD(__LINE__, (n))
+struct i2s_interface_regs {
+       __le32 intr_ctl;        /* 0x00 */
+       PAD(12);
+       __le32 serial_format;   /* 0x10 */
+       PAD(12);
+       __le32 codec_msg_out;   /* 0x20 */
+       PAD(12);
+       __le32 codec_msg_in;    /* 0x30 */
+       PAD(12);
+       __le32 frame_count;     /* 0x40 */
+       PAD(12);
+       __le32 frame_match;     /* 0x50 */
+       PAD(12);
+       __le32 data_word_sizes; /* 0x60 */
+       PAD(12);
+       __le32 peak_level_sel;  /* 0x70 */
+       PAD(12);
+       __le32 peak_level_in0;  /* 0x80 */
+       PAD(12);
+       __le32 peak_level_in1;  /* 0x90 */
+       PAD(12);
+       /* total size: 0x100 bytes */
+}  __attribute__((__packed__));
+
+/* interrupt register is just a bitfield with
+ * interrupt enable and pending bits */
+#define I2S_REG_INTR_CTL               0x00
+#      define I2S_INT_FRAME_COUNT              (1<<31)
+#      define I2S_PENDING_FRAME_COUNT          (1<<30)
+#      define I2S_INT_MESSAGE_FLAG             (1<<29)
+#      define I2S_PENDING_MESSAGE_FLAG         (1<<28)
+#      define I2S_INT_NEW_PEAK                 (1<<27)
+#      define I2S_PENDING_NEW_PEAK             (1<<26)
+#      define I2S_INT_CLOCKS_STOPPED           (1<<25)
+#      define I2S_PENDING_CLOCKS_STOPPED       (1<<24)
+#      define I2S_INT_EXTERNAL_SYNC_ERROR      (1<<23)
+#      define I2S_PENDING_EXTERNAL_SYNC_ERROR  (1<<22)
+#      define I2S_INT_EXTERNAL_SYNC_OK         (1<<21)
+#      define I2S_PENDING_EXTERNAL_SYNC_OK     (1<<20)
+#      define I2S_INT_NEW_SAMPLE_RATE          (1<<19)
+#      define I2S_PENDING_NEW_SAMPLE_RATE      (1<<18)
+#      define I2S_INT_STATUS_FLAG              (1<<17)
+#      define I2S_PENDING_STATUS_FLAG          (1<<16)
+
+/* serial format register is more interesting :)
+ * It contains:
+ *  - clock source
+ *  - MClk divisor
+ *  - SClk divisor
+ *  - SClk master flag
+ *  - serial format (sony, i2s 64x, i2s 32x, dav, silabs)
+ *  - external sample frequency interrupt (don't understand)
+ *  - external sample frequency
+ */
+#define I2S_REG_SERIAL_FORMAT          0x10
+/* clock source. You get either 18.432, 45.1584 or 49.1520 MHz */
+#      define I2S_SF_CLOCK_SOURCE_SHIFT        30
+#      define I2S_SF_CLOCK_SOURCE_MASK         (3<<I2S_SF_CLOCK_SOURCE_SHIFT)
+#      define I2S_SF_CLOCK_SOURCE_18MHz        (0<<I2S_SF_CLOCK_SOURCE_SHIFT)
+#      define I2S_SF_CLOCK_SOURCE_45MHz        (1<<I2S_SF_CLOCK_SOURCE_SHIFT)
+#      define I2S_SF_CLOCK_SOURCE_49MHz        (2<<I2S_SF_CLOCK_SOURCE_SHIFT)
+/* also, let's define the exact clock speeds here, in Hz */
+#define I2S_CLOCK_SPEED_18MHz  18432000
+#define I2S_CLOCK_SPEED_45MHz  45158400
+#define I2S_CLOCK_SPEED_49MHz  49152000
+/* MClk is the clock that drives the codec, usually called its 'system clock'.
+ * It is derived by taking only every 'divisor' tick of the clock.
+ */
+#      define I2S_SF_MCLKDIV_SHIFT             24
+#      define I2S_SF_MCLKDIV_MASK              (0x1F<<I2S_SF_MCLKDIV_SHIFT)
+#      define I2S_SF_MCLKDIV_1                 (0x14<<I2S_SF_MCLKDIV_SHIFT)
+#      define I2S_SF_MCLKDIV_3                 (0x13<<I2S_SF_MCLKDIV_SHIFT)
+#      define I2S_SF_MCLKDIV_5                 (0x12<<I2S_SF_MCLKDIV_SHIFT)
+#      define I2S_SF_MCLKDIV_14                (0x0E<<I2S_SF_MCLKDIV_SHIFT)
+#      define I2S_SF_MCLKDIV_OTHER(div)        (((div/2-1)<<I2S_SF_MCLKDIV_SHIFT)&I2S_SF_MCLKDIV_MASK)
+static inline int i2s_sf_mclkdiv(int div, int *out)
+{
+       int d;
+
+       switch(div) {
+       case 1: *out |= I2S_SF_MCLKDIV_1; return 0;
+       case 3: *out |= I2S_SF_MCLKDIV_3; return 0;
+       case 5: *out |= I2S_SF_MCLKDIV_5; return 0;
+       case 14: *out |= I2S_SF_MCLKDIV_14; return 0;
+       default:
+               if (div%2) return -1;
+               d = div/2-1;
+               if (d == 0x14 || d == 0x13 || d == 0x12 || d == 0x0E)
+                       return -1;
+               *out |= I2S_SF_MCLKDIV_OTHER(div);
+               return 0;
+       }
+}
+/* SClk is the clock that drives the i2s wire bus. Note that it is
+ * derived from the MClk above by taking only every 'divisor' tick
+ * of MClk.
+ */
+#      define I2S_SF_SCLKDIV_SHIFT             20
+#      define I2S_SF_SCLKDIV_MASK              (0xF<<I2S_SF_SCLKDIV_SHIFT)
+#      define I2S_SF_SCLKDIV_1                 (8<<I2S_SF_SCLKDIV_SHIFT)
+#      define I2S_SF_SCLKDIV_3                 (9<<I2S_SF_SCLKDIV_SHIFT)
+#      define I2S_SF_SCLKDIV_OTHER(div)        (((div/2-1)<<I2S_SF_SCLKDIV_SHIFT)&I2S_SF_SCLKDIV_MASK)
+static inline int i2s_sf_sclkdiv(int div, int *out)
+{
+       int d;
+
+       switch(div) {
+       case 1: *out |= I2S_SF_SCLKDIV_1; return 0;
+       case 3: *out |= I2S_SF_SCLKDIV_3; return 0;
+       default:
+               if (div%2) return -1;
+               d = div/2-1;
+               if (d == 8 || d == 9) return -1;
+               *out |= I2S_SF_SCLKDIV_OTHER(div);
+               return 0;
+       }
+}
+#      define I2S_SF_SCLK_MASTER               (1<<19)
+/* serial format is the way the data is put to the i2s wire bus */
+#      define I2S_SF_SERIAL_FORMAT_SHIFT       16
+#      define I2S_SF_SERIAL_FORMAT_MASK        (7<<I2S_SF_SERIAL_FORMAT_SHIFT)
+#      define I2S_SF_SERIAL_FORMAT_SONY        (0<<I2S_SF_SERIAL_FORMAT_SHIFT)
+#      define I2S_SF_SERIAL_FORMAT_I2S_64X     (1<<I2S_SF_SERIAL_FORMAT_SHIFT)
+#      define I2S_SF_SERIAL_FORMAT_I2S_32X     (2<<I2S_SF_SERIAL_FORMAT_SHIFT)
+#      define I2S_SF_SERIAL_FORMAT_I2S_DAV     (4<<I2S_SF_SERIAL_FORMAT_SHIFT)
+#      define I2S_SF_SERIAL_FORMAT_I2S_SILABS  (5<<I2S_SF_SERIAL_FORMAT_SHIFT)
+/* unknown */
+#      define I2S_SF_EXT_SAMPLE_FREQ_INT_SHIFT 12
+#      define I2S_SF_EXT_SAMPLE_FREQ_INT_MASK  (0xF<<I2S_SF_SAMPLE_FREQ_INT_SHIFT)
+/* probably gives external frequency? */
+#      define I2S_SF_EXT_SAMPLE_FREQ_MASK      0xFFF
+
+/* used to send codec messages, but how isn't clear */
+#define I2S_REG_CODEC_MSG_OUT          0x20
+
+/* used to receive codec messages, but how isn't clear */
+#define I2S_REG_CODEC_MSG_IN           0x30
+
+/* frame count reg isn't clear to me yet, but probably useful */
+#define I2S_REG_FRAME_COUNT            0x40
+
+/* program to some value, and get interrupt if frame count reaches it */
+#define I2S_REG_FRAME_MATCH            0x50
+
+/* this register describes how the bus transfers data */
+#define I2S_REG_DATA_WORD_SIZES                0x60
+/* number of interleaved input channels */
+#      define I2S_DWS_NUM_CHANNELS_IN_SHIFT    24
+#      define I2S_DWS_NUM_CHANNELS_IN_MASK     (0x1F<<I2S_DWS_NUM_CHANNELS_IN_SHIFT)
+/* word size of input data */
+#      define I2S_DWS_DATA_IN_SIZE_SHIFT       16
+#      define I2S_DWS_DATA_IN_16BIT            (0<<I2S_DWS_DATA_IN_SIZE_SHIFT)
+#      define I2S_DWS_DATA_IN_24BIT            (3<<I2S_DWS_DATA_IN_SIZE_SHIFT)
+/* number of interleaved output channels */
+#      define I2S_DWS_NUM_CHANNELS_OUT_SHIFT   8
+#      define I2S_DWS_NUM_CHANNELS_OUT_MASK    (0x1F<<I2S_DWS_NUM_CHANNELS_OUT_SHIFT)
+/* word size of output data */
+#      define I2S_DWS_DATA_OUT_SIZE_SHIFT      0
+#      define I2S_DWS_DATA_OUT_16BIT           (0<<I2S_DWS_DATA_OUT_SIZE_SHIFT)
+#      define I2S_DWS_DATA_OUT_24BIT           (3<<I2S_DWS_DATA_OUT_SIZE_SHIFT)
+
+
+/* unknown */
+#define I2S_REG_PEAK_LEVEL_SEL         0x70
+
+/* unknown */
+#define I2S_REG_PEAK_LEVEL_IN0         0x80
+
+/* unknown */
+#define I2S_REG_PEAK_LEVEL_IN1         0x90
+
+#endif /* __I2SBUS_INTERFACE_H */
diff --git a/sound/aoa/soundbus/i2sbus/pcm.c b/sound/aoa/soundbus/i2sbus/pcm.c

new file mode 100644 (file)

index 0000000..59bacd3
--- /dev/null
+++ b/sound/aoa/soundbus/i2sbus/pcm.c
@@ -0,0 +1,1062 @@
+/*
+ * i2sbus driver -- pcm routines
+ *
+ * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
+ *
+ * GPL v2, can be found in COPYING.
+ */
+
+#include <asm/io.h>
+#include <linux/delay.h>
+#include <sound/core.h>
+#include <asm/macio.h>
+#include <linux/pci.h>
+#include "../soundbus.h"
+#include "i2sbus.h"
+
+static inline void get_pcm_info(struct i2sbus_dev *i2sdev, int in,
+                               struct pcm_info **pi, struct pcm_info **other)
+{
+       if (in) {
+               if (pi)
+                       *pi = &i2sdev->in;
+               if (other)
+                       *other = &i2sdev->out;
+       } else {
+               if (pi)
+                       *pi = &i2sdev->out;
+               if (other)
+                       *other = &i2sdev->in;
+       }
+}
+
+static int clock_and_divisors(int mclk, int sclk, int rate, int *out)
+{
+       /* sclk must be derived from mclk! */
+       if (mclk % sclk)
+               return -1;
+       /* derive sclk register value */
+       if (i2s_sf_sclkdiv(mclk / sclk, out))
+               return -1;
+
+       if (I2S_CLOCK_SPEED_18MHz % (rate * mclk) == 0) {
+               if (!i2s_sf_mclkdiv(I2S_CLOCK_SPEED_18MHz / (rate * mclk), out)) {
+                       *out |= I2S_SF_CLOCK_SOURCE_18MHz;
+                       return 0;
+               }
+       }
+       if (I2S_CLOCK_SPEED_45MHz % (rate * mclk) == 0) {
+               if (!i2s_sf_mclkdiv(I2S_CLOCK_SPEED_45MHz / (rate * mclk), out)) {
+                       *out |= I2S_SF_CLOCK_SOURCE_45MHz;
+                       return 0;
+               }
+       }
+       if (I2S_CLOCK_SPEED_49MHz % (rate * mclk) == 0) {
+               if (!i2s_sf_mclkdiv(I2S_CLOCK_SPEED_49MHz / (rate * mclk), out)) {
+                       *out |= I2S_SF_CLOCK_SOURCE_49MHz;
+                       return 0;
+               }
+       }
+       return -1;
+}
+
+#define CHECK_RATE(rate)                                               \
+       do { if (rates & SNDRV_PCM_RATE_ ##rate) {                      \
+               int dummy;                                              \
+               if (clock_and_divisors(sysclock_factor,                 \
+                                      bus_factor, rate, &dummy))       \
+                       rates &= ~SNDRV_PCM_RATE_ ##rate;               \
+       } } while (0)
+
+static int i2sbus_pcm_open(struct i2sbus_dev *i2sdev, int in)
+{
+       struct pcm_info *pi, *other;
+       struct soundbus_dev *sdev;
+       int masks_inited = 0, err;
+       struct codec_info_item *cii, *rev;
+       struct snd_pcm_hardware *hw;
+       u64 formats = 0;
+       unsigned int rates = 0;
+       struct transfer_info v;
+       int result = 0;
+       int bus_factor = 0, sysclock_factor = 0;
+       int found_this;
+
+       mutex_lock(&i2sdev->lock);
+
+       get_pcm_info(i2sdev, in, &pi, &other);
+
+       hw = &pi->substream->runtime->hw;
+       sdev = &i2sdev->sound;
+
+       if (pi->active) {
+               /* alsa messed up */
+               result = -EBUSY;
+               goto out_unlock;
+       }
+
+       /* we now need to assign the hw */
+       list_for_each_entry(cii, &sdev->codec_list, list) {
+               struct transfer_info *ti = cii->codec->transfers;
+               bus_factor = cii->codec->bus_factor;
+               sysclock_factor = cii->codec->sysclock_factor;
+               while (ti->formats && ti->rates) {
+                       v = *ti;
+                       if (ti->transfer_in == in
+                           && cii->codec->usable(cii, ti, &v)) {
+                               if (masks_inited) {
+                                       formats &= v.formats;
+                                       rates &= v.rates;
+                               } else {
+                                       formats = v.formats;
+                                       rates = v.rates;
+                                       masks_inited = 1;
+                               }
+                       }
+                       ti++;
+               }
+       }
+       if (!masks_inited || !bus_factor || !sysclock_factor) {
+               result = -ENODEV;
+               goto out_unlock;
+       }
+       /* bus dependent stuff */
+       hw->info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
+                  SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_RESUME |
+                  SNDRV_PCM_INFO_JOINT_DUPLEX;
+
+       CHECK_RATE(5512);
+       CHECK_RATE(8000);
+       CHECK_RATE(11025);
+       CHECK_RATE(16000);
+       CHECK_RATE(22050);
+       CHECK_RATE(32000);
+       CHECK_RATE(44100);
+       CHECK_RATE(48000);
+       CHECK_RATE(64000);
+       CHECK_RATE(88200);
+       CHECK_RATE(96000);
+       CHECK_RATE(176400);
+       CHECK_RATE(192000);
+       hw->rates = rates;
+
+       /* well. the codec might want 24 bits only, and we'll
+        * ever only transfer 24 bits, but they are top-aligned!
+        * So for alsa, we claim that we're doing full 32 bit
+        * while in reality we'll ignore the lower 8 bits of
+        * that when doing playback (they're transferred as 0
+        * as far as I know, no codecs we have are 32-bit capable
+        * so I can't really test) and when doing recording we'll
+        * always have those lower 8 bits recorded as 0 */
+       if (formats & SNDRV_PCM_FMTBIT_S24_BE)
+               formats |= SNDRV_PCM_FMTBIT_S32_BE;
+       if (formats & SNDRV_PCM_FMTBIT_U24_BE)
+               formats |= SNDRV_PCM_FMTBIT_U32_BE;
+       /* now mask off what we can support. I suppose we could
+        * also support S24_3LE and some similar formats, but I
+        * doubt there's a codec that would be able to use that,
+        * so we don't support it here. */
+       hw->formats = formats & (SNDRV_PCM_FMTBIT_S16_BE |
+                                SNDRV_PCM_FMTBIT_U16_BE |
+                                SNDRV_PCM_FMTBIT_S32_BE |
+                                SNDRV_PCM_FMTBIT_U32_BE);
+
+       /* we need to set the highest and lowest rate possible.
+        * These are the highest and lowest rates alsa can
+        * support properly in its bitfield.
+        * Below, we'll use that to restrict to the rate
+        * currently in use (if any). */
+       hw->rate_min = 5512;
+       hw->rate_max = 192000;
+       /* if the other stream is active, then we can only
+        * support what it is currently using.
+        * FIXME: I lied. This comment is wrong. We can support
+        * anything that works with the same serial format, ie.
+        * when recording 24 bit sound we can well play 16 bit
+        * sound at the same time iff using the same transfer mode.
+        */
+       if (other->active) {
+               /* FIXME: is this guaranteed by the alsa api? */
+               hw->formats &= (1ULL << i2sdev->format);
+               /* see above, restrict rates to the one we already have */
+               hw->rate_min = i2sdev->rate;
+               hw->rate_max = i2sdev->rate;
+       }
+
+       hw->channels_min = 2;
+       hw->channels_max = 2;
+       /* these are somewhat arbitrary */
+       hw->buffer_bytes_max = 131072;
+       hw->period_bytes_min = 256;
+       hw->period_bytes_max = 16384;
+       hw->periods_min = 3;
+       hw->periods_max = MAX_DBDMA_COMMANDS;
+       err = snd_pcm_hw_constraint_integer(pi->substream->runtime,
+                                           SNDRV_PCM_HW_PARAM_PERIODS);
+       if (err < 0) {
+               result = err;
+               goto out_unlock;
+       }
+       list_for_each_entry(cii, &sdev->codec_list, list) {
+               if (cii->codec->open) {
+                       err = cii->codec->open(cii, pi->substream);
+                       if (err) {
+                               result = err;
+                               /* unwind */
+                               found_this = 0;
+                               list_for_each_entry_reverse(rev,
+                                   &sdev->codec_list, list) {
+                                       if (found_this && rev->codec->close) {
+                                               rev->codec->close(rev,
+                                                               pi->substream);
+                                       }
+                                       if (rev == cii)
+                                               found_this = 1;
+                               }
+                               goto out_unlock;
+                       }
+               }
+       }
+
+ out_unlock:
+       mutex_unlock(&i2sdev->lock);
+       return result;
+}
+
+#undef CHECK_RATE
+
+static int i2sbus_pcm_close(struct i2sbus_dev *i2sdev, int in)
+{
+       struct codec_info_item *cii;
+       struct pcm_info *pi;
+       int err = 0, tmp;
+
+       mutex_lock(&i2sdev->lock);
+
+       get_pcm_info(i2sdev, in, &pi, NULL);
+
+       list_for_each_entry(cii, &i2sdev->sound.codec_list, list) {
+               if (cii->codec->close) {
+                       tmp = cii->codec->close(cii, pi->substream);
+                       if (tmp)
+                               err = tmp;
+               }
+       }
+
+       pi->substream = NULL;
+       pi->active = 0;
+       mutex_unlock(&i2sdev->lock);
+       return err;
+}
+
+static void i2sbus_wait_for_stop(struct i2sbus_dev *i2sdev,
+                                struct pcm_info *pi)
+{
+       unsigned long flags;
+       struct completion done;
+       long timeout;
+
+       spin_lock_irqsave(&i2sdev->low_lock, flags);
+       if (pi->dbdma_ring.stopping) {
+               init_completion(&done);
+               pi->stop_completion = &done;
+               spin_unlock_irqrestore(&i2sdev->low_lock, flags);
+               timeout = wait_for_completion_timeout(&done, HZ);
+               spin_lock_irqsave(&i2sdev->low_lock, flags);
+               pi->stop_completion = NULL;
+               if (timeout == 0) {
+                       /* timeout expired, stop dbdma forcefully */
+                       printk(KERN_ERR "i2sbus_wait_for_stop: timed out\n");
+                       /* make sure RUN, PAUSE and S0 bits are cleared */
+                       out_le32(&pi->dbdma->control, (RUN | PAUSE | 1) << 16);
+                       pi->dbdma_ring.stopping = 0;
+                       timeout = 10;
+                       while (in_le32(&pi->dbdma->status) & ACTIVE) {
+                               if (--timeout <= 0)
+                                       break;
+                               udelay(1);
+                       }
+               }
+       }
+       spin_unlock_irqrestore(&i2sdev->low_lock, flags);
+}
+
+#ifdef CONFIG_PM
+void i2sbus_wait_for_stop_both(struct i2sbus_dev *i2sdev)
+{
+       struct pcm_info *pi;
+
+       get_pcm_info(i2sdev, 0, &pi, NULL);
+       i2sbus_wait_for_stop(i2sdev, pi);
+       get_pcm_info(i2sdev, 1, &pi, NULL);
+       i2sbus_wait_for_stop(i2sdev, pi);
+}
+#endif
+
+static int i2sbus_hw_params(struct snd_pcm_substream *substream,
+                           struct snd_pcm_hw_params *params)
+{
+       return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
+}
+
+static inline int i2sbus_hw_free(struct snd_pcm_substream *substream, int in)
+{
+       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
+       struct pcm_info *pi;
+
+       get_pcm_info(i2sdev, in, &pi, NULL);
+       if (pi->dbdma_ring.stopping)
+               i2sbus_wait_for_stop(i2sdev, pi);
+       snd_pcm_lib_free_pages(substream);
+       return 0;
+}
+
+static int i2sbus_playback_hw_free(struct snd_pcm_substream *substream)
+{
+       return i2sbus_hw_free(substream, 0);
+}
+
+static int i2sbus_record_hw_free(struct snd_pcm_substream *substream)
+{
+       return i2sbus_hw_free(substream, 1);
+}
+
+static int i2sbus_pcm_prepare(struct i2sbus_dev *i2sdev, int in)
+{
+       /* whee. Hard work now. The user has selected a bitrate
+        * and bit format, so now we have to program our
+        * I2S controller appropriately. */
+       struct snd_pcm_runtime *runtime;
+       struct dbdma_cmd *command;
+       int i, periodsize, nperiods;
+       dma_addr_t offset;
+       struct bus_info bi;
+       struct codec_info_item *cii;
+       int sfr = 0;            /* serial format register */
+       int dws = 0;            /* data word sizes reg */
+       int input_16bit;
+       struct pcm_info *pi, *other;
+       int cnt;
+       int result = 0;
+       unsigned int cmd, stopaddr;
+
+       mutex_lock(&i2sdev->lock);
+
+       get_pcm_info(i2sdev, in, &pi, &other);
+
+       if (pi->dbdma_ring.running) {
+               result = -EBUSY;
+               goto out_unlock;
+       }
+       if (pi->dbdma_ring.stopping)
+               i2sbus_wait_for_stop(i2sdev, pi);
+
+       if (!pi->substream || !pi->substream->runtime) {
+               result = -EINVAL;
+               goto out_unlock;
+       }
+
+       runtime = pi->substream->runtime;
+       pi->active = 1;
+       if (other->active &&
+           ((i2sdev->format != runtime->format)
+            || (i2sdev->rate != runtime->rate))) {
+               result = -EINVAL;
+               goto out_unlock;
+       }
+
+       i2sdev->format = runtime->format;
+       i2sdev->rate = runtime->rate;
+
+       periodsize = snd_pcm_lib_period_bytes(pi->substream);
+       nperiods = pi->substream->runtime->periods;
+       pi->current_period = 0;
+
+       /* generate dbdma command ring first */
+       command = pi->dbdma_ring.cmds;
+       memset(command, 0, (nperiods + 2) * sizeof(struct dbdma_cmd));
+
+       /* commands to DMA to/from the ring */
+       /*
+        * For input, we need to do a graceful stop; if we abort
+        * the DMA, we end up with leftover bytes that corrupt
+        * the next recording.  To do this we set the S0 status
+        * bit and wait for the DMA controller to stop.  Each
+        * command has a branch condition to
+        * make it branch to a stop command if S0 is set.
+        * On input we also need to wait for the S7 bit to be
+        * set before turning off the DMA controller.
+        * In fact we do the graceful stop for output as well.
+        */
+       offset = runtime->dma_addr;
+       cmd = (in? INPUT_MORE: OUTPUT_MORE) | BR_IFSET | INTR_ALWAYS;
+       stopaddr = pi->dbdma_ring.bus_cmd_start +
+               (nperiods + 1) * sizeof(struct dbdma_cmd);
+       for (i = 0; i < nperiods; i++, command++, offset += periodsize) {
+               command->command = cpu_to_le16(cmd);
+               command->cmd_dep = cpu_to_le32(stopaddr);
+               command->phy_addr = cpu_to_le32(offset);
+               command->req_count = cpu_to_le16(periodsize);
+       }
+
+       /* branch back to beginning of ring */
+       command->command = cpu_to_le16(DBDMA_NOP | BR_ALWAYS);
+       command->cmd_dep = cpu_to_le32(pi->dbdma_ring.bus_cmd_start);
+       command++;
+
+       /* set stop command */
+       command->command = cpu_to_le16(DBDMA_STOP);
+
+       /* ok, let's set the serial format and stuff */
+       switch (runtime->format) {
+       /* 16 bit formats */
+       case SNDRV_PCM_FORMAT_S16_BE:
+       case SNDRV_PCM_FORMAT_U16_BE:
+               /* FIXME: if we add different bus factors we need to
+                * do more here!! */
+               bi.bus_factor = 0;
+               list_for_each_entry(cii, &i2sdev->sound.codec_list, list) {
+                       bi.bus_factor = cii->codec->bus_factor;
+                       break;
+               }
+               if (!bi.bus_factor) {
+                       result = -ENODEV;
+                       goto out_unlock;
+               }
+               input_16bit = 1;
+               break;
+       case SNDRV_PCM_FORMAT_S32_BE:
+       case SNDRV_PCM_FORMAT_U32_BE:
+               /* force 64x bus speed, otherwise the data cannot be
+                * transferred quickly enough! */
+               bi.bus_factor = 64;
+               input_16bit = 0;
+               break;
+       default:
+               result = -EINVAL;
+               goto out_unlock;
+       }
+       /* we assume all sysclocks are the same! */
+       list_for_each_entry(cii, &i2sdev->sound.codec_list, list) {
+               bi.sysclock_factor = cii->codec->sysclock_factor;
+               break;
+       }
+
+       if (clock_and_divisors(bi.sysclock_factor,
+                              bi.bus_factor,
+                              runtime->rate,
+                              &sfr) < 0) {
+               result = -EINVAL;
+               goto out_unlock;
+       }
+       switch (bi.bus_factor) {
+       case 32:
+               sfr |= I2S_SF_SERIAL_FORMAT_I2S_32X;
+               break;
+       case 64:
+               sfr |= I2S_SF_SERIAL_FORMAT_I2S_64X;
+               break;
+       }
+       /* FIXME: THIS ASSUMES MASTER ALL THE TIME */
+       sfr |= I2S_SF_SCLK_MASTER;
+
+       list_for_each_entry(cii, &i2sdev->sound.codec_list, list) {
+               int err = 0;
+               if (cii->codec->prepare)
+                       err = cii->codec->prepare(cii, &bi, pi->substream);
+               if (err) {
+                       result = err;
+                       goto out_unlock;
+               }
+       }
+       /* codecs are fine with it, so set our clocks */
+       if (input_16bit)
+               dws =   (2 << I2S_DWS_NUM_CHANNELS_IN_SHIFT) |
+                       (2 << I2S_DWS_NUM_CHANNELS_OUT_SHIFT) |
+                       I2S_DWS_DATA_IN_16BIT | I2S_DWS_DATA_OUT_16BIT;
+       else
+               dws =   (2 << I2S_DWS_NUM_CHANNELS_IN_SHIFT) |
+                       (2 << I2S_DWS_NUM_CHANNELS_OUT_SHIFT) |
+                       I2S_DWS_DATA_IN_24BIT | I2S_DWS_DATA_OUT_24BIT;
+
+       /* early exit if already programmed correctly */
+       /* not locking these is fine since we touch them only in this function */
+       if (in_le32(&i2sdev->intfregs->serial_format) == sfr
+        && in_le32(&i2sdev->intfregs->data_word_sizes) == dws)
+               goto out_unlock;
+
+       /* let's notify the codecs about clocks going away.
+        * For now we only do mastering on the i2s cell... */
+       list_for_each_entry(cii, &i2sdev->sound.codec_list, list)
+               if (cii->codec->switch_clock)
+                       cii->codec->switch_clock(cii, CLOCK_SWITCH_PREPARE_SLAVE);
+
+       i2sbus_control_enable(i2sdev->control, i2sdev);
+       i2sbus_control_cell(i2sdev->control, i2sdev, 1);
+
+       out_le32(&i2sdev->intfregs->intr_ctl, I2S_PENDING_CLOCKS_STOPPED);
+
+       i2sbus_control_clock(i2sdev->control, i2sdev, 0);
+
+       msleep(1);
+
+       /* wait for clock stopped. This can apparently take a while... */
+       cnt = 100;
+       while (cnt-- &&
+           !(in_le32(&i2sdev->intfregs->intr_ctl) & I2S_PENDING_CLOCKS_STOPPED)) {
+               msleep(5);
+       }
+       out_le32(&i2sdev->intfregs->intr_ctl, I2S_PENDING_CLOCKS_STOPPED);
+
+       /* not locking these is fine since we touch them only in this function */
+       out_le32(&i2sdev->intfregs->serial_format, sfr);
+       out_le32(&i2sdev->intfregs->data_word_sizes, dws);
+
+        i2sbus_control_enable(i2sdev->control, i2sdev);
+        i2sbus_control_cell(i2sdev->control, i2sdev, 1);
+        i2sbus_control_clock(i2sdev->control, i2sdev, 1);
+       msleep(1);
+
+       list_for_each_entry(cii, &i2sdev->sound.codec_list, list)
+               if (cii->codec->switch_clock)
+                       cii->codec->switch_clock(cii, CLOCK_SWITCH_SLAVE);
+
+ out_unlock:
+       mutex_unlock(&i2sdev->lock);
+       return result;
+}
+
+#ifdef CONFIG_PM
+void i2sbus_pcm_prepare_both(struct i2sbus_dev *i2sdev)
+{
+       i2sbus_pcm_prepare(i2sdev, 0);
+       i2sbus_pcm_prepare(i2sdev, 1);
+}
+#endif
+
+static int i2sbus_pcm_trigger(struct i2sbus_dev *i2sdev, int in, int cmd)
+{
+       struct codec_info_item *cii;
+       struct pcm_info *pi;
+       int result = 0;
+       unsigned long flags;
+
+       spin_lock_irqsave(&i2sdev->low_lock, flags);
+
+       get_pcm_info(i2sdev, in, &pi, NULL);
+
+       switch (cmd) {
+       case SNDRV_PCM_TRIGGER_START:
+       case SNDRV_PCM_TRIGGER_RESUME:
+               if (pi->dbdma_ring.running) {
+                       result = -EALREADY;
+                       goto out_unlock;
+               }
+               list_for_each_entry(cii, &i2sdev->sound.codec_list, list)
+                       if (cii->codec->start)
+                               cii->codec->start(cii, pi->substream);
+               pi->dbdma_ring.running = 1;
+
+               if (pi->dbdma_ring.stopping) {
+                       /* Clear the S0 bit, then see if we stopped yet */
+                       out_le32(&pi->dbdma->control, 1 << 16);
+                       if (in_le32(&pi->dbdma->status) & ACTIVE) {
+                               /* possible race here? */
+                               udelay(10);
+                               if (in_le32(&pi->dbdma->status) & ACTIVE) {
+                                       pi->dbdma_ring.stopping = 0;
+                                       goto out_unlock; /* keep running */
+                               }
+                       }
+               }
+
+               /* make sure RUN, PAUSE and S0 bits are cleared */
+               out_le32(&pi->dbdma->control, (RUN | PAUSE | 1) << 16);
+
+               /* set branch condition select register */
+               out_le32(&pi->dbdma->br_sel, (1 << 16) | 1);
+
+               /* write dma command buffer address to the dbdma chip */
+               out_le32(&pi->dbdma->cmdptr, pi->dbdma_ring.bus_cmd_start);
+
+               /* initialize the frame count and current period */
+               pi->current_period = 0;
+               pi->frame_count = in_le32(&i2sdev->intfregs->frame_count);
+
+               /* set the DMA controller running */
+               out_le32(&pi->dbdma->control, (RUN << 16) | RUN);
+
+               /* off you go! */
+               break;
+
+       case SNDRV_PCM_TRIGGER_STOP:
+       case SNDRV_PCM_TRIGGER_SUSPEND:
+               if (!pi->dbdma_ring.running) {
+                       result = -EALREADY;
+                       goto out_unlock;
+               }
+               pi->dbdma_ring.running = 0;
+
+               /* Set the S0 bit to make the DMA branch to the stop cmd */
+               out_le32(&pi->dbdma->control, (1 << 16) | 1);
+               pi->dbdma_ring.stopping = 1;
+
+               list_for_each_entry(cii, &i2sdev->sound.codec_list, list)
+                       if (cii->codec->stop)
+                               cii->codec->stop(cii, pi->substream);
+               break;
+       default:
+               result = -EINVAL;
+               goto out_unlock;
+       }
+
+ out_unlock:
+       spin_unlock_irqrestore(&i2sdev->low_lock, flags);
+       return result;
+}
+
+static snd_pcm_uframes_t i2sbus_pcm_pointer(struct i2sbus_dev *i2sdev, int in)
+{
+       struct pcm_info *pi;
+       u32 fc;
+
+       get_pcm_info(i2sdev, in, &pi, NULL);
+
+       fc = in_le32(&i2sdev->intfregs->frame_count);
+       fc = fc - pi->frame_count;
+
+       if (fc >= pi->substream->runtime->buffer_size)
+               fc %= pi->substream->runtime->buffer_size;
+       return fc;
+}
+
+static inline void handle_interrupt(struct i2sbus_dev *i2sdev, int in)
+{
+       struct pcm_info *pi;
+       u32 fc, nframes;
+       u32 status;
+       int timeout, i;
+       int dma_stopped = 0;
+       struct snd_pcm_runtime *runtime;
+
+       spin_lock(&i2sdev->low_lock);
+       get_pcm_info(i2sdev, in, &pi, NULL);
+       if (!pi->dbdma_ring.running && !pi->dbdma_ring.stopping)
+               goto out_unlock;
+
+       i = pi->current_period;
+       runtime = pi->substream->runtime;
+       while (pi->dbdma_ring.cmds[i].xfer_status) {
+               if (le16_to_cpu(pi->dbdma_ring.cmds[i].xfer_status) & BT)
+                       /*
+                        * BT is the branch taken bit.  If it took a branch
+                        * it is because we set the S0 bit to make it
+                        * branch to the stop command.
+                        */
+                       dma_stopped = 1;
+               pi->dbdma_ring.cmds[i].xfer_status = 0;
+
+               if (++i >= runtime->periods) {
+                       i = 0;
+                       pi->frame_count += runtime->buffer_size;
+               }
+               pi->current_period = i;
+
+               /*
+                * Check the frame count.  The DMA tends to get a bit
+                * ahead of the frame counter, which confuses the core.
+                */
+               fc = in_le32(&i2sdev->intfregs->frame_count);
+               nframes = i * runtime->period_size;
+               if (fc < pi->frame_count + nframes)
+                       pi->frame_count = fc - nframes;
+       }
+
+       if (dma_stopped) {
+               timeout = 1000;
+               for (;;) {
+                       status = in_le32(&pi->dbdma->status);
+                       if (!(status & ACTIVE) && (!in || (status & 0x80)))
+                               break;
+                       if (--timeout <= 0) {
+                               printk(KERN_ERR "i2sbus: timed out "
+                                      "waiting for DMA to stop!\n");
+                               break;
+                       }
+                       udelay(1);
+               }
+
+               /* Turn off DMA controller, clear S0 bit */
+               out_le32(&pi->dbdma->control, (RUN | PAUSE | 1) << 16);
+
+               pi->dbdma_ring.stopping = 0;
+               if (pi->stop_completion)
+                       complete(pi->stop_completion);
+       }
+
+       if (!pi->dbdma_ring.running)
+               goto out_unlock;
+       spin_unlock(&i2sdev->low_lock);
+       /* may call _trigger again, hence needs to be unlocked */
+       snd_pcm_period_elapsed(pi->substream);
+       return;
+
+ out_unlock:
+       spin_unlock(&i2sdev->low_lock);
+}
+
+irqreturn_t i2sbus_tx_intr(int irq, void *devid)
+{
+       handle_interrupt((struct i2sbus_dev *)devid, 0);
+       return IRQ_HANDLED;
+}
+
+irqreturn_t i2sbus_rx_intr(int irq, void *devid)
+{
+       handle_interrupt((struct i2sbus_dev *)devid, 1);
+       return IRQ_HANDLED;
+}
+
+static int i2sbus_playback_open(struct snd_pcm_substream *substream)
+{
+       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
+
+       if (!i2sdev)
+               return -EINVAL;
+       i2sdev->out.substream = substream;
+       return i2sbus_pcm_open(i2sdev, 0);
+}
+
+static int i2sbus_playback_close(struct snd_pcm_substream *substream)
+{
+       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
+       int err;
+
+       if (!i2sdev)
+               return -EINVAL;
+       if (i2sdev->out.substream != substream)
+               return -EINVAL;
+       err = i2sbus_pcm_close(i2sdev, 0);
+       if (!err)
+               i2sdev->out.substream = NULL;
+       return err;
+}
+
+static int i2sbus_playback_prepare(struct snd_pcm_substream *substream)
+{
+       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
+
+       if (!i2sdev)
+               return -EINVAL;
+       if (i2sdev->out.substream != substream)
+               return -EINVAL;
+       return i2sbus_pcm_prepare(i2sdev, 0);
+}
+
+static int i2sbus_playback_trigger(struct snd_pcm_substream *substream, int cmd)
+{
+       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
+
+       if (!i2sdev)
+               return -EINVAL;
+       if (i2sdev->out.substream != substream)
+               return -EINVAL;
+       return i2sbus_pcm_trigger(i2sdev, 0, cmd);
+}
+
+static snd_pcm_uframes_t i2sbus_playback_pointer(struct snd_pcm_substream
+                                                *substream)
+{
+       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
+
+       if (!i2sdev)
+               return -EINVAL;
+       if (i2sdev->out.substream != substream)
+               return 0;
+       return i2sbus_pcm_pointer(i2sdev, 0);
+}
+
+static struct snd_pcm_ops i2sbus_playback_ops = {
+       .open =         i2sbus_playback_open,
+       .close =        i2sbus_playback_close,
+       .ioctl =        snd_pcm_lib_ioctl,
+       .hw_params =    i2sbus_hw_params,
+       .hw_free =      i2sbus_playback_hw_free,
+       .prepare =      i2sbus_playback_prepare,
+       .trigger =      i2sbus_playback_trigger,
+       .pointer =      i2sbus_playback_pointer,
+};
+
+static int i2sbus_record_open(struct snd_pcm_substream *substream)
+{
+       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
+
+       if (!i2sdev)
+               return -EINVAL;
+       i2sdev->in.substream = substream;
+       return i2sbus_pcm_open(i2sdev, 1);
+}
+
+static int i2sbus_record_close(struct snd_pcm_substream *substream)
+{
+       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
+       int err;
+
+       if (!i2sdev)
+               return -EINVAL;
+       if (i2sdev->in.substream != substream)
+               return -EINVAL;
+       err = i2sbus_pcm_close(i2sdev, 1);
+       if (!err)
+               i2sdev->in.substream = NULL;
+       return err;
+}
+
+static int i2sbus_record_prepare(struct snd_pcm_substream *substream)
+{
+       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
+
+       if (!i2sdev)
+               return -EINVAL;
+       if (i2sdev->in.substream != substream)
+               return -EINVAL;
+       return i2sbus_pcm_prepare(i2sdev, 1);
+}
+
+static int i2sbus_record_trigger(struct snd_pcm_substream *substream, int cmd)
+{
+       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
+
+       if (!i2sdev)
+               return -EINVAL;
+       if (i2sdev->in.substream != substream)
+               return -EINVAL;
+       return i2sbus_pcm_trigger(i2sdev, 1, cmd);
+}
+
+static snd_pcm_uframes_t i2sbus_record_pointer(struct snd_pcm_substream
+                                              *substream)
+{
+       struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);
+
+       if (!i2sdev)
+               return -EINVAL;
+       if (i2sdev->in.substream != substream)
+               return 0;
+       return i2sbus_pcm_pointer(i2sdev, 1);
+}
+
+static struct snd_pcm_ops i2sbus_record_ops = {
+       .open =         i2sbus_record_open,
+       .close =        i2sbus_record_close,
+       .ioctl =        snd_pcm_lib_ioctl,
+       .hw_params =    i2sbus_hw_params,
+       .hw_free =      i2sbus_record_hw_free,
+       .prepare =      i2sbus_record_prepare,
+       .trigger =      i2sbus_record_trigger,
+       .pointer =      i2sbus_record_pointer,
+};
+
+static void i2sbus_private_free(struct snd_pcm *pcm)
+{
+       struct i2sbus_dev *i2sdev = snd_pcm_chip(pcm);
+       struct codec_info_item *p, *tmp;
+
+       i2sdev->sound.pcm = NULL;
+       i2sdev->out.created = 0;
+       i2sdev->in.created = 0;
+       list_for_each_entry_safe(p, tmp, &i2sdev->sound.codec_list, list) {
+               printk(KERN_ERR "i2sbus: a codec didn't unregister!\n");
+               list_del(&p->list);
+               module_put(p->codec->owner);
+               kfree(p);
+       }
+       soundbus_dev_put(&i2sdev->sound);
+       module_put(THIS_MODULE);
+}
+
+int
+i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card,
+                   struct codec_info *ci, void *data)
+{
+       int err, in = 0, out = 0;
+       struct transfer_info *tmp;
+       struct i2sbus_dev *i2sdev = soundbus_dev_to_i2sbus_dev(dev);
+       struct codec_info_item *cii;
+
+       if (!dev->pcmname || dev->pcmid == -1) {
+               printk(KERN_ERR "i2sbus: pcm name and id must be set!\n");
+               return -EINVAL;
+       }
+
+       list_for_each_entry(cii, &dev->codec_list, list) {
+               if (cii->codec_data == data)
+                       return -EALREADY;
+       }
+
+       if (!ci->transfers || !ci->transfers->formats
+           || !ci->transfers->rates || !ci->usable)
+               return -EINVAL;
+
+       /* we currently code the i2s transfer on the clock, and support only
+        * 32 and 64 */
+       if (ci->bus_factor != 32 && ci->bus_factor != 64)
+               return -EINVAL;
+
+       /* If you want to fix this, you need to keep track of what transport infos
+        * are to be used, which codecs they belong to, and then fix all the
+        * sysclock/busclock stuff above to depend on which is usable */
+       list_for_each_entry(cii, &dev->codec_list, list) {
+               if (cii->codec->sysclock_factor != ci->sysclock_factor) {
+                       printk(KERN_DEBUG
+                              "cannot yet handle multiple different sysclocks!\n");
+                       return -EINVAL;
+               }
+               if (cii->codec->bus_factor != ci->bus_factor) {
+                       printk(KERN_DEBUG
+                              "cannot yet handle multiple different bus clocks!\n");
+                       return -EINVAL;
+               }
+       }
+
+       tmp = ci->transfers;
+       while (tmp->formats && tmp->rates) {
+               if (tmp->transfer_in)
+                       in = 1;
+               else
+                       out = 1;
+               tmp++;
+       }
+
+       cii = kzalloc(sizeof(struct codec_info_item), GFP_KERNEL);
+       if (!cii) {
+               printk(KERN_DEBUG "i2sbus: failed to allocate cii\n");
+               return -ENOMEM;
+       }
+
+       /* use the private data to point to the codec info */
+       cii->sdev = soundbus_dev_get(dev);
+       cii->codec = ci;
+       cii->codec_data = data;
+
+       if (!cii->sdev) {
+               printk(KERN_DEBUG
+                      "i2sbus: failed to get soundbus dev reference\n");
+               err = -ENODEV;
+               goto out_free_cii;
+       }
+
+       if (!try_module_get(THIS_MODULE)) {
+               printk(KERN_DEBUG "i2sbus: failed to get module reference!\n");
+               err = -EBUSY;
+               goto out_put_sdev;
+       }
+
+       if (!try_module_get(ci->owner)) {
+               printk(KERN_DEBUG
+                      "i2sbus: failed to get module reference to codec owner!\n");
+               err = -EBUSY;
+               goto out_put_this_module;
+       }
+
+       if (!dev->pcm) {
+               err = snd_pcm_new(card, dev->pcmname, dev->pcmid, 0, 0,
+                                 &dev->pcm);
+               if (err) {
+                       printk(KERN_DEBUG "i2sbus: failed to create pcm\n");
+                       goto out_put_ci_module;
+               }
+               dev->pcm->dev = &dev->ofdev.dev;
+       }
+
+       /* ALSA yet again sucks.
+        * If it is ever fixed, remove this line. See below. */
+       out = in = 1;
+
+       if (!i2sdev->out.created && out) {
+               if (dev->pcm->card != card) {
+                       /* eh? */
+                       printk(KERN_ERR
+                              "Can't attach same bus to different cards!\n");
+                       err = -EINVAL;
+                       goto out_put_ci_module;
+               }
+               err = snd_pcm_new_stream(dev->pcm, SNDRV_PCM_STREAM_PLAYBACK, 1);
+               if (err)
+                       goto out_put_ci_module;
+               snd_pcm_set_ops(dev->pcm, SNDRV_PCM_STREAM_PLAYBACK,
+                               &i2sbus_playback_ops);
+               i2sdev->out.created = 1;
+       }
+
+       if (!i2sdev->in.created && in) {
+               if (dev->pcm->card != card) {
+                       printk(KERN_ERR
+                              "Can't attach same bus to different cards!\n");
+                       err = -EINVAL;
+                       goto out_put_ci_module;
+               }
+               err = snd_pcm_new_stream(dev->pcm, SNDRV_PCM_STREAM_CAPTURE, 1);
+               if (err)
+                       goto out_put_ci_module;
+               snd_pcm_set_ops(dev->pcm, SNDRV_PCM_STREAM_CAPTURE,
+                               &i2sbus_record_ops);
+               i2sdev->in.created = 1;
+       }
+
+       /* so we have to register the pcm after adding any substream
+        * to it because alsa doesn't create the devices for the
+        * substreams when we add them later.
+        * Therefore, force in and out on both busses (above) and
+        * register the pcm now instead of just after creating it.
+        */
+       err = snd_device_register(card, dev->pcm);
+       if (err) {
+               printk(KERN_ERR "i2sbus: error registering new pcm\n");
+               goto out_put_ci_module;
+       }
+       /* no errors any more, so let's add this to our list */
+       list_add(&cii->list, &dev->codec_list);
+
+       dev->pcm->private_data = i2sdev;
+       dev->pcm->private_free = i2sbus_private_free;
+
+       /* well, we really should support scatter/gather DMA */
+       snd_pcm_lib_preallocate_pages_for_all(
+               dev->pcm, SNDRV_DMA_TYPE_DEV,
+               snd_dma_pci_data(macio_get_pci_dev(i2sdev->macio)),
+               64 * 1024, 64 * 1024);
+
+       return 0;
+ out_put_ci_module:
+       module_put(ci->owner);
+ out_put_this_module:
+       module_put(THIS_MODULE);
+ out_put_sdev:
+       soundbus_dev_put(dev);
+ out_free_cii:
+       kfree(cii);
+       return err;
+}
+
+void i2sbus_detach_codec(struct soundbus_dev *dev, void *data)
+{
+       struct codec_info_item *cii = NULL, *i;
+
+       list_for_each_entry(i, &dev->codec_list, list) {
+               if (i->codec_data == data) {
+                       cii = i;
+                       break;
+               }
+       }
+       if (cii) {
+               list_del(&cii->list);
+               module_put(cii->codec->owner);
+               kfree(cii);
+       }
+       /* no more codecs, but still a pcm? */
+       if (list_empty(&dev->codec_list) && dev->pcm) {
+               /* the actual cleanup is done by the callback above! */
+               snd_device_free(dev->pcm->card, dev->pcm);
+       }
+}
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c

index 5dd3e89f620a2753511097d1fe86b4e6673afefa..b77f330d2650b7c13d23d1d0f84d9344d973940a 100644 (file)
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -69,6 +69,7 @@ enum {
  };
  
  enum {
+       STAC_92HD73XX_NO_JD, /* no jack-detection */
         STAC_92HD73XX_REF,
         STAC_DELL_M6_AMIC,
         STAC_DELL_M6_DMIC,
@@ -127,6 +128,7 @@ enum {
  };
  
  enum {
+       STAC_D965_REF_NO_JD, /* no jack-detection */
         STAC_D965_REF,
         STAC_D965_3ST,
         STAC_D965_5ST,
@@ -857,6 +859,7 @@ static struct hda_verb stac92hd83xxx_core_init[] = {
  
         /* power state controls amps */
         { 0x01, AC_VERB_SET_EAPD, 1 << 2},
+       {}
  };
  
  static struct hda_verb stac92hd71bxx_core_init[] = {
@@ -868,6 +871,7 @@ static struct hda_verb stac92hd71bxx_core_init[] = {
         { 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         { 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+       {}
  };
  
  #define HD_DISABLE_PORTF 2
@@ -1611,6 +1615,7 @@ static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = {
  };
  
  static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = {
+       [STAC_92HD73XX_NO_JD] = "no-jd",
         [STAC_92HD73XX_REF] = "ref",
         [STAC_DELL_M6_AMIC] = "dell-m6-amic",
         [STAC_DELL_M6_DMIC] = "dell-m6-dmic",
@@ -1640,6 +1645,8 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = {
                                 "unknown Dell", STAC_DELL_M6_DMIC),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x029f,
                                 "Dell Studio 1537", STAC_DELL_M6_DMIC),
+       SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02a0,
+                               "Dell Studio 17", STAC_DELL_M6_DMIC),
         {} /* terminator */
  };
  
@@ -1662,6 +1669,7 @@ static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                       "DFI LanParty", STAC_92HD71BXX_REF),
+       {} /* terminator */
  };
  
  static unsigned int ref92hd71bxx_pin_configs[11] = {
@@ -2027,6 +2035,7 @@ static unsigned int dell_3st_pin_configs[14] = {
  };
  
  static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = {
+       [STAC_D965_REF_NO_JD] = ref927x_pin_configs,
         [STAC_D965_REF]  = ref927x_pin_configs,
         [STAC_D965_3ST]  = d965_3st_pin_configs,
         [STAC_D965_5ST]  = d965_5st_pin_configs,
@@ -2035,6 +2044,7 @@ static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = {
  };
  
  static const char *stac927x_models[STAC_927X_MODELS] = {
+       [STAC_D965_REF_NO_JD]   = "ref-no-jd",
         [STAC_D965_REF]         = "ref",
         [STAC_D965_3ST]         = "3stack",
         [STAC_D965_5ST]         = "5stack",
@@ -2896,7 +2906,7 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,
         }
  
         if ((spec->multiout.num_dacs - cfg->line_outs) > 0 &&
-                       cfg->hp_outs && !spec->multiout.hp_nid)
+           cfg->hp_outs == 1 && !spec->multiout.hp_nid)
                 spec->multiout.hp_nid = nid;
  
         if (cfg->hp_outs > 1 && cfg->line_out_type == AUTO_PIN_LINE_OUT) {
@@ -4254,14 +4264,17 @@ again:
  
         switch (spec->multiout.num_dacs) {
         case 0x3: /* 6 Channel */
+               spec->multiout.hp_nid = 0x17;
                 spec->mixer = stac92hd73xx_6ch_mixer;
                 spec->init = stac92hd73xx_6ch_core_init;
                 break;
         case 0x4: /* 8 Channel */
+               spec->multiout.hp_nid = 0x18;
                 spec->mixer = stac92hd73xx_8ch_mixer;
                 spec->init = stac92hd73xx_8ch_core_init;
                 break;
         case 0x5: /* 10 Channel */
+               spec->multiout.hp_nid = 0x19;
                 spec->mixer = stac92hd73xx_10ch_mixer;
                 spec->init = stac92hd73xx_10ch_core_init;
         };
@@ -4297,6 +4310,7 @@ again:
                 spec->amp_nids = &stac92hd73xx_amp_nids[DELL_M6_AMP];
                 spec->eapd_switch = 0;
                 spec->num_amps = 1;
+               spec->multiout.hp_nid = 0; /* dual HPs */
  
                 if (!spec->init)
                         spec->init = dell_m6_core_init;
@@ -4351,6 +4365,9 @@ again:
                 return err;
         }
  
+       if (spec->board_config == STAC_92HD73XX_NO_JD)
+               spec->hp_detect = 0;
+
         codec->patch_ops = stac92xx_patch_ops;
  
         return 0;
@@ -4899,6 +4916,10 @@ static int patch_stac927x(struct hda_codec *codec)
          */
         codec->bus->needs_damn_long_delay = 1;
  
+       /* no jack detecion for ref-no-jd model */
+       if (spec->board_config == STAC_D965_REF_NO_JD)
+               spec->hp_detect = 0;
+
         return 0;
  }
author	Takashi Iwai <tiwai@suse.de>
	Thu, 25 Dec 2008 10:40:25 +0000 (11:40 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Thu, 25 Dec 2008 10:40:25 +0000 (11:40 +0100)