Received: by 2002:a05:7412:b101:b0:e2:908c:2ebd with SMTP id az1csp2505691rdb; Wed, 15 Nov 2023 02:45:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IEZonezwB+MfH7lTgd1UvghYN4ObAPzrpkpK3w8RucXSAvYMsmvW0leMAPrBkbse077yoiP X-Received: by 2002:a05:6a21:7883:b0:187:1cb7:337f with SMTP id bf3-20020a056a21788300b001871cb7337fmr5232979pzc.15.1700045147511; Wed, 15 Nov 2023 02:45:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700045147; cv=none; d=google.com; s=arc-20160816; b=gwMZ7XgWd+g7WV6DXDvCfpgtr3NHjJJ225ATJfHgLUs2fvGoQR0PiULEhlEn5gJ9nH 3q5OqHWjZtQrLC37Qew+eTDhJ31m0x2/w8K0YGIrhi564jTK44GX0eQ9nHPUCEJrjshr ZmPQc4b6Ky4qf6/rZatenWtsGf+WMv3MzUG+Vg7QsWMA0k+P6tL5RPdjj72H2NivbdDS yH+exrxU7gvz6U/tjnIveO38iPJusmpH/lB17S6tt8/bZDFNEHi/B1Cm0VOZ1wNSacS0 E4Q4xyu4DJKMLKjpR6ATiQcr2tjxmfjk4sphi06wqwpQt+csiKAIzzpLXhBlXlm77zj/ Ha2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=4tMjpHymknIjwE2hE7SnQFQ2kYl/Ww1x/FcP4n9OE/g=; fh=TZiEND9oy13nw8GkO1NM91EM1mr4eT9e+EFpfAkiP64=; b=ss0DkIjT7i0C1qi/A0sxORWiG9PhPxZ8pVNQ/Q02Vh9SgT3G1O8GllhJo4u/qS5vve 5QLXB98/rkrTWCqQ1LIY0eREAJ7Bxa0hehxkEwTeYA4S1gDFpvSjfh67gP7VUbRz4Dyb eWyKV1Q4BL/W83QaOWq4Tgij6wUGRl2jTixOmVJ0ObXqtmUx1CqJAnKqszkhjVP4zIL5 zJ+8+NNXZ10gTVmo+Ut+seY4QOzM+SE1mitccMjOZ6hyjcNk8lZCAa3oLydENhPYZuVF n9D97SgCXTGI/eG+2E246aUmlnkAGChNAz7l9+7sRsESkcagvpVy+Z6cPeBC+/Co0twh QgaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="BNY3DK/r"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id o38-20020a635d66000000b005b958401e4fsi10172003pgm.418.2023.11.15.02.45.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 02:45:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="BNY3DK/r"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 81F8480958B0; Wed, 15 Nov 2023 02:45:44 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234868AbjKOKpb (ORCPT + 99 others); Wed, 15 Nov 2023 05:45:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234098AbjKOKpa (ORCPT ); Wed, 15 Nov 2023 05:45:30 -0500 Received: from mail-yb1-xb31.google.com (mail-yb1-xb31.google.com [IPv6:2607:f8b0:4864:20::b31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AAA210F for ; Wed, 15 Nov 2023 02:45:26 -0800 (PST) Received: by mail-yb1-xb31.google.com with SMTP id 3f1490d57ef6-da30fd994fdso588853276.1 for ; Wed, 15 Nov 2023 02:45:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700045125; x=1700649925; darn=vger.kernel.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=4tMjpHymknIjwE2hE7SnQFQ2kYl/Ww1x/FcP4n9OE/g=; b=BNY3DK/rSRwHiRK6UI/8V9/EFaUniK45Pj9fscmJZFb0yJt31pbeO/aVdlaPgjvfFL rX7GJDDO1JgDkSYneTVlVJNhALv1/KkKHNZSoQ9lxhibmFV7hSm7Uaq5pwTgIbtqP34k 323mPQvw42uB/BD/ICg7wQ7RbzXV3fTHNwECi6NJfHNCwUVkUFJkvCPYHnjI74wa56zE V8kfqK7z+PD575ildRmMXx+rjV8NnK+gLmHsJ22kMapKJNuMMaXV2G4h07wacJwWG1Cs Bg06gr6zXN7dI00JjNgYp1oJwQoieDMhu6jxBKgaj/bzFMkN43VYjtWY/10ig1BnBtLM PchQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700045125; x=1700649925; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4tMjpHymknIjwE2hE7SnQFQ2kYl/Ww1x/FcP4n9OE/g=; b=YXrKaSgrn2+/gSQWAOkJgfCyXuwz8sevkqHDca8Ncj6fKh83QjXZgpEMIHa81ZoeBv wzrEqkVY7Y7kIzde0ESEnjxs/iBPgHxIfvC77uTN0W19sAXg2fjA+y9XIkkwULCQe2UH 08C6JxPmzxsZptwhgufiw1SFR3ZDOMHyyqcTF8PNLAM/2gxHYhCNwHUFRCWuUVKeonpW wBWge5G+mCAcMlVEhAfGEWt9HCgWzwjKBPxXcKMckAWYwkf3DpUdOyYpJ/lVr4sc1O4l /xrpMzJU2QVgb9Ujve/9U8hHGS9Rfgmv4RFK6TWXbkemRWQPCBMP1WCgedv/47kXLGJ+ We1Q== X-Gm-Message-State: AOJu0Yx58T1N+GFZbIzuX3pTHylldsTBQJFj0f8wU62HZKIR7bW5N6dG zhk80r7DtJQ3xxNMAwcqp79UZXRPTQ59vZgU7jbRDQ== X-Received: by 2002:a25:c04f:0:b0:da3:6fa0:1afe with SMTP id c76-20020a25c04f000000b00da36fa01afemr3868592ybf.21.1700045125514; Wed, 15 Nov 2023 02:45:25 -0800 (PST) MIME-Version: 1.0 References: <20231114135654.30475-1-quic_bibekkum@quicinc.com> <20231114135654.30475-3-quic_bibekkum@quicinc.com> <7edad996-f148-42d5-8e72-0334d3b9101f@quicinc.com> In-Reply-To: From: Dmitry Baryshkov Date: Wed, 15 Nov 2023 12:45:14 +0200 Message-ID: Subject: Re: [PATCH v2 2/3] iommu/arm-smmu: add ACTLR data and support for SM8550 To: Bibek Kumar Patro Cc: will@kernel.org, robin.murphy@arm.com, joro@8bytes.org, a39.skl@gmail.com, konrad.dybcio@linaro.org, quic_pkondeti@quicinc.com, quic_molvera@quicinc.com, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, qipl.kernel.upstream@quicinc.com Content-Type: text/plain; charset="UTF-8" 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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Wed, 15 Nov 2023 02:45:44 -0800 (PST) On Wed, 15 Nov 2023 at 11:51, Bibek Kumar Patro wrote: > > > > On 11/15/2023 3:08 PM, Dmitry Baryshkov wrote: > > On Wed, 15 Nov 2023 at 11:22, Bibek Kumar Patro > > wrote: > >> > >> > >> > >> On 11/14/2023 7:42 PM, Dmitry Baryshkov wrote: > >>> On Tue, 14 Nov 2023 at 15:57, Bibek Kumar Patro > >>> wrote: > >>>> > >>>> 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 | 92 +++++++++++++++++++++- > >>>> 1 file changed, 88 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 578c662c7c30..0eaf6f2a2e49 100644 > >>>> --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c > >>>> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c > >>>> @@ -25,6 +25,70 @@ struct actlr_data { > >>>> u32 actlr; > >>>> }; > >>>> > >>>> +#define PRE_FETCH_1 0 > >>>> +#define PRE_FETCH_2 BIT(8) > >>>> +#define PRE_FETCH_3 (BIT(9) | BIT(8)) > >>> > >>> What is the difference between PRE_FETCH_3 and PRE_FETCH_2? And > >>> PRE_FETCH_1? Are these real numbers that refer to some amount / count > >>> or just dummy names? > >>> > >> > >> No,these are not real numbers, but prefetch settings for a particular > >> perfect configuration. > > > > Then I'd ask for some better names or descriptions. > > > > Noted, PREFETCH_SETTING_n / PREFETCH_OPTION_n sounds like a better name > in the following case. Would it be okay to use this name instead? Not really. > > >> > >>>> +#define CPRE BIT(1) /* Enable context caching in the prefetch buffer */ > >>>> +#define CMTLB BIT(0) /* Enable context caching in the macro TLB */ > >>>> + > >>>> +static const struct actlr_data sm8550_apps_actlr_data[] = { > >>>> + { 0x18a0, 0x0000, PRE_FETCH_2 | CPRE | CMTLB }, > >>>> + { 0x18e0, 0x0000, PRE_FETCH_2 | CPRE | CMTLB }, > >>>> + { 0x0800, 0x0020, PRE_FETCH_1 | CMTLB }, > >>>> + { 0x1800, 0x00c0, PRE_FETCH_1 | CMTLB }, > >>>> + { 0x1820, 0x0000, PRE_FETCH_1 | CMTLB }, > >>>> + { 0x1860, 0x0000, PRE_FETCH_1 | CMTLB }, > >>>> + { 0x0c01, 0x0020, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x0c02, 0x0020, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x0c03, 0x0020, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x0c04, 0x0020, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x0c05, 0x0020, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x0c06, 0x0020, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x0c07, 0x0020, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x0c08, 0x0020, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x0c09, 0x0020, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x0c0c, 0x0020, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x0c0d, 0x0020, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x0c0e, 0x0020, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x0c0f, 0x0020, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x1961, 0x0000, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x1962, 0x0000, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x1963, 0x0000, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x1964, 0x0000, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x1965, 0x0000, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x1966, 0x0000, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x1967, 0x0000, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x1968, 0x0000, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x1969, 0x0000, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x196c, 0x0000, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x196d, 0x0000, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x196e, 0x0000, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x196f, 0x0000, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x19c1, 0x0010, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x19c2, 0x0010, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x19c3, 0x0010, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x19c4, 0x0010, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x19c5, 0x0010, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x19c6, 0x0010, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x19c7, 0x0010, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x19c8, 0x0010, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x19c9, 0x0010, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x19cc, 0x0010, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x19cd, 0x0010, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x19ce, 0x0010, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x19cf, 0x0010, PRE_FETCH_3 | CPRE | CMTLB }, > >>>> + { 0x1c00, 0x0002, PRE_FETCH_2 | CPRE | CMTLB }, > >>>> + { 0x1c01, 0x0000, PRE_FETCH_1 | CMTLB }, > >>>> + { 0x1920, 0x0000, PRE_FETCH_2 | CPRE | CMTLB }, > >>>> + { 0x1923, 0x0000, PRE_FETCH_2 | CPRE | CMTLB }, > >>>> + { 0x1924, 0x0000, PRE_FETCH_2 | CPRE | CMTLB }, > >>>> + { 0x1940, 0x0000, PRE_FETCH_2 | CPRE | CMTLB }, > >>>> + { 0x1941, 0x0004, PRE_FETCH_2 | CPRE | CMTLB }, > >>>> + { 0x1943, 0x0000, PRE_FETCH_2 | CPRE | CMTLB }, > >>>> + { 0x1944, 0x0000, PRE_FETCH_2 | CPRE | CMTLB }, > >>>> + { 0x1947, 0x0000, PRE_FETCH_2 | CPRE | CMTLB }, > >>>> +}; > >>>> + > >>>> static struct qcom_smmu *to_qcom_smmu(struct arm_smmu_device *smmu) > >>>> { > >>>> return container_of(smmu, struct qcom_smmu, smmu); > >>>> @@ -459,6 +523,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, > >>> > >>> What is the difference between this one and qcom_smmu_500_impl ? > >>> > >> > >> Noted, will remove this and use qcom_smmu_500_impl instead. > >> Thanks for pointing this out. > >> Since inititally the reset ops was different to reset CPRE bit only for > >> sm8550 SoC hence sm8550_smmu_500_impl is defined, but now default reset > >> ops is modified to set CPRE bit for all SoCs ([PATCH v2 3/3]) so it > >> should be fine to use qcom_smmu_500_impl as there's no difference now. > >> > >>>> +}; > >>>> + > >>>> 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, > >>>> @@ -522,6 +596,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. > >>>> @@ -545,16 +624,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. > >>>> - */ > >>> > >>> NAK, leave this in place. > >>> > >> > >> Ack, will address this in next version. > >> > >>>> 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 }, > >>>> @@ -579,6 +662,7 @@ static const struct of_device_id __maybe_unused qcom_smmu_impl_of_match[] = { > >>>> { .compatible = "qcom,sm8250-smmu-500", .data = &qcom_smmu_500_impl0_data }, > >>>> { .compatible = "qcom,sm8350-smmu-500", .data = &qcom_smmu_500_impl0_data }, > >>>> { .compatible = "qcom,sm8450-smmu-500", .data = &qcom_smmu_500_impl0_data }, > >>>> + { .compatible = "qcom,sm8550-smmu-500", .data = &sm8550_smmu_500_impl0_data }, > >>>> { .compatible = "qcom,smmu-500", .data = &qcom_smmu_500_impl0_data }, > >>>> { } > >>>> }; > >>>> -- > >>>> 2.17.1 > >>>> > >>> > >>> > > > > > > -- With best wishes Dmitry