On 02/17/2016 05:19 AM, Mauro Carvalho Chehab wrote:

Em Thu, 11 Feb 2016 16:41:17 -0700 Shuah Khan shuahkh@osg.samsung.com escreveu:

...

Add ALSA Media Controller Intf types

Signed-off-by: Shuah Khan shuahkh@osg.samsung.com

Documentation/DocBook/media/v4l/media-types.xml | 40 +++++++++++++++++++++++++ 1 file changed, 40 insertions(+)

diff --git a/Documentation/DocBook/media/v4l/media-types.xml b/Documentation/DocBook/media/v4l/media-types.xml index 751c3d0..3730967 100644 --- a/Documentation/DocBook/media/v4l/media-types.xml +++ b/Documentation/DocBook/media/v4l/media-types.xml @@ -193,6 +193,46 @@ <entry>Device node interface for Software Defined Radio (V4L)</entry> <entry>typically, /dev/swradio?</entry> </row>

•  <row>
  

•    <entry><constant>MEDIA_INTF_T_ALSA_PCM_CAPTURE</constant></entry>
  

•    <entry>Device node interface for ASLA PCM Capture</entry>
  

•    <entry>typically, /dev/snd/pcmC?D?c</entry>
  

•  </row>
  

•  <row>
  

•    <entry><constant>MEDIA_INTF_T_ALSA_PCM_PLAYBACK</constant></entry>
  

•    <entry>Device node interface for ASLA PCM Playback</entry>
  

•    <entry>typically, /dev/snd/pcmC?D?p</entry>
  

•  </row>
  

•  <row>
  

•    <entry><constant>MEDIA_INTF_T_ALSA_CONTROL</constant></entry>
  

•    <entry>Device node interface for ASLA Control</entry>
  

•    <entry>typically, /dev/snd/controlC?</entry>
  

•  </row>
  

•  <row>
  

•    <entry><constant>MEDIA_INTF_T_ALSA_COMPRESS</constant></entry>
  

•    <entry>Device node interface for ASLA Compress</entry>
  

•    <entry>typically, /dev/snd/compr?</entry>
  

•  </row>
  

•  <row>
  

•    <entry><constant>MEDIA_INTF_T_ALSA_RAWMIDI</constant></entry>
  

•    <entry>Device node interface for ASLA Raw MIDI</entry>
  

•    <entry>typically, /dev/snd/midi?</entry>
  

•  </row>
  

•  <row>
  

•    <entry><constant>MEDIA_INTF_T_ALSA_HWDEP</constant></entry>
  

•    <entry>Device node interface for ASLA Hardware Dependent</entry>
  

•    <entry>typically, /dev/snd/hwC?D?</entry>
  

•  </row>
  

•  <row>
  

•    <entry><constant>MEDIA_INTF_T_ALSA_SEQUENCER</constant></entry>
  

•    <entry>Device node interface for ASLA Sequencer</entry>
  

•    <entry>typically, /dev/snd/seq</entry>
  

•  </row>
  

•  <row>
  

•    <entry><constant>MEDIA_INTF_T_ALSA_TIMER</constant></entry>
  

•    <entry>Device node interface for ASLA Timer</entry>
  

•    <entry>typically, /dev/snd/timer</entry>
  

On all the above: s,ASLA,ALSA,

Sorry for the typo. Sent v4 with the fix.

Except for that, patch looks OK for me.

Takashi,

If this is OK for you too, could you please ack?

Thanks, Mauro

-- Shuah

On 02/17/2016 05:21 AM, Mauro Carvalho Chehab wrote:

Em Thu, 11 Feb 2016 16:41:18 -0700 Shuah Khan shuahkh@osg.samsung.com escreveu:

...

Declare the interface types to be used on alsa for the new G_TOPOLOGY ioctl.

Signed-off-by: Shuah Khan shuahkh@osg.samsung.com

drivers/media/media-entity.c | 16 ++++++++++++++++ include/uapi/linux/media.h | 10 ++++++++++ 2 files changed, 26 insertions(+)

diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c index f2e4360..6179543 100644 --- a/drivers/media/media-entity.c +++ b/drivers/media/media-entity.c @@ -65,6 +65,22 @@ static inline const char *intf_type(struct media_interface *intf) return "v4l2-subdev"; case MEDIA_INTF_T_V4L_SWRADIO: return "swradio";

• case MEDIA_INTF_T_ALSA_PCM_CAPTURE:

• return "pcm-capture";
  

• case MEDIA_INTF_T_ALSA_PCM_PLAYBACK:

• return "pcm-playback";
  

• case MEDIA_INTF_T_ALSA_CONTROL:

• return "alsa-control";
  

• case MEDIA_INTF_T_ALSA_COMPRESS:

• return "compress";
  

• case MEDIA_INTF_T_ALSA_RAWMIDI:

• return "rawmidi";
  

• case MEDIA_INTF_T_ALSA_HWDEP:

• return "hwdep";
  

• case MEDIA_INTF_T_ALSA_SEQUENCER:

• return "sequencer";
  

• case MEDIA_INTF_T_ALSA_TIMER:

• return "timer";
  

  default: return "unknown-intf"; }

diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index c9eb42a..3cc0366 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -265,6 +265,7 @@ struct media_links_enum {

#define MEDIA_INTF_T_DVB_BASE 0x00000100 #define MEDIA_INTF_T_V4L_BASE 0x00000200 +#define MEDIA_INTF_T_ALSA_BASE 0x00000300

/* Interface types */

@@ -280,6 +281,15 @@ struct media_links_enum { #define MEDIA_INTF_T_V4L_SUBDEV (MEDIA_INTF_T_V4L_BASE + 3) #define MEDIA_INTF_T_V4L_SWRADIO (MEDIA_INTF_T_V4L_BASE + 4)

+#define MEDIA_INTF_T_ALSA_PCM_CAPTURE (MEDIA_INTF_T_ALSA_BASE) +#define MEDIA_INTF_T_ALSA_PCM_PLAYBACK (MEDIA_INTF_T_ALSA_BASE + 1) +#define MEDIA_INTF_T_ALSA_CONTROL (MEDIA_INTF_T_ALSA_BASE + 2) +#define MEDIA_INTF_T_ALSA_COMPRESS (MEDIA_INTF_T_ALSA_BASE + 3) +#define MEDIA_INTF_T_ALSA_RAWMIDI (MEDIA_INTF_T_ALSA_BASE + 4) +#define MEDIA_INTF_T_ALSA_HWDEP (MEDIA_INTF_T_ALSA_BASE + 5) +#define MEDIA_INTF_T_ALSA_SEQUENCER (MEDIA_INTF_T_ALSA_BASE + 6) +#define MEDIA_INTF_T_ALSA_TIMER (MEDIA_INTF_T_ALSA_BASE + 7)

/*

• MC next gen API definitions

Looks OK to me.

Takashi,

If this is OK for you too, would you mind acking it?

Hi Takashi,

Are you okay with this patch? Could you please Ack it.

thanks, -- Shuah

On Wed, 17 Feb 2016 13:23:09 +0100, Mauro Carvalho Chehab wrote:

Em Thu, 11 Feb 2016 16:41:19 -0700 Shuah Khan shuahkh@osg.samsung.com escreveu:

...

Add Audio Function Entities

Signed-off-by: Shuah Khan shuahkh@osg.samsung.com

Documentation/DocBook/media/v4l/media-types.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+)

diff --git a/Documentation/DocBook/media/v4l/media-types.xml b/Documentation/DocBook/media/v4l/media-types.xml index 3730967..924a604 100644 --- a/Documentation/DocBook/media/v4l/media-types.xml +++ b/Documentation/DocBook/media/v4l/media-types.xml @@ -113,6 +113,18 @@ decoder. </entry> </row>

•  <row>
  

•    <entry><constant>MEDIA_ENT_F_AUDIO_CAPTURE</constant></entry>
  

•    <entry>Audio Capture Function Entity.</entry>
  

•  </row>
  

•  <row>
  

•    <entry><constant>MEDIA_ENT_F_AUDIO_PLAYBACK</constant></entry>
  

•    <entry>Audio Playback Function Entity.</entry>
  

•  </row>
  

•  <row>
  

•    <entry><constant>MEDIA_ENT_F_AUDIO_MIXER</constant></entry>
  

•    <entry>Audio Mixer Function Entity.</entry>
  

•  </row>
  

  </tbody> </tgroup> </table>

Looks OK to me.

Takashi,

Could you ack if ok for you?

Yeah, nothing looks wrong, as it's pretty straightforward :)

Acked-by: Takashi Iwai tiwai@suse.de

thanks,

Takashi

On Wed, 17 Feb 2016 13:25:05 +0100, Mauro Carvalho Chehab wrote:

Em Thu, 11 Feb 2016 16:41:20 -0700 Shuah Khan shuahkh@osg.samsung.com escreveu:

...

Add ALSA Media Controller capture, playback, and mixer function entity defines.

Signed-off-by: Shuah Khan shuahkh@osg.samsung.com

include/uapi/linux/media.h | 7 +++++++ 1 file changed, 7 insertions(+)

diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index 3cc0366..449462e 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -98,6 +98,13 @@ struct media_device_info { #define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 42)

/*

• • Audio Entity Functions
• */

+#define MEDIA_ENT_F_AUDIO_CAPTURE (MEDIA_ENT_F_BASE + 200) +#define MEDIA_ENT_F_AUDIO_PLAYBACK (MEDIA_ENT_F_BASE + 201) +#define MEDIA_ENT_F_AUDIO_MIXER (MEDIA_ENT_F_BASE + 202)

+/*

• Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and
• MEDIA_ENT_F_OLD_SUBDEV_BASE are kept to keep backward compatibility
• with the legacy v1 API.The number range is out of range by purpose:

Looks OK to me.

This won't apply anymore on master, because we changed the numberspace, but it is a trivial conflict. No need to rebase.

Takashi,

If OK for you, please ack.

Acked-by: Takashi Iwai tiwai@suse.de

Takashi

On 03/10/2016 12:35 AM, Sakari Ailus wrote:

Hi Shuah,

On Thu, Feb 11, 2016 at 04:41:22PM -0700, Shuah Khan wrote:

...

Add new fields to struct media_device to add enable_source, and disable_source handlers, and source_priv to stash driver private data that is used to run these handlers. The enable_source handler finds source entity for the passed in entity and checks if it is available. When link is found, it activates it. Disable source handler deactivates the link.

Bridge driver is expected to implement and set these handlers.

Signed-off-by: Shuah Khan shuahkh@osg.samsung.com

include/media/media-device.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)

diff --git a/include/media/media-device.h b/include/media/media-device.h index 075a482..1a04644 100644 --- a/include/media/media-device.h +++ b/include/media/media-device.h @@ -302,6 +302,11 @@ struct media_entity_notify {

• @entity_notify: List of registered entity_notify callbacks
• @lock: Entities list lock
• @graph_mutex: Entities graph operation lock

• • @source_priv: Driver Private data for enable/disable source handlers
• • @enable_source: Enable Source Handler function pointer
• • @disable_source: Disable Source Handler function pointer
• • @link_notify: Link state change notification callback
  • This structure represents an abstract high-level media device. It allows easy

@@ -313,6 +318,26 @@ struct media_entity_notify {

• @model is a descriptive model name exported through sysfs. It doesn't have to
• be unique.

• • @enable_source is a handler to find source entity for the
• • sink entity and activate the link between them if source
• • entity is free. Drivers should call this handler before
• • accessing the source.
• • @disable_source is a handler to find source entity for the
• • sink entity and deactivate the link between them. Drivers
• • should call this handler to release the source.

Is there a particular reason you're not simply (de)activating the link, but instead add a new callback?

These two handlers are separate for a couple of reasons:

1. Explicit and symmetric API is easier to use and maintain. Similar what we do in other cases, register/unregister get/put etc. 2. This is more important. Disable handler makes sure the owner is releasing the resource. Otherwise, when some other application does enable, the owner could loose the resource, if enable and disable are the same.

e.g: Video app is holding the resource, DVB app does enable. Disable handler makes sure Video/owner is the one that is asking to do the release.

thanks, -- Shuah

...

• • Note: Bridge driver is expected to implement and set the
• • handler when media_device is registered or when
• • bridge driver finds the media_device during probe.
• • Bridge driver sets source_priv with information
• • necessary to run enable/disable source handlers.
• • Use-case: find tuner entity connected to the decoder
• • entity and check if it is available, and activate the
• • the link between them from enable_source and deactivate
• • from disable_source.
  */

struct media_device { /* dev->driver_data points to this struct. */ @@ -344,6 +369,11 @@ struct media_device { /* Serializes graph operations. */ struct mutex graph_mutex;

• void *source_priv;
• int (*enable_source)(struct media_entity *entity,

• 	     struct media_pipeline *pipe);
  

• void (*disable_source)(struct media_entity *entity);
• int (*link_notify)(struct media_link *link, u32 flags, unsigned int notification);

};

On 03/13/2016 02:11 PM, Sakari Ailus wrote:

Hi Shuah,

On Thu, Mar 10, 2016 at 07:29:59AM -0700, Shuah Khan wrote:

...

On 03/10/2016 12:35 AM, Sakari Ailus wrote:

...

Hi Shuah,

On Thu, Feb 11, 2016 at 04:41:22PM -0700, Shuah Khan wrote:

...

Add new fields to struct media_device to add enable_source, and disable_source handlers, and source_priv to stash driver private data that is used to run these handlers. The enable_source handler finds source entity for the passed in entity and checks if it is available. When link is found, it activates it. Disable source handler deactivates the link.

Bridge driver is expected to implement and set these handlers.

Signed-off-by: Shuah Khan shuahkh@osg.samsung.com

include/media/media-device.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)

diff --git a/include/media/media-device.h b/include/media/media-device.h index 075a482..1a04644 100644 --- a/include/media/media-device.h +++ b/include/media/media-device.h @@ -302,6 +302,11 @@ struct media_entity_notify {

• @entity_notify: List of registered entity_notify callbacks
• @lock: Entities list lock
• @graph_mutex: Entities graph operation lock

• • @source_priv: Driver Private data for enable/disable source handlers
• • @enable_source: Enable Source Handler function pointer
• • @disable_source: Disable Source Handler function pointer
• • @link_notify: Link state change notification callback
  • This structure represents an abstract high-level media device. It allows easy

@@ -313,6 +318,26 @@ struct media_entity_notify {

• @model is a descriptive model name exported through sysfs. It doesn't have to
• be unique.

• • @enable_source is a handler to find source entity for the
• • sink entity and activate the link between them if source
• • entity is free. Drivers should call this handler before
• • accessing the source.
• • @disable_source is a handler to find source entity for the
• • sink entity and deactivate the link between them. Drivers
• • should call this handler to release the source.

Is there a particular reason you're not simply (de)activating the link, but instead add a new callback?

These two handlers are separate for a couple of reasons:

1. Explicit and symmetric API is easier to use and maintain. Similar what we do in other cases, register/unregister get/put etc.

Link state is set explicitly (enabled or disabled). This is certainly not a reason to create a redundant API for link setup.

...

2. This is more important. Disable handler makes sure the owner is releasing the resource. Otherwise, when some other application does enable, the owner could loose the resource, if enable and disable are the same.

   e.g: Video app is holding the resource, DVB app does enable. Disable handler makes sure Video/owner is the one that is asking to do the release.

Based on the later patches in this set, the enable_source() callback of the au0828 driver performs three things:

• Find the source entity,
• Enable the link from some au0828 entity to the source and
• Start the pipeline that begins from the I/O device node. The pipe object is embedded in struct video_device.

disable_source() undoes this in reverse order.

That's in the au0828 driver and rightly so.

Then it gets murkier. enable_source() and disable_source() callbacks (through a few turns) will get called from v4l2-ioctl.c functions v4l_querycap, v4l_s_fmt, v4l_s_frequency, v4l_s_std and v4l_querystd. This is also performed in VB2 core vb2_core_streamon() function.

I certainly have no objections when it comes to blocking other processes from setting the format when a process holding a file handle to a device has e.g. set the format. The implementation is another matter.

What particularly does concern me in this patchset is:

• struct media_pipe is intended to be allocated by drivers embedded in another struct holding information the driver needs related to the pipeline. Moving this struct to struct video_device prevents this, which translates to v4l_enable_media_source() and v4l_disable_media_source() functions the patchset adds being specific to the au0828 driver. They should be part of that driver, and may not be part of the V4L2 core. struct media_pipe may not be added to struct video_device for the same reason.

This media_pipe is associated with struct video_device though. I don't understand your concern. I am viewing this media_pipe as part of the registered video_device. video_device struct is in the au0828 device and gets registered as a whole including the media_pipe

• The IOCTL handlers in v4l2-ioctl.c already call driver-settable callbacks before this set. It looks like redundant callbacks are added there as ell. The same appears to be true for the VB2 callback. Could you use the existing callbacks instead of creating new ones?

If I understand correctly, you are suggesting that the calls to enable and disable source should be made from the au0828 hooks. e.g vidioc_s_std()

Calling them from v4l2-core makes it generic and works on all drivers without driver changes. That is the rationale for making adding v4l2 common interfaces v4l_enable_media_source() and v4l_disable_media_source()

As a short term solution, I propose moving the code to the au0828 driver. Once it is there, we can see whether it could be made more generic if there is a need for it elsewhere. I believe so. Support atomic pipeline configuration and startup is a generic problem that requires a generic solution: we should have a way to construct a pipeline and prevent other users from messing with it before it's started. But as currently implemented by this patchset, it is very specific to the au0828 driver and as such may not be added to the V4L2 or the MC frameworks.

The enable and disable handlers themselves are for a good reason. These are handlers that get called from dvb-core, v4l2-core via the common interfaces. These also get called from sound driver from the media_device. All of this is generic. Could you please elaborate on which part is au0828 driver specific other than the media_pipe in struct video_device?

thanks, -- Shuah

On 02/11/2016 04:41 PM, Shuah Khan wrote:

Change ALSA driver to use Media Controller API to share media resources with DVB and V4L2 drivers on a AU0828 media device. Media Controller specific initialization is done after sound card is registered. ALSA creates Media interface and entity function graph nodes for Control, Mixer, PCM Playback, and PCM Capture devices.

snd_usb_hw_params() will call Media Controller enable source handler interface to request the media resource. If resource request is granted, it will release it from snd_usb_hw_free(). If resource is busy, -EBUSY is returned.

Media specific cleanup is done in usb_audio_disconnect().

Signed-off-by: Shuah Khan shuahkh@osg.samsung.com

Hi Takashi,

Hope you are okay with this version. I addressed all your comments. Could you please Ack it or let me know if there is something I still need to address.

thanks, -- Shuah

---

sound/usb/Kconfig | 4 + sound/usb/Makefile | 2 + sound/usb/card.c | 14 +++ sound/usb/card.h | 3 + sound/usb/media.c | 318 +++++++++++++++++++++++++++++++++++++++++++++++ sound/usb/media.h | 72 +++++++++++ sound/usb/mixer.h | 3 + sound/usb/pcm.c | 28 ++++- sound/usb/quirks-table.h | 1 + sound/usb/stream.c | 2 + sound/usb/usbaudio.h | 6 + 11 files changed, 448 insertions(+), 5 deletions(-) create mode 100644 sound/usb/media.c create mode 100644 sound/usb/media.h

diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig index a452ad7..ba117f5 100644 --- a/sound/usb/Kconfig +++ b/sound/usb/Kconfig @@ -15,6 +15,7 @@ config SND_USB_AUDIO select SND_RAWMIDI select SND_PCM select BITREVERSE

• select SND_USB_AUDIO_USE_MEDIA_CONTROLLER if MEDIA_CONTROLLER && MEDIA_SUPPORT help Say Y here to include support for USB audio and USB MIDI devices.

@@ -22,6 +23,9 @@ config SND_USB_AUDIO To compile this driver as a module, choose M here: the module will be called snd-usb-audio.

+config SND_USB_AUDIO_USE_MEDIA_CONTROLLER

• bool

config SND_USB_UA101 tristate "Edirol UA-101/UA-1000 driver" select SND_PCM diff --git a/sound/usb/Makefile b/sound/usb/Makefile index 2d2d122..8dca3c4 100644 --- a/sound/usb/Makefile +++ b/sound/usb/Makefile @@ -15,6 +15,8 @@ snd-usb-audio-objs := card.o \ quirks.o \ stream.o

+snd-usb-audio-$(CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER) += media.o

snd-usbmidi-lib-objs := midi.o

# Toplevel Module Dependency diff --git a/sound/usb/card.c b/sound/usb/card.c index 1f09d95..35fe256 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -66,6 +66,7 @@ #include "format.h" #include "power.h" #include "stream.h" +#include "media.h"

MODULE_AUTHOR("Takashi Iwai tiwai@suse.de"); MODULE_DESCRIPTION("USB Audio"); @@ -561,6 +562,11 @@ static int usb_audio_probe(struct usb_interface *intf, if (err < 0) goto __error;

• if (quirk->media_device) {

• /* don't want to fail when media_device_create() fails */
  

• media_device_create(chip, intf);
  

• }
• usb_chip[chip->index] = chip; chip->num_interfaces++; usb_set_intfdata(intf, chip);

@@ -617,6 +623,14 @@ static void usb_audio_disconnect(struct usb_interface *intf) list_for_each(p, &chip->midi_list) { snd_usbmidi_disconnect(p); }

• /*
  

•  * Nice to check quirk && quirk->media_device
  

•  * need some special handlings. Doesn't look like
  

•  * we have access to quirk here
  

•  * Acceses mixer_list
  

• */
  

• media_device_delete(chip);
  

• /* release mixer resources */ list_for_each_entry(mixer, &chip->mixer_list, list) { snd_usb_mixer_disconnect(mixer);

diff --git a/sound/usb/card.h b/sound/usb/card.h index 71778ca..34a0898 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h @@ -105,6 +105,8 @@ struct snd_usb_endpoint { struct list_head list; };

+struct media_ctl;

struct snd_usb_substream { struct snd_usb_stream *stream; struct usb_device *dev; @@ -156,6 +158,7 @@ struct snd_usb_substream { } dsd_dop;

bool trigger_tstamp_pending_update; /* trigger timestamp being updated from initial estimate */

• struct media_ctl *media_ctl;

};

struct snd_usb_stream { diff --git a/sound/usb/media.c b/sound/usb/media.c new file mode 100644 index 0000000..cff1459 --- /dev/null +++ b/sound/usb/media.c @@ -0,0 +1,318 @@ +/*

• • media.c - Media Controller specific ALSA driver code
• • Copyright (c) 2016 Shuah Khan shuahkh@osg.samsung.com
• • Copyright (c) 2016 Samsung Electronics Co., Ltd.
• • This file is released under the GPLv2.
• */

+/*

• • This file adds Media Controller support to ALSA driver
• • to use the Media Controller API to share tuner with DVB
• • and V4L2 drivers that control media device. Media device
• • is created based on existing quirks framework. Using this
• • approach, the media controller API usage can be added for
• • a specific device.

+*/

+#include <linux/init.h> +#include <linux/list.h> +#include <linux/mutex.h> +#include <linux/slab.h> +#include <linux/usb.h>

+#include <sound/pcm.h> +#include <sound/core.h>

+#include "usbaudio.h" +#include "card.h" +#include "mixer.h" +#include "media.h"

+static int media_enable_source(struct media_ctl *mctl) +{

• if (mctl && mctl->media_dev->enable_source)

• return mctl->media_dev->enable_source(&mctl->media_entity,
  

• 				      &mctl->media_pipe);
  

• return 0;

+}

+static void media_disable_source(struct media_ctl *mctl) +{

• if (mctl && mctl->media_dev->disable_source)

• mctl->media_dev->disable_source(&mctl->media_entity);
  

+}

+int media_stream_init(struct snd_usb_substream *subs, struct snd_pcm *pcm,

• 	int stream)
  

+{

• struct media_device *mdev;
• struct media_ctl *mctl;
• struct device *pcm_dev = &pcm->streams[stream].dev;
• u32 intf_type;
• int ret = 0;
• u16 mixer_pad;
• struct media_entity *entity;
• mdev = subs->stream->chip->media_dev;
• if (!mdev)

• return -ENODEV;
  

• if (subs->media_ctl)

• return 0;
  

• /* allocate media_ctl */
• mctl = kzalloc(sizeof(*mctl), GFP_KERNEL);
• if (!mctl)

• return -ENOMEM;
  

• mctl->media_dev = mdev;
• if (stream == SNDRV_PCM_STREAM_PLAYBACK) {

• intf_type = MEDIA_INTF_T_ALSA_PCM_PLAYBACK;
  

• mctl->media_entity.function = MEDIA_ENT_F_AUDIO_PLAYBACK;
  

• mctl->media_pad.flags = MEDIA_PAD_FL_SOURCE;
  

• mixer_pad = 1;
  

• } else {

• intf_type = MEDIA_INTF_T_ALSA_PCM_CAPTURE;
  

• mctl->media_entity.function = MEDIA_ENT_F_AUDIO_CAPTURE;
  

• mctl->media_pad.flags = MEDIA_PAD_FL_SINK;
  

• mixer_pad = 2;
  

• }
• mctl->media_entity.name = pcm->name;
• media_entity_pads_init(&mctl->media_entity, 1, &mctl->media_pad);
• ret = media_device_register_entity(mctl->media_dev,

• 			    &mctl->media_entity);
  

• if (ret)

• goto err1;
  

• mctl->intf_devnode = media_devnode_create(mdev, intf_type, 0,

• 				  MAJOR(pcm_dev->devt),
  

• 				  MINOR(pcm_dev->devt));
  

• if (!mctl->intf_devnode) {

• ret = -ENOMEM;
  

• goto err2;
  

• }
• mctl->intf_link = media_create_intf_link(&mctl->media_entity,

• 				 &mctl->intf_devnode->intf,
  

• 				 MEDIA_LNK_FL_ENABLED);
  

• if (!mctl->intf_link) {

• ret = -ENOMEM;
  

• goto err3;
  

• }
• /* create link between mixer and audio */
• media_device_for_each_entity(entity, mdev) {

• switch (entity->function) {
  

• case MEDIA_ENT_F_AUDIO_MIXER:
  

• 	ret = media_create_pad_link(entity, mixer_pad,
  

• 				    &mctl->media_entity, 0,
  

• 				    MEDIA_LNK_FL_ENABLED);
  

• 	if (ret)
  

• 		goto err4;
  

• 	break;
  

• }
  

• }
• subs->media_ctl = mctl;
• return 0;

+err4:

• media_remove_intf_link(mctl->intf_link);

+err3:

• media_devnode_remove(mctl->intf_devnode);

+err2:

• media_device_unregister_entity(&mctl->media_entity);

+err1:

• kfree(mctl);
• return ret;

+}

+void media_stream_delete(struct snd_usb_substream *subs) +{

• struct media_ctl *mctl = subs->media_ctl;
• if (mctl && mctl->media_dev) {

• struct media_device *mdev;
  

• mdev = subs->stream->chip->media_dev;
  

• if (mdev && media_devnode_is_registered(&mdev->devnode)) {
  

• 	media_devnode_remove(mctl->intf_devnode);
  

• 	media_device_unregister_entity(&mctl->media_entity);
  

• 	media_entity_cleanup(&mctl->media_entity);
  

• }
  

• kfree(mctl);
  

• subs->media_ctl = NULL;
  

• }

+}

+int media_start_pipeline(struct snd_usb_substream *subs) +{

• struct media_ctl *mctl = subs->media_ctl;
• if (mctl)

• return media_enable_source(mctl);
  

• return 0;

+}

+void media_stop_pipeline(struct snd_usb_substream *subs) +{

• struct media_ctl *mctl = subs->media_ctl;
• if (mctl)

• media_disable_source(mctl);
  

+}

+int media_mixer_init(struct snd_usb_audio *chip) +{

• struct device *ctl_dev = &chip->card->ctl_dev;
• struct media_intf_devnode *ctl_intf;
• struct usb_mixer_interface *mixer;
• struct media_device *mdev = chip->media_dev;
• struct media_mixer_ctl *mctl;
• u32 intf_type = MEDIA_INTF_T_ALSA_CONTROL;
• int ret;
• if (!mdev)

• return -ENODEV;
  

• ctl_intf = chip->ctl_intf_media_devnode;
• if (!ctl_intf) {

• ctl_intf = media_devnode_create(mdev, intf_type, 0,
  

• 				MAJOR(ctl_dev->devt),
  

• 				MINOR(ctl_dev->devt));
  

• if (!ctl_intf)
  

• 	return -ENOMEM;
  

• chip->ctl_intf_media_devnode = ctl_intf;
  

• }
• list_for_each_entry(mixer, &chip->mixer_list, list) {

• if (mixer->media_mixer_ctl)
  

• 	continue;
  

• /* allocate media_mixer_ctl */
  

• mctl = kzalloc(sizeof(*mctl), GFP_KERNEL);
  

• if (!mctl)
  

• 	return -ENOMEM;
  

• mctl->media_dev = mdev;
  

• mctl->media_entity.function = MEDIA_ENT_F_AUDIO_MIXER;
  

• mctl->media_entity.name = chip->card->mixername;
  

• mctl->media_pad[0].flags = MEDIA_PAD_FL_SINK;
  

• mctl->media_pad[1].flags = MEDIA_PAD_FL_SOURCE;
  

• mctl->media_pad[2].flags = MEDIA_PAD_FL_SOURCE;
  

• media_entity_pads_init(&mctl->media_entity, MEDIA_MIXER_PAD_MAX,
  

• 		  mctl->media_pad);
  

• ret =  media_device_register_entity(mctl->media_dev,
  

• 				    &mctl->media_entity);
  

• if (ret) {
  

• 	kfree(mctl);
  

• 	return ret;
  

• }
  

• mctl->intf_link = media_create_intf_link(&mctl->media_entity,
  

• 					 &ctl_intf->intf,
  

• 					 MEDIA_LNK_FL_ENABLED);
  

• if (!mctl->intf_link) {
  

• 	media_device_unregister_entity(&mctl->media_entity);
  

• 	media_entity_cleanup(&mctl->media_entity);
  

• 	kfree(mctl);
  

• 	return -ENOMEM;
  

• }
  

• mctl->intf_devnode = ctl_intf;
  

• mixer->media_mixer_ctl = mctl;
  

• }
• return 0;

+}

+static void media_mixer_delete(struct snd_usb_audio *chip) +{

• struct usb_mixer_interface *mixer;
• struct media_device *mdev = chip->media_dev;
• if (!mdev)

• return;
  

• list_for_each_entry(mixer, &chip->mixer_list, list) {

• struct media_mixer_ctl *mctl;
  

• mctl = mixer->media_mixer_ctl;
  

• if (!mixer->media_mixer_ctl)
  

• 	continue;
  

• if (media_devnode_is_registered(&mdev->devnode)) {
  

• 	media_device_unregister_entity(&mctl->media_entity);
  

• 	media_entity_cleanup(&mctl->media_entity);
  

• }
  

• kfree(mctl);
  

• mixer->media_mixer_ctl = NULL;
  

• }
• if (media_devnode_is_registered(&mdev->devnode))

• media_devnode_remove(chip->ctl_intf_media_devnode);
  

• chip->ctl_intf_media_devnode = NULL;

+}

+int media_device_create(struct snd_usb_audio *chip,

• 	struct usb_interface *iface)
  

+{

• struct media_device *mdev;
• struct usb_device *usbdev = interface_to_usbdev(iface);
• int ret;
• mdev = media_device_get_devres(&usbdev->dev);
• if (!mdev)

• return -ENOMEM;
  

• if (!mdev->dev) {

• /* register media device */
  

• mdev->dev = &usbdev->dev;
  

• if (usbdev->product)
  

• 	strlcpy(mdev->model, usbdev->product,
  

• 		sizeof(mdev->model));
  

• if (usbdev->serial)
  

• 	strlcpy(mdev->serial, usbdev->serial,
  

• 		sizeof(mdev->serial));
  

• strcpy(mdev->bus_info, usbdev->devpath);
  

• mdev->hw_revision = le16_to_cpu(usbdev->descriptor.bcdDevice);
  

• media_device_init(mdev);
  

• }
• if (!media_devnode_is_registered(&mdev->devnode)) {

• ret = media_device_register(mdev);
  

• if (ret) {
  

• 	dev_err(&usbdev->dev,
  

• 		"Couldn't register media device. Error: %d\n",
  

• 		ret);
  

• 	return ret;
  

• }
  

• }
• /* save media device - avoid lookups */
• chip->media_dev = mdev;
• /* Create media entities for mixer and control dev */
• ret = media_mixer_init(chip);
• if (ret) {

• dev_err(&usbdev->dev,
  

• 	"Couldn't create media mixer entities. Error: %d\n",
  

• 	ret);
  

• /* clear saved media_dev */
  

• chip->media_dev = NULL;
  

• return ret;
  

• }
• return 0;

+}

+void media_device_delete(struct snd_usb_audio *chip) +{

• struct media_device *mdev = chip->media_dev;
• media_mixer_delete(chip);
• if (mdev) {

• if (media_devnode_is_registered(&mdev->devnode))
  

• 	media_device_unregister(mdev);
  

• chip->media_dev = NULL;
  

• }

+} diff --git a/sound/usb/media.h b/sound/usb/media.h new file mode 100644 index 0000000..f66b4d7 --- /dev/null +++ b/sound/usb/media.h @@ -0,0 +1,72 @@ +/*

• • media.h - Media Controller specific ALSA driver code
• • Copyright (c) 2016 Shuah Khan shuahkh@osg.samsung.com
• • Copyright (c) 2016 Samsung Electronics Co., Ltd.
• • This file is released under the GPLv2.
• */

+/*

• • This file adds Media Controller support to ALSA driver
• • to use the Media Controller API to share tuner with DVB
• • and V4L2 drivers that control media device. Media device
• • is created based on existing quirks framework. Using this
• • approach, the media controller API usage can be added for
• • a specific device.

+*/ +#ifndef __MEDIA_H

+#ifdef CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER

+#include <media/media-device.h> +#include <media/media-entity.h> +#include <sound/asound.h>

+struct media_ctl {

• struct media_device *media_dev;
• struct media_entity media_entity;
• struct media_intf_devnode *intf_devnode;
• struct media_link *intf_link;
• struct media_pad media_pad;
• struct media_pipeline media_pipe;

+};

+/*

• • One source pad each for SNDRV_PCM_STREAM_CAPTURE and
• • SNDRV_PCM_STREAM_PLAYBACK. One for sink pad to link
• • to AUDIO Source

+*/ +#define MEDIA_MIXER_PAD_MAX (SNDRV_PCM_STREAM_LAST + 2)

+struct media_mixer_ctl {

• struct media_device *media_dev;
• struct media_entity media_entity;
• struct media_intf_devnode *intf_devnode;
• struct media_link *intf_link;
• struct media_pad media_pad[MEDIA_MIXER_PAD_MAX];
• struct media_pipeline media_pipe;

+};

+int media_device_create(struct snd_usb_audio *chip,

• 	struct usb_interface *iface);
  

+void media_device_delete(struct snd_usb_audio *chip); +int media_stream_init(struct snd_usb_substream *subs, struct snd_pcm *pcm,

• 	int stream);
  

+void media_stream_delete(struct snd_usb_substream *subs); +int media_start_pipeline(struct snd_usb_substream *subs); +void media_stop_pipeline(struct snd_usb_substream *subs); +#else +static inline int media_device_create(struct snd_usb_audio *chip,

• 		      struct usb_interface *iface)
  

• 				{ return 0; }
  

+static inline void media_device_delete(struct snd_usb_audio *chip) { } +static inline int media_stream_init(struct snd_usb_substream *subs,

• 			struct snd_pcm *pcm, int stream)
  

• 				{ return 0; }
  

+static inline void media_stream_delete(struct snd_usb_substream *subs) { } +static inline int media_start_pipeline(struct snd_usb_substream *subs)

• 			{ return 0; }
  

+static inline void media_stop_pipeline(struct snd_usb_substream *subs) { } +#endif +#endif /* __MEDIA_H */ diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h index 3417ef3..f378944 100644 --- a/sound/usb/mixer.h +++ b/sound/usb/mixer.h @@ -3,6 +3,8 @@

#include <sound/info.h>

+struct media_mixer_ctl;

struct usb_mixer_interface { struct snd_usb_audio *chip; struct usb_host_interface *hostif; @@ -22,6 +24,7 @@ struct usb_mixer_interface { struct urb *rc_urb; struct usb_ctrlrequest *rc_setup_packet; u8 rc_buffer[6];

• struct media_mixer_ctl *media_mixer_ctl;

};

#define MAX_CHANNELS 16 /* max logical channels */ diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 9245f52..c3b8486 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -35,6 +35,7 @@ #include "pcm.h" #include "clock.h" #include "power.h" +#include "media.h"

#define SUBSTREAM_FLAG_DATA_EP_STARTED 0 #define SUBSTREAM_FLAG_SYNC_EP_STARTED 1 @@ -715,10 +716,14 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream, struct audioformat *fmt; int ret;

• ret = media_start_pipeline(subs);
• if (ret)

• return ret;
  

• ret = snd_pcm_lib_alloc_vmalloc_buffer(substream, params_buffer_bytes(hw_params)); if (ret < 0)

• return ret;
  

• goto err_ret;
  
  

  subs->pcm_format = params_format(hw_params); subs->period_bytes = params_period_bytes(hw_params);

@@ -732,22 +737,27 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream, dev_dbg(&subs->dev->dev, "cannot set format: format = %#x, rate = %d, channels = %d\n", subs->pcm_format, subs->cur_rate, subs->channels);

• return -EINVAL;
  

• ret = -EINVAL;
  

• goto err_ret;
  

  }

  ret = snd_usb_lock_shutdown(subs->stream->chip); if (ret < 0)

• return ret;
  

• goto err_ret;
  

  ret = set_format(subs, fmt); snd_usb_unlock_shutdown(subs->stream->chip); if (ret < 0)

• return ret;
  

• goto err_ret;
  
  

  subs->interface = fmt->iface; subs->altset_idx = fmt->altset_idx; subs->need_setup_ep = true;

  return 0;

+err_ret:

• media_stop_pipeline(subs);
• return ret;

}

/* @@ -759,6 +769,7 @@ static int snd_usb_hw_free(struct snd_pcm_substream *substream) { struct snd_usb_substream *subs = substream->runtime->private_data;

• media_stop_pipeline(subs); subs->cur_audiofmt = NULL; subs->cur_rate = 0; subs->period_bytes = 0;

@@ -1219,6 +1230,7 @@ static int snd_usb_pcm_open(struct snd_pcm_substream *substream, int direction) struct snd_usb_stream *as = snd_pcm_substream_chip(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct snd_usb_substream *subs = &as->substream[direction];

• int ret;

  subs->interface = -1; subs->altset_idx = 0;

@@ -1232,7 +1244,12 @@ static int snd_usb_pcm_open(struct snd_pcm_substream *substream, int direction) subs->dsd_dop.channel = 0; subs->dsd_dop.marker = 1;

• return setup_hw_info(runtime, subs);

• ret = setup_hw_info(runtime, subs);
• if (ret == 0)

• ret = media_stream_init(subs, as->pcm, direction);
  

• if (ret)

• snd_usb_autosuspend(subs->stream->chip);
  

• return ret;

}

static int snd_usb_pcm_close(struct snd_pcm_substream *substream, int direction) @@ -1241,6 +1258,7 @@ static int snd_usb_pcm_close(struct snd_pcm_substream *substream, int direction) struct snd_usb_substream *subs = &as->substream[direction];

stop_endpoints(subs, true);

• media_stop_pipeline(subs);

  if (subs->interface >= 0 && !snd_usb_lock_shutdown(subs->stream->chip)) {

diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index c60a776..9d087b1 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -2886,6 +2886,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), .product_name = pname, \ .ifnum = QUIRK_ANY_INTERFACE, \ .type = QUIRK_AUDIO_ALIGN_TRANSFER, \

• .media_device = 1, \
  

  } \

}

diff --git a/sound/usb/stream.c b/sound/usb/stream.c index c4dc577..6c7f5c1 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -36,6 +36,7 @@ #include "format.h" #include "clock.h" #include "stream.h" +#include "media.h"

/*

• free a substream

@@ -52,6 +53,7 @@ static void free_substream(struct snd_usb_substream *subs) kfree(fp); } kfree(subs->rate_list.list);

• media_stream_delete(subs);

}

diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index b665d85..a161c7c 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h @@ -30,6 +30,9 @@

*/

+struct media_device; +struct media_intf_devnode;

struct snd_usb_audio { int index; struct usb_device *dev; @@ -60,6 +63,8 @@ struct snd_usb_audio { bool autoclock; /* from the 'autoclock' module param */

struct usb_host_interface *ctrl_intf; /* the audio control interface */

• struct media_device *media_dev;
• struct media_intf_devnode *ctl_intf_media_devnode;

};

#define usb_audio_err(chip, fmt, args...) \ @@ -110,6 +115,7 @@ struct snd_usb_audio_quirk { const char *product_name; int16_t ifnum; uint16_t type;

• bool media_device; const void *data;

};

On 02/26/2016 12:55 PM, Takashi Iwai wrote:

On Fri, 12 Feb 2016 00:41:38 +0100, Shuah Khan wrote:

...

Change ALSA driver to use Media Controller API to share media resources with DVB and V4L2 drivers on a AU0828 media device. Media Controller specific initialization is done after sound card is registered. ALSA creates Media interface and entity function graph nodes for Control, Mixer, PCM Playback, and PCM Capture devices.

snd_usb_hw_params() will call Media Controller enable source handler interface to request the media resource. If resource request is granted, it will release it from snd_usb_hw_free(). If resource is busy, -EBUSY is returned.

Media specific cleanup is done in usb_audio_disconnect().

Signed-off-by: Shuah Khan shuahkh@osg.samsung.com

sound/usb/Kconfig | 4 + sound/usb/Makefile | 2 + sound/usb/card.c | 14 +++ sound/usb/card.h | 3 + sound/usb/media.c | 318 +++++++++++++++++++++++++++++++++++++++++++++++ sound/usb/media.h | 72 +++++++++++ sound/usb/mixer.h | 3 + sound/usb/pcm.c | 28 ++++- sound/usb/quirks-table.h | 1 + sound/usb/stream.c | 2 + sound/usb/usbaudio.h | 6 + 11 files changed, 448 insertions(+), 5 deletions(-) create mode 100644 sound/usb/media.c create mode 100644 sound/usb/media.h

diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig index a452ad7..ba117f5 100644 --- a/sound/usb/Kconfig +++ b/sound/usb/Kconfig @@ -15,6 +15,7 @@ config SND_USB_AUDIO select SND_RAWMIDI select SND_PCM select BITREVERSE

• select SND_USB_AUDIO_USE_MEDIA_CONTROLLER if MEDIA_CONTROLLER && MEDIA_SUPPORT

Looking at the media Kconfig again, this would be broken if MEDIA_SUPPORT=m and SND_USB_AUDIO=y. The ugly workaround is something like: select SND_USB_AUDIO_USE_MEDIA_CONTROLLER \ if MEDIA_CONTROLLER && (MEDIA_SUPPORT=y || MEDIA_SUPPORT=SND)

My current config is MEDIA_SUPPORT=m and SND_USB_AUDIO=y It is working and I didn't see any issues so far. Maybe the current change is good. I am hoping kbuild-bot can find issues (if any) once it gets merged.

Other than that, it looks more or less OK to me. The way how media_stream_init() gets called is a bit worrisome, but it should work practically. Another concern is about the disconnection. Can all function calls in media_device_delete() be safe even if it's called while the application still opens the MC device?

Right. I have been looking into device removal path when ioctls are active and I can resolve any issues that might surface while an audio app is active when device is removed.

In anyway, such a thing can be improved later once after we get this merged, too. So, feel fee to take my ack.

Acked-by: Takashi Iwai tiwai@suse.de

thanks for the Ack -- Shuah

thanks,

Takashi

On 02/26/2016 01:50 PM, Takashi Iwai wrote:

On Fri, 26 Feb 2016 21:08:43 +0100, Shuah Khan wrote:

...

On 02/26/2016 12:55 PM, Takashi Iwai wrote:

...

On Fri, 12 Feb 2016 00:41:38 +0100, Shuah Khan wrote:

...

Change ALSA driver to use Media Controller API to share media resources with DVB and V4L2 drivers on a AU0828 media device. Media Controller specific initialization is done after sound card is registered. ALSA creates Media interface and entity function graph nodes for Control, Mixer, PCM Playback, and PCM Capture devices.

snd_usb_hw_params() will call Media Controller enable source handler interface to request the media resource. If resource request is granted, it will release it from snd_usb_hw_free(). If resource is busy, -EBUSY is returned.

Media specific cleanup is done in usb_audio_disconnect().

Signed-off-by: Shuah Khan shuahkh@osg.samsung.com

sound/usb/Kconfig | 4 + sound/usb/Makefile | 2 + sound/usb/card.c | 14 +++ sound/usb/card.h | 3 + sound/usb/media.c | 318 +++++++++++++++++++++++++++++++++++++++++++++++ sound/usb/media.h | 72 +++++++++++ sound/usb/mixer.h | 3 + sound/usb/pcm.c | 28 ++++- sound/usb/quirks-table.h | 1 + sound/usb/stream.c | 2 + sound/usb/usbaudio.h | 6 + 11 files changed, 448 insertions(+), 5 deletions(-) create mode 100644 sound/usb/media.c create mode 100644 sound/usb/media.h

diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig index a452ad7..ba117f5 100644 --- a/sound/usb/Kconfig +++ b/sound/usb/Kconfig @@ -15,6 +15,7 @@ config SND_USB_AUDIO select SND_RAWMIDI select SND_PCM select BITREVERSE

• select SND_USB_AUDIO_USE_MEDIA_CONTROLLER if MEDIA_CONTROLLER && MEDIA_SUPPORT

Looking at the media Kconfig again, this would be broken if MEDIA_SUPPORT=m and SND_USB_AUDIO=y. The ugly workaround is something like: select SND_USB_AUDIO_USE_MEDIA_CONTROLLER \ if MEDIA_CONTROLLER && (MEDIA_SUPPORT=y || MEDIA_SUPPORT=SND)

My current config is MEDIA_SUPPORT=m and SND_USB_AUDIO=y It is working and I didn't see any issues so far.

Hmm, how does it be? In drivers/media/Makefile:

ifeq ($(CONFIG_MEDIA_CONTROLLER),y) obj-$(CONFIG_MEDIA_SUPPORT) += media.o endif

So it's a module. Meanwhile you have reference from usb-audio driver that is built-in kernel. How is the symbol resolved?

Sorry my mistake. I misspoke. My config had: CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIA_CONTROLLER=y CONFIG_SND_USB_AUDIO=m

The following doesn't work as you pointed out.

CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIA_CONTROLLER=y CONFIG_SND_USB_AUDIO=y

okay here is what will work for all of the possible combinations of CONFIG_MEDIA_SUPPORT and CONFIG_SND_USB_AUDIO

select SND_USB_AUDIO_USE_MEDIA_CONTROLLER \ if MEDIA_CONTROLLER && ((MEDIA_SUPPORT=y) || (MEDIA_SUPPORT=m && SND_USB_AUDIO=m))

The above will cover the cases when

1. CONFIG_MEDIA_SUPPORT and CONFIG_SND_USB_AUDIO are both modules CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER is selected

2. CONFIG_MEDIA_SUPPORT=y and CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER is selected

3. CONFIG_MEDIA_SUPPORT=y and CONFIG_SND_USB_AUDIO=y CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER is selected

4. CONFIG_MEDIA_SUPPORT=m and CONFIG_SND_USB_AUDIO=y This is when we don't want CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER selected

I verified all of the above combinations to make sure the logic works.

If you think of a better way to do this please let me know. I will go ahead and send patch v4 with the above change and you can decide if that is acceptable.

...

...

Other than that, it looks more or less OK to me. The way how media_stream_init() gets called is a bit worrisome, but it should work practically. Another concern is about the disconnection. Can all function calls in media_device_delete() be safe even if it's called while the application still opens the MC device?

Right. I have been looking into device removal path when ioctls are active and I can resolve any issues that might surface while an audio app is active when device is removed.

So, it's 100% safe to call all these media_*() functions while the device is being accessed before closing?

There is a known problem with device removal when media device file is open and ioctl is in progress. This isn't specific to this patch series, a general problem that is related to media device removal in general.

I am working on a fix for this problem. As you said, earlier, I can work on fixing issues after the merge.

thanks, -- Shuah

Em Sat, 27 Feb 2016 08:48:05 +0100 Takashi Iwai tiwai@suse.de escreveu:

On Sat, 27 Feb 2016 03:55:39 +0100, Shuah Khan wrote:

...

On 02/26/2016 01:50 PM, Takashi Iwai wrote:

...

On Fri, 26 Feb 2016 21:08:43 +0100, Shuah Khan wrote:

...

On 02/26/2016 12:55 PM, Takashi Iwai wrote:

...

On Fri, 12 Feb 2016 00:41:38 +0100, Shuah Khan wrote:

...

Change ALSA driver to use Media Controller API to share media resources with DVB and V4L2 drivers on a AU0828 media device. Media Controller specific initialization is done after sound card is registered. ALSA creates Media interface and entity function graph nodes for Control, Mixer, PCM Playback, and PCM Capture devices.

snd_usb_hw_params() will call Media Controller enable source handler interface to request the media resource. If resource request is granted, it will release it from snd_usb_hw_free(). If resource is busy, -EBUSY is returned.

Media specific cleanup is done in usb_audio_disconnect().

Signed-off-by: Shuah Khan shuahkh@osg.samsung.com

sound/usb/Kconfig | 4 + sound/usb/Makefile | 2 + sound/usb/card.c | 14 +++ sound/usb/card.h | 3 + sound/usb/media.c | 318 +++++++++++++++++++++++++++++++++++++++++++++++ sound/usb/media.h | 72 +++++++++++ sound/usb/mixer.h | 3 + sound/usb/pcm.c | 28 ++++- sound/usb/quirks-table.h | 1 + sound/usb/stream.c | 2 + sound/usb/usbaudio.h | 6 + 11 files changed, 448 insertions(+), 5 deletions(-) create mode 100644 sound/usb/media.c create mode 100644 sound/usb/media.h

diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig index a452ad7..ba117f5 100644 --- a/sound/usb/Kconfig +++ b/sound/usb/Kconfig @@ -15,6 +15,7 @@ config SND_USB_AUDIO select SND_RAWMIDI select SND_PCM select BITREVERSE

• select SND_USB_AUDIO_USE_MEDIA_CONTROLLER if MEDIA_CONTROLLER && MEDIA_SUPPORT

Looking at the media Kconfig again, this would be broken if MEDIA_SUPPORT=m and SND_USB_AUDIO=y. The ugly workaround is something like: select SND_USB_AUDIO_USE_MEDIA_CONTROLLER \ if MEDIA_CONTROLLER && (MEDIA_SUPPORT=y || MEDIA_SUPPORT=SND)

My current config is MEDIA_SUPPORT=m and SND_USB_AUDIO=y It is working and I didn't see any issues so far.

Hmm, how does it be? In drivers/media/Makefile:

ifeq ($(CONFIG_MEDIA_CONTROLLER),y) obj-$(CONFIG_MEDIA_SUPPORT) += media.o endif

So it's a module. Meanwhile you have reference from usb-audio driver that is built-in kernel. How is the symbol resolved?

Sorry my mistake. I misspoke. My config had: CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIA_CONTROLLER=y CONFIG_SND_USB_AUDIO=m

The following doesn't work as you pointed out.

CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIA_CONTROLLER=y CONFIG_SND_USB_AUDIO=y

okay here is what will work for all of the possible combinations of CONFIG_MEDIA_SUPPORT and CONFIG_SND_USB_AUDIO

select SND_USB_AUDIO_USE_MEDIA_CONTROLLER \ if MEDIA_CONTROLLER && ((MEDIA_SUPPORT=y) || (MEDIA_SUPPORT=m && SND_USB_AUDIO=m))

The above will cover the cases when

1. CONFIG_MEDIA_SUPPORT and CONFIG_SND_USB_AUDIO are both modules CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER is selected

2. CONFIG_MEDIA_SUPPORT=y and CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER is selected

3. CONFIG_MEDIA_SUPPORT=y and CONFIG_SND_USB_AUDIO=y CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER is selected

4. CONFIG_MEDIA_SUPPORT=m and CONFIG_SND_USB_AUDIO=y This is when we don't want CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER selected

I verified all of the above combinations to make sure the logic works.

If you think of a better way to do this please let me know. I will go ahead and send patch v4 with the above change and you can decide if that is acceptable.

I'm not 100% sure whether CONFIG_SND_USB_AUDIO=m can be put there as conditional inside CONFIG_SND_USB_AUDIO definition. Maybe a safer form would be like:

config SND_USB_AUDIO_USE_MEDIA_CONTROLLER bool default y depends on SND_USB_AUDIO depends on MEDIA_CONTROLLER depends on (MEDIA_SUPPORT=y || MEDIA_SUPPORT=SND_USB_AUDIO)

and drop select from SND_USB_AUDIO.

...

...

...

...

Other than that, it looks more or less OK to me. The way how media_stream_init() gets called is a bit worrisome, but it should work practically. Another concern is about the disconnection. Can all function calls in media_device_delete() be safe even if it's called while the application still opens the MC device?

Right. I have been looking into device removal path when ioctls are active and I can resolve any issues that might surface while an audio app is active when device is removed.

So, it's 100% safe to call all these media_*() functions while the device is being accessed before closing?

There is a known problem with device removal when media device file is open and ioctl is in progress. This isn't specific to this patch series, a general problem that is related to media device removal in general.

I am working on a fix for this problem. As you said, earlier, I can work on fixing issues after the merge.

OK, understood.

Takashi

As there are still some issues here, I decided to apply all but this one, in order to avoid having compilation issues with random configs.

Shuah,

As there were several conflicts when I applied the initial 21 patches from this series, please apply this one on the top of the latest tree.

As this patch touches only at sound, it is independent, so you won't need to rebase it. However, I might have solved some conflicts badly, a final test wouldn't hurt ;)

Regards, Mauro