* [PATCH v2] iommu/arm-smmu-qcom: Add missing GMU entry to match table
@ 2023-12-10 18:06 ` Rob Clark
0 siblings, 0 replies; 8+ messages in thread
From: Rob Clark @ 2023-12-10 18:06 UTC (permalink / raw)
To: iommu
Cc: freedreno, linux-arm-msm, Robin Murphy, Johan Hovold, Rob Clark,
stable, Will Deacon, Joerg Roedel, Konrad Dybcio,
Dmitry Baryshkov, Bjorn Andersson, Manivannan Sadhasivam,
Danila Tikhonov, Elliot Berman, moderated list:ARM SMMU DRIVERS,
open list:IOMMU SUBSYSTEM, open list
From: Rob Clark <robdclark@chromium.org>
In some cases the firmware expects cbndx 1 to be assigned to the GMU,
so we also want the default domain for the GMU to be an identy domain.
This way it does not get a context bank assigned. Without this, both
of_dma_configure() and drm/msm's iommu_domain_attach() will trigger
allocating and configuring a context bank. So GMU ends up attached to
both cbndx 1 and later cbndx 2. This arrangement seemingly confounds
and surprises the firmware if the GPU later triggers a translation
fault, resulting (on sc8280xp / lenovo x13s, at least) in the SMMU
getting wedged and the GPU stuck without memory access.
Cc: stable@vger.kernel.org
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
I didn't add a fixes tag because really this issue has been there
all along, but either didn't matter with other firmware or we didn't
notice the problem.
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
index 549ae4dba3a6..d326fa230b96 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
@@ -243,6 +243,7 @@ static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain,
static const struct of_device_id qcom_smmu_client_of_match[] __maybe_unused = {
{ .compatible = "qcom,adreno" },
+ { .compatible = "qcom,adreno-gmu" },
{ .compatible = "qcom,mdp4" },
{ .compatible = "qcom,mdss" },
{ .compatible = "qcom,sc7180-mdss" },
--
2.43.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2] iommu/arm-smmu-qcom: Add missing GMU entry to match table
@ 2023-12-10 18:06 ` Rob Clark
0 siblings, 0 replies; 8+ messages in thread
From: Rob Clark @ 2023-12-10 18:06 UTC (permalink / raw)
To: iommu
Cc: freedreno, linux-arm-msm, Robin Murphy, Johan Hovold, Rob Clark,
stable, Will Deacon, Joerg Roedel, Konrad Dybcio,
Dmitry Baryshkov, Bjorn Andersson, Manivannan Sadhasivam,
Danila Tikhonov, Elliot Berman, moderated list:ARM SMMU DRIVERS,
open list:IOMMU SUBSYSTEM, open list
From: Rob Clark <robdclark@chromium.org>
In some cases the firmware expects cbndx 1 to be assigned to the GMU,
so we also want the default domain for the GMU to be an identy domain.
This way it does not get a context bank assigned. Without this, both
of_dma_configure() and drm/msm's iommu_domain_attach() will trigger
allocating and configuring a context bank. So GMU ends up attached to
both cbndx 1 and later cbndx 2. This arrangement seemingly confounds
and surprises the firmware if the GPU later triggers a translation
fault, resulting (on sc8280xp / lenovo x13s, at least) in the SMMU
getting wedged and the GPU stuck without memory access.
Cc: stable@vger.kernel.org
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
I didn't add a fixes tag because really this issue has been there
all along, but either didn't matter with other firmware or we didn't
notice the problem.
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
index 549ae4dba3a6..d326fa230b96 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
@@ -243,6 +243,7 @@ static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain,
static const struct of_device_id qcom_smmu_client_of_match[] __maybe_unused = {
{ .compatible = "qcom,adreno" },
+ { .compatible = "qcom,adreno-gmu" },
{ .compatible = "qcom,mdp4" },
{ .compatible = "qcom,mdss" },
{ .compatible = "qcom,sc7180-mdss" },
--
2.43.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2] iommu/arm-smmu-qcom: Add missing GMU entry to match table
2023-12-10 18:06 ` Rob Clark
@ 2023-12-11 10:11 ` Johan Hovold
-1 siblings, 0 replies; 8+ messages in thread
From: Johan Hovold @ 2023-12-11 10:11 UTC (permalink / raw)
To: Rob Clark
Cc: iommu, freedreno, linux-arm-msm, Robin Murphy, Rob Clark, stable,
Will Deacon, Joerg Roedel, Konrad Dybcio, Dmitry Baryshkov,
Bjorn Andersson, Manivannan Sadhasivam, Danila Tikhonov,
Elliot Berman, moderated list:ARM SMMU DRIVERS,
open list:IOMMU SUBSYSTEM, open list
On Sun, Dec 10, 2023 at 10:06:53AM -0800, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> In some cases the firmware expects cbndx 1 to be assigned to the GMU,
> so we also want the default domain for the GMU to be an identy domain.
> This way it does not get a context bank assigned. Without this, both
> of_dma_configure() and drm/msm's iommu_domain_attach() will trigger
> allocating and configuring a context bank. So GMU ends up attached to
> both cbndx 1 and later cbndx 2. This arrangement seemingly confounds
> and surprises the firmware if the GPU later triggers a translation
> fault, resulting (on sc8280xp / lenovo x13s, at least) in the SMMU
> getting wedged and the GPU stuck without memory access.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Rob Clark <robdclark@chromium.org>
Tested-by: Johan Hovold <johan+linaro@kernel.org>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] iommu/arm-smmu-qcom: Add missing GMU entry to match table
@ 2023-12-11 10:11 ` Johan Hovold
0 siblings, 0 replies; 8+ messages in thread
From: Johan Hovold @ 2023-12-11 10:11 UTC (permalink / raw)
To: Rob Clark
Cc: iommu, freedreno, linux-arm-msm, Robin Murphy, Rob Clark, stable,
Will Deacon, Joerg Roedel, Konrad Dybcio, Dmitry Baryshkov,
Bjorn Andersson, Manivannan Sadhasivam, Danila Tikhonov,
Elliot Berman, moderated list:ARM SMMU DRIVERS,
open list:IOMMU SUBSYSTEM, open list
On Sun, Dec 10, 2023 at 10:06:53AM -0800, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> In some cases the firmware expects cbndx 1 to be assigned to the GMU,
> so we also want the default domain for the GMU to be an identy domain.
> This way it does not get a context bank assigned. Without this, both
> of_dma_configure() and drm/msm's iommu_domain_attach() will trigger
> allocating and configuring a context bank. So GMU ends up attached to
> both cbndx 1 and later cbndx 2. This arrangement seemingly confounds
> and surprises the firmware if the GPU later triggers a translation
> fault, resulting (on sc8280xp / lenovo x13s, at least) in the SMMU
> getting wedged and the GPU stuck without memory access.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Rob Clark <robdclark@chromium.org>
Tested-by: Johan Hovold <johan+linaro@kernel.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] iommu/arm-smmu-qcom: Add missing GMU entry to match table
2023-12-10 18:06 ` Rob Clark
@ 2023-12-11 22:58 ` Robin Murphy
-1 siblings, 0 replies; 8+ messages in thread
From: Robin Murphy @ 2023-12-11 22:58 UTC (permalink / raw)
To: Rob Clark, iommu
Cc: freedreno, linux-arm-msm, Johan Hovold, Rob Clark, stable,
Will Deacon, Joerg Roedel, Konrad Dybcio, Dmitry Baryshkov,
Bjorn Andersson, Manivannan Sadhasivam, Danila Tikhonov,
Elliot Berman, moderated list:ARM SMMU DRIVERS,
open list:IOMMU SUBSYSTEM, open list
On 2023-12-10 6:06 pm, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> In some cases the firmware expects cbndx 1 to be assigned to the GMU,
> so we also want the default domain for the GMU to be an identy domain.
> This way it does not get a context bank assigned. Without this, both
> of_dma_configure() and drm/msm's iommu_domain_attach() will trigger
> allocating and configuring a context bank. So GMU ends up attached to
> both cbndx 1 and later cbndx 2. This arrangement seemingly confounds
> and surprises the firmware if the GPU later triggers a translation
> fault, resulting (on sc8280xp / lenovo x13s, at least) in the SMMU
> getting wedged and the GPU stuck without memory access.
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
> Cc: stable@vger.kernel.org
> Signed-off-by: Rob Clark <robdclark@chromium.org>
> ---
>
> I didn't add a fixes tag because really this issue has been there
> all along, but either didn't matter with other firmware or we didn't
> notice the problem.
>
> drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> index 549ae4dba3a6..d326fa230b96 100644
> --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> @@ -243,6 +243,7 @@ static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain,
>
> static const struct of_device_id qcom_smmu_client_of_match[] __maybe_unused = {
> { .compatible = "qcom,adreno" },
> + { .compatible = "qcom,adreno-gmu" },
> { .compatible = "qcom,mdp4" },
> { .compatible = "qcom,mdss" },
> { .compatible = "qcom,sc7180-mdss" },
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] iommu/arm-smmu-qcom: Add missing GMU entry to match table
@ 2023-12-11 22:58 ` Robin Murphy
0 siblings, 0 replies; 8+ messages in thread
From: Robin Murphy @ 2023-12-11 22:58 UTC (permalink / raw)
To: Rob Clark, iommu
Cc: freedreno, linux-arm-msm, Johan Hovold, Rob Clark, stable,
Will Deacon, Joerg Roedel, Konrad Dybcio, Dmitry Baryshkov,
Bjorn Andersson, Manivannan Sadhasivam, Danila Tikhonov,
Elliot Berman, moderated list:ARM SMMU DRIVERS,
open list:IOMMU SUBSYSTEM, open list
On 2023-12-10 6:06 pm, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> In some cases the firmware expects cbndx 1 to be assigned to the GMU,
> so we also want the default domain for the GMU to be an identy domain.
> This way it does not get a context bank assigned. Without this, both
> of_dma_configure() and drm/msm's iommu_domain_attach() will trigger
> allocating and configuring a context bank. So GMU ends up attached to
> both cbndx 1 and later cbndx 2. This arrangement seemingly confounds
> and surprises the firmware if the GPU later triggers a translation
> fault, resulting (on sc8280xp / lenovo x13s, at least) in the SMMU
> getting wedged and the GPU stuck without memory access.
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
> Cc: stable@vger.kernel.org
> Signed-off-by: Rob Clark <robdclark@chromium.org>
> ---
>
> I didn't add a fixes tag because really this issue has been there
> all along, but either didn't matter with other firmware or we didn't
> notice the problem.
>
> drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> index 549ae4dba3a6..d326fa230b96 100644
> --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> @@ -243,6 +243,7 @@ static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain,
>
> static const struct of_device_id qcom_smmu_client_of_match[] __maybe_unused = {
> { .compatible = "qcom,adreno" },
> + { .compatible = "qcom,adreno-gmu" },
> { .compatible = "qcom,mdp4" },
> { .compatible = "qcom,mdss" },
> { .compatible = "qcom,sc7180-mdss" },
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] iommu/arm-smmu-qcom: Add missing GMU entry to match table
2023-12-10 18:06 ` Rob Clark
@ 2023-12-12 17:21 ` Will Deacon
-1 siblings, 0 replies; 8+ messages in thread
From: Will Deacon @ 2023-12-12 17:21 UTC (permalink / raw)
To: Rob Clark, iommu
Cc: catalin.marinas, kernel-team, Will Deacon,
open list:IOMMU SUBSYSTEM, Manivannan Sadhasivam, open list,
Robin Murphy, Konrad Dybcio, Rob Clark, Johan Hovold,
Joerg Roedel, linux-arm-msm, stable, freedreno, Danila Tikhonov,
moderated list:ARM SMMU DRIVERS, Dmitry Baryshkov, Elliot Berman,
Bjorn Andersson
On Sun, 10 Dec 2023 10:06:53 -0800, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> In some cases the firmware expects cbndx 1 to be assigned to the GMU,
> so we also want the default domain for the GMU to be an identy domain.
> This way it does not get a context bank assigned. Without this, both
> of_dma_configure() and drm/msm's iommu_domain_attach() will trigger
> allocating and configuring a context bank. So GMU ends up attached to
> both cbndx 1 and later cbndx 2. This arrangement seemingly confounds
> and surprises the firmware if the GPU later triggers a translation
> fault, resulting (on sc8280xp / lenovo x13s, at least) in the SMMU
> getting wedged and the GPU stuck without memory access.
>
> [...]
Applied to will (for-joerg/arm-smmu/updates), thanks!
[1/1] iommu/arm-smmu-qcom: Add missing GMU entry to match table
https://git.kernel.org/will/c/afc95681c306
Cheers,
--
Will
https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] iommu/arm-smmu-qcom: Add missing GMU entry to match table
@ 2023-12-12 17:21 ` Will Deacon
0 siblings, 0 replies; 8+ messages in thread
From: Will Deacon @ 2023-12-12 17:21 UTC (permalink / raw)
To: Rob Clark, iommu
Cc: catalin.marinas, kernel-team, Will Deacon,
open list:IOMMU SUBSYSTEM, Manivannan Sadhasivam, open list,
Robin Murphy, Konrad Dybcio, Rob Clark, Johan Hovold,
Joerg Roedel, linux-arm-msm, stable, freedreno, Danila Tikhonov,
moderated list:ARM SMMU DRIVERS, Dmitry Baryshkov, Elliot Berman,
Bjorn Andersson
On Sun, 10 Dec 2023 10:06:53 -0800, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> In some cases the firmware expects cbndx 1 to be assigned to the GMU,
> so we also want the default domain for the GMU to be an identy domain.
> This way it does not get a context bank assigned. Without this, both
> of_dma_configure() and drm/msm's iommu_domain_attach() will trigger
> allocating and configuring a context bank. So GMU ends up attached to
> both cbndx 1 and later cbndx 2. This arrangement seemingly confounds
> and surprises the firmware if the GPU later triggers a translation
> fault, resulting (on sc8280xp / lenovo x13s, at least) in the SMMU
> getting wedged and the GPU stuck without memory access.
>
> [...]
Applied to will (for-joerg/arm-smmu/updates), thanks!
[1/1] iommu/arm-smmu-qcom: Add missing GMU entry to match table
https://git.kernel.org/will/c/afc95681c306
Cheers,
--
Will
https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-12-12 17:22 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-10 18:06 [PATCH v2] iommu/arm-smmu-qcom: Add missing GMU entry to match table Rob Clark
2023-12-10 18:06 ` Rob Clark
2023-12-11 10:11 ` Johan Hovold
2023-12-11 10:11 ` Johan Hovold
2023-12-11 22:58 ` Robin Murphy
2023-12-11 22:58 ` Robin Murphy
2023-12-12 17:21 ` Will Deacon
2023-12-12 17:21 ` Will Deacon
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.