{"id":813971,"url":"http://patchwork.ozlabs.org/api/patches/813971/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20170914220513.9359-12-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-12-paul.burton@imgtec.com>","list_archive_url":null,"date":"2017-09-14T22:05:11","name":"[U-Boot,v2,11/13] nios2: Use asm-generic/io.h","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"0060a9c0941e8c41d381ccd342851a2dd0b73e5b","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-12-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/813971/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813971/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 3xtXr20ztGz9s5L\n\tfor ;\n\tFri, 15 Sep 2017 08:14:10 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid DB968C21F6F; Thu, 14 Sep 2017 22:11:44 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 931F2C21F74;\n\tThu, 14 Sep 2017 22:11:41 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid BD04EC21F64; Thu, 14 Sep 2017 22:08:52 +0000 (UTC)","from mailapp01.imgtec.com (mailapp01.imgtec.com [195.59.15.196])\n\tby lists.denx.de (Postfix) with ESMTP id 9E7BAC21EF8\n\tfor ; Thu, 14 Sep 2017 22:08:49 +0000 (UTC)","from hhmail02.hh.imgtec.org (unknown [10.100.10.20])\n\tby Forcepoint Email with ESMTPS id BB05FFC761497;\n\tThu, 14 Sep 2017 23:08:43 +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:48 +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:11 -0700","Message-ID":"<20170914220513.9359-12-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]","Cc":"Scott McNutt ","Subject":"[U-Boot] [PATCH v2 11/13] nios2: 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 nios2 architecture to make use of the new asm-generic/io.h to\nprovide address mapping functions. As nios2 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\nFeedback from architecture maintainers is welcome.\n\nSigned-off-by: Paul Burton \nCc: Thomas Chou \n---\n\nChanges in v2: None\n\n arch/nios2/include/asm/io.h | 15 ++++++++-------\n 1 file changed, 8 insertions(+), 7 deletions(-)","diff":"diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h\nindex e951500190..4e5b44a4e4 100644\n--- a/arch/nios2/include/asm/io.h\n+++ b/arch/nios2/include/asm/io.h\n@@ -19,9 +19,6 @@ static inline void sync(void)\n * properties specified by \"flags\".\n */\n #define MAP_NOCACHE\t1\n-#define MAP_WRCOMBINE\t0\n-#define MAP_WRBACK\t0\n-#define MAP_WRTHROUGH\t0\n \n static inline void *\n map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)\n@@ -32,20 +29,22 @@ map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)\n \telse\n \t\treturn (void *)(paddr | gd->arch.mem_region_base);\n }\n+#define map_physmem map_physmem\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+static inline void *phys_to_virt(phys_addr_t paddr)\n {\n+\tDECLARE_GLOBAL_DATA_PTR;\n \n+\treturn (void *)(paddr | gd->arch.mem_region_base);\n }\n+#define phys_to_virt phys_to_virt\n \n static inline phys_addr_t virt_to_phys(void * vaddr)\n {\n \tDECLARE_GLOBAL_DATA_PTR;\n \treturn (phys_addr_t)vaddr & gd->arch.physaddr_mask;\n }\n+#define virt_to_phys virt_to_phys\n \n #define __raw_writeb(v,a) (*(volatile unsigned char *)(a) = (v))\n #define __raw_writew(v,a) (*(volatile unsigned short *)(a) = (v))\n@@ -171,4 +170,6 @@ static inline void outsl (unsigned long port, const void *src, unsigned long cou\n #define memcpy_fromio(a, b, c)\t\tmemcpy((a), (void *)(b), (c))\n #define memcpy_toio(a, b, c)\t\tmemcpy((void *)(a), (b), (c))\n \n+#include \n+\n #endif /* __ASM_NIOS2_IO_H_ */\n","prefixes":["U-Boot","v2","11/13"]}