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 EC28E3612E7 for ; Mon, 13 Jul 2026 05:22:51 +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=1783920173; cv=none; b=and7vkUpnbchA692z0ggI3hw2hSANls7UAZF6dchBHM0s6MhSJjWk3bnGbrkQq5ptvpOLVDlTHYqXhVuaVFZKj8hvHoiAJ+JdMsbn+NituxDJz4nmyD3U7o4hqN1bkH9+QMsfJgXY12Nvj+vST8iAf6lhsVbQElWgllwBVqQmEA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783920173; c=relaxed/simple; bh=VmXHhCMfLZLd1XdifWXdK5hh9acIDGbTOS14Y8L4MD0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=M0a/xgMvU6HmwqZze77Klr5qyQnVKazHymS55OM/GuGLwke0YbNjdif/F+bwdSmdqL1leg8jiD5T0R6NohpV4KecM/E84g0jAqQELRZKPTqn6Q2P2Ff7G+NR4AK6zNopWhz/K7w1GwiZsLLYIIjPY0jKhPd+6hVuMOl9KQGTC50= 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=cEFQol0W; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=b+UZdN1C; 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="cEFQol0W"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="b+UZdN1C" 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 66D3A3Jn169735 for ; Mon, 13 Jul 2026 05:22:51 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=rX2n8/wl/aZ 5m0mAvSyZH/8f/EcwdRtpFwxFW/vqR7A=; b=cEFQol0WXB/xTarzSmKHeJ9Fcf4 DcOs4JPBkm6j/bzteyJ036g4nZIh4g1Rq+moFWD1v1nzDq2GfPrhgm7wwmwobaBz MLlUTwV0g6xH6mP6iui2XCNibGyswNimG/wLwMHDILUGCNYBFFbXFXJtBBmWoDC2 N2dIfAkrA1OhxcxvlRZuDsFo7qpuywlKPVWM5xm5taZyZAiR8AszmNf3xO/mfIVP HC1ONrGez4+TT5RjqtwzsEhI14lSFyR50PGwCAu1WqVUoSn50xzfBCDnyqr3wMoZ ytCmKWxinkJKB8J2pFUwkHFDp7Q8tk+3JiK5mkW373X0wOSQiUZ0QX4lJkg== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fbeehmfp1-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 13 Jul 2026 05:22:51 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-84877b362f6so4433493b3a.2 for ; Sun, 12 Jul 2026 22:22:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1783920170; x=1784524970; 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:content-type; bh=rX2n8/wl/aZ5m0mAvSyZH/8f/EcwdRtpFwxFW/vqR7A=; b=b+UZdN1CbRe2aQSgRQeQ9nCPjwuv83UuLAdMuWUCFUou2+9TOQF/maoxig2KIlbDqD xc6iIE96Zj/ywoynPkzzq4kApPdv+v/UT0ASC5SqHnuZPaaM1l8EGxF/OnTvLZ7isU1Z qZalKQ50ShAE0enimLQWk8mFIu6BcC1OO4aCrB152LAP5bwhF+pXwI8tbOQWv8O9lZ4E 2WsXTCRLuw7GhY4S+I/8nt2nZqJZKlB2z+U3VbVfjnunA4L0lFMP2HdThL5kekS0h3g5 EiZNN+WbSwggdjKY2QKRvizNhupKPLiCAKS/UZ5czUlAXhI0ts7/z2uYCQ7qGGR1SAkC ZuMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783920170; x=1784524970; 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:content-type; bh=rX2n8/wl/aZ5m0mAvSyZH/8f/EcwdRtpFwxFW/vqR7A=; b=aH0MrgvFox8UsVHxe3/ZYj7vywReX0IhVu9lwLLtUrCANj4Zkn19JQ6PYXEZJhOTqN LFlYCNm1oCNAs1Ju7UgFJAXynmu6qy03PkfTbiJLNB4DwTs671VrgYJ6wGoQnjcR5f/f GRN6iX4VclgexHg+kFgjtZ2NOxXUjiLflqXWRE17+vczNWMsxMZfWBky8KPNdrAXQ05+ qWKtzFU3U4O4mYcHNZEKoA0nBt+QW5lx6zT52iyPD3z9QESL6tNATcMPnu1m2SvRtlJT vZtkYQNeMl+I07UWJyETPLkGXy2be+DGtvjVhf0B/IDYP5Us21ZCryBg2hJJhUB9GdkM r9AA== X-Forwarded-Encrypted: i=1; AHgh+RqUSB+aAKdXqkz79GQOjfvznSC3lMh82zrQOaxi3JQPQ8FFcHZ0bB3L5dKgnCjYOvl33Zw3aOqPWAWIrTc=@vger.kernel.org X-Gm-Message-State: AOJu0YwsLagSbJf4SzkAmf4cWqfDMDfLdK/xwTiP2wG85KHf0paowqeY U5nYEJ1rQuXaxtVBHgmqLXsKAVzbfugOWkuZ+Cg0oeMTSM/yniU298LUEcHNHdWvt4gZxpmNEC7 a3rpU/Kfrl2foEhCFOPyGtRr/Y3qsaDj4InlPoDBismwNCvQ9qqOZGTZsUMp99mKJ2to= X-Gm-Gg: AfdE7cktIw9r+yaeFBsDa2QfbCCOUDQsbkLuDQx55MafY0J8WsLTp8O14XEEWYRsNxn 4y4pet92/GAk2Pi5LDJczSnjRlQbGg96+FjLferYmj2u2q54x7y0hMqrNINSB6JOqrHAbWpqh10 8uYLzvB2pFlDuqXDAkbwE4sP84pI2xQ696uH3kK/M6wbpVjrsSz8UhkZU8X+R8F7rb0N9dvjGH1 SoyJqKmjubhuBsZfrMDfxzlhRrDipYnf/ihWrn/jbM/9GtIukX25SzFWETFC8jqi6kt7RDwscjW hMpsrzadJ1kT+nmBE+wWtspmzJOg66m4xAf19Sr9CtYhP2FVaAoruNVBamWrma/Cd66GiepGhnv 94wS+KePH9+M40u1ZqKZiKQ4e5k+fTGssDf9OOEerE60= X-Received: by 2002:a05:6a00:139c:b0:848:4c3d:659f with SMTP id d2e1a72fcca58-8488990d0b4mr7089166b3a.75.1783920169875; Sun, 12 Jul 2026 22:22:49 -0700 (PDT) X-Received: by 2002:a05:6a00:139c:b0:848:4c3d:659f with SMTP id d2e1a72fcca58-8488990d0b4mr7089134b3a.75.1783920169350; Sun, 12 Jul 2026 22:22:49 -0700 (PDT) Received: from hu-ekangupt-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ca75ef0c30dsm6245605a12.17.2026.07.12.22.22.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jul 2026 22:22:48 -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 v13 2/4] misc: fastrpc: Replace hardcoded ctxid mask with GENMASK Date: Mon, 13 Jul 2026 10:52:34 +0530 Message-Id: <20260713052236.3033744-3-ekansh.gupta@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260713052236.3033744-1-ekansh.gupta@oss.qualcomm.com> References: <20260713052236.3033744-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-Spam-Info: AW1haW4tMjYwNzEzMDA1MiBTYWx0ZWRfX8UQA4jZQY3qJ PbL8xWGJYKmKm763jl5UND6n7zVUd6baik6eVzBAF7a625WVpOPHt+lNXoE7j/RRj1iVSqZ/54V 8kHXY6XdFgApJTfwt2NMXoSBpWw2O3I= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzEzMDA1MiBTYWx0ZWRfX8vqfKi9W6rau w8fw46HE4NoGqSXL1Aq50aNAJZA9nJ6/onOSwRq9+Zq4PmnVRhTZlWoNYmXmjFnxCQtEhsZatdM OkhEXYusV8XICcOKuXzEL17zg6AsJggFF4hD5vHeyvclqF0SyFVcmA/yWhvTSe8gqOvnqdD59GX MXP3CJqwUHkQ5DOhwF7d/R9EoRDgSVfHpKqlJyh0pAPf0DK6X6G7SzokUZVQphOL12b6qnuNiUK iKSigj8TC9OB/BhDraOflh/06gH/y73n0XtZ+RyXa6Io0/jnG9UnSyzOeFAu1cRlG1DFBxIabXD 55JEbU0UFUM3OYE/7o9rDQswZoIihhN7BsJ7RyICFxK7Ivzfe6afS4GL7SazYccuTqoYiRrTCjg p5qeZDiLFX1KoTWSY19Dbgt74N9x3N1tkEp5leE8z+8XPWdOUD9g59CUPOu3AafaUwF9s3SOReX NBFATHZjrgfv0A2jliA== X-Proofpoint-GUID: Rov3sGgt6yo04aZETn-_YHZ5kMKrdaQY X-Proofpoint-ORIG-GUID: Rov3sGgt6yo04aZETn-_YHZ5kMKrdaQY X-Authority-Analysis: v=2.4 cv=aPvAb79m c=1 sm=1 tr=0 ts=6a54762b cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=HL6mAI18knL3XnPGOeUA:9 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-13_01,2026-07-10_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 adultscore=0 suspectscore=0 bulkscore=0 clxscore=1015 priorityscore=1501 spamscore=0 lowpriorityscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607130052 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 02c2765e1188..41c2ec0bc628 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" @@ -566,7 +567,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 +705,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); @@ -2547,7 +2548,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.34.1