From patchwork Wed Nov 16 19:31: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: 13045679 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 54499C4332F for ; Wed, 16 Nov 2022 19:33:07 +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=uS2600t/SUrTnxReMv2D6Azn0CKPQ2inNT6bM44Ytkk=; b=dUCC6ZfmU2sKWK Vny573qMz++T2FwmOXUugDD86JmsdlSzyM+WDCPHOEpSVMtR6hoRn9PeTsk84Q9shgawAzdYufZjb xTALSmd5M2bj+TikpvEmOdR4f1XD5zNL+JS1Ffo6JSUx8eh4sxMjuqcDAhBd3Gpbif75BelUd6AmT ldDWOOUIMzMLzMgmP8pMEzYNplT9vppBOL59srxDGh+fxRlndlzBYc23nCrg+IXX18aXQDec3DkRa ka5K5dABtR852bsSqEhxL1rGLKpIdnu1d2fKxypHH+dvw9YNX41MO5rvuRcRA4H9plSE0zMLHz1gd 5NHgWdGERGevEHN4/Vhg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ovO8Z-007Meh-M2; Wed, 16 Nov 2022 19:31:55 +0000 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ovO8F-007MYL-PZ for linux-arm-kernel@lists.infradead.org; Wed, 16 Nov 2022 19:31:37 +0000 Received: by mail-wr1-x42c.google.com with SMTP id bs21so31616488wrb.4 for ; Wed, 16 Nov 2022 11:31:33 -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=supRVz4T52oVqFelsFhkEjn9HuP+OJvPsiaQRkXaSXY=; b=RuwduGQoL6RNZdNsCkvAs1s01RvLdNpuhqMxQcM5zQYPC05mFOSpK7h66qWpQM3Lqi 679YLRtq9sU/uy08ZbP1DDSQ7PPiTxEHCN4OlRc5mpMv/F5NYMOvF0jlUjGvuSKl+2sg QQ12EX6uhHBWQIS/D9Gs4IDpTIZqq+2RRKGt9Y/aMhezL1HszIRZr1Y5yfrv4KYH1v2i KM/OS9f7jcSZ8l2xeyM5FizpK6PyBLZgrqth5uagibIBp3Heju7m69Ln22nWAEJwbZdn cqXKOS6Q4HyQNvH78lT/aqGYdTrsW/+/y3rU5AJKQER/3322TcYoNtMYz7Rxi5/2n7nu ecbg== 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=supRVz4T52oVqFelsFhkEjn9HuP+OJvPsiaQRkXaSXY=; b=OV0oxBG2V/WIOSB2fUbsQWtYvyUwhIxi/IAeBFxujLR9JtrTm/olpZ0ZHykX8Jx/js 6XvptMd79/7Y6L/c8dUnJ7pysf4NZ/jDhJtUkVyqX4d3GOisHAXsPbqiJsqgAnX5cn1S a38deMnIfqF5Eh+/dRaPxH14Unmoe1KrtEaKyNVOO0o05Sx5hwNqtvMYyxSBnOMIkuUX cjU7fjF5R+DS7lqIPrkwGibQcVuCczzSCYhciS6QXrktozIbW3BhAXJx1BM5nCBFBASU yJ2RXYl5Q0E2rPoEcaldiFBDow7HD02cWo1htaMI6Vtyvh+VsXqzPOB65AAh+f3CTNcr U/nQ== X-Gm-Message-State: ANoB5pmK/lB/Z34jImnuzwIY1hBSlcY9F6G4ZgjtV3c4qaTMjPN6CpN4 C4cAUm2NFQiX4GgpXReVHkI= X-Google-Smtp-Source: AA0mqf4LY6JFZkmH5+c+/H2WjbTvikrkg74sq1CpTEgiQpUYahnaPsbCsrWLj1aOUCvNV/AgTVS9aQ== X-Received: by 2002:a5d:5741:0:b0:236:960f:161d with SMTP id q1-20020a5d5741000000b00236960f161dmr15517728wrw.376.1668627092709; Wed, 16 Nov 2022 11:31:32 -0800 (PST) Received: from kista.localdomain (82-149-19-102.dynamic.telemach.net. [82.149.19.102]) by smtp.gmail.com with ESMTPSA id q125-20020a1c4383000000b003c6cd82596esm3044646wma.43.2022.11.16.11.31.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 11:31:32 -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 1/2] media: dt-bindings: allwinner: video-engine: Fix number of IOMMU channels Date: Wed, 16 Nov 2022 20:31:04 +0100 Message-Id: <20221116193105.363297-2-jernej.skrabec@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116193105.363297-1-jernej.skrabec@gmail.com> References: <20221116193105.363297-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_113135_845629_04524184 X-CRM114-Status: GOOD ( 11.60 ) 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 | 2 +- 1 file changed, 1 insertion(+), 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..257bb372d166 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,7 @@ properties: description: Phandle to the device SRAM iommus: - maxItems: 1 + maxItems: 2 memory-region: maxItems: 1 From patchwork Wed Nov 16 19:31:05 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: 13045678 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 DCF5DC433FE for ; Wed, 16 Nov 2022 19:32:56 +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=LYSrbcrQqMFeVFghV25cQHFuXpf0FPc0Jbo/KvVUHKc=; b=s6fqcruSb0iCV1 9LufaMFzftboh5F8o4eORu+UOU/b7s1x7nabwYxfFQy+o12tJ10lmw0EjaeZABXOC5qXsmgdGnV7a Rh/ZunxZH1HmSLBcnZH3z+KlXLdDR+fb6sYYfy5hEjI0eNzT3o1XWhNq+pFiKtQHVkoRCRY7gNv6y aIrPdDljlwV7rzVkBJ1AUWkQixJgW/O97OGcrxE+w+hMjS8Y3dry793GfutbGX6ARzHYt0u2bAVA0 1X5RYrEwVBZnH3iLnCJVgcai8rD3rshu43FNi5LABoLpo7IGqeJeo6veIjXWR/81MNSWgT7x6fezr 24vyy0tNuitbZKOpYUVw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ovO8H-007MZu-UF; Wed, 16 Nov 2022 19:31:38 +0000 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ovO8E-007MYO-VU for linux-arm-kernel@lists.infradead.org; Wed, 16 Nov 2022 19:31:36 +0000 Received: by mail-wr1-x42b.google.com with SMTP id h9so31650860wrt.0 for ; Wed, 16 Nov 2022 11:31:34 -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=J3cqBPNXFCPM9SPqErLl5EqPv8TqD4kJvo+8/hC/Kvc=; b=Ynri9fVx0vI5Lf+znhqrG0iR+yweHI2N2z+TchOnPi+rYb8P2px3K77Xwh0/l1DADz KnPlh+H+WqbGCSbGTQOaAM0hHFm3NN7CYcdx4NBKIKTZHT7dgzf0/CiT017fApLyqagX gSEc39/+sS4RNlMwyuT2FYFgDEeCdD34P5Ff7zITXMaWTAzRIScMQVPMMCdYyBmDRhfK ELlX74FnK45uhYSQqVkku4MPhiKvQLCkOmomsik0I4Wg1z9jZgRlg7w1QzQY03geTJUU P+YXXL88pUeGLQXOgQ//mrclw0YqMHJ95ytcAnxGYq8l9Js7K7rTQgof4vOwy2KOdUkk XeDA== 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=J3cqBPNXFCPM9SPqErLl5EqPv8TqD4kJvo+8/hC/Kvc=; b=BjGj/VY0huBkkTOHwBqykYcOEMQMsgMY1WULmnhJD4OeCL4eN/sNMeBLihad5nmZMm 5SePMYGUFEARTADchbJMjWNGIluYl0E5Dsysj5sIe6SwWmB3RgoBwC7Eg/P7tsEnNZYl AY7wdgzyGvgO+1QOjCnvsNzqIjgwUJVF67pTH8vhqaO4s5CtrFFRfR3i/DUp9jqx2gH5 3DSHxSBGlxcb3eooaqF/nHdBNinm48oCzRdeNTRn/grJHbbFVP10up7+tROW/XtHRE0b KqXiFefiU7gUbjABIJ3wNYNhDWibX3PakaRvQUkunucufdox0ohfi7Zch0Uyr3ApwXmG 8FBg== X-Gm-Message-State: ANoB5pmYcdEIlFz10Gw8iFC5jjp6oi9o2P9kOrYRDHNVkl489DgWk7ZR j45VxAsimzzKvabojOt9rsQ= X-Google-Smtp-Source: AA0mqf63+xcPwKEqO/zJar4BIbUp0DRdWtaKQPwkXJ8MVR2/sFn3Mdf7EVbj3yozb2stn+TxPMySpA== X-Received: by 2002:a5d:63c6:0:b0:235:e6a9:b492 with SMTP id c6-20020a5d63c6000000b00235e6a9b492mr15033159wrw.212.1668627093629; Wed, 16 Nov 2022 11:31:33 -0800 (PST) Received: from kista.localdomain (82-149-19-102.dynamic.telemach.net. [82.149.19.102]) by smtp.gmail.com with ESMTPSA id q125-20020a1c4383000000b003c6cd82596esm3044646wma.43.2022.11.16.11.31.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 11:31:33 -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 2/2] arm64: dts: allwinner: h6: Fix Cedrus IOMMU channels Date: Wed, 16 Nov 2022 20:31:05 +0100 Message-Id: <20221116193105.363297-3-jernej.skrabec@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116193105.363297-1-jernej.skrabec@gmail.com> References: <20221116193105.363297-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_113135_047664_4F28E721 X-CRM114-Status: GOOD ( 11.64 ) 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. Fixes: 62a8ccf3a248 ("arm64: dts: allwinner: h6: Fix Cedrus IOMMU usage") Signed-off-by: Jernej Skrabec Reviewed-by: Samuel Holland --- 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 {