From patchwork Sun May 24 02:38:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Marek X-Patchwork-Id: 11567105 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9ABD815E4 for ; Sun, 24 May 2020 02:38:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8432F20874 for ; Sun, 24 May 2020 02:38:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=marek-ca.20150623.gappssmtp.com header.i=@marek-ca.20150623.gappssmtp.com header.b="Cm6R0AG1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388250AbgEXCiT (ORCPT ); Sat, 23 May 2020 22:38:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388307AbgEXCiT (ORCPT ); Sat, 23 May 2020 22:38:19 -0400 Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C858C08C5C0 for ; Sat, 23 May 2020 19:38:19 -0700 (PDT) Received: by mail-qk1-x741.google.com with SMTP id i5so14658073qkl.12 for ; Sat, 23 May 2020 19:38:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4u1HmOI2Twq6GsEKJ5fvB0tfsgVAGgF1UXgxs14K3Zo=; b=Cm6R0AG1Zt7MiVkUiBh1yvKYC1S/pepEQzaF+2ABrJfB8O3YyxAeWF3qHWhK6dsrVO IwbCK9+Msh0xNCzh2hcqXKGhYZ/gOgOpBzH97v0I/vzK2JhXtmLvUsqsWuJwV3m7srT3 ACp+mHDuK6b/R6xUDNvc43J/Nz/xTSLs7rAKOXfAB2z+Oc9JNB8rHARXRONOVXWguzIb pX/6x8Ann6RFY/Q1mobmGohsxw9/TRBPmOU2AeWnTw2gc6NdqrT/hWLsQVMseIIbkPQG o6+OQXMu/pLMlQYC/cRFdMfuR+CYldKvgI0FzK3wz/D9L+NC3heKj4bJ/G977f0YjEDw x1/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4u1HmOI2Twq6GsEKJ5fvB0tfsgVAGgF1UXgxs14K3Zo=; b=Sjmk6Qh+oxSjSs5D9VbFY4hasN46Tano6WiHL/52I32CJ67BqCnAvXLZk8SvymNcSK noRh95iZvtxTk7EnJhP7wNVX+HpH4VK5JlnvAwEpFoxB7K/da6PiRsMnnqCfo7IW/p69 EH9on9q6nrxbLuspFR4Omxj6xUjtrVrSBohEV0drqM2e9+tlaGs+n6FTtUuhs8n8yxaP aKx44fTlXbm/WI/EVHDscAs81POCSVvsZlriMAtO34gZtMEHDGjZYTl+E66U6ZDIcJ17 vEakiAYJUuRRsPBB4VyIywLDwHAzEZu6pQnxzR/tsA7dP+8M8OjfVJFFv2h1hA8nvAc3 KkHQ== X-Gm-Message-State: AOAM532RjOanD6Ylg77KT03CzHcM1mAPORYd0INMuyu/ktg+FOuphg5S rhJ2C/nRdYA7IP8XR/GAeLYzeYHZF1E= X-Google-Smtp-Source: ABdhPJxaTHPS7dixHNuRkSqsSz1sTNcqkhiYWMkUXW7EhGUfdcGxw01t22FTReBnBwt+eDSoR/hcvg== X-Received: by 2002:ae9:e854:: with SMTP id a81mr21969493qkg.396.1590287898123; Sat, 23 May 2020 19:38:18 -0700 (PDT) Received: from localhost.localdomain ([147.253.86.153]) by smtp.gmail.com with ESMTPSA id e3sm11187666qtj.25.2020.05.23.19.38.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2020 19:38:17 -0700 (PDT) From: Jonathan Marek To: linux-arm-msm@vger.kernel.org Cc: Andy Gross , Bjorn Andersson , Rob Herring , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/6] arm64: dts: qcom: sm8150: add apps_smmu node Date: Sat, 23 May 2020 22:38:07 -0400 Message-Id: <20200524023815.21789-2-jonathan@marek.ca> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200524023815.21789-1-jonathan@marek.ca> References: <20200524023815.21789-1-jonathan@marek.ca> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add the apps_smmu node for sm8150. Note that adding the iommus field for UFS is required because initializing the iommu removes the bypass mapping that created by the bootloader. Signed-off-by: Jonathan Marek Reviewed-by: Sai Prakash Ranjan Tested-by: Sai Prakash Ranjan --- arch/arm64/boot/dts/qcom/sm8150.dtsi | 91 ++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index a36512d1f6a1..acb839427b12 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -442,6 +442,8 @@ ufs_mem_hc: ufshc@1d84000 { resets = <&gcc GCC_UFS_PHY_BCR>; reset-names = "rst"; + iommus = <&apps_smmu 0x300 0>; + clock-names = "core_clk", "bus_aggr_clk", @@ -706,6 +708,7 @@ usb_1_dwc3: dwc3@a600000 { compatible = "snps,dwc3"; reg = <0 0x0a600000 0 0xcd00>; interrupts = ; + iommus = <&apps_smmu 0x140 0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; phys = <&usb_1_hsphy>, <&usb_1_ssphy>; @@ -742,6 +745,94 @@ spmi_bus: spmi@c440000 { cell-index = <0>; }; + apps_smmu: iommu@15000000 { + compatible = "qcom,sdm845-smmu-500", "arm,mmu-500"; + reg = <0 0x15000000 0 0x100000>; + #iommu-cells = <2>; + #global-interrupts = <1>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + }; + remoteproc_adsp: remoteproc@17300000 { compatible = "qcom,sm8150-adsp-pas"; reg = <0x0 0x17300000 0x0 0x4040>;