From patchwork Mon May 19 13:43:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 891233 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 374EA27B507; Mon, 19 May 2025 13:43:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747662243; cv=none; b=Wj5ISwc0v9GrfJzJ8FWViTvAev19uXiYlw4LZovN/pigaDITCWM90nkWrQDsDMc34YW5foDOM5xkkmIndcSVVD1bMXDz3PhFBC8dewVeupEjmD/PF8AiV+qJOInR7hHWferzr4cV43XZ85SwcO0wkC//WtF3EMFddN9QCuTAB+4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747662243; c=relaxed/simple; bh=r63jBmdYNfllCSlVbc7iG71kBpdUFZAx1p/Hv2DTI4I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YsCT3U4j3v5UCtwZCEJ88lTCp1xqtcrTG5hYvXNwTNlKYkvSeSmmLSvfL4TcLPENRXmS5aDsLeOxql5G0Wr9G7e1SOmswHPV3Z103KhWrAaz+pyEgqdg26pdwEPYWfiwPaQTSOMJXgYMuK3BFDr6UsvHyfLROsuAE/MmFWXuWhw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=tomeuvizoso.net; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=tomeuvizoso.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43cfe63c592so48163705e9.2; Mon, 19 May 2025 06:43:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747662238; x=1748267038; 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=laEkWWVQjQ2oI3CZqHqG5uO1wLsoJjXKyEWBV14uYNg=; b=peAtZe+cfmXgLtx0CWZplV/44NEAD6JgR6Tvzw5B0DX/Zps+N3hmvey/QNx7FlbdPB JA6/7WjIt0M03e3lnu5qPW45vDaPbsWrbQORyYOYZ6UMKoXSZ1A9nBOvmYOP/B1O3gOp 94XoVST0XsaItehKhMJAuRkHQUC2qPd0MmhQz2ElorRNTjUQ5Xy/xjPc+sc3pAXZkFiq KOvb80vGok/X4mv3Uke1ezQc0O4x9FgqsMCNMHHxEW1oIgV8qUmdIGGQEq3lhRedoJY9 C1YBhMrDsWxmKMBt1wYkcS2lkWBddcOCj0MoF87aCADoArhPtws7T6uaADyuZhShokf+ 0yEA== X-Forwarded-Encrypted: i=1; AJvYcCUEmrKEQhEU7z6OnfartgKo9sgapi+dbdHmJQ0r44lNyxdlU8BbYIfrVbA5yJISrQ9l2KznoSAwTHkWwZg=@vger.kernel.org, AJvYcCV+QkE/mHo1eDkphfw6I5PkvVtppZHsvlOnwf9dZf523IcBIrz8SHuc/xOXhxZb8QKLXCUQ5f8ugli5nToe@vger.kernel.org, AJvYcCXEUX99DU1pzrlcEY2cLz3u7E/Up00ohgk1bOrSVK8jZFqLIuaRkp6xS2ZpaPevEpjfV7s6JF8oREQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwzDBqLQWPuKLHiRdDr7tewnsqUHVc38C+rSKW0CudFCHHAUK7s 44A9kwJ98sGshaV1Fn/bRmG4u63ZFnJOdAB8KJddASQDiXs8q4ZMnP4o X-Gm-Gg: ASbGnctZ0QysBnkvtVcFe+jqDbHm9lttb+Hus156ILXnklfOJXkxbS8wssDFtYV50WV qqMyhqvCC9j/YzLRqx2xZEFm8tK/HQNhvWcEbLbCyZYX+2/6+94vUQqOSyDPe239UKwwH9lsD0z dyiazWVrrg657KcwcwXvp74TbHBQa5dEduNnG1lTznERnAEqRH397fWt/z84rTnBKmNcL2ghnHJ h7Ed6h5NJ1bmq/sniTBeLoOq+b3nkhTuG6ZFNDfsfZVMAJKjxX8AsRR1zkUPIcGNupSTjCNB2NL QFuLxP3EXJl/0lCSsHxERN0IZAn9/OzFgs/JzWYwFvobICuhJVHH5LGGWzoBtAcPiEVQtV9b9jZ PKJRuOIRYnQ== X-Google-Smtp-Source: AGHT+IFTwFNPp1YLnhIlgYBYLqf+DRtXUkttSX/Uc2IdLN/P29kP+iLsKdD/QP2F1kANbrCZHNCv3Q== X-Received: by 2002:a05:600c:3114:b0:439:6118:c188 with SMTP id 5b1f17b1804b1-442fd63c6f6mr112314565e9.19.1747662238231; Mon, 19 May 2025 06:43:58 -0700 (PDT) Received: from [10.42.0.1] (cst-prg-46-162.cust.vodafone.cz. [46.135.46.162]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f8ab839esm171263005e9.17.2025.05.19.06.43.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 May 2025 06:43:57 -0700 (PDT) From: Tomeu Vizoso Date: Mon, 19 May 2025 15:43:34 +0200 Subject: [PATCH v4 02/10] arm64: dts: rockchip: Add nodes for NPU and its MMU to rk3588s Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250519-6-10-rocket-v4-2-d6dff6b4c0ae@tomeuvizoso.net> References: <20250519-6-10-rocket-v4-0-d6dff6b4c0ae@tomeuvizoso.net> In-Reply-To: <20250519-6-10-rocket-v4-0-d6dff6b4c0ae@tomeuvizoso.net> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Oded Gabbay , Jonathan Corbet , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= , Sebastian Reichel , Nicolas Frattaroli , Jeff Hugo Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, Tomeu Vizoso X-Mailer: b4 0.14.2 See Chapter 36 "RKNN" from the RK3588 TRM (Part 1). This is a derivative of NVIDIA's NVDLA, but with its own front-end processor. The IP is divided in three cores, programmed independently. The first core though is special, requiring to be powered on before any of the others can be used. The IOMMU of the first core is also special in that it has two subunits (read/write?) that need to be programmed in sync. v2: - Have one device for each NPU core (Sebastian Reichel) - Have one device for each IOMMU (Sebastian Reichel) - Correctly sort nodes (Diederik de Haas) - Add rockchip,iommu compatible to IOMMU nodes (Sebastian Reichel) v3: - Adapt to a split of the register block in the DT bindings (Nicolas Frattaroli) v4: - Adapt to changes in bindings Signed-off-by: Tomeu Vizoso --- arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 85 +++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi index 1e18ad93ba0ebdad31642b88ff0f90ef4e8dc76f..f5e58851047e80b23f9ff3244692ad868ddc1ff6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi @@ -1136,6 +1136,91 @@ power-domain@RK3588_PD_SDMMC { }; }; + rknn_core_top: npu@fdab0000 { + compatible = "rockchip,rk3588-rknn-core-top"; + reg = <0x0 0xfdab0000 0x0 0x1000>, + <0x0 0xfdab1000 0x0 0x1000>, + <0x0 0xfdab3000 0x0 0x1000>; + reg-names = "pc", "cna", "core"; + interrupts = ; + clocks = <&scmi_clk SCMI_CLK_NPU>, <&cru PCLK_NPU_ROOT>, + <&cru ACLK_NPU0>, <&cru HCLK_NPU0>; + clock-names = "aclk", "hclk", "npu", "pclk"; + assigned-clocks = <&scmi_clk SCMI_CLK_NPU>; + assigned-clock-rates = <200000000>; + resets = <&cru SRST_A_RKNN0>, <&cru SRST_H_RKNN0>; + reset-names = "srst_a", "srst_h"; + power-domains = <&power RK3588_PD_NPUTOP>; + iommus = <&rknn_mmu_top>; + status = "disabled"; + }; + + rknn_mmu_top: iommu@fdab9000 { + compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu"; + reg = <0x0 0xfdab9000 0x0 0x100>, + <0x0 0xfdaba000 0x0 0x100>; + interrupts = ; + clocks = <&cru ACLK_NPU0>, <&cru HCLK_NPU0>; + clock-names = "aclk", "iface"; + #iommu-cells = <0>; + power-domains = <&power RK3588_PD_NPUTOP>; + status = "disabled"; + }; + + rknn_core_1: npu@fdac0000 { + compatible = "rockchip,rk3588-rknn-core"; + reg = <0x0 0xfdac0000 0x0 0x1000>, + <0x0 0xfdac1000 0x0 0x1000>, + <0x0 0xfdac3000 0x0 0x1000>; + reg-names = "pc", "cna", "core"; + interrupts = ; + clocks = <&cru ACLK_NPU1>, <&cru HCLK_NPU1>; + clock-names = "aclk", "hclk"; + resets = <&cru SRST_A_RKNN1>, <&cru SRST_H_RKNN1>; + reset-names = "srst_a", "srst_h"; + power-domains = <&power RK3588_PD_NPU1>; + iommus = <&rknn_mmu_1>; + status = "disabled"; + }; + + rknn_mmu_1: iommu@fdac9000 { + compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu"; + reg = <0x0 0xfdaca000 0x0 0x100>; + interrupts = ; + clocks = <&cru ACLK_NPU1>, <&cru HCLK_NPU1>; + clock-names = "aclk", "iface"; + #iommu-cells = <0>; + power-domains = <&power RK3588_PD_NPU1>; + status = "disabled"; + }; + + rknn_core_2: npu@fdad0000 { + compatible = "rockchip,rk3588-rknn-core"; + reg = <0x0 0xfdad0000 0x0 0x1000>, + <0x0 0xfdad1000 0x0 0x1000>, + <0x0 0xfdad3000 0x0 0x1000>; + reg-names = "pc", "cna", "core"; + interrupts = ; + clocks = <&cru ACLK_NPU2>, <&cru HCLK_NPU2>; + clock-names = "aclk", "hclk"; + resets = <&cru SRST_A_RKNN2>, <&cru SRST_H_RKNN2>; + reset-names = "srst_a", "srst_h"; + power-domains = <&power RK3588_PD_NPU2>; + iommus = <&rknn_mmu_2>; + status = "disabled"; + }; + + rknn_mmu_2: iommu@fdad9000 { + compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu"; + reg = <0x0 0xfdada000 0x0 0x100>; + interrupts = ; + clocks = <&cru ACLK_NPU2>, <&cru HCLK_NPU2>; + clock-names = "aclk", "iface"; + #iommu-cells = <0>; + power-domains = <&power RK3588_PD_NPU2>; + status = "disabled"; + }; + vpu121: video-codec@fdb50000 { compatible = "rockchip,rk3588-vpu121", "rockchip,rk3568-vpu"; reg = <0x0 0xfdb50000 0x0 0x800>;