From patchwork Thu Jun 27 12:13:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 167967 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2263614ilk; Thu, 27 Jun 2019 05:14:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqxkvK41whdqiC/iBMPGs8+8d+YublPmfwxFbggm+Wac6YQRKos3ivHkw5ppYY3TygcS8QQR X-Received: by 2002:a63:dd53:: with SMTP id g19mr3380030pgj.3.1561637647043; Thu, 27 Jun 2019 05:14:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561637647; cv=none; d=google.com; s=arc-20160816; b=uy8UinRtghqCH2iAxPCEUKQ+mzS9sz6xqdZo0BMTtGeaiG1GMlxOtuB6D5ILRZMyag 50QapbcBKofn3zLlIYXyjNWv+N/61OuAWDyPH4CnGJrTKqDQlTC5URZgldqa/MWYu8+4 Hk2tOrD8pjckAk7Ra+DptT7cXzNkW3908TS35A2IiaThllsRABN3WjZWVfGqroQXb7R2 ak06+irjbMGdHsSz+SUzl0bsZzplbEah2WEHqYzve5hIAf6Dtoj4OifgIZamuELlyK3k 7TUWX7iAD8nPmJy5s/4ihfLNNK76jFS23Cv62ZMUEwgbRl8IOuPX3tg9fM3FJMRPq3b+ Rz/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6dZUNh41e54wloGbD976gFDh/dh9Od8QCAeDEWTqPi0=; b=P80wU8qUivJysRwbFi+bRbL6V0fmtxwyejvdC0EXQHqlIx3M8y2G8bGQwtDb5GQGPk v4masxXEIQzOls8KRJkl7Kku2wBp156W0bBEVU5dNdFk2jnttanWrAPD6YXYC/0lmu0x D1HoHgAOFPksSlYdODqV68AZcjmrfSZ6HzCHOPIshkRjx/QppBn0UCfVPTLYMFd+dluy pDuY6NTaIkjBJ2zHXxlkKtcCH3tEA8fqNaaks4WvmZawl0cyI/WkgKXpH7on8bKhlaWp QMVqKBe9IPqLOABAabZRE/K+B743ZEV67RrDtuJGLjHZ9NGVePJdMkAoxs9vA9kKL/Ba 4Feg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=OngWCzsC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k16si2624825pfk.68.2019.06.27.05.14.06; Thu, 27 Jun 2019 05:14:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=OngWCzsC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726979AbfF0MOF (ORCPT + 30 others); Thu, 27 Jun 2019 08:14:05 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:55480 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726759AbfF0MOC (ORCPT ); Thu, 27 Jun 2019 08:14:02 -0400 Received: by mail-wm1-f67.google.com with SMTP id a15so5498956wmj.5 for ; Thu, 27 Jun 2019 05:14:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6dZUNh41e54wloGbD976gFDh/dh9Od8QCAeDEWTqPi0=; b=OngWCzsC9ReioQ2dB+3Si543jtwEMKbYjq/B6YLYPcItr0MZED1V2Dnrf1ipky90Xm 2iqnk1Q9oOnzku0hLU6IbIPk+Egc8yDD67sNL0VmwMMzUU6CWjk9wYoUOhtUyro6kaA2 x/kegG5rlAwYjSM9O5eUH2HiLieh6BIsN7bTxHpA+O0W4ef+8mzhbLP8T45X3vwagZ3Y 2zeBk3oPb43DvoPr30KaBrp0CTr4oLPqlx9RgjuNGnVfvlC2yVMbWuuALVF0uTIrL/Jy QcGya6qoe436hbQ2EZ06QZ3VYz3D6/Hnha2mc6zl9JCmqKAXP/jm6XI7aGTMuHjMXqrN FN5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6dZUNh41e54wloGbD976gFDh/dh9Od8QCAeDEWTqPi0=; b=aXO4ArkNxbec2HJ7KEUf/PatbF/Zv7zGD5U2OoIqiP5YL0lCUpgum12WYWtyAx4rIR Byu46zSEzl9mhHwyPqDzTrw+mslIaSI7sXOxfFlspBD6AOPBoTZ3+PeTFvuo/O5Q08Lj U5ZHKc6zOHz7843fW4oDrwqaTqRxHjkLPgknCrmt2Tq07ckXzkCPjs6pZfkK3jdI1Ntu ZImGfryCYddpe4TAYqSq2HSDSs2hqkcoBlkFfSjlBMIEEFzAUN8i0Sbwl71yfk0+vPik KLcUEnPJ5hfsHq0uj/53Z8u1i/0XV7wbdQ2K18hYylYL2sienuLKUvERKEIc6oNt5rWM z6kw== X-Gm-Message-State: APjAAAWb4UBaJW0FWfwT8Fg1fPGZTNKmf3vPFnK20qNFzGgbWUEdB+hq 4EMWyIROGM419XlKPOvyApibLg== X-Received: by 2002:a1c:c109:: with SMTP id r9mr3255675wmf.143.1561637640165; Thu, 27 Jun 2019 05:14:00 -0700 (PDT) Received: from starbuck.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id i11sm6160594wmi.33.2019.06.27.05.13.59 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 27 Jun 2019 05:13:59 -0700 (PDT) From: Jerome Brunet To: Mark Brown , Liam Girdwood , Kevin Hilman Cc: Jerome Brunet , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org Subject: [PATCH v2 1/2] ASoC: soc-core: defer card registration if codec component is missing Date: Thu, 27 Jun 2019 14:13:49 +0200 Message-Id: <20190627121350.21027-2-jbrunet@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190627121350.21027-1-jbrunet@baylibre.com> References: <20190627121350.21027-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Like cpus and platforms, defer sound card initialization if the codec component is missing when initializing the dai_link Signed-off-by: Jerome Brunet --- sound/soc/soc-core.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.21.0 diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 358f1fbf9a30..0ec1d7a59b24 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1064,12 +1064,20 @@ static int soc_init_dai_link(struct snd_soc_card *card, link->name); return -EINVAL; } + /* Codec DAI name must be specified */ if (!codec->dai_name) { dev_err(card->dev, "ASoC: codec_dai_name not set for %s\n", link->name); return -EINVAL; } + + /* + * Defer card registration if codec component is not added to + * component list. + */ + if (!soc_find_component(codec)) + return -EPROBE_DEFER; } /* From patchwork Thu Jun 27 12:13:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 167968 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2263649ilk; Thu, 27 Jun 2019 05:14:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqwTEu3zVAUCFdCFUr2RSJqsYWFMFNqZ03XHXsPMY1zobU+nt3IU1aRFUoExUi78vjpB3aZ6 X-Received: by 2002:a65:524b:: with SMTP id q11mr3436962pgp.384.1561637649391; Thu, 27 Jun 2019 05:14:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561637649; cv=none; d=google.com; s=arc-20160816; b=KM3eU1U4HXbObGKDiLbdA6wr5D9y1AAi3M3xstDWOfOUIVdnYVH3qC81/YBzC5G5Fa pSPTXeh2at1Mt56TE6xwcHtUpjWv6Dkm9I3LTe9exD0emDu+k8StjrBEzt8hILZBlE+p s8lVVXHMA4k9Gr9n5Qe4xBCei1XbcQiygqiDrhD+eRK6TpB/s0zoIXeR8fMi88wRTow7 bSx5K81HYThmPsxTPWXBeOrnqEG5j0/8enEGX+QbAthwoNG6ZMy/UscwTRmRSJfkxigx 87alrrtcjcCJjqb3oLLberWJmTXf/IiWhYac+At3mQYpNB1FI9+hLzDxDVcy9KlDPAKi 4Flw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6PqH7FtXAyTVmgRsql/9Vt6uYwCKZA1EzRvgR9PRCkQ=; b=QN4MOOcjVtEycOFowDRYILs8Ua62QebhWVeRFDKU8ZRQ6H03Fjhjz3+uyfokOXOWue UdRkIVA8g2uawEzAiDOGQ/oQ5Cyv+GCYJurbv20CHnrg8ZztDSVCiCFeqvob8z0uhP+K 3TF7/KVnHN+s51ld1qaDeOVT7oLEhh8Y0puk91/MO223nHesaYQmW3TAfGnLPY8mtWoS UJtJBN3QkL+3MBB5FSHRKMo9JErhkMJMmq482yFfvs4A4VJMGqsr9Ydws6gakRLZJIhJ WXEGsy9q/0Okbe9fmTgwHXAybZTv0s6Ybh6n4KqJFfS9ErF37021NIOvjzsG+bexs67k N4qA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=UhohxZSB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d37si2286023pla.288.2019.06.27.05.14.09; Thu, 27 Jun 2019 05:14:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=UhohxZSB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726990AbfF0MOH (ORCPT + 30 others); Thu, 27 Jun 2019 08:14:07 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:40903 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726964AbfF0MOD (ORCPT ); Thu, 27 Jun 2019 08:14:03 -0400 Received: by mail-wm1-f66.google.com with SMTP id v19so5431930wmj.5 for ; Thu, 27 Jun 2019 05:14:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6PqH7FtXAyTVmgRsql/9Vt6uYwCKZA1EzRvgR9PRCkQ=; b=UhohxZSBhwVGzRN5sjpR2ypPIONf+8GU9/388Qyunz9WdEExkKcDyUXrjsD2j/7QLk i6uIVB+v9aetT6bkneXelTtWodDRCTjCeUFfPeMRtuxXN0X6wM3dXiS9WXaxkKt7sJXF yptlETEn8CDMz08vjnx/gIikHwQ/DNYwXqOyLY9z3xZHZcuos4UlnodAvrgpao0oV9iB 11L5dPCvpCGPyTj3gewwdoPHN+z6jUMNGq5ADkCmSsGo3u6gIu7ALtf/wqb2HPcz9Gdm KyuUhMBX+EO/uldm6thj+CLA5sHKQrjNg0ucRhQVprBCZRsTA1WIuaRZRYrdeNMlmJzs z6FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6PqH7FtXAyTVmgRsql/9Vt6uYwCKZA1EzRvgR9PRCkQ=; b=hgHxUlH8M63SH6BRCjYIVMKcEnxQxMZMhJV0SPupjFRox4uAYGMZZbasfos8V1/UGC 38CIxr36IO6Rns3qiZX1c876rLxPVHSOvReoiDIqfQHHZ5u7Jge6fut8Y6h5Kd01AJ4w PGypkiTCn+6Fh+qsZAoCz5/UoDfggFRWNsoCQ0C0XEabgFeeRy2+Szw9WEgx7Wi/kyQk PjH0YSDAtXQ/+3h26Ro96gDQ3RYksUJJogL5ZUwMShLgFUXa4e96zcRPex+tf7xgLUrT 3zp3BkwctxP0cEFRq81qgm1ezu/YM8vgjszeRmQp93VRWMap+m0t8kw3qN+VUeES7EWC G0LA== X-Gm-Message-State: APjAAAU8KVNYY6YKr67+HIGUgs/YTPjn45g6b1410ql2IaQ2AlkmURd/ NZKxe90Dovzy/u4nVRqDgsz79Q== X-Received: by 2002:a7b:c450:: with SMTP id l16mr3239638wmi.0.1561637641154; Thu, 27 Jun 2019 05:14:01 -0700 (PDT) Received: from starbuck.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id i11sm6160594wmi.33.2019.06.27.05.14.00 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 27 Jun 2019 05:14:00 -0700 (PDT) From: Jerome Brunet To: Mark Brown , Liam Girdwood , Kevin Hilman Cc: Jerome Brunet , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, Kuninori Morimoto Subject: [PATCH v2 2/2] ASoC: soc-core: support dai_link with platforms_num != 1 Date: Thu, 27 Jun 2019 14:13:50 +0200 Message-Id: <20190627121350.21027-3-jbrunet@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190627121350.21027-1-jbrunet@baylibre.com> References: <20190627121350.21027-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add support platforms_num != 1 in dai_link. Initially, the main purpose of this change was to make the platform optional in the dai_link, instead of inserting the dummy platform driver. This particular case had just been solved by Kuninori Morimoto with commit 1d7689892878 ("ASoC: soc-core: allow no Platform on dai_link"). However, this change may still be useful for those who need multiple platform components on a single dai_link (it solves one of the FIXME note in soc-core) Acked-by: Kuninori Morimoto Signed-off-by: Jerome Brunet --- include/sound/soc.h | 6 +++++ sound/soc/soc-core.c | 59 ++++++++++++++++++-------------------------- 2 files changed, 30 insertions(+), 35 deletions(-) -- 2.21.0 diff --git a/include/sound/soc.h b/include/sound/soc.h index 64405cdab8bb..4e8071269639 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -997,6 +997,12 @@ struct snd_soc_dai_link { ((i) < link->num_codecs) && ((codec) = &link->codecs[i]); \ (i)++) +#define for_each_link_platforms(link, i, platform) \ + for ((i) = 0; \ + ((i) < link->num_platforms) && \ + ((platform) = &link->platforms[i]); \ + (i)++) + /* * Sample 1 : Single CPU/Codec/Platform * diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 0ec1d7a59b24..c17d2f73fa71 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -887,7 +887,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link) { struct snd_soc_pcm_runtime *rtd; - struct snd_soc_dai_link_component *codecs; + struct snd_soc_dai_link_component *codec, *platform; struct snd_soc_component *component; int i; @@ -917,13 +917,14 @@ static int soc_bind_dai_link(struct snd_soc_card *card, /* Find CODEC from registered CODECs */ rtd->num_codecs = dai_link->num_codecs; - for_each_link_codecs(dai_link, i, codecs) { - rtd->codec_dais[i] = snd_soc_find_dai(codecs); + for_each_link_codecs(dai_link, i, codec) { + rtd->codec_dais[i] = snd_soc_find_dai(codec); if (!rtd->codec_dais[i]) { dev_info(card->dev, "ASoC: CODEC DAI %s not registered\n", - codecs->dai_name); + codec->dai_name); goto _err_defer; } + snd_soc_rtdcom_add(rtd, rtd->codec_dais[i]->component); } @@ -931,12 +932,13 @@ static int soc_bind_dai_link(struct snd_soc_card *card, rtd->codec_dai = rtd->codec_dais[0]; /* Find PLATFORM from registered PLATFORMs */ - for_each_component(component) { - if (!snd_soc_is_matching_component(dai_link->platforms, - component)) - continue; + for_each_link_platforms(dai_link, i, platform) { + for_each_component(component) { + if (!snd_soc_is_matching_component(platform, component)) + continue; - snd_soc_rtdcom_add(rtd, component); + snd_soc_rtdcom_add(rtd, component); + } } soc_add_pcm_runtime(card, rtd); @@ -1051,15 +1053,14 @@ static int soc_init_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link *link) { int i; - struct snd_soc_dai_link_component *codec; + struct snd_soc_dai_link_component *codec, *platform; for_each_link_codecs(link, i, codec) { /* * Codec must be specified by 1 of name or OF node, * not both or neither. */ - if (!!codec->name == - !!codec->of_node) { + if (!!codec->name == !!codec->of_node) { dev_err(card->dev, "ASoC: Neither/both codec name/of_node are set for %s\n", link->name); return -EINVAL; @@ -1080,36 +1081,24 @@ static int soc_init_dai_link(struct snd_soc_card *card, return -EPROBE_DEFER; } - /* - * Platform may be specified by either name or OF node, - * or no Platform. - * - * FIXME - * - * We need multi-platform support - */ - if (link->num_platforms > 0) { - - if (link->num_platforms > 1) { - dev_err(card->dev, - "ASoC: multi platform is not yet supported %s\n", - link->name); - return -EINVAL; - } - - if (link->platforms->name && link->platforms->of_node) { + for_each_link_platforms(link, i, platform) { + /* + * Platform may be specified by either name or OF node, but it + * can be left unspecified, then no components will be inserted + * in the rtdcom list + */ + if (!!platform->name == !!platform->of_node) { dev_err(card->dev, - "ASoC: Both platform name/of_node are set for %s\n", + "ASoC: Neither/both platform name/of_node are set for %s\n", link->name); return -EINVAL; } /* - * Defer card registartion if platform dai component is not - * added to component list. + * Defer card registration if platform component is not added to + * component list. */ - if ((link->platforms->of_node || link->platforms->name) && - !soc_find_component(link->platforms)) + if (!soc_find_component(platform)) return -EPROBE_DEFER; }