* [U-Boot] [PATCH v2 01/13] Provide a generic io.h & address mapping functions
2017-09-14 22:05 [U-Boot] [PATCH v2 00/13] Add asm-generic/io.h; virt_to_phys(), phys_to_virt() for all arches Paul Burton
@ 2017-09-14 22:05 ` Paul Burton
2017-09-15 7:35 ` Daniel Schwierzeck
2017-10-03 12:52 ` [U-Boot] [U-Boot, v2, " Tom Rini
2017-09-14 22:05 ` [U-Boot] [PATCH v2 02/13] arc: Use asm-generic/io.h Paul Burton
` (11 subsequent siblings)
12 siblings, 2 replies; 29+ messages in thread
From: Paul Burton @ 2017-09-14 22:05 UTC (permalink / raw)
To: u-boot
Most architectures currently supported by U-Boot use trivial
implementations of map_to_physmem & virt_to_phys which simply cast a
physical address to a pointer for use a virtual address & vice-versa.
This results in a lot of duplicate implementations of these mapping
functions.
The set of functions provided by different architectures also differs,
with some having implementations of phys_to_virt & others not. A later
patch will make use of phys_to_virt in architecture-neutral code, and so
requires that it be provided for all architectures.
This patch introduces an asm-generic/io.h which provides generic
implementations of address mapping functions, allowing the duplication
of them between architectures to be removed. Once architectures are
converted to make use of this generic header it will also ensure that
all of phys_to_virt, virt_to_phys, map_physmem & unmap_physmem are
provided. The 2 families of functions differ in that map_physmem may
create dynamic mappings whilst phys_to_virt may not & therefore is more
limited in scope but doesn't require information such as a length &
flags.
This patch doesn't convert any architectures to make use of this generic
header - later patches in the series will do so.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Alexey Brodkin <alexey.brodkin@synopsys.com>
Cc: Angelo Dureghello <angelo@sysam.it>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Cc: Macpaul Lin <macpaul@andestech.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Cc: Thomas Chou <thomas@wytron.com.tw>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Angelo Dureghello <angelo@sysam.it>
Tested-by: Angelo Dureghello <angelo@sysam.it>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
Changes in v2:
- Reformat map_physmem to split args across lines, rather than return type.
include/asm-generic/io.h | 110 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 110 insertions(+)
create mode 100644 include/asm-generic/io.h
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
new file mode 100644
index 0000000000..0f5160c6f1
--- /dev/null
+++ b/include/asm-generic/io.h
@@ -0,0 +1,110 @@
+/*
+ * Generic I/O functions.
+ *
+ * Copyright (c) 2016 Imagination Technologies Ltd.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef __ASM_GENERIC_IO_H__
+#define __ASM_GENERIC_IO_H__
+
+/*
+ * This file should be included at the end of each architecture-specific
+ * asm/io.h such that we may provide generic implementations without
+ * conflicting with architecture-specific code.
+ */
+
+#ifndef __ASSEMBLY__
+
+/**
+ * phys_to_virt() - Return a virtual address mapped to a given physical address
+ * @paddr: the physical address
+ *
+ * Returns a virtual address which the CPU can access that maps to the physical
+ * address @paddr. This should only be used where it is known that no dynamic
+ * mapping is required. In general, map_physmem should be used instead.
+ *
+ * Returns: a virtual address which maps to @paddr
+ */
+#ifndef phys_to_virt
+static inline void *phys_to_virt(phys_addr_t paddr)
+{
+ return (void *)(unsigned long)paddr;
+}
+#endif
+
+/**
+ * virt_to_phys() - Return the physical address that a virtual address maps to
+ * @vaddr: the virtual address
+ *
+ * Returns the physical address which the CPU-accessible virtual address @vaddr
+ * maps to.
+ *
+ * Returns: the physical address which @vaddr maps to
+ */
+#ifndef virt_to_phys
+static inline phys_addr_t virt_to_phys(void *vaddr)
+{
+ return (phys_addr_t)((unsigned long)vaddr);
+}
+#endif
+
+/*
+ * Flags for use with map_physmem() & unmap_physmem(). Architectures need not
+ * support all of these, in which case they will be defined as zero here &
+ * ignored. Callers that may run on multiple architectures should therefore
+ * treat them as hints rather than requirements.
+ */
+#ifndef MAP_NOCACHE
+# define MAP_NOCACHE 0 /* Produce an uncached mapping */
+#endif
+#ifndef MAP_WRCOMBINE
+# define MAP_WRCOMBINE 0 /* Allow write-combining on the mapping */
+#endif
+#ifndef MAP_WRBACK
+# define MAP_WRBACK 0 /* Map using write-back caching */
+#endif
+#ifndef MAP_WRTHROUGH
+# define MAP_WRTHROUGH 0 /* Map using write-through caching */
+#endif
+
+/**
+ * map_physmem() - Return a virtual address mapped to a given physical address
+ * @paddr: the physical address
+ * @len: the length of the required mapping
+ * @flags: flags affecting the type of mapping
+ *
+ * Return a virtual address through which the CPU may access the memory at
+ * physical address @paddr. The mapping will be valid for at least @len bytes,
+ * and may be affected by flags passed to the @flags argument. This function
+ * may create new mappings, so should generally be paired with a matching call
+ * to unmap_physmem once the caller is finished with the memory in question.
+ *
+ * Returns: a virtual address suitably mapped to @paddr
+ */
+#ifndef map_physmem
+static inline void *map_physmem(phys_addr_t paddr, unsigned long len,
+ unsigned long flags)
+{
+ return phys_to_virt(paddr);
+}
+#endif
+
+/**
+ * unmap_physmem() - Remove mappings created by a prior call to map_physmem()
+ * @vaddr: the virtual address which map_physmem() previously returned
+ * @flags: flags matching those originally passed to map_physmem()
+ *
+ * Unmap memory which was previously mapped by a call to map_physmem(). If
+ * map_physmem() dynamically created a mapping for the memory in question then
+ * unmap_physmem() will remove that mapping.
+ */
+#ifndef unmap_physmem
+static inline void unmap_physmem(void *vaddr, unsigned long flags)
+{
+}
+#endif
+
+#endif /* !__ASSEMBLY__ */
+#endif /* __ASM_GENERIC_IO_H__ */
--
2.14.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [U-Boot] [PATCH v2 01/13] Provide a generic io.h & address mapping functions
2017-09-14 22:05 ` [U-Boot] [PATCH v2 01/13] Provide a generic io.h & address mapping functions Paul Burton
@ 2017-09-15 7:35 ` Daniel Schwierzeck
2017-10-03 12:52 ` [U-Boot] [U-Boot, v2, " Tom Rini
1 sibling, 0 replies; 29+ messages in thread
From: Daniel Schwierzeck @ 2017-09-15 7:35 UTC (permalink / raw)
To: u-boot
Am 15.09.2017 um 00:05 schrieb Paul Burton:
> Most architectures currently supported by U-Boot use trivial
> implementations of map_to_physmem & virt_to_phys which simply cast a
> physical address to a pointer for use a virtual address & vice-versa.
> This results in a lot of duplicate implementations of these mapping
> functions.
>
> The set of functions provided by different architectures also differs,
> with some having implementations of phys_to_virt & others not. A later
> patch will make use of phys_to_virt in architecture-neutral code, and so
> requires that it be provided for all architectures.
>
> This patch introduces an asm-generic/io.h which provides generic
> implementations of address mapping functions, allowing the duplication
> of them between architectures to be removed. Once architectures are
> converted to make use of this generic header it will also ensure that
> all of phys_to_virt, virt_to_phys, map_physmem & unmap_physmem are
> provided. The 2 families of functions differ in that map_physmem may
> create dynamic mappings whilst phys_to_virt may not & therefore is more
> limited in scope but doesn't require information such as a length &
> flags.
>
> This patch doesn't convert any architectures to make use of this generic
> header - later patches in the series will do so.
>
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> Cc: Alexey Brodkin <alexey.brodkin@synopsys.com>
> Cc: Angelo Dureghello <angelo@sysam.it>
> Cc: Bin Meng <bmeng.cn@gmail.com>
> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> Cc: Macpaul Lin <macpaul@andestech.com>
> Cc: Michal Simek <monstr@monstr.eu>
> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> Cc: Thomas Chou <thomas@wytron.com.tw>
> Cc: Wolfgang Denk <wd@denx.de>
> Acked-by: Angelo Dureghello <angelo@sysam.it>
> Tested-by: Angelo Dureghello <angelo@sysam.it>
> Reviewed-by: Simon Glass <sjg@chromium.org>
>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
--
- Daniel
^ permalink raw reply [flat|nested] 29+ messages in thread
* [U-Boot] [U-Boot, v2, 01/13] Provide a generic io.h & address mapping functions
2017-09-14 22:05 ` [U-Boot] [PATCH v2 01/13] Provide a generic io.h & address mapping functions Paul Burton
2017-09-15 7:35 ` Daniel Schwierzeck
@ 2017-10-03 12:52 ` Tom Rini
1 sibling, 0 replies; 29+ messages in thread
From: Tom Rini @ 2017-10-03 12:52 UTC (permalink / raw)
To: u-boot
On Thu, Sep 14, 2017 at 03:05:01PM -0700, Paul Burton wrote:
> Most architectures currently supported by U-Boot use trivial
> implementations of map_to_physmem & virt_to_phys which simply cast a
> physical address to a pointer for use a virtual address & vice-versa.
> This results in a lot of duplicate implementations of these mapping
> functions.
>
> The set of functions provided by different architectures also differs,
> with some having implementations of phys_to_virt & others not. A later
> patch will make use of phys_to_virt in architecture-neutral code, and so
> requires that it be provided for all architectures.
>
> This patch introduces an asm-generic/io.h which provides generic
> implementations of address mapping functions, allowing the duplication
> of them between architectures to be removed. Once architectures are
> converted to make use of this generic header it will also ensure that
> all of phys_to_virt, virt_to_phys, map_physmem & unmap_physmem are
> provided. The 2 families of functions differ in that map_physmem may
> create dynamic mappings whilst phys_to_virt may not & therefore is more
> limited in scope but doesn't require information such as a length &
> flags.
>
> This patch doesn't convert any architectures to make use of this generic
> header - later patches in the series will do so.
>
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> Cc: Alexey Brodkin <alexey.brodkin@synopsys.com>
> Cc: Angelo Dureghello <angelo@sysam.it>
> Cc: Bin Meng <bmeng.cn@gmail.com>
> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> Cc: Macpaul Lin <macpaul@andestech.com>
> Cc: Michal Simek <monstr@monstr.eu>
> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> Cc: Thomas Chou <thomas@wytron.com.tw>
> Cc: Wolfgang Denk <wd@denx.de>
> Acked-by: Angelo Dureghello <angelo@sysam.it>
> Tested-by: Angelo Dureghello <angelo@sysam.it>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171003/7757e922/attachment.sig>
^ permalink raw reply [flat|nested] 29+ messages in thread
* [U-Boot] [PATCH v2 02/13] arc: Use asm-generic/io.h
2017-09-14 22:05 [U-Boot] [PATCH v2 00/13] Add asm-generic/io.h; virt_to_phys(), phys_to_virt() for all arches Paul Burton
2017-09-14 22:05 ` [U-Boot] [PATCH v2 01/13] Provide a generic io.h & address mapping functions Paul Burton
@ 2017-09-14 22:05 ` Paul Burton
2017-10-03 12:52 ` [U-Boot] [U-Boot,v2,02/13] " Tom Rini
2017-09-14 22:05 ` [U-Boot] [PATCH v2 03/13] arm: " Paul Burton
` (10 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Paul Burton @ 2017-09-14 22:05 UTC (permalink / raw)
To: u-boot
Convert the arc architecture to make use of the new asm-generic/io.h to
provide address mapping functions. As the generic implementations are
suitable for arc this is primarily a matter of removing code.
Feedback from architecture maintainers is welcome.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Alexey Brodkin <alexey.brodkin@synopsys.com>
Acked-by: Alexey Brodkin <abrodkin@synopsys.com>
---
Changes in v2: None
arch/arc/include/asm/io.h | 29 +----------------------------
1 file changed, 1 insertion(+), 28 deletions(-)
diff --git a/arch/arc/include/asm/io.h b/arch/arc/include/asm/io.h
index 42e7f22b28..a12303bc73 100644
--- a/arch/arc/include/asm/io.h
+++ b/arch/arc/include/asm/io.h
@@ -50,30 +50,6 @@
#define __iowmb() do { } while (0)
#endif
-/*
- * Given a physical address and a length, return a virtual address
- * that can be used to access the memory range with the caching
- * properties specified by "flags".
- */
-#define MAP_NOCACHE (0)
-#define MAP_WRCOMBINE (0)
-#define MAP_WRBACK (0)
-#define MAP_WRTHROUGH (0)
-
-static inline void *
-map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
-{
- return (void *)((unsigned long)paddr);
-}
-
-/*
- * Take down a mapping set up by map_physmem().
- */
-static inline void unmap_physmem(void *vaddr, unsigned long flags)
-{
-
-}
-
static inline void sync(void)
{
/* Not yet implemented */
@@ -302,9 +278,6 @@ static inline int __raw_writesl(unsigned int addr, void *data, int longlen)
#define setbits_8(addr, set) setbits(8, addr, set)
#define clrsetbits_8(addr, clear, set) clrsetbits(8, addr, clear, set)
-static inline phys_addr_t virt_to_phys(void *vaddr)
-{
- return (phys_addr_t)((unsigned long)vaddr);
-}
+#include <asm-generic/io.h>
#endif /* __ASM_ARC_IO_H */
--
2.14.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [U-Boot] [PATCH v2 03/13] arm: Use asm-generic/io.h
2017-09-14 22:05 [U-Boot] [PATCH v2 00/13] Add asm-generic/io.h; virt_to_phys(), phys_to_virt() for all arches Paul Burton
2017-09-14 22:05 ` [U-Boot] [PATCH v2 01/13] Provide a generic io.h & address mapping functions Paul Burton
2017-09-14 22:05 ` [U-Boot] [PATCH v2 02/13] arc: Use asm-generic/io.h Paul Burton
@ 2017-09-14 22:05 ` Paul Burton
2017-10-03 12:52 ` [U-Boot] [U-Boot,v2,03/13] " Tom Rini
2017-09-14 22:05 ` [U-Boot] [PATCH v2 04/13] m68k: " Paul Burton
` (9 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Paul Burton @ 2017-09-14 22:05 UTC (permalink / raw)
To: u-boot
Convert the arm architecture to make use of the new asm-generic/io.h to
provide address mapping functions. As the generic implementations are
suitable for arm this is primarily a matter of removing code.
This has only been build-tested, feedback from architecture maintainers
is welcome.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
arch/arm/include/asm/io.h | 30 +-----------------------------
1 file changed, 1 insertion(+), 29 deletions(-)
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index 5834f5b3dc..5df74728de 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -34,35 +34,6 @@ static inline void sync(void)
{
}
-/*
- * Given a physical address and a length, return a virtual address
- * that can be used to access the memory range with the caching
- * properties specified by "flags".
- */
-#define MAP_NOCACHE (0)
-#define MAP_WRCOMBINE (0)
-#define MAP_WRBACK (0)
-#define MAP_WRTHROUGH (0)
-
-static inline void *
-map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
-{
- return (void *)((unsigned long)paddr);
-}
-
-/*
- * Take down a mapping set up by map_physmem().
- */
-static inline void unmap_physmem(void *vaddr, unsigned long flags)
-{
-
-}
-
-static inline phys_addr_t virt_to_phys(void * vaddr)
-{
- return (phys_addr_t)((unsigned long)vaddr);
-}
-
/*
* Generic virtual read/write. Note that we don't support half-word
* read/writes. We define __arch_*[bl] here, and leave __arch_*w
@@ -426,6 +397,7 @@ out:
#endif /* __mem_isa */
#endif /* __KERNEL__ */
+#include <asm-generic/io.h>
#include <iotrace.h>
#endif /* __ASM_ARM_IO_H */
--
2.14.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [U-Boot] [U-Boot,v2,03/13] arm: Use asm-generic/io.h
2017-09-14 22:05 ` [U-Boot] [PATCH v2 03/13] arm: " Paul Burton
@ 2017-10-03 12:52 ` Tom Rini
0 siblings, 0 replies; 29+ messages in thread
From: Tom Rini @ 2017-10-03 12:52 UTC (permalink / raw)
To: u-boot
On Thu, Sep 14, 2017 at 03:05:03PM -0700, Paul Burton wrote:
> Convert the arm architecture to make use of the new asm-generic/io.h to
> provide address mapping functions. As the generic implementations are
> suitable for arm this is primarily a matter of removing code.
>
> This has only been build-tested, feedback from architecture maintainers
> is welcome.
>
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> Reviewed-by: Simon Glass <sjg@chromium.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171003/014b10ec/attachment.sig>
^ permalink raw reply [flat|nested] 29+ messages in thread
* [U-Boot] [PATCH v2 04/13] m68k: Use asm-generic/io.h
2017-09-14 22:05 [U-Boot] [PATCH v2 00/13] Add asm-generic/io.h; virt_to_phys(), phys_to_virt() for all arches Paul Burton
` (2 preceding siblings ...)
2017-09-14 22:05 ` [U-Boot] [PATCH v2 03/13] arm: " Paul Burton
@ 2017-09-14 22:05 ` Paul Burton
2017-10-03 12:52 ` [U-Boot] [U-Boot,v2,04/13] " Tom Rini
2017-09-14 22:05 ` [U-Boot] [PATCH v2 05/13] microblaze: " Paul Burton
` (8 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Paul Burton @ 2017-09-14 22:05 UTC (permalink / raw)
To: u-boot
Convert the m68k architecture to make use of the new asm-generic/io.h to
provide address mapping functions. As the generic implementations are
suitable for m68k this is primarily a matter of emoving code.
Feedback from architecture maintainers is welcome.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Huan Wang <alison.wang@freescale.com>
Cc: Angelo Dureghello <angelo@sysam.it>
Acked-by: Angelo Dureghello <angelo@sysam.it>
Tested-by: Angelo Dureghello <angelo@sysam.it>
---
Changes in v2: None
arch/m68k/include/asm/io.h | 29 +----------------------------
1 file changed, 1 insertion(+), 28 deletions(-)
diff --git a/arch/m68k/include/asm/io.h b/arch/m68k/include/asm/io.h
index 384308b747..dfe77f0756 100644
--- a/arch/m68k/include/asm/io.h
+++ b/arch/m68k/include/asm/io.h
@@ -253,33 +253,6 @@ static inline void sync(void)
*/
}
-/*
- * Given a physical address and a length, return a virtual address
- * that can be used to access the memory range with the caching
- * properties specified by "flags".
- */
-#define MAP_NOCACHE (0)
-#define MAP_WRCOMBINE (0)
-#define MAP_WRBACK (0)
-#define MAP_WRTHROUGH (0)
-
-static inline void *map_physmem(phys_addr_t paddr, unsigned long len,
- unsigned long flags)
-{
- return (void *)paddr;
-}
-
-/*
- * Take down a mapping set up by map_physmem().
- */
-static inline void unmap_physmem(void *vaddr, unsigned long flags)
-{
-
-}
-
-static inline phys_addr_t virt_to_phys(void * vaddr)
-{
- return (phys_addr_t)(vaddr);
-}
+#include <asm-generic/io.h>
#endif /* __ASM_M68K_IO_H__ */
--
2.14.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [U-Boot] [U-Boot,v2,04/13] m68k: Use asm-generic/io.h
2017-09-14 22:05 ` [U-Boot] [PATCH v2 04/13] m68k: " Paul Burton
@ 2017-10-03 12:52 ` Tom Rini
0 siblings, 0 replies; 29+ messages in thread
From: Tom Rini @ 2017-10-03 12:52 UTC (permalink / raw)
To: u-boot
On Thu, Sep 14, 2017 at 03:05:04PM -0700, Paul Burton wrote:
> Convert the m68k architecture to make use of the new asm-generic/io.h to
> provide address mapping functions. As the generic implementations are
> suitable for m68k this is primarily a matter of emoving code.
>
> Feedback from architecture maintainers is welcome.
>
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
> Cc: Huan Wang <alison.wang@freescale.com>
> Cc: Angelo Dureghello <angelo@sysam.it>
> Acked-by: Angelo Dureghello <angelo@sysam.it>
> Tested-by: Angelo Dureghello <angelo@sysam.it>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171003/ab1a9d27/attachment.sig>
^ permalink raw reply [flat|nested] 29+ messages in thread
* [U-Boot] [PATCH v2 05/13] microblaze: Use asm-generic/io.h
2017-09-14 22:05 [U-Boot] [PATCH v2 00/13] Add asm-generic/io.h; virt_to_phys(), phys_to_virt() for all arches Paul Burton
` (3 preceding siblings ...)
2017-09-14 22:05 ` [U-Boot] [PATCH v2 04/13] m68k: " Paul Burton
@ 2017-09-14 22:05 ` Paul Burton
2017-10-03 12:52 ` [U-Boot] [U-Boot,v2,05/13] " Tom Rini
2017-09-14 22:05 ` [U-Boot] [PATCH v2 06/13] nds32: " Paul Burton
` (7 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Paul Burton @ 2017-09-14 22:05 UTC (permalink / raw)
To: u-boot
Convert the microblaze architecture to make use of the new
asm-generic/io.h to provide address mapping functions. As the generic
implementations are suitable for microblaze this is primarily a matter
of removing code.
Feedback from architecture maintainers is welcome.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Michal Simek <monstr@monstr.eu>
---
Changes in v2: None
arch/microblaze/include/asm/io.h | 29 +----------------------------
1 file changed, 1 insertion(+), 28 deletions(-)
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h
index 584cbce358..c7516a47e8 100644
--- a/arch/microblaze/include/asm/io.h
+++ b/arch/microblaze/include/asm/io.h
@@ -131,33 +131,6 @@ static inline void sync(void)
{
}
-/*
- * Given a physical address and a length, return a virtual address
- * that can be used to access the memory range with the caching
- * properties specified by "flags".
- */
-#define MAP_NOCACHE (0)
-#define MAP_WRCOMBINE (0)
-#define MAP_WRBACK (0)
-#define MAP_WRTHROUGH (0)
-
-static inline void *
-map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
-{
- return (void *)paddr;
-}
-
-/*
- * Take down a mapping set up by map_physmem().
- */
-static inline void unmap_physmem(void *vaddr, unsigned long flags)
-{
-
-}
-
-static inline phys_addr_t virt_to_phys(void * vaddr)
-{
- return (phys_addr_t)(vaddr);
-}
+#include <asm-generic/io.h>
#endif /* __MICROBLAZE_IO_H__ */
--
2.14.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [U-Boot] [PATCH v2 06/13] nds32: Use asm-generic/io.h
2017-09-14 22:05 [U-Boot] [PATCH v2 00/13] Add asm-generic/io.h; virt_to_phys(), phys_to_virt() for all arches Paul Burton
` (4 preceding siblings ...)
2017-09-14 22:05 ` [U-Boot] [PATCH v2 05/13] microblaze: " Paul Burton
@ 2017-09-14 22:05 ` Paul Burton
2017-10-03 12:52 ` [U-Boot] [U-Boot,v2,06/13] " Tom Rini
2017-09-14 22:05 ` [U-Boot] [PATCH v2 07/13] sh: " Paul Burton
` (6 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Paul Burton @ 2017-09-14 22:05 UTC (permalink / raw)
To: u-boot
Convert the nds32 architecture to make use of the new asm-generic/io.h
to provide address mapping functions. As the generic implementations are
suitable for nds32 this is primarily a matter of removing code.
Feedback from architecture maintainers is welcome.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Macpaul Lin <macpaul@andestech.com>
---
Changes in v2: None
arch/nds32/include/asm/io.h | 32 +++-----------------------------
1 file changed, 3 insertions(+), 29 deletions(-)
diff --git a/arch/nds32/include/asm/io.h b/arch/nds32/include/asm/io.h
index b2c4d0ef8c..46ce8c4a13 100644
--- a/arch/nds32/include/asm/io.h
+++ b/arch/nds32/include/asm/io.h
@@ -38,35 +38,6 @@ static inline void sync(void)
{
}
-/*
- * Given a physical address and a length, return a virtual address
- * that can be used to access the memory range with the caching
- * properties specified by "flags".
- */
-#define MAP_NOCACHE (0)
-#define MAP_WRCOMBINE (0)
-#define MAP_WRBACK (0)
-#define MAP_WRTHROUGH (0)
-
-static inline void *
-map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
-{
- return (void *)paddr;
-}
-
-/*
- * Take down a mapping set up by map_physmem().
- */
-static inline void unmap_physmem(void *vaddr, unsigned long flags)
-{
-
-}
-
-static inline phys_addr_t virt_to_phys(void *vaddr)
-{
- return (phys_addr_t)(vaddr);
-}
-
/*
* Generic virtual read/write. Note that we don't support half-word
* read/writes. We define __arch_*[bl] here, and leave __arch_*w
@@ -459,5 +430,8 @@ out:
#define isa_check_signature(io, sig, len) (0)
#endif /* __mem_isa */
+
+#include <asm-generic/io.h>
+
#endif /* __KERNEL__ */
#endif /* __ASM_NDS_IO_H */
--
2.14.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [U-Boot] [PATCH v2 07/13] sh: Use asm-generic/io.h
2017-09-14 22:05 [U-Boot] [PATCH v2 00/13] Add asm-generic/io.h; virt_to_phys(), phys_to_virt() for all arches Paul Burton
` (5 preceding siblings ...)
2017-09-14 22:05 ` [U-Boot] [PATCH v2 06/13] nds32: " Paul Burton
@ 2017-09-14 22:05 ` Paul Burton
2017-10-03 12:52 ` [U-Boot] [U-Boot,v2,07/13] " Tom Rini
2017-09-14 22:05 ` [U-Boot] [PATCH v2 08/13] x86: " Paul Burton
` (5 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Paul Burton @ 2017-09-14 22:05 UTC (permalink / raw)
To: u-boot
Convert the sh architecture to make use of the new asm-generic/io.h to
provide address mapping functions. As the generic implementations are
suitable for sh this is primarily a matter of moving code.
Feedback from architecture maintainers is welcome.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
Changes in v2: None
arch/sh/include/asm/io.h | 29 +----------------------------
1 file changed, 1 insertion(+), 28 deletions(-)
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index 5cb000cada..be1ff4ad70 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -231,34 +231,7 @@ static inline void sync(void)
#define setbits_8(addr, set) setbits(8, addr, set)
#define clrsetbits_8(addr, clear, set) clrsetbits(8, addr, clear, set)
-/*
- * Given a physical address and a length, return a virtual address
- * that can be used to access the memory range with the caching
- * properties specified by "flags".
- */
-#define MAP_NOCACHE (0)
-#define MAP_WRCOMBINE (0)
-#define MAP_WRBACK (0)
-#define MAP_WRTHROUGH (0)
-
-static inline void *
-map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
-{
- return (void *)paddr;
-}
-
-/*
- * Take down a mapping set up by map_physmem().
- */
-static inline void unmap_physmem(void *vaddr, unsigned long flags)
-{
-
-}
-
-static inline phys_addr_t virt_to_phys(void *vaddr)
-{
- return (phys_addr_t)(vaddr);
-}
+#include <asm-generic/io.h>
#endif /* __KERNEL__ */
#endif /* __ASM_SH_IO_H */
--
2.14.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [U-Boot] [PATCH v2 08/13] x86: Use asm-generic/io.h
2017-09-14 22:05 [U-Boot] [PATCH v2 00/13] Add asm-generic/io.h; virt_to_phys(), phys_to_virt() for all arches Paul Burton
` (6 preceding siblings ...)
2017-09-14 22:05 ` [U-Boot] [PATCH v2 07/13] sh: " Paul Burton
@ 2017-09-14 22:05 ` Paul Burton
2017-10-03 12:52 ` [U-Boot] [U-Boot,v2,08/13] " Tom Rini
2017-09-14 22:05 ` [U-Boot] [PATCH v2 09/13] xtensa: " Paul Burton
` (4 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Paul Burton @ 2017-09-14 22:05 UTC (permalink / raw)
To: u-boot
Convert the x86 architecture to make use of the new asm-generic/io.h to
provide address mapping functions. As the generic implementations are
suitable for x86 this is primarily a matter of moving code.
This has only been build-tested, feedback from architecture maintainers
is welcome.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
arch/x86/include/asm/io.h | 31 ++-----------------------------
1 file changed, 2 insertions(+), 29 deletions(-)
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index a72daf2263..263dd8fd17 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -230,35 +230,6 @@ static inline void sync(void)
{
}
-/*
- * Given a physical address and a length, return a virtual address
- * that can be used to access the memory range with the caching
- * properties specified by "flags".
- */
-#define MAP_NOCACHE (0)
-#define MAP_WRCOMBINE (0)
-#define MAP_WRBACK (0)
-#define MAP_WRTHROUGH (0)
-
-static inline void *
-map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
-{
- return (void *)(uintptr_t)paddr;
-}
-
-/*
- * Take down a mapping set up by map_physmem().
- */
-static inline void unmap_physmem(void *vaddr, unsigned long flags)
-{
-
-}
-
-static inline phys_addr_t virt_to_phys(void * vaddr)
-{
- return (phys_addr_t)(uintptr_t)(vaddr);
-}
-
/*
* TODO: The kernel offers some more advanced versions of barriers, it might
* have some advantages to use them instead of the simple one here.
@@ -267,4 +238,6 @@ static inline phys_addr_t virt_to_phys(void * vaddr)
#define __iormb() dmb()
#define __iowmb() dmb()
+#include <asm-generic/io.h>
+
#endif /* _ASM_IO_H */
--
2.14.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [U-Boot] [U-Boot,v2,08/13] x86: Use asm-generic/io.h
2017-09-14 22:05 ` [U-Boot] [PATCH v2 08/13] x86: " Paul Burton
@ 2017-10-03 12:52 ` Tom Rini
0 siblings, 0 replies; 29+ messages in thread
From: Tom Rini @ 2017-10-03 12:52 UTC (permalink / raw)
To: u-boot
On Thu, Sep 14, 2017 at 03:05:08PM -0700, Paul Burton wrote:
> Convert the x86 architecture to make use of the new asm-generic/io.h to
> provide address mapping functions. As the generic implementations are
> suitable for x86 this is primarily a matter of moving code.
>
> This has only been build-tested, feedback from architecture maintainers
> is welcome.
>
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
> Cc: Simon Glass <sjg@chromium.org>
> Reviewed-by: Simon Glass <sjg@chromium.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171003/b5ec148e/attachment.sig>
^ permalink raw reply [flat|nested] 29+ messages in thread
* [U-Boot] [PATCH v2 09/13] xtensa: Use asm-generic/io.h
2017-09-14 22:05 [U-Boot] [PATCH v2 00/13] Add asm-generic/io.h; virt_to_phys(), phys_to_virt() for all arches Paul Burton
` (7 preceding siblings ...)
2017-09-14 22:05 ` [U-Boot] [PATCH v2 08/13] x86: " Paul Burton
@ 2017-09-14 22:05 ` Paul Burton
2017-10-03 12:52 ` [U-Boot] [U-Boot,v2,09/13] " Tom Rini
2017-09-14 22:05 ` [U-Boot] [PATCH v2 10/13] mips: " Paul Burton
` (3 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Paul Burton @ 2017-09-14 22:05 UTC (permalink / raw)
To: u-boot
Convert the xtensa architecture to make use of the new asm-generic/io.h
to provide address mapping functions. As the generic implementations are
suitable for xtensa this is primarily a matter of moving code.
This has only been build-tested, feedback from architecture maintainers
is welcome.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
---
Changes in v2: None
arch/xtensa/include/asm/io.h | 25 ++-----------------------
1 file changed, 2 insertions(+), 23 deletions(-)
diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h
index e34d6e1d7f..c9e335f4f6 100644
--- a/arch/xtensa/include/asm/io.h
+++ b/arch/xtensa/include/asm/io.h
@@ -115,29 +115,6 @@ void outsl(unsigned long port, const void *src, unsigned long count);
*/
#define xlate_dev_kmem_ptr(p) p
-#define MAP_NOCACHE (0)
-#define MAP_WRCOMBINE (0)
-#define MAP_WRBACK (0)
-#define MAP_WRTHROUGH (0)
-
-static inline void *
-map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
-{
- return (void *)paddr;
-}
-
-/*
- * Take down a mapping set up by map_physmem().
- */
-static inline void unmap_physmem(void *vaddr, unsigned long flags)
-{
-}
-
-static inline phys_addr_t virt_to_phys(void *vaddr)
-{
- return (phys_addr_t)((unsigned long)vaddr);
-}
-
/*
* Dummy function to keep U-Boot's cfi_flash.c driver happy.
*/
@@ -145,4 +122,6 @@ static inline void sync(void)
{
}
+#include <asm-generic/io.h>
+
#endif /* _XTENSA_IO_H */
--
2.14.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [U-Boot] [U-Boot,v2,09/13] xtensa: Use asm-generic/io.h
2017-09-14 22:05 ` [U-Boot] [PATCH v2 09/13] xtensa: " Paul Burton
@ 2017-10-03 12:52 ` Tom Rini
0 siblings, 0 replies; 29+ messages in thread
From: Tom Rini @ 2017-10-03 12:52 UTC (permalink / raw)
To: u-boot
On Thu, Sep 14, 2017 at 03:05:09PM -0700, Paul Burton wrote:
> Convert the xtensa architecture to make use of the new asm-generic/io.h
> to provide address mapping functions. As the generic implementations are
> suitable for xtensa this is primarily a matter of moving code.
>
> This has only been build-tested, feedback from architecture maintainers
> is welcome.
>
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Acked-by: Max Filippov <jcmvbkbc@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171003/3fb3a5f9/attachment.sig>
^ permalink raw reply [flat|nested] 29+ messages in thread
* [U-Boot] [PATCH v2 10/13] mips: Use asm-generic/io.h
2017-09-14 22:05 [U-Boot] [PATCH v2 00/13] Add asm-generic/io.h; virt_to_phys(), phys_to_virt() for all arches Paul Burton
` (8 preceding siblings ...)
2017-09-14 22:05 ` [U-Boot] [PATCH v2 09/13] xtensa: " Paul Burton
@ 2017-09-14 22:05 ` Paul Burton
2017-09-15 7:36 ` Daniel Schwierzeck
2017-10-03 12:52 ` [U-Boot] [U-Boot,v2,10/13] " Tom Rini
2017-09-14 22:05 ` [U-Boot] [PATCH v2 11/13] nios2: " Paul Burton
` (2 subsequent siblings)
12 siblings, 2 replies; 29+ messages in thread
From: Paul Burton @ 2017-09-14 22:05 UTC (permalink / raw)
To: u-boot
Convert the mips architecture to make use of the new asm-generic/io.h to
provide address mapping functions. As mips actually performs
non-identity mapping between physical & virtual addresses we can't
simply make use of the generic functions, with the exception of being
able to drop our no-op unmap_physmem() and definitions of unused map
flags.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
---
Changes in v2: None
arch/mips/include/asm/io.h | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
index ee7a59290d..45d7ca0cc6 100644
--- a/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@ -95,6 +95,7 @@ static inline unsigned long virt_to_phys(volatile const void *address)
#endif
return CPHYSADDR(addr);
}
+#define virt_to_phys virt_to_phys
/*
* phys_to_virt - map physical address to virtual
@@ -112,6 +113,7 @@ static inline void *phys_to_virt(unsigned long address)
{
return (void *)(address + PAGE_OFFSET - PHYS_OFFSET);
}
+#define phys_to_virt phys_to_virt
/*
* ISA I/O bus memory addresses are 1:1 with the physical address.
@@ -490,10 +492,7 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int
*/
#define sync() mmiowb()
-#define MAP_NOCACHE (1)
-#define MAP_WRCOMBINE (0)
-#define MAP_WRBACK (0)
-#define MAP_WRTHROUGH (0)
+#define MAP_NOCACHE 1
static inline void *
map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
@@ -503,13 +502,7 @@ map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
return (void *)CKSEG0ADDR(paddr);
}
-
-/*
- * Take down a mapping set up by map_physmem().
- */
-static inline void unmap_physmem(void *vaddr, unsigned long flags)
-{
-}
+#define map_physmem map_physmem
#define __BUILD_CLRBITS(bwlq, sfx, end, type) \
\
@@ -566,4 +559,6 @@ BUILD_CLRSETBITS(q, le64, le64, u64)
BUILD_CLRSETBITS(q, be64, be64, u64)
BUILD_CLRSETBITS(q, 64, _, u64)
+#include <asm-generic/io.h>
+
#endif /* _ASM_IO_H */
--
2.14.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [U-Boot] [PATCH v2 10/13] mips: Use asm-generic/io.h
2017-09-14 22:05 ` [U-Boot] [PATCH v2 10/13] mips: " Paul Burton
@ 2017-09-15 7:36 ` Daniel Schwierzeck
2017-10-03 12:52 ` [U-Boot] [U-Boot,v2,10/13] " Tom Rini
1 sibling, 0 replies; 29+ messages in thread
From: Daniel Schwierzeck @ 2017-09-15 7:36 UTC (permalink / raw)
To: u-boot
Am 15.09.2017 um 00:05 schrieb Paul Burton:
> Convert the mips architecture to make use of the new asm-generic/io.h to
> provide address mapping functions. As mips actually performs
> non-identity mapping between physical & virtual addresses we can't
> simply make use of the generic functions, with the exception of being
> able to drop our no-op unmap_physmem() and definitions of unused map
> flags.
>
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Acked-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
--
- Daniel
^ permalink raw reply [flat|nested] 29+ messages in thread
* [U-Boot] [U-Boot,v2,10/13] mips: Use asm-generic/io.h
2017-09-14 22:05 ` [U-Boot] [PATCH v2 10/13] mips: " Paul Burton
2017-09-15 7:36 ` Daniel Schwierzeck
@ 2017-10-03 12:52 ` Tom Rini
1 sibling, 0 replies; 29+ messages in thread
From: Tom Rini @ 2017-10-03 12:52 UTC (permalink / raw)
To: u-boot
On Thu, Sep 14, 2017 at 03:05:10PM -0700, Paul Burton wrote:
> Convert the mips architecture to make use of the new asm-generic/io.h to
> provide address mapping functions. As mips actually performs
> non-identity mapping between physical & virtual addresses we can't
> simply make use of the generic functions, with the exception of being
> able to drop our no-op unmap_physmem() and definitions of unused map
> flags.
>
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> Acked-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171003/0dab801d/attachment.sig>
^ permalink raw reply [flat|nested] 29+ messages in thread
* [U-Boot] [PATCH v2 11/13] nios2: Use asm-generic/io.h
2017-09-14 22:05 [U-Boot] [PATCH v2 00/13] Add asm-generic/io.h; virt_to_phys(), phys_to_virt() for all arches Paul Burton
` (9 preceding siblings ...)
2017-09-14 22:05 ` [U-Boot] [PATCH v2 10/13] mips: " Paul Burton
@ 2017-09-14 22:05 ` Paul Burton
2017-10-03 12:53 ` [U-Boot] [U-Boot,v2,11/13] " Tom Rini
2017-09-14 22:05 ` [U-Boot] [PATCH v2 12/13] powerpc: " Paul Burton
2017-09-14 22:05 ` [U-Boot] [PATCH v2 13/13] sandbox: " Paul Burton
12 siblings, 1 reply; 29+ messages in thread
From: Paul Burton @ 2017-09-14 22:05 UTC (permalink / raw)
To: u-boot
Convert the nios2 architecture to make use of the new asm-generic/io.h to
provide address mapping functions. As nios2 actually performs
non-identity mapping between physical & virtual addresses we can't
simply make use of the generic functions, with the exception of being
able to drop our no-op unmap_physmem() and definitions of unused map
flags.
Feedback from architecture maintainers is welcome.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Thomas Chou <thomas@wytron.com.tw>
---
Changes in v2: None
arch/nios2/include/asm/io.h | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h
index e951500190..4e5b44a4e4 100644
--- a/arch/nios2/include/asm/io.h
+++ b/arch/nios2/include/asm/io.h
@@ -19,9 +19,6 @@ static inline void sync(void)
* properties specified by "flags".
*/
#define MAP_NOCACHE 1
-#define MAP_WRCOMBINE 0
-#define MAP_WRBACK 0
-#define MAP_WRTHROUGH 0
static inline void *
map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
@@ -32,20 +29,22 @@ map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
else
return (void *)(paddr | gd->arch.mem_region_base);
}
+#define map_physmem map_physmem
-/*
- * Take down a mapping set up by map_physmem().
- */
-static inline void unmap_physmem(void *vaddr, unsigned long flags)
+static inline void *phys_to_virt(phys_addr_t paddr)
{
+ DECLARE_GLOBAL_DATA_PTR;
+ return (void *)(paddr | gd->arch.mem_region_base);
}
+#define phys_to_virt phys_to_virt
static inline phys_addr_t virt_to_phys(void * vaddr)
{
DECLARE_GLOBAL_DATA_PTR;
return (phys_addr_t)vaddr & gd->arch.physaddr_mask;
}
+#define virt_to_phys virt_to_phys
#define __raw_writeb(v,a) (*(volatile unsigned char *)(a) = (v))
#define __raw_writew(v,a) (*(volatile unsigned short *)(a) = (v))
@@ -171,4 +170,6 @@ static inline void outsl (unsigned long port, const void *src, unsigned long cou
#define memcpy_fromio(a, b, c) memcpy((a), (void *)(b), (c))
#define memcpy_toio(a, b, c) memcpy((void *)(a), (b), (c))
+#include <asm-generic/io.h>
+
#endif /* __ASM_NIOS2_IO_H_ */
--
2.14.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [U-Boot] [U-Boot,v2,11/13] nios2: Use asm-generic/io.h
2017-09-14 22:05 ` [U-Boot] [PATCH v2 11/13] nios2: " Paul Burton
@ 2017-10-03 12:53 ` Tom Rini
0 siblings, 0 replies; 29+ messages in thread
From: Tom Rini @ 2017-10-03 12:53 UTC (permalink / raw)
To: u-boot
On Thu, Sep 14, 2017 at 03:05:11PM -0700, Paul Burton wrote:
> Convert the nios2 architecture to make use of the new asm-generic/io.h to
> provide address mapping functions. As nios2 actually performs
> non-identity mapping between physical & virtual addresses we can't
> simply make use of the generic functions, with the exception of being
> able to drop our no-op unmap_physmem() and definitions of unused map
> flags.
>
> Feedback from architecture maintainers is welcome.
>
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
> Cc: Thomas Chou <thomas@wytron.com.tw>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171003/cc2782da/attachment.sig>
^ permalink raw reply [flat|nested] 29+ messages in thread
* [U-Boot] [PATCH v2 12/13] powerpc: Use asm-generic/io.h
2017-09-14 22:05 [U-Boot] [PATCH v2 00/13] Add asm-generic/io.h; virt_to_phys(), phys_to_virt() for all arches Paul Burton
` (10 preceding siblings ...)
2017-09-14 22:05 ` [U-Boot] [PATCH v2 11/13] nios2: " Paul Burton
@ 2017-09-14 22:05 ` Paul Burton
2017-10-03 12:53 ` [U-Boot] [U-Boot,v2,12/13] " Tom Rini
2017-09-14 22:05 ` [U-Boot] [PATCH v2 13/13] sandbox: " Paul Burton
12 siblings, 1 reply; 29+ messages in thread
From: Paul Burton @ 2017-09-14 22:05 UTC (permalink / raw)
To: u-boot
Convert the powerpc architecture to make use of the new asm-generic/io.h
to provide address mapping functions. As powerpc can actually perform
non-identity mapping between physical & virtual addresses we can't
simply make use of the generic phys_to_virt() & virt_to_phys()
functions. However since map_physmem() already effectively implemented
the same thing as virt_to_phys() we can simply implement virt_to_phys()
instead of map_physmem() & use the generic map_physmem(). We also drop
the no-op unmap_physmem().
This has only been build-tested, feedback from architecture maintainers
is welcome.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Wolfgang Denk <wd@denx.de>
---
Changes in v2: None
arch/powerpc/include/asm/io.h | 25 +++++--------------------
1 file changed, 5 insertions(+), 20 deletions(-)
diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h
index a54fc468d5..34fbfdf1cf 100644
--- a/arch/powerpc/include/asm/io.h
+++ b/arch/powerpc/include/asm/io.h
@@ -282,18 +282,7 @@ static inline void out_be32(volatile unsigned __iomem *addr, u32 val)
#define setbits_8(addr, set) setbits(8, addr, set)
#define clrsetbits_8(addr, clear, set) clrsetbits(8, addr, clear, set)
-/*
- * Given a physical address and a length, return a virtual address
- * that can be used to access the memory range with the caching
- * properties specified by "flags".
- */
-#define MAP_NOCACHE (0)
-#define MAP_WRCOMBINE (0)
-#define MAP_WRBACK (0)
-#define MAP_WRTHROUGH (0)
-
-static inline void *
-map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
+static inline void *phys_to_virt(phys_addr_t paddr)
{
#ifdef CONFIG_ADDR_MAP
return addrmap_phys_to_virt(paddr);
@@ -301,14 +290,7 @@ map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
return (void *)((unsigned long)paddr);
#endif
}
-
-/*
- * Take down a mapping set up by map_physmem().
- */
-static inline void unmap_physmem(void *vaddr, unsigned long flags)
-{
-
-}
+#define phys_to_virt phys_to_virt
static inline phys_addr_t virt_to_phys(void * vaddr)
{
@@ -318,5 +300,8 @@ static inline phys_addr_t virt_to_phys(void * vaddr)
return (phys_addr_t)((unsigned long)vaddr);
#endif
}
+#define virt_to_phys virt_to_phys
+
+#include <asm-generic/io.h>
#endif
--
2.14.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [U-Boot] [U-Boot,v2,12/13] powerpc: Use asm-generic/io.h
2017-09-14 22:05 ` [U-Boot] [PATCH v2 12/13] powerpc: " Paul Burton
@ 2017-10-03 12:53 ` Tom Rini
0 siblings, 0 replies; 29+ messages in thread
From: Tom Rini @ 2017-10-03 12:53 UTC (permalink / raw)
To: u-boot
On Thu, Sep 14, 2017 at 03:05:12PM -0700, Paul Burton wrote:
> Convert the powerpc architecture to make use of the new asm-generic/io.h
> to provide address mapping functions. As powerpc can actually perform
> non-identity mapping between physical & virtual addresses we can't
> simply make use of the generic phys_to_virt() & virt_to_phys()
> functions. However since map_physmem() already effectively implemented
> the same thing as virt_to_phys() we can simply implement virt_to_phys()
> instead of map_physmem() & use the generic map_physmem(). We also drop
> the no-op unmap_physmem().
>
> This has only been build-tested, feedback from architecture maintainers
> is welcome.
>
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
> Cc: Wolfgang Denk <wd@denx.de>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171003/a26a4e60/attachment.sig>
^ permalink raw reply [flat|nested] 29+ messages in thread
* [U-Boot] [PATCH v2 13/13] sandbox: Use asm-generic/io.h
2017-09-14 22:05 [U-Boot] [PATCH v2 00/13] Add asm-generic/io.h; virt_to_phys(), phys_to_virt() for all arches Paul Burton
` (11 preceding siblings ...)
2017-09-14 22:05 ` [U-Boot] [PATCH v2 12/13] powerpc: " Paul Burton
@ 2017-09-14 22:05 ` Paul Burton
2017-10-03 12:53 ` [U-Boot] [U-Boot,v2,13/13] " Tom Rini
12 siblings, 1 reply; 29+ messages in thread
From: Paul Burton @ 2017-09-14 22:05 UTC (permalink / raw)
To: u-boot
Convert the sandbox architecture to make use of the new asm-generic/io.h
to provide address mapping functions. As sandbox actually performs
non-identity mapping between physical & virtual addresses we can't
simply make use of the generic mapping functions, but are able to
implement phys_to_virt() & make use of it from map_physmem().
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
---
Changes in v2:
- Move include earlier to get MAP_WRBACK for (un)map_sysmem()
- Cast vaddr to uint8_t* in virt_to_phys() for arithmetic with ram_buf
arch/sandbox/cpu/cpu.c | 12 +++++++++++-
arch/sandbox/include/asm/io.h | 18 +++++++++---------
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index 01991049cc..66c3a6a88a 100644
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -56,6 +56,16 @@ int cleanup_before_linux_select(int flags)
return 0;
}
+void *phys_to_virt(phys_addr_t paddr)
+{
+ return (void *)(gd->arch.ram_buf + paddr);
+}
+
+phys_addr_t virt_to_phys(void *vaddr)
+{
+ return (phys_addr_t)((uint8_t *)vaddr - gd->arch.ram_buf);
+}
+
void *map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
{
#if defined(CONFIG_PCI) && !defined(CONFIG_SPL_BUILD)
@@ -73,7 +83,7 @@ void *map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
}
#endif
- return (void *)(gd->arch.ram_buf + paddr);
+ return phys_to_virt(paddr);
}
void unmap_physmem(const void *vaddr, unsigned long flags)
diff --git a/arch/sandbox/include/asm/io.h b/arch/sandbox/include/asm/io.h
index a6856356df..fd3c2478f7 100644
--- a/arch/sandbox/include/asm/io.h
+++ b/arch/sandbox/include/asm/io.h
@@ -7,22 +7,22 @@
#ifndef __SANDBOX_ASM_IO_H
#define __SANDBOX_ASM_IO_H
-/*
- * Given a physical address and a length, return a virtual address
- * that can be used to access the memory range with the caching
- * properties specified by "flags".
- */
-#define MAP_NOCACHE (0)
-#define MAP_WRCOMBINE (0)
-#define MAP_WRBACK (0)
-#define MAP_WRTHROUGH (0)
+void *phys_to_virt(phys_addr_t paddr);
+#define phys_to_virt phys_to_virt
+
+phys_addr_t virt_to_phys(void *vaddr);
+#define virt_to_phys virt_to_phys
void *map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags);
+#define map_physmem map_physmem
/*
* Take down a mapping set up by map_physmem().
*/
void unmap_physmem(const void *vaddr, unsigned long flags);
+#define unmap_physmem unmap_physmem
+
+#include <asm-generic/io.h>
/* For sandbox, we want addresses to point into our RAM buffer */
static inline void *map_sysmem(phys_addr_t paddr, unsigned long len)
--
2.14.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [U-Boot] [U-Boot,v2,13/13] sandbox: Use asm-generic/io.h
2017-09-14 22:05 ` [U-Boot] [PATCH v2 13/13] sandbox: " Paul Burton
@ 2017-10-03 12:53 ` Tom Rini
0 siblings, 0 replies; 29+ messages in thread
From: Tom Rini @ 2017-10-03 12:53 UTC (permalink / raw)
To: u-boot
On Thu, Sep 14, 2017 at 03:05:13PM -0700, Paul Burton wrote:
> Convert the sandbox architecture to make use of the new asm-generic/io.h
> to provide address mapping functions. As sandbox actually performs
> non-identity mapping between physical & virtual addresses we can't
> simply make use of the generic mapping functions, but are able to
> implement phys_to_virt() & make use of it from map_physmem().
>
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
> Cc: Simon Glass <sjg@chromium.org>
> Acked-by: Simon Glass <sjg@chromium.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171003/767cda10/attachment.sig>
^ permalink raw reply [flat|nested] 29+ messages in thread