From patchwork Thu Nov 17 06:07:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jernej_=C5=A0krabec?= X-Patchwork-Id: 13046198 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 72F05C4332F for ; Thu, 17 Nov 2022 06:08:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cieVWUqc+BPR4sIsm4trnl85fRln1LqO2rePl01YJ+g=; b=RmdfeaNwJZWtud 9E1XFO0UpfI+l0GO4BgUolqiCmrfKgVZnBLB0rnS4avu/P90D6TOX3DVUyWRvrSA96NE3LyomzDo4 XZcUqPmQ78jsI/ydmrRarROEitgLXbx2nNCuig0+tBPNBDiC3NdZfPpl4K3+M3S4D/sbWrLOZaeam Hgyiy8dWAOH/lHI2U1PHARSxwrP2xa5gvKEqypA5AVrii8KmCWJRre8hwBhacdmSsvRhOeUl4/8XA pkNWTJW/6RAd7c/KOkD0UOMGiagbTOdvq1A0RcsaOqQgI94YBNeNkh0LELaY9cfMXwdGQtSfw0qmB WL3Ept/UjqDNCVQaWGSg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ovY3d-00AgwD-Go; Thu, 17 Nov 2022 06:07:29 +0000 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ovY3R-00Agmz-Nz for linux-arm-kernel@lists.infradead.org; Thu, 17 Nov 2022 06:07:18 +0000 Received: by mail-wm1-x32a.google.com with SMTP id ay14-20020a05600c1e0e00b003cf6ab34b61so4127241wmb.2 for ; Wed, 16 Nov 2022 22:07:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=B/4dSPCEiDUe3Xyt1vQbKBrfveGFoVaGx8ciHb9QLPU=; b=WUBVCwSUcsGVoF5A63XFfDYRW1n0W7vigFBveEkiddsyxkiK9JwbQ2C8nQfM6NuS8j 1YiOGDJe/57NZX+qOTUggz6zwUvRm+U1wLbURpOIUesmnmvuK42IioAj0pWaJ8NqqT8L 9+yLc1PiTJx3NP6rtLtzWC+Gnjx2593eesxm3O33ss8pcUZqy2mwMgNq7DRCJWgc1u30 tbfRqwKb/anPwHPrrop0+4r6bcFvIgHRDb9ieqt45zUGDsyfgHbirdVGWZutcibNcqd9 8aJ0T+3Cut4F3djKa7abbi2qEkD3OTGCRbO8L+xPzveL7/xciSYhx27Ccm4Ckn9sx9kU PswQ== 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=B/4dSPCEiDUe3Xyt1vQbKBrfveGFoVaGx8ciHb9QLPU=; b=SFheYbUduifhF9dfUOve36QeEj/LqXHGPX3eZ+qHpboKIxawpMDj9Okjf9k4W2WInP FGzJYBWuhamto160SocxBw0iOmPuJFQKWf9bzFr2y7VS9GBVyUHmzhdZdKBG580AnvmQ q+Pb1GRB0YLJW2ou8pLf6Ee71woNooqud784CIbV1xVuJOn3n8VHtieHlQ9v2SaxUx3x uU2HKXKRoWv6B2KWCNqd8Ul+eOUoyPNu+MHANqCc4xytYMY4EfWclBmO9hBY+D1gTZRq ZdSzv7YJGgKIwoGK9e2jqwJ4fjt2zsNJfFMT/DuUy/jtcsQQlqkv4OCCWGdepPDA9VkE 6e+g== X-Gm-Message-State: ANoB5pnzppWEBdkqOEYOTMUtNhqbZCdhKmoOK93bNSpXId4uqLdoUURF 6+yG+O5dGwVQYhq3D5TrcFk= X-Google-Smtp-Source: AA0mqf6nbH1NYbfiNWEsx3ll18zbt1NmXbZvFY47Q26qtUlN3NrLlCKI8CekDyokCXbhnOmaguJOdg== X-Received: by 2002:a05:600c:3c8a:b0:3cf:6fe0:b16a with SMTP id bg10-20020a05600c3c8a00b003cf6fe0b16amr4030910wmb.28.1668665230759; Wed, 16 Nov 2022 22:07:10 -0800 (PST) Received: from kista.localdomain (82-149-19-102.dynamic.telemach.net. [82.149.19.102]) by smtp.gmail.com with ESMTPSA id r11-20020a5d694b000000b0023691d62cffsm16542568wrw.70.2022.11.16.22.07.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 22:07:10 -0800 (PST) From: Jernej Skrabec To: mchehab@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, wens@csie.org, samuel@sholland.org Cc: 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, Jernej Skrabec Subject: [PATCH v2 1/2] media: dt-bindings: allwinner: video-engine: Fix number of IOMMU channels Date: Thu, 17 Nov 2022 07:07:03 +0100 Message-Id: <20221117060704.367945-2-jernej.skrabec@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221117060704.367945-1-jernej.skrabec@gmail.com> References: <20221117060704.367945-1-jernej.skrabec@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221116_220717_795617_66B1EAB7 X-CRM114-Status: GOOD ( 10.69 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Cedrus (video engine) on Allwinner H6 actually uses two IOMMU channel, not just one. However, Cedrus on SoCs like D1 only uses one channel. Allow up to 2 IOMMU channels. Fixes: 62a8ccf3a248 ("arm64: dts: allwinner: h6: Fix Cedrus IOMMU usage") Signed-off-by: Jernej Skrabec --- .../bindings/media/allwinner,sun4i-a10-video-engine.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml b/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml index 541325f900a1..6446004d59d9 100644 --- a/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml +++ b/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml @@ -55,7 +55,8 @@ properties: description: Phandle to the device SRAM iommus: - maxItems: 1 + minItems: 1 + maxItems: 2 memory-region: maxItems: 1 From patchwork Thu Nov 17 06:07:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jernej_=C5=A0krabec?= X-Patchwork-Id: 13046199 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B1BE8C4332F for ; Thu, 17 Nov 2022 06:08:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=K+3xYeFkkYYzlrLTxcSlBdhUoCwxv8R1l/OlTOqPsyw=; b=1Z4UGWoqENVlAY i9USrqPMBDNnR3GSa7G012IUAm3G38Fe0vFwfXuU9woUlFGks807OOUxIsFntHxjFWSXDhJ22aqt5 duVt8wBfNk5TAxcv/ql/LhU3mXDnj7C9YOAqXfdt3bAOawdEfPM3Nyy5NTsc/IGvpZJI8/QkKq2oi XcGFWoisR23mI29pFX5GayO5h5FqDU3M9TaHJCoiTd+rV1Eh1KICHRu53raberzfoAdJ3y/RCr4Eb Ke72PytHjlcCvOjFcbQ7FWQE7JqbIHS3x3WS+BLG5/DspDkpd+oq2KZbQy86NsiNHQ6RmBxJTCi03 /bE2wPBLzDU4Foh3HNEg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ovY3n-00Ah1Q-MJ; Thu, 17 Nov 2022 06:07:39 +0000 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ovY3T-00AgnC-BF for linux-arm-kernel@lists.infradead.org; Thu, 17 Nov 2022 06:07:20 +0000 Received: by mail-wm1-x334.google.com with SMTP id a11-20020a05600c2d4b00b003cf6f5fd9f1so1019421wmg.2 for ; Wed, 16 Nov 2022 22:07:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=FYLz02viNCcZeuKJqkLZJicl/v6PrsUfH2KEY8TpF5c=; b=XAILsUAJagM8MUl29mV+63W7fYXbvVj1O6ywhS5MTgcLI3+dE+YuG2BgElNzv6qGWd MIZhedNEAN9eTFz/qYbXZx2SjfD70pLE01qrHOw3JGyBdYj6UsAcNBEtF2N5XvcmhAJ0 WtWGTmDzYXmFJ7LNism80tQWa8NLSn2Qjmys/RmCnCbJ4moyDyZ4kNBacLPBepBvYcTa WP7rHuVe+fy4cFCCxUGZUGCtFHBL0EznaMPh+gxSyKLHaCq9rhNckWaf+qPIWNQ1G9rF pbxv3rI+yj4bcGOzQW/oH0Ug5kZ+MGSOaMSCMf7Rv198BUocjZaEy+Gb8hRpUYKFcrvn Rnpw== 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=FYLz02viNCcZeuKJqkLZJicl/v6PrsUfH2KEY8TpF5c=; b=lERtbI+YrlLDkGRUCrKPYsy8TmX7hjjewwj2bgPzvkW0iYXh34dA/6tIBwN2RYAXL5 KtqCnMWN5G/uW3Tby/Zk8FxQdnv5X8GqcR3sKA5O1Dd6lgz4yZhMuMaSN8e7N9M2NG5o bzz9w85x9MlTGdBSwX+A0GOPZsXrFotlrTWDIHiprP6RtyL2K+DdvALCoduTl1c4DrhW FnVYdsvsVLMW+0779mAgwZAaGMH5dsrLhDo2kFhJBYnZ2DTFvtxftgsQEteMlgUWPyXC aHdgsiCm4OlCeq1DlpikDpyMaNJ5PxkMnCbZJl1iOS3WHpn/xcHzZYEEACN+ZdIhG9NB kWoA== X-Gm-Message-State: ANoB5pnNGoZ2N+VFDTe9IWjrdIrGiLZH4pbI66ngJKUEAT7rZvhUiVj+ /UuIhlOBxymHMtd0TeV7ZePlkovzpkyPew== X-Google-Smtp-Source: AA0mqf7PN/VpawVglIwIn6auY2jtpRLyUWC/cyLwr5nNPze1Twrr1VtCbQ+ltxYbw0sQ6aJURe2Rag== X-Received: by 2002:a05:600c:3b18:b0:3cf:6ab3:49ce with SMTP id m24-20020a05600c3b1800b003cf6ab349cemr538308wms.137.1668665231715; Wed, 16 Nov 2022 22:07:11 -0800 (PST) Received: from kista.localdomain (82-149-19-102.dynamic.telemach.net. [82.149.19.102]) by smtp.gmail.com with ESMTPSA id r11-20020a5d694b000000b0023691d62cffsm16542568wrw.70.2022.11.16.22.07.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 22:07:11 -0800 (PST) From: Jernej Skrabec To: mchehab@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, wens@csie.org, samuel@sholland.org Cc: 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, Jernej Skrabec Subject: [PATCH v2 2/2] arm64: dts: allwinner: h6: Fix Cedrus IOMMU channels Date: Thu, 17 Nov 2022 07:07:04 +0100 Message-Id: <20221117060704.367945-3-jernej.skrabec@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221117060704.367945-1-jernej.skrabec@gmail.com> References: <20221117060704.367945-1-jernej.skrabec@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221116_220719_400123_BAD28278 X-CRM114-Status: GOOD ( 11.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Cedrus H6 actually uses two IOMMU channels. During development page faults from both were observed. Documentation also lists both of them to be connected to Cedrus, but it doesn't make clear which is used for what. Add second IOMMU channel. Reviewed-by: Samuel Holland Fixes: 62a8ccf3a248 ("arm64: dts: allwinner: h6: Fix Cedrus IOMMU usage") Signed-off-by: Jernej Skrabec --- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi index 53f6660656ac..7bff054a9bdf 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi @@ -172,7 +172,7 @@ video-codec@1c0e000 { resets = <&ccu RST_BUS_VE>; interrupts = ; allwinner,sram = <&ve_sram 1>; - iommus = <&iommu 3>; + iommus = <&iommu 1>, <&iommu 3>; }; gpu: gpu@1800000 {