Commit 3962dc28 authored by Jordan Crouse's avatar Jordan Crouse Committed by Matthias Maennich
Browse files

FROMGIT: iommu/arm-smmu: Don't bypass pinned stream mappings

Commit 0e764a01 ("iommu/arm-smmu: Allow client devices to select
direct mapping") sets the initial domain type to SMMU_DOMAIN_IDENTITY
for devices that select direct mapping. This ends up setting the domain
as ARM_SMMU_DOMAIN_BYPASS which causes the stream ID mappings
for the device to be programmed to S2CR_TYPE_BYPASS.

This causes a problem for stream mappings that are inherited from
the bootloader since rewriting the stream to BYPASS will disrupt the
display controller access to DDR.

This is an extension to ("iommu/arm-smmu: Allow inheriting stream mapping
from bootloader") [1] that identifies streams that are already configured
 and marked them as pinned. This patch extends that to not re-write pinned
stream mappings for ARM_SMMU_DOMAIN_BYPASS domains.

[1] https://lore.kernel.org/r/20191226221709.3844244-4-bjorn.andersson@linaro.org



Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
(cherry picked from commit 7ea70cbadd53c199b36f6d2433183dfcb9b1fbdb
 https://github.com/freedreno/kernel-msm.git

 wip/c630-5.8-rc1)
Change-Id: Iecc6e3d1feedee178e04f7da8f601ee12bd5ae3b
Signed-off-by: default avatarMatthias Maennich <maennich@google.com>
parent 6d5f98b6
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment