From patchwork Mon May 25 11:39:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 1297306 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=85.214.62.61; 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=n4QAhAN+; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 49VwCf1ThXz9sRW for ; Mon, 25 May 2020 21:41:18 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 117FF81C7B; Mon, 25 May 2020 13:40: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=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="n4QAhAN+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8359C81C62; Mon, 25 May 2020 13:40:29 +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 mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 229F881A66 for ; Mon, 25 May 2020 13:40:18 +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 eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20200525114016euoutp021b0b80b8aa6908df52bca6336a59339f~SQpLcvuiU0304703047euoutp02H for ; Mon, 25 May 2020 11:40:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20200525114016euoutp021b0b80b8aa6908df52bca6336a59339f~SQpLcvuiU0304703047euoutp02H DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1590406816; bh=ozB4PjYhWsS5ZxKpmPa8mdxicOKm0FHHREyxFBafxKE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n4QAhAN+BEPXbQ5L3a8Qn37rLNs8bb2q89WU7lDzeVhQ2yxPdU7AEKTYs7/mfqfKw DocykIhgVeEyYSsoFcsesstWE8qDPXL28fG/7zuzE1wKaMdmAtHmUC96m32zfGXSOE axL4ZRsbkz/XsNC7CwihyVk2FKEwgin9p/VmtTes= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200525114016eucas1p2d13b2bc11e7e44b778cd52b61edc54df~SQpLPmObA2414324143eucas1p2a; Mon, 25 May 2020 11:40:16 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id A3.C8.60698.0AEABCE5; Mon, 25 May 2020 12:40:16 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200525114016eucas1p1d9166ae099e725d3284d27241a79b805~SQpK1mvl50867208672eucas1p1d; Mon, 25 May 2020 11:40:16 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200525114016eusmtrp2f6177034fcf6689cf39990d49d59898e~SQpK0-x1S2713827138eusmtrp2O; Mon, 25 May 2020 11:40:16 +0000 (GMT) X-AuditID: cbfec7f5-a0fff7000001ed1a-e4-5ecbaea0ba3c Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id FA.47.07950.0AEABCE5; Mon, 25 May 2020 12:40:16 +0100 (BST) Received: from AMDC3061.digital.local (unknown [106.120.51.75]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20200525114015eusmtip1afe3d7fef8540524e5fd96030e32482c~SQpKTYaNC2309623096eusmtip1q; Mon, 25 May 2020 11:40:15 +0000 (GMT) From: Sylwester Nawrocki To: u-boot@lists.denx.de, mbrugger@suse.com Cc: marex@denx.de, bmeng.cn@gmail.com, james.quinlan@broadcom.com, sjg@chromium.org, nsaenzjulienne@suse.de, jh80.chung@samsung.com, m.szyprowski@samsung.com, b.zolnierkie@samsung.com, Sylwester Nawrocki Subject: [PATCH v4 5/9] rpi4: add a mapping for the PCIe XHCI controller MMIO registers (ARM 64bit) Date: Mon, 25 May 2020 13:39:55 +0200 Message-Id: <20200525113959.11886-6-s.nawrocki@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200525113959.11886-1-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA0WSa0gUYRSG+3ZndkZrZVwtT1qI2wUt1MR+DClmkDhQUREFZWprDirqajte Mv+shVuZrpKauV1cC1TM3LR1vectMxQ1sbykpsgWKEpBFl5C23G0/r3nPc/7ncPhI8WyItyR jFImsCqlIkYuscZM75b63fWVPSGHVtL201UPDTidnxlKN89lS+iRZQ1Ov3w7QdBzmjRE63PN OG3SlUrojrnbOP3baEL0fPNdwn8ro5vslTCP1AMY81T3HmPqdRME0ztehxitsRwxBuMnjHnd k3qGvGTtG87GRCWxKk+/K9aRmYZOIr7f9vrC6ixSoxqbDGRFAnUYcosWRRnImpRRZQh0X6tx oVhAMFjQKuIpGfUTganj5GaiUL+MBKgUQVtHi+hfQvMhh+ApCeUFWZ1axGt76iCMVpjWITE1 i+Dbj2acb9hRLDSlayW8xqh9kJk2tO5LKR8YnTGLhHHO8OJVq5jXVpQvdLd9EfMPAVVCQJ6p Dxeg47A0XbYRsIPZLiMh6F2wVl8kEgK3EGQ2jhFCkYNgskuPBMoHxvuWLWuQlv3cwNDgKdjH oKmiGfE2UDYwMm/L22KLvG8qEAu2FO5oZAK9F1bKCzZWcIR75jVM0AysVeZLhAtlI2h4lE3k IGfd/2F6hMqRA5vIxUawnLeSTfbgFLFcojLC42pcbDWyfJue1a5fdejNn7B2RJFIvk1KV/SE yHBFEpcS246AFMvtpZpAiyUNV6TcYFVxoarEGJZrR04kJneQej+bCZZREYoENppl41nVZldE WjmqUYnmnEFLiXa4YCeGHhS7rNaGtMT51Zy2D1h6UjYW7f7RP3qhrjbygkPGVCN2NiH5yM6B 58VeF9V+8YNOUS5Kt4xUdV5CsI2KyQJnbk/3zaOFa1JmpsrV9fOUrPi8XZT2Wnp/bqBj0HfV Ys0wOXnKbA64bNyy3SR5HDas3j0dGiTHuEiF1wGxilP8BTfNGboyAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrPLMWRmVeSWpSXmKPExsVy+t/xu7oL1p2OM3jxi9ti44z1rBZTe+It 9r7pZ7O48auN1WLtkbvsFm/aGhktFkx+wmqxbdZyNovDb9pZLb5t2cZo8XZvJ7sDt8es+2fZ PGY3XGTxmDfrBIvHzll32T3O3tnB6NG3ZRWjx/otV1k8Np+uDuCI0rMpyi8tSVXIyC8usVWK NrQw0jO0tNAzMrHUMzQ2j7UyMlXSt7NJSc3JLEst0rdL0MvoWX+UveC8YMWXf68YGxi38nUx cnJICJhIzFzwi7GLkYtDSGApo8TtTTvYuxg5gBJSEvNblCBqhCX+XOtig6j5xCjx49hZRpAE m4ChRO/RPjBbREBXorFnHQtIEbPAF0aJTQcWs4EkhAWSJZadaAArYhFQlehpvMYKYvMKWEvc fPmECWKDvMTqDQeYQWxOARuJUwfvgdlCQDUzZz1jnMDIt4CRYRWjSGppcW56brGRXnFibnFp Xrpecn7uJkZg4G879nPLDsaud8GHGAU4GJV4eC3WnI4TYk0sK67MPcQowcGsJMLb5g4U4k1J rKxKLcqPLyrNSS0+xGgKdNREZinR5HxgVOaVxBuaGppbWBqaG5sbm1koifN2CByMERJITyxJ zU5NLUgtgulj4uCUamDkMWJ163DZV3bPlTPyR0M0f7DJ5ZjvbtcPM3qmxjJv52JnlXz/+9yF Ba62Cqk33x+dNcumOiG2kSfirtHM75MttS+uPikgt337qtUfunJ6Qmau19CRLun0fzopqkBp 6txD71LzKi/brN7jIXHjxdNLSrkHznqELlTvOBZ7tvzg1G+3lk80/7pdiaU4I9FQi7moOBEA AhJWCpICAAA= X-CMS-MailID: 20200525114016eucas1p1d9166ae099e725d3284d27241a79b805 X-Msg-Generator: CA X-RootMTR: 20200525114016eucas1p1d9166ae099e725d3284d27241a79b805 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200525114016eucas1p1d9166ae099e725d3284d27241a79b805 References: <20200525113959.11886-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 v3: - none. Changes since v2: - fixed typo MAX_MAP_MAX_ENTRIES -> MEM_MAP_MAX_ENTRIES 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..9f5bca3 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 MEM_MAP_MAX_ENTRIES (4) + +static struct mm_region bcm283x_mem_map[MEM_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[MEM_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 < MEM_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;