From patchwork Mon Dec 28 12:43:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 352705 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp9821515jai; Mon, 28 Dec 2020 07:16:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJyZuab98DaMuZpEssFkfuAa1TyQYIocoCZRTCKwnRGlAEQ8pycX15/oJHBY0RT7OoxMcxGF X-Received: by 2002:a17:907:2111:: with SMTP id qn17mr40549086ejb.525.1609168229632; Mon, 28 Dec 2020 07:10:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609168229; cv=none; d=google.com; s=arc-20160816; b=wLjk/CJOWAPNhoZIezCMfa66SMCAL34jZR80GnzRdJ5y/ScPItoKxI6Fzg5KkS0s0/ Gy60NTr34SVLaRO1WJ8+zX/zFqdbIZW9A9HZvHBj2SGGmjGXtRWUHq7J4ZjAZoS7iVsB 85Nw+NAhtUrbOIxQ1j2W7jqTlqakxfkuISl0MxLEQ0qFl5IWANNu5tB82jndwJ7KyZ5q PN3lxocXYHjqMfs27H8xSUQEHCoxV7ouaYvSjx37qdwQMkqEIVRjIG+vYvv64E4npSic O0Yk9Tu6tZwnSV3R02eWJIcr4aLWIK0rMOCeW9vjzQCwggsxIDr5JKI3qvpsf/clulg6 4MKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=raXC75NfGbLsl1eWd+cQS8FER/STMl9t2W9iDOR6QHk=; b=S3nfASm4ZS8jyIi0bscreA/jaKjrjDczFd7b0Yf1HouGHSbcpe7m00VbK4E7YJhTOX ttjh3I2cThuxGJo56if16tWbXfYFRuSyPOV2bq+dqmkaZZd/mAZdVykJRf6ulXOyi49a m6tHGLSOy2FB3BEM01Nlo+uUpemgzIimiCLxsTHl7pJ319bs7SdA0GhGTx352HD3ioz4 cHAGQhmkCG0EhpQ6RAre8pNGNUKvrU9HkcgpOzMHIgGrIG1pt3ARM0xI/GrPoDWs6iHr 2k9CPM7mM7btu9IK9wg2phSOnWXqPZQl9zx1iuYu54AkQElHIaSSGOBTSL+NnNcrGVLV SVIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=D0Vc3WFL; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e20si18577079edr.131.2020.12.28.07.10.29; Mon, 28 Dec 2020 07:10:29 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=D0Vc3WFL; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391745AbgL1OIi (ORCPT + 14 others); Mon, 28 Dec 2020 09:08:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:42886 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391735AbgL1OIg (ORCPT ); Mon, 28 Dec 2020 09:08:36 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id D5E8D2063A; Mon, 28 Dec 2020 14:08:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609164501; bh=VTKFG8x/9ubRDJEHHfb2/5jIan0v6X/2BQC/NjlwyCU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D0Vc3WFL0EmkoXnuew9+oqNj2vNqL9CBx3LLoDPth/bp2j2o5uGqbTKjoLXw2QHhz J+qrqH36skIqWA7Eqnqnf+BXuzReDxynMXKV/ENjOmkkf3nCfZFdJK5RIEVfmAB27f 8HuOHBFfl+hN9Yh3rFyCbEruLqlG0D9n/BQzppPo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alex Elder , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.10 202/717] arm64: dts: qcom: sdm845: Limit ipa iommu streams Date: Mon, 28 Dec 2020 13:43:20 +0100 Message-Id: <20201228125030.656380195@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228125020.963311703@linuxfoundation.org> References: <20201228125020.963311703@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bjorn Andersson [ Upstream commit 95e6f8467c83c4074a6f6b47bad00653549ff90a ] The Android and Windows firmware does not accept the use of 3 as a mask to cover the IPA streams. But with 0x721 being related to WiFi and 0x723 being unsed the mapping can be reduced to just cover 0x720 and 0x722, which is accepted. Acked-by: Alex Elder Tested-by: Alex Elder Fixes: e9e89c45bfeb ("arm64: dts: sdm845: add IPA iommus property") Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20201123052305.157686-1-bjorn.andersson@linaro.org Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/qcom/sdm845.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.27.0 diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 40e8c11f23ab0..f97f354af86f4 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -2141,7 +2141,8 @@ ipa: ipa@1e40000 { compatible = "qcom,sdm845-ipa"; - iommus = <&apps_smmu 0x720 0x3>; + iommus = <&apps_smmu 0x720 0x0>, + <&apps_smmu 0x722 0x0>; reg = <0 0x1e40000 0 0x7000>, <0 0x1e47000 0 0x2000>, <0 0x1e04000 0 0x2c000>;