From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AECBEC433DF for ; Thu, 18 Jun 2020 02:30:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8FCA82193E for ; Thu, 18 Jun 2020 02:30:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592447410; bh=U/qoEAVeB8iCO5EXhVzLLWw4mzWwgbNVgm8+Xu0dWoc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IT6YkXVNkhyJ+BKeAtuv1MPuf2XFU8/OsWSmAayyD7/YBVHTJM286ZOtoYlACKIJh FbimDafLraqS/HiWIbv1WK4MOnkEm+FBcciG7Dfv4eRMHJXSlvnNGkwsbbo/MDlcmt 2H6pUSeCI5FCTiOmLxi4JmMNMph74w2wv8dtv8uk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731773AbgFRCaH (ORCPT ); Wed, 17 Jun 2020 22:30:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:46258 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729533AbgFRBP5 (ORCPT ); Wed, 17 Jun 2020 21:15:57 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 19E6921D7D; Thu, 18 Jun 2020 01:15:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442957; bh=U/qoEAVeB8iCO5EXhVzLLWw4mzWwgbNVgm8+Xu0dWoc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C3GxPQlz0z7EWYH26lFPyVix+CeVrad+TPl+6MEyzLWJASTdAm/BxJUC8+4IWph0k fGEMiifuyH5w/J5mysK8m61MO+H/OhdUMLlOZ6Uf2kNwnkzLjKZrFyKmKfzrCNhLut AW6dGEPHNqIEH+uFWpGBC8FVMwXlo7J5/tOdPMys= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pierre-Louis Bossart , Guennadi Liakhovetski , Daniel Baluta , Bard Liao , Mark Brown , Sasha Levin , sound-open-firmware@alsa-project.org, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.7 364/388] ASoC: SOF: nocodec: conditionally set dpcm_capture/dpcm_playback flags Date: Wed, 17 Jun 2020 21:07:41 -0400 Message-Id: <20200618010805.600873-364-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Pierre-Louis Bossart [ Upstream commit ba4e5abc6c4e173af7c941c03c067263b686665d ] With additional checks on dailinks, we see errors such as [ 3.000418] sof-nocodec sof-nocodec: CPU DAI DMIC01 Pin for rtd NoCodec-6 does not support playback It's not clear why we set the dpcm_playback and dpcm_capture flags unconditionally, add a check on number of channels for each direction to avoid invalid configurations. Fixes: 8017b8fd37bf5e ('ASoC: SOF: Add Nocodec machine driver support') Signed-off-by: Pierre-Louis Bossart Reviewed-by: Guennadi Liakhovetski Reviewed-by: Daniel Baluta Reviewed-by: Bard Liao Link: https://lore.kernel.org/r/20200608194415.4663-5-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/sof/nocodec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/nocodec.c b/sound/soc/sof/nocodec.c index 2233146386cc..71cf5f9db79d 100644 --- a/sound/soc/sof/nocodec.c +++ b/sound/soc/sof/nocodec.c @@ -52,8 +52,10 @@ static int sof_nocodec_bes_setup(struct device *dev, links[i].platforms->name = dev_name(dev); links[i].codecs->dai_name = "snd-soc-dummy-dai"; links[i].codecs->name = "snd-soc-dummy"; - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; + if (ops->drv[i].playback.channels_min) + links[i].dpcm_playback = 1; + if (ops->drv[i].capture.channels_min) + links[i].dpcm_capture = 1; } card->dai_link = links; -- 2.25.1