From nobody Sun Apr 5 16:31:35 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC16CC6FA89 for ; Thu, 15 Sep 2022 12:39:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229880AbiIOMjB (ORCPT ); Thu, 15 Sep 2022 08:39:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229806AbiIOMiw (ORCPT ); Thu, 15 Sep 2022 08:38:52 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4940F7E81B for ; Thu, 15 Sep 2022 05:38:51 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id bq9so30696342wrb.4 for ; Thu, 15 Sep 2022 05:38:51 -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; bh=S1Wbe703KgwRjRnGYT1UQwDcnhEdqY3xQGpBo/iRxEg=; b=q3+13rQMZe8hlYwv/HASxaymo9QU7p0gObvq/d5o6KQtnwUylgUQplJPjfYGffqCks 5F8EjLkvigkbDjNM/++o1zWtG42OLmXzp5MMrrYIlwQNsHdvpqwXnTxzuOChx7YdbIF2 fl25J3FTfrJHkdgOmt7xYOzP8q88Yk2acfQB0tgY+2zOLpS0nEI1If4HYXPZvi7zEd6X HnMLg7bfjO8enspJ0UONS20xGgvWOTi6Bf7Evs9FpONh7OZuLB9MCiDWcxESInWFTq2E TcVA11DFo8vV7r5L/1XEAB0Tt4JbgyLxvNiUiSD5VKvCtiaoeo+VhJDF/ghafdcJvrNb lifg== 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; bh=S1Wbe703KgwRjRnGYT1UQwDcnhEdqY3xQGpBo/iRxEg=; b=a8aXKFAfw/jElr1vT4qPfrjolnnRpXNzqXJ0p21pe3Xaay8ur9hYEkZxFEZG11uWZC yAXmcQRJFOWDL5Ik3t/Ci3cmhVdfOQmHQL0ih4hE1kSexD0Ui///1aGejrCxGdPXPkRa sAWDW3tBCcFFGtSLFYM9oc/SuP6gdL51CUTzjVlwgy01stfHh3IoGRezUanEJAUdOXgS V8yTtTWLARbkojfQ4ENcCcrFqsqzmGHpDL5nCR8m4dyGwklzaW1ILOYG8FrSPgMmyXhz 95ATklpo+XHi273xB8/wBU3uVRbmAaYvh8N9TxO+Ttezy5UpCx2T4xfrXv4JHskNPWWi R8hQ== X-Gm-Message-State: ACgBeo2mVUMwuveEqcW2KKQgwOwcjDBfgo0BO66xPbHh4rg4YEDjl7D8 26GRWWvFBLmDy9c0BEYrclfFjg== X-Google-Smtp-Source: AA6agR6FwgsGTkzftq/NA192AJGeqy4nG8K/OS7cYBnFj10qXrYUHizyklw0lCpWs5mOS0cI7s/0jw== X-Received: by 2002:a05:6000:1689:b0:22a:a66d:1f37 with SMTP id y9-20020a056000168900b0022aa66d1f37mr10986312wrd.197.1663245529897; Thu, 15 Sep 2022 05:38:49 -0700 (PDT) Received: from srini-hackbox.lan (cpc90716-aztw32-2-0-cust825.18-1.cable.virginm.net. [86.26.103.58]) by smtp.gmail.com with ESMTPSA id bg13-20020a05600c3c8d00b003a5f4fccd4asm3112559wmb.35.2022.09.15.05.38.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Sep 2022 05:38:48 -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 1/9] ASoC: qdsp6: audioreach: topology use idr_alloc_u32 Date: Thu, 15 Sep 2022 13:38:29 +0100 Message-Id: <20220915123837.11591-2-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20220915123837.11591-1-srinivas.kandagatla@linaro.org> References: <20220915123837.11591-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" SubGraph and Module Instance ids take 32 bits, so use idr_alloc_u32 instead of idr_alloc to able to accomdate valid ranges. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/topology.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/qcom/qdsp6/topology.c b/sound/soc/qcom/qdsp6/topolog= y.c index bd649c232a06..9a3d9e0eae53 100644 --- a/sound/soc/qcom/qdsp6/topology.c +++ b/sound/soc/qcom/qdsp6/topology.c @@ -44,7 +44,7 @@ static struct audioreach_graph_info *audioreach_tplg_allo= c_graph_info(struct q6a INIT_LIST_HEAD(&info->sg_list); =20 mutex_lock(&apm->lock); - ret =3D idr_alloc(&apm->graph_info_idr, info, graph_id, graph_id + 1, GFP= _KERNEL); + ret =3D idr_alloc_u32(&apm->graph_info_idr, info, &graph_id, graph_id, GF= P_KERNEL); mutex_unlock(&apm->lock); =20 if (ret < 0) { @@ -53,7 +53,7 @@ static struct audioreach_graph_info *audioreach_tplg_allo= c_graph_info(struct q6a return ERR_PTR(ret); } =20 - info->id =3D ret; + info->id =3D graph_id; =20 return info; } @@ -94,7 +94,7 @@ static struct audioreach_sub_graph *audioreach_tplg_alloc= _sub_graph(struct q6apm INIT_LIST_HEAD(&sg->container_list); =20 mutex_lock(&apm->lock); - ret =3D idr_alloc(&apm->sub_graphs_idr, sg, sub_graph_id, sub_graph_id + = 1, GFP_KERNEL); + ret =3D idr_alloc_u32(&apm->sub_graphs_idr, sg, &sub_graph_id, sub_graph_= id, GFP_KERNEL); mutex_unlock(&apm->lock); =20 if (ret < 0) { @@ -103,7 +103,7 @@ static struct audioreach_sub_graph *audioreach_tplg_all= oc_sub_graph(struct q6apm return ERR_PTR(ret); } =20 - sg->sub_graph_id =3D ret; + sg->sub_graph_id =3D sub_graph_id; =20 return sg; } @@ -136,7 +136,7 @@ static struct audioreach_container *audioreach_tplg_all= oc_container(struct q6apm INIT_LIST_HEAD(&cont->modules_list); =20 mutex_lock(&apm->lock); - ret =3D idr_alloc(&apm->containers_idr, cont, container_id, container_id = + 1, GFP_KERNEL); + ret =3D idr_alloc_u32(&apm->containers_idr, cont, &container_id, containe= r_id, GFP_KERNEL); mutex_unlock(&apm->lock); =20 if (ret < 0) { @@ -145,7 +145,7 @@ static struct audioreach_container *audioreach_tplg_all= oc_container(struct q6apm return ERR_PTR(ret); } =20 - cont->container_id =3D ret; + cont->container_id =3D container_id; cont->sub_graph =3D sg; /* add to container list */ list_add_tail(&cont->node, &sg->container_list); @@ -181,7 +181,7 @@ static struct audioreach_module *audioreach_tplg_alloc_= module(struct q6apm *apm, AR_MODULE_DYNAMIC_INSTANCE_ID_START, AR_MODULE_DYNAMIC_INSTANCE_ID_END, GFP_KERNEL); } else { - ret =3D idr_alloc(&apm->modules_idr, mod, module_id, module_id + 1, GFP_= KERNEL); + ret =3D idr_alloc_u32(&apm->modules_idr, mod, &module_id, module_id, GFP= _KERNEL); } mutex_unlock(&apm->lock); =20 @@ -191,7 +191,7 @@ static struct audioreach_module *audioreach_tplg_alloc_= module(struct q6apm *apm, return ERR_PTR(ret); } =20 - mod->instance_id =3D ret; + mod->instance_id =3D module_id; /* add to module list */ list_add_tail(&mod->node, &cont->modules_list); mod->container =3D cont; --=20 2.21.0