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: 13461147 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 88D76C54FB9 for ; Mon, 20 Nov 2023 12:13:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 58B5210E3B2; Mon, 20 Nov 2023 12:13:13 +0000 (UTC) Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 40AEC10E3AC for ; Mon, 20 Nov 2023 12:13:10 +0000 (UTC) Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-5401bab7525so6170564a12.2 for ; Mon, 20 Nov 2023 04:13:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700482388; x=1701087188; darn=lists.freedesktop.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=lxbAjQfw6UgfmOhqcK56Fql1vlSg9Ygz1ld6Nzo8GeIAIsLcMVlXqQDYl6VeDP8FA/ qvwE1q74oSeL8o3TxEpbbVT1S5m0UaYHunH/+nu9+Zvq4OHkL1Ma+nFYTe+lID240066 gpJ4mm2f12GuPboqZ+1yCH1Gx4mIO7IGai0OvlnNw3F93pe+IGQZve70kuxbxe+umyyI clVWDvP+mja82twubt/TWWBUF9Y6LV9rL9q+aQW/VY6UTyVhFmvBLg33W7WpjtM7snXh t+5YbbFDMCyeI6XmngVx+hboDIzARb8FxHK9GCt6mTLiEVBAV+FmcNtj1AS1Rt5UKXlZ ilqQ== 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=bjVMbijOdHOik8XXcp1ZMA2ERKJo4aJqGDsemHFTKq225PnA5ROaWW8V1NPhOxniT0 AaJsO8JdHW0loWGUV2MuwLmzyiQntgLN3dCGFZ71jnnFdi85/+7MLJ8dwJZiWiFZ5UWC pu282r1B83WWL+5z72v4cuNU3S42jwzVcErUg6EQ0CyNK4Hsaa/A5+j9JCucjOXvG5w4 DrRAw56jOp74sjej0+fzRWcP7TAWr3VSMl636p773foxQki6cRlnd868tyh92LB048LZ e7mAyMkhbDuWwqSkLDECvoGBljwaSxZiPQ8ABvbGewrowwgXgN4UMK1uI85boRt+jC8N MPgw== X-Gm-Message-State: AOJu0YyCICOmUCpe9XaaXvngDg9eTvodhG0x86umgTU9jNwj4Q5sWeE4 JtTYL9f8Pw0sprrEAW9Qw0J6Ww== 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 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 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= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Clark , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Luca Weiss , Konrad Dybcio , Marijn Suijten , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13461148 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 55EA3C54E76 for ; Mon, 20 Nov 2023 12:13:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A0A3110E3B5; Mon, 20 Nov 2023 12:13:15 +0000 (UTC) Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by gabe.freedesktop.org (Postfix) with ESMTPS id DFB3610E3AB for ; Mon, 20 Nov 2023 12:13:11 +0000 (UTC) Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5437d60fb7aso6255063a12.3 for ; Mon, 20 Nov 2023 04:13:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700482390; x=1701087190; darn=lists.freedesktop.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=XQ0ypSe1N8mypAau3OPEaXjK2/eDjD7aM7p9a0KkeYY=; b=c/5CC20sh99F+OtkL8N7F1/1CcmByZhFugm7Vw+I8CxUD2s1ZXfxSWgNIiKhtbkCfs +ikt95BOz6K94LhsnueLn/gzTRuFcrdj3HaDJzt2yFcLY9gIw/vsWoS4e8gA++b/1HB3 t26wErvHhGQPOcbPS4Im6Qds2DOXUR75zFEFMj5tUASv4lYGzYfpGSHmTnsEcXWob+AR jr1piaL72nJZp6xvASdHXPcFIrDIbbeHDS44SFdQWQ/wssvs1s2t9/2RO5GX0L9o/LbD 1Fir97NIMkd093bJR8GlzdtnEYBEZxSA+/ZkH5G4lxfLp/IdmSUat82QGWttuNXWZUcK uSOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700482390; x=1701087190; 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=XQ0ypSe1N8mypAau3OPEaXjK2/eDjD7aM7p9a0KkeYY=; b=ph8Fr+ftJ4kyqX8i17PUSHsFbf2gaPKD7G0loeK1dr5MmiHAX0z/UhOEIxwfq+fJro i+kdfUs3Eo/knDAe4Ox3Zl7eSh/1IxD2PElBRNxJp+w0bHZI8crdBke9SnkNXsLvQHd+ hP9XCePbDvMeBWiAte5988cof7UrJesjeo/IqAmlpm63zj55I0s6la0QXxKJYD51nUnc 29kTE12K8V31ONY47Jth5avISenEvRXp0E+4KmoJ14ber5IpjcUFSj/agQnzNtmDpLug vakfxAlAVXFDHG2RWH9Dsq2WzIwKXXv4YQzw9PiJ5Q3z8tOB+ajZaiTy8t5n1F9U1zTL /ESA== X-Gm-Message-State: AOJu0Yw4i/XYU4GcogrCmPHYa6rIAGXATz+B0lmEhOWwhovUUU8Er6b6 PBJoxWaWDfLH+UQjPJ80e59nxw== X-Google-Smtp-Source: AGHT+IHgHEWqlDlsQXQAl07jhTuaRXFLhW6gDO2Rl+xkYrooOqkwo/D69PwFKDS16PgzgicY1iZj2Q== X-Received: by 2002:aa7:d795:0:b0:53e:29c1:ae1f with SMTP id s21-20020aa7d795000000b0053e29c1ae1fmr6220141edq.19.1700482390140; Mon, 20 Nov 2023 04:13:10 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 04:13:09 -0800 (PST) From: Konrad Dybcio Date: Mon, 20 Nov 2023 13:12:53 +0100 Subject: [PATCH v2 2/4] arm64: dts: qcom: sc7280: Fix up GPU SIDs MIME-Version: 1.0 Message-Id: <20230926-topic-a643-v2-2-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 X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1700482383; l=1308; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=N2IVhDhpEh9zFeokJPv6QBy10GmMVdulaG7b6AuvP+g=; b=uG783dcu48EoyZtmTibdT6s18RnNyLq6HJ4ZSeg0kSXPAOezOy5rAXKriMyErZZssZNCUWxWR adKpfYAOfdWARCJg24F0tWOT8i81Lrg67x10qpdZ8oWQW/Nxp+Eihif X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Clark , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Luca Weiss , Konrad Dybcio , Marijn Suijten , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 --- 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 58563f8fdc16..db47af668232 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -2608,7 +2608,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>; 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: 13461150 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8F689C54E76 for ; Mon, 20 Nov 2023 12:13:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2E01910E3B8; Mon, 20 Nov 2023 12:13:21 +0000 (UTC) Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by gabe.freedesktop.org (Postfix) with ESMTPS id 659E710E3B5 for ; Mon, 20 Nov 2023 12:13:14 +0000 (UTC) Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-543456dbd7bso10252940a12.1 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=lists.freedesktop.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=YCpiO0GC/VD57VNHQwKX0ZOq606CMN2oO5v6vb5PQODeATfAo+fnGCToc++PaWQr/s H1648rtCJsWp2ShAK+3An9ypTWqBHcEdZHfYO76McgYrVkdWaNMaTX98H/CMeatPsE+7 cSwNrH6dtv4hQxzhuwu+ZeqTdFIveMLh/thn9mXbxQeCjTzkGKf+wcdeaLUV7hcj6DkN XBv/+ZKYeP1B9ZZ4I1K1hKvwCkPNlqou//D6hrW5e2tAim8vTxJbUviCMjfjO7o5SlqK xLQvBHo6s+lHXrPFmRG2h3dNutczyHqCC5EdGAsfzpECIEDTq0AM8Kb6LnwwAzlA2ikK k7Sg== 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=d1bOHmZgzh8ZA4KoJ14zYFVqIovu8ASnTXKrOkQEb3XCUJmZMqkhGKn+wmQdWcebuG wSHIYY9fgqsAeF2KioF7AEafyJst3uu5FTLeasfWBcknRH+2Pa4Z4Mda8qr3VXb5MTON UpPWy2ycwigT4p837Vm+AJxAkxQDBoMX6v0Ol0HpGkU0CZh8M1bNoHwuyLiPr1b8Pgm5 +Hir1UeUIfhLIULiHoQL+cRGFSFOGfNNvJ7/4KBo8T8eBSX2eaJ7eVSz1ipm8aCCE5Dd +lP12K+YfH7DxRGKBJs8oBT8C0sxB2YfUd4m1za+sa13eATJ/6unXiB5dmSnhO3VyxVg Gv5w== X-Gm-Message-State: AOJu0YzSi8P25HyhvfrhR1agg+YyvRT+CGUBekDV+ZXaKTITCMQEOceP G7QAkg8zmT3pD+zxGYONE6o7fQ== 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 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 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= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Clark , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Luca Weiss , Konrad Dybcio , Marijn Suijten , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 { From patchwork Mon Nov 20 12:12:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13461149 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6C652C54FB9 for ; Mon, 20 Nov 2023 12:13:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CA10C10E3B7; Mon, 20 Nov 2023 12:13:20 +0000 (UTC) Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 819DF10E3B7 for ; Mon, 20 Nov 2023 12:13:17 +0000 (UTC) Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-50aab20e828so1574998e87.2 for ; Mon, 20 Nov 2023 04:13:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700482395; x=1701087195; darn=lists.freedesktop.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=hjbqDcif3jzflMbhtEmEZ70pT8i9f+MEiRbeLY07kxg=; b=i1EXDftDwcdWdNJOWL802Mf6KKOIJP7Eh0ZQsY09G2Me+k6MlFhdOblEv2Ks8obZLM SCeP4PcdeBib87QqYu1SH6eafQjFL1dFofjs5VjieDTBhGXonm/8rYxRZa4O4OlLgVch IP0rlYzaim99iTbiRjhBqaYh9EO6HWQCINAq8ENtsAuIuaIZFllRN55EIvjf65n21wB5 KBxlUzGO9fINqvdAxLwzxB8weg46kqqTFUrwlRXKjtm+/TVypVG+ZZpLQqtrBz5yXJvF L/w8fS4FHlqUGakV6Kj2zIVpebIxJ9pRK3N24XlAQ+Tg0gY+Nl8Ec9aRwT/3RYa1IquR RiVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700482395; x=1701087195; 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=hjbqDcif3jzflMbhtEmEZ70pT8i9f+MEiRbeLY07kxg=; b=ZT+l/mY7mn2ZLyVS//0RPW5aqVEfb7D+N6cCbh6K4o7dNY/jeAEiDU+6Nt0MHGrWGA z5pnNbJkdsOnzdHgTSZfu+hncJ6LQStdX5IUWc1tHE2ELYPJt+8xBd6hWtnlkyI9k1Mh 44ySoXDKjOV/Btni6CaW8Ke8DCPaX/qVVHAn7EnO+h5aJsxBepyU74ZzkK9JP8gBbcYF Ve5eJvecV0BAkOkJx99jpHFQGIo0DNvn3V7SMBxDGO072S/CN7Rjf0rWlF55lbawkp1d xCL+XSyMsRGii/aWPC46KbwJRNrQMPDNyl0e3/H4eZ9Px689Lr4nqXSiGJSnOnBZ/D7i 6JDg== X-Gm-Message-State: AOJu0YyfeCmFTtrFFsncHcMjO96aXlgOWNH3jJs87ZCaxjiXe27SG9Qe kyPWuIy3EGCRKKGiatvSn2NBWA== X-Google-Smtp-Source: AGHT+IFxchI6MuaO4+QAa9CHUiTl9TDpRwO40gYUBYra2bKUEs5p5Bv739G2JhMQRJKThOE6+wo4lA== X-Received: by 2002:a19:650f:0:b0:508:1edf:92f with SMTP id z15-20020a19650f000000b005081edf092fmr4746097lfb.40.1700482395544; Mon, 20 Nov 2023 04:13:15 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 04:13:15 -0800 (PST) From: Konrad Dybcio Date: Mon, 20 Nov 2023 13:12:55 +0100 Subject: [PATCH v2 4/4] arm64: dts: qcom: sc7280: Add 0xac Adreno speed bin MIME-Version: 1.0 Message-Id: <20230926-topic-a643-v2-4-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 X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1700482383; l=2100; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=0f0QQnvO1OvRDYb4hv9oWcG/BSDnRfhPjCkhWoQhfrI=; b=0Nffh216XN36a8KAHzJ+iTGHOH9zXgzAyU8cqvps3yJau91tC4fBXin93gUZGtvNdoae0OqNE JbFUivsMLrcB0AtbFGl7/mvtmfceuIcCm5lRdcD6IOsN8qbnAw4NPGS X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Clark , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Luca Weiss , Konrad Dybcio , Marijn Suijten , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" A643 (A635 speedbin 0xac) tops out at 812 MHz. Fill in the opp-supported-hw appropriately. Note that fuseval 0xac is referred to as speedbin 1 downstream, but that was already in use upstream, so 2 was chosen instead. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc7280.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 6964c14ffce5..b4e6951d9359 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -2630,14 +2630,14 @@ opp-315000000 { opp-hz = /bits/ 64 <315000000>; opp-level = ; opp-peak-kBps = <1804000>; - opp-supported-hw = <0x03>; + opp-supported-hw = <0x07>; }; opp-450000000 { opp-hz = /bits/ 64 <450000000>; opp-level = ; opp-peak-kBps = <4068000>; - opp-supported-hw = <0x03>; + opp-supported-hw = <0x07>; }; /* Only applicable for SKUs which has 550Mhz as Fmax */ @@ -2652,28 +2652,28 @@ opp-550000000-1 { opp-hz = /bits/ 64 <550000000>; opp-level = ; opp-peak-kBps = <6832000>; - opp-supported-hw = <0x02>; + opp-supported-hw = <0x06>; }; opp-608000000 { opp-hz = /bits/ 64 <608000000>; opp-level = ; opp-peak-kBps = <8368000>; - opp-supported-hw = <0x02>; + opp-supported-hw = <0x06>; }; opp-700000000 { opp-hz = /bits/ 64 <700000000>; opp-level = ; opp-peak-kBps = <8532000>; - opp-supported-hw = <0x02>; + opp-supported-hw = <0x06>; }; opp-812000000 { opp-hz = /bits/ 64 <812000000>; opp-level = ; opp-peak-kBps = <8532000>; - opp-supported-hw = <0x02>; + opp-supported-hw = <0x06>; }; opp-840000000 {