From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 70D403D565E for ; Sun, 9 Aug 2026 20:15:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786306556; cv=none; b=EUjdKiX8eG+uFt+N0MzxbkW9nj6Hytq9kunFjmnQC/i0tZ11kqs3lm2E/2RUwU2n0BYmUZdqekBGL+6+4cqBFHGsq//IYRpeoXbZVkOV1hJZzWjaJX+sci3isA9Nq52GBvgbeE2Sujlk0z1bTL2lzBEZRljMLXFsrpfVuj82wn8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786306556; c=relaxed/simple; bh=csEY5kAK1o0MObErtcP/fI47l7/+8j45w1x7Lk7YzUQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UEkyDrvp63dOZC+RPAIrDa10kE1iglQUEr3yZADut7winV0Oq43fFy7izWuetGs4wImDZ1kh4PVix9WEhbRmx/WSorp2MnyE7ScjveiJjzjao+HK9fMFsnRHUa0vfnqq/j8aR/oOwwaXRiYaIfnpZyHcZtHw3SHRcNQovZwlSO0= 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=PaUMagiH; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=XN6zIzuX; arc=none smtp.client-ip=205.220.168.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="PaUMagiH"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="XN6zIzuX" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 679IAvC13978189 for ; Sun, 9 Aug 2026 20:15:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 8yX2uvlIC/AyCu7NKmE2TS3xQ1wV6P6EK8NgrBlFOpE=; b=PaUMagiHy/M083UU OPCrXT8i+jMRrju1tVMeF3pJ6smSm4MHRNEpiCxUoYbk2SjYnCUGfCb4wny53Hu/ HrCTZbKwoUYLOFdCGZWtWwrJGCzNuqG/qX3BA9sz6zSomCKV7/nJ8c6xSYWGdyuW Ama4SLlQN13tpbWk31/TSbxWoaMdcLcLINRPJgvA/w5eN9qnXkGwDaj8NDpAfy1F 8YOHAVtr3YNiEmo8vg9w64ZTkNL2q+yOgXXxm0v5T9CEw3f0Kjs1pBj49/LZeF4I 5G2OWgMA/wreXDayPlrIL+arwnma/AU3bbR7NLq4nPMpeaMBFF/rpwD/Rm1r3d3a dQ8Emg== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fwudqkjc8-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 09 Aug 2026 20:15:54 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-52769fc3f2eso17444261cf.0 for ; Sun, 09 Aug 2026 13:15:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786306554; x=1786911354; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=8yX2uvlIC/AyCu7NKmE2TS3xQ1wV6P6EK8NgrBlFOpE=; b=XN6zIzuXov3bPq3LjuR9bW94pjYx+PI+7eflsK14p+CjT2nJtNwRMA/bx66HK+JvPj MdchzQoXUwaT+Rk7osI9A2flCDwkKLbLPdt7M/9UhPHgnghNngPgVUT01c01zSLLaMQ8 kdLckgOpEjZEMcRSbAIbMcqhls4c2pVsN+mq/rvJQqB94opGRMMOn+6UFpF6yOGgN8XI wrORYVwHNNCqhf4vCNdTigW7Mm/UrZpmbZwPKgnxtOKGhDqZnAQawTjhJ/vlYLYPbNsx clIyz2zkM1nfxazvnJ4l1oMN/cQTUnILv8yzwt2Z3jEniz+a0dxzvkh0JEqQtPx00aFT MRZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786306554; x=1786911354; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=8yX2uvlIC/AyCu7NKmE2TS3xQ1wV6P6EK8NgrBlFOpE=; b=PbfhMmllC4vaXprjFC9OAu2vSqgfXgJg3CxfgEAugSUOFgNXqV/ewWQl9SV3f8Aiek GWkXWY7WSH48do/SJqwGhQvRerxofe0cQMIqWbWBvk1vQU5YFZn4qVzsUbOE4EY7NL2x wvBsImAi0IKv4mEijPvlOXawLGFTDSrIHGg6nizAgvcVI6XPTzv/nSXCN6s2qsT04TRI 358wgUvTRgqUylwApyT53HJ0jEixrJ8D5r5fsLUM2KW8CwNzfGdzaZpmpEFheJiq8/gY z55iQK3LswZqYq28l+rhcveyskLvS5HmH+/4/5Xj1P4QGQW3RvZCjHDsH3vypDNjJqPG 99og== X-Forwarded-Encrypted: i=1; AHgh+RrmlfN5wXOxDGYQlUpn+qUsFSUkk3iANApnsnwmBPGLB8QVML+h9rjAd+db4OUb7JY3/MapeZusHlIivQI=@vger.kernel.org X-Gm-Message-State: AOJu0Yx9Sgv0/wIEfPuwO8lprrBZH5Y8vl1B4qE84vrBGz8sDNNKyQqJ JB5WDUQvyV+Pp5IpAyFRQ3/o1HusFBi5RyfFrk+39uh55737g8gdcOanvlqh+YDjN338D4WwCVN 7otR47KSs7LOtcq43QV3nlMW1JZiiKniT5N6DzQEus3p6rNsfcKWtPRAVpkpgb9DudfQ= X-Gm-Gg: AR+sD11lWTl3r+v8SnVYOFFKO8x6LHgt+IqyCflorSoIFMCBNooyZPW4SYgxR++PSoo gitx8q8hY/7swYkrLIJL4wzucL/tc1GpMGOagutWL1Glh6BnuE2ZZ9jIGJhIwFwwoNPJ5fCC6s7 Uu5c39AG2lEvSl8Nh4g8oplbAZ5oMY35UAfurhlAFjqctnkGvs0Gu6iPEQM3+u+mdJWAFJFpC9f DSn7lVreEj/nknES1WQQRV7EXadZ1Ra9bBKK9SJwrraeN3t88QgDpwgPfjnqWYPnKIU94K4r2Ex sRhzAE0sbsLd/KeDaKVe8t4FcNCN9IxgV1qfzNiS+GdVfyL833praL9aoNxga68vhAc4WgHWc+s /RsGxwhq0aJqW9JjvzYvVmHR2C3VRQMNJkDn4jzGCMZgXsgZCOPq+JEklMwGMU1r0T0I7ibXBz8 26Dng4M9wmRiDt9A== X-Received: by 2002:a05:622a:1820:b0:51c:ae7:fa1d with SMTP id d75a77b69052e-52ce5f606b3mr397018681cf.5.1786306553692; Sun, 09 Aug 2026 13:15:53 -0700 (PDT) X-Received: by 2002:a05:622a:1820:b0:51c:ae7:fa1d with SMTP id d75a77b69052e-52ce5f606b3mr397018341cf.5.1786306553324; Sun, 09 Aug 2026 13:15:53 -0700 (PDT) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b3055f3cfasm1589259e87.70.2026.08.09.13.15.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Aug 2026 13:15:52 -0700 (PDT) From: Dmitry Baryshkov Date: Sun, 09 Aug 2026 23:15:42 +0300 Subject: [PATCH 03/12] iommu: qcom_iommu: extract context bank programming into a helper Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260809-msm8974-iommu-upstream-v1-3-87f5cd492560@oss.qualcomm.com> References: <20260809-msm8974-iommu-upstream-v1-0-87f5cd492560@oss.qualcomm.com> In-Reply-To: <20260809-msm8974-iommu-upstream-v1-0-87f5cd492560@oss.qualcomm.com> To: "Joerg Roedel (AMD)" , Will Deacon , Robin Murphy , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Konrad Dybcio , Rob Clark , Bjorn Andersson , Luca Weiss Cc: linux-arm-msm@vger.kernel.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4252; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=csEY5kAK1o0MObErtcP/fI47l7/+8j45w1x7Lk7YzUQ=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqeN/uriw60rs+lsE378Y69ErulMz7J4LxQ7Xse VKKqpoQgimJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCanjf7gAKCRCLPIo+Aiko 1V4nB/4xLHYwqddsAkj0i7R1FY8Pzik/aBfxcQ7lN5soSofsB1wkagZDML9XPhBgzl4rWtXPqtX 5tShzbnY0XMI6WJVPz8ZF0+9kaFtmqaRQSZci2m4+Kd+K4mhDWhfks6Bs9oQBEoCkxRPdYYzyTh /1aiPPFUYyRkR2qYqmyqENTIAGo9EPjxEPHkDEV/HOEdtGiu8wGwNmsduECngv1h+aaFJkyUEpu n8Ml/pyU5SN1GRTxM4VGUhq8umq50AmnPxW0tNWnkBZuMti3nTnvM5/9kiLK5haiP1AsQpH9IH2 fI5mzihG3hVaNNrA7pZ3+g33/+CRc9ki8oatn/Mpkviu9ZR8 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Info: AW1haW4tMjYwODA5MDE4MyBTYWx0ZWRfX/x8Y4Ryaz2H7 eF2/EPxXRAQHrR4lMu3KnFUS4CR4sL/WC58aiq4gImUbfBQqYbNcNetq+EnDVPrubwcFUyPERj6 lswxW0fhcWMh+lc48B4OMrE0jQ813kA= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODA5MDE4MyBTYWx0ZWRfX0YNTVswNuOVN Y0BJJ6HdiMxnryrS39wzvErut5JJBzUcEZ1/Q3f2qE4lBGW/oJDRHm/PDrTRi/xDFzOVpHFVuj/ DwykcPqTb2g+vpB4PsCte/mMSEmEqC8fPsO2WtFW6NGNYW4T+TEE3jAIGSanV9CwbF+ExKajxgC K4bHKW+1LKd9XEa8VHfZ2Z13ow5hWiL/QelRHB8EOUwpek7v/92NOOFRNjPtikOwoUSqXoH4qUz PSLiqarr9iDSK5CVBKCSz1d61JV8irlP20M0ZvhvIpsK8+JxxVKiux3wa+IOkiQyxCVtn5Nt0Hq P7Sizj6Cjj4FzdJ4vEWiDN8FTNbMq0R2s24pndq2rVUMCoU+XFPR9xG7Xi5Td794bKpgR9Z9RC4 tOsJZVNbH+VP6l4o9P20K+c+NGAl8rdp1R3eILn8ZJc52gpTJC5LDFsllJtyqT11Gn72Zgch0Y/ 1urzlJJJCnakWzBm8qA== X-Authority-Analysis: v=2.4 cv=BNCDalQG c=1 sm=1 tr=0 ts=6a78dffa cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=GTiPovFEgKA3HYAQ8hUA:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-ORIG-GUID: e25fBRkn5bCysQIOQfwODtt4z7bfnJf1 X-Proofpoint-GUID: e25fBRkn5bCysQIOQfwODtt4z7bfnJf1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-09_06,2026-08-07_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 clxscore=1015 impostorscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 bulkscore=0 spamscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608090183 qcom_iommu_init_domain() programs the context bank registers inline, with values computed on the spot, so no record of the programmed state is kept. The MSM8974 QSMMU instances about to be supported sit in MMSS GDSCs and lose the context bank state whenever the power domain collapses, which requires the driver to reprogram the banks at runtime resume. Stash the computed register values in struct qcom_iommu_ctx and move the programming sequence into a new qcom_iommu_program_ctx() helper that can later be replayed from the resume path. No functional change. Assisted-by: Claude:claude-fable-5 Signed-off-by: Dmitry Baryshkov --- drivers/iommu/arm/arm-smmu/qcom_iommu.c | 66 ++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 26 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c index 21d18ce67b98..5bbb51d9bd65 100644 --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c @@ -61,6 +61,11 @@ struct qcom_iommu_ctx { bool secured_ctx; u8 asid; /* asid and ctx bank # are 1:1 */ struct iommu_domain *domain; + /* programmed context bank state */ + u64 ttbr0; + u32 tcr[2]; + u32 mair[2]; + u32 sctlr; }; struct qcom_iommu_domain { @@ -213,6 +218,32 @@ static irqreturn_t qcom_iommu_fault(int irq, void *dev) return IRQ_HANDLED; } +static void qcom_iommu_program_ctx(struct qcom_iommu_dev *qcom_iommu, + struct qcom_iommu_ctx *ctx) +{ + /* Disable context bank before programming */ + iommu_writel(ctx, ARM_SMMU_CB_SCTLR, 0); + + /* Clear context bank fault address fault status registers */ + iommu_writel(ctx, ARM_SMMU_CB_FAR, 0); + iommu_writel(ctx, ARM_SMMU_CB_FSR, ARM_SMMU_CB_FSR_FAULT); + + /* TTBRs */ + iommu_writeq(ctx, ARM_SMMU_CB_TTBR0, ctx->ttbr0); + iommu_writeq(ctx, ARM_SMMU_CB_TTBR1, 0); + + /* TCR */ + iommu_writel(ctx, ARM_SMMU_CB_TCR2, ctx->tcr[1]); + iommu_writel(ctx, ARM_SMMU_CB_TCR, ctx->tcr[0]); + + /* MAIRs (stage-1 only) */ + iommu_writel(ctx, ARM_SMMU_CB_S1_MAIR0, ctx->mair[0]); + iommu_writel(ctx, ARM_SMMU_CB_S1_MAIR1, ctx->mair[1]); + + /* SCTLR */ + iommu_writel(ctx, ARM_SMMU_CB_SCTLR, ctx->sctlr); +} + static int qcom_iommu_init_domain(struct iommu_domain *domain, struct qcom_iommu_dev *qcom_iommu, struct device *dev) @@ -267,32 +298,13 @@ static int qcom_iommu_init_domain(struct iommu_domain *domain, continue; } - /* Disable context bank before programming */ - iommu_writel(ctx, ARM_SMMU_CB_SCTLR, 0); + ctx->ttbr0 = pgtbl_cfg.arm_lpae_s1_cfg.ttbr | + FIELD_PREP(ARM_SMMU_TTBRn_ASID, ctx->asid); + ctx->tcr[0] = arm_smmu_lpae_tcr(&pgtbl_cfg) | ARM_SMMU_TCR_EAE; + ctx->tcr[1] = arm_smmu_lpae_tcr2(&pgtbl_cfg); + ctx->mair[0] = pgtbl_cfg.arm_lpae_s1_cfg.mair; + ctx->mair[1] = pgtbl_cfg.arm_lpae_s1_cfg.mair >> 32; - /* Clear context bank fault address fault status registers */ - iommu_writel(ctx, ARM_SMMU_CB_FAR, 0); - iommu_writel(ctx, ARM_SMMU_CB_FSR, ARM_SMMU_CB_FSR_FAULT); - - /* TTBRs */ - iommu_writeq(ctx, ARM_SMMU_CB_TTBR0, - pgtbl_cfg.arm_lpae_s1_cfg.ttbr | - FIELD_PREP(ARM_SMMU_TTBRn_ASID, ctx->asid)); - iommu_writeq(ctx, ARM_SMMU_CB_TTBR1, 0); - - /* TCR */ - iommu_writel(ctx, ARM_SMMU_CB_TCR2, - arm_smmu_lpae_tcr2(&pgtbl_cfg)); - iommu_writel(ctx, ARM_SMMU_CB_TCR, - arm_smmu_lpae_tcr(&pgtbl_cfg) | ARM_SMMU_TCR_EAE); - - /* MAIRs (stage-1 only) */ - iommu_writel(ctx, ARM_SMMU_CB_S1_MAIR0, - pgtbl_cfg.arm_lpae_s1_cfg.mair); - iommu_writel(ctx, ARM_SMMU_CB_S1_MAIR1, - pgtbl_cfg.arm_lpae_s1_cfg.mair >> 32); - - /* SCTLR */ reg = ARM_SMMU_SCTLR_CFIE | ARM_SMMU_SCTLR_CFRE | ARM_SMMU_SCTLR_AFE | ARM_SMMU_SCTLR_TRE | ARM_SMMU_SCTLR_M | ARM_SMMU_SCTLR_S1_ASIDPNE | @@ -301,7 +313,9 @@ static int qcom_iommu_init_domain(struct iommu_domain *domain, if (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) reg |= ARM_SMMU_SCTLR_E; - iommu_writel(ctx, ARM_SMMU_CB_SCTLR, reg); + ctx->sctlr = reg; + + qcom_iommu_program_ctx(qcom_iommu, ctx); ctx->domain = domain; } -- 2.47.3