From patchwork Fri May 15 11:20:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 1291054 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=kzB8gWg2; 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 49NmFR1Pcjz9sTC for ; Fri, 15 May 2020 21:21:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2EF0681FCE; Fri, 15 May 2020 13:21:01 +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="kzB8gWg2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A60BE81FC7; Fri, 15 May 2020 13:20:44 +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 1D2E981FAA for ; Fri, 15 May 2020 13:20:36 +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=m.szyprowski@samsung.com Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20200515112034euoutp02f71d33b29c4b85a66b81a45873b34b34~PL7HgOHxs2708427084euoutp02Z for ; Fri, 15 May 2020 11:20:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20200515112034euoutp02f71d33b29c4b85a66b81a45873b34b34~PL7HgOHxs2708427084euoutp02Z DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1589541634; bh=daCvR4rQHDa+xspa2ZJYUH1JortBoXrqc8oRYdrjojg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kzB8gWg23tlTgD0mTX8Hde5cD+jpHhnjkJTvW3fQ4ffCbcK+LLC+NjvJvbe681P+c FfYdtxXFV+AuAC7TsaM+igqmliE7qanCKrRXf5ccRF4vqir+d6/vdq//ThUtB8Jgwe q4GqAn+b66VkJiCOlHn6wQRBp10jHnmPAKJ8dx9s= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200515112034eucas1p2a77ba266d23536bffef9b27eebdd72a2~PL7HP85BH1489914899eucas1p2q; Fri, 15 May 2020 11:20:34 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 7B.4C.60698.20B7EBE5; Fri, 15 May 2020 12:20:34 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200515112033eucas1p1cd20ecf4b87ae37a056eadb87b5b48be~PL7G7WD7S0867308673eucas1p1L; Fri, 15 May 2020 11:20:33 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200515112033eusmtrp2b638e32ab8c35aa8e74de207759b92a9~PL7G6lWJm2535425354eusmtrp2H; Fri, 15 May 2020 11:20:33 +0000 (GMT) X-AuditID: cbfec7f5-a29ff7000001ed1a-1d-5ebe7b02fc13 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 50.30.07950.10B7EBE5; Fri, 15 May 2020 12:20:33 +0100 (BST) Received: from AMDC2765.digital.local (unknown [106.120.51.73]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200515112033eusmtip217cceaf80f2838a59ac1a91c5d41e030~PL7GSVgd91806518065eusmtip2a; Fri, 15 May 2020 11:20:33 +0000 (GMT) From: Marek Szyprowski To: u-boot@lists.denx.de Cc: Marek Szyprowski , Matthias Brugger , Tom Rini , Sylwester Nawrocki , marex@denx.de, bmeng.cn@gmail.com, nsaenzjulienne@suse.de, sjg@chromium.org, jh80.chung@samsung.com, b.zolnierkie@samsung.com Subject: [RFC PATCH v2 2/2] rpi4: add a mapping for the PCIe XHCI controller MMIO registers (ARM 32bit) Date: Fri, 15 May 2020 13:20:16 +0200 Message-Id: <20200515112016.24522-3-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200515112016.24522-1-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprHKsWRmVeSWpSXmKPExsWy7djP87pM1fviDO5e57HYOGM9q8XUnniL G7/aWC3WHrnLbvGmrZHRYsHkJ6wW22YtZ7M4/Kad1eLblm2MFlMnbWa3eLu3k92B22N2w0UW j3mzTrB47Jx1l93j1YFV7B5n7+xg9OjbsorRY/2Wqywem09XB3BEcdmkpOZklqUW6dslcGW8 XTaFsWC1SMWWPQ9ZGhi/CXQxcnJICJhItP9Zz9rFyMUhJLCCUeLGyjYWCOcLo8TUSdPZQaqE BD4zSry4LwrTcfrWY2aIouWMEj86ulnhOs7tmc0GUsUmYCjR9bYLzBYRkJD41X+VEaSIWWAF k8Tn9tlgY4UFMiV6rk8BK2IRUJXY0dMIFucVsJXo2dDPCLFOXmL1hgNA6zg4OAXsJO5cBjtP QmAZu8TFTeeYIWpcJFofL2CDsIUlXh3fwg5hy0j83zmfCaKhmVHi4bm17BBOD6PE5aYZUBus Je6c+8UGsoFZQFNi/S59iLCjxMQ5DYwgYQkBPokbbwVBwsxA5qRt05khwrwSHW1CENVqErOO r4Nbe/DCJajTPCS+X1rGDgmgw4wSGx/9YZ3AKD8LYdkCRsZVjOKppcW56anFxnmp5XrFibnF pXnpesn5uZsYganm9L/jX3cw7vuTdIhRgINRiYf3QdW+OCHWxLLiytxDjBIczEoivH7rd8cJ 8aYkVlalFuXHF5XmpBYfYpTmYFES5zVe9DJWSCA9sSQ1OzW1ILUIJsvEwSnVwOixdWOUs3CC 8WTHLWsznV8f0jz6v6Mt9JjkzdU3OrkcTISuam9PjXifWyKt89mn5fPb/SyHWlW+NttV3H0m vEdw/VUN/jlun474tlxocDvp9O13YsfLY7zeZ6rF78/2eB3Vsd7a0E7nj9sUkwwutpjgG1v/ c8x7JlT7/OGah5YxN/lTXPnbipRYijMSDbWYi4oTAT5qAQIxAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrPLMWRmVeSWpSXmKPExsVy+t/xe7qM1fviDFo+61lsnLGe1WJqT7zF jV9trBZrj9xlt3jT1shosWDyE1aLbbOWs1kcftPOavFtyzZGi6mTNrNbvN3bye7A7TG74SKL x7xZJ1g8ds66y+7x6sAqdo+zd3YwevRtWcXosX7LVRaPzaerAzii9GyK8ktLUhUy8otLbJWi DS2M9AwtLfSMTCz1DI3NY62MTJX07WxSUnMyy1KL9O0S9DLeLpvCWLBapGLLnocsDYzfBLoY OTkkBEwkTt96zNzFyMUhJLCUUeLz8p1sEAkZiZPTGlghbGGJP9e62CCKPjFKXFp1CCzBJmAo 0fW2C6xBREBC4lf/VUaQImaBTUwSl/YuAEsIC6RLHD05jx3EZhFQldjR0whm8wrYSvRs6GeE 2CAvsXrDAaAzODg4Bewk7lxmAQkLCeRL/L23gG0CI98CRoZVjCKppcW56bnFRnrFibnFpXnp esn5uZsYgYG/7djPLTsYu94FH2IU4GBU4uE1mLo3Tog1say4MvcQowQHs5IIr9/63XFCvCmJ lVWpRfnxRaU5qcWHGE2BbprILCWanA+MyrySeENTQ3MLS0NzY3NjMwslcd4OgYMxQgLpiSWp 2ampBalFMH1MHJxSDYwZS4/6fE7a7Cxwc0vHEYW/zAwBAgVLrqclXP679HCKTeMOw9bncivZ dFiTt8Vl7JOtilD+naR3qkXl/NrnRT+uFzzm6go4WHhV3PDtdce6xP8K5kfXxLmqRv+aNCXa 1cdY/ZCPUp1XvVvj0yk2RhK/RNWKttsyMr2e6+y068Xa65MvPHfNq1diKc5INNRiLipOBACy xJLEkgIAAA== X-CMS-MailID: 20200515112033eucas1p1cd20ecf4b87ae37a056eadb87b5b48be X-Msg-Generator: CA X-RootMTR: 20200515112033eucas1p1cd20ecf4b87ae37a056eadb87b5b48be X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200515112033eucas1p1cd20ecf4b87ae37a056eadb87b5b48be References: <71b88bb9-7bfd-cb33-59b8-052c08ed33fa@suse.com> <20200515112016.24522-1-m.szyprowski@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 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. Due to 32bit limit in the CPU virtual address space in ARM 32bit mode, this region is mapped at 0xff800000 CPU virtual address. Signed-off-by: Marek Szyprowski --- arch/arm/mach-bcm283x/Kconfig | 1 + arch/arm/mach-bcm283x/include/mach/base.h | 6 ++++++ arch/arm/mach-bcm283x/init.c | 14 ++++++++++++++ include/configs/rpi.h | 5 +++++ 4 files changed, 26 insertions(+) diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig index 00419bf..bcb7f1d 100644 --- a/arch/arm/mach-bcm283x/Kconfig +++ b/arch/arm/mach-bcm283x/Kconfig @@ -36,6 +36,7 @@ config BCM2711_32B select BCM2711 select ARMV7_LPAE select CPU_V7A + select PHYS_64BIT config BCM2711_64B bool "Broadcom BCM2711 SoC 64-bit support" diff --git a/arch/arm/mach-bcm283x/include/mach/base.h b/arch/arm/mach-bcm283x/include/mach/base.h index c4ae398..1bf89db 100644 --- a/arch/arm/mach-bcm283x/include/mach/base.h +++ b/arch/arm/mach-bcm283x/include/mach/base.h @@ -8,4 +8,10 @@ extern unsigned long rpi_bcm283x_base; +#ifdef CONFIG_ARMV7_LPAE +#include +#define phys_to_virt addrmap_phys_to_virt +#define virt_to_phys addrmap_virt_to_phys +#endif + #endif diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c index 6a748da..4b9c831 100644 --- a/arch/arm/mach-bcm283x/init.c +++ b/arch/arm/mach-bcm283x/init.c @@ -145,6 +145,20 @@ int mach_cpu_init(void) } #ifdef CONFIG_ARMV7_LPAE +#define BCM2711_RPI4_PCIE_XHCI_MMIO_VIRT 0xff800000UL +#include + +void init_addr_map(void) +{ + mmu_set_region_dcache_behaviour_phys(BCM2711_RPI4_PCIE_XHCI_MMIO_VIRT, + BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS, + BCM2711_RPI4_PCIE_XHCI_MMIO_SIZE, + DCACHE_OFF); + addrmap_set_entry(BCM2711_RPI4_PCIE_XHCI_MMIO_VIRT, + BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS, + BCM2711_RPI4_PCIE_XHCI_MMIO_SIZE, 0); +} + void enable_caches(void) { dcache_enable(); diff --git a/include/configs/rpi.h b/include/configs/rpi.h index b53a4b6..7da2cff 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -63,6 +63,11 @@ #define CONFIG_SYS_BOOTM_LEN SZ_64M #endif +#ifdef CONFIG_ARMV7_LPAE +#define CONFIG_ADDR_MAP 1 +#define CONFIG_SYS_NUM_ADDR_MAP 2 +#endif + /* Devices */ /* GPIO */ #define CONFIG_BCM2835_GPIO