From patchwork Mon May 18 13:17:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 1292524 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=u5Cucauj; 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 49QfjG1kksz9sRK for ; Mon, 18 May 2020 23:18:38 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 193FA81584; Mon, 18 May 2020 15:18:29 +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="u5Cucauj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 32AAB81CB9; Mon, 18 May 2020 15:18:26 +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 0DC2181584 for ; Mon, 18 May 2020 15:18: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=m.szyprowski@samsung.com Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20200518131816euoutp021aed6265cfd5747c933b4e8be514b1e5~QIdvoXf9c2853128531euoutp02D for ; Mon, 18 May 2020 13:18:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20200518131816euoutp021aed6265cfd5747c933b4e8be514b1e5~QIdvoXf9c2853128531euoutp02D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1589807896; bh=dUNOdbeUwGQ0gjnN7h/iptgs0THBcsWZ7VMJYZz9CsY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u5Cucauj39pqDDM1DJiN6+R8jqyn04XAcDpUb9ZEubzX1N7GXwRi3tpxOt7wqnb7R 6KJinsLjefFEPCt+7zDMokPYj1dCpE1PlJxxzxJHYzXyxjIwBRffj7EjN7tZch3/Gs pJELAh1EG2gaH6PasJkQIEOgKTfD0ZcbdAqrJPDQ= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200518131816eucas1p2bb1d25281000e925a9f461f50451ac31~QIdvTmP030055100551eucas1p2-; Mon, 18 May 2020 13:18:16 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 7F.0C.60698.81B82CE5; Mon, 18 May 2020 14:18:16 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200518131816eucas1p1aa84fb661559b858fd976d414212c254~QIdu33-Au1880218802eucas1p1C; Mon, 18 May 2020 13:18:16 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200518131816eusmtrp24edd11a7178c844ba4d2a3f8bb75d2b4~QIdu3P_0m2712527125eusmtrp27; Mon, 18 May 2020 13:18:16 +0000 (GMT) X-AuditID: cbfec7f5-a0fff7000001ed1a-13-5ec28b18ab40 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 8E.F0.08375.71B82CE5; Mon, 18 May 2020 14:18:15 +0100 (BST) Received: from AMDC2765.digital.local (unknown [106.120.51.73]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200518131815eusmtip2be73e49f99a77c2645d86e8fa4248551~QIduSB8Ow0342603426eusmtip2L; Mon, 18 May 2020 13:18:15 +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 v3 1/3] arm: provide a function for boards init code to modify MMU virtual-physical map Date: Mon, 18 May 2020 15:17:59 +0200 Message-Id: <20200518131801.465-2-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200518131801.465-1-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA0VSa0hTYRjm85ztnK2Onqbkm0XGoEgjL1h0SI3CoNO/CsILXlp6UGlT21FL K1iWm03NWok2SyXwkmZmLtMi02lpisu8kKR2Gf1J1IRZpA3Leab9e97n8j7f9/GRmKxc5EUm p6Rz6hSFUi6W4i1vFiy7Id8cG1Bl38g0lTaKmOKCOGZsUStiGronCWZaexkxlbe+iZgWY42Y 6ZrWiZhfphbEFBuaCWbm5TXi4Dq2TPMeZ8uNvTjbZpwk2KmOOoIdmGhF7HVTHWIbTaM429x/ 4RgZJQ1J4JTJmZza/8ApaVL/j1yXtIqt5x/kfMI1yA56JCGB3gNdIzlIj6SkjK5F0HCvGhOG eQSTOr1TsSEYvGlGq5Hf9eUiQahBsJQ3TaxFZqeGCIdLTAeCfkYvdmAPGmCxaHRlFUbXuoBN V7ZicqdV8NY6j+sRSeL0dtB+3OugKToYrJ8LxEKbN9Q/7sAcWEKHgK3zj4tjD9DVBPQVawjB dBieFrxyYneY6jE58Rb421bhDFxB8NXSQAhDAYLhnFLnhYJhwrIodpwCo32g8bm/QB8Cu7Fv hQbaFcZmNjhobBkaWkowgaYgTysT3DvA2PNorbZzcMhpYaH6AyW8TxGC3qFu7AbyNv7vqkSo DnlyGbwqkeODUrhzfrxCxWekJPrFp6qeoOVf07/U87MVtdtPmxFNIvl6ilSZY2UiRSafpTIj IDG5BxVpa4+VUQmKrGxOnRqnzlByvBltJnG5JxV0/3uMjE5UpHNnOC6NU6+qLqTES4PyYzZl vw62Tfi4RShkYR77j++U5Cqz+KZU64nmgYhwwzvJ0kWpa7T2aFEF90JizfcvHEu1VkXG6wJC 63wvebeOJ4jcwwrLwk9quErcUuW97fbQCO1jj37m51ZCPTw7PDsYsks31zR+ZC5qKmlfofKq IXSBWjJZcu7EfTHcjamQ43ySItAXU/OKf3cVKu0xAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrPLMWRmVeSWpSXmKPExsVy+t/xe7ri3YfiDFYcsLbYOGM9q8XUnniL G7/aWC3WHrnLbvGmrZHRYsHkJ6wW22YtZ7M4/Kad1eLblm2MFlMnbWa3eLu3k92B22N2w0UW j3mzTrB47Jx1l93j1YFV7B5n7+xg9OjbsorRY/2Wqywem09XB3BE6dkU5ZeWpCpk5BeX2CpF G1oY6RlaWugZmVjqGRqbx1oZmSrp29mkpOZklqUW6dsl6GWcft/KVDBfrmJl0z2WBsY/El2M nBwSAiYSP1bPY+1i5OIQEljKKHHw4jIWiISMxMlpDawQtrDEn2tdbBBFnxgl+h+eBUuwCRhK dL0FSXByiAhISPzqv8oIUsQssIlJ4tLeBWAJYYFsiWln+9m7GDk4WARUJdpumYKEeQWsJR7d 72GDWCAvsXrDAWYQm1PARuLzwd9MILYQUM2pRxfZJzDyLWBkWMUoklpanJueW2yoV5yYW1ya l66XnJ+7iREY+NuO/dy8g/HSxuBDjAIcjEo8vAn5h+KEWBPLiitzDzFKcDArifBGft4XJ8Sb klhZlVqUH19UmpNafIjRFOimicxSosn5wKjMK4k3NDU0t7A0NDc2NzazUBLn7RA4GCMkkJ5Y kpqdmlqQWgTTx8TBKdXAWPzM162vR8LMPFDqwa1zqrMcmj73bsuc0TfZtLfg04GcA46nz/M6 m8yJUNuV8q7sqIhqRmbGD2G7WQ0fvddK79PL5fgV1Tz9sIYO88/jIYaytznviwrfZHBf9+77 phlJR43tSkr8Pkbc2/bxW8E6/l7tkFcnkwRdPrtyqeyN7T1hPmvSxrTNSizFGYmGWsxFxYkA YamjbZICAAA= X-CMS-MailID: 20200518131816eucas1p1aa84fb661559b858fd976d414212c254 X-Msg-Generator: CA X-RootMTR: 20200518131816eucas1p1aa84fb661559b858fd976d414212c254 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200518131816eucas1p1aa84fb661559b858fd976d414212c254 References: <20200518131801.465-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 Provide a function for setting arbitrary virtual-physical MMU mapping for the given region. Signed-off-by: Marek Szyprowski --- arch/arm/include/asm/mmu.h | 8 ++++++++ arch/arm/include/asm/system.h | 11 +++++++++++ arch/arm/lib/cache-cp15.c | 24 ++++++++++++++++++------ 3 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 arch/arm/include/asm/mmu.h diff --git a/arch/arm/include/asm/mmu.h b/arch/arm/include/asm/mmu.h new file mode 100644 index 0000000..fe3d793 --- /dev/null +++ b/arch/arm/include/asm/mmu.h @@ -0,0 +1,8 @@ +#ifndef __ASM_ARM_MMU_H +#define __ASM_ARM_MMU_H + +#ifdef CONFIG_ADDR_MAP +extern void init_addr_map(void); +#endif + +#endif diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h index 81ccead..5b9f31c 100644 --- a/arch/arm/include/asm/system.h +++ b/arch/arm/include/asm/system.h @@ -573,6 +573,17 @@ s32 psci_features(u32 function_id, u32 psci_fid); void save_boot_params_ret(void); /** + * Change the virt/phys mapping and cache settings for a region. + * + * \param virt virtual start address of memory region to change + * \param phys physical address for the memory region to set + * \param size size of memory region to change + * \param option dcache option to select + */ +void mmu_set_region_dcache_behaviour_phys(phys_addr_t virt, phys_addr_t phys, + size_t size, enum dcache_option option); + +/** * Change the cache settings for a region. * * \param start start address of memory region to change diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c index f8d2096..84ddad3 100644 --- a/arch/arm/lib/cache-cp15.c +++ b/arch/arm/lib/cache-cp15.c @@ -24,7 +24,8 @@ __weak void arm_init_domains(void) { } -void set_section_dcache(int section, enum dcache_option option) +static void set_section_phys(int section, phys_addr_t phys, + enum dcache_option option) { #ifdef CONFIG_ARMV7_LPAE u64 *page_table = (u64 *)gd->arch.tlb_addr; @@ -36,7 +37,7 @@ void set_section_dcache(int section, enum dcache_option option) #endif /* Add the page offset */ - value |= ((u32)section << MMU_SECTION_SHIFT); + value |= phys; /* Add caching bits */ value |= option; @@ -45,13 +46,18 @@ void set_section_dcache(int section, enum dcache_option option) page_table[section] = value; } +void set_section_dcache(int section, enum dcache_option option) +{ + set_section_phys(section, (u32)section << MMU_SECTION_SHIFT, option); +} + __weak void mmu_page_table_flush(unsigned long start, unsigned long stop) { debug("%s: Warning: not implemented\n", __func__); } -void mmu_set_region_dcache_behaviour(phys_addr_t start, size_t size, - enum dcache_option option) +void mmu_set_region_dcache_behaviour_phys(phys_addr_t start, phys_addr_t phys, + size_t size, enum dcache_option option) { #ifdef CONFIG_ARMV7_LPAE u64 *page_table = (u64 *)gd->arch.tlb_addr; @@ -70,8 +76,8 @@ void mmu_set_region_dcache_behaviour(phys_addr_t start, size_t size, debug("%s: start=%pa, size=%zu, option=0x%x\n", __func__, &start, size, option); #endif - for (upto = start; upto < end; upto++) - set_section_dcache(upto, option); + for (upto = start; upto < end; upto++, phys += MMU_SECTION_SIZE) + set_section_phys(upto, phys, option); /* * Make sure range is cache line aligned @@ -86,6 +92,12 @@ void mmu_set_region_dcache_behaviour(phys_addr_t start, size_t size, mmu_page_table_flush(startpt, stoppt); } +void mmu_set_region_dcache_behaviour(phys_addr_t start, size_t size, + enum dcache_option option) +{ + mmu_set_region_dcache_behaviour_phys(start, start, size, option); +} + __weak void dram_bank_mmu_setup(int bank) { bd_t *bd = gd->bd; From patchwork Mon May 18 13:18:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 1292527 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=QM+6hpT2; 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 49Qfjz42j4z9sRK for ; Mon, 18 May 2020 23:19:19 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EBD6981CD0; Mon, 18 May 2020 15:18:43 +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="QM+6hpT2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5684281CAF; Mon, 18 May 2020 15:18:30 +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 4512D81CAD for ; Mon, 18 May 2020 15:18:19 +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 20200518131817euoutp025041c3f5f6893ccda472c6bc29806c45~QIdwoOHOr2893728937euoutp02t for ; Mon, 18 May 2020 13:18:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20200518131817euoutp025041c3f5f6893ccda472c6bc29806c45~QIdwoOHOr2893728937euoutp02t DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1589807897; bh=5DvHpbzARYzZea8kwdy13FBc8UPRFraRiIjmgpduJgc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QM+6hpT2SAEjcTsnMTN55khRex9RbZiVn9ZVPEFjj/HqylK3X0fV1wqSd+zxH9wQp /45n84/MI/1NuhWsJrNQUOKcmXsIHeoMsUiZh5WkaJnC1O/mJN6HonoWwngMVyJmGR 6zzlCxGmv+wFyagn3WcvMP3i02R9mSvNOXTgxLGs= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20200518131817eucas1p165f057fef0d232fa354521466a727ca4~QIdwPqnb21880218802eucas1p1D; Mon, 18 May 2020 13:18:17 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 9D.89.61286.91B82CE5; Mon, 18 May 2020 14:18:17 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20200518131816eucas1p2344d0e25b136ee0d2f07517af488358e~QIdvhyHy62404224042eucas1p2Q; Mon, 18 May 2020 13:18:16 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200518131816eusmtrp21690e441784f4e26577fd3487fc4ad03~QIdvhILnc2712527125eusmtrp29; Mon, 18 May 2020 13:18:16 +0000 (GMT) X-AuditID: cbfec7f2-ef1ff7000001ef66-a3-5ec28b194772 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 40.01.08375.81B82CE5; Mon, 18 May 2020 14:18:16 +0100 (BST) Received: from AMDC2765.digital.local (unknown [106.120.51.73]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200518131816eusmtip27d557049442f1f03da3768fc12f9915d~QIdu2_QR-0825508255eusmtip2o; Mon, 18 May 2020 13:18:15 +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, Seung-Woo Kim Subject: [RFC PATCH v3 2/3] mmc: bcm283x: fix int to pointer cast Date: Mon, 18 May 2020 15:18:00 +0200 Message-Id: <20200518131801.465-3-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200518131801.465-1-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA0WSbUhTYRTHeXZfXU5uU/BJg8FAwTDNUrqlhULIrb5ERGDky9TLFN2UzVkW kRVYTlNTtDHDmYHmak5zjS106Mxcii+bShZKGBVpWphvaKi5XbVvv/M/53/OeQ4PiQifYQFk pjyPVcgl2WKcj5rfrQ0fPlBiTzrS/DmQbtMYMbq6NJmeWC/CaMPbKYKeK7oD6Pqqrxht1jbh dM/cfYxeMZkBramawenqynaCnu8sJmK9mdpCJ8rUaR0oY9VOEcxsl55gBictgCkz6QFjNI2j TPvAzQvkFX5MOpudmc8qwk+n8DNMxjokt5a47vqwzCsEZbgakCSkImHjy5NqwCeF1HMA+20d KBcsAfix3wy4YBHAoaevwa6jpDSV05sALBuZRvYc04ZiQg28SJyKgOp5Ne5mPwrC9fJxTyeE GuHBmkqNJ+FLxcH64QrMzSgVBNvVYx6zgIqGrnUd4mZIieCL1i4Pe1ExcLH7L8/dCFJ6Ala3 TgKu6Az8tLWJcuwLZ/tMBMcH4ZZVt2O4t73ekIHgglIAR+9qdtzRcHJo3XMOhAqBxjfhnBwH q8YGCO7NPnBifr9bRrax0vwY4WQBfFAk5KqDobavZW9s94hrZ38GWjZGMe5C5QBa25p5FUCk /T+sHgA98GdVSpmUVUbI2WthSolMqZJLw9JyZK/A9tcZ2Oz7YwHLrlQ7oEgg9hak5NiThJgk X1kgswNIImI/QcKiLUkoSJcU3GAVOckKVTartINAEhX7C441zCQKKakkj81i2VxWsZvlkV4B heCEcyPSbNlIXJUOWn//rJR94+FOXZuoKLR8LMF01roQmrivp6bjVu8pY/3Vc48cMRdXsYXI xsxUfrDqC14u+k7+WMsSG2Rr+PssIXH7SdlKlt2RJpMsXGrEqwxHg34FRy15R3U9bBlgbSJn yHFdfCzjY3fZLgsc8b3n5Q2dYlSZIYk4hCiUkn8bgHFNNgMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmkeLIzCtJLcpLzFFi42I5/e/4PV2J7kNxBjOvaVlsnLGe1WJqT7zF jV9trBZrj9xlt3jT1shosWDyE1aLbbOWs1kcftPOavFtyzZGixmTX7JZTJ20md3i7d5Odgce j9kNF1k85s06weKxc9Zddo9XB1axe5y9s4PRo2/LKkaP9VuusnhsPl0dwBGlZ1OUX1qSqpCR X1xiqxRtaGGkZ2hpoWdkYqlnaGwea2VkqqRvZ5OSmpNZllqkb5egl7Fl/TzmgtnsFZeuf2Vq YOxj62Lk4JAQMJHo7knqYuTiEBJYyiix9vBtoDgnUFxG4uS0BlYIW1jiz7UuNoiiT4wSP5f3 ghWxCRhKdL3tArNFBCQkfvVfZQSxmQXuMEm83i4OYgsLOEosOD8BbBCLgKrE5q4r7CA2r4C1 xKVf85khFshLrN5wAMzmFLCR+HzwNxOILQRUc+rRRfYJjHwLGBlWMYqklhbnpucWG+oVJ+YW l+al6yXn525iBEbAtmM/N+9gvLQx+BCjAAejEg9vQv6hOCHWxLLiytxDjBIczEoivJGf98UJ 8aYkVlalFuXHF5XmpBYfYjQFOmois5Rocj4wOvNK4g1NDc0tLA3Njc2NzSyUxHk7BA7GCAmk J5akZqemFqQWwfQxcXBKNTAWXjwk+nHjTRPB1HhNY5egw6/Oha2fu+naicxlib2B03+v3Ci+ tG3amZrrL3Xu8vkdvpjeUHOOJyRhz6Oiby4fgyw/m7JbzUj64Pfw+2yV7kV31d373UXNKq94 ON25aZ3F++iUl0efVPjvSQp7XBqXbV9Z3TK/sa/eh+Xj+28smhKvLi5e66OixFKckWioxVxU nAgALjNyTpYCAAA= X-CMS-MailID: 20200518131816eucas1p2344d0e25b136ee0d2f07517af488358e X-Msg-Generator: CA X-RootMTR: 20200518131816eucas1p2344d0e25b136ee0d2f07517af488358e X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200518131816eucas1p2344d0e25b136ee0d2f07517af488358e References: <20200518131801.465-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 From: Seung-Woo Kim On build with 32 bit, there is a warning for int-to-pointer-cast. Fix the int to pointer cast by using uintptr_t. Signed-off-by: Seung-Woo Kim Signed-off-by: Marek Szyprowski --- drivers/mmc/bcm2835_sdhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c index 39c93db..c31f099 100644 --- a/drivers/mmc/bcm2835_sdhci.c +++ b/drivers/mmc/bcm2835_sdhci.c @@ -209,7 +209,7 @@ static int bcm2835_sdhci_probe(struct udevice *dev) priv->last_write = 0; host->name = dev->name; - host->ioaddr = (void *)base; + host->ioaddr = (void *)(uintptr_t)base; host->quirks = SDHCI_QUIRK_BROKEN_VOLTAGE | SDHCI_QUIRK_BROKEN_R1B | SDHCI_QUIRK_WAIT_SEND_CMD | SDHCI_QUIRK_NO_HISPD_BIT; host->max_clk = emmc_freq; From patchwork Mon May 18 13:18:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 1292526 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=omyjq/nd; 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49Qfjn5xckz9sTC for ; Mon, 18 May 2020 23:19:09 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EA88481CC5; Mon, 18 May 2020 15:18: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="omyjq/nd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C5A8F81CBD; Mon, 18 May 2020 15:18: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 12FDC81CA8 for ; Mon, 18 May 2020 15:18: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=m.szyprowski@samsung.com Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20200518131818euoutp0271efca025aba47bfd050ca65f2832012~QIdwzla_O2838728387euoutp02R for ; Mon, 18 May 2020 13:18:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20200518131818euoutp0271efca025aba47bfd050ca65f2832012~QIdwzla_O2838728387euoutp02R DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1589807898; bh=Y/boAdQ+dsD1KkSjjRbGfiZmKaJE3KLFybfaF1xj0gI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=omyjq/ndyskQsvOjtokl4xdvkgVzmBzrqFxBOm5gTvbUrD6yKNPe4WLRWgm7Yk2Q6 cyydcmDITqZ3iYdHQeCUJkUyJaZ+dM8681ykmyBcA9/jS79oI530feSeabgoogs9YE 01x1j8B0vJH90JQ9TZtOw9PEuCuvXv5DdEIZ5PlI= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20200518131817eucas1p18159e7e408fe16ea4a9429e1a1cebf03~QIdweWMq-1880518805eucas1p1J; Mon, 18 May 2020 13:18:17 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 8E.89.61286.91B82CE5; Mon, 18 May 2020 14:18:17 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200518131817eucas1p16d37a356ad7f18a9a0f75ccbe9663905~QIdwNQFpZ1893218932eucas1p1-; Mon, 18 May 2020 13:18:17 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200518131817eusmtrp10310deb8d03126d8c86c2ea009aa87c6~QIdwMm3mn0118401184eusmtrp1Y; Mon, 18 May 2020 13:18:17 +0000 (GMT) X-AuditID: cbfec7f2-ef1ff7000001ef66-a5-5ec28b1924c8 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 61.9D.07950.91B82CE5; Mon, 18 May 2020 14:18:17 +0100 (BST) Received: from AMDC2765.digital.local (unknown [106.120.51.73]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200518131816eusmtip2c1bf7f3bda177d1efc0d443d317ddc5e~QIdviW_YP0540505405eusmtip2o; Mon, 18 May 2020 13:18:16 +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 v3 3/3] rpi4: add a mapping for the PCIe XHCI controller MMIO registers (ARM 32bit) Date: Mon, 18 May 2020 15:18:01 +0200 Message-Id: <20200518131801.465-4-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200518131801.465-1-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprPKsWRmVeSWpSXmKPExsWy7djPc7qS3YfiDGZ36lhsnLGe1WJqT7zF jV9trBZrj9xlt3jT1shosWDyE1aLbbOWs1kcftPOavFtyzZGi6mTNrNbvN3bye7A7TG74SKL x7xZJ1g8ds66y+7x6sAqdo+zd3YwevRtWcXosX7LVRaPzaerAziiuGxSUnMyy1KL9O0SuDLu XJnOVvBDrOLU3u3sDYyzhLsYOTkkBEwkdp48ydLFyMUhJLCCUeL8w+fMEM4XRok1r6ZCOZ8Z JU5u/8cI03L4yGQ2iMRyRomjr9cxgSTAWn6c1wex2QQMJbredrGB2CICEhK/+q8ygjQwC6xg kvjcPpsdJCEskCnx+moXWDOLgKrE51P7WEBsXgFriRU/1rJAbJOXWL3hADOIzSlgI/H54G8m kEESAovYJb4f3gl1kovE2ck72SFsYYlXx7dA2TISpyf3sEA0NDNKPDy3lh3C6WGUuNw0A6rb WuLOuV9At3IA3acpsX6XPkTYUeLF2bfMIGEJAT6JG28FQcLMQOakbdOhwrwSHW1CENVqErOO r4Nbe/DCJWYI20Oibf00aDD2M0ps2LuIaQKj/CyEZQsYGVcxiqeWFuempxYb5qWW6xUn5haX 5qXrJefnbmIEJpvT/45/2sH49VLSIUYBDkYlHt6E/ENxQqyJZcWVuYcYJTiYlUR4Iz/vixPi TUmsrEotyo8vKs1JLT7EKM3BoiTOa7zoZayQQHpiSWp2ampBahFMlomDU6qBsV5SbEuSp8O0 olORHdmz0iae/3jj4ypTlU2syYqMR3/wLORa/KBuaf7p3cH/YjRZVIyZo87usp3Y2ufkx3tO 8t6FNft8/nWYKc65wzDb+IP+Sbf+/sxP83gu1TvNZp78109kl6HhlSm8s3j5T1gmXTgU6z3h /a05N4I0AzrXFzqfbLgvIpz8TomlOCPRUIu5qDgRAKm5TvoyAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrPLMWRmVeSWpSXmKPExsVy+t/xe7qS3YfiDCbuELHYOGM9q8XUnniL G7/aWC3WHrnLbvGmrZHRYsHkJ6wW22YtZ7M4/Kad1eLblm2MFlMnbWa3eLu3k92B22N2w0UW j3mzTrB47Jx1l93j1YFV7B5n7+xg9OjbsorRY/2Wqywem09XB3BE6dkU5ZeWpCpk5BeX2CpF G1oY6RlaWugZmVjqGRqbx1oZmSrp29mkpOZklqUW6dsl6GXcuTKdreCHWMWpvdvZGxhnCXcx cnJICJhIHD4ymQ3EFhJYyiixZ40vRFxG4uS0BlYIW1jiz7UuoBouoJpPjBI9Hw+ygCTYBAwl ut52gTWLCEhI/Oq/yghSxCywiUni0t4FYAlhgXSJiZ/WgtksAqoSn0/tA2vmFbCWWPFjLQvE BnmJ1RsOMIPYnAI2Ep8P/maCuMha4tSji+wTGPkWMDKsYhRJLS3OTc8tNtIrTswtLs1L10vO z93ECAz8bcd+btnB2PUu+BCjAAejEg9vQv6hOCHWxLLiytxDjBIczEoivJGf98UJ8aYkVlal FuXHF5XmpBYfYjQFOmois5Rocj4wKvNK4g1NDc0tLA3Njc2NzSyUxHk7BA7GCAmkJ5akZqem FqQWwfQxcXBKNTAq2mRfr4nrWN0bPWPP+tDS/7of3K4KreB+822rlrmamU3QkkomIQ9nlWkN Thlisqee/7k+k13GP3bFlkezF8td3iByqaBG20zsSu08gyei4hYfeeZd/mHZuUlzUXOspoyv D9/zZ7OiaycdO+W6i3m3/ceaXbtYvD/+kbAIdgqc+HZJw27hA85KLMUZiYZazEXFiQAbgtLW kgIAAA== X-CMS-MailID: 20200518131817eucas1p16d37a356ad7f18a9a0f75ccbe9663905 X-Msg-Generator: CA X-RootMTR: 20200518131817eucas1p16d37a356ad7f18a9a0f75ccbe9663905 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200518131817eucas1p16d37a356ad7f18a9a0f75ccbe9663905 References: <20200518131801.465-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 | 8 ++++++++ arch/arm/mach-bcm283x/init.c | 20 ++++++++++++++++++++ include/configs/rpi.h | 7 +++++++ 4 files changed, 36 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..4ccaf69 100644 --- a/arch/arm/mach-bcm283x/include/mach/base.h +++ b/arch/arm/mach-bcm283x/include/mach/base.h @@ -8,4 +8,12 @@ extern unsigned long rpi_bcm283x_base; +#ifdef CONFIG_ARMV7_LPAE +#ifdef CONFIG_TARGET_RPI_4_32B +#include +#define phys_to_virt addrmap_phys_to_virt +#define virt_to_phys addrmap_virt_to_phys +#endif +#endif + #endif diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c index 9f5bca3..008b312 100644 --- a/arch/arm/mach-bcm283x/init.c +++ b/arch/arm/mach-bcm283x/init.c @@ -145,6 +145,26 @@ int mach_cpu_init(void) } #ifdef CONFIG_ARMV7_LPAE +#ifdef CONFIG_TARGET_RPI_4_32B +#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); + + /* identity mapping for 0..BCM2711_RPI4_PCIE_XHCI_MMIO_VIRT */ + addrmap_set_entry(0, 0, BCM2711_RPI4_PCIE_XHCI_MMIO_VIRT, 0); + /* XHCI MMIO on PCIe at BCM2711_RPI4_PCIE_XHCI_MMIO_VIRT */ + addrmap_set_entry(BCM2711_RPI4_PCIE_XHCI_MMIO_VIRT, + BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS, + BCM2711_RPI4_PCIE_XHCI_MMIO_SIZE, 1); +} +#endif + void enable_caches(void) { dcache_enable(); diff --git a/include/configs/rpi.h b/include/configs/rpi.h index b53a4b6..296e8ee 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -63,6 +63,13 @@ #define CONFIG_SYS_BOOTM_LEN SZ_64M #endif +#ifdef CONFIG_ARMV7_LPAE +#ifdef CONFIG_TARGET_RPI_4_32B +#define CONFIG_ADDR_MAP 1 +#define CONFIG_SYS_NUM_ADDR_MAP 2 +#endif +#endif + /* Devices */ /* GPIO */ #define CONFIG_BCM2835_GPIO