From nobody Wed Dec 17 08:23:55 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A1BFE743F8 for ; Fri, 29 Sep 2023 08:38:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232893AbjI2Iir (ORCPT ); Fri, 29 Sep 2023 04:38:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232859AbjI2Iih (ORCPT ); Fri, 29 Sep 2023 04:38:37 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 062EF1B2 for ; Fri, 29 Sep 2023 01:38:34 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-9ae2cc4d17eso1850928466b.1 for ; Fri, 29 Sep 2023 01:38:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1695976712; x=1696581512; 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=fOWusuB+PJKjWg0I1/CANfiCcxqSyq9YW+0X1DGwXrU=; b=u6lLL8ECo0kIt9x8I4vz7H4uB1KlrBw2gHITC2PUnkyZau8rWGm93FdXsyCPksI7d1 2r4KSTj8qkKnr8AKdxDP+jEaz6OHjO4Mpaov+aKwA9XfrlAevfLQz796BrAPUc740pKQ oDIa6U2x9s/GIHqcxYRUaD7WEgZrty0ytB3LIATJYGcZaHAiKUM1VJRIAhXUEe5OM51J qUVDGhCZBDWDmHclGZhTPcLknRw5EOjSGJO6BftM0yoi5NZGlaRB3aihZJ4vV2Vmfyia 8dSGqPoWCVXZZ1jEVhM7exmoRojreMlS+pfaHCMIYBSzsh0nn5SU2LEqr4Tiw84QF4CI iYCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695976712; x=1696581512; 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=fOWusuB+PJKjWg0I1/CANfiCcxqSyq9YW+0X1DGwXrU=; b=PSgOtynLcJYkf0q5DOTkYNuuD3NrxXJO7JwAZgyGtdmPNpBISEAFVvydW4+wpv0ygA o3eIsnCD8PVVwDX+Oe8zFG6flXZkRke2sx3KA6uP9et3BSCqq27rNYMENkc/fZZBA8wc 0+LpdW6wjSB1GwGv64WsYVVqkJ9LdeIAtvzG0P6qTPnD2shYMHJQ08EdUl52qiEila8e SZyamc0UtAaCAO1ysi8pJApfz9imMrv3iwplTJL/aYPjjzVXn9naS3iMPKcUfTXeaG/6 xV4K+3yxmCtKSD4ZWtx7z8ZftKaOBgVWykFFM4DzbVZxlcRSnBN3BhWwOmlstcCD0/pf irZA== X-Gm-Message-State: AOJu0YyKlCIn8nv6j3CVEmXi0fZhHav24TkXsvZyZPZnm4WY1bXm0PXo GhBlB1PfVKCZUoe2dJq+wamXZQ== X-Google-Smtp-Source: AGHT+IEWR92YMVGrUJ5RbQ/heh37u0ZBG1Ma86v3zGzQBjc8vLO3PtSXU3sJrxy1LVODE3qkkrxcVA== X-Received: by 2002:a17:906:30ca:b0:9b2:794d:62d3 with SMTP id b10-20020a17090630ca00b009b2794d62d3mr2952442ejb.14.1695976712440; Fri, 29 Sep 2023 01:38:32 -0700 (PDT) Received: from otso.luca.vpn.lucaweiss.eu (144-178-202-138.static.ef-service.nl. [144.178.202.138]) by smtp.gmail.com with ESMTPSA id qk8-20020a170906d9c800b009ad89697c86sm12208965ejb.144.2023.09.29.01.38.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 01:38:31 -0700 (PDT) From: Luca Weiss Date: Fri, 29 Sep 2023 10:38:19 +0200 Subject: [PATCH 1/3] media: venus: core: Set up secure memory ranges for SC7280 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230929-sc7280-venus-pas-v1-1-9c6738cf157a@fairphone.com> References: <20230929-sc7280-venus-pas-v1-0-9c6738cf157a@fairphone.com> In-Reply-To: <20230929-sc7280-venus-pas-v1-0-9c6738cf157a@fairphone.com> To: Stanimir Varbanov , Vikash Garodia , Bryan O'Donoghue , Andy Gross , Bjorn Andersson , Konrad Dybcio , Mauro Carvalho Chehab , cros-qcom-dts-watchers@chromium.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Luca Weiss X-Mailer: b4 0.12.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Not all SC7280 devices ship with ChromeOS firmware. Other devices need PAS for image authentication. That requires the predefined virtual address ranges to be passed via scm calls. Define them to enable Venus on non-CrOS SC7280 devices. Signed-off-by: Luca Weiss Reviewed-by: Bryan O'Donoghue Reviewed-by: Konrad Dybcio --- drivers/media/platform/qcom/venus/core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platf= orm/qcom/venus/core.c index 054b8e74ba4f..5c6baa0f4d45 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -881,6 +881,10 @@ static const struct venus_resources sc7280_res =3D { .vmem_size =3D 0, .vmem_addr =3D 0, .dma_mask =3D 0xe0000000 - 1, + .cp_start =3D 0, + .cp_size =3D 0x25800000, + .cp_nonpixel_start =3D 0x1000000, + .cp_nonpixel_size =3D 0x24800000, .fwname =3D "qcom/vpu-2.0/venus.mbn", }; =20 --=20 2.42.0 From nobody Wed Dec 17 08:23:55 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A20C8E743F8 for ; Fri, 29 Sep 2023 08:38:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232932AbjI2Iiw (ORCPT ); Fri, 29 Sep 2023 04:38:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232871AbjI2Iii (ORCPT ); Fri, 29 Sep 2023 04:38:38 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 173011B6 for ; Fri, 29 Sep 2023 01:38:35 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-9b1ebc80d0aso1521331966b.0 for ; Fri, 29 Sep 2023 01:38:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1695976713; x=1696581513; 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=Eb8SXxyy/PW+V96CqaPd3QJGGDx1CmgmZ0KsU7u1POg=; b=OFwZj2kc3WBPg5A4j1LXYvHp6W5Si7JjPkH9S0+RiWIxvV9pLhFYEPVliAP2q9XC6v oBxaey+2k1ATLwW+VtrCWKuhKe5d7oj/CPvB81bDQ0+JwMMS4i02TOJemdVX5qlC9uG/ ct+gUAjG4I1628mgDG15PtuA6tdpW9nxykffbgLpfT6EtcVbBPq6PW8/PDTunn2NT3YE NnlhKMqU24KbeCS56fvslpwmlbVnu+D4DfqrAJPz42Wg8PIEmCrtSJBTyPHjpYdnGjpw /Iear0TMi0BHtdYx+zgQEHBto3BMFY/dvFl/8uENYIl85ofvKQcAv+Tyw8+52xvNHccg AF4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695976713; x=1696581513; 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=Eb8SXxyy/PW+V96CqaPd3QJGGDx1CmgmZ0KsU7u1POg=; b=DkwYr0phC37uE9TXo+CH0mfmKoLoc8b1CKoe9suJtPWT4kfOS1J/YOmgKfT6qY0YDr VV5hsQT75WN2AdcOJZEKe+XgRqVnRgjl0kKJlySQFFPKAw3qGZdNUU9eYCIZtVIqDKXt v8RxHxvpCo5cbfbiZlH3hCmEtlsTfOQ1k5FtV0CzF87mZka66RzOVIC41O7lS7AO7ZiZ JUzDtdpNuTh5n8mu3mHAr3we3j4SoxcnZfh+CDW5TGcGiaG7FRyLv+jAMjPgEQeuTDxf 1Snbi0XoqtHlwCI12toeNGTNbjClKVVpYR6zYsTzz4AfXbIPGym1K2IOoxuM+cIfamyV ZAaA== X-Gm-Message-State: AOJu0YyvuicSUmfKtEzmNO/qoojtnu3I053tJTtWA3C8cl5+jKhovUGX KsDWtvnGPKKl/bPufB25tTe4QQ== X-Google-Smtp-Source: AGHT+IHWo6Ad+NGH7yOlybgeRKc1BDC4UBNVMKM73Iv+L+9Io0w560rL/OsLgRo5bWtZz2faxPtTnA== X-Received: by 2002:a17:906:10cd:b0:9ae:7081:402e with SMTP id v13-20020a17090610cd00b009ae7081402emr2825437ejv.64.1695976713284; Fri, 29 Sep 2023 01:38:33 -0700 (PDT) Received: from otso.luca.vpn.lucaweiss.eu (144-178-202-138.static.ef-service.nl. [144.178.202.138]) by smtp.gmail.com with ESMTPSA id qk8-20020a170906d9c800b009ad89697c86sm12208965ejb.144.2023.09.29.01.38.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 01:38:32 -0700 (PDT) From: Luca Weiss Date: Fri, 29 Sep 2023 10:38:20 +0200 Subject: [PATCH 2/3] arm64: dts: qcom: sc7280: Move video-firmware to chrome-common MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230929-sc7280-venus-pas-v1-2-9c6738cf157a@fairphone.com> References: <20230929-sc7280-venus-pas-v1-0-9c6738cf157a@fairphone.com> In-Reply-To: <20230929-sc7280-venus-pas-v1-0-9c6738cf157a@fairphone.com> To: Stanimir Varbanov , Vikash Garodia , Bryan O'Donoghue , Andy Gross , Bjorn Andersson , Konrad Dybcio , Mauro Carvalho Chehab , cros-qcom-dts-watchers@chromium.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Luca Weiss X-Mailer: b4 0.12.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the video-firmware node is present, the venus driver assumes we're on a non-TZ system. Move the video-firmware node to chrome-common.dtsi so we can use venus on a TZ board. At the same time let's disable the venus node by default as is custom on such nodes. Signed-off-by: Luca Weiss Reviewed-by: Bryan O'Donoghue --- arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 8 ++++++++ arch/arm64/boot/dts/qcom/sc7280.dtsi | 6 ++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm6= 4/boot/dts/qcom/sc7280-chrome-common.dtsi index 5d462ae14ba1..cd491e46666d 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi @@ -104,6 +104,14 @@ &scm { dma-coherent; }; =20 +&venus { + status =3D "okay"; + + video-firmware { + iommus =3D <&apps_smmu 0x21a2 0x0>; + }; +}; + &watchdog { status =3D "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qco= m/sc7280.dtsi index 66f1eb83cca7..fa53f54d4675 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -3740,6 +3740,8 @@ venus: video-codec@aa00000 { <&apps_smmu 0x2184 0x20>; memory-region =3D <&video_mem>; =20 + status =3D "disabled"; + video-decoder { compatible =3D "venus-decoder"; }; @@ -3748,10 +3750,6 @@ video-encoder { compatible =3D "venus-encoder"; }; =20 - video-firmware { - iommus =3D <&apps_smmu 0x21a2 0x0>; - }; - venus_opp_table: opp-table { compatible =3D "operating-points-v2"; =20 --=20 2.42.0 From nobody Wed Dec 17 08:23:55 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A16CCE743FF for ; Fri, 29 Sep 2023 08:38:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232902AbjI2Iim (ORCPT ); Fri, 29 Sep 2023 04:38:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232846AbjI2Iih (ORCPT ); Fri, 29 Sep 2023 04:38:37 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88E811A5 for ; Fri, 29 Sep 2023 01:38:35 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-9b2cee40de8so90250166b.1 for ; Fri, 29 Sep 2023 01:38:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1695976714; x=1696581514; 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=SJ7dWwjIApKtRRNvf80hbFpB8p0JqB1tooDJ9n4DaEc=; b=TgzOm07j+oG1QdQ6M6etJgUeQYZp+TXhNEwce6SC7NegU1rvUIB8qWIqSre70gvqIl MZoLTwZhnSm4GD9A7X5nEcFjM5oklp7VbT6v2YugXw9sAAVaRZKFefkHoVYLwtQPQqmA kwLGp3DeDUejD6/DoBtKu4NVoQF23G9vRfrPyPHWSFuCBwpVq2JqnteNoGkCboByweNL rW7vkuPdNX+G8+XZjZ0EYIFQSrZIN9tIaanqwXw4ghxwvG+XB10HbW9hYVpN433PmAm8 RxdVY393/oodVrOK4Cp5rIRsjrBeNtzJXY45LiiHcVFwVhGvLxwbKznFsmVG2+9g9t0x zOVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695976714; x=1696581514; 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=SJ7dWwjIApKtRRNvf80hbFpB8p0JqB1tooDJ9n4DaEc=; b=rnrEmWja58ArI3f9Oc2SjqYTkneLYYtx9Os5jOkXWTdZv6k6R5PTLOM4EebNlYUf17 V/OarOCLagxqQizSNC6Ohw5z+0xqs6tAeliFFrwF4r8YMnhQPQiEHBujk06MYmLpsRFz 6NZL7oujqQm9KBsZg3NUfzcYmWu/dKDORMMtVFlj+jIjtaalOI7q+I4rqrdRjH2GkWwK v0GgCQFcK8eZGFSPHX+Y7PbifXJ6kO+88halmYgPBMVxrYnxq9jRX+8+JxtW26A4Qb6I d4HraE+JpWlzgsvuiMw3uZdrc8h9VKG8d+X/tPeWip+zVPsF5ixrTAh4wcesczXjBWFT u6Vg== X-Gm-Message-State: AOJu0YyOmAzVYPyWodLImbr1CYNNRd8GNbTeMtbokAFQ+bBvdNVcOoTx S1BwIo8vIzb9mUnJbwWtZAu3kQ== X-Google-Smtp-Source: AGHT+IEhBGY5oEalRjg4MOYzaPZSrg/MxpppdFL+uwcBakrAbyblbQv0sSsQVIzDZ1igXxgYsQTD2A== X-Received: by 2002:a17:906:8a73:b0:9a1:b528:d0f6 with SMTP id hy19-20020a1709068a7300b009a1b528d0f6mr3157220ejc.27.1695976713867; Fri, 29 Sep 2023 01:38:33 -0700 (PDT) Received: from otso.luca.vpn.lucaweiss.eu (144-178-202-138.static.ef-service.nl. [144.178.202.138]) by smtp.gmail.com with ESMTPSA id qk8-20020a170906d9c800b009ad89697c86sm12208965ejb.144.2023.09.29.01.38.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 01:38:33 -0700 (PDT) From: Luca Weiss Date: Fri, 29 Sep 2023 10:38:21 +0200 Subject: [PATCH 3/3] arm64: dts: qcom: qcm6490-fairphone-fp5: Enable venus node MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230929-sc7280-venus-pas-v1-3-9c6738cf157a@fairphone.com> References: <20230929-sc7280-venus-pas-v1-0-9c6738cf157a@fairphone.com> In-Reply-To: <20230929-sc7280-venus-pas-v1-0-9c6738cf157a@fairphone.com> To: Stanimir Varbanov , Vikash Garodia , Bryan O'Donoghue , Andy Gross , Bjorn Andersson , Konrad Dybcio , Mauro Carvalho Chehab , cros-qcom-dts-watchers@chromium.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Luca Weiss X-Mailer: b4 0.12.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Enable the venus node so that the video encoder/decoder will start working. Signed-off-by: Luca Weiss Reviewed-by: Bryan O'Donoghue Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts b/arch/arm6= 4/boot/dts/qcom/qcm6490-fairphone-fp5.dts index 2de0b8c26c35..d29f10f822c9 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts @@ -665,3 +665,8 @@ &usb_1_qmpphy { =20 status =3D "okay"; }; + +&venus { + firmware-name =3D "qcom/qcm6490/fairphone5/venus.mbn"; + status =3D "okay"; +}; --=20 2.42.0