{"id":813967,"url":"http://patchwork.ozlabs.org/api/patches/813967/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20170914220513.9359-11-paul.burton@imgtec.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170914220513.9359-11-paul.burton@imgtec.com>","list_archive_url":null,"date":"2017-09-14T22:05:10","name":"[U-Boot,v2,10/13] mips: Use asm-generic/io.h","commit_ref":"d1cbeafd5e5e43ec8869a6e5e0b6dd720e51252a","pull_url":null,"state":"accepted","archived":false,"hash":"bf9fd3975f8c88bb2cbf0c361972fc62ff7e0309","submitter":{"id":33698,"url":"http://patchwork.ozlabs.org/api/people/33698/?format=json","name":"Paul Burton","email":"paul.burton@imgtec.com"},"delegate":{"id":3651,"url":"http://patchwork.ozlabs.org/api/users/3651/?format=json","username":"trini","first_name":"Tom","last_name":"Rini","email":"trini@ti.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20170914220513.9359-11-paul.burton@imgtec.com/mbox/","series":[{"id":3169,"url":"http://patchwork.ozlabs.org/api/series/3169/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=3169","date":"2017-09-14T22:05:00","name":"Add asm-generic/io.h; virt_to_phys(), phys_to_virt() for all arches","version":2,"mbox":"http://patchwork.ozlabs.org/series/3169/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813967/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813967/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xtXm83zlTz9s3T\n\tfor ;\n\tFri, 15 Sep 2017 08:10:48 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 5C758C21F64; Thu, 14 Sep 2017 22:09:10 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id D3F92C21F3B;\n\tThu, 14 Sep 2017 22:09:06 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid EE133C21F0B; Thu, 14 Sep 2017 22:08:32 +0000 (UTC)","from mailapp01.imgtec.com (mailapp01.imgtec.com [195.59.15.196])\n\tby lists.denx.de (Postfix) with ESMTP id D486DC21F3B\n\tfor ; Thu, 14 Sep 2017 22:08:31 +0000 (UTC)","from hhmail02.hh.imgtec.org (unknown [10.100.10.20])\n\tby Forcepoint Email with ESMTPS id E76E3ADAD5401;\n\tThu, 14 Sep 2017 23:08:25 +0100 (IST)","from localhost (10.20.1.88) by hhmail02.hh.imgtec.org\n\t(10.100.10.21) with Microsoft SMTP Server (TLS) id 14.3.294.0;\n\tThu, 14 Sep 2017 23:08:30 +0100"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE\n\tautolearn=unavailable autolearn_force=no version=3.4.0","From":"Paul Burton ","To":"","Date":"Thu, 14 Sep 2017 15:05:10 -0700","Message-ID":"<20170914220513.9359-11-paul.burton@imgtec.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170914220513.9359-1-paul.burton@imgtec.com>","References":"<20170914220513.9359-1-paul.burton@imgtec.com>","MIME-Version":"1.0","X-Originating-IP":"[10.20.1.88]","Subject":"[U-Boot] [PATCH v2 10/13] mips: Use asm-generic/io.h","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"Convert the mips architecture to make use of the new asm-generic/io.h to\nprovide address mapping functions. As mips actually performs\nnon-identity mapping between physical & virtual addresses we can't\nsimply make use of the generic functions, with the exception of being\nable to drop our no-op unmap_physmem() and definitions of unused map\nflags.\n\nSigned-off-by: Paul Burton \nCc: Daniel Schwierzeck \n---\n\nChanges in v2: None\n\n arch/mips/include/asm/io.h | 17 ++++++-----------\n 1 file changed, 6 insertions(+), 11 deletions(-)","diff":"diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h\nindex ee7a59290d..45d7ca0cc6 100644\n--- a/arch/mips/include/asm/io.h\n+++ b/arch/mips/include/asm/io.h\n@@ -95,6 +95,7 @@ static inline unsigned long virt_to_phys(volatile const void *address)\n #endif\n \treturn CPHYSADDR(addr);\n }\n+#define virt_to_phys virt_to_phys\n \n /*\n * phys_to_virt - map physical address to virtual\n@@ -112,6 +113,7 @@ static inline void *phys_to_virt(unsigned long address)\n {\n \treturn (void *)(address + PAGE_OFFSET - PHYS_OFFSET);\n }\n+#define phys_to_virt phys_to_virt\n \n /*\n * ISA I/O bus memory addresses are 1:1 with the physical address.\n@@ -490,10 +492,7 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int\n */\n #define sync()\t\tmmiowb()\n \n-#define MAP_NOCACHE\t(1)\n-#define MAP_WRCOMBINE\t(0)\n-#define MAP_WRBACK\t(0)\n-#define MAP_WRTHROUGH\t(0)\n+#define MAP_NOCACHE\t1\n \n static inline void *\n map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)\n@@ -503,13 +502,7 @@ map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)\n \n \treturn (void *)CKSEG0ADDR(paddr);\n }\n-\n-/*\n- * Take down a mapping set up by map_physmem().\n- */\n-static inline void unmap_physmem(void *vaddr, unsigned long flags)\n-{\n-}\n+#define map_physmem map_physmem\n \n #define __BUILD_CLRBITS(bwlq, sfx, end, type)\t\t\t\t\\\n \t\t\t\t\t\t\t\t\t\\\n@@ -566,4 +559,6 @@ BUILD_CLRSETBITS(q, le64, le64, u64)\n BUILD_CLRSETBITS(q, be64, be64, u64)\n BUILD_CLRSETBITS(q, 64, _, u64)\n \n+#include \n+\n #endif /* _ASM_IO_H */\n","prefixes":["U-Boot","v2","10/13"]}