From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E449A60BAC; Tue, 23 Jan 2024 00:45:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705970750; cv=none; b=q9Rf7Ggz2CqM5DyfflceJQv8uGlH9Mfy963zq7kID8mqDdFHT7GCMqAPJoLnqk9dWR7rgT1ieZVuL7WAgGVmdV665ztY8o2GAIPI+tFjXgS3XS/uqQYj89za5zhWTBL/Y2AjqqLLfLMVAgo3QmMshiZLXeLKG7Xt76Bhw7iZtg0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705970750; c=relaxed/simple; bh=iV57wsX90Zc6WcBB5+cOfWADT6+OszjirUCkxWoPeX0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QjNUhL6ZaeOVTCKMMG0NXLjkZIRQgtUrvTw1XaB4VrAzFkZU1HYyQfuEuY9EwIt+V2woejpGnmv8JtHDwxtVgPq4T2a5QHzkUcLu6mKgnQCNq5IxlL1QYr8G+0u7VA9E8W1HqRfs2VKWdVGslt8rgLiMlxJFPK5twOKSzI+XbQ8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=A9tQGdAS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="A9tQGdAS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0DCF5C433F1; Tue, 23 Jan 2024 00:45:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705970749; bh=iV57wsX90Zc6WcBB5+cOfWADT6+OszjirUCkxWoPeX0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A9tQGdASyl//PSRl9U+bLjE125BKZ0JDELfu7EAb63sAJ42P5ZKdAIDCOPWiNF8Lm VQ1erW67MDQSsyG9xCMyTVXJLR4+Cp+7KOM/HlmwTXtm/yOc1OQWSGLh9G9p/YpqAV kCqON+MdM660KxXRq/60InfvzIA3HH53rwqEug7k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Konrad Dybcio , Bjorn Andersson , Sasha Levin Subject: [PATCH 6.1 103/417] arm64: dts: qcom: sc7280: Fix up GPU SIDs Date: Mon, 22 Jan 2024 15:54:31 -0800 Message-ID: <20240122235755.263415878@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235751.480367507@linuxfoundation.org> References: <20240122235751.480367507@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Konrad Dybcio [ Upstream commit 94085049fdad7a36fe14dd55e72e712fe55d6bca ] GPU_SMMU SID 1 is meant for Adreno LPAC (Low Priority Async Compute). On platforms that support it (in firmware), it is necessary to describe that link, or Adreno register access will hang the board. The current settings are functionally identical, *but* due to what is likely hardcoded security policies, the secure firmware rejects them, resulting in the board hanging. To avoid that, alter the settings such that SID 0 and 1 are described separately. Fixes: 96c471970b7b ("arm64: dts: qcom: sc7280: Add gpu support") Signed-off-by: Konrad Dybcio Link: https://lore.kernel.org/r/20230926-topic-a643-v2-2-06fa3d899c0a@linaro.org Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/qcom/sc7280.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index b1016ccdf032..30e18ce54921 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -2533,7 +2533,8 @@ gpu: gpu@3d00000 { "cx_mem", "cx_dbgc"; interrupts = ; - iommus = <&adreno_smmu 0 0x401>; + iommus = <&adreno_smmu 0 0x400>, + <&adreno_smmu 1 0x400>; operating-points-v2 = <&gpu_opp_table>; qcom,gmu = <&gmu>; interconnects = <&gem_noc MASTER_GFX3D 0 &mc_virt SLAVE_EBI1 0>; -- 2.43.0