From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (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 B4FAA3659F9 for ; Wed, 20 May 2026 06:51:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779259866; cv=none; b=jWChbzLMeUtD17Eb1u5n//5Pko0EqQ63XBhfF9HMPf01a/MnKg4S3QG0GAg04kSqY28kLUxLtSWNzSWLYiBcXMXoO+UjPi6moQov1mxIOQX7s/xmnJLs2cUUwK203I32qWrGQmu4owfwaVttRAZkZ0fhS0vcJ61lHYEKwnhopiE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779259866; c=relaxed/simple; bh=1ddE0U7h9weXbIaT7HOzewRICM+9yO0cSWfl91aUt5Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=t/zYdt0OrdiPE9vEFdlliFb89w9AkKnY7f6v/8pFVnGt69lyU+eVFfcY7tDJmVYWqzfuhLjOJt6vH8GXgufMTjQNSOe4QnKqdcMNoRZrdaoS6ESrHSJVf14iP2hLC4w0vmYrnzaqEAX3XJUxlFqAv2u6QxrjmQg6KKXR0iVWOTg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=KP0Oc6fO; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=c4NqtMjU; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="KP0Oc6fO"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="c4NqtMjU" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64JMYo3r1739609 for ; Wed, 20 May 2026 06:51:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=JIaEBu2fXti OblnnO/rwwIoef8J83XO0Fyvu0X3nK9Q=; b=KP0Oc6fOQHckMwDl6aAK7+IENbO ipvK9YVfmudylkelSt3tGvElGMtCmLp9mievydU48ADgv0v/Dm0Cob3yv9Q0bTrT jdiZMckl3kyFLvFbuC1EyVPGIuP94a1yGFB/ByKkphYIo5yPURTR34kqTtIQOH7F TwQSAaScP2sP01UZxnjXnKtb3uXdLYAgURpGFO/j/SRlUqfeWwScnAMgVmtz2+rT Ynsrwmf7gIJ42966ZYFhRFFrCi9tF1aeYDrJpOkfbYHgDRfOqd1tI5j/vrKfQ5cr MlO+3DX9k+dBSI+gfNCpqnVWpmmzVk1LAr9id4OdBSwHK0MWirsnphgHnKg== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e8t3qbba7-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 06:51:03 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2bd5b20aaa6so49189935ad.2 for ; Tue, 19 May 2026 23:51:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779259863; x=1779864663; darn=vger.kernel.org; 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=JIaEBu2fXtiOblnnO/rwwIoef8J83XO0Fyvu0X3nK9Q=; b=c4NqtMjUGrNAubYULb+Nl7NRVOGVn3ml9n8ofupfHM98uPNmAx4SRTHeyg9Lu0dBuS jVjIXjHPnUgg+K0fkYrC+Ypzy+n4YDpDeeaf1QBgEQhiK4KkqtaKg0TRS1nJvSrtSWVf AJLQGEyX6lJZ6dL2N1baW5BVyjgo8ED7ITVC+njKrXKdBv015RmFjvSSrLnSaZwRJlGa txkh8YY5jz6BLnr61eP29S0DvwMaTgib9Zirbz0n9coZJw2H2dEXjRIaJQYHKHx3VcGG rMDFeaWinq+icC58g6Q7SnBnA3T0cHiTUPB5e7wTYAQnaA3fyrWcHPPa6ktkCtR0CMAQ KUbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779259863; x=1779864663; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=JIaEBu2fXtiOblnnO/rwwIoef8J83XO0Fyvu0X3nK9Q=; b=m25RRInW9mYRqA8OQkuG293IJ6PfCYXgxd4N6yegTM7Juj6mCajNIuXb9FN7fd8FKm 1KYiofT5iRILdr+y7D+b98PW1CVWKsBvxGownYbB4IMBFNLKxh4FP+pihRK+r4luGTiV jT7gImJhfLCVrhk5+JgKIOvfwnTz2Mfb18sQKmDSVg8dfSM61paVQImPL8fI/q9isDP5 +ey8k3US1gB9yk7Re0FCM5hgkHA0yArYQGOHdn6K1Ko69wQjdh6vt8rW7G83liAij4Ae mJTO57SEUtjctwY/cTAr2+g4IIijklidyt+IAAV1uMU866QveiwEeJ7nh9/H1Tf0PfpQ uMOA== X-Forwarded-Encrypted: i=1; AFNElJ8QW7TaoAqAQTNcbW29uS5qg3iZm5KmPCZ9m1skEp90kSJdtaTSjQbNsd5mBlIlLo7zRq3atzJ3gdGF6BM=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1Dsn4JK34N9ETTF8gNUXwuaqq0PRLqKTHEiAUlq5rY1qnsXlD Tp9Zur0IBhALiaMyRCwd2iEplLmTCm06FZVLqJ2V5vRGgXu/zb5A7vcsW0VZzGgyimP3U9DWAAi 82d7YNSL1sahMHVYWfrkBoWKnamBI229gQlQbHdCUDXNUIfJ8owl8nQtEJWnVI0rjCnA= X-Gm-Gg: Acq92OGu0eKtSScbOPTsp8DixZqOjqzP4LW6+jXQbtDscNOj4habOoqIRKVVAnAtUs9 YckBOQQ9CChR9usZC0dlWDVPxi6mrDfgj2usBWU5BPaLf73OdRi2/lUGovxHUUYpexAHtkvt2qN aJxzoQ+ChZ21hIGvLk12KgjBbIRiAtZaOTcC6QKpkhx+Ml/lMKmMVl0psDQbkOZcMNt6oDO6kmT gDN2KHo46xd+IW+oOhuEEZWoN3QuAXsBZKBqHx/AqcqGcbRKt5GhXa255fXocFrgn4/V4/TeZdB 5iBW8F61Z5sb88xibGiLtHNzRl9Z8WqF5I8GSntla96tVgPdEhg+1eIAevSg51fYu/2GUA5mV4Q NZr6LLqqE+1hnDqL8QKkvmY8RV4cor3PmM1Vgkx04ZJA+3TDBIgXckQ== X-Received: by 2002:a17:903:3c6b:b0:2ae:825b:49a5 with SMTP id d9443c01a7336-2bd7e415675mr232877115ad.0.1779259862408; Tue, 19 May 2026 23:51:02 -0700 (PDT) X-Received: by 2002:a17:903:3c6b:b0:2ae:825b:49a5 with SMTP id d9443c01a7336-2bd7e415675mr232876855ad.0.1779259861917; Tue, 19 May 2026 23:51:01 -0700 (PDT) Received: from hu-ekangupt-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2bd5bd5fe51sm206410165ad.2.2026.05.19.23.50.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2026 23:51:01 -0700 (PDT) From: Ekansh Gupta To: srini@kernel.org, linux-arm-msm@vger.kernel.org Cc: gregkh@linuxfoundation.org, quic_bkumar@quicinc.com, linux-kernel@vger.kernel.org, quic_chennak@quicinc.com, dri-devel@lists.freedesktop.org, arnd@arndb.de, dmitry.baryshkov@oss.qualcomm.com, Konrad Dybcio Subject: [PATCH v11 2/4] misc: fastrpc: Replace hardcoded ctxid mask with GENMASK Date: Wed, 20 May 2026 12:20:45 +0530 Message-Id: <20260520065047.3415790-3-ekansh.gupta@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260520065047.3415790-1-ekansh.gupta@oss.qualcomm.com> References: <20260520065047.3415790-1-ekansh.gupta@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: cA4U6dLuRRy9Em6kYc8IHMdr4Ph-2B9g X-Authority-Analysis: v=2.4 cv=LcMMLDfi c=1 sm=1 tr=0 ts=6a0d59d7 cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=HL6mAI18knL3XnPGOeUA:9 a=1OuFwYUASf3TG4hYMiVC:22 X-Proofpoint-ORIG-GUID: cA4U6dLuRRy9Em6kYc8IHMdr4Ph-2B9g X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDA2MyBTYWx0ZWRfX9UWOF2hxFn47 aBgL+d21RJ1C2z1QbQrDGbwlfKziTeNsSe2zNUsH3Hsd80mUVqI0aMoqPfzq/RnU/03cvnTdwRp CF6rKzE0rSsPc1+L/rH8BTRzXsp8ezf4+j7AebVW4YIDu5WPWOiASQgdIXtcbVP8zKMsjsohR/A lFRAyVjSDFLeDB+S2Ohdw3C5iKTLtUB8Y65kjr0ERHh7MnyquN70XrJVIPJ3TsNSbxTCKUCM29M bqaL4feRT0pYxItrTyb4ediE0N5mXBzeht5uZWofkA8Kj9QVKVvuataXKeSS2RK+GZcjB4X5CJS T0ez1LktCWW0vmSn5FqD7ET0YwO3fS5TYmmOYNe5g6Rm4A5bP9iWy6ygnTFbqR0cM+IvjhwWqEt 9tHDenefaCs4OscK8w4XjCm2HqeNKXCGKQVifWolcg87ca2IHhV2rNvMF++96MnQTOBPtGoLPFZ zTtsE4WyhqvMnYo4fAg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-20_01,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 spamscore=0 priorityscore=1501 clxscore=1015 bulkscore=0 adultscore=0 malwarescore=0 lowpriorityscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200063 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 --- drivers/misc/fastrpc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index a9f507a88c67..3f5d5d73be5a 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -23,6 +23,7 @@ #include #include #include +#include #define ADSP_DOMAIN_ID (0) #define MDSP_DOMAIN_ID (1) @@ -37,7 +38,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" @@ -515,7 +516,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); @@ -649,7 +650,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); @@ -2508,7 +2509,7 @@ static int fastrpc_rpmsg_callback(struct rpmsg_device *rpdev, void *data, if (len < sizeof(*rsp)) return -EINVAL; - 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.34.1