* [PATCH 00/11] Consolidate asm/fixmap.h files
@ 2013-11-12 13:22 Mark Salter
2013-11-12 13:22 ` [PATCH 01/11] Add generic fixmap.h Mark Salter
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Mark Salter @ 2013-11-12 13:22 UTC (permalink / raw)
To: linux-arm-kernel
Many architectures provide an asm/fixmap.h which defines support for
compile-time 'special' virtual mappings which need to be made before
paging_init() has run. This suport is also used for early ioremap
on x86. Much of this support is identical across the architectures.
This patch consolidates all of the common bits into asm-generic/fixmap.h
which is intended to be included from arch/*/include/asm/fixmap.h.
This has been compiled on x86, arm, powerpc, and sh, but tested
on x86 only.
Mark Salter (11):
Add generic fixmap.h
x86: use generic fixmap.h
arm: use generic fixmap.h
hexagon: use generic fixmap.h
metag: use generic fixmap.h
microblaze: use generic fixmap.h
mips: use generic fixmap.h
powerpc: use generic fixmap.h
sh: use generic fixmap.h
tile: use generic fixmap.h
um: use generic fixmap.h
arch/arm/include/asm/fixmap.h | 25 ++------
arch/hexagon/include/asm/fixmap.h | 40 +------------
arch/metag/include/asm/fixmap.h | 32 +----------
arch/microblaze/include/asm/fixmap.h | 44 +-------------
arch/mips/include/asm/fixmap.h | 33 +----------
arch/powerpc/include/asm/fixmap.h | 44 +-------------
arch/sh/include/asm/fixmap.h | 39 +------------
arch/tile/include/asm/fixmap.h | 33 +----------
arch/um/include/asm/fixmap.h | 40 +------------
arch/x86/include/asm/fixmap.h | 59 +------------------
include/asm-generic/fixmap.h | 107 +++++++++++++++++++++++++++++++++++
11 files changed, 125 insertions(+), 371 deletions(-)
create mode 100644 include/asm-generic/fixmap.h
--
1.8.3.1
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 01/11] Add generic fixmap.h 2013-11-12 13:22 [PATCH 00/11] Consolidate asm/fixmap.h files Mark Salter @ 2013-11-12 13:22 ` Mark Salter 2013-11-12 13:46 ` Arnd Bergmann 2013-11-12 13:22 ` [PATCH 03/11] arm: use " Mark Salter 2013-11-12 15:39 ` [PATCH 00/11] Consolidate asm/fixmap.h files Michal Simek 2 siblings, 1 reply; 8+ messages in thread From: Mark Salter @ 2013-11-12 13:22 UTC (permalink / raw) To: linux-arm-kernel Many architectures provide an asm/fixmap.h which defines support for compile-time 'special' virtual mappings which need to be made before paging_init() has run. This suport is also used for early ioremap on x86. Much of this support is identical across the architectures. This patch consolidates all of the common bits into asm-generic/fixmap.h which is intended to be included from arch/*/include/asm/fixmap.h. Signed-off-by: Mark Salter <msalter@redhat.com> CC: Arnd Bergmann <arnd@arndb.de> CC: linux-arch at vger.kernel.org CC: Russell King <linux@arm.linux.org.uk> CC: linux-arm-kernel at lists.infradead.org CC: Richard Kuo <rkuo@codeaurora.org> CC: linux-hexagon at vger.kernel.org CC: James Hogan <james.hogan@imgtec.com> CC: linux-metag at vger.kernel.org CC: Michal Simek <monstr@monstr.eu> CC: microblaze-uclinux at itee.uq.edu.au CC: Ralf Baechle <ralf@linux-mips.org> CC: linux-mips at linux-mips.org CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> CC: Paul Mackerras <paulus@samba.org> CC: linuxppc-dev at lists.ozlabs.org --- include/asm-generic/fixmap.h | 107 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 include/asm-generic/fixmap.h diff --git a/include/asm-generic/fixmap.h b/include/asm-generic/fixmap.h new file mode 100644 index 0000000..8d453db --- /dev/null +++ b/include/asm-generic/fixmap.h @@ -0,0 +1,107 @@ +/* + * fixmap.h: compile-time virtual memory allocation + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * + * Copyright (C) 1998 Ingo Molnar + * + * Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999 + * x86_32 and x86_64 integration by Gustavo F. Padovan, February 2009 + */ + +#ifndef __ASM_GENERIC_FIXMAP_H +#define __ASM_GENERIC_FIXMAP_H + +#define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) +#define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT) + +#ifndef __ASSEMBLY__ +extern void __this_fixmap_does_not_exist(void); + +/* + * 'index to address' translation. If anyone tries to use the idx + * directly without translation, we catch the bug with a NULL-deference + * kernel oops. Illegal ranges of incoming indices are caught too. + */ +static __always_inline unsigned long fix_to_virt(const unsigned int idx) +{ + /* + * this branch gets completely eliminated after inlining, + * except when someone tries to use fixaddr indices in an + * illegal way. (such as mixing up address types or using + * out-of-range indices). + * + * If it doesn't get removed, the linker will complain + * loudly with a reasonably clear error message.. + */ + if (idx >= __end_of_fixed_addresses) + __this_fixmap_does_not_exist(); + + return __fix_to_virt(idx); +} + +static inline unsigned long virt_to_fix(const unsigned long vaddr) +{ + BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START); + return __virt_to_fix(vaddr); +} + +/* + * Provide some reasonable defaults for page flags. + * Not all architectures use all of these different types and some + * architectures use different names. + */ +#ifndef FIXMAP_PAGE_NORMAL +#define FIXMAP_PAGE_NORMAL PAGE_KERNEL +#endif +#ifndef FIXMAP_PAGE_NOCACHE +#define FIXMAP_PAGE_NOCACHE PAGE_KERNEL_NOCACHE +#endif +#ifndef FIXMAP_PAGE_IO +#define FIXMAP_PAGE_IO PAGE_KERNEL_IO +#endif +#ifndef FIXMAP_PAGE_CLEAR +#define FIXMAP_PAGE_CLEAR __pgprot(0) +#endif + +#ifndef set_fixmap +#define set_fixmap(idx, phys) \ + __set_fixmap(idx, phys, FIXMAP_PAGE_NORMAL) +#endif + +#ifndef clear_fixmap +#define clear_fixmap(idx) \ + __set_fixmap(idx, 0, FIXMAP_PAGE_CLEAR) +#endif + +/* Return an pointer with offset calculated */ +#define __set_fixmap_offset(idx, phys, flags) \ +({ \ + unsigned long addr; \ + __set_fixmap(idx, phys, flags); \ + addr = fix_to_virt(idx) + ((phys) & (PAGE_SIZE - 1)); \ + addr; \ +}) + +#define set_fixmap_offset(idx, phys) \ + __set_fixmap_offset(idx, phys, FIXMAP_PAGE_NORMAL) + +/* + * Some hardware wants to get fixmapped without caching. + */ +#define set_fixmap_nocache(idx, phys) \ + __set_fixmap(idx, phys, FIXMAP_PAGE_NOCACHE) + +#define set_fixmap_offset_nocache(idx, phys) \ + __set_fixmap_offset(idx, phys, FIXMAP_PAGE_NOCACHE) + +/* + * Some fixmaps are for IO + */ +#define set_fixmap_io(idx, phys) \ + __set_fixmap(idx, phys, FIXMAP_PAGE_IO) + +#endif /* __ASSEMBLY__ */ +#endif /* __ASM_GENERIC_FIXMAP_H */ -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 01/11] Add generic fixmap.h 2013-11-12 13:22 ` [PATCH 01/11] Add generic fixmap.h Mark Salter @ 2013-11-12 13:46 ` Arnd Bergmann 0 siblings, 0 replies; 8+ messages in thread From: Arnd Bergmann @ 2013-11-12 13:46 UTC (permalink / raw) To: linux-arm-kernel On Tuesday 12 November 2013, Mark Salter wrote: > Many architectures provide an asm/fixmap.h which defines support for > compile-time 'special' virtual mappings which need to be made before > paging_init() has run. This suport is also used for early ioremap > on x86. Much of this support is identical across the architectures. > This patch consolidates all of the common bits into asm-generic/fixmap.h > which is intended to be included from arch/*/include/asm/fixmap.h. Good idea, Acked-by: Arnd Bergmann <arnd@arndb.de> On Tuesday 12 November 2013, Mark Salter wrote: > +static __always_inline unsigned long fix_to_virt(const unsigned int idx) > +{ > + /* > + * this branch gets completely eliminated after inlining, > + * except when someone tries to use fixaddr indices in an > + * illegal way. (such as mixing up address types or using > + * out-of-range indices). > + * > + * If it doesn't get removed, the linker will complain > + * loudly with a reasonably clear error message.. > + */ > + if (idx >= __end_of_fixed_addresses) > + __this_fixmap_does_not_exist(); > + You might be able to turn this into the more readable BUILD_BUG_ON(). Arnd ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 03/11] arm: use generic fixmap.h 2013-11-12 13:22 [PATCH 00/11] Consolidate asm/fixmap.h files Mark Salter 2013-11-12 13:22 ` [PATCH 01/11] Add generic fixmap.h Mark Salter @ 2013-11-12 13:22 ` Mark Salter 2013-11-12 14:50 ` Mark Salter 2013-11-12 15:39 ` [PATCH 00/11] Consolidate asm/fixmap.h files Michal Simek 2 siblings, 1 reply; 8+ messages in thread From: Mark Salter @ 2013-11-12 13:22 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Mark Salter <msalter@redhat.com> CC: Russell King <linux@arm.linux.org.uk> CC: linux-arm-kernel at lists.infradead.org --- arch/arm/include/asm/fixmap.h | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/arch/arm/include/asm/fixmap.h b/arch/arm/include/asm/fixmap.h index bbae919..f88ae8b 100644 --- a/arch/arm/include/asm/fixmap.h +++ b/arch/arm/include/asm/fixmap.h @@ -17,25 +17,12 @@ #define FIXADDR_TOP 0xfffe0000UL #define FIXADDR_SIZE (FIXADDR_TOP - FIXADDR_START) -#define FIX_KMAP_BEGIN 0 -#define FIX_KMAP_END (FIXADDR_SIZE >> PAGE_SHIFT) +enum fixed_addresses { + FIX_KMAP_BEGIN, + FIX_KMAP_END = (FIXADDR_SIZE >> PAGE_SHIFT) - 1, + __end_of_fixed_addresses +}; -#define __fix_to_virt(x) (FIXADDR_START + ((x) << PAGE_SHIFT)) -#define __virt_to_fix(x) (((x) - FIXADDR_START) >> PAGE_SHIFT) - -extern void __this_fixmap_does_not_exist(void); - -static inline unsigned long fix_to_virt(const unsigned int idx) -{ - if (idx >= FIX_KMAP_END) - __this_fixmap_does_not_exist(); - return __fix_to_virt(idx); -} - -static inline unsigned int virt_to_fix(const unsigned long vaddr) -{ - BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START); - return __virt_to_fix(vaddr); -} +#include <asm-generic/fixmap.h> #endif -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 03/11] arm: use generic fixmap.h 2013-11-12 13:22 ` [PATCH 03/11] arm: use " Mark Salter @ 2013-11-12 14:50 ` Mark Salter 0 siblings, 0 replies; 8+ messages in thread From: Mark Salter @ 2013-11-12 14:50 UTC (permalink / raw) To: linux-arm-kernel On Tue, 2013-11-12 at 08:22 -0500, Mark Salter wrote: > Signed-off-by: Mark Salter <msalter@redhat.com> > CC: Russell King <linux@arm.linux.org.uk> > CC: linux-arm-kernel at lists.infradead.org > --- > arch/arm/include/asm/fixmap.h | 25 ++++++------------------- > 1 file changed, 6 insertions(+), 19 deletions(-) Okay, this one is wrong. I just noticed that arm is different from other architectures in that increasing fixed indices convert to increasing virt addresses. Does this need to be the case or is it okay to change it to match other architectures? --Mark ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 00/11] Consolidate asm/fixmap.h files 2013-11-12 13:22 [PATCH 00/11] Consolidate asm/fixmap.h files Mark Salter 2013-11-12 13:22 ` [PATCH 01/11] Add generic fixmap.h Mark Salter 2013-11-12 13:22 ` [PATCH 03/11] arm: use " Mark Salter @ 2013-11-12 15:39 ` Michal Simek 2013-11-12 15:55 ` Mark Salter 2 siblings, 1 reply; 8+ messages in thread From: Michal Simek @ 2013-11-12 15:39 UTC (permalink / raw) To: linux-arm-kernel On 11/12/2013 02:22 PM, Mark Salter wrote: > Many architectures provide an asm/fixmap.h which defines support for > compile-time 'special' virtual mappings which need to be made before > paging_init() has run. This suport is also used for early ioremap > on x86. Much of this support is identical across the architectures. > This patch consolidates all of the common bits into asm-generic/fixmap.h > which is intended to be included from arch/*/include/asm/fixmap.h. > > This has been compiled on x86, arm, powerpc, and sh, but tested > on x86 only. > > Mark Salter (11): > Add generic fixmap.h > x86: use generic fixmap.h > arm: use generic fixmap.h > hexagon: use generic fixmap.h > metag: use generic fixmap.h > microblaze: use generic fixmap.h > mips: use generic fixmap.h > powerpc: use generic fixmap.h > sh: use generic fixmap.h > tile: use generic fixmap.h > um: use generic fixmap.h > > arch/arm/include/asm/fixmap.h | 25 ++------ > arch/hexagon/include/asm/fixmap.h | 40 +------------ > arch/metag/include/asm/fixmap.h | 32 +---------- > arch/microblaze/include/asm/fixmap.h | 44 +------------- > arch/mips/include/asm/fixmap.h | 33 +---------- > arch/powerpc/include/asm/fixmap.h | 44 +------------- > arch/sh/include/asm/fixmap.h | 39 +------------ > arch/tile/include/asm/fixmap.h | 33 +---------- > arch/um/include/asm/fixmap.h | 40 +------------ > arch/x86/include/asm/fixmap.h | 59 +------------------ > include/asm-generic/fixmap.h | 107 +++++++++++++++++++++++++++++++++++ > 11 files changed, 125 insertions(+), 371 deletions(-) > create mode 100644 include/asm-generic/fixmap.h Any repo/branch with all these patches will be helpful. Thanks, Michal -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 263 bytes Desc: OpenPGP digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131112/026a7f78/attachment.sig> ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 00/11] Consolidate asm/fixmap.h files 2013-11-12 15:39 ` [PATCH 00/11] Consolidate asm/fixmap.h files Michal Simek @ 2013-11-12 15:55 ` Mark Salter 2013-11-14 9:39 ` Michal Simek 0 siblings, 1 reply; 8+ messages in thread From: Mark Salter @ 2013-11-12 15:55 UTC (permalink / raw) To: linux-arm-kernel On Tue, 2013-11-12 at 16:39 +0100, Michal Simek wrote: > On 11/12/2013 02:22 PM, Mark Salter wrote: > > > > arch/arm/include/asm/fixmap.h | 25 ++------ > > arch/hexagon/include/asm/fixmap.h | 40 +------------ > > arch/metag/include/asm/fixmap.h | 32 +---------- > > arch/microblaze/include/asm/fixmap.h | 44 +------------- > > arch/mips/include/asm/fixmap.h | 33 +---------- > > arch/powerpc/include/asm/fixmap.h | 44 +------------- > > arch/sh/include/asm/fixmap.h | 39 +------------ > > arch/tile/include/asm/fixmap.h | 33 +---------- > > arch/um/include/asm/fixmap.h | 40 +------------ > > arch/x86/include/asm/fixmap.h | 59 +------------------ > > include/asm-generic/fixmap.h | 107 +++++++++++++++++++++++++++++++++++ > > 11 files changed, 125 insertions(+), 371 deletions(-) > > create mode 100644 include/asm-generic/fixmap.h > > Any repo/branch with all these patches will be helpful. https://github.com/mosalter/linux (fixmap branch) ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 00/11] Consolidate asm/fixmap.h files 2013-11-12 15:55 ` Mark Salter @ 2013-11-14 9:39 ` Michal Simek 0 siblings, 0 replies; 8+ messages in thread From: Michal Simek @ 2013-11-14 9:39 UTC (permalink / raw) To: linux-arm-kernel On 11/12/2013 04:55 PM, Mark Salter wrote: > On Tue, 2013-11-12 at 16:39 +0100, Michal Simek wrote: >> On 11/12/2013 02:22 PM, Mark Salter wrote: >>> >>> arch/arm/include/asm/fixmap.h | 25 ++------ >>> arch/hexagon/include/asm/fixmap.h | 40 +------------ >>> arch/metag/include/asm/fixmap.h | 32 +---------- >>> arch/microblaze/include/asm/fixmap.h | 44 +------------- >>> arch/mips/include/asm/fixmap.h | 33 +---------- >>> arch/powerpc/include/asm/fixmap.h | 44 +------------- >>> arch/sh/include/asm/fixmap.h | 39 +------------ >>> arch/tile/include/asm/fixmap.h | 33 +---------- >>> arch/um/include/asm/fixmap.h | 40 +------------ >>> arch/x86/include/asm/fixmap.h | 59 +------------------ >>> include/asm-generic/fixmap.h | 107 +++++++++++++++++++++++++++++++++++ >>> 11 files changed, 125 insertions(+), 371 deletions(-) >>> create mode 100644 include/asm-generic/fixmap.h >> >> Any repo/branch with all these patches will be helpful. > > https://github.com/mosalter/linux (fixmap branch) Thanks, For Microblaze Tested-by: Michal Simek <monstr@monstr.eu> Thanks, Michal -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 263 bytes Desc: OpenPGP digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131114/0d24ff52/attachment.sig> ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-11-14 9:39 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-11-12 13:22 [PATCH 00/11] Consolidate asm/fixmap.h files Mark Salter 2013-11-12 13:22 ` [PATCH 01/11] Add generic fixmap.h Mark Salter 2013-11-12 13:46 ` Arnd Bergmann 2013-11-12 13:22 ` [PATCH 03/11] arm: use " Mark Salter 2013-11-12 14:50 ` Mark Salter 2013-11-12 15:39 ` [PATCH 00/11] Consolidate asm/fixmap.h files Michal Simek 2013-11-12 15:55 ` Mark Salter 2013-11-14 9:39 ` Michal Simek
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).