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 8A6DD2C21C3 for ; Wed, 15 Apr 2026 11:25:46 +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=1776252347; cv=none; b=bsAvNbq/rC46FvEWahE57LDZTLdpBOmNHdZQL8oF2DoEKPDHYAVfdzxybZ9ZkkytfWi6zWLmhJFf1NtdR7FS9hGaMoCMsj+CDYJ/IOx45EL4n/lG1bRsaAIvsBBVdajCslj0Vk5LqfpKXkLeUhICNhS6ZL+jR02DPsAdocUgYAI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776252347; c=relaxed/simple; bh=17Ef71wpPprYkzSdH9NRRGCjdmeEYelFAAr5q3M9YqE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Rug98azLeTIQxIAnMeT51mEnlKqTXy009iartDcB1GxiQxba83DsezLpmPzW8jN+rHgL/dVyQaAsJCpt7bQGM0W6xomVNciajgTE4Zwred6qcuiv20IJInjOeAGYGwfdNsr796Ye6jFYEI4gwvUrk4CBq5r64FRxk8rkTlGyGXE= 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=KGmANgAW; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=ZTd/AMjk; 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="KGmANgAW"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="ZTd/AMjk" 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 63FAgeJS3126664 for ; Wed, 15 Apr 2026 11:25:45 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=TZq/rLCuYKP zZ+3bFaDBlw4HhmEskTpGrvorY5Ef4Mg=; b=KGmANgAWlCO1gEeQJ5VVozAh+zm sV+Ldiunp+1ulSTCnd98Qa/7mY/LRPY0O+3WpJEuCyD6sMRGIrRJDC8AP25bMX0i fu4X0S+3IHTdKjfbZAI1lFaZXMo4MbTD2BEjKM8DICr1nQZF5DKWl96zijCvTaMF AKD3MxKtzrsRDBdRhtvU9QeJo/ld6uvfEwZQmkWZjw7PaQ5iTANg15ezs5WnO+EJ niUnBiQDKzuXxejSMJsKVccgINvvdA2lm6r0GfIhAUo0apWLDi4QF5GFU8px/qQE XT+xA7pwvmcykC/3Nvm9CR+b30UKHCdoe8Ve9uS5nuJX5IJmLYUKLAahiRA== Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dht56u077-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 15 Apr 2026 11:25:45 +0000 (GMT) Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2b2e6ee9444so42144765ad.1 for ; Wed, 15 Apr 2026 04:25:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1776252345; x=1776857145; 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=TZq/rLCuYKPzZ+3bFaDBlw4HhmEskTpGrvorY5Ef4Mg=; b=ZTd/AMjkU1n4EJv/LLIh2myPbZARifg9qI4UtVPhUNz1tsWn93nacr7KA2Kd0HGvzx ii/iX2KBua+y2MM8Gx9AwJT2bXlw94CeYFoDYDrKXiIl7tHSjBs/RLck4GnxlvJZ8/Ir 5WabpVt+TNrEuMI0YEOmGUblNzlMqkm3Dpa7NsQBxEWcXIcnncCTaJH6Uk6m9YI0dGj0 /ieH4Jnoa5ZVMc3/OsrzLWQLtaloR78lJXL/3HMctu2E9r1fY07rZ9hzErlb27bAYz3P S4HxgphJ9J8h7bxx8vkzXk0IHVwc5U63Gbd3DHBLnzGrbYJORvw0Pp2kj86JQQNmWqF4 j6fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776252345; x=1776857145; 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=TZq/rLCuYKPzZ+3bFaDBlw4HhmEskTpGrvorY5Ef4Mg=; b=EMsUjIZ6ClatX+LAzdEpvYOrOIyqAScIYO9sYq+vSnSh1GwDknrlE8IRCAsoZUk6ow ErOJybQ3kXF0JvtqTjRYcblahsdbex1UiUyZELeEGPVD8dKxjyYE0xb+aDgmCpd7JNnN /EF0Ckm95cAnhNqO2oYKh75F2A9TwO4zdkEmgmlhU+yUqI3Fsxxt3XrNmeoNiuepiZbO B8FkhN6kdtayEc5NhjjYz7rIJeBgfR2iOB0Ont3/oymznaCrDH6QuwZgjxNuQV6ys6Ji 9x5VUmFitzVZ3LozhldpH5anAix2x4rfaJktvKXGLGD0tgh/3NUT34o78+UZcsL+8hRr jUGw== X-Forwarded-Encrypted: i=1; AFNElJ9hUgH9eVNOQTYK11MNuE7HuCHAlnNKGv6mbXOq+WCi58MQVIKNl1BK/9X71etgwLhqJ35mhc56SYNh+68=@vger.kernel.org X-Gm-Message-State: AOJu0YzeZYJYcu1Rimn+nfWZAk9Gi7+4qzpnTVrl1V0Xz/kBRE5nqAib +Gll2e5yrY8D7o7leS0hw4/iPXTAaRYdjY9pic5n+RG/bP2cogdlgezDjDer6UQLueu6gRP/c0d VNvFS464NYzoAsS9TuYkmJAe9X8/mbx1cbZZIDJ6owpP0gsJVFYtzQD2EZyuwrw44eHU= X-Gm-Gg: AeBDievgMhhXojoiZoCswcZmDHMYhEwqZZK/ALD6EKzKYevE6pTAm8U38tB7TmEmnRS wrxEx4wurmCchvylsmrHhroo/FRnuSmsOjVLnvSVEXtomHM0P4q91u7Ikrp0EajC6LIj8G3RoYm lKtanfABrLd37lopKOW9X8iMrx0AwhH9azmOQATBcuE0poLs0TjQSex9kQnP+peHP5uezphrWoO U/161ZbUtSmADde6ydIDPcbXSsTF/XMWLC/SHeonWmRXGkV3x/vJNlMn6v0xyjxi4X6ROgz3d4k /ew3S4OxiHlRLaMHcXKI7Y7+XcsCOia9GygnAgH0d1UhrRcvKT70UMBIWikoa8zX2js89KGSdDb T0G1vuI7ZSS9VlZn8ScFFVF5kAKgef8e8TRfiyn7z2rGKJRxL5KadKqM+9AeHNtAE X-Received: by 2002:a17:903:38c4:b0:2b2:4f43:b49a with SMTP id d9443c01a7336-2b2d5d8ab1bmr197871775ad.22.1776252344515; Wed, 15 Apr 2026 04:25:44 -0700 (PDT) X-Received: by 2002:a17:903:38c4:b0:2b2:4f43:b49a with SMTP id d9443c01a7336-2b2d5d8ab1bmr197871535ad.22.1776252344070; Wed, 15 Apr 2026 04:25:44 -0700 (PDT) Received: from hu-ekangupt-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b4782b6fd8sm26794325ad.73.2026.04.15.04.25.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2026 04:25:43 -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@oss.qualcomm.com, andersson@kernel.org Subject: [PATCH v8 2/4] misc: fastrpc: Replace hardcoded ctxid mask with GENMASK Date: Wed, 15 Apr 2026 16:55:28 +0530 Message-Id: <20260415112530.4083240-3-ekansh.gupta@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260415112530.4083240-1-ekansh.gupta@oss.qualcomm.com> References: <20260415112530.4083240-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-Authority-Analysis: v=2.4 cv=LuiiDHdc c=1 sm=1 tr=0 ts=69df75b9 cx=c_pps a=MTSHoo12Qbhz2p7MsH1ifg==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=HL6mAI18knL3XnPGOeUA:9 a=GvdueXVYPmCkWapjIL-Q:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDE1MDEwNSBTYWx0ZWRfX9bx7103zhLPZ 0HrKSkPJnOkPPHPEZ/VmXQrzn5QekrHTsoVqNInwZDXEH/JPK9OT1JQKhixybgw/MIvEDBBcpZv 8pX8hR0RmyutQS2J9wEldkA6vbDVPX8BGoq3zauOGnmLtCM0O8AJILTdH0JDBE7R9cxoQ0U2jDi kjTJazV5rDqUTfKcci1JCy0s/m77JaJOd2JgCJ5p5izQpMaNsOZvSvhfVGN1aEV+P9QUYX2cP84 Xrh3psh+88lmSUP+55QmoomxGIwnvvkr3PuQIJ1CBHzVxpGZY7HH/mB9jW+21wUvcBFXPxs0InU YBLAN+zekHOhbXVUkUQASti9PTkYcXYz2p01HUkve+ars6XbISposRAZU6i5NldMdB2cBHMwcDG E+n3eM81U3TWExtgQt27Dd9SRyajBYY9jXtZOnVdHllwiviWRNfwk4aGRkXsU5WW9KOhHtMlvHv k6HrPoOL3l1uytvpzIQ== X-Proofpoint-ORIG-GUID: 8LXbMizzjYVLot26_nVa7c1SFgE9V2cZ X-Proofpoint-GUID: 8LXbMizzjYVLot26_nVa7c1SFgE9V2cZ 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-04-14_04,2026-04-13_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 clxscore=1015 priorityscore=1501 adultscore=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 lowpriorityscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604070000 definitions=main-2604150105 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 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