lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 596/717] arm64: dts: marvell: keep SMMU disabled by default for Armada 7040 and 8040
    Date
    From: Tomasz Nowicki <tn@semihalf.com>

    commit f43cadef2df260101497a6aace05e24201f00202 upstream.

    FW has to configure devices' StreamIDs so that SMMU is able to lookup
    context and do proper translation later on. For Armada 7040 & 8040 and
    publicly available FW, most of the devices are configured properly,
    but some like ap_sdhci0, PCIe, NIC still remain unassigned which
    results in SMMU faults about unmatched StreamID (assuming
    ARM_SMMU_DISABLE_BYPASS_BY_DEFAUL=y).

    Since there is dependency on custom FW let SMMU be disabled by default.
    People who still willing to use SMMU need to enable manually and
    use ARM_SMMU_DISABLE_BYPASS_BY_DEFAUL=n (or via kernel command line)
    with extra caution.

    Fixes: 83a3545d9c37 ("arm64: dts: marvell: add SMMU support")
    Cc: <stable@vger.kernel.org> # 5.9+
    Signed-off-by: Tomasz Nowicki <tn@semihalf.com>
    Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm64/boot/dts/marvell/armada-7040.dtsi | 4 ----
    arch/arm64/boot/dts/marvell/armada-8040.dtsi | 4 ----
    2 files changed, 8 deletions(-)

    --- a/arch/arm64/boot/dts/marvell/armada-7040.dtsi
    +++ b/arch/arm64/boot/dts/marvell/armada-7040.dtsi
    @@ -15,10 +15,6 @@
    "marvell,armada-ap806";
    };

    -&smmu {
    - status = "okay";
    -};
    -
    &cp0_pcie0 {
    iommu-map =
    <0x0 &smmu 0x480 0x20>,
    --- a/arch/arm64/boot/dts/marvell/armada-8040.dtsi
    +++ b/arch/arm64/boot/dts/marvell/armada-8040.dtsi
    @@ -15,10 +15,6 @@
    "marvell,armada-ap806";
    };

    -&smmu {
    - status = "okay";
    -};
    -
    &cp0_pcie0 {
    iommu-map =
    <0x0 &smmu 0x480 0x20>,

    \
     
     \ /
      Last update: 2020-12-28 15:29    [W:4.267 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site