Received: by 2002:a05:7412:8521:b0:e2:908c:2ebd with SMTP id t33csp770233rdf; Fri, 3 Nov 2023 14:54:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFyT8bcbU1QDTzcT2JObIcQ4SlLl2pf8tQNRyth7B5SZUMpkgpRAmn08YPkfQtKjEAnPeEP X-Received: by 2002:a05:6870:10d1:b0:1dc:d8c6:39f with SMTP id 17-20020a05687010d100b001dcd8c6039fmr23399481oar.14.1699048454657; Fri, 03 Nov 2023 14:54:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699048454; cv=none; d=google.com; s=arc-20160816; b=Vo1pXcUZxMlOHIvVAgNNo8edn511MPjJ/7KCojW8AdfmMjDyABSK2z2ezKsEnE9sMZ xynq2Fk1N5iYn1krA+nilWe0+NI04C7LWy2ghrC5/ttkO45KO9o+2CSBEBJqebub4MlQ dB10KO83EvBKOgWjwTpmwI5R5zUVuFb1/V7UcCtcZ6Xl9nPpDcyH3/pSTjkEnifl9Q8g m2wGdmMzEpNAQxfMTCMw7RRodlLU7960IBhfDEVXqEq76BI16Pg/3M6u4YLoacAds1vg lIYEGM7zV2NZotKTN+N/oI/Rd9y4gyYteqcwsI/d3v8ripNNwJqVoqc/BfF/UyxkLAta DXqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=ZwSQsV0rJVY3FXPpR987A+Fln9pKhEeMDyb7+8jIUos=; fh=PVwdo4Ev8xM57n1taMK7yZeEsS7AUc4nv0WI2X2iHAg=; b=Cvac6Q7lEIlniE2DflAJevx+T/FOESPIwHQFj/eWTnhgxfdBcjFjxYkeJd6u1qGaGt 4LR/P6j+LUg+silawFLLLlblTrJ5cSSXr2QyQI3tc4PyRZkyr9PlxEC/0mvEw5LbUxbf yL4/agUI0dJouBE619+oP7TSta8fnjHiNj3LEHhtV3yp69ZiSl5z9LRsk2R/DgY4/X3q XVFxhAR4oh0gR/lvHAKLrldOagOgJeSLmk6dD4890WGblZz11fzBnySIqxINF7u6yulT qKIp0zL2NEXGkREkQA4uMkEjCS0pawtfaelLfpOJHl/DZJ7gn9duxoWvoIapWvoZwC9n v5hA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=fpnNGQNe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Return-Path: Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id t4-20020a63f344000000b00565dd108fd4si2187261pgj.115.2023.11.03.14.54.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 14:54:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=fpnNGQNe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id C5D72808EDEE; Fri, 3 Nov 2023 14:54:11 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231908AbjKCVx7 (ORCPT + 99 others); Fri, 3 Nov 2023 17:53:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230386AbjKCVxx (ORCPT ); Fri, 3 Nov 2023 17:53:53 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F223D5A for ; Fri, 3 Nov 2023 14:53:50 -0700 (PDT) Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3A3LSZ8r004521; Fri, 3 Nov 2023 21:53:38 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=ZwSQsV0rJVY3FXPpR987A+Fln9pKhEeMDyb7+8jIUos=; b=fpnNGQNeZyT6A9GFJSFPMEdzA5rkjMfvdfJQ1KzHnlXpqwMVL3NkGZ8oojMehfF7FTka PPdZ9C9esgaXWkVsz5Iur7WV38536OWoplwCBheW1/KnK6HrPybRML1n1dbP+SsafVpd tSNK+dK+cwE12vGxbHRKw563tvE0oHIPvtwNnnoD/u46UfK6vdF/YPCGSnQ/Wv8wqu9/ 0t8moXK/az1+2u7daVSPN6/6K/+vdTCpUGUzW2X/0vbgTgmp0LpvpGBZEw0idXeV9zLk bGKHH63ujWTW0Rdhp0W/vmg2qpNu39EfWzLmSehTI+q4rOFWVcNSo86nkr5VgcOaZfUa RQ== Received: from nasanppmta05.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3u4reva62v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 03 Nov 2023 21:53:37 +0000 Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 3A3Lra5h003856 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 3 Nov 2023 21:53:36 GMT Received: from hyd-lablnx450.qualcomm.com (10.80.80.8) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Fri, 3 Nov 2023 14:53:31 -0700 From: Bibek Kumar Patro To: , , , , , , , , CC: , , , , "Bibek Kumar Patro" Subject: [PATCH 2/3] iommu/arm-smmu: add ACTLR data and support for SM8550 Date: Sat, 4 Nov 2023 03:21:23 +0530 Message-ID: <20231103215124.1095-3-quic_bibekkum@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231103215124.1095-1-quic_bibekkum@quicinc.com> References: <20231103215124.1095-1-quic_bibekkum@quicinc.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: M2pdkuPqEFYEHa-TVOAKW_7vv2q7NHzx X-Proofpoint-ORIG-GUID: M2pdkuPqEFYEHa-TVOAKW_7vv2q7NHzx X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-03_20,2023-11-02_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 impostorscore=0 suspectscore=0 priorityscore=1501 malwarescore=0 mlxlogscore=999 spamscore=0 bulkscore=0 lowpriorityscore=0 clxscore=1015 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310240000 definitions=main-2311030185 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Fri, 03 Nov 2023 14:54:11 -0700 (PDT) Add ACTLR data table for SM8550 along with support for same including SM8550 specific implementation operations. Signed-off-by: Bibek Kumar Patro --- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 85 +++++++++++++++++++++- 1 file changed, 81 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c index 68c1f4908473..590b7c285299 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c @@ -25,6 +25,64 @@ struct actlr_data { u32 actlr; }; +static const struct actlr_data sm8550_apps_actlr_data[] = { + { 0x18a0, 0x0000, 0x00000103 }, + { 0x18e0, 0x0000, 0x00000103 }, + { 0x0800, 0x0020, 0x00000001 }, + { 0x1800, 0x00c0, 0x00000001 }, + { 0x1820, 0x0000, 0x00000001 }, + { 0x1860, 0x0000, 0x00000001 }, + { 0x0c01, 0x0020, 0x00000303 }, + { 0x0c02, 0x0020, 0x00000303 }, + { 0x0c03, 0x0020, 0x00000303 }, + { 0x0c04, 0x0020, 0x00000303 }, + { 0x0c05, 0x0020, 0x00000303 }, + { 0x0c06, 0x0020, 0x00000303 }, + { 0x0c07, 0x0020, 0x00000303 }, + { 0x0c08, 0x0020, 0x00000303 }, + { 0x0c09, 0x0020, 0x00000303 }, + { 0x0c0c, 0x0020, 0x00000303 }, + { 0x0c0d, 0x0020, 0x00000303 }, + { 0x0c0e, 0x0020, 0x00000303 }, + { 0x0c0f, 0x0020, 0x00000303 }, + { 0x1961, 0x0000, 0x00000303 }, + { 0x1962, 0x0000, 0x00000303 }, + { 0x1963, 0x0000, 0x00000303 }, + { 0x1964, 0x0000, 0x00000303 }, + { 0x1965, 0x0000, 0x00000303 }, + { 0x1966, 0x0000, 0x00000303 }, + { 0x1967, 0x0000, 0x00000303 }, + { 0x1968, 0x0000, 0x00000303 }, + { 0x1969, 0x0000, 0x00000303 }, + { 0x196c, 0x0000, 0x00000303 }, + { 0x196d, 0x0000, 0x00000303 }, + { 0x196e, 0x0000, 0x00000303 }, + { 0x196f, 0x0000, 0x00000303 }, + { 0x19c1, 0x0010, 0x00000303 }, + { 0x19c2, 0x0010, 0x00000303 }, + { 0x19c3, 0x0010, 0x00000303 }, + { 0x19c4, 0x0010, 0x00000303 }, + { 0x19c5, 0x0010, 0x00000303 }, + { 0x19c6, 0x0010, 0x00000303 }, + { 0x19c7, 0x0010, 0x00000303 }, + { 0x19c8, 0x0010, 0x00000303 }, + { 0x19c9, 0x0010, 0x00000303 }, + { 0x19cc, 0x0010, 0x00000303 }, + { 0x19cd, 0x0010, 0x00000303 }, + { 0x19ce, 0x0010, 0x00000303 }, + { 0x19cf, 0x0010, 0x00000303 }, + { 0x1c00, 0x0002, 0x00000103 }, + { 0x1c01, 0x0000, 0x00000001 }, + { 0x1920, 0x0000, 0x00000103 }, + { 0x1923, 0x0000, 0x00000103 }, + { 0x1924, 0x0000, 0x00000103 }, + { 0x1940, 0x0000, 0x00000103 }, + { 0x1941, 0x0004, 0x00000103 }, + { 0x1943, 0x0000, 0x00000103 }, + { 0x1944, 0x0000, 0x00000103 }, + { 0x1947, 0x0000, 0x00000103 }, +}; + static struct qcom_smmu *to_qcom_smmu(struct arm_smmu_device *smmu) { return container_of(smmu, struct qcom_smmu, smmu); @@ -444,6 +502,16 @@ static const struct arm_smmu_impl sdm845_smmu_500_impl = { .tlb_sync = qcom_smmu_tlb_sync, }; + +static const struct arm_smmu_impl sm8550_smmu_500_impl = { + .init_context = qcom_smmu_init_context, + .cfg_probe = qcom_smmu_cfg_probe, + .def_domain_type = qcom_smmu_def_domain_type, + .reset = arm_mmu500_reset, + .write_s2cr = qcom_smmu_write_s2cr, + .tlb_sync = qcom_smmu_tlb_sync, +}; + static const struct arm_smmu_impl qcom_adreno_smmu_v2_impl = { .init_context = qcom_adreno_smmu_init_context, .def_domain_type = qcom_smmu_def_domain_type, @@ -507,6 +575,11 @@ static const struct qcom_smmu_config qcom_smmu_impl0_cfg = { .reg_offset = qcom_smmu_impl0_reg_offset, }; +static const struct actlr_config sm8550_actlrcfg = { + .adata = sm8550_apps_actlr_data, + .size = ARRAY_SIZE(sm8550_apps_actlr_data), +}; + /* * It is not yet possible to use MDP SMMU with the bypass quirk on the msm8996, * there are not enough context banks. @@ -530,16 +603,20 @@ static const struct qcom_smmu_match_data sdm845_smmu_500_data = { /* Also no debug configuration. */ }; + +static const struct qcom_smmu_match_data sm8550_smmu_500_impl0_data = { + .impl = &sm8550_smmu_500_impl, + .adreno_impl = &qcom_adreno_smmu_500_impl, + .cfg = &qcom_smmu_impl0_cfg, + .actlrcfg = &sm8550_actlrcfg, +}; + static const struct qcom_smmu_match_data qcom_smmu_500_impl0_data = { .impl = &qcom_smmu_500_impl, .adreno_impl = &qcom_adreno_smmu_500_impl, .cfg = &qcom_smmu_impl0_cfg, }; -/* - * Do not add any more qcom,SOC-smmu-500 entries to this list, unless they need - * special handling and can not be covered by the qcom,smmu-500 entry. - */ static const struct of_device_id __maybe_unused qcom_smmu_impl_of_match[] = { { .compatible = "qcom,msm8996-smmu-v2", .data = &msm8996_smmu_data }, { .compatible = "qcom,msm8998-smmu-v2", .data = &qcom_smmu_v2_data }, -- 2.17.1