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: 625006 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 03574C433FE for ; Tue, 15 Nov 2022 09:07:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237557AbiKOJHY (ORCPT ); Tue, 15 Nov 2022 04:07:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237809AbiKOJHP (ORCPT ); Tue, 15 Nov 2022 04:07:15 -0500 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A229D21E3F for ; Tue, 15 Nov 2022 01:07:14 -0800 (PST) Received: by mail-pj1-x1029.google.com with SMTP id k5so12747915pjo.5 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=P62LRIInzqERpDsl4KiVrBJI60/mtB2qQjT44Dc63JEICrIXB4kA1Aq/cSkoJt5AAK y5xxPuaag8kiKhb0DmAdDCGjUxqGYHKnK8YQaCtL3C3TfZPsfVvyQGSf3gzoTZl5nzt0 sPRL+W/iSTxeo6II/vjRg8Nh1Sf1MYaJf5yWkdA9Zwtukzl6Bk18Kx9VHoWgHbUoH5a5 YhBa2Cr/r+hcoahLGgu7ETIOSIP1pQN8PQ5eVjG6+kUsovPK8zmU8nY6fkLQQf8l+IVn v2gccMUVBeKRsJnIqnW6cHmYZEZRyVAGW/KQV7yfrMhZk4k+tCl4rGuiqDiq6FpOq/+6 EtNw== X-Gm-Message-State: ANoB5pnwYxk7YhdgPNBcU9aoHnhF08j00KEMdVOtBaiQ/RWEEzN86gIR CWnrAVr0o2p7axIW4PWWaTCUOw== X-Google-Smtp-Source: AA0mqf6xPgmp/9dWQoBk4GaDGwS6v+A/TwdAX5vB3zmEdHUZjJxWqfB0WDZ/WyQ5o/+ZIS9vw8C7cQ== 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 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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 --- 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 {