1. 09 Oct, 2015 5 commits
    • Takashi Sakamoto's avatar
      ALSA: firewire-lib: add throttle for MIDI data rate · ea848b7b
      Takashi Sakamoto authored
      Typically, the target devices have internal buffer to adjust output of
      received MIDI messages for MIDI serial bus, while the capacity of the
      buffer is limited. IEEE 1394 transactions can transfer more MIDI messages
      than MIDI serial bus can. This can cause buffer over flow in device side.
      
      This commit adds throttle to limit MIDI data rate by counting intervals
      between two MIDI messages. Usual MIDI messages consists of two or three
      bytes. This requires 1.302 to 1.953 mili-seconds interval between these
      messages. This commit uses kernel monotonic time service to calculate the
      time of next transaction.
      Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      ea848b7b
    • Takashi Sakamoto's avatar
      ALSA: firewire-lib: schedule work again when MIDI substream has rest of MIDI messages · e8a40d9b
      Takashi Sakamoto authored
      Currently, when two MIDI trigger callbacks can be called immediately,
      transactions for the second MIDI messages can be postpone till next trigger
      callback. This is not good for real-time message transmission.
      
      This commit schedules work again at response handling callback if the
      MIDI substream still includes untransferred MIDI messages.
      Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      e8a40d9b
    • Takashi Sakamoto's avatar
      ALSA: firewire-lib: add a restriction for a transaction at once · d3ef9cb9
      Takashi Sakamoto authored
      Currently, when waiting for a response, callers can start another
      transaction by scheduling another work. This is not good for error
      processing of transaction, especially the first response is too late.
      
      This commit serialize request/response transactions, by adding one
      boolean member to represent idling state.
      Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      d3ef9cb9
    • Takashi Sakamoto's avatar
      ALSA: firewire-lib: add helper functions for asynchronous transactions to transfer MIDI messages · 585d7cba
      Takashi Sakamoto authored
      Some models receive MIDI messages via IEEE 1394 asynchronous transactions.
      In this case, MIDI messages are transferred in fixed-length payload. It's
      nice that firewire-lib module has common helper functions.
      
      This commit implements this idea. Each driver adds
      'struct snd_fw_async_midi_port' in its instance structure. In probing,
      it should call snd_fw_async_midi_port_init() to initialize the
      structure with some parameters such as target address, the length
      of payload in a transaction and a pointer for callback function
      to fill the payload buffer. At 'struct snd_rawmidi_ops.trigger()'
      callback, it should call 'snd_fw_async_midi_port_run()' to start
      transactions. Each driver should ensure that the lifetime of MIDI
      substream continues till calling 'snd_fw_async_midi_port_finish()'.
      
      The helper functions support retries to transferring MIDI messages when
      transmission errors occur. When transactions are successful, the helper
      functions call 'snd_rawmidi_transmit_ack()' internally to consume MIDI
      bytes in the buffer. Therefore, Each driver is expected to use
      'snd_rawmidi_transmit_peek()' to tell the number of bytes to transfer to
      return value of 'fill' callback.
      Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      585d7cba
    • Kosuke Tatsukawa's avatar
      ALSA: seq_oss: fix waitqueue_active without memory barrier in snd-seq-oss · 69447027
      Kosuke Tatsukawa authored
      snd_seq_oss_readq_put_event() seems to be missing a memory barrier which
      might cause the waker to not notice the waiter and miss sending a
      wake_up as in the following figure.
      
          snd_seq_oss_readq_put_event		    snd_seq_oss_readq_wait
      ------------------------------------------------------------------------
      					/* wait_event_interruptible_timeout */
      					 /* __wait_event_interruptible_timeout */
      					  /* ___wait_event */
      					  for (;;) {									 prepare_to_wait_event(&wq, &__wait,
      					    state);
      spin_lock_irqsave(&q->lock, flags);
      if (waitqueue_active(&q->midi_sleep))
      /* The CPU might reorder the test for
         the waitqueue up here, before
         prior writes complete */
      					  if ((q->qlen>0 || q->head==q->tail)
      					  ...
      					  __ret = schedule_timeout(__ret)
      if (q->qlen >= q->maxlen - 1) {
      memcpy(&q->q[q->tail], ev, sizeof(*ev));
      q->tail = (q->tail + 1) % q->maxlen;
      q->qlen++;
      ------------------------------------------------------------------------
      
      There are two other place in sound/core/seq/oss/ which have similar
      code.  The attached patch removes the call to waitqueue_active() leaving
      just wake_up() behind.  This fixes the problem because the call to
      spin_lock_irqsave() in wake_up() will be an ACQUIRE operation.
      
      I found this issue when I was looking through the linux source code
      for places calling waitqueue_active() before wake_up*(), but without
      preceding memory barriers, after sending a patch to fix a similar
      issue in drivers/tty/n_tty.c  (Details about the original issue can be
      found here: https://lkml.org/lkml/2015/9/28/849).
      Signed-off-by: default avatarKosuke Tatsukawa <tatsu@ab.jp.nec.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      69447027
  2. 08 Oct, 2015 2 commits
  3. 05 Oct, 2015 2 commits
  4. 04 Oct, 2015 1 commit
    • Takashi Sakamoto's avatar
      ALSA: bebob: support Firewire I/O card of Mackie Onyx 1220/1620/1640 · 425a570e
      Takashi Sakamoto authored
      Current ALSA BeBoB drivers has an entry for this model, while the value of
      vendor ID seems to be wrong according to an user's report.
      
      The vendor had released no updated firmware, thus we can judge that this
      model had not changed the content of its config ROM. It's reasonable to fix
      the ID according to the report.
      
      $ ./linux-firewire-utils/src/crpp < /sys/bus/firewire/devices/fw1/config_rom
      
                     ROM header and bus information block
                     -----------------------------------------------------------------
      400  0425720f  bus_info_length 4, crc_length 37, crc 29199
      404  31333934  bus_name "1394"
      408  f0646122  irmc 1, cmc 1, isc 1, bmc 1, pmc 0, cyc_clk_acc 100,
                     max_rec 6 (128), max_rom 1, gen 2, spd 2 (S400)
      40c  00000ff2  company_id 00000f     |
      410  00004697  device_id f200004697  | EUI-64 00000ff200004697
      
                     root directory
                     -----------------------------------------------------------------
      414  000859be  directory_length 8, crc 22974
      418  04000082  hardware version
      41c  0c0083c0  node capabilities per IEEE 1394
      420  03000ff2  vendor
      424  8100000a  --> descriptor leaf at 44c
      428  17010065  model
      42c  8100000d  --> descriptor leaf at 460
      430  13000910  version
      434  d1000001  --> unit directory at 438
      
                     unit directory at 438
                     -----------------------------------------------------------------
      438  0004ccec  directory_length 4, crc 52460
      43c  1200a02d  specifier id: 1394 TA
      440  13010001  version: AV/C
      444  17010065  model
      448  8100000d  --> descriptor leaf at 47c
      
                     descriptor leaf at 44c
                     -----------------------------------------------------------------
      44c  0004152a  leaf_length 4, crc 5418
      450  00000000  textual descriptor
      454  00000000  minimal ASCII
      458  4d61636b  "Mack"
      45c  69650000  "ie"
      
                     descriptor leaf at 460
                     -----------------------------------------------------------------
      460  000612b5  leaf_length 6, crc 4789
      464  00000000  textual descriptor
      468  00000000  minimal ASCII
      46c  4f6e7978  "Onyx"
      470  20466972  " Fir"
      474  65776972  "ewir"
      478  65000000  "e"
      
                     descriptor leaf at 47c
                     -----------------------------------------------------------------
      47c  000612b5  leaf_length 6, crc 4789
      480  00000000  textual descriptor
      484  00000000  minimal ASCII
      488  4f6e7978  "Onyx"
      48c  20466972  " Fir"
      490  65776972  "ewir"
      494  65000000  "e"
      
      $ cat /proc/asound/card3/firewire/firmware
      Manufacturer:   bridgeCo
      Protocol Ver:   1
      Build Ver:      0
      GUID:           0x00000FF200004697
      Model ID:       0x82
      Model Rev:      1
      Firmware Date:  20040430
      Firmware Time:  131527
      Firmware ID:    0x10065
      Firmware Ver:   2320
      Base Addr:      0x20080000
      Max Size:       1572864
      Loader Date:    20040430
      Loader Time:    112036
      Reported-by: default avatarAndrzej Gansiniec <andrzej@gansiniec.pl>
      Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      425a570e
  5. 02 Oct, 2015 7 commits
  6. 30 Sep, 2015 9 commits
    • Takashi Sakamoto's avatar
      ALSA: firewire-digi00x: add support for asynchronous messaging · 44b73088
      Takashi Sakamoto authored
      Digi 002/003 family uses asynchronous transaction for messaging.
      The address to transmit this message is stored on a certain register.
      
      This commit allocates a range of address on OHCI 1394 host controller
      to handle the messaging. As long as I know, the purpose of this message
      seems to notify lost of synchronization. While, the meaning of content
      of the message is not clear.
      
      Actual examples of this messaging:
       * When clock source is set as internal:
       - 0x00007051
       - 0x00007052
       - 0x00007054
       - 0x00007057
       - 0x00007058
       * When clock source is set as somewhat external:
       - 0x00009000
       - 0x00009010
       - 0x00009020
       - 0x00009021
       - 0x00009022
      
      The lost often occurs when using internal clock source. In this case,
      users hear sounds with quite short gap every several minutes. In fact,
      the lost is recovered temporarily.
      
      When using with external clock source, the lost seems not to occur. The
      mechanism is not clear yet.
      Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      44b73088
    • Takashi Sakamoto's avatar
      ALSA: firewire-digi00x: add hwdep interface · 660dd3d5
      Takashi Sakamoto authored
      This commit adds hwdep interface so as the other sound drivers for units
      on IEEE 1394 bus have.
      
      This interface is designed for mixer/control applications. By using this
      interface, an application can get information about firewire node, can
      lock/unlock kernel streaming and can get notification at starting/stopping
      kernel streaming.
      Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      660dd3d5
    • Takashi Sakamoto's avatar
      ALSA: firewire-digi00x: add PCM functionality · 0120d0f1
      Takashi Sakamoto authored
      This commit adds PCM functionality to transmit/receive PCM samples.
      
      Any PCM substreams are jointed because incoming/outgoing AMDTP streams
      are bound. When one of PCM substream is running or external clock source
      is selected, current sampling rate is used. Else, the sampling rate is
      changed as an userspace application requests.
      Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      0120d0f1
    • Takashi Sakamoto's avatar
      ALSA: firewire-digi00x: add proc node to show clock status · 927f17dc
      Takashi Sakamoto authored
      This commit adds proc node to show current clock status for debugging.
      
      As long as testing Digi 002 rack, registers can show local clock rate,
      local clock source. When external clock input such as S/PDIF is
      connected, the registers show the detection and external clock rate.
      
      Additionally, the registers show the mode of optical digital input
      interface. Although, a tester with Digi 003 rack reports this makes no
      sense. Further investigation is required for Digi 003 series.
      
      Besides, in Digi 002 rack, the S/PDIF format must be IEC 60958-4,
      so-called professional.
      Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      927f17dc
    • Takashi Sakamoto's avatar
      ALSA: firewire-digi00x: add stream functionality · 3a2a1797
      Takashi Sakamoto authored
      This commit adds a functionality to manage streaming.
      
      The streaming is not controlled by CMP in IEC 61883-6. It's controlled by
      IEEE 1394 write transaction to certain addresses.
      
      Several clock sources are available, while there're no differences about
      packet transmission. The value of SYT field in transmitted packets is
      always zero. Thus, streams in both direction don't build synchronization.
      
      And the device always requires received packets to transmit packets. This
      driver keeps to transfer outgoing stream even if they're not required.
      Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      3a2a1797
    • Takashi Sakamoto's avatar
      ALSA: firewire-digi00x: add data block processing layer · 163ae6f3
      Takashi Sakamoto authored
      Digi 002/003 family uses its own format for data blocks. The format is
      quite similar to AM824 in IEC 61883-6, while there're some differences:
      
       * The Valid Bit Length (VBL) code is always 0x40 in Multi-bit Linear Audio
         (MBLA) data channel.
       * The first data channel includes MIDI messages, against IEC 61883-6
         recommendation.
       * The Counter field is always zero in MIDI conformant data channel.
       * Sequence multiplexing in IEC 61883-6 is not applied to the MIDI
         conformant data channel.
       * PCM samples are scrambled in received AMDTP packets. We call the way
         as Double-Oh-Three (DOT). The algorithm was discovered by
         Robin Gareus and Damien Zammit in 2012.
      
      This commit adds data processing layer to satisfy these differences.
      
      There's a quirk about transmission mode for received packets. When this
      driver applies non-blocking mode to outgoing packets with isochronous
      channel 2 or more, after 15 to 20 seconds since playbacking, any PCM
      samples causes noisy sound on the device. With isochronous channel 0 or 1,
      this doesn't occur. As long as I investigated, this quirk is not observed
      when applying blocking mode to the received packets.
      
      This driver applies blocking mode to outgoing packets, while non-blocking
      mode to incoming packgets.
      Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      163ae6f3
    • Takashi Sakamoto's avatar
      ALSA: firewire-digi00x: add skeleton for Digi 002/003 family · 9edf723f
      Takashi Sakamoto authored
      This commit adds a new driver for Digidesign 002/003 family. This commit
      just creates/removes card instance according to bus event. More functions
      will be added in following commits.
      
      Digidesign 002/003 family consists of:
       * Agere FW802B for IEEE 1394 PHY layer
       * PDI 1394L40 for IEEE 1394 LINK layer and IEC 61883 interface
       * ALTERA ACEX EP1K50 for IEC 61883 layer and DSP controller
       * ADSP-21065L for signal processing
      
      [minor cleanup using skip_spaces() by tiwai]
      Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      9edf723f
    • Takashi Iwai's avatar
      3c95e0c5
    • Takashi Iwai's avatar
      drm/i915: Add missing const to audio_rate_need_prog() · 87f77eff
      Takashi Iwai authored
      The lack of const leads to a compile warning after merging i915
      upstream tree:
         drivers/gpu/drm/i915/intel_audio.c:147:13: note: expected 'struct drm_display_mode *' but argument is of type 'const struct drm_display_mode *'
      Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      87f77eff
  7. 29 Sep, 2015 14 commits