* [PATCH v15 1/5] iommu/arm-smmu: re-enable context caching in smmu reset operation
2024-09-20 15:58 [PATCH v15 0/5] iommu/arm-smmu: introduction of ACTLR implementation for Qualcomm SoCs Bibek Kumar Patro
@ 2024-09-20 15:58 ` Bibek Kumar Patro
2024-09-20 15:58 ` [PATCH v15 2/5] iommu/arm-smmu: refactor qcom_smmu structure to include single pointer Bibek Kumar Patro
` (3 subsequent siblings)
4 siblings, 0 replies; 14+ messages in thread
From: Bibek Kumar Patro @ 2024-09-20 15:58 UTC (permalink / raw)
To: robdclark, will, robin.murphy, joro, jgg, jsnitsel, robh,
krzysztof.kozlowski, quic_c_gdjako, dmitry.baryshkov
Cc: iommu, linux-arm-msm, linux-arm-kernel, linux-kernel,
quic_bibekkum, Konrad Dybcio
Default MMU-500 reset operation disables context caching in
prefetch buffer. It is however expected for context banks using
the ACTLR register to retain their prefetch value during reset
and runtime suspend.
Replace default MMU-500 reset operation with Qualcomm specific reset
operation which envelope the default reset operation and re-enables
context caching in prefetch buffer for Qualcomm SoCs.
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bibek Kumar Patro <quic_bibekkum@quicinc.com>
---
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 45 ++++++++++++++++++++--
1 file changed, 42 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
index 087fb4f6f4d3..0cb10b354802 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
@@ -16,6 +16,16 @@
#define QCOM_DUMMY_VAL -1
+/*
+ * 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 CPRE (1 << 1)
+#define CMTLB (1 << 0)
+
static struct qcom_smmu *to_qcom_smmu(struct arm_smmu_device *smmu)
{
return container_of(smmu, struct qcom_smmu, smmu);
@@ -396,11 +406,40 @@ static int qcom_smmu_def_domain_type(struct device *dev)
return match ? IOMMU_DOMAIN_IDENTITY : 0;
}
+static int qcom_smmu500_reset(struct arm_smmu_device *smmu)
+{
+ int ret;
+ u32 val;
+ int i;
+
+ ret = arm_mmu500_reset(smmu);
+ if (ret)
+ return ret;
+
+ /*
+ * arm_mmu500_reset() disables CPRE which is re-enabled here.
+ * The errata for MMU-500 before the r2p2 revision requires CPRE to be
+ * disabled. The arm_mmu500_reset function disables CPRE to accommodate all
+ * RTL revisions. Since all Qualcomm SoCs are on the r2p4 revision, where
+ * the CPRE bit can be enabled, the qcom_smmu500_reset function re-enables
+ * the CPRE bit for the next-page prefetcher to retain the prefetch value
+ * during reset and runtime suspend operations.
+ */
+
+ for (i = 0; i < smmu->num_context_banks; ++i) {
+ val = arm_smmu_cb_read(smmu, i, ARM_SMMU_CB_ACTLR);
+ val |= CPRE;
+ arm_smmu_cb_write(smmu, i, ARM_SMMU_CB_ACTLR, val);
+ }
+
+ return 0;
+}
+
static int qcom_sdm845_smmu500_reset(struct arm_smmu_device *smmu)
{
int ret;
- arm_mmu500_reset(smmu);
+ qcom_smmu500_reset(smmu);
/*
* To address performance degradation in non-real time clients,
@@ -427,7 +466,7 @@ static const struct arm_smmu_impl qcom_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,
+ .reset = qcom_smmu500_reset,
.write_s2cr = qcom_smmu_write_s2cr,
.tlb_sync = qcom_smmu_tlb_sync,
#ifdef CONFIG_ARM_SMMU_QCOM_DEBUG
@@ -461,7 +500,7 @@ static const struct arm_smmu_impl qcom_adreno_smmu_v2_impl = {
static const struct arm_smmu_impl qcom_adreno_smmu_500_impl = {
.init_context = qcom_adreno_smmu_init_context,
.def_domain_type = qcom_smmu_def_domain_type,
- .reset = arm_mmu500_reset,
+ .reset = qcom_smmu500_reset,
.alloc_context_bank = qcom_adreno_smmu_alloc_context_bank,
.write_sctlr = qcom_adreno_smmu_write_sctlr,
.tlb_sync = qcom_smmu_tlb_sync,
--
2.34.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v15 2/5] iommu/arm-smmu: refactor qcom_smmu structure to include single pointer
2024-09-20 15:58 [PATCH v15 0/5] iommu/arm-smmu: introduction of ACTLR implementation for Qualcomm SoCs Bibek Kumar Patro
2024-09-20 15:58 ` [PATCH v15 1/5] iommu/arm-smmu: re-enable context caching in smmu reset operation Bibek Kumar Patro
@ 2024-09-20 15:58 ` Bibek Kumar Patro
2024-09-20 15:58 ` [PATCH v15 3/5] iommu/arm-smmu: add support for PRR bit setup Bibek Kumar Patro
` (2 subsequent siblings)
4 siblings, 0 replies; 14+ messages in thread
From: Bibek Kumar Patro @ 2024-09-20 15:58 UTC (permalink / raw)
To: robdclark, will, robin.murphy, joro, jgg, jsnitsel, robh,
krzysztof.kozlowski, quic_c_gdjako, dmitry.baryshkov
Cc: iommu, linux-arm-msm, linux-arm-kernel, linux-kernel,
quic_bibekkum
qcom_smmu_match_data is static and constant so refactor qcom_smmu
to store single pointer to qcom_smmu_match_data instead of
replicating multiple child members of the same and handle the further
dereferences in the places that want them.
Suggested-by: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Bibek Kumar Patro <quic_bibekkum@quicinc.com>
---
drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c | 2 +-
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 2 +-
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c
index 548783f3f8e8..d03b2239baad 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c
@@ -73,7 +73,7 @@ void qcom_smmu_tlb_sync_debug(struct arm_smmu_device *smmu)
if (__ratelimit(&rs)) {
dev_err(smmu->dev, "TLB sync timed out -- SMMU may be deadlocked\n");
- cfg = qsmmu->cfg;
+ cfg = qsmmu->data->cfg;
if (!cfg)
return;
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
index 0cb10b354802..6e0a2a43e45a 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
@@ -534,7 +534,7 @@ static struct arm_smmu_device *qcom_smmu_create(struct arm_smmu_device *smmu,
return ERR_PTR(-ENOMEM);
qsmmu->smmu.impl = impl;
- qsmmu->cfg = data->cfg;
+ qsmmu->data = data;
return &qsmmu->smmu;
}
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h
index 3c134d1a6277..b55cd3e3ae48 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h
@@ -8,7 +8,7 @@
struct qcom_smmu {
struct arm_smmu_device smmu;
- const struct qcom_smmu_config *cfg;
+ const struct qcom_smmu_match_data *data;
bool bypass_quirk;
u8 bypass_cbndx;
u32 stall_enabled;
--
2.34.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v15 3/5] iommu/arm-smmu: add support for PRR bit setup
2024-09-20 15:58 [PATCH v15 0/5] iommu/arm-smmu: introduction of ACTLR implementation for Qualcomm SoCs Bibek Kumar Patro
2024-09-20 15:58 ` [PATCH v15 1/5] iommu/arm-smmu: re-enable context caching in smmu reset operation Bibek Kumar Patro
2024-09-20 15:58 ` [PATCH v15 2/5] iommu/arm-smmu: refactor qcom_smmu structure to include single pointer Bibek Kumar Patro
@ 2024-09-20 15:58 ` Bibek Kumar Patro
2024-09-20 15:58 ` [PATCH v15 4/5] iommu/arm-smmu: introduction of ACTLR for custom prefetcher settings Bibek Kumar Patro
2024-09-20 15:58 ` [PATCH v15 5/5] iommu/arm-smmu: add ACTLR data and support for qcom_smmu_500 Bibek Kumar Patro
4 siblings, 0 replies; 14+ messages in thread
From: Bibek Kumar Patro @ 2024-09-20 15:58 UTC (permalink / raw)
To: robdclark, will, robin.murphy, joro, jgg, jsnitsel, robh,
krzysztof.kozlowski, quic_c_gdjako, dmitry.baryshkov
Cc: iommu, linux-arm-msm, linux-arm-kernel, linux-kernel,
quic_bibekkum
Add an adreno-smmu-priv interface for drm/msm to call
into arm-smmu-qcom and initiate the PRR bit setup or reset
sequence as per request.
This will be used by GPU to setup the PRR bit and related
configuration registers through adreno-smmu private
interface instead of directly poking the smmu hardware.
Suggested-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Bibek Kumar Patro <quic_bibekkum@quicinc.com>
---
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 37 ++++++++++++++++++++++
drivers/iommu/arm/arm-smmu/arm-smmu.h | 2 ++
include/linux/adreno-smmu-priv.h | 10 +++++-
3 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
index 6e0a2a43e45a..38ac9cab763b 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
@@ -25,6 +25,7 @@
#define CPRE (1 << 1)
#define CMTLB (1 << 0)
+#define GFX_ACTLR_PRR (1 << 5)
static struct qcom_smmu *to_qcom_smmu(struct arm_smmu_device *smmu)
{
@@ -109,6 +110,40 @@ static void qcom_adreno_smmu_resume_translation(const void *cookie, bool termina
arm_smmu_cb_write(smmu, cfg->cbndx, ARM_SMMU_CB_RESUME, reg);
}
+static void qcom_adreno_smmu_set_prr_bit(const void *cookie, bool set)
+{
+ struct arm_smmu_domain *smmu_domain = (void *)cookie;
+ struct arm_smmu_device *smmu = smmu_domain->smmu;
+ const struct device_node *np = smmu->dev->of_node;
+ struct arm_smmu_cfg *cfg = &smmu_domain->cfg;
+ u32 reg = 0;
+
+ if (of_device_is_compatible(np, "qcom,smmu-500") &&
+ of_device_is_compatible(np, "qcom,adreno-smmu")) {
+ reg = arm_smmu_cb_read(smmu, cfg->cbndx, ARM_SMMU_CB_ACTLR);
+ reg &= ~GFX_ACTLR_PRR;
+ if (set)
+ reg |= FIELD_PREP(GFX_ACTLR_PRR, 1);
+ arm_smmu_cb_write(smmu, cfg->cbndx, ARM_SMMU_CB_ACTLR, reg);
+ }
+}
+
+static void qcom_adreno_smmu_set_prr_addr(const void *cookie, phys_addr_t page_addr)
+{
+ struct arm_smmu_domain *smmu_domain = (void *)cookie;
+ struct arm_smmu_device *smmu = smmu_domain->smmu;
+ const struct device_node *np = smmu->dev->of_node;
+
+ if (of_device_is_compatible(np, "qcom,smmu-500") &&
+ of_device_is_compatible(np, "qcom,adreno-smmu")) {
+ writel_relaxed(lower_32_bits(page_addr),
+ smmu->base + ARM_SMMU_GFX_PRR_CFG_LADDR);
+
+ writel_relaxed(upper_32_bits(page_addr),
+ smmu->base + ARM_SMMU_GFX_PRR_CFG_UADDR);
+ }
+}
+
#define QCOM_ADRENO_SMMU_GPU_SID 0
static bool qcom_adreno_smmu_is_gpu_device(struct device *dev)
@@ -249,6 +284,8 @@ static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain,
priv->get_fault_info = qcom_adreno_smmu_get_fault_info;
priv->set_stall = qcom_adreno_smmu_set_stall;
priv->resume_translation = qcom_adreno_smmu_resume_translation;
+ priv->set_prr_bit = qcom_adreno_smmu_set_prr_bit;
+ priv->set_prr_addr = qcom_adreno_smmu_set_prr_addr;
return 0;
}
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.h b/drivers/iommu/arm/arm-smmu/arm-smmu.h
index e2aeb511ae90..2dbf3243b5ad 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu.h
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu.h
@@ -154,6 +154,8 @@ enum arm_smmu_cbar_type {
#define ARM_SMMU_SCTLR_M BIT(0)
#define ARM_SMMU_CB_ACTLR 0x4
+#define ARM_SMMU_GFX_PRR_CFG_LADDR 0x6008
+#define ARM_SMMU_GFX_PRR_CFG_UADDR 0x600C
#define ARM_SMMU_CB_RESUME 0x8
#define ARM_SMMU_RESUME_TERMINATE BIT(0)
diff --git a/include/linux/adreno-smmu-priv.h b/include/linux/adreno-smmu-priv.h
index c637e0997f6d..03466eb16933 100644
--- a/include/linux/adreno-smmu-priv.h
+++ b/include/linux/adreno-smmu-priv.h
@@ -49,7 +49,13 @@ struct adreno_smmu_fault_info {
* before set_ttbr0_cfg(). If stalling on fault is enabled,
* the GPU driver must call resume_translation()
* @resume_translation: Resume translation after a fault
- *
+ * @set_prr_bit: Extendible interface to be used by GPU to modify the
+ * ACTLR register bits, currently used to configure
+ * Partially-Resident-Region (PRR) bit for feature's
+ * setup and reset sequence as requested.
+ * @set_prr_addr: Configure the PRR_CFG_*ADDR register with the
+ * physical address of PRR page passed from
+ * GPU driver.
*
* The GPU driver (drm/msm) and adreno-smmu work together for controlling
* the GPU's SMMU instance. This is by necessity, as the GPU is directly
@@ -67,6 +73,8 @@ struct adreno_smmu_priv {
void (*get_fault_info)(const void *cookie, struct adreno_smmu_fault_info *info);
void (*set_stall)(const void *cookie, bool enabled);
void (*resume_translation)(const void *cookie, bool terminate);
+ void (*set_prr_bit)(const void *cookie, bool set);
+ void (*set_prr_addr)(const void *cookie, phys_addr_t page_addr);
};
#endif /* __ADRENO_SMMU_PRIV_H */
--
2.34.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v15 4/5] iommu/arm-smmu: introduction of ACTLR for custom prefetcher settings
2024-09-20 15:58 [PATCH v15 0/5] iommu/arm-smmu: introduction of ACTLR implementation for Qualcomm SoCs Bibek Kumar Patro
` (2 preceding siblings ...)
2024-09-20 15:58 ` [PATCH v15 3/5] iommu/arm-smmu: add support for PRR bit setup Bibek Kumar Patro
@ 2024-09-20 15:58 ` Bibek Kumar Patro
2024-09-20 16:20 ` Dmitry Baryshkov
2024-09-22 19:36 ` kernel test robot
2024-09-20 15:58 ` [PATCH v15 5/5] iommu/arm-smmu: add ACTLR data and support for qcom_smmu_500 Bibek Kumar Patro
4 siblings, 2 replies; 14+ messages in thread
From: Bibek Kumar Patro @ 2024-09-20 15:58 UTC (permalink / raw)
To: robdclark, will, robin.murphy, joro, jgg, jsnitsel, robh,
krzysztof.kozlowski, quic_c_gdjako, dmitry.baryshkov
Cc: iommu, linux-arm-msm, linux-arm-kernel, linux-kernel,
quic_bibekkum
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 <quic_bibekkum@quicinc.com>
---
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 26 ++++++++++++++++++++++
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h | 1 +
2 files changed, 27 insertions(+)
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
index 38ac9cab763b..4ac272d05843 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
@@ -252,6 +252,20 @@ static bool qcom_adreno_can_do_ttbr1(struct arm_smmu_device *smmu)
return true;
}
+static void qcom_smmu_set_actlr_dev(struct device *dev, struct arm_smmu_device *smmu, int cbndx,
+ const struct of_device_id *client_match)
+{
+ const struct of_device_id *match =
+ of_match_device(client_match, dev);
+
+ if (!match) {
+ dev_notice(dev, "no ACTLR settings present\n");
+ return;
+ }
+
+ arm_smmu_cb_write(smmu, cbndx, ARM_SMMU_CB_ACTLR, (u64)match->data);
+}
+
static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain,
struct io_pgtable_cfg *pgtbl_cfg, struct device *dev)
{
@@ -316,8 +330,20 @@ 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);
+ const struct of_device_id *client_match;
+ int cbndx = smmu_domain->cfg.cbndx;
+
smmu_domain->cfg.flush_walk_prefer_tlbiasid = true;
+ client_match = qsmmu->data->client_match;
+
+ if (!client_match)
+ return 0;
+
+ qcom_smmu_set_actlr_dev(dev, smmu, cbndx, client_match);
+
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 b55cd3e3ae48..8addd453f5f1 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h
@@ -28,6 +28,7 @@ struct qcom_smmu_match_data {
const struct qcom_smmu_config *cfg;
const struct arm_smmu_impl *impl;
const struct arm_smmu_impl *adreno_impl;
+ const struct of_device_id * const client_match;
};
irqreturn_t qcom_smmu_context_fault(int irq, void *dev);
--
2.34.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v15 4/5] iommu/arm-smmu: introduction of ACTLR for custom prefetcher settings
2024-09-20 15:58 ` [PATCH v15 4/5] iommu/arm-smmu: introduction of ACTLR for custom prefetcher settings Bibek Kumar Patro
@ 2024-09-20 16:20 ` Dmitry Baryshkov
2024-09-20 19:34 ` Bibek Kumar Patro
2024-09-22 19:36 ` kernel test robot
1 sibling, 1 reply; 14+ messages in thread
From: Dmitry Baryshkov @ 2024-09-20 16:20 UTC (permalink / raw)
To: Bibek Kumar Patro
Cc: robdclark, will, robin.murphy, joro, jgg, jsnitsel, robh,
krzysztof.kozlowski, quic_c_gdjako, iommu, linux-arm-msm,
linux-arm-kernel, linux-kernel
On Fri, Sep 20, 2024 at 09:28:12PM GMT, Bibek Kumar Patro wrote:
> 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 <quic_bibekkum@quicinc.com>
> ---
> drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 26 ++++++++++++++++++++++
> drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h | 1 +
> 2 files changed, 27 insertions(+)
>
> diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> index 38ac9cab763b..4ac272d05843 100644
> --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> @@ -252,6 +252,20 @@ static bool qcom_adreno_can_do_ttbr1(struct arm_smmu_device *smmu)
> return true;
> }
>
> +static void qcom_smmu_set_actlr_dev(struct device *dev, struct arm_smmu_device *smmu, int cbndx,
> + const struct of_device_id *client_match)
> +{
> + const struct of_device_id *match =
> + of_match_device(client_match, dev);
> +
> + if (!match) {
> + dev_notice(dev, "no ACTLR settings present\n");
dev_dbg() or even dev_vdbg(), please. We do not want to spam people with
messages about a perfectly normal behaviour.
LGTM otherwise.
> + return;
> + }
> +
> + arm_smmu_cb_write(smmu, cbndx, ARM_SMMU_CB_ACTLR, (u64)match->data);
> +}
> +
> static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain,
> struct io_pgtable_cfg *pgtbl_cfg, struct device *dev)
> {
> @@ -316,8 +330,20 @@ 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);
> + const struct of_device_id *client_match;
> + int cbndx = smmu_domain->cfg.cbndx;
> +
> smmu_domain->cfg.flush_walk_prefer_tlbiasid = true;
>
> + client_match = qsmmu->data->client_match;
> +
> + if (!client_match)
> + return 0;
> +
> + qcom_smmu_set_actlr_dev(dev, smmu, cbndx, client_match);
> +
> 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 b55cd3e3ae48..8addd453f5f1 100644
> --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h
> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h
> @@ -28,6 +28,7 @@ struct qcom_smmu_match_data {
> const struct qcom_smmu_config *cfg;
> const struct arm_smmu_impl *impl;
> const struct arm_smmu_impl *adreno_impl;
> + const struct of_device_id * const client_match;
> };
>
> irqreturn_t qcom_smmu_context_fault(int irq, void *dev);
> --
> 2.34.1
>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v15 4/5] iommu/arm-smmu: introduction of ACTLR for custom prefetcher settings
2024-09-20 16:20 ` Dmitry Baryshkov
@ 2024-09-20 19:34 ` Bibek Kumar Patro
0 siblings, 0 replies; 14+ messages in thread
From: Bibek Kumar Patro @ 2024-09-20 19:34 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: robdclark, will, robin.murphy, joro, jgg, jsnitsel, robh,
krzysztof.kozlowski, quic_c_gdjako, iommu, linux-arm-msm,
linux-arm-kernel, linux-kernel
On 9/20/2024 9:50 PM, Dmitry Baryshkov wrote:
> On Fri, Sep 20, 2024 at 09:28:12PM GMT, Bibek Kumar Patro wrote:
>> 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 <quic_bibekkum@quicinc.com>
>> ---
>> drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 26 ++++++++++++++++++++++
>> drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h | 1 +
>> 2 files changed, 27 insertions(+)
>>
>> diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
>> index 38ac9cab763b..4ac272d05843 100644
>> --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
>> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
>> @@ -252,6 +252,20 @@ static bool qcom_adreno_can_do_ttbr1(struct arm_smmu_device *smmu)
>> return true;
>> }
>>
>> +static void qcom_smmu_set_actlr_dev(struct device *dev, struct arm_smmu_device *smmu, int cbndx,
>> + const struct of_device_id *client_match)
>> +{
>> + const struct of_device_id *match =
>> + of_match_device(client_match, dev);
>> +
>> + if (!match) {
>> + dev_notice(dev, "no ACTLR settings present\n");
>
> dev_dbg() or even dev_vdbg(), please. We do not want to spam people with
> messages about a perfectly normal behaviour.
>
> LGTM otherwise.
Ack, thanks Dmitry for the suggestion.
I was actually wondering if to broadcast this message
over the logs through dev_notice or give a option to
print it in debug level through dev_dbg.
But I'm inline with your suggestion now, will switch
to dev_dbg for this message.
Thanks & regards,
Bibek
>
>
>> + return;
>> + }
>> +
>> + arm_smmu_cb_write(smmu, cbndx, ARM_SMMU_CB_ACTLR, (u64)match->data);
>> +}
>> +
>> static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain,
>> struct io_pgtable_cfg *pgtbl_cfg, struct device *dev)
>> {
>> @@ -316,8 +330,20 @@ 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);
>> + const struct of_device_id *client_match;
>> + int cbndx = smmu_domain->cfg.cbndx;
>> +
>> smmu_domain->cfg.flush_walk_prefer_tlbiasid = true;
>>
>> + client_match = qsmmu->data->client_match;
>> +
>> + if (!client_match)
>> + return 0;
>> +
>> + qcom_smmu_set_actlr_dev(dev, smmu, cbndx, client_match);
>> +
>> 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 b55cd3e3ae48..8addd453f5f1 100644
>> --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h
>> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h
>> @@ -28,6 +28,7 @@ struct qcom_smmu_match_data {
>> const struct qcom_smmu_config *cfg;
>> const struct arm_smmu_impl *impl;
>> const struct arm_smmu_impl *adreno_impl;
>> + const struct of_device_id * const client_match;
>> };
>>
>> irqreturn_t qcom_smmu_context_fault(int irq, void *dev);
>> --
>> 2.34.1
>>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v15 4/5] iommu/arm-smmu: introduction of ACTLR for custom prefetcher settings
2024-09-20 15:58 ` [PATCH v15 4/5] iommu/arm-smmu: introduction of ACTLR for custom prefetcher settings Bibek Kumar Patro
2024-09-20 16:20 ` Dmitry Baryshkov
@ 2024-09-22 19:36 ` kernel test robot
2024-09-24 9:10 ` Bibek Kumar Patro
1 sibling, 1 reply; 14+ messages in thread
From: kernel test robot @ 2024-09-22 19:36 UTC (permalink / raw)
To: Bibek Kumar Patro, robdclark, will, robin.murphy, joro, jgg,
jsnitsel, robh, krzysztof.kozlowski, quic_c_gdjako,
dmitry.baryshkov
Cc: oe-kbuild-all, iommu, linux-arm-msm, linux-arm-kernel,
linux-kernel, quic_bibekkum
Hi Bibek,
kernel test robot noticed the following build warnings:
[auto build test WARNING on linus/master]
[also build test WARNING on joro-iommu/next v6.11 next-20240920]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Bibek-Kumar-Patro/iommu-arm-smmu-re-enable-context-caching-in-smmu-reset-operation/20240921-000146
base: linus/master
patch link: https://lore.kernel.org/r/20240920155813.3434021-5-quic_bibekkum%40quicinc.com
patch subject: [PATCH v15 4/5] iommu/arm-smmu: introduction of ACTLR for custom prefetcher settings
config: arm-qcom_defconfig (https://download.01.org/0day-ci/archive/20240923/202409230343.Q8KnYl2w-lkp@intel.com/config)
compiler: arm-linux-gnueabi-gcc (GCC) 13.3.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240923/202409230343.Q8KnYl2w-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202409230343.Q8KnYl2w-lkp@intel.com/
All warnings (new ones prefixed by >>):
In file included from drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c:14:
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c: In function 'qcom_smmu_set_actlr_dev':
>> drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c:266:59: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
266 | arm_smmu_cb_write(smmu, cbndx, ARM_SMMU_CB_ACTLR, (u64)match->data);
| ^
drivers/iommu/arm/arm-smmu/arm-smmu.h:533:59: note: in definition of macro 'arm_smmu_cb_write'
533 | arm_smmu_writel((s), ARM_SMMU_CB((s), (n)), (o), (v))
| ^
vim +266 drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
254
255 static void qcom_smmu_set_actlr_dev(struct device *dev, struct arm_smmu_device *smmu, int cbndx,
256 const struct of_device_id *client_match)
257 {
258 const struct of_device_id *match =
259 of_match_device(client_match, dev);
260
261 if (!match) {
262 dev_notice(dev, "no ACTLR settings present\n");
263 return;
264 }
265
> 266 arm_smmu_cb_write(smmu, cbndx, ARM_SMMU_CB_ACTLR, (u64)match->data);
267 }
268
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v15 4/5] iommu/arm-smmu: introduction of ACTLR for custom prefetcher settings
2024-09-22 19:36 ` kernel test robot
@ 2024-09-24 9:10 ` Bibek Kumar Patro
0 siblings, 0 replies; 14+ messages in thread
From: Bibek Kumar Patro @ 2024-09-24 9:10 UTC (permalink / raw)
To: kernel test robot, robdclark, will, robin.murphy, joro, jgg,
jsnitsel, robh, krzysztof.kozlowski, quic_c_gdjako,
dmitry.baryshkov
Cc: oe-kbuild-all, iommu, linux-arm-msm, linux-arm-kernel,
linux-kernel
On 9/23/2024 1:06 AM, kernel test robot wrote:
> All warnings (new ones prefixed by >>):
>
> In file included from drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c:14:
> drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c: In function 'qcom_smmu_set_actlr_dev':
>>> drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c:266:59: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
> 266 | arm_smmu_cb_write(smmu, cbndx, ARM_SMMU_CB_ACTLR, (u64)match->data);
> | ^
> drivers/iommu/arm/arm-smmu/arm-smmu.h:533:59: note: in definition of macro 'arm_smmu_cb_write'
> 533 | arm_smmu_writel((s), ARM_SMMU_CB((s), (n)), (o), (v))
> |
I'll fix this warning in next revision after other reviews are received.
regards,
Bibek
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v15 5/5] iommu/arm-smmu: add ACTLR data and support for qcom_smmu_500
2024-09-20 15:58 [PATCH v15 0/5] iommu/arm-smmu: introduction of ACTLR implementation for Qualcomm SoCs Bibek Kumar Patro
` (3 preceding siblings ...)
2024-09-20 15:58 ` [PATCH v15 4/5] iommu/arm-smmu: introduction of ACTLR for custom prefetcher settings Bibek Kumar Patro
@ 2024-09-20 15:58 ` Bibek Kumar Patro
2024-09-20 16:18 ` Dmitry Baryshkov
4 siblings, 1 reply; 14+ messages in thread
From: Bibek Kumar Patro @ 2024-09-20 15:58 UTC (permalink / raw)
To: robdclark, will, robin.murphy, joro, jgg, jsnitsel, robh,
krzysztof.kozlowski, quic_c_gdjako, dmitry.baryshkov
Cc: iommu, linux-arm-msm, linux-arm-kernel, linux-kernel,
quic_bibekkum
Add ACTLR data table for qcom_smmu_500 including
corresponding data entry and set prefetch value by
way of a list of compatible strings.
Signed-off-by: Bibek Kumar Patro <quic_bibekkum@quicinc.com>
---
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 24 ++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
index 4ac272d05843..e8f936a446df 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
@@ -25,8 +25,31 @@
#define CPRE (1 << 1)
#define CMTLB (1 << 0)
+#define PREFETCH_SHIFT 8
+#define PREFETCH_DEFAULT 0
+#define PREFETCH_SHALLOW (1 << PREFETCH_SHIFT)
+#define PREFETCH_MODERATE (2 << PREFETCH_SHIFT)
+#define PREFETCH_DEEP (3 << PREFETCH_SHIFT)
#define GFX_ACTLR_PRR (1 << 5)
+static const struct of_device_id qcom_smmu_actlr_client_of_match[] = {
+ { .compatible = "qcom,adreno",
+ .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
+ { .compatible = "qcom,adreno-gmu",
+ .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
+ { .compatible = "qcom,adreno-smmu",
+ .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
+ { .compatible = "qcom,fastrpc",
+ .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
+ { .compatible = "qcom,sc7280-mdss",
+ .data = (const void *) (PREFETCH_SHALLOW | CPRE | CMTLB) },
+ { .compatible = "qcom,sc7280-venus",
+ .data = (const void *) (PREFETCH_SHALLOW | CPRE | CMTLB) },
+ { .compatible = "qcom,sm8550-mdss",
+ .data = (const void *) (PREFETCH_DEFAULT | CMTLB) },
+ { }
+};
+
static struct qcom_smmu *to_qcom_smmu(struct arm_smmu_device *smmu)
{
return container_of(smmu, struct qcom_smmu, smmu);
@@ -640,6 +663,7 @@ 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,
+ .client_match = qcom_smmu_actlr_client_of_match,
};
/*
--
2.34.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v15 5/5] iommu/arm-smmu: add ACTLR data and support for qcom_smmu_500
2024-09-20 15:58 ` [PATCH v15 5/5] iommu/arm-smmu: add ACTLR data and support for qcom_smmu_500 Bibek Kumar Patro
@ 2024-09-20 16:18 ` Dmitry Baryshkov
2024-09-20 19:59 ` Bibek Kumar Patro
0 siblings, 1 reply; 14+ messages in thread
From: Dmitry Baryshkov @ 2024-09-20 16:18 UTC (permalink / raw)
To: Bibek Kumar Patro
Cc: robdclark, will, robin.murphy, joro, jgg, jsnitsel, robh,
krzysztof.kozlowski, quic_c_gdjako, iommu, linux-arm-msm,
linux-arm-kernel, linux-kernel
On Fri, Sep 20, 2024 at 09:28:13PM GMT, Bibek Kumar Patro wrote:
> Add ACTLR data table for qcom_smmu_500 including
> corresponding data entry and set prefetch value by
> way of a list of compatible strings.
>
> Signed-off-by: Bibek Kumar Patro <quic_bibekkum@quicinc.com>
> ---
> drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 24 ++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> index 4ac272d05843..e8f936a446df 100644
> --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> @@ -25,8 +25,31 @@
>
> #define CPRE (1 << 1)
> #define CMTLB (1 << 0)
> +#define PREFETCH_SHIFT 8
> +#define PREFETCH_DEFAULT 0
> +#define PREFETCH_SHALLOW (1 << PREFETCH_SHIFT)
> +#define PREFETCH_MODERATE (2 << PREFETCH_SHIFT)
> +#define PREFETCH_DEEP (3 << PREFETCH_SHIFT)
> #define GFX_ACTLR_PRR (1 << 5)
>
> +static const struct of_device_id qcom_smmu_actlr_client_of_match[] = {
> + { .compatible = "qcom,adreno",
> + .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
> + { .compatible = "qcom,adreno-gmu",
> + .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
> + { .compatible = "qcom,adreno-smmu",
> + .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
> + { .compatible = "qcom,fastrpc",
> + .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
> + { .compatible = "qcom,sc7280-mdss",
> + .data = (const void *) (PREFETCH_SHALLOW | CPRE | CMTLB) },
> + { .compatible = "qcom,sc7280-venus",
> + .data = (const void *) (PREFETCH_SHALLOW | CPRE | CMTLB) },
> + { .compatible = "qcom,sm8550-mdss",
> + .data = (const void *) (PREFETCH_DEFAULT | CMTLB) },
> + { }
> +};
Wow, this looks really nice now!
> +
> static struct qcom_smmu *to_qcom_smmu(struct arm_smmu_device *smmu)
> {
> return container_of(smmu, struct qcom_smmu, smmu);
> @@ -640,6 +663,7 @@ 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,
> + .client_match = qcom_smmu_actlr_client_of_match,
> };
>
> /*
> --
> 2.34.1
>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v15 5/5] iommu/arm-smmu: add ACTLR data and support for qcom_smmu_500
2024-09-20 16:18 ` Dmitry Baryshkov
@ 2024-09-20 19:59 ` Bibek Kumar Patro
2024-09-24 9:39 ` Dmitry Baryshkov
0 siblings, 1 reply; 14+ messages in thread
From: Bibek Kumar Patro @ 2024-09-20 19:59 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: robdclark, will, robin.murphy, joro, jgg, jsnitsel, robh,
krzysztof.kozlowski, quic_c_gdjako, iommu, linux-arm-msm,
linux-arm-kernel, linux-kernel
On 9/20/2024 9:48 PM, Dmitry Baryshkov wrote:
> On Fri, Sep 20, 2024 at 09:28:13PM GMT, Bibek Kumar Patro wrote:
>> Add ACTLR data table for qcom_smmu_500 including
>> corresponding data entry and set prefetch value by
>> way of a list of compatible strings.
>>
>> Signed-off-by: Bibek Kumar Patro <quic_bibekkum@quicinc.com>
>> ---
>> drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 24 ++++++++++++++++++++++
>> 1 file changed, 24 insertions(+)
>>
>> diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
>> index 4ac272d05843..e8f936a446df 100644
>> --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
>> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
>> @@ -25,8 +25,31 @@
>>
>> #define CPRE (1 << 1)
>> #define CMTLB (1 << 0)
>> +#define PREFETCH_SHIFT 8
>> +#define PREFETCH_DEFAULT 0
>> +#define PREFETCH_SHALLOW (1 << PREFETCH_SHIFT)
>> +#define PREFETCH_MODERATE (2 << PREFETCH_SHIFT)
>> +#define PREFETCH_DEEP (3 << PREFETCH_SHIFT)
>> #define GFX_ACTLR_PRR (1 << 5)
>>
>> +static const struct of_device_id qcom_smmu_actlr_client_of_match[] = {
>> + { .compatible = "qcom,adreno",
>> + .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
>> + { .compatible = "qcom,adreno-gmu",
>> + .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
>> + { .compatible = "qcom,adreno-smmu",
>> + .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
>> + { .compatible = "qcom,fastrpc",
>> + .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
>> + { .compatible = "qcom,sc7280-mdss",
>> + .data = (const void *) (PREFETCH_SHALLOW | CPRE | CMTLB) },
>> + { .compatible = "qcom,sc7280-venus",
>> + .data = (const void *) (PREFETCH_SHALLOW | CPRE | CMTLB) },
>> + { .compatible = "qcom,sm8550-mdss",
>> + .data = (const void *) (PREFETCH_DEFAULT | CMTLB) },
>> + { }
>> +};
>
> Wow, this looks really nice now!
>
I am also in favor of this compatible based approach now,
as it looks to be much cleaner implementation.
>> +
>> static struct qcom_smmu *to_qcom_smmu(struct arm_smmu_device *smmu)
>> {
>> return container_of(smmu, struct qcom_smmu, smmu);
>> @@ -640,6 +663,7 @@ 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,
>> + .client_match = qcom_smmu_actlr_client_of_match,
>> };
>>
>> /*
>> --
>> 2.34.1
>>
>
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v15 5/5] iommu/arm-smmu: add ACTLR data and support for qcom_smmu_500
2024-09-20 19:59 ` Bibek Kumar Patro
@ 2024-09-24 9:39 ` Dmitry Baryshkov
2024-09-27 19:53 ` Bibek Kumar Patro
0 siblings, 1 reply; 14+ messages in thread
From: Dmitry Baryshkov @ 2024-09-24 9:39 UTC (permalink / raw)
To: Bibek Kumar Patro
Cc: robdclark, will, robin.murphy, joro, jgg, jsnitsel, robh,
krzysztof.kozlowski, quic_c_gdjako, iommu, linux-arm-msm,
linux-arm-kernel, linux-kernel
On Sat, Sep 21, 2024 at 01:29:04AM GMT, Bibek Kumar Patro wrote:
>
>
> On 9/20/2024 9:48 PM, Dmitry Baryshkov wrote:
> > On Fri, Sep 20, 2024 at 09:28:13PM GMT, Bibek Kumar Patro wrote:
> > > Add ACTLR data table for qcom_smmu_500 including
> > > corresponding data entry and set prefetch value by
> > > way of a list of compatible strings.
> > >
> > > Signed-off-by: Bibek Kumar Patro <quic_bibekkum@quicinc.com>
> > > ---
> > > drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 24 ++++++++++++++++++++++
> > > 1 file changed, 24 insertions(+)
> > >
> > > diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> > > index 4ac272d05843..e8f936a446df 100644
> > > --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> > > +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> > > @@ -25,8 +25,31 @@
> > >
> > > #define CPRE (1 << 1)
> > > #define CMTLB (1 << 0)
> > > +#define PREFETCH_SHIFT 8
> > > +#define PREFETCH_DEFAULT 0
> > > +#define PREFETCH_SHALLOW (1 << PREFETCH_SHIFT)
> > > +#define PREFETCH_MODERATE (2 << PREFETCH_SHIFT)
> > > +#define PREFETCH_DEEP (3 << PREFETCH_SHIFT)
> > > #define GFX_ACTLR_PRR (1 << 5)
> > >
> > > +static const struct of_device_id qcom_smmu_actlr_client_of_match[] = {
> > > + { .compatible = "qcom,adreno",
> > > + .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
> > > + { .compatible = "qcom,adreno-gmu",
> > > + .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
> > > + { .compatible = "qcom,adreno-smmu",
> > > + .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
> > > + { .compatible = "qcom,fastrpc",
> > > + .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
> > > + { .compatible = "qcom,sc7280-mdss",
> > > + .data = (const void *) (PREFETCH_SHALLOW | CPRE | CMTLB) },
> > > + { .compatible = "qcom,sc7280-venus",
> > > + .data = (const void *) (PREFETCH_SHALLOW | CPRE | CMTLB) },
> > > + { .compatible = "qcom,sm8550-mdss",
> > > + .data = (const void *) (PREFETCH_DEFAULT | CMTLB) },
> > > + { }
> > > +};
> >
> > Wow, this looks really nice now!
> >
>
> I am also in favor of this compatible based approach now,
> as it looks to be much cleaner implementation.
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>
> > > +
> > > static struct qcom_smmu *to_qcom_smmu(struct arm_smmu_device *smmu)
> > > {
> > > return container_of(smmu, struct qcom_smmu, smmu);
> > > @@ -640,6 +663,7 @@ 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,
> > > + .client_match = qcom_smmu_actlr_client_of_match,
> > > };
> > >
> > > /*
> > > --
> > > 2.34.1
> > >
> >
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v15 5/5] iommu/arm-smmu: add ACTLR data and support for qcom_smmu_500
2024-09-24 9:39 ` Dmitry Baryshkov
@ 2024-09-27 19:53 ` Bibek Kumar Patro
0 siblings, 0 replies; 14+ messages in thread
From: Bibek Kumar Patro @ 2024-09-27 19:53 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: robdclark, will, robin.murphy, joro, jgg, jsnitsel, robh,
krzysztof.kozlowski, quic_c_gdjako, iommu, linux-arm-msm,
linux-arm-kernel, linux-kernel
On 9/24/2024 3:09 PM, Dmitry Baryshkov wrote:
> On Sat, Sep 21, 2024 at 01:29:04AM GMT, Bibek Kumar Patro wrote:
>>
>>
>> On 9/20/2024 9:48 PM, Dmitry Baryshkov wrote:
>>> On Fri, Sep 20, 2024 at 09:28:13PM GMT, Bibek Kumar Patro wrote:
>>>> Add ACTLR data table for qcom_smmu_500 including
>>>> corresponding data entry and set prefetch value by
>>>> way of a list of compatible strings.
>>>>
>>>> Signed-off-by: Bibek Kumar Patro <quic_bibekkum@quicinc.com>
>>>> ---
>>>> drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 24 ++++++++++++++++++++++
>>>> 1 file changed, 24 insertions(+)
>>>>
>>>> diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
>>>> index 4ac272d05843..e8f936a446df 100644
>>>> --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
>>>> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
>>>> @@ -25,8 +25,31 @@
>>>>
>>>> #define CPRE (1 << 1)
>>>> #define CMTLB (1 << 0)
>>>> +#define PREFETCH_SHIFT 8
>>>> +#define PREFETCH_DEFAULT 0
>>>> +#define PREFETCH_SHALLOW (1 << PREFETCH_SHIFT)
>>>> +#define PREFETCH_MODERATE (2 << PREFETCH_SHIFT)
>>>> +#define PREFETCH_DEEP (3 << PREFETCH_SHIFT)
>>>> #define GFX_ACTLR_PRR (1 << 5)
>>>>
>>>> +static const struct of_device_id qcom_smmu_actlr_client_of_match[] = {
>>>> + { .compatible = "qcom,adreno",
>>>> + .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
>>>> + { .compatible = "qcom,adreno-gmu",
>>>> + .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
>>>> + { .compatible = "qcom,adreno-smmu",
>>>> + .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
>>>> + { .compatible = "qcom,fastrpc",
>>>> + .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) },
>>>> + { .compatible = "qcom,sc7280-mdss",
>>>> + .data = (const void *) (PREFETCH_SHALLOW | CPRE | CMTLB) },
>>>> + { .compatible = "qcom,sc7280-venus",
>>>> + .data = (const void *) (PREFETCH_SHALLOW | CPRE | CMTLB) },
>>>> + { .compatible = "qcom,sm8550-mdss",
>>>> + .data = (const void *) (PREFETCH_DEFAULT | CMTLB) },
>>>> + { }
>>>> +};
>>>
>>> Wow, this looks really nice now!
>>>
>>
>> I am also in favor of this compatible based approach now,
>> as it looks to be much cleaner implementation.
>
>
> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>
>
Hi Robin/Will, let me know if you have any suggestions/inputs on this
patch. If everything looks fine, I'll send the next iteration with
Dmitry's inputs and update tags.
Thanks & regards,
Bibek
>>
>>>> +
>>>> static struct qcom_smmu *to_qcom_smmu(struct arm_smmu_device *smmu)
>>>> {
>>>> return container_of(smmu, struct qcom_smmu, smmu);
>>>> @@ -640,6 +663,7 @@ 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,
>>>> + .client_match = qcom_smmu_actlr_client_of_match,
>>>> };
>>>>
>>>> /*
>>>> --
>>>> 2.34.1
>>>>
>>>
>
^ permalink raw reply [flat|nested] 14+ messages in thread