From patchwork Tue Nov 15 09:06:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 20247 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2603330wru; Tue, 15 Nov 2022 01:11:09 -0800 (PST) X-Google-Smtp-Source: AA0mqf6kqGBGc0mzS6kfZSJ1qO94btnTCKWcPljz1aVVV7asRs0qk6NipxWBIrAGkiPaFKpWui43 X-Received: by 2002:a50:fc8e:0:b0:461:bcf0:86dc with SMTP id f14-20020a50fc8e000000b00461bcf086dcmr14751984edq.368.1668503469096; Tue, 15 Nov 2022 01:11:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668503469; cv=none; d=google.com; s=arc-20160816; b=GAVR8KeUrIJjBjGMyjr42tkwPdwuX1Y1hfcIec657KbOg7w7RZAYbk+/ymQJM6QeQt fZHA5rZ4GN3JvrNCVl/JRt42xqdcxFnDMixKQU6Y6EaJ90vBRfxf+wxCt0LGkd0/5Rdz HdMXdRDO1PiBK+cUJM4jhUySDHUGKyJkq134bIntfzn4q/Drcc6mSjt7+BR1HryLCWBr rudzp0Dt85caT215pdxNyKO+Oxx1G/4ujN+/AS95V9HbjZVoCWWPPjUD88vfpncfzMaV SoNzpSryhSXWMnz+7ktdTytHNNF9OmuzNHglagp6LCwnaXMtt6FvHKLsTWNuFzZbOGlY RKKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=R5ZFQEoKVRbIfSfItdmWycqTzq7emVGHn7tQvs1HyFc=; b=bb9/ksLQ77fr4QBcv0YvDwnUBN7SGeterS/izB8nHR2k2q8rJY01fB6bjXoEUuTcZB sBCFUG7CM6snOcTCStNO9SrKwo4KSKr62MARQCmso23UOEKkJJZbCR+f8vmCSMFtzVSv hM32wHXvv46gAXL0tXc/dnBSuCHtJoJVCktK1jCIDAeONZgAcS6LuxEiTeozPIe7Jx6N bsKMso2aGq4W8t3gPxBsTZV524A2pJySfDVX+AybGdoMA0DBRjZaBLVixa+ay50RT9RI Z7YMApFjn+rqtOXRNr8SkHPl8mCQy2gBx9ScfLPobVj+hAlRjNLBZF4zOKyxvbzqbmWS jBeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=kaTCXy9N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id oz17-20020a1709077d9100b0078d8bd255d4si11940860ejc.949.2022.11.15.01.10.44; Tue, 15 Nov 2022 01:11:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=kaTCXy9N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237809AbiKOJH0 (ORCPT + 99 others); Tue, 15 Nov 2022 04:07:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237821AbiKOJHQ (ORCPT ); Tue, 15 Nov 2022 04:07:16 -0500 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6B8A220D2 for ; Tue, 15 Nov 2022 01:07:14 -0800 (PST) Received: by mail-pj1-x1034.google.com with SMTP id b11so12773593pjp.2 for ; Tue, 15 Nov 2022 01:07:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=R5ZFQEoKVRbIfSfItdmWycqTzq7emVGHn7tQvs1HyFc=; b=kaTCXy9NTn9ky20nP7T+gz/kzP4EXtscARvVKey6KLpM1X5mvpxHLvxGZRgm3HiGKy Ku4VVEhfcdvwqWQRZkpEaw87Z5WtiIBKtibuSyCqkLo4tHTDDSwVORjGzVXHUW3mfet4 AFamSQ83xPANX9ssr7d+CfeU6vpusLtDTxABE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R5ZFQEoKVRbIfSfItdmWycqTzq7emVGHn7tQvs1HyFc=; b=rdGFroUrYkBy1nozDBZ2oLvjjbrODYYxJIYg2NtXDsM3rCzi7alOPgojZFPnZK4tUQ IIqTIxGjwxjJw3JNpOLObLwLaEgRPcxvZ0ktExp6ZgkHOauwmnhLn5iQDRknee0+Iaxy HtxK79CyKWvd49wEpu0cLM9wJaLZB8HyQYFdSCJGi1vIKusSIwNgINXlI4reUmPt8ctl WhUwQgrJuxbrFXVDVmQeJZ0O/dAuhZ52Hb62thvXnaaehvgqGHrnSHaop6zE8FF2ijm5 HHoAe6joE/8bSqqtrRiEZMhJAnyLEdmGpnyGyGZT+Zn/WcOqRzPjFnPhU8RzleF1ILzP xA9Q== X-Gm-Message-State: ANoB5pkle+ESvvM4VCt2w54eOtkpx2Niwjm3TTN3PJvHMk+9MmP/9LeT z/8Q3tX8T2n5kbaRC2gNgNjgZw== X-Received: by 2002:a17:903:28d:b0:186:9cce:c59 with SMTP id j13-20020a170903028d00b001869cce0c59mr3133032plr.120.1668503234175; Tue, 15 Nov 2022 01:07:14 -0800 (PST) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:4d49:6d15:b250:5977]) by smtp.gmail.com with ESMTPSA id q16-20020a17090311d000b00182a9c27acfsm3378830plh.227.2022.11.15.01.07.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 01:07:13 -0800 (PST) From: Chen-Yu Tsai To: Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Jernej Skrabec , Samuel Holland , Hans Verkuil Cc: Chen-Yu Tsai , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] arm64: dts: allwinner: h6: Add IOMMU reference to Hantro G2 Date: Tue, 15 Nov 2022 17:06:44 +0800 Message-Id: <20221115090644.3602573-3-wenst@chromium.org> X-Mailer: git-send-email 2.38.1.493.g58b659f92b-goog In-Reply-To: <20221115090644.3602573-1-wenst@chromium.org> References: <20221115090644.3602573-1-wenst@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749552693706144975?= X-GMAIL-MSGID: =?utf-8?q?1749552693706144975?= The Hantro G2 video decoder block sits behind the IOMMU. Without a reference for the system to properly configure the IOMMU, it will fault and cause the video decoder to fail. Add a proper reference to the IOMMU port. The master ID is taken from the IOMMU fault error message on Linux, and the number seems to match the order in the user manual's IOMMU diagram. Fixes: 0baddea60e8d ("arm64: dts: allwinner: h6: Add Hantro G2 node") Signed-off-by: Chen-Yu Tsai Acked-by: Jernej Skrabec --- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi index 53f6660656ac..ca1d287a0a01 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi @@ -161,6 +161,7 @@ video-codec-g2@1c00000 { clocks = <&ccu CLK_BUS_VP9>, <&ccu CLK_VP9>; clock-names = "bus", "mod"; resets = <&ccu RST_BUS_VP9>; + iommus = <&iommu 5>; }; video-codec@1c0e000 {