From patchwork Mon Dec 28 12:43:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 352699 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp9816906jai; Mon, 28 Dec 2020 07:10:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJwlFZAu/WpgwvQwg3MxLKYeM0PsOq9nuPXqWMMEM4fNCSMoAYpaU10K8bqQqnAyo3j7f6n+ X-Received: by 2002:a17:906:810:: with SMTP id e16mr36945207ejd.34.1609168214964; Mon, 28 Dec 2020 07:10:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609168214; cv=none; d=google.com; s=arc-20160816; b=Y7iPjD7LZf33c/WTWBB0gw7/3fE8lqQ4J36YKBQxo0YM9xj5gNrje7R1B1bpVP+x1c OK4Cm7f6ftSxJtPK5CZr0cdMbmj38XLKHvqjqglpNXsjN/HbS4/79KNYSFoFgbRUXn5G t9H7v73Gg3eOfpVf9gggKPXJCMQzeH1ZIja6wjlpAWeojMN2OhkrIei/gS4n8O8+OJG7 7Ecg7KmRCBHKF3F1V1zx+XEr9/ob78QeyCBe81F1hOWiuc+p1uCD/fS3h0bkTVnMTegz 2dxzG5z1nCezSyh275nflmLWj1OI/0YloxkAvPdp0c9OSH7LVKFAZyfU8DZYn4WNVL+A qo9Q== 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=3xfiPyy1xnKRZbzG8xoVgeQzmfcg/Y82L21lJWi41PY=; b=Db7Zt91h84xlrKA3Unqle/6thl7EzXjUJK5dePGUaInT35OYtVXCnmB7LzpmG5wWDs NpLSyMNfBy9vR8h0IrPdBOv+XDRbDqL53KIdbCXLk41rwIE23D97X3XYh/Onfio1ckw0 UMYIbQMdVhweoMfA9vfBFeFMRfegN2nLgA5aheH4kr/D/B3YLxDXOm9cNr7/YyX76HKH OUrRDdWEQwcKsuMYDFsaHxQfk4iYhJAOSH8XOBMxT4jK2q2ohwYE/G3j+bIPhpYXnp6s +ZScmPEZxF7gwc3wdLfh7CwU0MIHKT4vp4NzSEotwWR/4DMnHv4ll9pLLgZY9z+5xXZb d4cA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=SuHJWSJL; 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.14; Mon, 28 Dec 2020 07:10:14 -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=SuHJWSJL; 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 S2439490AbgL1PFX (ORCPT + 14 others); Mon, 28 Dec 2020 10:05:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:45744 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2438379AbgL1OLO (ORCPT ); Mon, 28 Dec 2020 09:11:14 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8098F20731; Mon, 28 Dec 2020 14:10:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609164634; bh=E1bQpI9RN96K7zvpzcbQ7/BxJFNvZGbMLZcbJivgd2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SuHJWSJLMhSupZmNvZ0/jr/jHQK5HXVby9emT73DWFE8vBXiMP2QJ+aICyuVNz0R5 iUZt2iUswr6WJKoG+tlf+iOKnZ7Od8gL63BGVWw/04WyS46LNb2wkeE7GWbxGrfp2z B1rg7WPS+MMiqvuuI3UEGy26yvufiZjow9aIHI3U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bjorn Andersson , Alex Elder , Sasha Levin Subject: [PATCH 5.10 213/717] arm64: dts: qcom: sc7180: limit IPA iommu streams Date: Mon, 28 Dec 2020 13:43:31 +0100 Message-Id: <20201228125031.176824661@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: Alex Elder [ Upstream commit 8f34831d3659d38f480fddccb76d84c6c3e0ac0b ] Recently we learned that Android and Windows firmware don't seem to like using 3 as an iommu mask value for IPA. A simple fix was to specify exactly the streams needed explicitly, rather than implying a range with the mask. Make the same change for the SC7180 platform. See also: https://lore.kernel.org/linux-arm-msm/20201123052305.157686-1-bjorn.andersson@linaro.org/ Fixes: d82fade846aa8 ("arm64: dts: qcom: sc7180: add IPA information") Reviewed-by: Bjorn Andersson Signed-off-by: Alex Elder Link: https://lore.kernel.org/r/20201126015457.6557-2-elder@linaro.org Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/qcom/sc7180.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.27.0 diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index a02776ce77a10..c71f3afc1cc9f 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -1394,7 +1394,8 @@ ipa: ipa@1e40000 { compatible = "qcom,sc7180-ipa"; - iommus = <&apps_smmu 0x440 0x3>; + iommus = <&apps_smmu 0x440 0x0>, + <&apps_smmu 0x442 0x0>; reg = <0 0x1e40000 0 0x7000>, <0 0x1e47000 0 0x2000>, <0 0x1e04000 0 0x2c000>;