* [PATCH 1/2] iommu/arm-smmu-qcom: Fix missing adreno_smmu's
@ 2023-05-09 16:37 Rob Clark
2023-05-09 16:37 ` [PATCH 2/2] drm/msm: Be more shouty if per-process pgtables aren't working Rob Clark
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Rob Clark @ 2023-05-09 16:37 UTC (permalink / raw)
To: dri-devel, iommu
Cc: freedreno, linux-arm-msm, Dmitry Baryshkov, Rob Clark, Lepton Wu,
Will Deacon, Robin Murphy, Joerg Roedel, Sai Prakash Ranjan,
Konrad Dybcio, Bjorn Andersson, Elliot Berman, Marijn Suijten,
Emma Anholt, moderated list:ARM SMMU DRIVERS,
open list:IOMMU SUBSYSTEM, open list
From: Rob Clark <robdclark@chromium.org>
When the special handling of qcom,adreno-smmu was moved into
qcom_smmu_create(), it was overlooked that we didn't have all the
required entries in qcom_smmu_impl_of_match. So we stopped getting
adreno_smmu_priv on sc7180, breaking per-process pgtables.
Fixes: 30b912a03d91 ("iommu/arm-smmu-qcom: Move the qcom,adreno-smmu check into qcom_smmu_create")
Suggested-by: Lepton Wu <lepton@chromium.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
index d1b296b95c86..760d9c43dbd2 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
@@ -496,20 +496,21 @@ static const struct qcom_smmu_match_data qcom_smmu_500_impl0_data = {
/*
* 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 },
{ .compatible = "qcom,qcm2290-smmu-500", .data = &qcom_smmu_500_impl0_data },
{ .compatible = "qcom,qdu1000-smmu-500", .data = &qcom_smmu_500_impl0_data },
{ .compatible = "qcom,sc7180-smmu-500", .data = &qcom_smmu_500_impl0_data },
+ { .compatible = "qcom,sc7180-smmu-v2", .data = &qcom_smmu_v2_data },
{ .compatible = "qcom,sc7280-smmu-500", .data = &qcom_smmu_500_impl0_data },
{ .compatible = "qcom,sc8180x-smmu-500", .data = &qcom_smmu_500_impl0_data },
{ .compatible = "qcom,sc8280xp-smmu-500", .data = &qcom_smmu_500_impl0_data },
{ .compatible = "qcom,sdm630-smmu-v2", .data = &qcom_smmu_v2_data },
{ .compatible = "qcom,sdm845-smmu-v2", .data = &qcom_smmu_v2_data },
{ .compatible = "qcom,sdm845-smmu-500", .data = &sdm845_smmu_500_data },
{ .compatible = "qcom,sm6115-smmu-500", .data = &qcom_smmu_500_impl0_data},
{ .compatible = "qcom,sm6125-smmu-500", .data = &qcom_smmu_500_impl0_data },
{ .compatible = "qcom,sm6350-smmu-v2", .data = &qcom_smmu_v2_data },
{ .compatible = "qcom,sm6350-smmu-500", .data = &qcom_smmu_500_impl0_data },
@@ -540,12 +541,14 @@ struct arm_smmu_device *qcom_smmu_impl_init(struct arm_smmu_device *smmu)
/* Match platform for ACPI boot */
if (acpi_match_platform_list(qcom_acpi_platlist) >= 0)
return qcom_smmu_create(smmu, &qcom_smmu_500_impl0_data);
}
#endif
match = of_match_node(qcom_smmu_impl_of_match, np);
if (match)
return qcom_smmu_create(smmu, match->data);
+ WARN_ON(of_device_is_compatible(np, "qcom,adreno-smmu"));
+
return smmu;
}
--
2.40.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] drm/msm: Be more shouty if per-process pgtables aren't working
2023-05-09 16:37 [PATCH 1/2] iommu/arm-smmu-qcom: Fix missing adreno_smmu's Rob Clark
@ 2023-05-09 16:37 ` Rob Clark
2023-05-11 14:25 ` [PATCH 1/2] iommu/arm-smmu-qcom: Fix missing adreno_smmu's Rob Clark
2023-05-11 14:51 ` Dmitry Baryshkov
2 siblings, 0 replies; 6+ messages in thread
From: Rob Clark @ 2023-05-09 16:37 UTC (permalink / raw)
To: dri-devel, iommu
Cc: freedreno, linux-arm-msm, Dmitry Baryshkov, Rob Clark, Rob Clark,
Abhinav Kumar, Sean Paul, David Airlie, Daniel Vetter, open list
From: Rob Clark <robdclark@chromium.org>
Otherwise it is not always obvious if a dt or iommu change is causing us
to fall back to global pgtable.
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
drivers/gpu/drm/msm/msm_iommu.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c
index 418e1e06cdde..9b19124c9bd0 100644
--- a/drivers/gpu/drm/msm/msm_iommu.c
+++ b/drivers/gpu/drm/msm/msm_iommu.c
@@ -227,21 +227,26 @@ struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent)
struct adreno_smmu_priv *adreno_smmu = dev_get_drvdata(parent->dev);
struct msm_iommu *iommu = to_msm_iommu(parent);
struct msm_iommu_pagetable *pagetable;
const struct io_pgtable_cfg *ttbr1_cfg = NULL;
struct io_pgtable_cfg ttbr0_cfg;
int ret;
/* Get the pagetable configuration from the domain */
if (adreno_smmu->cookie)
ttbr1_cfg = adreno_smmu->get_ttbr1_cfg(adreno_smmu->cookie);
- if (!ttbr1_cfg)
+
+ /*
+ * If you hit this WARN_ONCE() you are probably missing an entry in
+ * qcom_smmu_impl_of_match[] in arm-smmu-qcom.c
+ */
+ if (WARN_ONCE(!ttbr1_cfg, "No per-process page tables"))
return ERR_PTR(-ENODEV);
pagetable = kzalloc(sizeof(*pagetable), GFP_KERNEL);
if (!pagetable)
return ERR_PTR(-ENOMEM);
msm_mmu_init(&pagetable->base, parent->dev, &pagetable_funcs,
MSM_MMU_IOMMU_PAGETABLE);
/* Clone the TTBR1 cfg as starting point for TTBR0 cfg: */
--
2.40.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] iommu/arm-smmu-qcom: Fix missing adreno_smmu's
2023-05-09 16:37 [PATCH 1/2] iommu/arm-smmu-qcom: Fix missing adreno_smmu's Rob Clark
2023-05-09 16:37 ` [PATCH 2/2] drm/msm: Be more shouty if per-process pgtables aren't working Rob Clark
@ 2023-05-11 14:25 ` Rob Clark
2023-05-11 14:51 ` Dmitry Baryshkov
2 siblings, 0 replies; 6+ messages in thread
From: Rob Clark @ 2023-05-11 14:25 UTC (permalink / raw)
To: dri-devel, iommu
Cc: freedreno, linux-arm-msm, Dmitry Baryshkov, Rob Clark, Lepton Wu,
Will Deacon, Robin Murphy, Joerg Roedel, Sai Prakash Ranjan,
Konrad Dybcio, Bjorn Andersson, Elliot Berman, Marijn Suijten,
Emma Anholt, moderated list:ARM SMMU DRIVERS,
open list:IOMMU SUBSYSTEM, open list
On Tue, May 9, 2023 at 9:37 AM Rob Clark <robdclark@gmail.com> wrote:
>
> From: Rob Clark <robdclark@chromium.org>
>
> When the special handling of qcom,adreno-smmu was moved into
> qcom_smmu_create(), it was overlooked that we didn't have all the
> required entries in qcom_smmu_impl_of_match. So we stopped getting
> adreno_smmu_priv on sc7180, breaking per-process pgtables.
>
> Fixes: 30b912a03d91 ("iommu/arm-smmu-qcom: Move the qcom,adreno-smmu check into qcom_smmu_create")
> Suggested-by: Lepton Wu <lepton@chromium.org>
> Signed-off-by: Rob Clark <robdclark@chromium.org>
Any chance I could get an ack for landing this fix via msm-fixes?
Broken per-process pgtables is kind of a serious regression..
BR,
-R
> ---
> drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> index d1b296b95c86..760d9c43dbd2 100644
> --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> @@ -496,20 +496,21 @@ static const struct qcom_smmu_match_data qcom_smmu_500_impl0_data = {
> /*
> * 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 },
> { .compatible = "qcom,qcm2290-smmu-500", .data = &qcom_smmu_500_impl0_data },
> { .compatible = "qcom,qdu1000-smmu-500", .data = &qcom_smmu_500_impl0_data },
> { .compatible = "qcom,sc7180-smmu-500", .data = &qcom_smmu_500_impl0_data },
> + { .compatible = "qcom,sc7180-smmu-v2", .data = &qcom_smmu_v2_data },
> { .compatible = "qcom,sc7280-smmu-500", .data = &qcom_smmu_500_impl0_data },
> { .compatible = "qcom,sc8180x-smmu-500", .data = &qcom_smmu_500_impl0_data },
> { .compatible = "qcom,sc8280xp-smmu-500", .data = &qcom_smmu_500_impl0_data },
> { .compatible = "qcom,sdm630-smmu-v2", .data = &qcom_smmu_v2_data },
> { .compatible = "qcom,sdm845-smmu-v2", .data = &qcom_smmu_v2_data },
> { .compatible = "qcom,sdm845-smmu-500", .data = &sdm845_smmu_500_data },
> { .compatible = "qcom,sm6115-smmu-500", .data = &qcom_smmu_500_impl0_data},
> { .compatible = "qcom,sm6125-smmu-500", .data = &qcom_smmu_500_impl0_data },
> { .compatible = "qcom,sm6350-smmu-v2", .data = &qcom_smmu_v2_data },
> { .compatible = "qcom,sm6350-smmu-500", .data = &qcom_smmu_500_impl0_data },
> @@ -540,12 +541,14 @@ struct arm_smmu_device *qcom_smmu_impl_init(struct arm_smmu_device *smmu)
> /* Match platform for ACPI boot */
> if (acpi_match_platform_list(qcom_acpi_platlist) >= 0)
> return qcom_smmu_create(smmu, &qcom_smmu_500_impl0_data);
> }
> #endif
>
> match = of_match_node(qcom_smmu_impl_of_match, np);
> if (match)
> return qcom_smmu_create(smmu, match->data);
>
> + WARN_ON(of_device_is_compatible(np, "qcom,adreno-smmu"));
> +
> return smmu;
> }
> --
> 2.40.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] iommu/arm-smmu-qcom: Fix missing adreno_smmu's
2023-05-09 16:37 [PATCH 1/2] iommu/arm-smmu-qcom: Fix missing adreno_smmu's Rob Clark
2023-05-09 16:37 ` [PATCH 2/2] drm/msm: Be more shouty if per-process pgtables aren't working Rob Clark
2023-05-11 14:25 ` [PATCH 1/2] iommu/arm-smmu-qcom: Fix missing adreno_smmu's Rob Clark
@ 2023-05-11 14:51 ` Dmitry Baryshkov
2023-05-11 14:57 ` Rob Clark
2 siblings, 1 reply; 6+ messages in thread
From: Dmitry Baryshkov @ 2023-05-11 14:51 UTC (permalink / raw)
To: Rob Clark
Cc: dri-devel, iommu, freedreno, linux-arm-msm, Rob Clark, Lepton Wu,
Will Deacon, Robin Murphy, Joerg Roedel, Sai Prakash Ranjan,
Konrad Dybcio, Bjorn Andersson, Elliot Berman, Marijn Suijten,
Emma Anholt, moderated list:ARM SMMU DRIVERS,
open list:IOMMU SUBSYSTEM, open list
On Tue, 9 May 2023 at 19:37, Rob Clark <robdclark@gmail.com> wrote:
>
> From: Rob Clark <robdclark@chromium.org>
>
> When the special handling of qcom,adreno-smmu was moved into
> qcom_smmu_create(), it was overlooked that we didn't have all the
> required entries in qcom_smmu_impl_of_match. So we stopped getting
> adreno_smmu_priv on sc7180, breaking per-process pgtables.
>
> Fixes: 30b912a03d91 ("iommu/arm-smmu-qcom: Move the qcom,adreno-smmu check into qcom_smmu_create")
> Suggested-by: Lepton Wu <lepton@chromium.org>
> Signed-off-by: Rob Clark <robdclark@chromium.org>
> ---
> drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> index d1b296b95c86..760d9c43dbd2 100644
> --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> @@ -496,20 +496,21 @@ static const struct qcom_smmu_match_data qcom_smmu_500_impl0_data = {
> /*
> * 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 },
> { .compatible = "qcom,qcm2290-smmu-500", .data = &qcom_smmu_500_impl0_data },
> { .compatible = "qcom,qdu1000-smmu-500", .data = &qcom_smmu_500_impl0_data },
> { .compatible = "qcom,sc7180-smmu-500", .data = &qcom_smmu_500_impl0_data },
> + { .compatible = "qcom,sc7180-smmu-v2", .data = &qcom_smmu_v2_data },
> { .compatible = "qcom,sc7280-smmu-500", .data = &qcom_smmu_500_impl0_data },
> { .compatible = "qcom,sc8180x-smmu-500", .data = &qcom_smmu_500_impl0_data },
> { .compatible = "qcom,sc8280xp-smmu-500", .data = &qcom_smmu_500_impl0_data },
> { .compatible = "qcom,sdm630-smmu-v2", .data = &qcom_smmu_v2_data },
> { .compatible = "qcom,sdm845-smmu-v2", .data = &qcom_smmu_v2_data },
> { .compatible = "qcom,sdm845-smmu-500", .data = &sdm845_smmu_500_data },
> { .compatible = "qcom,sm6115-smmu-500", .data = &qcom_smmu_500_impl0_data},
> { .compatible = "qcom,sm6125-smmu-500", .data = &qcom_smmu_500_impl0_data },
> { .compatible = "qcom,sm6350-smmu-v2", .data = &qcom_smmu_v2_data },
> { .compatible = "qcom,sm6350-smmu-500", .data = &qcom_smmu_500_impl0_data },
> @@ -540,12 +541,14 @@ struct arm_smmu_device *qcom_smmu_impl_init(struct arm_smmu_device *smmu)
> /* Match platform for ACPI boot */
> if (acpi_match_platform_list(qcom_acpi_platlist) >= 0)
> return qcom_smmu_create(smmu, &qcom_smmu_500_impl0_data);
> }
> #endif
>
> match = of_match_node(qcom_smmu_impl_of_match, np);
> if (match)
> return qcom_smmu_create(smmu, match->data);
>
> + WARN_ON(of_device_is_compatible(np, "qcom,adreno-smmu"));
Could you please add a comment here, noting the reason? Or maybe we
should change that to:
if (WARN_ON(...))
return ERR_PTR(-EINVAL);
> +
> return smmu;
> }
> --
> 2.40.1
>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] iommu/arm-smmu-qcom: Fix missing adreno_smmu's
2023-05-11 14:51 ` Dmitry Baryshkov
@ 2023-05-11 14:57 ` Rob Clark
0 siblings, 0 replies; 6+ messages in thread
From: Rob Clark @ 2023-05-11 14:57 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: dri-devel, iommu, freedreno, linux-arm-msm, Rob Clark, Lepton Wu,
Will Deacon, Robin Murphy, Joerg Roedel, Sai Prakash Ranjan,
Konrad Dybcio, Bjorn Andersson, Elliot Berman, Marijn Suijten,
Emma Anholt, moderated list:ARM SMMU DRIVERS,
open list:IOMMU SUBSYSTEM, open list
On Thu, May 11, 2023 at 7:51 AM Dmitry Baryshkov
<dmitry.baryshkov@linaro.org> wrote:
>
> On Tue, 9 May 2023 at 19:37, Rob Clark <robdclark@gmail.com> wrote:
> >
> > From: Rob Clark <robdclark@chromium.org>
> >
> > When the special handling of qcom,adreno-smmu was moved into
> > qcom_smmu_create(), it was overlooked that we didn't have all the
> > required entries in qcom_smmu_impl_of_match. So we stopped getting
> > adreno_smmu_priv on sc7180, breaking per-process pgtables.
> >
> > Fixes: 30b912a03d91 ("iommu/arm-smmu-qcom: Move the qcom,adreno-smmu check into qcom_smmu_create")
> > Suggested-by: Lepton Wu <lepton@chromium.org>
> > Signed-off-by: Rob Clark <robdclark@chromium.org>
> > ---
> > drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> > index d1b296b95c86..760d9c43dbd2 100644
> > --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> > +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> > @@ -496,20 +496,21 @@ static const struct qcom_smmu_match_data qcom_smmu_500_impl0_data = {
> > /*
> > * 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 },
> > { .compatible = "qcom,qcm2290-smmu-500", .data = &qcom_smmu_500_impl0_data },
> > { .compatible = "qcom,qdu1000-smmu-500", .data = &qcom_smmu_500_impl0_data },
> > { .compatible = "qcom,sc7180-smmu-500", .data = &qcom_smmu_500_impl0_data },
> > + { .compatible = "qcom,sc7180-smmu-v2", .data = &qcom_smmu_v2_data },
> > { .compatible = "qcom,sc7280-smmu-500", .data = &qcom_smmu_500_impl0_data },
> > { .compatible = "qcom,sc8180x-smmu-500", .data = &qcom_smmu_500_impl0_data },
> > { .compatible = "qcom,sc8280xp-smmu-500", .data = &qcom_smmu_500_impl0_data },
> > { .compatible = "qcom,sdm630-smmu-v2", .data = &qcom_smmu_v2_data },
> > { .compatible = "qcom,sdm845-smmu-v2", .data = &qcom_smmu_v2_data },
> > { .compatible = "qcom,sdm845-smmu-500", .data = &sdm845_smmu_500_data },
> > { .compatible = "qcom,sm6115-smmu-500", .data = &qcom_smmu_500_impl0_data},
> > { .compatible = "qcom,sm6125-smmu-500", .data = &qcom_smmu_500_impl0_data },
> > { .compatible = "qcom,sm6350-smmu-v2", .data = &qcom_smmu_v2_data },
> > { .compatible = "qcom,sm6350-smmu-500", .data = &qcom_smmu_500_impl0_data },
> > @@ -540,12 +541,14 @@ struct arm_smmu_device *qcom_smmu_impl_init(struct arm_smmu_device *smmu)
> > /* Match platform for ACPI boot */
> > if (acpi_match_platform_list(qcom_acpi_platlist) >= 0)
> > return qcom_smmu_create(smmu, &qcom_smmu_500_impl0_data);
> > }
> > #endif
> >
> > match = of_match_node(qcom_smmu_impl_of_match, np);
> > if (match)
> > return qcom_smmu_create(smmu, match->data);
> >
> > + WARN_ON(of_device_is_compatible(np, "qcom,adreno-smmu"));
>
> Could you please add a comment here, noting the reason? Or maybe we
> should change that to:
> if (WARN_ON(...))
> return ERR_PTR(-EINVAL);
I'll add a comment. Not having an iommu is even worse, so returning
an error isn't a good idea. I just wanted to leave some breadcrumbs
so people can see where the problem actually is if per-process
pgtables break again.
BR,
-R
>
> > +
> > return smmu;
> > }
> > --
> > 2.40.1
> >
>
>
> --
> With best wishes
> Dmitry
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] iommu/arm-smmu-qcom: Fix missing adreno_smmu's
@ 2023-05-02 16:09 Rob Clark
2023-05-02 16:09 ` [PATCH 2/2] drm/msm: Be more shouty if per-process pgtables aren't working Rob Clark
0 siblings, 1 reply; 6+ messages in thread
From: Rob Clark @ 2023-05-02 16:09 UTC (permalink / raw)
To: dri-devel, iommu
Cc: freedreno, linux-arm-msm, Dmitry Baryshkov, Rob Clark,
Will Deacon, Robin Murphy, Joerg Roedel, Sai Prakash Ranjan,
Konrad Dybcio, Bjorn Andersson, Marijn Suijten,
moderated list:ARM SMMU DRIVERS, open list:IOMMU SUBSYSTEM,
open list
From: Rob Clark <robdclark@chromium.org>
When the special handling of qcom,adreno-smmu was moved into
qcom_smmu_create(), it was overlooked that we didn't have all the
required entries in qcom_smmu_impl_of_match. So we stopped getting
adreno_smmu_priv on sc7180, breaking per-process pgtables.
Fixes: 30b912a03d91 ("iommu/arm-smmu-qcom: Move the qcom,adreno-smmu check into qcom_smmu_create")
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
index d1b296b95c86..88c89424485b 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
@@ -512,20 +512,25 @@ static const struct of_device_id __maybe_unused qcom_smmu_impl_of_match[] = {
{ .compatible = "qcom,sm6115-smmu-500", .data = &qcom_smmu_500_impl0_data},
{ .compatible = "qcom,sm6125-smmu-500", .data = &qcom_smmu_500_impl0_data },
{ .compatible = "qcom,sm6350-smmu-v2", .data = &qcom_smmu_v2_data },
{ .compatible = "qcom,sm6350-smmu-500", .data = &qcom_smmu_500_impl0_data },
{ .compatible = "qcom,sm6375-smmu-500", .data = &qcom_smmu_500_impl0_data },
{ .compatible = "qcom,sm8150-smmu-500", .data = &qcom_smmu_500_impl0_data },
{ .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,smmu-500", .data = &qcom_smmu_500_impl0_data },
+ /*
+ * Should come after the qcom,smmu-500 fallback so smmu-500 variants of
+ * adreno-smmu get qcom_adreno_smmu_500_impl:
+ */
+ { .compatible = "qcom,adreno-smmu", .data = &qcom_smmu_v2_data },
{ }
};
#ifdef CONFIG_ACPI
static struct acpi_platform_list qcom_acpi_platlist[] = {
{ "LENOVO", "CB-01 ", 0x8180, ACPI_SIG_IORT, equal, "QCOM SMMU" },
{ "QCOM ", "QCOMEDK2", 0x8180, ACPI_SIG_IORT, equal, "QCOM SMMU" },
{ }
};
#endif
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] drm/msm: Be more shouty if per-process pgtables aren't working
2023-05-02 16:09 Rob Clark
@ 2023-05-02 16:09 ` Rob Clark
0 siblings, 0 replies; 6+ messages in thread
From: Rob Clark @ 2023-05-02 16:09 UTC (permalink / raw)
To: dri-devel, iommu
Cc: freedreno, linux-arm-msm, Dmitry Baryshkov, Rob Clark, Rob Clark,
Abhinav Kumar, Sean Paul, David Airlie, Daniel Vetter, open list
From: Rob Clark <robdclark@chromium.org>
Otherwise it is not always obvious if a dt or iommu change is causing us
to fall back to global pgtable.
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
drivers/gpu/drm/msm/msm_iommu.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c
index 418e1e06cdde..1b7792d35860 100644
--- a/drivers/gpu/drm/msm/msm_iommu.c
+++ b/drivers/gpu/drm/msm/msm_iommu.c
@@ -224,24 +224,25 @@ static int msm_fault_handler(struct iommu_domain *domain, struct device *dev,
struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent)
{
struct adreno_smmu_priv *adreno_smmu = dev_get_drvdata(parent->dev);
struct msm_iommu *iommu = to_msm_iommu(parent);
struct msm_iommu_pagetable *pagetable;
const struct io_pgtable_cfg *ttbr1_cfg = NULL;
struct io_pgtable_cfg ttbr0_cfg;
int ret;
+
/* Get the pagetable configuration from the domain */
if (adreno_smmu->cookie)
ttbr1_cfg = adreno_smmu->get_ttbr1_cfg(adreno_smmu->cookie);
- if (!ttbr1_cfg)
+ if (WARN_ON_ONCE(!ttbr1_cfg))
return ERR_PTR(-ENODEV);
pagetable = kzalloc(sizeof(*pagetable), GFP_KERNEL);
if (!pagetable)
return ERR_PTR(-ENOMEM);
msm_mmu_init(&pagetable->base, parent->dev, &pagetable_funcs,
MSM_MMU_IOMMU_PAGETABLE);
/* Clone the TTBR1 cfg as starting point for TTBR0 cfg: */
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-05-11 14:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-09 16:37 [PATCH 1/2] iommu/arm-smmu-qcom: Fix missing adreno_smmu's Rob Clark
2023-05-09 16:37 ` [PATCH 2/2] drm/msm: Be more shouty if per-process pgtables aren't working Rob Clark
2023-05-11 14:25 ` [PATCH 1/2] iommu/arm-smmu-qcom: Fix missing adreno_smmu's Rob Clark
2023-05-11 14:51 ` Dmitry Baryshkov
2023-05-11 14:57 ` Rob Clark
-- strict thread matches above, loose matches on Subject: below --
2023-05-02 16:09 Rob Clark
2023-05-02 16:09 ` [PATCH 2/2] drm/msm: Be more shouty if per-process pgtables aren't working Rob Clark
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox