Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
From:   Chancel Liu <chancel.liu@nxp.com>
To:     lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz,
        tiwai@suse.com, linux-sound@vger.kernel.org,
        linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org
Cc:     Chancel Liu <chancel.liu@nxp.com>
Subject: [RESEND] ASoC: soc-pcm.c: Complete the active count for components without DAIs
Date:   Thu, 14 Dec 2023 10:34:25 +0800
Message-Id: <20231214023425.10572-1-chancel.liu@nxp.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xaXA4Iyej5Dx2gRFJiSATxRo1Mx+I70mjFrpg5IENW5lDH2LfSwKEwEdsXDV?=
 =?us-ascii?Q?B/DEztLKJqm4fgdXnJkqOQ8syXe7Idvr8gj05FQeIQsDdhL+JwTHzihwzFlQ?=
 =?us-ascii?Q?RMq/3HM13r/jeTqQBsOBWrGFriyb9YKikfoLLJZoIMRJnu0Fi+MMMabb7H+9?=
 =?us-ascii?Q?TaxlVEfc6mboWU1NtBeTxDa/XPnNioMlmbT4rQpmcgU6pIxjq3zcX5JfFMOD?=
 =?us-ascii?Q?9gwA4o4dl1yiCyxSPTzl2udgQwgY12yA95+xzYlChpKz0cnY8iyaXYU78Eyw?=
 =?us-ascii?Q?dJBu4jSxaDnAFGY7R2AvoWHEVO8hkZs+1BQxHL4D+GVGHna6TREOYd/peS+q?=
 =?us-ascii?Q?Z4oK28vgkV1ieLZ0iCSGVw8SZ+Qya0aPZyJ1QGxRZhtkcRwi28/rbyifkcu/?=
 =?us-ascii?Q?Dp6CE975trnxMBW2bRZguAzl4TZqYbHJC6C44+rh+/U2d85aKF7VVw5U7Nzu?=
 =?us-ascii?Q?AM+XedVD9cxi/wDK0WAX+PKXIZBm1pRRYBSXqqJW9xrIN9hG0Sm8YbkX92GN?=
 =?us-ascii?Q?Wp7KEbH2DAzsl5r6QTGZYw1Q9dQG+ugnXXVVnaLW3hAs3+yg9pXENZoBH8pC?=
 =?us-ascii?Q?10fZdY9veQcn3No0P/3vf9wTF/4aPfF65Z4hzmWwXpjhmKxpIfSKPaxkdcd4?=
 =?us-ascii?Q?3uNJd6Y8PSWcJkKfjbkRYpDkJAKTRx+eBwDCBh21FoNQHWx+5bImY+VAz9M4?=
 =?us-ascii?Q?kKqc3AtYZQAnY8oKIImCMXzh2r2yObSMGGgqro7Qw/WPrKepuxPxGbV2OMnU?=
 =?us-ascii?Q?0XJQFqr+rEWm91CVgFcDYbLQra4SUAPbsNwpwsWaJCE+jGDuYu2AQQkoYZiE?=
 =?us-ascii?Q?RnZNtgS1jbLNdFrrg6Sii0B6ERB/o0A3M43pZ1LEWzzW8xs8OPLq5QuxVClK?=
 =?us-ascii?Q?a1Q+GXXZW99UEdjLJHTi6sUbmRLJt2dFdZ4jEXsY56ldicnvzmhZR8Z8mMdX?=
 =?us-ascii?Q?SXRhNZly7UlVp4lW1OuUFDMqmogKdZVn3dnqFEjqOx6zRAr39swZbU8OGqMJ?=
 =?us-ascii?Q?msqhmkyE9q0q1JfzHFB6kfVTkYFKhv8XAhDAeSlh9QCD6wivHigdB9lFELoq?=
 =?us-ascii?Q?ksIJmdIsyYeXIH++5FkTkCxv+DYBm+jJ3ib3IC94bdghjSLsrHXDTh11Swci?=
 =?us-ascii?Q?Be+7ENuWI9UskMZmsAixv6r5f3Ts1R+AH/EEKEhbs/pCPI1XUiafTzv/y7C9?=
 =?us-ascii?Q?VpyTJtHJz2hl/2CULxdOWExVQVR3GE1C9OzSKM3DLKuw9sjvhIfOKi0X/jg5?=
 =?us-ascii?Q?lJUzde9YZeXhFjtWBR03u8276Ze119H7eckkP/rBe1VboWgJx08EH0f8uEOG?=
 =?us-ascii?Q?+LGrB2YC0O6AWg+JRweZxZZHpfaCqK3NwNHRZEC93Not2opFTmwkmixiRfhW?=
 =?us-ascii?Q?OD5OMZhBHFgsOgoFsOhZH+rAeBqlen1KT+hMQsVvlcv2QWJvHWrHLT5Dl+hM?=
 =?us-ascii?Q?rhpc4ygL7hcC94ceKOOBufrSIAPhy5S13+tJV+TkWVO3PBeGjUjTcIWf6nzQ?=
 =?us-ascii?Q?qzXLd9HCHbuS33+TXn0Y720g3RKQ6rYmUBHaQApLhRqPsi7G9jTvtNTfSHXb?=
 =?us-ascii?Q?4MY9H7lA8ZWXnvBF0vxmT6tsnHRcT5L803Pg8TqP?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ec7ee500-2a75-4c84-de77-08dbfc5056f7
X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB9498.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2023 02:56:59.3196
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Ed8NnnBtmy+uIORwiEVOSjUjv6VjmiF+Ci9o7S0+bNJGXDzQvB7/ESpX4RXGuBjGN4MWFdAtZUejI6J9kr+ofA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7190
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Wed, 13 Dec 2023 18:57:13 -0800 (PST)

Some components like platforms don't have DAIs. If the active count of
these components is ignored pinctrl may be wrongly selected between
default and sleep state. So need to increment or decrement the active
count for components without DAIs to avoid it.

Signed-off-by: Chancel Liu <chancel.liu@nxp.com>
---
Add alsa-devel@alsa-project.org in RESEND. No other changes.

 sound/soc/soc-pcm.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index efde4203bbf7..7dd4d41f680a 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -292,6 +292,7 @@ static void dpcm_set_be_update_state(struct snd_soc_pcm_runtime *be,
 void snd_soc_runtime_action(struct snd_soc_pcm_runtime *rtd,
 			    int stream, int action)
 {
+	struct snd_soc_component *component;
 	struct snd_soc_dai *dai;
 	int i;

@@ -299,6 +300,13 @@ void snd_soc_runtime_action(struct snd_soc_pcm_runtime *rtd,

 	for_each_rtd_dais(rtd, i, dai)
 		snd_soc_dai_action(dai, stream, action);
+
+	/* Increments/Decrements the active count for components without DAIs */
+	for_each_rtd_components(rtd, i, component) {
+		if (component->num_dai)
+			continue;
+		component->active += action;
+	}
 }
 EXPORT_SYMBOL_GPL(snd_soc_runtime_action);

--
2.42.0