From patchwork Mon May 4 12:45:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 1282596 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=samsung.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.a=rsa-sha256 header.s=mail20170921 header.b=HH0Er3fy; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49G2fw4BC7z9sSc for ; Mon, 4 May 2020 22:46:48 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2A80F81F9E; Mon, 4 May 2020 14:46:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=samsung.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.b="HH0Er3fy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F3C1181F9B; Mon, 4 May 2020 14:45:56 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 471A281FAE for ; Mon, 4 May 2020 14:45:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=samsung.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=s.nawrocki@samsung.com Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200504124545euoutp0146bc1f8b0486dc26c4e3dde032a0ae08~L0-W8G7xY2102521025euoutp01O for ; Mon, 4 May 2020 12:45:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200504124545euoutp0146bc1f8b0486dc26c4e3dde032a0ae08~L0-W8G7xY2102521025euoutp01O DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1588596345; bh=qi461G5EWErLGKbaNxeiYRdzjilYWpZTyyONAWTi6Dg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HH0Er3fyTPSKr+G8ksaHRuUg0DsGzoJ04i2Vu51/ZXmZ7WRqPySJDM+7TLb6smBsM Z0y8A/NOkQsly1Bi8DCWHe1/ZCzQKVrDMzGqn52hjIkzj/FBjie0EyELbMh5XIiC6b QjTfKl+wYNt/Oa8mLG2Yqbc5E1bMBwp4csW4hKbI= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200504124545eucas1p2ac0d2c5b981d9de6d72cfdb33af597bd~L0-WpQK-k1838618386eucas1p2Q; Mon, 4 May 2020 12:45:45 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 45.D0.60698.97E00BE5; Mon, 4 May 2020 13:45:45 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200504124545eucas1p1532613e2c1558cb043f3b32946c748ea~L0-WFpCxm2257722577eucas1p1v; Mon, 4 May 2020 12:45:45 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200504124545eusmtrp2655a3355e10c72a4f14cbaea8a2285f2~L0-WE7HaJ2443524435eusmtrp2a; Mon, 4 May 2020 12:45:45 +0000 (GMT) X-AuditID: cbfec7f5-a0fff7000001ed1a-28-5eb00e79d606 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 43.38.08375.87E00BE5; Mon, 4 May 2020 13:45:45 +0100 (BST) Received: from AMDC3061.digital.local (unknown [106.120.51.75]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200504124544eusmtip23a0e6e9b03f88cd2ec68d13ba5cb07df~L0-Von2k_2672526725eusmtip2Z; Mon, 4 May 2020 12:45:44 +0000 (GMT) From: Sylwester Nawrocki To: u-boot@lists.denx.de, mbrugger@suse.com, marex@denx.de, bmeng.cn@gmail.com Cc: nsaenzjulienne@suse.de, sjg@chromium.org, jh80.chung@samsung.com, m.szyprowski@samsung.com, b.zolnierkie@samsung.com, Sylwester Nawrocki Subject: [PATCH v2 05/10] rpi4: add a mapping for the PCIe XHCI controller MMIO registers (ARM 64bit) Date: Mon, 4 May 2020 14:45:18 +0200 Message-Id: <20200504124523.23484-6-s.nawrocki@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200504124523.23484-1-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprMKsWRmVeSWpSXmKPExsWy7djPc7qVfBviDOYsVbTYOGM9q8XUnniL G7/aWC3WHrnLbvGmrZHRYsHkJ6wW22YtZ7M4/Kad1eLblm2MFm/3drI7cHnMbrjI4jFv1gkW j52z7rJ7nL2zg9Gjb8sqRo/1W66yeGw+XR3AHsVlk5Kak1mWWqRvl8CVsfZqSMETgYq7L9+y NzDe5+1i5OSQEDCR2LjsAWMXIxeHkMAKRomZLzvZIZwvjBKnDhxlg3A+M0q8WT6NBablc89m ZhBbSGA5o8SOZmm4jpnXT7GCJNgEDCV6j/YxgtgiAgES135OA9vBLLCSUeLDvW/sIAlhgXSJ NXfnMYHYLAKqEr92fACzeQWsJbZNXcoGsU1eYvWGA2DbOAVsJN40fWIBGSQhMJld4sb8Q8wQ RS4SW1s3Q9nCEq+Ob2GHsGUk/u+czwTR0Mwo0bP7NjuEM4FR4v7xBYwQVdYSd879AlrHAXSf psT6XfoQYUeJPztWMYOEJQT4JG68FQQJMwOZk7ZNhwrzSnS0CUFUq0j8XjWdCcKWkuh+8h8a Wh4SN55cZYKEVj+jxO73cRMY5Wch7FrAyLiKUTy1tDg3PbXYOC+1XK84Mbe4NC9dLzk/dxMj MKmc/nf86w7GfX+SDjEKcDAq8fBGfF4fJ8SaWFZcmXuIUYKDWUmEd0cLUIg3JbGyKrUoP76o NCe1+BCjNAeLkjiv8aKXsUIC6YklqdmpqQWpRTBZJg5OqQbG/T+9O/cn/T/3c+Pq2+2Lbxte /V0gI97zyeNhxT27dbrqfTE3dXSWHDq/U+FG6VWnBJmkrdt/i/Oev2lYrCz4I85K5O8efvN5 vYK34zO47jw6mTlR8tDZh2be25mkf7iIJ+kuWWDMtJadb+NmUVHVN/fKVQIeHPoQu/Pl5kpN nyfSl3qMfybaK7EUZyQaajEXFScCACnL9wgmAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrMLMWRmVeSWpSXmKPExsVy+t/xe7qVfBviDFY7W2ycsZ7VYmpPvMWN X22sFmuP3GW3eNPWyGixYPITVotts5azWRx+085q8W3LNkaLt3s72R24PGY3XGTxmDfrBIvH zll32T3O3tnB6NG3ZRWjx/otV1k8Np+uDmCP0rMpyi8tSVXIyC8usVWKNrQw0jO0tNAzMrHU MzQ2j7UyMlXSt7NJSc3JLEst0rdL0MtYezWk4IlAxd2Xb9kbGO/zdjFyckgImEh87tnM3MXI xSEksJRRYuqym4xdjBxACSmJ+S1KEDXCEn+udbFB1HxilPixfiMjSIJNwFCi92gfmC0iECLx 4ugVJpAiZoH1jBIXz89nBkkIC6RKTL91ngnEZhFQlfi14wOYzStgLbFt6lI2iA3yEqs3HACr 5xSwkXjT9IkFxBYCqtn74xjbBEa+BYwMqxhFUkuLc9Nziw31ihNzi0vz0vWS83M3MQIDfNux n5t3MF7aGHyIUYCDUYmHN+Lz+jgh1sSy4srcQ4wSHMxKIrw7WoBCvCmJlVWpRfnxRaU5qcWH GE2BjprILCWanA+MvrySeENTQ3MLS0NzY3NjMwslcd4OgYMxQgLpiSWp2ampBalFMH1MHJxS DYyK3Jm7lW1W/z48k3M6a0OC4ITLmlk3izl546/7TDO/zSPX6LIrVG2ibiOn1a2bX54UTgra 5HHScX7v1pDojVMWvvwSe0n18N192p7vz/TMqGv4vHCPl3/bh0a/YP6Iiwcuf5yVYL/886zt C9bmd639zvUsUZM1odzAJni5/K6tylEKzx6GHHBUYinOSDTUYi4qTgQAz9tcgoYCAAA= X-CMS-MailID: 20200504124545eucas1p1532613e2c1558cb043f3b32946c748ea X-Msg-Generator: CA X-RootMTR: 20200504124545eucas1p1532613e2c1558cb043f3b32946c748ea X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200504124545eucas1p1532613e2c1558cb043f3b32946c748ea References: <20200504124523.23484-1-s.nawrocki@samsung.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Marek Szyprowski Create a non-cacheable mapping for the 0x600000000 physical memory region, where MMIO registers for the PCIe XHCI controller are instantiated by the PCIe bridge. Signed-off-by: Marek Szyprowski Signed-off-by: Sylwester Nawrocki Reviewed-by: Nicolas Saenz Julienne --- Changes since v1: - none. --- arch/arm/mach-bcm283x/init.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c index 4295356..6a748da 100644 --- a/arch/arm/mach-bcm283x/init.c +++ b/arch/arm/mach-bcm283x/init.c @@ -11,10 +11,15 @@ #include #include +#define BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS 0x600000000UL +#define BCM2711_RPI4_PCIE_XHCI_MMIO_SIZE 0x800000UL + #ifdef CONFIG_ARM64 #include -static struct mm_region bcm283x_mem_map[] = { +#define MAX_MAP_MAX_ENTRIES (4) + +static struct mm_region bcm283x_mem_map[MAX_MAP_MAX_ENTRIES] = { { .virt = 0x00000000UL, .phys = 0x00000000UL, @@ -34,7 +39,7 @@ static struct mm_region bcm283x_mem_map[] = { } }; -static struct mm_region bcm2711_mem_map[] = { +static struct mm_region bcm2711_mem_map[MAX_MAP_MAX_ENTRIES] = { { .virt = 0x00000000UL, .phys = 0x00000000UL, @@ -49,6 +54,13 @@ static struct mm_region bcm2711_mem_map[] = { PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN }, { + .virt = BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS, + .phys = BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS, + .size = BCM2711_RPI4_PCIE_XHCI_MMIO_SIZE, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { /* List terminator */ 0, } @@ -71,7 +83,7 @@ static void _rpi_update_mem_map(struct mm_region *pd) { int i; - for (i = 0; i < 2; i++) { + for (i = 0; i < MAX_MAP_MAX_ENTRIES; i++) { mem_map[i].virt = pd[i].virt; mem_map[i].phys = pd[i].phys; mem_map[i].size = pd[i].size;