1. 15 11月, 2010 1 次提交
    • J
      ASoC: Add optional name_prefix for codec kcontrol, widget and route names · ead9b919
      Jarkko Nikula 提交于
      There is a need to prefix codec kcontrol, widget and internal route names in
      an ASoC machine that has multiple codecs with conflicting names. The name
      collision would occur when codec drivers try to registering kcontrols with
      the same name or when building audio paths.
      
      This patch introduces optional prefix_map into struct snd_soc_card. With it
      machine drivers can specify a unique name prefix to each codec that have
      conflicting names with anothers. Prefix to codec is matched with codec
      name.
      
      Following example illustrates a machine that has two same codec instances.
      Name collision from kcontrol registration is avoided by specifying a name
      prefix "foo" for the second codec. As the codec widget names are prefixed
      then second audio map for that codec shows a prefixed widget name.
      
      static const struct snd_soc_dapm_route map0[] = {
      	{"Spk", NULL, "MONO"},
      };
      
      static const struct snd_soc_dapm_route map1[] = {
      	{"Vibra", NULL, "foo MONO"},
      };
      
      static struct snd_soc_prefix_map codec_prefix[] = {
      	{
      		.dev_name = "codec.2",
      		.name_prefix = "foo",
      	},
      };
      
      static struct snd_soc_card card = {
      	...
      	.prefix_map = codec_prefix,
      	.num_prefixes = ARRAY_SIZE(codec_prefix),
      };
      Signed-off-by: NJarkko Nikula <jhnikula@gmail.com>
      Acked-by: NLiam Girdwood <lrg@slimlogic.co.uk>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      ead9b919
  2. 11 11月, 2010 5 次提交
    • D
      ASoC: soc-cache: Add support for rbtree based register caching · a7f387d5
      Dimitris Papastamos 提交于
      This patch adds support for rbtree compression when storing the
      register cache.  It does this by not adding any uninitialized registers
      (those whose value is 0).  If any of those registers is written
      with a nonzero value they get added into the rbtree.
      
      Consider a sample device with a large sparse register map.  The
      register indices are between [0, 0x31ff].  An array of 12800 registers
      is thus created each of which is 2 bytes.  This results in a 25kB
      region.  This array normally lives outside soc-core, normally in the
      driver itself.  The original soc-core code would kmemdup this region
      resulting in 50kB total memory.  When using the rbtree compression
      technique and __devinitconst on the original array the figures are
      as follows.  For this typical device, you might have 100 initialized
      registers, that is registers that are nonzero by default.  We build
      an rbtree with 100 nodes, each of which is 24 bytes.  This results
      in ~2kB of memory.  Assuming that the target arch can freeup the
      memory used by the initial __devinitconst array, we end up using
      about ~2kB bytes of actual memory.  The memory footprint will increase
      as uninitialized registers get written and thus new nodes created in
      the rbtree.  In practice, most of those registers are never changed.
      If the target arch can't freeup the __devinitconst array, we end up
      using a total of ~27kB.  The difference between the rbtree and the LZO
      caching techniques, is that if using the LZO technique the size of
      the cache will increase slower as more uninitialized registers get
      changed.
      Signed-off-by: NDimitris Papastamos <dp@opensource.wolfsonmicro.com>
      Acked-by: NLiam Girdwood <lrg@slimlogic.co.uk>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      a7f387d5
    • D
      ASoC: soc-cache: Add support for LZO register caching · cc28fb8e
      Dimitris Papastamos 提交于
      This patch adds support for LZO compression when storing the register
      cache.  The initial register defaults cache is marked as __devinitconst
      and the only change required for a driver to use LZO compression is
      to set the compress_type member in codec->driver to SND_SOC_LZO_COMPRESSION.
      
      For a typical device whose register map would normally occupy 25kB or 50kB
      by using the LZO compression technique, one can get down to ~5-7kB.  There
      might be a performance penalty associated with each individual read/write
      due to decompressing/compressing the underlying cache, however that should not
      be noticeable.  These memory benefits depend on whether the target architecture
      can get rid of the memory occupied by the original register defaults cache
      which is marked as __devinitconst.  Nevertheless there will be some memory
      gain even if the target architecture can't get rid of the original register
      map, this should be around ~30-32kB instead of 50kB.
      Signed-off-by: NDimitris Papastamos <dp@opensource.wolfsonmicro.com>
      Acked-by: NLiam Girdwood <lrg@slimlogic.co.uk>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      cc28fb8e
    • D
      ASoC: soc-cache: Add support for flat register caching · 7a30a3db
      Dimitris Papastamos 提交于
      This patch introduces the new caching API and migrates the
      old caching interface into the new one.  The flat register caching
      technique does not use compression at all and it is equivalent to
      the old caching technique.  One can still access codec->reg_cache
      directly but this is not advised as that will not be portable
      across different caching strategies.
      
      None of the existing drivers need to be changed to adapt to this
      caching technique.  There should be no noticeable overhead associated
      with using the new caching API.
      Signed-off-by: NDimitris Papastamos <dp@opensource.wolfsonmicro.com>
      Acked-by: NLiam Girdwood <lrg@slimlogic.co.uk>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      7a30a3db
    • M
      ASoC: Add DAPM trace events · 84e90930
      Mark Brown 提交于
      Trace events for DAPM allow us to monitor the performance and behaviour
      of DAPM with logging which can be built into the kernel permanantly, is
      more suited to automated analysis and display and less likely to suffer
      interference from other logging activity.
      
      Currently trace events are generated for:
      
      - Start and stop of DAPM processing
      - Start and stop of bias level changes
      - Power decisions for widgets
      - Widget event execution start and stop
      
      giving some view as to what is happening and where latencies occur.
      
      Actual changes in widget power can be seen via the register write trace in
      soc-core.
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      Acked-by: NLiam Girdwood <lrg@slimlogic.co.uk>
      84e90930
    • M
      ASoC: Add trace events for ASoC register read/write · a8b1d34f
      Mark Brown 提交于
      The trace subsystem provides a convenient way of instrumenting the kernel
      which can be left on all the time with extremely low impact on the system
      unlike prints to the kernel log which can be very spammy. Begin adding
      support for instrumenting ASoC via this interface by adding trace for the
      register access primitives.
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      Acked-by: NLiam Girdwood <lrg@slimlogic.co.uk>
      a8b1d34f
  3. 10 11月, 2010 1 次提交
  4. 06 11月, 2010 3 次提交
    • J
      ASoC: Move pop time from DAPM context to sound card · 3a45b867
      Jarkko Nikula 提交于
      Based on discussion the dapm_pop_time in debugsfs should be per card rather
      than per device. Single pop time value for entire card is cleaner when the
      DAPM sequencing is extended to cross-device paths.
      
      debugfs/asoc/{card->name}/{codec dir}/dapm_pop_time
      ->
      debugfs/asoc/{card->name}/dapm_pop_time
      Signed-off-by: NJarkko Nikula <jhnikula@gmail.com>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      3a45b867
    • J
      ASoC: Add sound card directory under debugfs/asoc/ · a6052154
      Jarkko Nikula 提交于
      There will be need to have sound card specific debugfs entries. This patch
      introduces a new debugfs/asoc/{card->name}/ directory but does not add yet
      any entries there.
      Signed-off-by: NJarkko Nikula <jhnikula@gmail.com>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      a6052154
    • L
      ASoC: Decouple DAPM from CODECs · ce6120cc
      Liam Girdwood 提交于
      Decoupling Dynamic Audio Power Management (DAPM) from codec devices is
      required when developing ASoC further. Such as for other ASoC components to
      have DAPM widgets or when extending DAPM to handle cross-device paths.
      
      This patch decouples DAPM related variables from struct snd_soc_codec and
      moves them to new struct snd_soc_dapm_context that is used to encapsulate
      DAPM context of a device. ASoC core and API of DAPM functions are modified
      to use DAPM context instead of codec.
      
      This patch does not change current functionality and a large part of changes
      come because of structure and internal API changes.
      
      Core implementation is from Liam Girdwood <lrg@slimlogic.co.uk> with some
      minor core changes, codecs and machine driver conversions from
      Jarkko Nikula <jhnikula@gmail.com>.
      Signed-off-by: NLiam Girdwood <lrg@slimlogic.co.uk>
      Signed-off-by: NJarkko Nikula <jhnikula@gmail.com>
      Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
      Cc: Manuel Lauss <manuel.lauss@googlemail.com>
      Cc: Mike Frysinger <vapier.adi@gmail.com>
      Cc: Cliff Cai <cliff.cai@analog.com>
      Cc: Kevin Hilman <khilman@deeprootsystems.com>
      Cc: Ryan Mallon <ryan@bluewatersys.com>
      Cc: Timur Tabi <timur@freescale.com>
      Cc: Sascha Hauer <s.hauer@pengutronix.de>
      Cc: Lars-Peter Clausen <lars@metafoo.de>
      Cc: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
      Cc: Wan ZongShun <mcuos.com@gmail.com>
      Cc: Eric Miao <eric.y.miao@gmail.com>
      Cc: Jassi Brar <jassi.brar@samsung.com>
      Cc: Daniel Gloeckner <dg@emlix.com>
      Cc: Kuninori Morimoto <morimoto.kuninori@renesas.com>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      ce6120cc
  5. 04 11月, 2010 1 次提交
  6. 01 11月, 2010 2 次提交
  7. 31 10月, 2010 3 次提交
  8. 30 10月, 2010 8 次提交
    • A
      audit mmap · 120a795d
      Al Viro 提交于
      Normal syscall audit doesn't catch 5th argument of syscall.  It also
      doesn't catch the contents of userland structures pointed to be
      syscall argument, so for both old and new mmap(2) ABI it doesn't
      record the descriptor we are mapping.  For old one it also misses
      flags.
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      120a795d
    • A
      af295132
    • T
      audit: Call tty_audit_push_task() outside preempt disabled · 3c80fe4a
      Thomas Gleixner 提交于
      While auditing all tasklist_lock read_lock sites I stumbled over the
      following call chain:
      
      audit_prepare_user_tty()
        read_lock(&tasklist_lock);
        tty_audit_push_task();
           mutex_lock(&buf->mutex);
      
           --> buf->mutex is locked with preemption disabled.
      
      Solve this by acquiring a reference to the task struct under
      rcu_read_lock and call tty_audit_push_task outside of the preempt
      disabled region.
      
      Move all code which needs to be protected by sighand lock into
      tty_audit_push_task() and use lock/unlock_sighand as we do not hold
      tasklist_lock.
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Eric Paris <eparis@redhat.com>
      Cc: Oleg Nesterov <oleg@redhat.com>
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      3c80fe4a
    • T
      semaphore: Remove mutex emulation · 4882720b
      Thomas Gleixner 提交于
      Semaphores used as mutexes have been deprecated for years. Now that
      all users are either converted to real semaphores or to mutexes remove
      the cruft.
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Christoph Hellwig <hch@infradead.org>
      LKML-Reference: <20100907125057.562399240@linutronix.de>
      4882720b
    • C
      phy/marvell: rename 88ec048 to 88e1318s and fix mscr1 addr · 337ac9d5
      Cyril Chemparathy 提交于
      The marvell 88ec048's official part number is 88e1318s.  This patch renames
      definitions in the driver to reflect this.
      
      In addition, a minor bug fix has been added to write back the MSCR1 register
      value properly.
      Signed-off-by: NCyril Chemparathy <cyril@ti.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      337ac9d5
    • S
      jump label: Add work around to i386 gcc asm goto bug · 45f81b1c
      Steven Rostedt 提交于
      On i386 (not x86_64) early implementations of gcc would have a bug
      with asm goto causing it to produce code like the following:
      
      (This was noticed by Peter Zijlstra)
      
         56 pushl 0
         67 nopl         jmp 0x6f
            popl
            jmp 0x8c
      
         6f              mov
                         test
                         je 0x8c
      
         8c mov
            call *(%esp)
      
      The jump added in the asm goto skipped over the popl that matched
      the pushl 0, which lead up to a quick crash of the system when
      the jump was enabled. The nopl is defined in the asm goto () statement
      and when tracepoints are enabled, the nop changes to a jump to the label
      that was specified by the asm goto. asm goto is suppose to tell gcc that
      the code in the asm might jump to an external label. Here gcc obviously
      fails to make that work.
      
      The bug report for gcc is here:
      
        http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46226
      
      The bug only appears on x86 when not compiled with
      -maccumulate-outgoing-args. This option is always set on x86_64 and it
      is also the work around for a function graph tracer i386 bug.
      (See commit: 746357d6)
      This explains why the bug only showed up on i386 when function graph
      tracer was not enabled.
      
      This patch now adds a CONFIG_JUMP_LABEL option that is default
      off instead of using jump labels by default. When jump labels are
      enabled, the -maccumulate-outgoing-args will be used (causing a
      slightly larger kernel image on i386). This option will exist
      until we have a way to detect if the gcc compiler in use is safe
      to use on all configurations without the work around.
      
      Note, there exists such a test, but for now we will keep the enabling
      of jump label as a manual option.
      
      Archs that know the compiler is safe with asm goto, may choose to
      select JUMP_LABEL and enable it by default.
      Reported-by: NIngo Molnar <mingo@elte.hu>
      Cause-discovered-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Jason Baron <jbaron@redhat.com>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: David Daney <ddaney@caviumnetworks.com>
      Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
      Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
      Cc: David Miller <davem@davemloft.net>
      Cc: Richard Henderson <rth@redhat.com>
      LKML-Reference: <1288028746.3673.11.camel@laptop>
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      45f81b1c
    • D
      debug_core,x86,blackfin: Clean up hw debug disable API · d7ba979d
      Dongdong Deng 提交于
      The kgdb_disable_hw_debug() was an architecture specific function for
      disabling all hardware breakpoints on a per cpu basis when entering
      the debug core.
      
      This patch will remove the weak function kdbg_disable_hw_debug() and
      change it into a call back which lives with the rest of hw breakpoint
      call backs in struct kgdb_arch.
      Signed-off-by: NDongdong Deng <dongdong.deng@windriver.com>
      Signed-off-by: NJason Wessel <jason.wessel@windriver.com>
      d7ba979d
    • L
      readv/writev: do the same MAX_RW_COUNT truncation that read/write does · 435f49a5
      Linus Torvalds 提交于
      We used to protect against overflow, but rather than return an error, do
      what read/write does, namely to limit the total size to MAX_RW_COUNT.
      This is not only more consistent, but it also means that any broken
      low-level read/write routine that still keeps counts in 'int' can't
      break.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      435f49a5
  9. 29 10月, 2010 16 次提交