Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp6571752rdb; Fri, 15 Dec 2023 02:20:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IEjcdV452CkxVAAxGcPUTL7Gl6HaaiYWol9ej2WFA/RbUWnV6cPpWUenMzwfqZvWuEJH4qH X-Received: by 2002:a9d:6512:0:b0:6d3:3dcf:bb92 with SMTP id i18-20020a9d6512000000b006d33dcfbb92mr10686598otl.37.1702635625645; Fri, 15 Dec 2023 02:20:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702635625; cv=none; d=google.com; s=arc-20160816; b=hZtKmy2DoA6bGTAWro6nXUa/guGR5BAlSZudRMWowaUmnPr3PLt/+ttZHOlAgTkm9S AGgCvshtUqqjJwUH2Pn3GQo64r5bXjaBxiAEUZAgc+CRnuK1yFyzgUZFtEcOzt1dtXIb 4ezaV48qJ9dgkCZF7XYUWNGpMzYOb8tu7Vi2uOtvw5ZwtxdRFWirpgWUO3X5UfGsiXqH nH8v7/Yjq5CMxJpmlz/5VY4TC8+kM0ovHqJd9mMfRczxByMAzMBcT7ePLfIeNYI2woDu TRyh+et3sPi9BNcK7nOWAWfNzweiXnIkGroXFmmr94WYO60blCK2EYZNrL0k/qc4UkHn olKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lXJ5V3mfT+EvsOn6UxmTLIMPjEfkLdtS7BpbCTx0/lo=; fh=mFC8nmckJLq19l2a2JACcOVBANdLlvDzOiUZ3OvRdps=; b=lfHH3HekLpUdSJxPnEaSka5Fa9FJVKuw7etpqYbuyhysFPMvY6AYVOMncAS37jxSk3 d00wLzCNFKrFSaOwerR10wFPabcrgKtZMTr1BJTjG2NpN9VvlvN9+ZM16NpihpfyMaQc qG8Ou9Bv6zMr23H8jR1X0kyArtM8gl7YnjFl72RztpqXQky+13z6+QTPvkz3y1Cr21iD Hgnwfbgp5Q0AewyfzZpwJDJpvxpZaLrnqH+jmqwevOjtchqpwAilPxMRTTw7CGM7/MMu mf2Dq2jA/c3l4DtG8YtSPwwa5J7kpZxYaY9chFqZ5s0qx7gis2N8jdyN4g/GIL5zLMiq xYDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=g1tDhe4T; spf=pass (google.com: domain of linux-kernel+bounces-736-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-736-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id e6-20020a654786000000b005c1b2f397cfsi12795146pgs.525.2023.12.15.02.20.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 02:20:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-736-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=g1tDhe4T; spf=pass (google.com: domain of linux-kernel+bounces-736-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-736-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 44FDE2850E8 for ; Fri, 15 Dec 2023 10:20:25 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7331424B2F; Fri, 15 Dec 2023 10:19:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="g1tDhe4T" X-Original-To: linux-kernel@vger.kernel.org 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 5E5B219BDD; Fri, 15 Dec 2023 10:19:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 3BF6Hn6u015999; Fri, 15 Dec 2023 10:19:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type; s=qcppdkim1; bh=lXJ5V3mfT+EvsOn6UxmT LIMPjEfkLdtS7BpbCTx0/lo=; b=g1tDhe4TkFqUT0NtMNnbFCemGWNPvFv2WiRu BAbAc1ZBlDjnIQnxXzLJynQwPZUllANRpWaEj9JD3IylxVHYLNlIOAs/dqlHxseo mzg1Jy2Q18XlgKSUo7w2dIpA2PuAP5/Toj9rMyqKfgvq/Nhq2K45BfWOFM5mzaSU LVAL3wdEr9JR0GGOcQgpsi2uCfCNNy7L3isWvRSTlOmIRoj3Kj7YuUwX10hkDKC/ vZAnjda4v+hyQNGrSQjMh5m2LE26V3c9qa9ENPby4AVSS+gpiLZKviSj3x+mByqc PMT7WDZbxhwlmhtbXddKlfjLoh8WqmtFgpCRRvAr4Iqb4SIy3w== Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3v0hdf8q2e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 15 Dec 2023 10:19:06 +0000 (GMT) Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 3BFAJ6wI002418 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 15 Dec 2023 10:19:06 GMT Received: from hu-bibekkum-hyd.qualcomm.com (10.80.80.8) by nalasex01c.na.qualcomm.com (10.47.97.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Fri, 15 Dec 2023 02:18:59 -0800 From: Bibek Kumar Patro To: , , , , , , , , , , , , , , CC: , , , , , Bibek Kumar Patro Subject: [PATCH v4 2/5] iommu/arm-smmu: introduction of ACTLR for custom prefetcher settings Date: Fri, 15 Dec 2023 15:48:24 +0530 Message-ID: <20231215101827.30549-3-quic_bibekkum@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231215101827.30549-1-quic_bibekkum@quicinc.com> References: <20231215101827.30549-1-quic_bibekkum@quicinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01c.na.qualcomm.com (10.47.97.35) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: 6hYEdPdyp4DHEGYHoONN6I3DxF4FKvra X-Proofpoint-GUID: 6hYEdPdyp4DHEGYHoONN6I3DxF4FKvra X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-09_01,2023-12-07_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 mlxlogscore=999 impostorscore=0 spamscore=0 lowpriorityscore=0 adultscore=0 clxscore=1015 priorityscore=1501 mlxscore=0 phishscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311290000 definitions=main-2312150069 Currently in Qualcomm SoCs the default prefetch is set to 1 which allows the TLB to fetch just the next page table. MMU-500 features ACTLR register which is implementation defined and is used for Qualcomm SoCs to have a custom prefetch setting enabling TLB to prefetch the next set of page tables accordingly allowing for faster translations. ACTLR value is unique for each SMR (Stream matching register) and stored in a pre-populated table. This value is set to the register during context bank initialisation. Signed-off-by: Bibek Kumar Patro --- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 45 ++++++++++++++++++++++ drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h | 4 ++ drivers/iommu/arm/arm-smmu/arm-smmu.c | 5 ++- drivers/iommu/arm/arm-smmu/arm-smmu.h | 5 +++ 4 files changed, 57 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c index 8a7c16a86694..cb49291f5233 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c @@ -14,6 +14,12 @@ #define QCOM_DUMMY_VAL -1 +struct actlr_config { + u16 sid; + u16 mask; + u32 actlr; +}; + static struct qcom_smmu *to_qcom_smmu(struct arm_smmu_device *smmu) { return container_of(smmu, struct qcom_smmu, smmu); @@ -205,9 +211,38 @@ static bool qcom_adreno_can_do_ttbr1(struct arm_smmu_device *smmu) return true; } +static void qcom_smmu_set_actlr(struct device *dev, struct arm_smmu_device *smmu, int cbndx, + const struct actlr_config *actlrcfg) +{ + struct arm_smmu_master_cfg *cfg = dev_iommu_priv_get(dev); + struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); + struct arm_smmu_smr *smr; + u16 mask; + int idx; + u16 id; + int i; + + for (; actlrcfg->sid || actlrcfg->mask || actlrcfg->actlr; actlrcfg++) { + id = actlrcfg->sid; + mask = actlrcfg->mask; + + for_each_cfg_sme(cfg, fwspec, i, idx) { + smr = &smmu->smrs[idx]; + if (smr_is_subset(smr, id, mask)) { + arm_smmu_cb_write(smmu, cbndx, ARM_SMMU_CB_ACTLR, + actlrcfg->actlr); + break; + } + } + } +} + static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain, struct io_pgtable_cfg *pgtbl_cfg, struct device *dev) { + struct arm_smmu_device *smmu = smmu_domain->smmu; + struct qcom_smmu *qsmmu = to_qcom_smmu(smmu); + int cbndx = smmu_domain->cfg.cbndx; struct adreno_smmu_priv *priv; smmu_domain->cfg.flush_walk_prefer_tlbiasid = true; @@ -238,6 +273,9 @@ static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain, priv->set_stall = qcom_adreno_smmu_set_stall; priv->resume_translation = qcom_adreno_smmu_resume_translation; + if (qsmmu->data->actlrcfg_gfx) + qcom_smmu_set_actlr(dev, smmu, cbndx, qsmmu->data->actlrcfg_gfx); + return 0; } @@ -264,6 +302,13 @@ static const struct of_device_id qcom_smmu_client_of_match[] __maybe_unused = { static int qcom_smmu_init_context(struct arm_smmu_domain *smmu_domain, struct io_pgtable_cfg *pgtbl_cfg, struct device *dev) { + struct arm_smmu_device *smmu = smmu_domain->smmu; + struct qcom_smmu *qsmmu = to_qcom_smmu(smmu); + int cbndx = smmu_domain->cfg.cbndx; + + if (qsmmu->data->actlrcfg) + qcom_smmu_set_actlr(dev, smmu, cbndx, qsmmu->data->actlrcfg); + smmu_domain->cfg.flush_walk_prefer_tlbiasid = true; return 0; diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h index f3b91963e234..448a66b5332f 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h @@ -24,7 +24,11 @@ struct qcom_smmu_config { const u32 *reg_offset; }; +struct actlr_config; + struct qcom_smmu_match_data { + const struct actlr_config *actlrcfg; + const struct actlr_config *actlrcfg_gfx; const struct qcom_smmu_config *cfg; const struct arm_smmu_impl *impl; const struct arm_smmu_impl *adreno_impl; diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c index d6d1a2a55cc0..0c7f700b27dd 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c @@ -990,9 +990,10 @@ static int arm_smmu_find_sme(struct arm_smmu_device *smmu, u16 id, u16 mask) * expect simply identical entries for this case, but there's * no harm in accommodating the generalisation. */ - if ((mask & smrs[i].mask) == mask && - !((id ^ smrs[i].id) & ~smrs[i].mask)) + + if (smr_is_subset(&smrs[i], id, mask)) return i; + /* * If the new entry has any other overlap with an existing one, * though, then there always exists at least one stream ID diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.h b/drivers/iommu/arm/arm-smmu/arm-smmu.h index 703fd5817ec1..2e4f65412c6b 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.h +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.h @@ -501,6 +501,11 @@ static inline void arm_smmu_writeq(struct arm_smmu_device *smmu, int page, writeq_relaxed(val, arm_smmu_page(smmu, page) + offset); } +static inline bool smr_is_subset(struct arm_smmu_smr *smrs, u16 id, u16 mask) +{ + return (mask & smrs->mask) == mask && !((id ^ smrs->id) & ~smrs->mask); +} + #define ARM_SMMU_GR0 0 #define ARM_SMMU_GR1 1 #define ARM_SMMU_CB(s, n) ((s)->numpage + (n)) -- 2.17.1