From mboxrd@z Thu Jan 1 00:00:00 1970 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 B3233C61DF4 for ; Fri, 24 Nov 2023 15:56:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231343AbjKXP4H (ORCPT ); Fri, 24 Nov 2023 10:56:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229715AbjKXP4F (ORCPT ); Fri, 24 Nov 2023 10:56:05 -0500 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 033B91B5 for ; Fri, 24 Nov 2023 07:56:11 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-99bdeae1d0aso286492466b.1 for ; Fri, 24 Nov 2023 07:56:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1700841369; x=1701446169; darn=vger.kernel.org; h=in-reply-to:references:subject:cc:to:from:message-id:date :content-transfer-encoding:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=nw3Uf93v4iSEa/tdYMiQyvWyR4Di+Wg4uCLDclNVmg0=; b=NYuGxzqABuzAmy6p/kptBJtRuMvWkMfsoJSnoYeqfe9MFUh4mKd6b/bEJZ5udax3tH xzFWyA7g5o65v9079Tg0tYVMCAa4lfJarcKH3WeNSdycwiz9e2WbTKJV1UOjg16T/en1 7Ki9iYsLxkTjD/f+NPFb588cbentamfYG+dIdQ8ZLcW5Pnseoy4X4tfbNgqE48X45FrH LfppJMWeSCpQT2MF7i752EHV8JOiLi9fnd0CRwaVRc991riZEoLhijudpYHv/DewCZ4P u3TTcSZQvFDG1Q1JCdclHRTqon7Rh+YBUlnjnE53cA3h5d3DDEeF+7LpUtTJzIHtZ8MZ g5/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700841369; x=1701446169; h=in-reply-to:references:subject:cc:to:from:message-id:date :content-transfer-encoding:mime-version:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=nw3Uf93v4iSEa/tdYMiQyvWyR4Di+Wg4uCLDclNVmg0=; b=VDaygnfpBW1nu2M4V3HeM6TeD8ZZPP+Hwh6P70SmudFDDqWqT3jPkMlWl0p2tJuYvV V8GPRrFrJiN6mSPgKSdEJRYm9hdcj6LtskiQpXnsofr6M1RzHBuRfeFzGuLSFRYVkE4B YBwmWIrtu5saVo/uFKtiHn11B+sXc/CdL/gVKbZdPDYOfMu56tv8tyWHeuFk3x3Kb8E2 D70o2aUKWI8t6X6kcCaEmlOsESHNgDBEeso0tI7SeRxslNKi3zAxuPZYCArA630qoPXv 8o2UADQUr507u85FYmQG+KbfLEoSlsreiRLV9NEPeN+QPToTB1oGQGx89gAEwfgU4O6Y CHVA== X-Gm-Message-State: AOJu0YzTxDFSAVlArgPfha7T9OPB4dfDG0ZDqHBL1IL36DIsLx1UEwYt RJJMxALqTW/6hyx7Ozc0TN/cxA== X-Google-Smtp-Source: AGHT+IHdYT+wamtbURTY6Lg3vipmmatxHpZyDbbDEqCD+868icucZy3YUAsomjQh8KBK3Ob6gLqU1Q== X-Received: by 2002:a17:906:747:b0:9e2:af47:54c9 with SMTP id z7-20020a170906074700b009e2af4754c9mr2612285ejb.19.1700841369481; Fri, 24 Nov 2023 07:56:09 -0800 (PST) Received: from localhost (dhcp-089-099-055-216.chello.nl. [89.99.55.216]) by smtp.gmail.com with ESMTPSA id k18-20020a17090646d200b009f826f1238esm2205215ejs.100.2023.11.24.07.56.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Nov 2023 07:56:09 -0800 (PST) Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Fri, 24 Nov 2023 16:56:08 +0100 Message-Id: From: "Luca Weiss" To: "Vikash Garodia" , "Dmitry Baryshkov" Cc: "Stanimir Varbanov" , "Bryan O'Donoghue" , "Andy Gross" , "Bjorn Andersson" , "Konrad Dybcio" , "Mauro Carvalho Chehab" , , "Rob Herring" , "Krzysztof Kozlowski" , "Conor Dooley" , <~postmarketos/upstreaming@lists.sr.ht>, , , , , Subject: Re: [PATCH v2 2/3] arm64: dts: qcom: sc7280: Move video-firmware to chrome-common X-Mailer: aerc 0.15.2 References: <20231002-sc7280-venus-pas-v2-0-bd2408891317@fairphone.com> <20231002-sc7280-venus-pas-v2-2-bd2408891317@fairphone.com> <4cfad910-1821-3a31-c372-3f6b199e8f71@quicinc.com> In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri Nov 24, 2023 at 2:35 PM CET, Vikash Garodia wrote: > > > On 11/24/2023 6:23 PM, Dmitry Baryshkov wrote: > > On Fri, 24 Nov 2023 at 14:30, Vikash Garodia wrote: > >> > >> On 11/24/2023 5:05 PM, Luca Weiss wrote: > >>> On Fri Nov 24, 2023 at 7:38 AM CET, Vikash Garodia wrote: > >>>> > >>>> On 11/22/2023 7:50 PM, Luca Weiss wrote: > >>>>> On Wed Nov 22, 2023 at 2:17 PM CET, Vikash Garodia wrote: > >>>>>> > >>>>>> On 10/2/2023 7:50 PM, Luca Weiss wrote: > >>>>>>> If the video-firmware node is present, the venus driver assumes w= e're on > >>>>>>> a system that doesn't use TZ for starting venus, like on ChromeOS > >>>>>>> devices. > >>>>>>> > >>>>>>> Move the video-firmware node to chrome-common.dtsi so we can use = venus > >>>>>>> on a non-ChromeOS devices. > >>>>>>> > >>>>>>> At the same time also disable the venus node by default in the dt= si, > >>>>>>> like it's done on other SoCs. > >>>>>>> > >>>>>>> Reviewed-by: Bryan O'Donoghue > >>>>>>> Signed-off-by: Luca Weiss > >>>>>>> --- > >>>>>>> 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/arm64/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; > >>>>>>> }; > >>>>>>> > >>>>>>> +&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/bo= ot/dts/qcom/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>; > >>>> 0x2184 is a secure SID. I think qcm6490-fairphone-fp5.dts needs to o= verride the > >>>> iommus property as well to retain only the non secure SID i.e 0x2180= ? I am > >>>> seeing below crash > >>>> > >>>> Call trace: > >>>> [ 47.663593] qcom_smmu_write_s2cr+0x64/0xa4 > >>>> [ 47.663616] arm_smmu_attach_dev+0x120/0x284 > >>>> [ 47.663647] __iommu_attach_device+0x24/0xf8 > >>>> [ 47.676845] __iommu_device_set_domain+0x70/0xd0 > >>>> [ 47.681632] __iommu_group_set_domain_internal+0x60/0x1b4 > >>>> [ 47.687218] iommu_setup_default_domain+0x358/0x418 > >>>> [ 47.692258] __iommu_probe_device+0x3e4/0x404 > >>>> > >>>> Could you please reconfirm if Video SID 0x2184 (and mask) is allowed= by the > >>>> qcm6490-fairphone-fp5 hardware having TZ ? > >>> > >>> Hi, > >>> > >>> On FP5 it seems it's no problem to have both SIDs in there, probe and > >>> using venus appears to work fine. > >>> > >>> Are you using different firmware than QCM6490.LA.3.0 on the device wh= ere > >>> you tested this? > >> I was testing this on RB3 board which uses firmware [1]. > >=20 > > There is something wrong here. > >=20 > > RB3 board uses venus-5.2 > > RB5 board uses vpu-1.0 > > Only sc7280 uses vpu-2.0 > > Tested on QCM6490 IDP board, which is QCOM internal board similar to RB3 = gen2. In any case, I don't know much about the venus & iommu setup here. I can try removing the 0x2184 SID and test if venus still works on FP5. Also should the chromebooks keep that iommu entry or not? Regards Luca > > >> > >> Regards, > >> Vikash > >> > >> [1] > >> https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmwar= e.git/tree/qcom/vpu-2.0 > >> > >>>> > >>>>>>> memory-region =3D <&video_mem>; > >>>>>>> > >>>>>>> + status =3D "disabled"; > >>>>>>> + > >>>>>>> video-decoder { > >>>>>>> compatible =3D "venus-decoder"; > >>>>>>> }; > >>>>>>> @@ -3748,10 +3750,6 @@ video-encoder { > >>>>>>> compatible =3D "venus-encoder"; > >>>>>>> }; > >>>>>>> > >>>>>>> - video-firmware { > >>>>>>> - iommus =3D <&apps_smmu 0x21a2 0x0>; > >>>>>>> - }; > >>>>>>> - > >>>>>>> venus_opp_table: opp-table { > >>>>>>> compatible =3D "operating-points-v2"; > >>>>>>> > >>>>>>> > >>>>>> Changes look good. Is this tested on SC7280 ? > >>>>> > >>>>> Hi Vikash, > >>>>> > >>>>> I didn't test it myself on sc7280 (just qcm6490-fp5) but dtx_diff > >>>>> reports no differences except for status =3D okay property being ad= ded, so > >>>>> there should be no change on those boards. See below. > >>>>> > >>>>> Regards > >>>>> Luca > >>>> > >>>> I tested on SC7280 (herobrine) and all good. > >>> > >>> Great, thanks! > >>> > >>> Regards > >>> Luca > >>> > >>>> > >>>> Regards, > >>>> Vikash > >>> > >> > >=20 > >=20