From patchwork Mon Oct 2 14:20:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 147556 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1734625vqb; Mon, 2 Oct 2023 15:50:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF9N/Stl+rjdrYKL4kJUEuvu6H3yt1WbIQJMJJu5VCQy16WmR3icRiuTgrTa7OtVQySSipx X-Received: by 2002:a05:6a21:66cb:b0:160:ec7e:ec07 with SMTP id ze11-20020a056a2166cb00b00160ec7eec07mr11673923pzb.58.1696287022721; Mon, 02 Oct 2023 15:50:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696287022; cv=none; d=google.com; s=arc-20160816; b=vncwG9wyPyCgCZ1+qz5y9/OVreXunjqwZQdeYPSuiL+lOhYkhWWspV82pOQh/Xpots 9AqwnKpJ6XqURkEtYTTICncK0bUH87acIoaDUt/h8u+/rL0OJfbNpB8MGNlbHxf+qpCo iIeqSGXuG5soe/ShvqeqJg8grIyp7S/XwFmDOKmwGKeJnQu55UxR0HX13LcZzhgRi6xu Vv8q2NCakkM9o2z4bCvnhsD+0GN/oErHDd6bHNL/nopoCQg9+MCJQaRmcm6Aj4lIIsBI N0tAJvZ6JW9CIsmd3/cqNLToJNR1FlMUiPRK7rEqSBouB6A4+WtbLbBc0S2782UjBlBn P/LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=P1hZYPziDEWmtdRiUaFpSGZqLrCtBE6eM/yrVSmM+ac=; fh=RbuVdAHdkZh3zmsnEBmnbXgcSPvehQVzUrpFzUODU6Y=; b=pUB+oPU/0XT/l6TUb9dEVX5xgvcPINRXNZXiNComToX/X3L2sAtCXlzz2EHdI7+tBH 66zrLd3nwCL47zvKCy3KTCi/vxMAxMPkKxhI6G68h6RkQAFD7XLA5CgbgOuHvVhgJ6iC zJLLwyboXAbbux3i2990N/nvun0Q6Hiz/TksbBiRwLRyiiO/4hWyZc3DE2RZl8f6fX/5 ibR+gCXL9EMXFS0fndJQL2tTDxLyB3PoMnWl0swBJE3Zr5SimUfWaIQdQGw4tuLLzfeW OlPuBRbPOYnXLBE8X9fLiEnneys3mxEB/MXT9OcVx1uiBo8Oad3rI/IstW37rwZO4NAE uN+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=zHyiXBuX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id j2-20020a056a00174200b0068ffda29587si29851pfc.109.2023.10.02.15.50.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 15:50:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=zHyiXBuX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id B1432801CBCF; Mon, 2 Oct 2023 07:20:54 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237740AbjJBOUn (ORCPT + 18 others); Mon, 2 Oct 2023 10:20:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237730AbjJBOUg (ORCPT ); Mon, 2 Oct 2023 10:20:36 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FE33C9 for ; Mon, 2 Oct 2023 07:20:32 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-52fe27898e9so23027568a12.0 for ; Mon, 02 Oct 2023 07:20:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1696256431; x=1696861231; 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=P1hZYPziDEWmtdRiUaFpSGZqLrCtBE6eM/yrVSmM+ac=; b=zHyiXBuX02GTWjhbEMuVda/7vb0nTmIEluWBJOJWDh2BNkmlDQBkhd21LlSqSRB6IQ g8YwPujM654dlXByMzho0iNUYZkt3AbpzyTlX9YYEBtOsF7FULUwHWsvF4xBr8vbC33m 6NKDX016MSIA6YTit/C1QUxfWEJ1z1nqDPoD3o18aiCOagFA57zqH4YFo5bhnJN8mgCA EmzeElY+M7gA2wglSjZMquE28BrGGXkJZv1Tii3E0rWyFatyK0+/JG6fYfmeHVNmEIz0 Dyul+Gn6xAFOYE8qY+To6TFUdcODa7XrvJszfpPXKDOaRjJC//NdRckE2rtH/oxcISp9 WNiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696256431; x=1696861231; 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=P1hZYPziDEWmtdRiUaFpSGZqLrCtBE6eM/yrVSmM+ac=; b=MxY1uYJsUCv3kDAzWe30Gxpllv20lI82lY9vu+Za31NYD3lrVfLWSaq/UR1QR9kNAA DTPNEo9VZKgMvkv6Mu/rEVxsBlUM5cEqcNOxCc5CHrKi1/SHZespMTFe8zNM9Ydz85Pr qjswf741A5BBWUEOGSChNuBptclR2Ch2ZpZ3bQdxsLN99zwBj9j2BBdO9SNyrF6p0KM7 RzcOpuUhW5AYV4TkGMu1m86lC8aEkqiPcZm1pvrE2p03oZVnemcIuZbk+cKZ1bpJoESO RXLlpfSqMv2hBCNIOiL113I/uCXo5m4cCQNEFG+9CJDqfjtaYOUeSPMPPQF/QQGZgEDN hcxw== X-Gm-Message-State: AOJu0Yzgq8qIZGQEt39ENn5xnj1CRSpy+jkbz8FoA1Wf/ZNM7ZzoyiZP WiZfsj52Y44cVtVlpr7EupZqsA== X-Received: by 2002:a50:ee1a:0:b0:523:3e23:15ab with SMTP id g26-20020a50ee1a000000b005233e2315abmr2670995eds.26.1696256431036; Mon, 02 Oct 2023 07:20:31 -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 w10-20020aa7dcca000000b005309eb7544fsm15583356edu.45.2023.10.02.07.20.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 07:20:30 -0700 (PDT) From: Luca Weiss Date: Mon, 02 Oct 2023 16:20:29 +0200 Subject: [PATCH v2 1/3] media: venus: core: Set up secure memory ranges for SC7280 MIME-Version: 1.0 Message-Id: <20231002-sc7280-venus-pas-v2-1-bd2408891317@fairphone.com> References: <20231002-sc7280-venus-pas-v2-0-bd2408891317@fairphone.com> In-Reply-To: <20231002-sc7280-venus-pas-v2-0-bd2408891317@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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 02 Oct 2023 07:20:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778685861404979203 X-GMAIL-MSGID: 1778685861404979203 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. Reviewed-by: Konrad Dybcio Reviewed-by: Bryan O'Donoghue Signed-off-by: Luca Weiss Reviewed-by: Vikash Garodia --- 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/platform/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 = { .vmem_size = 0, .vmem_addr = 0, .dma_mask = 0xe0000000 - 1, + .cp_start = 0, + .cp_size = 0x25800000, + .cp_nonpixel_start = 0x1000000, + .cp_nonpixel_size = 0x24800000, .fwname = "qcom/vpu-2.0/venus.mbn", }; From patchwork Mon Oct 2 14:20:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 147352 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1524104vqb; Mon, 2 Oct 2023 09:01:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGcnwe/zJCzDXXhLVQ490yO8kAI5kHSF1x2rtfqNe5O5rWBvxFq0nnqocqpo+wB0QvpLTP6 X-Received: by 2002:a17:903:44a:b0:1c0:c4be:62ca with SMTP id iw10-20020a170903044a00b001c0c4be62camr9761086plb.17.1696262519501; Mon, 02 Oct 2023 09:01:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696262519; cv=none; d=google.com; s=arc-20160816; b=sbtTUsXaquH5canmUakvpr4qfgC9wBUDHXtJJxmqvF8UAa5G+XydVupAkkZ198Iutt XR5M4vV6ndTWcfOypCirBBxtlj19Mp6W9BM9ntQRZQThAoOJwYtlZ6Vy9ubOEO6eh34E 1fUUydI4EX0ieNBbHkJRxfPYKKZGWdwtVTov6BHGxFuACUYOpDKnzI8GRQm2eex4G933 bYGXAca9Vre6Dm5evffmiAmTNXRyDUax6gw1n2bmluetjXacOZh1mtI3XXbh3bpPT2Vo UtreMcMKGHm6rEl+HTdsWEwJBAkXNzrPmQOggnDj2If9rrKdVtk/lyZfcW9OogYXlZkz 3OFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=W3IqRDQO3YMqUzu0c5SK0CfZMleyMRbL6H+Fh9GL8Gk=; fh=RbuVdAHdkZh3zmsnEBmnbXgcSPvehQVzUrpFzUODU6Y=; b=RekUSk52ojvhdGnOwnC8ULrjOlHPpSE5j0sfbbasXIEQ45wryqY0PVe8o4ETx/3zR4 xX3qqJyHkvBnSRQ4kw7yqWGI9wqJdCsf7egBpi0YxD1/baqvzP7lcNQammz5vDdIIGm8 frqXvEmJ52LP2M41f9aGyYvwqNbHzqrRqI/jOfJPHj76NW2DgeE9ZhktPrX57cpGNMm1 OQWJXC5Kqk/RereraQgwqhTZ3vWRjbDznp2OthiaUiecK/MKLfQNGRYM36Snayqy+h3k 2S6ax6sl35TLgspDmRBF0qsXsBFLbSxwt5rcNyDGUT7tG4ogdgUv4oO7QoEDIejImsmK 24GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=30g4eMrW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id lb14-20020a170902fa4e00b001c4605546b5si25857004plb.42.2023.10.02.09.01.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 09:01:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=30g4eMrW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id B04F4806AFD5; Mon, 2 Oct 2023 07:20:56 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237747AbjJBOUr (ORCPT + 18 others); Mon, 2 Oct 2023 10:20:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237741AbjJBOUh (ORCPT ); Mon, 2 Oct 2023 10:20:37 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70BF7E6 for ; Mon, 2 Oct 2023 07:20:33 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-5346b64f17aso13616805a12.2 for ; Mon, 02 Oct 2023 07:20:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1696256432; x=1696861232; 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=W3IqRDQO3YMqUzu0c5SK0CfZMleyMRbL6H+Fh9GL8Gk=; b=30g4eMrWlMyBhabHisXWqEIatsSjDwWwPdceCWbL8z0f+GQwKFnRdUNXrQSNrPEqGg SK1+1BYenMY+AIEQnQpIw6jYLBaxOZ/VITRhXOxc+EQbV9mzHrc3ZBHAC8XX3v5wzdul OISuWWMWnY4SKbOZhlaAaKzPlIa/9BWO8t0emwJlqVe0/8K+XU8YQ4ZR0pDQMPLiuEc7 qS4OfkMvlmj0kPdQUnorTU4HlWg/j/gLneP2fSg4ubTY222Jpn3YmZd/5XIWCDai+s0i NiwZLyFVvJwgh/bo8r8ca1Z6mhaquRHT5mwnYCQwGbrijny5NIBuAKhCj2SGv4soqxFX jV0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696256432; x=1696861232; 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=W3IqRDQO3YMqUzu0c5SK0CfZMleyMRbL6H+Fh9GL8Gk=; b=gKd3pHahtRy4VgPMsamfFR06DWcF4FHxSh9J6YKqj/gmm7lS8rQIklybxqLhtcF3+9 BkVxh65RkXG+dvpBTjh5DEyFhl2z1SEYJIj3DIR0eZbVPJHwrWbozUIiPKuvc8Rb+3ZO HojHrR3rX10gSvKvG+VhXAYxlAOaCwE51irloW8QC4Om+JePstIGlyjISNq0SVAVjcCX 4m20T16cJMZWk9WEBy3OvcBJKXrm2xDAXFqGNtCVf8ka251agSLIRbTTAf5hYmjnsPoA DxWo74oIHA0GiiwyZ+j6i37bYetdzPwITBB3qbg5hWJ9zt7NU217LM5XfrveLIhAHYtH JHbA== X-Gm-Message-State: AOJu0YzcPYvN2EK8jQsPgSFCeEYYi0pCKhj+pzhwbPDtMvoSGNb/zgpi bG2TNf9zyLUCekB3M35E8g+MvA== X-Received: by 2002:aa7:c584:0:b0:530:a226:1f25 with SMTP id g4-20020aa7c584000000b00530a2261f25mr9383353edq.17.1696256431920; Mon, 02 Oct 2023 07:20:31 -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 w10-20020aa7dcca000000b005309eb7544fsm15583356edu.45.2023.10.02.07.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 07:20:31 -0700 (PDT) From: Luca Weiss Date: Mon, 02 Oct 2023 16:20:30 +0200 Subject: [PATCH v2 2/3] arm64: dts: qcom: sc7280: Move video-firmware to chrome-common MIME-Version: 1.0 Message-Id: <20231002-sc7280-venus-pas-v2-2-bd2408891317@fairphone.com> References: <20231002-sc7280-venus-pas-v2-0-bd2408891317@fairphone.com> In-Reply-To: <20231002-sc7280-venus-pas-v2-0-bd2408891317@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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 02 Oct 2023 07:20:56 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778660167863564979 X-GMAIL-MSGID: 1778660167863564979 If the video-firmware node is present, the venus driver assumes we'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 dtsi, 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 = "okay"; + + video-firmware { + iommus = <&apps_smmu 0x21a2 0x0>; + }; +}; + &watchdog { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/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>; memory-region = <&video_mem>; + status = "disabled"; + video-decoder { compatible = "venus-decoder"; }; @@ -3748,10 +3750,6 @@ video-encoder { compatible = "venus-encoder"; }; - video-firmware { - iommus = <&apps_smmu 0x21a2 0x0>; - }; - venus_opp_table: opp-table { compatible = "operating-points-v2"; From patchwork Mon Oct 2 14:20:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 147334 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1487833vqb; Mon, 2 Oct 2023 08:04:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEbNmm/6YJgMLWwJxmyk20mMFjuBjqUXtXj17TvtkjzZbNSFftEZUjD1nqp+steiJly8vTc X-Received: by 2002:aa7:888f:0:b0:68f:e810:e86f with SMTP id z15-20020aa7888f000000b0068fe810e86fmr10969042pfe.28.1696259087730; Mon, 02 Oct 2023 08:04:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696259087; cv=none; d=google.com; s=arc-20160816; b=WaK8SflZgxzyoaatLngeWWaYOGJp62biTFy3LGD58h6qRk/IkdUa2PzUDAdHn8OWog Re5XP2r4NGOFHwTl/1mi2ZJAjrwys/+mQWyNbXhrNi8lLszkeqSYSPL925fib32tLQUP p2F/CU50i1VHQ3DDAr9wYVsvRd4daL5SxKvqkUwOe0WZfANoQQX77u9kLSWILFadzr9J hjQF2kcKL6JPTb/29r/U2iCLPseNsdhOUZNTxmKtF4mwrlmJqoQ6Xnv8hsqFM9z7WgCo IHG/2KRaxv3gyUSyO5ZtjmUP9wIHChzvXCBOVXxyg6CK7zuvruxzgVxU5zdrNlma+HkZ igaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=q5zIgA66kGCbchY/Ojg8H7iySCE0A8qr1NX3eo7f44c=; fh=RbuVdAHdkZh3zmsnEBmnbXgcSPvehQVzUrpFzUODU6Y=; b=RAZlylP2C7bnyIcZQylpoAckZi1nAzlgViZARC423OfzfGf1f/wy5Mh5eJzwXKh5vA OJoEB6L+N2ICyu9X9g8hYz0DMoomSSig2AhBD9b+9Npb1H+WwECPD3KRUvDZeBxb+02b V5+48NvMOH5gq+9L1wKY6IJELDE7BSAxO4TB7lK8LdnNYd8wmI+B7zsFFLrm5beGhZqm yRMQ6AOky5XdnkYNjApOb/MlyF9JrXpawWIi8T5984i72dI5pqjrB79pbBcmCxV8xrDM ykKn/HfVCELkr0bChCxYG+9xWMBxjfj1/1wcKIgLtkUgya8zSLJ2bFh7aJKyOOZQGLud 6nPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=1lWWqahT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id o73-20020a62cd4c000000b0069026fd5a31si25851955pfg.272.2023.10.02.08.04.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 08:04:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=1lWWqahT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id CE4018047565; Mon, 2 Oct 2023 07:21:05 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237783AbjJBOUv (ORCPT + 18 others); Mon, 2 Oct 2023 10:20:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237745AbjJBOUh (ORCPT ); Mon, 2 Oct 2023 10:20:37 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E59AE0 for ; Mon, 2 Oct 2023 07:20:34 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-53627feca49so7311526a12.1 for ; Mon, 02 Oct 2023 07:20:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1696256432; x=1696861232; 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=q5zIgA66kGCbchY/Ojg8H7iySCE0A8qr1NX3eo7f44c=; b=1lWWqahTP3gORKGiaZ8FZz7o2kLTESUJjkAIci0gU12uDu/IFMeMlaQLXmeAABy3X+ Cxo7KXg+aaBZlGGZWjpYvAotclV+xpXuECjAx0bgmlnQFMVb3Sh4jeKjK56c1s6G2W1M k4M89kG68EG98Td4xVF39xAOg9ceT3i52CNw6PqcXGs5DX0vOMInmXcZPftADSiTNtqM L0Ri8NMboj4J4RtM0EsKAD8skPqGxjgWi0qImLljKBVDsLQ2786l8xiI+T++oYX3ePdm v6U8MAr79HPkmIVJLmVxTqZTivCjFBfNG/lNzKrXyrTpP7E2c2UYCTwc17VQ5wZ1uu32 VbCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696256432; x=1696861232; 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=q5zIgA66kGCbchY/Ojg8H7iySCE0A8qr1NX3eo7f44c=; b=TP8qn7xr+0lyrDmQ0mpRyJXOFBoo9OaEc2gJPX4xdyEQa5o0H5YP9n0U/OKpLVDgCE SpB50PWAkuHoE0lIPLDlfwVYkMAJpOqF3P1RFezxgtuUjs/IrWOuVRwkuObLEVxc6L8V 29qwCwjcodjWxUa8IFCI+N92chse3oeHO/GSLVh1bDSPVNK6z7KSQ8159QZw2dGAZpI1 v6SYhcU9ZWPoLErEbitVrUBkzvFxyXEiWcxsYAYh480yf/YY2FGm/X2p9y0c1IMGlEnx ejLUkVEVt51f7weyV3P66f4hyJe3fkM0uDSvLLC6kSN8ZCTTmKZ6nE3Wo2ENpZrifOVp 3QLA== X-Gm-Message-State: AOJu0YyQPWoc31pwRGSeQZuigEl1Orxy8A6CBbNOSEGQUuJkyV5Fn1jY YGzYTmrBTJB5Sdr4WY4I80jxdA== X-Received: by 2002:aa7:c24d:0:b0:530:9b94:96e with SMTP id y13-20020aa7c24d000000b005309b94096emr9420553edo.41.1696256432713; Mon, 02 Oct 2023 07:20: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 w10-20020aa7dcca000000b005309eb7544fsm15583356edu.45.2023.10.02.07.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 07:20:32 -0700 (PDT) From: Luca Weiss Date: Mon, 02 Oct 2023 16:20:31 +0200 Subject: [PATCH v2 3/3] arm64: dts: qcom: qcm6490-fairphone-fp5: Enable venus node MIME-Version: 1.0 Message-Id: <20231002-sc7280-venus-pas-v2-3-bd2408891317@fairphone.com> References: <20231002-sc7280-venus-pas-v2-0-bd2408891317@fairphone.com> In-Reply-To: <20231002-sc7280-venus-pas-v2-0-bd2408891317@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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 02 Oct 2023 07:21:05 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778656569028217766 X-GMAIL-MSGID: 1778656569028217766 Enable the venus node so that the video encoder/decoder will start working. Reviewed-by: Konrad Dybcio Reviewed-by: Bryan O'Donoghue Signed-off-by: Luca Weiss Reviewed-by: Vikash Garodia --- 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/arm64/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 { status = "okay"; }; + +&venus { + firmware-name = "qcom/qcm6490/fairphone5/venus.mbn"; + status = "okay"; +};