From nobody Sat Nov 22 17:35:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDK3f71dJz6HW0Q for ; Sat, 22 Nov 2025 17:35:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDK3f6BKfz3cfb for ; Sat, 22 Nov 2025 17:35:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763832910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BPd3AL5fh/ItocWtopAPiGVxdIMDCMsTOf50QKk/d9U=; b=OgOwzCo2AFwiRy/FFJxwc195W43BvKel+UKNJ25f2mSR0rlHSKPRwYe+R8dN/8NItwXUEU 9DrK7LZDNFeznXXzjFaaj+DBo0gp3IZditnEIDmOB9L81Bp/8Qqi5YAE2gZxEdvrD3p/kZ apVuvaH6FNlt2Aae0HD4OLKfWU/3c2e+bafL79I3EjmIhpUG7jNezuyVONhikIDS6AkP2G xkhPBFCe0YM9ep+jPuMyD8vqa1rwi5e+8BFhbxdTG3uQn8l2ry/fJ2Xa1puppeFsqR52rf xUOsA18Q6Dl9xnJU4frQ8neH0q5ptlqpMvBvRHlJ8Tk0+/mZhDXacdX7eaVd9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763832910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BPd3AL5fh/ItocWtopAPiGVxdIMDCMsTOf50QKk/d9U=; b=A6uX9/3GV7Ubr1NwXuPWNsDLmzB75aOh+YubbZBsJBB1UvZUmfcRpi8kLr/uFm7OWrzthM NgmzFmvohFDPf9F9oNasC2qDgU2Kp+1UC3oPbwWkjBbRwlyJkcXyuThxZCs+G2QW2b7/KR x/oz0yEkbfSI959sAVnCDzDtq+Kf7MIG1byZ02iumkPiylfM1bu+l9nHiox5L5RqQTJNd1 342kINjV+KAKDrTEEyQm2/2TRmMTLFH+rCAQXbYI7o07CRxT8grkKi1NOW7xQpIQCMQ8S8 1BA++9CaT6ySr+JmsKO4rTFqCWN112XHIkHPEjcBSY8Lv9nsmwqEIkI5jyBEJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763832910; a=rsa-sha256; cv=none; b=tawMFI2ThhWE94b1clKtHKjqlrbkkEw81ZwXwT+MFeJvQ+aO8KYh1pO8r09sOeL45OzlAH Gnrcz2b6BZV1c9fcXWEQRWwA1Y5ZMAdBiRAFV5Q1So8P8+eYt1+tdfxBeLGjNmmtf+SJ5e w6DEJVYzaQXV+5gpv+xe6Zi64VtVC1hjOwxdzqU/GJmsZzP+acrmOBf1OfzfufZkDH5qYi p8B+0500g5Ho+luwjKn48Rbuh3xUdyk67H59qFesfaDqQAgD6UBvQK9D1W/b0NNaw5YqhZ st2taHMN824z5CRg+1UQJsKg9t/b+rx+G+6XiThOhdg/76xSfyGgVHRdpohCTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDK3f5k7vz16tC for ; Sat, 22 Nov 2025 17:35:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 90c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 17:35:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 55de86dac813 - main - dts: Revert its addition for rk356x List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55de86dac813d2f8fbb70dd15b17a5677cb1168f Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 17:35:10 +0000 Message-Id: <6921f44e.90c0.9da8a27@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=55de86dac813d2f8fbb70dd15b17a5677cb1168f commit 55de86dac813d2f8fbb70dd15b17a5677cb1168f Author: Emmanuel Vadot AuthorDate: 2025-11-22 17:32:54 +0000 Commit: Emmanuel Vadot CommitDate: 2025-11-22 17:32:54 +0000 dts: Revert its addition for rk356x Rockchip have two erratas (#3568001 and #3568002) for the GIC on RK356x. Until we have a way to handle them revert the changes that uses ITS instead of GIC for PCIe. --- sys/contrib/device-tree/src/arm64/rockchip/rk3568.dtsi | 8 ++++---- .../device-tree/src/arm64/rockchip/rk356x-base.dtsi | 14 +------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/sys/contrib/device-tree/src/arm64/rockchip/rk3568.dtsi b/sys/contrib/device-tree/src/arm64/rockchip/rk3568.dtsi index e719a3df126c..695cccbdab0f 100644 --- a/sys/contrib/device-tree/src/arm64/rockchip/rk3568.dtsi +++ b/sys/contrib/device-tree/src/arm64/rockchip/rk3568.dtsi @@ -152,7 +152,7 @@ compatible = "rockchip,rk3568-pcie"; #address-cells = <3>; #size-cells = <2>; - bus-range = <0x10 0x1f>; + bus-range = <0x0 0xf>; clocks = <&cru ACLK_PCIE30X1_MST>, <&cru ACLK_PCIE30X1_SLV>, <&cru ACLK_PCIE30X1_DBI>, <&cru PCLK_PCIE30X1>, <&cru CLK_PCIE30X1_AUX_NDFT>; @@ -175,7 +175,7 @@ num-ib-windows = <6>; num-ob-windows = <2>; max-link-speed = <3>; - msi-map = <0x1000 &its 0x1000 0x1000>; + msi-map = <0x0 &gic 0x1000 0x1000>; num-lanes = <1>; phys = <&pcie30phy>; phy-names = "pcie-phy"; @@ -205,7 +205,7 @@ compatible = "rockchip,rk3568-pcie"; #address-cells = <3>; #size-cells = <2>; - bus-range = <0x20 0x2f>; + bus-range = <0x0 0xf>; clocks = <&cru ACLK_PCIE30X2_MST>, <&cru ACLK_PCIE30X2_SLV>, <&cru ACLK_PCIE30X2_DBI>, <&cru PCLK_PCIE30X2>, <&cru CLK_PCIE30X2_AUX_NDFT>; @@ -228,7 +228,7 @@ num-ib-windows = <6>; num-ob-windows = <2>; max-link-speed = <3>; - msi-map = <0x2000 &its 0x2000 0x1000>; + msi-map = <0x0 &gic 0x2000 0x1000>; num-lanes = <2>; phys = <&pcie30phy>; phy-names = "pcie-phy"; diff --git a/sys/contrib/device-tree/src/arm64/rockchip/rk356x-base.dtsi b/sys/contrib/device-tree/src/arm64/rockchip/rk356x-base.dtsi index fd2214b6fad4..81e635620301 100644 --- a/sys/contrib/device-tree/src/arm64/rockchip/rk356x-base.dtsi +++ b/sys/contrib/device-tree/src/arm64/rockchip/rk356x-base.dtsi @@ -283,18 +283,6 @@ mbi-alias = <0x0 0xfd410000>; mbi-ranges = <296 24>; msi-controller; - ranges; - #address-cells = <2>; - #size-cells = <2>; - dma-noncoherent; - - its: msi-controller@fd440000 { - compatible = "arm,gic-v3-its"; - reg = <0x0 0xfd440000 0 0x20000>; - dma-noncoherent; - msi-controller; - #msi-cells = <1>; - }; }; usb_host0_ehci: usb@fd800000 { @@ -968,7 +956,7 @@ num-ib-windows = <6>; num-ob-windows = <2>; max-link-speed = <2>; - msi-map = <0x0 &its 0x0 0x1000>; + msi-map = <0x0 &gic 0x0 0x1000>; num-lanes = <1>; phys = <&combphy2 PHY_TYPE_PCIE>; phy-names = "pcie-phy";