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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 C10C4C5ACC4 for ; Thu, 20 Feb 2020 00:43:24 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4C6D52465D for ; Thu, 20 Feb 2020 00:43:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="ADV0NgNT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C6D52465D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=renesas.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 7C53B1698; Thu, 20 Feb 2020 01:42:32 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7C53B1698 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1582159402; bh=+ppiiGQ6xa37Tm5g3HkPCq9kTXTxFBiXN11r1dwEOS0=; h=Date:From:To:Subject:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=ADV0NgNTU/yDzcFJsBzV+fQFmlUogypwu+MVAF4MoE3IvVhR3OxPTBmapoeknOwsB wiyQ7Rjs0rvERC8P54SRez9UdIp8zcq4ZcwE9Z1eSw21vMISwCWHvofNC6QT0qG3jS wWJnDjml7kUGkn/qvxt4qGcY6OTm/WJfTFo7ypCk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id E4D08F8025F; Thu, 20 Feb 2020 01:42:31 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0E6BFF80273; Thu, 20 Feb 2020 01:42:30 +0100 (CET) Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by alsa1.perex.cz (Postfix) with ESMTP id B4584F801F5 for ; Thu, 20 Feb 2020 01:42:23 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B4584F801F5 Date: 20 Feb 2020 09:42:20 +0900 X-IronPort-AV: E=Sophos;i="5.70,462,1574089200"; d="scan'208";a="39755036" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 20 Feb 2020 09:42:20 +0900 Received: from mercury.renesas.com (unknown [10.166.252.133]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 4A68541065D4; Thu, 20 Feb 2020 09:42:20 +0900 (JST) Message-ID: <87blput7hh.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Kai Vehmanen Subject: Re: [PATCH] ASoC: soc-pcm: Revert "call snd_soc_component_open/close() once" In-Reply-To: <20200219182650.1416-1-kai.vehmanen@linux.intel.com> References: <20200219182650.1416-1-kai.vehmanen@linux.intel.com> User-Agent: Wanderlust/2.15.9 Emacs/25.2 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Cc: alsa-devel@alsa-project.org, broonie@kernel.org, ranjani.sridharan@linux.intel.com, digetx@gmail.com, pierre-louis.bossart@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Hi Kai, Pierre-Louis Thank you for your test / review > ASoC component open/close and snd_soc_component_module_get/put are > called independently for each component-substream pair, so the logic > in the reverted patch was not sufficient and led to PCM playback and > module unload errors. > > Fixes: dd03907bf129 ("ASoC: soc-pcm: call snd_soc_component_open/close() once") > Signed-off-by: Kai Vehmanen > --- OK, some component (SOF, and maybe DPCM too ?) want to be opened for each substreams. If so, indeed current code is not enough for it. But, unfortunately I don't want spaghetti error handling code again. I think we can solve it if we can *count* open / module ? Can you please test this patch ? --- 8< --- 8< --- 8< --- 8< --- 8< --- 8< --- 8< --- 8< --- 8< --- diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h index 1866ecc8e94b..4e78925858c0 100644 --- a/include/sound/soc-component.h +++ b/include/sound/soc-component.h @@ -181,10 +181,11 @@ struct snd_soc_component { const char *debugfs_prefix; #endif + u8 opened; + u8 module; + /* bit field */ unsigned int suspended:1; /* is in suspend PM state */ - unsigned int opened:1; - unsigned int module:1; }; #define for_each_component_dais(component, dai)\ diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c index ee00c09df5e7..a2526a1ffcbe 100644 --- a/sound/soc/soc-component.c +++ b/sound/soc/soc-component.c @@ -297,14 +297,16 @@ EXPORT_SYMBOL_GPL(snd_soc_component_set_jack); int snd_soc_component_module_get(struct snd_soc_component *component, int upon_open) { - if (component->module) - return 0; + if (unlikely(component->module == 0xff)) { + dev_warn(component->dev, "too many module get (%s)\n", component->name); + return -EBUSY; + } if (component->driver->module_get_upon_open == !!upon_open && !try_module_get(component->dev->driver->owner)) return -ENODEV; - component->module = 1; + component->module++; return 0; } @@ -316,7 +318,7 @@ void snd_soc_component_module_put(struct snd_soc_component *component, component->driver->module_get_upon_open == !!upon_open) module_put(component->dev->driver->owner); - component->module = 0; + component->module--; } int snd_soc_component_open(struct snd_soc_component *component, @@ -324,12 +326,15 @@ int snd_soc_component_open(struct snd_soc_component *component, { int ret = 0; - if (!component->opened && - component->driver->open) + if (unlikely(component->opened == 0xff)) { + dev_warn(component->dev, "too many open (%s)\n", component->name); + return -EBUSY; + } + + if (component->driver->open) ret = component->driver->open(component, substream); - if (ret == 0) - component->opened = 1; + component->opened++; return ret; } @@ -343,7 +348,7 @@ int snd_soc_component_close(struct snd_soc_component *component, component->driver->close) ret = component->driver->close(component, substream); - component->opened = 0; + component->opened--; return ret; } Thank you for your help !! Best regards --- Kuninori Morimoto