From mboxrd@z Thu Jan 1 00:00:00 1970 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 173F1C4167B for ; Mon, 11 Dec 2023 13:57:35 +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=RZhA3EEVAw2ImOJ8f+Lkmbb7Fxu3cfOzejTqxwJlz9Y=; b=PNCyGq/djvJv49 0DICh8vP7GGDHB5qeFzWKOR6u0W1EC3KFpJ4fL9uEa2KRqqbxykxgQAKPyeTqtpYNrIReKAco/Uja 1swHR1Ge9GcSb98uo/9axaUs8ViN6F4a7cFc0l2sIsPQLfyU+A/HCTLqbXFeLjNOE4yPuiuNCFqnf OM7ZhoJY5X/+XsvnO7MF4eJmWQaM3oI8cfiR9gdq9S4bSVPqMIpDo+tx38FdKcj29R1IEQX+tgDpA Qe80MBW0Xdrdz+pqter2yjLyeuoup+uRbyAFhfrJUaaMnCLP3LU5Tz1DLF2G1YzNBY/wCLUCThHRC 9hIkm+asqerOLsUoSxuw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rCgmi-00531V-2y; Mon, 11 Dec 2023 13:57:24 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rCglz-0052m5-2J; Mon, 11 Dec 2023 13:56:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=Osnv2XOng4mlWKEXYSrHyc0d6F/viLjNjbJfQifN4Tc=; b=NAvuuoyeuKAld/LOQ1jeRZBr9M hoKOTanXDjZjv3T8LDHM9caeoo2lIHwrlsF3Yf3SO5g90FNquCXQMeWeDou7fWVQU1DcxgWYxx9Mf UUqhlxiKDSEQkx/h0znV2oVxXFJQlhaEFLxsv6oIPxjN/23rEedcUKoj8rtL2XZv+QhSyGLZBkTq4 xKB6tfsdnd0p9/x6bWNUD5dvkjK6b5Oh6Sr2oD4ZtomL44xfCT67uS4HmO4xTEYfG0CBr2P+6WmWx Ky32YGGPcrwGI51eAbMoDtJ+hIIm+Oq+DhImtasO7LDR2l+Jn0uRgRmSHjFIVveLGNYwpvwDMDNRr jeNz8zgQ==; Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rCglv-0086J6-29; Mon, 11 Dec 2023 13:56:38 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id E7E55CE126D; Mon, 11 Dec 2023 13:56:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2A18C433C8; Mon, 11 Dec 2023 13:56:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702302989; bh=YTJmHBrqPg0CR8GZDuwnak/WMVKO84fw0wkyiKcQrjI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aROXTfs2TLlDV4JrqqJ8v4jA790ey6S0LG5zk+fgz2gyk2nhrFt0vPxjIsQxTqPyu 9f9NBBfkZFPAicKpMCWMbTqVV/Plgn7zBpq2ppxpHr5glYphpHlrtSxDq2lmmi53lL is+jECNQfktBNhD1H+ttn49ae5bD4okBJopINUifMQRvCMGYMNsmYAx7nIROY8J07P awgIwWpTEz3ZqaYdiBpwLd1jXNxksw0Njv0mfrVWf35bSt4cVktH1ldGvbW0XUHbXE drkDSn/qUqqO9xpzJmrEl7pyC/1ORmcIiOFTYTfcMw5KK3jG9EA6HIJahM7FtgPFJA PDCGIsJ/QwbRw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Rob Herring , Heiko Stuebner , Sasha Levin , robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, javierm@redhat.com, briannorris@chromium.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 21/29] arm64: dts: rockchip: Fix PCI node addresses on rk3399-gru Date: Mon, 11 Dec 2023 08:54:05 -0500 Message-ID: <20231211135457.381397-21-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231211135457.381397-1-sashal@kernel.org> References: <20231211135457.381397-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.66 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231211_135636_153955_E628A518 X-CRM114-Status: GOOD ( 12.90 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org From: Rob Herring [ Upstream commit c13c823a78b77ea0e5f1f73112d910e259911101 ] The rk3399-gru PCI node addresses are wrong. In rk3399-gru-scarlet, the bus number in the address should be 0. This is because bus number assignment is dynamic and not known up front. For FDT, the bus number is simply ignored. In rk3399-gru-chromebook, the addresses are simply invalid. The first "reg" entry must be the configuration space for the device. The entry should be all 0s except for device/slot and function numbers. The existing 64-bit memory space (0x83000000) entries are not valid because they must have the BAR address in the lower byte of the first cell. Warnings for these are enabled by adding the missing 'device_type = "pci"' for the root port node. Signed-off-by: Rob Herring Link: https://lore.kernel.org/r/20231130191830.2424361-1-robh@kernel.org Signed-off-by: Heiko Stuebner Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 3 +-- arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts | 4 ++-- arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi index ee6095baba4d3..7d9b8064ad2ec 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi @@ -510,8 +510,7 @@ wacky_spi_audio: spi2@0 { &pci_rootport { mvl_wifi: wifi@0,0 { compatible = "pci1b4b,2b42"; - reg = <0x83010000 0x0 0x00000000 0x0 0x00100000 - 0x83010000 0x0 0x00100000 0x0 0x00100000>; + reg = <0x0000 0x0 0x0 0x0 0x0>; interrupt-parent = <&gpio0>; interrupts = <8 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts index 853e88455e750..9e4b12ed62cbe 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts @@ -34,8 +34,8 @@ &mipi_panel { &pci_rootport { wifi@0,0 { compatible = "qcom,ath10k"; - reg = <0x00010000 0x0 0x00000000 0x0 0x00000000>, - <0x03010010 0x0 0x00000000 0x0 0x00200000>; + reg = <0x00000000 0x0 0x00000000 0x0 0x00000000>, + <0x03000010 0x0 0x00000000 0x0 0x00200000>; qcom,ath10k-calibration-variant = "GO_DUMO"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi index 23bfba86daabe..7ba25315dd9ab 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi @@ -489,6 +489,7 @@ pci_rootport: pcie@0,0 { #address-cells = <3>; #size-cells = <2>; ranges; + device_type = "pci"; }; }; -- 2.42.0 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip