Re: [PATCH v4 3/5] iommu/arm-smmu: add ACTLR data and support for SM8550

Bibek Kumar Patro <quic_bibekkum@xxxxxxxxxxx> · Fri, 15 Dec 2023 17:50:52 +0530

On 12/15/2023 4:14 PM, Dmitry Baryshkov wrote:
On Fri, 15 Dec 2023 at 12:19, Bibek Kumar Patro
<quic_bibekkum@xxxxxxxxxxx> wrote:

Add ACTLR data table for SM8550 along with support for
same including SM8550 specific implementation operations.

Signed-off-by: Bibek Kumar Patro <quic_bibekkum@xxxxxxxxxxx>
---
  drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 89 ++++++++++++++++++++++
  1 file changed, 89 insertions(+)

diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
index cb49291f5233..d2006f610243 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
@@ -20,6 +20,85 @@ struct actlr_config {
         u32 actlr;
  };

+/*
+ * SMMU-500 TRM defines BIT(0) as CMTLB (Enable context caching in the
+ * macro TLB) and BIT(1) as CPRE (Enable context caching in the prefetch
+ * buffer). The remaining bits are implementation defined and vary across
+ * SoCs.
+ */
+
+#define PREFETCH_DEFAULT       0
+#define PREFETCH_SHALLOW       BIT(8)
+#define PREFETCH_MODERATE      BIT(9)
+#define PREFETCH_DEEP          (BIT(9) | BIT(8))

I thin the following might be more correct:

#include <linux/bitfield.h>

#define PREFETCH_MASK GENMASK(9, 8)
#define PREFETCH_DEFAULT FIELD_PREP(PREFETCH_MASK, 0)
#define PREFETCH_SHALLOW FIELD_PREP(PREFETCH_MASK, 1)
#define PREFETCH_MODERATE FIELD_PREP(PREFETCH_MASK, 2)
#define PREFETCH_DEEP FIELD_PREP(PREFETCH_MASK, 3)


Ack, thanks for this suggestion. Let me try this out using
GENMASK. Once tested, will take care of this in next version.

Thanks,
Bibek

+#define PREFETCH_SWITCH_GFX    (BIT(5) | BIT(3))
+#define CPRE                   BIT(1)
+#define CMTLB                  BIT(0)
+
+static const struct actlr_config sm8550_apps_actlr_cfg[] = {
+       { 0x18a0, 0x0000, PREFETCH_SHALLOW | CPRE | CMTLB },
+       { 0x18e0, 0x0000, PREFETCH_SHALLOW | CPRE | CMTLB },
+       { 0x0800, 0x0020, PREFETCH_DEFAULT | CMTLB },
+       { 0x1800, 0x00c0, PREFETCH_DEFAULT | CMTLB },
+       { 0x1820, 0x0000, PREFETCH_DEFAULT | CMTLB },
+       { 0x1860, 0x0000, PREFETCH_DEFAULT | CMTLB },
+       { 0x0c01, 0x0020, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x0c02, 0x0020, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x0c03, 0x0020, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x0c04, 0x0020, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x0c05, 0x0020, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x0c06, 0x0020, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x0c07, 0x0020, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x0c08, 0x0020, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x0c09, 0x0020, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x0c0c, 0x0020, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x0c0d, 0x0020, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x0c0e, 0x0020, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x0c0f, 0x0020, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x1961, 0x0000, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x1962, 0x0000, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x1963, 0x0000, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x1964, 0x0000, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x1965, 0x0000, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x1966, 0x0000, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x1967, 0x0000, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x1968, 0x0000, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x1969, 0x0000, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x196c, 0x0000, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x196d, 0x0000, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x196e, 0x0000, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x196f, 0x0000, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x19c1, 0x0010, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x19c2, 0x0010, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x19c3, 0x0010, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x19c4, 0x0010, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x19c5, 0x0010, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x19c6, 0x0010, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x19c7, 0x0010, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x19c8, 0x0010, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x19c9, 0x0010, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x19cc, 0x0010, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x19cd, 0x0010, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x19ce, 0x0010, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x19cf, 0x0010, PREFETCH_DEEP | CPRE | CMTLB },
+       { 0x1c00, 0x0002, PREFETCH_SHALLOW | CPRE | CMTLB },
+       { 0x1c01, 0x0000, PREFETCH_DEFAULT | CMTLB },
+       { 0x1920, 0x0000, PREFETCH_SHALLOW | CPRE | CMTLB },
+       { 0x1923, 0x0000, PREFETCH_SHALLOW | CPRE | CMTLB },
+       { 0x1924, 0x0000, PREFETCH_SHALLOW | CPRE | CMTLB },
+       { 0x1940, 0x0000, PREFETCH_SHALLOW | CPRE | CMTLB },
+       { 0x1941, 0x0004, PREFETCH_SHALLOW | CPRE | CMTLB },
+       { 0x1943, 0x0000, PREFETCH_SHALLOW | CPRE | CMTLB },
+       { 0x1944, 0x0000, PREFETCH_SHALLOW | CPRE | CMTLB },
+       { 0x1947, 0x0000, PREFETCH_SHALLOW | CPRE | CMTLB },
+       {},
+};
+
+static const struct actlr_config sm8550_gfx_actlr_cfg[] = {
+       { 0x0000, 0x03ff, PREFETCH_SWITCH_GFX | PREFETCH_DEEP | CPRE | CMTLB },
+       {},
+};
+
  static struct qcom_smmu *to_qcom_smmu(struct arm_smmu_device *smmu)
  {
         return container_of(smmu, struct qcom_smmu, smmu);
@@ -549,6 +628,15 @@ 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 = &qcom_smmu_500_impl,
+       .adreno_impl = &qcom_adreno_smmu_500_impl,
+       .cfg = &qcom_smmu_impl0_cfg,
+       .actlrcfg = sm8550_apps_actlr_cfg,
+       .actlrcfg_gfx = sm8550_gfx_actlr_cfg,
+};
+
  static const struct qcom_smmu_match_data qcom_smmu_500_impl0_data = {
         .impl = &qcom_smmu_500_impl,
         .adreno_impl = &qcom_adreno_smmu_500_impl,
@@ -583,6 +671,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










