From patchwork Tue Apr 21 16:50:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 1274442 X-Patchwork-Delegate: marek.vasut@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=W9S6JG/g; 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 4969q812W9z9sSJ for ; Wed, 22 Apr 2020 03:41:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D70A281C61; Tue, 21 Apr 2020 19:40:41 +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="W9S6JG/g"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1CC4281A0D; Tue, 21 Apr 2020 18:51:25 +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 2DCCB81737 for ; Tue, 21 Apr 2020 18:51:21 +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 20200421165120euoutp0101ec21506fef207024eec068bd2713f3~H49EUIi7N0962409624euoutp01X for ; Tue, 21 Apr 2020 16:51:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200421165120euoutp0101ec21506fef207024eec068bd2713f3~H49EUIi7N0962409624euoutp01X DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587487880; bh=dqMAZVBRR9AX01Hgc3T6VfoE0znPLsfUFWVSuYq0+c4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W9S6JG/gS0hScvMlp/3epnfVC4hXCCQVdSWs/HmbozVZy1tC0RnFAo/3I16oYIbkc +pZI/20PwYLhme7RT6MLSyS+lUE0/4ixnMQwnXv/DUpZWYlvIK0LcCDDGu9M1BJPdc CAdBy0xK4HCDR5Ar4NYeI3D3yBeyZBXXkhJfBheA= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200421165120eucas1p297b1e3453e703f8e5eda14172d0f83d1~H49EBiVo82629626296eucas1p2m; Tue, 21 Apr 2020 16:51:20 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 78.64.60679.8842F9E5; Tue, 21 Apr 2020 17:51:20 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200421165119eucas1p19a1103b9f6b952bd83086a77df71e837~H49DkOhQc1429214292eucas1p1l; Tue, 21 Apr 2020 16:51:19 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200421165119eusmtrp29ad6632f3c6393b1aa457330e8cf88ab~H49DjrPER3266732667eusmtrp2V; Tue, 21 Apr 2020 16:51:19 +0000 (GMT) X-AuditID: cbfec7f4-0cbff7000001ed07-12-5e9f2488998e Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 3B.0E.08375.7842F9E5; Tue, 21 Apr 2020 17:51:19 +0100 (BST) Received: from AMDC3061.digital.local (unknown [106.120.51.75]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20200421165119eusmtip1f1b67aa1787772211a1def16f65bc6d6~H49DErhFS0901309013eusmtip1B; Tue, 21 Apr 2020 16:51:19 +0000 (GMT) From: Sylwester Nawrocki To: u-boot@lists.denx.de, mbrugger@suse.com, marex@denx.de, bmeng.cn@gmail.com Cc: agraf@suse.de, sjg@chrmium.org, jh80.chung@samsung.com, m.szyprowski@samsung.com, b.zolnierkie@samsung.com Subject: [RFC PATCH 4/9] rpi4: add a mapping for the PCIe XHCI controller MMIO registers (ARM 64bit) Date: Tue, 21 Apr 2020 18:50:54 +0200 Message-Id: <20200421165059.19394-5-s.nawrocki@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200421165059.19394-1-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjleLIzCtJLcpLzFFi42LZduznOd0OlflxBleWSlqcuPKP0WLjjPWs FlN74i1u/GpjtVh75C67xZu2RkaLBZOfsFp0XP3PaPF2bye7A6fH/VMNrB7zZp1g8dg56y67 x9k7Oxg9+rasYvRYv+Uqi8fm09UB7FFcNimpOZllqUX6dglcGUterGUvOMFf8XXacaYGxhs8 XYycHBICJhKT2+8zgdhCAisYJX5vreti5AKyvzBKTOy7zwLhfGaUOHVoLjNMx4Ztc5ggEssZ JWb/OsEC19L2+zQ7SBWbgKFE79E+RhBbRCBA4trPaWA2s0CBxLTrT9hAbGGBNIl9l78DTeXg YBFQlVjxvQokzCtgLTF/+zk2iGXyEqs3HABbzClgI3H3+wywXRIC3ewSk4/ugipykfhz5CUj hC0s8er4FnYIW0bi/875TBANzYwSPbtvs0M4Exgl7h9fANVhLXHn3C82kCuYBTQl1u/Shwg7 Sqw/dJcJJCwhwCdx460gxP18EpO2TWeGCPNKdLQJQVSrSPxeNZ0JwpaS6H7ynwXC9pCY9mwi MyR8+hklfh3uYJ/AKD8LYdkCRsZVjOKppcW56anFRnmp5XrFibnFpXnpesn5uZsYgank9L/j X3Yw7vqTdIhRgINRiYf3xvl5cUKsiWXFlbmHGCU4mJVEeDc8BArxpiRWVqUW5ccXleakFh9i lOZgURLnNV70MlZIID2xJDU7NbUgtQgmy8TBKdXAOHuVS7S8w6+vK66y3jUUn9Eot2jjWc3T 07clrGqY05D8vcnIWUTH3vg1g5PMzX1+c36v/DlvjcjllKft3RM2Pq5d+XPC/m3LHth0shma z2SJSs1Se6xv6SxU0zgnqmNN+KFzZtOdvtidECi//MLjlMPXX+HtjPmqCWHZkS7vDq+tcu+e oxC6VomlOCPRUIu5qDgRAPNyI+ohAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHLMWRmVeSWpSXmKPExsVy+t/xu7rtKvPjDC6fsbI4ceUfo8XGGetZ Lab2xFvc+NXGarH2yF12izdtjYwWCyY/YbXouPqf0eLt3k52B06P+6caWD3mzTrB4rFz1l12 j7N3djB69G1ZxeixfstVFo/Np6sD2KP0bIryS0tSFTLyi0tslaINLYz0DC0t9IxMLPUMjc1j rYxMlfTtbFJSczLLUov07RL0Mpa8WMtecIK/4uu040wNjDd4uhg5OSQETCQ2bJvD1MXIxSEk sJRR4uvF/yxdjBxACSmJ+S1KEDXCEn+udbFB1HxilJja9IUZJMEmYCjRe7SPEcQWEQiReHH0 ChOIzSxQJrGm9TVYXFggRWLyrSlsIDNZBFQlVnyvAgnzClhLzN9+jg1ivrzE6g0HwEZyCthI 3P0+gwXEFgKqabi0hGUCI98CRoZVjCKppcW56bnFhnrFibnFpXnpesn5uZsYgWG97djPzTsY L20MPsQowMGoxMN74/y8OCHWxLLiytxDjBIczEoivBseAoV4UxIrq1KL8uOLSnNSiw8xmgLd NJFZSjQ5HxhzeSXxhqaG5haWhubG5sZmFkrivB0CB2OEBNITS1KzU1MLUotg+pg4OKUaGLX1 Tpc+7j1lL7kgh/HtV62FV+8ti952/p9Snln59awyjq46dndey3c+M7oZG3/ERqdbyH/I23a0 b2EwV5eJ844j/B9f3fctmXPoxNKu3dMMl+y2rjzHa2Yuc11bPLbK8Uvn5cuav+bfXGP73eOv qbWD1uuNaSbcN6ekvG3fH66u9K8y+S5fshJLcUaioRZzUXEiAOSx0z6BAgAA X-CMS-MailID: 20200421165119eucas1p19a1103b9f6b952bd83086a77df71e837 X-Msg-Generator: CA X-RootMTR: 20200421165119eucas1p19a1103b9f6b952bd83086a77df71e837 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200421165119eucas1p19a1103b9f6b952bd83086a77df71e837 References: <20200421165059.19394-1-s.nawrocki@samsung.com> X-Mailman-Approved-At: Tue, 21 Apr 2020 19:40:20 +0200 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 --- 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;