From patchwork Thu Oct 27 10:27:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 11728 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp148847wru; Thu, 27 Oct 2022 03:30:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM607adatgeBBDk/qjyd7mH/X8yIiug61rt686/N00Jnft4Zr5XQtRdqmFslZQv0BksCVrOT X-Received: by 2002:a63:7304:0:b0:46a:faa5:700f with SMTP id o4-20020a637304000000b0046afaa5700fmr42727268pgc.253.1666866645352; Thu, 27 Oct 2022 03:30:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666866645; cv=none; d=google.com; s=arc-20160816; b=QycpPY7/FFe3DYjJo96crVZIL13AGaH7/gJVZ+wdMnIXLtmvvYHD6J3jjgKJpqzGaW u95fNu4kYuCqa+PsUsqFxubevPF3aEw+VGP9I+HKoNLNwyv4SjeaGXsVmYh7Vrv7en0K 4PcuLdvfECzT5jC6dLk7nJyCQUpbMabti3p+QZAT5DT5fxXSJW9i9yWA2EfuY518V9U6 0C87uVnSqYA7SaKgmYHZpp2zAIyXzMgfOkUe3IULvJJ0vw/jwToqAO6NY5l11MueKgU1 +QxU0P1Kx4q4H4zg2qVbdz5CBqwMNv4lPxyPD3JJWuB2BgYAOoP/vfzQQLWbu7hCOiQk x3KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8PzGOU3cHi3C/xmeEh0jzvedpAW9sTnCtCJCz/dvKXw=; b=Ax8Y7wYt9A+15P0hM87vHwgJVwMsWcjiPGTmDTt0vyEJD32F6flVYw9vAbLLOXDTAo rCngf3D6WmNn4OEXn6KupV4iIPMMMkqhEoB5JlSJil/KXkfF7K7cTqpgGHQiw3aMg13P czPn6YwbOYvRFztDyv8MThPcrdNTNHvslwtVF7V7zzq+obfBExhMr0XoPQXciHO3IxB6 y/QhBPLAqX82SVi0gqEuKou1C52P5sP7TUZ9n3oMcORoALFKsq00pH5oU+/1ne9Wk0W5 Y89MVn+V3XnX+L3rUpganYhCgJF3Ob4Q1VL0I1uR8DE4Hynn+b8LySWH4FbbObP6gD5G HhVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kmV7eRAw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x2-20020a170902a38200b001869c035f20si999748pla.381.2022.10.27.03.30.31; Thu, 27 Oct 2022 03:30:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kmV7eRAw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235472AbiJ0K2T (ORCPT + 99 others); Thu, 27 Oct 2022 06:28:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230441AbiJ0K1s (ORCPT ); Thu, 27 Oct 2022 06:27:48 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 338C4E0981 for ; Thu, 27 Oct 2022 03:27:47 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id v1so1369472wrt.11 for ; Thu, 27 Oct 2022 03:27:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8PzGOU3cHi3C/xmeEh0jzvedpAW9sTnCtCJCz/dvKXw=; b=kmV7eRAwmX8oQYf73+tBJXu8eVBs3MEay0gi6/jZolwjNmntD04cdJrbfmVKBYB+CV r9lpGwwm2qZhvgMLWHLMc2LbSjONA7zBfHof42h3Ri4DgnMaRT06/ORl+SYOupi+jfdP 4m+yh8AiGtfzvWMiqzIGXu1hDGRWKy/qPaNZ2a9CYqZjyAFczd+78pW0rX+32BrYBmf3 ql+5TjspKrIkVn79k35TiRprdY9j5r22rErgkm0pksOT7htanoBuY+mnodh+ZgAutGrL zYj4tjKGrjebdTjxzsvzUNrAo/7IXblaM3iPc8u3iq6SuS2wChxQDx9Lvi87SLE7HZEp f+qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8PzGOU3cHi3C/xmeEh0jzvedpAW9sTnCtCJCz/dvKXw=; b=kU1kB53aTk1UFe8YiumCuP7bhkOJvqM5gi+YKB0Yg08zsJDOjVjjViaKQma8UJ96Gn sHHPaAviH/b/l3YtbvnPiKZknHTkywTFwMA7dO2uzmHBFj0pqalrvi93v511YPmiRFbe xllegd4C8T38065obDwdkT6jVV7g0qQl57wk6vHM0jkYMjquoc6F8dj0wooxo9otWxAe EZPtTVGBlC94PbJeNhBy6ThssRQ03ihq6Qn3zyGVp/2FyxMvCHiiyO4fpQVVvCWgb4qS kqW1XGUYZzNA26IBpeOzu622zt88uUkK9c9n1ikDzviMLMSwdsnw4/I7NCED7fmbAo2M RN3A== X-Gm-Message-State: ACrzQf3cA/rrhaYyDDTZsowRSg02AfLgopck97AqpSg6VkE+FCO7VQXM jPTrrPcXsMljmV4w+CPBeD069O5VaktADA== X-Received: by 2002:a5d:5988:0:b0:236:6e28:a493 with SMTP id n8-20020a5d5988000000b002366e28a493mr14754569wri.66.1666866465783; Thu, 27 Oct 2022 03:27:45 -0700 (PDT) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id fc7-20020a05600c524700b003b505d26776sm5088674wmb.5.2022.10.27.03.27.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 03:27:44 -0700 (PDT) From: Srinivas Kandagatla To: broonie@kernel.org Cc: lgirdwood@gmail.com, bgoswami@quicinc.com, perex@perex.cz, tiwai@suse.com, linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v3 5/9] ASoC: qdsp6: audioreach: simplify module_list sz calculation Date: Thu, 27 Oct 2022 11:27:06 +0100 Message-Id: <20221027102710.21407-6-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20221027102710.21407-1-srinivas.kandagatla@linaro.org> References: <20221027102710.21407-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747836359569281617?= X-GMAIL-MSGID: =?utf-8?q?1747836359569281617?= Simplify module_list size calculation by doing inside modules loop. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/audioreach.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/qcom/qdsp6/audioreach.c b/sound/soc/qcom/qdsp6/audioreach.c index 0015ec89d90b..87a3fd1f8107 100644 --- a/sound/soc/qcom/qdsp6/audioreach.c +++ b/sound/soc/qcom/qdsp6/audioreach.c @@ -430,7 +430,6 @@ void *audioreach_alloc_graph_pkt(struct q6apm *apm, struct audioreach_graph_info struct audioreach_sub_graph *sgs; struct apm_mod_list_obj *mlobj; struct list_head *sg_list; - int num_modules_per_list; int num_connections = 0; int num_containers = 0; int num_sub_graphs = 0; @@ -451,6 +450,9 @@ void *audioreach_alloc_graph_pkt(struct q6apm *apm, struct audioreach_graph_info list_for_each_entry(container, &sgs->container_list, node) { num_containers++; num_modules += container->num_modules; + ml_sz = ml_sz + sizeof(struct apm_module_list_params) + + APM_MOD_LIST_OBJ_PSIZE(mlobj, container->num_modules); + list_for_each_entry(module, &container->modules_list, node) { if (module->src_mod_inst_id) num_connections++; @@ -459,11 +461,11 @@ void *audioreach_alloc_graph_pkt(struct q6apm *apm, struct audioreach_graph_info } num_modules_list = num_containers; - num_modules_per_list = num_modules/num_containers; sg_sz = APM_SUB_GRAPH_PSIZE(sg_params, num_sub_graphs); cont_sz = APM_CONTAINER_PSIZE(cont_params, num_containers); - ml_sz = ALIGN(sizeof(struct apm_module_list_params) + - num_modules_list * APM_MOD_LIST_OBJ_PSIZE(mlobj, num_modules_per_list), 8); + + ml_sz = ALIGN(ml_sz, 8); + mp_sz = APM_MOD_PROP_PSIZE(mprop, num_modules); mc_sz = APM_MOD_CONN_PSIZE(mcon, num_connections);