From patchwork Mon Nov 20 12:12:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 745447 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="BR/P1bMi" Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16A2AD8 for ; Mon, 20 Nov 2023 04:13:10 -0800 (PST) Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-53e08e439c7so6196632a12.0 for ; Mon, 20 Nov 2023 04:13:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700482388; x=1701087188; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=y4obJbFuX32a51CPgRwasEGqIWFeGs2SFetYjrfd9IY=; b=BR/P1bMiVUDoKw1BoecSGM4mIDLORYLlo7RbXSocFuXCQ1vmatjqkTtF6tc2iReXpT r5nkkdBIF3RwqdtcP1BGb4TlVMTgbdZT7mW/ttw47RtlAXI8lREjm7SYfWPPFCJPLbY0 Hr5oiNlsR0aUcsWjfVE/ZjtOCHXkjef3gTGHf7wRF34m+pBtC+g2SVtAreugOqaoMIJq nRExJfiPRZUp5I3GjbyxlWV5MXaTPTklBRuRUCTFxKqGFkjStPTqgj2Kluq0pW80hK0b XHGCpzLqmv9OiIESmafW96cu8K3LWoLmDX7a48l9a1m00MEhNUAaoAwZ+gRcF8sls/x4 xalg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700482388; x=1701087188; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y4obJbFuX32a51CPgRwasEGqIWFeGs2SFetYjrfd9IY=; b=Fuky/m5rFnrr8jrV3k+pgf3Hflezo8JKhMHizYMlS6gXGZ1tqZ7bsrQh5Gr4WdBDJ3 Rg4+e9f1q4AXlnx/OW83vHbKtN8/B+lI98ca8UmdClKb8XRF04sIy9p+Mn8OTYLI0mHo 4tV5s4UMERhPlGhgbXksnpiswUWt93wqIvLqA6eQ2DvZr+Sxci0CkMXzU7hTSFAPpumy FZ/XXn9HmbdU7fMrvb8B3jZ1fwm0UZGePTiQISHFv/wTJMcj/owt1Len04XUO1bs9My8 Q6VD35hX2b7hSMdx095Q+aCZ6ypu9mwDf5ZNRcMnrNE2eTz4dKWZK56ltG9V+5dSqAHc 934Q== X-Gm-Message-State: AOJu0YwFgZYkE8P+zY/FrUj6Pud/biqpA8HWn46sse+FaT5d51YVrCOW Q4Bi755IYSHKPZGdRbfD0X6pDQ== X-Google-Smtp-Source: AGHT+IHvqKMeMD59wsOARYBHIOOtmh9DOb0vYqoILiQ4tuG247ufeLMp7wMGy+ZaKH140knr325lBg== X-Received: by 2002:a50:d7d4:0:b0:53f:2128:ff4f with SMTP id m20-20020a50d7d4000000b0053f2128ff4fmr4619581edj.17.1700482388356; Mon, 20 Nov 2023 04:13:08 -0800 (PST) Received: from [10.167.154.1] (178235187204.dynamic-4-waw-k-2-3-0.vectranet.pl. [178.235.187.204]) by smtp.gmail.com with ESMTPSA id i22-20020aa7c716000000b00548ac80f90csm1324584edq.40.2023.11.20.04.13.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 04:13:08 -0800 (PST) From: Konrad Dybcio Date: Mon, 20 Nov 2023 13:12:52 +0100 Subject: [PATCH v2 1/4] arm64: dts: qcom: sc7280: Add ZAP shader support Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230926-topic-a643-v2-1-06fa3d899c0a@linaro.org> References: <20230926-topic-a643-v2-0-06fa3d899c0a@linaro.org> In-Reply-To: <20230926-topic-a643-v2-0-06fa3d899c0a@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , cros-qcom-dts-watchers@chromium.org, Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stephen Boyd , Akhil P Oommen Cc: Marijn Suijten , Luca Weiss , Rob Clark , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1700482383; l=1670; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=FO3D/4Lb+LmHq1IGkCnu/dhJPyd8/ht4WBGb18ODAj4=; b=GDIoeoFFvlB60e66DCtoCtdYcFDJbtJgGMbZGN5KrIZ1iWjzao4lxLmmp21pEUKM97CcEFTle lF26xtdb/VUC4IGtZsC0gvQrUiKc+np3MWMmV6N9bzHMdNmiX96otsu X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Non-Chrome SC7280-family platforms ship a ZAP shader with the Adreno GPU. Describe that and make sure it doesn't interfere with Chrome devices. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 2 ++ arch/arm64/boot/dts/qcom/sc7280.dtsi | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi index 5d462ae14ba1..88fc67c3646e 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi @@ -17,6 +17,8 @@ * required by the setup for Chrome boards. */ +/delete-node/ &gpu_zap_mem; +/delete-node/ &gpu_zap_shader; /delete-node/ &hyp_mem; /delete-node/ &xbl_mem; /delete-node/ &reserved_xbl_uefi_log; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 04bf85b0399a..58563f8fdc16 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -152,6 +152,11 @@ ipa_fw_mem: memory@8b700000 { no-map; }; + gpu_zap_mem: zap@8b71a000 { + reg = <0 0x8b71a000 0 0x2000>; + no-map; + }; + rmtfs_mem: memory@9c900000 { compatible = "qcom,rmtfs-mem"; reg = <0x0 0x9c900000 0x0 0x280000>; @@ -2613,6 +2618,10 @@ gpu: gpu@3d00000 { nvmem-cells = <&gpu_speed_bin>; nvmem-cell-names = "speed_bin"; + gpu_zap_shader: zap-shader { + memory-region = <&gpu_zap_mem>; + }; + gpu_opp_table: opp-table { compatible = "operating-points-v2"; From patchwork Mon Nov 20 12:12:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 745446 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="g9Am2HQJ" Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AD2FF5 for ; Mon, 20 Nov 2023 04:13:14 -0800 (PST) Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-547e7de7b6fso8168177a12.0 for ; Mon, 20 Nov 2023 04:13:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700482393; x=1701087193; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=hc7Srsl8oO2HlJZxLPv8yK7GL1izzxy48y1+02c51Ts=; b=g9Am2HQJqjG6BO0Jwcvnjb0cSPRagXFZozNxavQ0MoKXmGlsFmrmICMBB0nXa++3hC 2oc+BbIoGR5TFP/TjNF/QP7OTMFaRBpsjTVXOLB1tGntDfOgsTX9M3FxMsUz6lC+Re+z xGDMf5+C7ZjkUny1OqG15U3u1AVB35pJtPz+FrdCQkDrWiFlRSbifZmMJ8JG6DCuKS5h 9acMZ4mB1hgqJHB+Nx34/c7m+uqwcMeOejfUkAONfb217AC762Zp9fMw9Jpfaqwh+MZP vlLeu9HwPVntEYz9BlZEA0B5LnlWNhbVARbZT2hKGCOonGjZzUd5Mjwb3oM8js6rl8Xb 6msg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700482393; x=1701087193; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hc7Srsl8oO2HlJZxLPv8yK7GL1izzxy48y1+02c51Ts=; b=TYHsjVF7GSuCwjbRlLL7TqtgKX5zN3CCuXDQKsasmvXwF6BE00niUeYGQBlI5k4MTQ sPeABAsUux1Xr4M6To8DeR+QVGNwU1iae/8i8SNxKBhkYDZ2m6Lky8Vp4g+ptGYqskLZ 3LxjdiDxDFzTiuYU9j0vRgu9wVH21pDzTnDKBmRY9Tc9NeR9hUN/DP0acdjz77yuwWy7 pkf50ojpqVRXVc7pp/vfXp53fufB4wUfTXtMK96wDg+iYlk0K66ngrBXP+GtS5Los0if 6z7v6Xi2eOClOrnbPA2j8RPqJbCs5ZSsbIppWRrMtNjbFTVBoW53X7i4qz4PGvIqDkGZ 9MBw== X-Gm-Message-State: AOJu0YwjYRtXjVQba5sWNzRJi3kfnTjsh7wnmhPsWeiC34JfWyh1xGgT m/eI6yH+Yuo5KvNXZlG8YJ5TOw== X-Google-Smtp-Source: AGHT+IGw/4MA6a4F2ynhiVNpF2g4hzEzhrMsIOv0gcbFJUT46nhwK4WRybWUyxcnRwFshSqp3RC5UA== X-Received: by 2002:aa7:c7cc:0:b0:548:e0e1:4a37 with SMTP id o12-20020aa7c7cc000000b00548e0e14a37mr517770eds.6.1700482392848; Mon, 20 Nov 2023 04:13:12 -0800 (PST) Received: from [10.167.154.1] (178235187204.dynamic-4-waw-k-2-3-0.vectranet.pl. [178.235.187.204]) by smtp.gmail.com with ESMTPSA id i22-20020aa7c716000000b00548ac80f90csm1324584edq.40.2023.11.20.04.13.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 04:13:12 -0800 (PST) From: Konrad Dybcio Date: Mon, 20 Nov 2023 13:12:54 +0100 Subject: [PATCH v2 3/4] arm64: dts: qcom: sc7280: Mark Adreno SMMU as DMA coherent Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230926-topic-a643-v2-3-06fa3d899c0a@linaro.org> References: <20230926-topic-a643-v2-0-06fa3d899c0a@linaro.org> In-Reply-To: <20230926-topic-a643-v2-0-06fa3d899c0a@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , cros-qcom-dts-watchers@chromium.org, Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stephen Boyd , Akhil P Oommen Cc: Marijn Suijten , Luca Weiss , Rob Clark , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1700482383; l=799; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=05mrlbVuANlpTmTxHApROoZU1kjiSPRK0BLlIaRuxCY=; b=N7V3LfV39ASMH6JxhCBajFYvAbuJCyrK9fNCDfTK84S8uEkPk7JXxd/ojzzIXDuqIEsSYBu02 my03rnSOGj3BWgra7wVYH42C6VvOO2cRT3XyDapRQaF6EMOK760EeZG X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= The SMMUs on sc7280 are cache-coherent. APPS_SMMU is marked as such, mark the GPU one as well. Fixes: 96c471970b7b ("arm64: dts: qcom: sc7280: Add gpu support") Reviewed-by: Akhil P Oommen Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc7280.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index db47af668232..6964c14ffce5 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -2787,6 +2787,7 @@ adreno_smmu: iommu@3da0000 { "gpu_cc_hub_aon_clk"; power-domains = <&gpucc GPU_CC_CX_GDSC>; + dma-coherent; }; remoteproc_mpss: remoteproc@4080000 {