Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Daniel Baluta <daniel.baluta@oss.nxp.com>
To:     broonie@kernel.org
Cc:     pierre-louis.bossart@linux.intel.com, lgirdwood@gmail.com,
        ranjani.sridharan@linux.intel.com, kai.vehmanen@linux.intel.com,
        alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
        daniel.baluta@nxp.com,
        Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>,
        =?UTF-8?q?P=C3=A9ter=20Ujfalusi?= <peter.ujfalusi@intel.com>,
        Seppo Ingalsuo <seppo.ingalsuo@intel.com>
Subject: [PATCH v2 07/12] ASoC: SOF: restore kcontrols for widget during set up
Date:   Fri, 17 Sep 2021 17:36:54 +0300
Message-Id: <20210917143659.401102-8-daniel.baluta@oss.nxp.com>
In-Reply-To: <20210917143659.401102-1-daniel.baluta@oss.nxp.com>
References: <20210917143659.401102-1-daniel.baluta@oss.nxp.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost.localdomain (2a02:2f08:5708:8600:8372:c747:541d:bbc9) by VI1P193CA0022.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Fri, 17 Sep 2021 14:37:26 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 99efe8d7-ff42-4972-e514-08d979e8abc0
X-MS-TrafficTypeDiagnostic: AM0PR0402MB3506:
X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <AM0PR0402MB350698554307E2D96D8E6055B8DD9@AM0PR0402MB3506.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:669;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: hrFbFoML3pBbjgMUiYvVATrH/mGH9moIRYFrn3l81m6lPNxxoiuqKZZEfzK++kuRoz+TQyfKAb2kOtxQ+echhPGL89JKxR57sLQeOLWJ3crkm11yWFBMWGb2ChK6rEOmy9Rks2WoowznJbI0pTf0CjnEWb77uV3B1M2yu5O1HW5TViiRcvuigm5lTulteAdwit561TCXxJxiF+Nj8pHxZvhwGQuqrkRcwGiBSk2ed0qDGeGo9W+elMGZivqEeDHO5v7jj9JwVq4AgbKFc1KbKm2kKZWV6vyUnYwneOaEf0mrie2UE293UB3YJHyHVXk/P4DD5tjqeIgTdj+MelWXvcGXa6d3W8zppV3s9InfSjb8endZZ42iRSWXLgSKlmA17mcfX8GZAxnW94wBxG4jNlrQJtGzHZMSLFOd3RArOvcCOQHvC8UYa7ery9DtfKRplNV6WGEqkfR68Dz8Ee/4gfrrJhaHnbA2CE+AEbFAIhX4/jr6iNQfzlSgzIhD6goLRLwE23BGxiP74W2F09WjpZhKQRUjp9wYJjMpB7aDLVPn/y/jlSGgNeh0xWBOD9SUhA6gD85hNWmDxa6SD+10e0GPfhqab6htB3OoRPETq/ewqQKE97bNpRnk3DQZDjGxR1zMU7J9mO6rsB07aD477A==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB5140.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(396003)(39860400002)(136003)(366004)(376002)(186003)(316002)(54906003)(1076003)(7416002)(66476007)(2906002)(6486002)(5660300002)(38100700002)(2616005)(86362001)(66574015)(83380400001)(44832011)(478600001)(4326008)(52116002)(6506007)(6666004)(8936002)(6512007)(66946007)(6916009)(8676002)(66556008);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QjU5dENNQnNENDVEM3dteXRFd0pONkROOTdYZFRqcG1NWmxhY1ZST25Qclla?=
 =?utf-8?B?azBYWTN4ZGVvSW9rQ2IrQTlGMmE1ckYzTHcrTGx3bVBabVJyckF2WkFEOFlr?=
 =?utf-8?B?QlBBZkFnZXQ2UjRjaS9GUFdtVGJOUUpaWWN5WnJkcUN1ZDFaVlBnWEh0ODJj?=
 =?utf-8?B?RnBaOW8yQ2RvR1d3WHpReHE1QzdpdloydXNWclowS1ZIOUVzdzFEZ00xdzNW?=
 =?utf-8?B?QU96bW5nSTZqc2dUM25DcmYyNHJDR2prRTlpMFdTbStDdElNRTNJUkdOVU5Q?=
 =?utf-8?B?eDc5dnpxQmNOUk9uK2w2eTdZaDI4Q25RRWZBb1lPNTZ6QjhRWkNjWGdGVDI3?=
 =?utf-8?B?VVVGZExXZ2lkOW90NERZSUlOMHRwMEwxd253dnlJNHBiTHVnbE5DTGxNWDdN?=
 =?utf-8?B?OGJZRFpZUG5FYW1IM1VvcEdiYW1pTlMzc0N5c3dhMXl2QWtQYmpsMlhBYThw?=
 =?utf-8?B?K3hBV3NPdGxmY0hWVkNkR3V3WkowbEpwNVozdW1tNWV2dUNsaGZySzJkMkRP?=
 =?utf-8?B?dUV6OFBRMkM0R1dwd2R2U25JdVI5LzBSbm1TYzhOSytqd0xaNG9mRUZCL01t?=
 =?utf-8?B?Y09HaE5MZis5UWg1RVpZMVpWcW5PcVFjb3lKOUxSTEVGWWJMUjM2elNveWRH?=
 =?utf-8?B?RkFUbzhSQXFSWXYzV29ZZU1oQ0x1b3FJMEsrV0NFMVZnMnNjZWNBZTdkdWRG?=
 =?utf-8?B?ODNFcWVCYW5xVEtFQzM4Y0o1SFNQRWNVUFkxY2RTcVRqTURvYzFOTEVYanlm?=
 =?utf-8?B?bjJpWWhJRENEUUNublM5dTFjLzFmb083aVZtZlFiNDF3US9ET0NIRUwxcndO?=
 =?utf-8?B?RzlqL2s0RndIbmxmWFFhdW5IK1RybXM2bnM3d0VIZVpERUxsZUc4T3FybTRD?=
 =?utf-8?B?bmI2bDRSUW1qUGc2bkV0c01FdVVsUW0vVnZqK3VZMmpMTWtUYkg1c3NsNWJz?=
 =?utf-8?B?KzVzYnJMSXVJdWZLTlUzTEVkV2NYT0FhbUhXR3FtVWJ6SkY0MERUbU5mKzY3?=
 =?utf-8?B?Q2Frd09WYURDbUdNUjVGMXdlZ1JSY2J1YkduQzByU1FyZ1ZIU1hrendXNlFo?=
 =?utf-8?B?M1NlTWpiNHVKaFptNERmckk3Q0lYR3dSdHdneUQ4bVNTK3VjSDNCdUtYUnZw?=
 =?utf-8?B?RHB5ZFpzSzZoaEp6S253NmRmMHViY01DRkdWTXhyQktZWXE2cCtvRzRpVGlM?=
 =?utf-8?B?TWFkaHVidjhBaSs2WmRRekF2L0lUdkljWCs4UjJEWnJhbEYwLzRRUUpLRW05?=
 =?utf-8?B?L29LSDdNOUtsZlNpYWh2Y2Y1OW5ZMnorWXRGdlM4dTlyQ21sOTdiT2JxNE40?=
 =?utf-8?B?MjhGSGhPWXhtL1lwOUVRcEh1SVNES2JMWjg4M1pxQWtiTWxhbGkvT2NMM3gy?=
 =?utf-8?B?UTNzU3hQZDFucnlOYWNQOGtUQ2IwV3hjUk9OZW1US0thTCtmN2pJejRUUnVG?=
 =?utf-8?B?cmFJbVo5K1R6cnNYcjZYV3hyclNzZW5vOEdpcTJub3hCaHFtVXMydlY1aWhi?=
 =?utf-8?B?eHRKd1JKdjNUandaNDFLeVJqa1RIcTNLL0lPbEFUcTRiU3FTbWwwWHExTlE1?=
 =?utf-8?B?aE4vTUczMUVSa3ZFR2pFY1pXTndHNWtRSyt4M1NFdHgvZ3FBMmpKcXFReUZ5?=
 =?utf-8?B?NUxpYkhEWnJabVZMVVdWeDUyVCtCYWlONDltNS9RR3NGNzk5T1NNMUNmRWp4?=
 =?utf-8?B?ZFdEbWdZNk1hdTA0UHc3Mm9sVEtuU3pGQi9EUEFtQ09KZFRyZThBTFRPUmoy?=
 =?utf-8?B?VldaZW9MOTlEbXE1RlE1UDRVazg2OGV0UE1MS1l6RHpIZWw2NytFQklZVlBN?=
 =?utf-8?B?aUVCb0h3VUlKbjVVVEQ0Qy9TbmdSZy85REY5anBMcjdqSzlTRUdta3lvSGtZ?=
 =?utf-8?Q?t46/qIWrAVawU?=
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 99efe8d7-ff42-4972-e514-08d979e8abc0
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5140.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2021 14:37:27.2014
 (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: sSBqPNRWcEsodilkstbx/6I58uu3yIlbCeXjhBemLIVeNix1gI+O53LWG3bq41q1nkjksrNkOebdieZJZI/qSA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0402MB3506
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

Restore kcontrols for each widget after it has been set up
successfully.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@intel.com>
Reviewed-by: Seppo Ingalsuo <seppo.ingalsuo@intel.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
---
 sound/soc/sof/sof-audio.c | 59 ++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
index b52a453ae9d7..b27760208a4b 100644
--- a/sound/soc/sof/sof-audio.c
+++ b/sound/soc/sof/sof-audio.c
@@ -64,6 +64,25 @@ static int sof_dai_config_setup(struct snd_sof_dev *sdev, struct snd_sof_dai *da
 	return ret;
 }
 
+static int sof_widget_kcontrol_setup(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget)
+{
+	struct snd_sof_control *scontrol;
+	int ret;
+
+	/* set up all controls for the widget */
+	list_for_each_entry(scontrol, &sdev->kcontrol_list, list)
+		if (scontrol->comp_id == swidget->comp_id) {
+			ret = sof_kcontrol_setup(sdev, scontrol);
+			if (ret < 0) {
+				dev_err(sdev->dev, "error: fail to set up kcontrols for widget %s\n",
+					swidget->widget->name);
+				return ret;
+			}
+		}
+
+	return 0;
+}
+
 static int sof_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget)
 {
 	struct sof_ipc_pipe_new *pipeline;
@@ -113,10 +132,20 @@ static int sof_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget *swi
 					 &r, sizeof(r));
 		break;
 	}
-	if (ret < 0)
+	if (ret < 0) {
 		dev_err(sdev->dev, "error: failed to load widget %s\n", swidget->widget->name);
-	else
-		dev_dbg(sdev->dev, "widget %s setup complete\n", swidget->widget->name);
+		return ret;
+	}
+
+	/* restore kcontrols for widget */
+	ret = sof_widget_kcontrol_setup(sdev, swidget);
+	if (ret < 0) {
+		dev_err(sdev->dev, "error: failed to restore kcontrols for widget %s\n",
+			swidget->widget->name);
+		return ret;
+	}
+
+	dev_dbg(sdev->dev, "widget %s setup complete\n", swidget->widget->name);
 
 	return ret;
 }
@@ -203,22 +232,6 @@ int sof_set_hw_params_upon_resume(struct device *dev)
 	return snd_sof_dsp_hw_params_upon_resume(sdev);
 }
 
-static int sof_restore_kcontrols(struct device *dev)
-{
-	struct snd_sof_dev *sdev = dev_get_drvdata(dev);
-	struct snd_sof_control *scontrol;
-	int ret = 0;
-
-	/* restore kcontrol values */
-	list_for_each_entry(scontrol, &sdev->kcontrol_list, list) {
-		ret = sof_kcontrol_setup(sdev, scontrol);
-		if (ret < 0)
-			return ret;
-	}
-
-	return 0;
-}
-
 const struct sof_ipc_pipe_new *snd_sof_pipeline_find(struct snd_sof_dev *sdev,
 						     int pipeline_id)
 {
@@ -309,13 +322,7 @@ int sof_restore_pipelines(struct device *dev)
 		}
 	}
 
-	/* restore pipeline kcontrols */
-	ret = sof_restore_kcontrols(dev);
-	if (ret < 0)
-		dev_err(dev,
-			"error: restoring kcontrols after resume\n");
-
-	return ret;
+	return 0;
 }
 
 /* This function doesn't free widgets. It only resets the set up status for all routes */
-- 
2.27.0