From: Rob Clark <[email protected]>
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 <[email protected]>
---
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
From: Rob Clark <[email protected]>
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 <[email protected]>
---
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
On 2.05.2023 18:09, Rob Clark wrote:
> From: Rob Clark <[email protected]>
>
> 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 <[email protected]>
> ---
I believe the issue here is the lack of qcom,sc7180-smmu-v2 instead.
qcom,adreno-smmu does not have to imply the "qcom smmu v2" impl
Konrad
> 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
On Thu, May 4, 2023 at 10:41 AM Konrad Dybcio <[email protected]> wrote:
>
>
>
> On 2.05.2023 18:09, Rob Clark wrote:
> > From: Rob Clark <[email protected]>
> >
> > 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 <[email protected]>
> > ---
> I believe the issue here is the lack of qcom,sc7180-smmu-v2 instead.
>
> qcom,adreno-smmu does not have to imply the "qcom smmu v2" impl
Yes, but the ordering after "qcom,smmu-500" does. Currently we just
need the one missing "qcom,sc7180-smmu-v2" but that seemed kind of
fragile to me, which is why I went with "qcom,adreno-smmu" as a
catch-all
BR,
-R
>
> Konrad
> > 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
On 04/05/2023 21:08, Rob Clark wrote:
> On Thu, May 4, 2023 at 10:41 AM Konrad Dybcio <[email protected]> wrote:
>>
>>
>>
>> On 2.05.2023 18:09, Rob Clark wrote:
>>> From: Rob Clark <[email protected]>
>>>
>>> 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 <[email protected]>
>>> ---
>> I believe the issue here is the lack of qcom,sc7180-smmu-v2 instead.
>>
>> qcom,adreno-smmu does not have to imply the "qcom smmu v2" impl
>
> Yes, but the ordering after "qcom,smmu-500" does. Currently we just
> need the one missing "qcom,sc7180-smmu-v2" but that seemed kind of
> fragile to me, which is why I went with "qcom,adreno-smmu" as a
> catch-all
I think, the order is not relevant when comparing compatible entries,
see __of_match_node(). It uses scoring and the more specific compatible
wins. This way, "qcom,adreno-smmu", "qcom,smmu-500" will always end up
with the v2 ops instead smmu500. It was not included into the list
intentionally, rather than being by omission.
Thus I'd also suggest adding "qcom,sc7180-smmu-v2" to the list, as we
currently do for all SMMU_v2 devices.
>
> BR,
> -R
>
>>
>> Konrad
>>> 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
--
With best wishes
Dmitry