From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4769F444704 for ; Wed, 29 Jul 2026 09:44:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785318247; cv=none; b=eIKeRn0GXx3LSTej4Y91Y0zyF7tiLhWbR/upBS/JOeTdT/Q2iLgcn4bFfmU1232vkBu7lqjisvgjn2G0yaI942MI4yohfnWBrzhn/5sICsxSLb5H7k6Asd1UWQ8h0+imoxYQGl7Cuc47Aug1nDsRF/Dp8+Jvx/t2hiHW/388bas= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785318247; c=relaxed/simple; bh=dCW461AidV9Piej7/LhYfDA8wZAbpt9ithyM2k7t6tQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BpZBAHOV1umPVjWnv7UBwyXTAQvHUeonglFwGSNzyqGsVixFvQcHBeGpK1Eny7jJ2WW0Stitjcq3F/weu1T1NDCEJLiCyJRA88Ct3tlMdgO5WZcwQ7JcC+4IRuR9vNvz/kJU/P0ojMpY98Mcsh4ZWGP3GiI7q8QskE/rjoatRkY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bWsMGgtY; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bWsMGgtY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2DA71F000E9; Wed, 29 Jul 2026 09:44:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785318246; bh=N89STIoHxXPLe9XlEBrITGifQLwms//WRLP9whcAktQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bWsMGgtYGif0BdCyZdw+kyaVthgBUxJ1N7gL+EsvMclsln3zP9228ACkztPDO3OA4 1tqZ3VBIEXDBiHvUM+8X6NJRRIM6x3wxFI2tMl39rUhjWVY9ANRlBW1SDe0/BKaqIy lPVVzqm9XtNktrfglBGhrJi7Auug1P6z0RrYOFx4yT2A7bbo/Xd5ZNhcvoLAwoulK8 /Us8+e/5ihwf1BAYozeqYzGDDTvjCEibWGSAEesDV5ixsvXkP5bvFedHhddTdwg5O7 vW7TMBwYF3hFtcyYCIuvTx3862m8suGjFifoTkuhsU8dy0tn3W7QxTYOaYZSSgYgpY mY+Og843SG4sg== From: srini@kernel.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Ekansh Gupta , Konrad Dybcio , Dmitry Baryshkov , Srinivas Kandagatla Subject: [PATCH 05/10] misc: fastrpc: Replace hardcoded ctxid mask with GENMASK Date: Wed, 29 Jul 2026 10:43:47 +0100 Message-ID: <20260729094352.111065-6-srini@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260729094352.111065-1-srini@kernel.org> References: <20260729094352.111065-1-srini@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Ekansh Gupta Replace the hardcoded context ID mask (0xFF0) with GENMASK(11, 4) to improve readability and follow kernel bitfield conventions. Use FIELD_PREP and FIELD_GET instead of manual shifts for setting and extracting ctxid values. Reviewed-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov Signed-off-by: Ekansh Gupta Signed-off-by: Srinivas Kandagatla --- drivers/misc/fastrpc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index 885ba7d1bff5..9d8dcd836a75 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -22,7 +22,9 @@ #include #include #include +#include #include +#include #define ADSP_DOMAIN_ID (0) #define MDSP_DOMAIN_ID (1) @@ -37,7 +39,7 @@ #define FASTRPC_CTX_MAX (256) #define FASTRPC_INIT_HANDLE 1 #define FASTRPC_DSP_UTILITIES_HANDLE 2 -#define FASTRPC_CTXID_MASK (0xFF0) +#define FASTRPC_CTXID_MASK GENMASK(11, 4) #define INIT_FILELEN_MAX (2 * 1024 * 1024) #define INIT_FILE_NAMELEN_MAX (128) #define FASTRPC_DEVICE_NAME "fastrpc" @@ -566,7 +568,7 @@ static void fastrpc_context_free(struct kref *ref) fastrpc_buf_free(ctx->buf); spin_lock_irqsave(&cctx->lock, flags); - idr_remove(&cctx->ctx_idr, ctx->ctxid >> 4); + idr_remove(&cctx->ctx_idr, FIELD_GET(FASTRPC_CTXID_MASK, ctx->ctxid)); spin_unlock_irqrestore(&cctx->lock, flags); kfree(ctx->maps); @@ -704,7 +706,7 @@ static struct fastrpc_invoke_ctx *fastrpc_context_alloc( spin_unlock_irqrestore(&cctx->lock, flags); goto err_idr; } - ctx->ctxid = ret << 4; + ctx->ctxid = FIELD_PREP(FASTRPC_CTXID_MASK, ret); spin_unlock_irqrestore(&cctx->lock, flags); kref_init(&ctx->refcount); @@ -2539,7 +2541,7 @@ static int fastrpc_rpmsg_callback(struct rpmsg_device *rpdev, void *data, if (!cctx) return -ENODEV; - ctxid = ((rsp->ctx & FASTRPC_CTXID_MASK) >> 4); + ctxid = FIELD_GET(FASTRPC_CTXID_MASK, rsp->ctx); spin_lock_irqsave(&cctx->lock, flags); ctx = idr_find(&cctx->ctx_idr, ctxid); -- 2.53.0