From nobody Mon Dec 1 22:05:50 2025 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 9EBDC2C237C for ; Fri, 28 Nov 2025 05:05:49 +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=1764306351; cv=none; b=ksS8LEHw8UkzTw80y/scb7UJokZaHaDhpkhDxnDstHxMytTxwYJUvixNOuFdrE4r9oDLovJlHqX98TKBzSQ+FWlJqLBMZ6J1zhPu1vztD0AJ3hadRLAzJ4IIFsmWt2HByZwJDYMtOp/9a9Qa225i77LpAJNGLQXfMqxTHZlB3R4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764306351; c=relaxed/simple; bh=MHn+V6TRZoHpB/IKHPrGSV0ycKamLtaH9inFw5f2g5Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Q1XA8FfIP+ITRYJcfxHnGXlIJvEXd3nNF9s928mXjSSiAn+jkr9AALWf/eQnP2a196SaF89JkLnG4qGu8JsSo5LMr+QDWIdOREEsE2qcTAFer/SBlM5BnIcFWtSGmIjmioy/pgMo8RcjpZpfN41Z3PDvQ2c+gEYbNMtwkbUB7Og= 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=bNyAr8uO; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=J9gy9m5H; 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="bNyAr8uO"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="J9gy9m5H" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5ARLP21W1940063 for ; Fri, 28 Nov 2025 05:05:48 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=44twYS2j8pu ef9SPj0m2ACmUVD52vfoicRaqJwTY5UY=; b=bNyAr8uO7bts12AzHYKQ8z/cNfl z5T6xsO4+YmfTg/HZ0048u/vEk73rflpzjqeyZ9vX4XHSYlnJlZJqgEYCsBGlT7e XSbbqLcZb2FtKVTfef8U02Z3eaIoSfagEUpK3OV7q0t3uE7x33/jEfxU+4IIGcpp 3ymZe5MPTx+Q5lZYaNWNM9B94tnt1U26IazZmrUs3neMe04OEi+E5Hk8dvGeO6p4 dWIGorrhRF7bvnW0mAY5TT7fq+0Ho+g5rzpkPO26Q+JMjYXUmUyofzwF3sA1odcB aOrSj6dc+5u/9e9VQ/xCkZJFgl5TzWeFvlWY+6PbuOFoQ2tQpQRIfoIE+4g== 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 4apnud9x70-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 28 Nov 2025 05:05:47 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-297ddb3c707so11726405ad.2 for ; Thu, 27 Nov 2025 21:05:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1764306346; x=1764911146; 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=44twYS2j8puef9SPj0m2ACmUVD52vfoicRaqJwTY5UY=; b=J9gy9m5HQY4FEU2XCPDpbyrF32WHNQx+a7mOfNk389Rg49JEhq3own+dF0Oq1M/uM1 +TZ/qxboJo5IWklfo77HvGbCPL08YOYowRtXVe41vkwkfCqNia0wWkVUVCuVKK1Usa2N 6tng8/4LTxT8ZYvItAxxgBJk5aBiAAl5YjTxmJ7ZhUewMqETHAYDEY8XVhu2RZMSNN9k 5NLeFLMshl7UHSOKFtuMQYcOyTKNDHMHLvPU+jYMkLOhYgExXrV0ZykdqAHK8J4S37N9 s9l2vgbsTLPHxM4qpMjLyBd0MZY2QYOe1iUXDvsnf/B0lYfazE4UxxHbyFei7JbqR3uX vBvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764306346; x=1764911146; 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=44twYS2j8puef9SPj0m2ACmUVD52vfoicRaqJwTY5UY=; b=eZNA+tL7Yyl7tzpCeezBp67P/zq5KIpm2S+V+RbamQVrJySSC3z5f7MIoKQAyB94qD 85mY+117pp8k3eSQE0oTXqDrAnEx+NKs7oz6DAxhk4V8tZvLmvjmeu9TLJGH9aBYrmem piXYDDBiXDoUcQprqt8QHEVT7kz7qSVxJ/rVBl0d+aXBuC82az9ZolfFq5YV5ajiB+HD DD2ITKLOmYSG3hRkkCVCRaH9LFcedlDWmU6gSsfA+RC73YueByiYyoPy4w47lRJWl55i foVZDrhjii7wqwP5JiTTzqxTCa2E6gu7VPBxIZxc0BEwDl6wUTVZqft7Hf7M/lKXj3vk fFmQ== X-Forwarded-Encrypted: i=1; AJvYcCW/y7s4IO0YNPHLGY7v5sdtsTnrIiwuH6wpcmfZQmGw2wxJPoYNwYeDw3sesOEuUqmQ34/8GBgppKitBTk=@vger.kernel.org X-Gm-Message-State: AOJu0YzcIL3AUumhcRXyy9K2EzL0cTHn2j/22bFmE+xr72yxhjyu/+x4 HigeuDk/4997qZnVMg3jblw2JFTRyCoUDc5MRhjH6FIi+JHRhV1m0vn8cSAFs5Jj7fb7CiM3rfw GFs6kbPW5PaMdKIY+F9zxa/IcomMWG2Cb5wgqgF0CMxMxQFhOG7/Dpzx+fZJq81/6EvI= X-Gm-Gg: ASbGncsE+w3BYVhls7gsiLKt9TvAA8v3LZQfYUCfeonCwwXzSNVAgXImiIg1KOQ/1pE gV6ORo1jeFFOXE1etwZyr4gxZRcd3pyKHFY9eDnavRhHuCwQHzmHOgxybKYWzwQNjdm7OcfM1Dz Jk4LOe2m7EPzXTCMkMA3K63ap6fxbuVsONkyjenKPqTLqa6KMkD4ECaYtBXrKPlLwgcIrSScDzK 6lJKTZxDU8TTePlZrPaX6Xp7aY5t3qxCKn0SE793ZVHcyPTFUaP/wVFdE17vqdsqvekyB3ah2MW OlUffTI6Y8z316e+MDcDwMHTlUkwazzCCZVI4mFz2ccxUFvc8TIF3uL36/9n+ZUUSEe85jLrse8 BmpWtHAXPJuGqOJjvBlqBD95KVMdPTs/BE6U5LgjlKw== X-Received: by 2002:a17:903:4b4b:b0:298:35c:c313 with SMTP id d9443c01a7336-29bab30b2c3mr152791235ad.61.1764306346587; Thu, 27 Nov 2025 21:05:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IE5vU/dXx4v3KW0plfFY8OrOYCD0CU/vAR1V5h3oXplPI2SFfGWsGEiYMb5j54hJMtNg3yK0w== X-Received: by 2002:a17:903:4b4b:b0:298:35c:c313 with SMTP id d9443c01a7336-29bab30b2c3mr152790925ad.61.1764306346126; Thu, 27 Nov 2025 21:05:46 -0800 (PST) Received: from hu-ekangupt-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29bceb40276sm31952075ad.73.2025.11.27.21.05.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 21:05:45 -0800 (PST) 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 Subject: [PATCH v4 2/4] misc: fastrpc: Replace hardcoded ctxid mask with GENMASK Date: Fri, 28 Nov 2025 10:35:32 +0530 Message-Id: <20251128050534.437755-3-ekansh.gupta@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251128050534.437755-1-ekansh.gupta@oss.qualcomm.com> References: <20251128050534.437755-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: quoted-printable X-Proofpoint-GUID: W4DrqX02FHqskZrKq2Uf6MFKoI7BPnCV X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTI4MDAzNSBTYWx0ZWRfX94/oCdrngyg2 3/z3nCctk/fZLBNop4CX/+ig2JZEfPmKVoSGkjgTF2zmD6HaSNH8CJ/+MOciwyyBS+RiT5jB+KE l9lsLPwuMe0BEun96S3GYy9MKlzg8emy+bx2w0JssEXcAqnCr517lqKmORRee2FoGsfo4KMyR0X FqgapK6qslyINog3gV4SPz1ESgCv+pJp+r2yvMz/hX7KUD77H5RGmC6h6sEX2C1VSqhNi/5I1vJ QlwJY6pBn7+0mehLU5JOXRbjyfjuURXTnL9MCZHEfY7MbNvnVasgrNqxXa4SqxnBAM3jyieyBU9 Re+HSqQAg0tYVEBsL/q0cMIoisvBqQnnlLzoJ078Z3lwWzuYBTvMHR2eU+hlfbBsS5QHcQWu8u2 FcijPEK4NxyvzhGGzOrDrnc9WFC0Cg== X-Proofpoint-ORIG-GUID: W4DrqX02FHqskZrKq2Uf6MFKoI7BPnCV X-Authority-Analysis: v=2.4 cv=MKNtWcZl c=1 sm=1 tr=0 ts=69292dac cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=mhgHPu3uRlbtNExDwEMA:9 a=1OuFwYUASf3TG4hYMiVC:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-25_02,2025-11-27_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 adultscore=0 clxscore=1015 phishscore=0 lowpriorityscore=0 spamscore=0 suspectscore=0 malwarescore=0 impostorscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511280035 Content-Type: text/plain; charset="utf-8" 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. 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 679cd8997a00..f7fb44a8e9c0 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -22,6 +22,7 @@ #include #include #include +#include =20 #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" @@ -489,7 +490,7 @@ static void fastrpc_context_free(struct kref *ref) fastrpc_buf_free(ctx->buf); =20 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); =20 kfree(ctx->maps); @@ -625,7 +626,7 @@ static struct fastrpc_invoke_ctx *fastrpc_context_alloc( spin_unlock_irqrestore(&cctx->lock, flags); goto err_idr; } - ctx->ctxid =3D ret << 4; + ctx->ctxid =3D FIELD_PREP(FASTRPC_CTXID_MASK, ret); spin_unlock_irqrestore(&cctx->lock, flags); =20 kref_init(&ctx->refcount); @@ -2451,7 +2452,7 @@ static int fastrpc_rpmsg_callback(struct rpmsg_device= *rpdev, void *data, if (len < sizeof(*rsp)) return -EINVAL; =20 - ctxid =3D ((rsp->ctx & FASTRPC_CTXID_MASK) >> 4); + ctxid =3D FIELD_GET(FASTRPC_CTXID_MASK, rsp->ctx); =20 spin_lock_irqsave(&cctx->lock, flags); ctx =3D idr_find(&cctx->ctx_idr, ctxid); --=20 2.34.1