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 10670C433EF for ; Thu, 13 Jan 2022 17:09:52 +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: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:In-Reply-To:References: List-Owner; bh=pEEED//8U/NsJIpEzHC6hwKgq8ULiOTmG6XR9VkGSs0=; b=vFvoa5hobPkN4I qbt7m7FO01KETPqUV/o5l5uhFhIjVmLBWA6kwWhwZ8tfggbZi0UG1II8N+siEV5r8EEr1eILzNIEk xzWsPuZ+1/HLZ+jVsJas9U4kGkjRHQz1KxCQfLRMCSFC+ZQUl03R+Y9RkLK13HeuaiWb5TcLe58KA 2yriRWNozVDO+Vxa+puLbHobPE30DNb7AoOVTllrIc5CIfSLp0GeORi7Fob6aVVnN8ons8D9bRNvs CSyb5maufQVugjUzfdQIf4sW1idx5HYvgc4Vk/KOCI1P+ZnUElvhaGeuFF3f/mRV10YhzxVrUv5hS nLzgl38Eap3Amj38lsSA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n83aV-006ibj-QW; Thu, 13 Jan 2022 17:08:35 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n83aS-006ib0-5P for linux-arm-kernel@lists.infradead.org; Thu, 13 Jan 2022 17:08:34 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C93DEB82276; Thu, 13 Jan 2022 17:08:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73D89C36AEB; Thu, 13 Jan 2022 17:08:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642093709; bh=dygNr80wMXp+UwmgpjOaiLbn3AABVgQIS8MjdeeyX1Y=; h=From:To:Cc:Subject:Date:From; b=qEuoT1/T6TTqqKVDVsD8XFUDmA2AlXGwyCyA7uaS+waEHNJ+iR68ar4wlGBG8hIrC L5/+yLBCVvnGEDalwTrVXA14daXV6g1aa4a+xI6XquXDW/eal+XtUCNXgGiaYw+s/Z doFYXfWwz3VAVOr7qlBc8TrCIGYn9qMOPrjLMwoFTWsl5YZ/WYw/y9oez7SLTWIvhx ql7HfVehabJB71qvw5Qe4uGwsofc8uJkey2kDY2bh7SVZgxO75R07xDg9gPEkw1j54 o74/vTwXhnTl3bysBufzgtjxGmFN62uTWXESbhIVV/G61LTUlq5qCTS/e4lEZsYeUk HtSMGVBjtFH2A== Received: by pali.im (Postfix) id DAC8A778; Thu, 13 Jan 2022 18:08:26 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Gregory Clement Cc: Andrew Lunn , Sebastian Hesselbarth , Rob Herring , =?UTF-8?q?Marek=20Beh=C3=BAn?= , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: dts: marvell: armada-37xx: Increase PCIe IO size from 64 KiB to 1 MiB Date: Thu, 13 Jan 2022 18:07:55 +0100 Message-Id: <20220113170755.11856-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220113_090832_501997_11EB4A2F X-CRM114-Status: GOOD ( 18.19 ) 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Q29tbWl0IDUxNGVmMWU2MmQ2NSAoImFybTY0OiBkdHM6IG1hcnZlbGw6IGFybWFkYS0zN3h4OiBF eHRlbmQgUENJZSBNRU0Kc3BhY2UiKSBpbmNyZWFzZWQgc2l6ZSBvZiBQQ0llIE1FTSB0byAxMjcg TWlCLCB3aGljaCBpcyB0aGUgbWF4aW1hbApwb3NzaWJsZSBzaXplIGZvciBhbGxvY2F0ZWQgMTI4 IE1pQiBQQ0llIHdpbmRvdy4gUENJZSBJTyBzaXplIGluIHRoYXQKY29tbWl0IHdhcyB1bmNoYW5n ZWQuCgpBcm1hZGEgMzcyMCBQQ0llIGNvbnRyb2xsZXIgc3VwcG9ydHMgMzItYml0IElPIHNwYWNl IG1hcHBpbmcgc28gaXQgaXMKcG9zc2libGUgdG8gYXNzaWduIG1vcmUgdGhhbiA2NCBLaUIgaWYg YWRkcmVzcyBzcGFjZSBmb3IgSU8uCgpDdXJyZW50bHkgY29udHJvbGxlciBoYXMgYXNzaWduZWQg MTI3IE1pQiArIDY0IEtpQiBtZW1vcnkgYW5kIHRoZXJlZm9yZQp0aGVyZSBpcyA5NjAgS2lCIG9m IHVudXNlZCBtZW1vcnkuIFNvIGFzc2lnbiBpdCB0byBJTyBzcGFjZSBieSBpbmNyZWFzaW5nCklP IHdpbmRvdyBmcm9tIDY0IEtpQiB0byAxIE1pQi4KCkRUUyBmaWxlIGFybWFkYS0zNzIwLXR1cnJp cy1tb3guZHRzIGFscmVhZHkgdXNlcyB3aG9sZSAxMjggTWlCIHNwYWNlLCBzbwpvbmx5IHVwZGF0 ZSBjb21tZW50IGFib3V0IDMyLWJpdCBJTyBzcGFjZSBtYXBwaW5nLgoKU2lnbmVkLW9mZi1ieTog UGFsaSBSb2jDoXIgPHBhbGlAa2VybmVsLm9yZz4KRml4ZXM6IDUxNGVmMWU2MmQ2NSAoImFybTY0 OiBkdHM6IG1hcnZlbGw6IGFybWFkYS0zN3h4OiBFeHRlbmQgUENJZSBNRU0gc3BhY2UiKQotLS0K IGFyY2gvYXJtNjQvYm9vdC9kdHMvbWFydmVsbC9hcm1hZGEtMzcyMC10dXJyaXMtbW94LmR0cyB8 IDIgKy0KIGFyY2gvYXJtNjQvYm9vdC9kdHMvbWFydmVsbC9hcm1hZGEtMzd4eC5kdHNpICAgICAg ICAgICB8IDQgKystLQogMiBmaWxlcyBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDMgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2ZWxsL2FybWFkYS0z NzIwLXR1cnJpcy1tb3guZHRzIGIvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2ZWxsL2FybWFkYS0z NzIwLXR1cnJpcy1tb3guZHRzCmluZGV4IGRkMDE0MDlkNGJiNy4uMjNlMWIwN2MwNjBhIDEwMDY0 NAotLS0gYS9hcmNoL2FybTY0L2Jvb3QvZHRzL21hcnZlbGwvYXJtYWRhLTM3MjAtdHVycmlzLW1v eC5kdHMKKysrIGIvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2ZWxsL2FybWFkYS0zNzIwLXR1cnJp cy1tb3guZHRzCkBAIC0xNTMsNyArMTUzLDcgQEAKIAkgKiAyIHNpemUgY2VsbHMgYW5kIGFsc28g ZXhwZWN0cyB0aGF0IHRoZSBzZWNvbmQgcmFuZ2Ugc3RhcnRzIGF0IDE2IE1CIG9mZnNldC4gSWYg dGhlc2UKIAkgKiBjb25kaXRpb25zIGFyZSBub3QgbWV0IHRoZW4gVS1Cb290IGNyYXNoZXMgZHVy aW5nIGxvYWRpbmcga2VybmVsIERUQiBmaWxlLiBQQ0llIGFkZHJlc3MKIAkgKiBzcGFjZSBpcyAx MjggTUIgbG9uZywgc28gdGhlIGJlc3Qgc3BsaXQgYmV0d2VlbiBNRU0gYW5kIElPIGlzIHRvIHVz ZSBmaXhlZCAxNiBNQiB3aW5kb3cKLQkgKiBmb3IgSU8gYW5kIHRoZSByZXN0IDExMiBNQiAoNjQr MzIrMTYpIGZvciBNRU0sIGRlc3BpdGUgdGhhdCBtYXhpbWFsIElPIHNpemUgaXMganVzdCA2NCBr Qi4KKwkgKiBmb3IgSU8gYW5kIHRoZSByZXN0IDExMiBNQiAoNjQrMzIrMTYpIGZvciBNRU0uIENv bnRyb2xsZXIgc3VwcG9ydHMgMzItYml0IElPIG1hcHBpbmcuCiAJICogVGhpcyBidWcgaXMgbm90 IHByZXNlbnQgaW4gVS1Cb290IHBvcnRzIGZvciBvdGhlciBBcm1hZGEgMzcwMCBkZXZpY2VzIGFu ZCBpcyBmaXhlZCBpbgogCSAqIFUtQm9vdCB2ZXJzaW9uIDIwMjEuMDcuIFNlZSByZWxldmFudCBV LUJvb3QgY29tbWl0cyAodGhlIGxhc3Qgb25lIGNvbnRhaW5zIGZpeCk6CiAJICogaHR0cHM6Ly9z b3VyY2UuZGVueC5kZS91LWJvb3QvdS1ib290Ly0vY29tbWl0L2NiMmRkYjI5MWVlNmZjYmRkZDZk OGY0ZmY0OTA4OWRmZTU4MGY1ZDcKZGlmZiAtLWdpdCBhL2FyY2gvYXJtNjQvYm9vdC9kdHMvbWFy dmVsbC9hcm1hZGEtMzd4eC5kdHNpIGIvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2ZWxsL2FybWFk YS0zN3h4LmR0c2kKaW5kZXggMWM3NGYwMjUzNWM2Li44ZDU5ZWFiYWRjZTYgMTAwNjQ0Ci0tLSBh L2FyY2gvYXJtNjQvYm9vdC9kdHMvbWFydmVsbC9hcm1hZGEtMzd4eC5kdHNpCisrKyBiL2FyY2gv YXJtNjQvYm9vdC9kdHMvbWFydmVsbC9hcm1hZGEtMzd4eC5kdHNpCkBAIC01MDgsMTIgKzUwOCwx MiBAQAogCQkJLyoKIAkJCSAqIFRoZSAxMjggTWlCIGFkZHJlc3MgcmFuZ2UgWzB4ZTgwMDAwMDAt MHhmMDAwMDAwMF0gaXMKIAkJCSAqIGRlZGljYXRlZCBmb3IgUENJZSBhbmQgY2FuIGJlIGFzc2ln bmVkIHRvIDggd2luZG93cwotCQkJICogd2l0aCBzaXplIGEgcG93ZXIgb2YgdHdvLiBVc2Ugb25l IDY0IEtpQiB3aW5kb3cgZm9yCisJCQkgKiB3aXRoIHNpemUgYSBwb3dlciBvZiB0d28uIFVzZSBv bmUgMSBNaUIgd2luZG93IGZvcgogCQkJICogSU8gYXQgdGhlIGVuZCBhbmQgdGhlIHJlbWFpbmlu ZyBzZXZlbiB3aW5kb3dzCiAJCQkgKiAodG90YWxpbmcgMTI3IE1pQikgZm9yIE1FTS4KIAkJCSAq LwogCQkJcmFuZ2VzID0gPDB4ODIwMDAwMDAgMCAweGU4MDAwMDAwICAgMCAweGU4MDAwMDAwICAg MCAweDA3ZjAwMDAwICAgLyogUG9ydCAwIE1FTSAqLwotCQkJCSAgMHg4MTAwMDAwMCAwIDB4ZWZm ZjAwMDAgICAwIDB4ZWZmZjAwMDAgICAwIDB4MDAwMTAwMDA+OyAvKiBQb3J0IDAgSU8gKi8KKwkJ CQkgIDB4ODEwMDAwMDAgMCAweGVmZjAwMDAwICAgMCAweGVmZjAwMDAwICAgMCAweDAwMTAwMDAw PjsgLyogUG9ydCAwIElPKi8KIAkJCWludGVycnVwdC1tYXAtbWFzayA9IDwwIDAgMCA3PjsKIAkJ CWludGVycnVwdC1tYXAgPSA8MCAwIDAgMSAmcGNpZV9pbnRjIDA+LAogCQkJCQk8MCAwIDAgMiAm cGNpZV9pbnRjIDE+LAotLSAKMi4yMC4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJt LWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21h aWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo= 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 294B5C433F5 for ; Thu, 13 Jan 2022 17:08:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233737AbiAMRIe (ORCPT ); Thu, 13 Jan 2022 12:08:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237003AbiAMRIc (ORCPT ); Thu, 13 Jan 2022 12:08:32 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34916C061574; Thu, 13 Jan 2022 09:08:32 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E3BB2B822C7; Thu, 13 Jan 2022 17:08:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73D89C36AEB; Thu, 13 Jan 2022 17:08:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642093709; bh=dygNr80wMXp+UwmgpjOaiLbn3AABVgQIS8MjdeeyX1Y=; h=From:To:Cc:Subject:Date:From; b=qEuoT1/T6TTqqKVDVsD8XFUDmA2AlXGwyCyA7uaS+waEHNJ+iR68ar4wlGBG8hIrC L5/+yLBCVvnGEDalwTrVXA14daXV6g1aa4a+xI6XquXDW/eal+XtUCNXgGiaYw+s/Z doFYXfWwz3VAVOr7qlBc8TrCIGYn9qMOPrjLMwoFTWsl5YZ/WYw/y9oez7SLTWIvhx ql7HfVehabJB71qvw5Qe4uGwsofc8uJkey2kDY2bh7SVZgxO75R07xDg9gPEkw1j54 o74/vTwXhnTl3bysBufzgtjxGmFN62uTWXESbhIVV/G61LTUlq5qCTS/e4lEZsYeUk HtSMGVBjtFH2A== Received: by pali.im (Postfix) id DAC8A778; Thu, 13 Jan 2022 18:08:26 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Gregory Clement Cc: Andrew Lunn , Sebastian Hesselbarth , Rob Herring , =?UTF-8?q?Marek=20Beh=C3=BAn?= , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: dts: marvell: armada-37xx: Increase PCIe IO size from 64 KiB to 1 MiB Date: Thu, 13 Jan 2022 18:07:55 +0100 Message-Id: <20220113170755.11856-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Commit 514ef1e62d65 ("arm64: dts: marvell: armada-37xx: Extend PCIe MEM space") increased size of PCIe MEM to 127 MiB, which is the maximal possible size for allocated 128 MiB PCIe window. PCIe IO size in that commit was unchanged. Armada 3720 PCIe controller supports 32-bit IO space mapping so it is possible to assign more than 64 KiB if address space for IO. Currently controller has assigned 127 MiB + 64 KiB memory and therefore there is 960 KiB of unused memory. So assign it to IO space by increasing IO window from 64 KiB to 1 MiB. DTS file armada-3720-turris-mox.dts already uses whole 128 MiB space, so only update comment about 32-bit IO space mapping. Signed-off-by: Pali Rohár Fixes: 514ef1e62d65 ("arm64: dts: marvell: armada-37xx: Extend PCIe MEM space") --- arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts index dd01409d4bb7..23e1b07c060a 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts @@ -153,7 +153,7 @@ * 2 size cells and also expects that the second range starts at 16 MB offset. If these * conditions are not met then U-Boot crashes during loading kernel DTB file. PCIe address * space is 128 MB long, so the best split between MEM and IO is to use fixed 16 MB window - * for IO and the rest 112 MB (64+32+16) for MEM, despite that maximal IO size is just 64 kB. + * for IO and the rest 112 MB (64+32+16) for MEM. Controller supports 32-bit IO mapping. * This bug is not present in U-Boot ports for other Armada 3700 devices and is fixed in * U-Boot version 2021.07. See relevant U-Boot commits (the last one contains fix): * https://source.denx.de/u-boot/u-boot/-/commit/cb2ddb291ee6fcbddd6d8f4ff49089dfe580f5d7 diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi index 1c74f02535c6..8d59eabadce6 100644 --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi @@ -508,12 +508,12 @@ /* * The 128 MiB address range [0xe8000000-0xf0000000] is * dedicated for PCIe and can be assigned to 8 windows - * with size a power of two. Use one 64 KiB window for + * with size a power of two. Use one 1 MiB window for * IO at the end and the remaining seven windows * (totaling 127 MiB) for MEM. */ ranges = <0x82000000 0 0xe8000000 0 0xe8000000 0 0x07f00000 /* Port 0 MEM */ - 0x81000000 0 0xefff0000 0 0xefff0000 0 0x00010000>; /* Port 0 IO */ + 0x81000000 0 0xeff00000 0 0xeff00000 0 0x00100000>; /* Port 0 IO*/ interrupt-map-mask = <0 0 0 7>; interrupt-map = <0 0 0 1 &pcie_intc 0>, <0 0 0 2 &pcie_intc 1>, -- 2.20.1