From: Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, leif.lindholm-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, roy.franz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, mark.rutland-5wv7dgnIgG8@public.gmane.org, catalin.marinas-5wv7dgnIgG8@public.gmane.org, will.deacon-5wv7dgnIgG8@public.gmane.org, matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org, bp-Gina5bIWoIWzQB+pC5nmwQ@public.gmane.org, dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, msalter-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org Cc: Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> Subject: [PATCH 4/8] memblock: introduce memblock_add_phys() and memblock_is_physmem() Date: Mon, 22 Dec 2014 19:08:38 +0000 [thread overview] Message-ID: <1419275322-29811-5-git-send-email-ard.biesheuvel@linaro.org> (raw) In-Reply-To: <1419275322-29811-1-git-send-email-ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> This introduces the following functions: - memblock_add_phys(), that registers regions in the 'physmem' memblock map if CONFIG_HAVE_MEMBLOCK_PHYS_MAP is set; otherwise, it is a nop - memblock_is_physmem(), returns whether a physical address is classified as physical memory. Signed-off-by: Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> --- include/linux/memblock.h | 10 ++++++++++ mm/memblock.c | 15 +++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index e8cc45307f8f..d32fe838c6ca 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -365,6 +365,16 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo #define __initdata_memblock #endif +#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP +int memblock_add_phys(phys_addr_t base, phys_addr_t size); +int memblock_is_physmem(phys_addr_t addr); +#else +static inline int memblock_add_phys(phys_addr_t base, phys_addr_t size) +{ + return 0; +} +#endif /* CONFIG_HAVE_MEMBLOCK_PHYS_MAP */ + #else static inline phys_addr_t memblock_alloc(phys_addr_t size, phys_addr_t align) { diff --git a/mm/memblock.c b/mm/memblock.c index c27353beb260..107aa5ee2d7b 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -586,6 +586,14 @@ int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size) MAX_NUMNODES, 0); } +#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP +int __init_memblock memblock_add_phys(phys_addr_t base, phys_addr_t size) +{ + return memblock_add_range(&memblock.physmem, base, size, + MAX_NUMNODES, 0); +} +#endif + /** * memblock_isolate_range - isolate given range into disjoint memblocks * @type: memblock type to isolate range for @@ -1398,6 +1406,13 @@ int __init_memblock memblock_is_memory(phys_addr_t addr) return memblock_search(&memblock.memory, addr) != -1; } +#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP +int __init_memblock memblock_is_physmem(phys_addr_t addr) +{ + return memblock_search(&memblock.physmem, addr) != -1; +} +#endif + #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP int __init_memblock memblock_search_pfn_nid(unsigned long pfn, unsigned long *start_pfn, unsigned long *end_pfn) -- 1.8.3.2
WARNING: multiple messages have this Message-ID (diff)
From: ard.biesheuvel@linaro.org (Ard Biesheuvel) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/8] memblock: introduce memblock_add_phys() and memblock_is_physmem() Date: Mon, 22 Dec 2014 19:08:38 +0000 [thread overview] Message-ID: <1419275322-29811-5-git-send-email-ard.biesheuvel@linaro.org> (raw) In-Reply-To: <1419275322-29811-1-git-send-email-ard.biesheuvel@linaro.org> This introduces the following functions: - memblock_add_phys(), that registers regions in the 'physmem' memblock map if CONFIG_HAVE_MEMBLOCK_PHYS_MAP is set; otherwise, it is a nop - memblock_is_physmem(), returns whether a physical address is classified as physical memory. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- include/linux/memblock.h | 10 ++++++++++ mm/memblock.c | 15 +++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index e8cc45307f8f..d32fe838c6ca 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -365,6 +365,16 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo #define __initdata_memblock #endif +#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP +int memblock_add_phys(phys_addr_t base, phys_addr_t size); +int memblock_is_physmem(phys_addr_t addr); +#else +static inline int memblock_add_phys(phys_addr_t base, phys_addr_t size) +{ + return 0; +} +#endif /* CONFIG_HAVE_MEMBLOCK_PHYS_MAP */ + #else static inline phys_addr_t memblock_alloc(phys_addr_t size, phys_addr_t align) { diff --git a/mm/memblock.c b/mm/memblock.c index c27353beb260..107aa5ee2d7b 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -586,6 +586,14 @@ int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size) MAX_NUMNODES, 0); } +#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP +int __init_memblock memblock_add_phys(phys_addr_t base, phys_addr_t size) +{ + return memblock_add_range(&memblock.physmem, base, size, + MAX_NUMNODES, 0); +} +#endif + /** * memblock_isolate_range - isolate given range into disjoint memblocks * @type: memblock type to isolate range for @@ -1398,6 +1406,13 @@ int __init_memblock memblock_is_memory(phys_addr_t addr) return memblock_search(&memblock.memory, addr) != -1; } +#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP +int __init_memblock memblock_is_physmem(phys_addr_t addr) +{ + return memblock_search(&memblock.physmem, addr) != -1; +} +#endif + #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP int __init_memblock memblock_search_pfn_nid(unsigned long pfn, unsigned long *start_pfn, unsigned long *end_pfn) -- 1.8.3.2
next prev parent reply other threads:[~2014-12-22 19:08 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-12-22 19:08 [PATCH 0/8] arm64: improved memory map handling for /dev/mem, ACPI etc Ard Biesheuvel 2014-12-22 19:08 ` Ard Biesheuvel [not found] ` <1419275322-29811-1-git-send-email-ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2014-12-22 19:08 ` [PATCH 1/8] arm64/efi: use UEFI memory map unconditionally if available Ard Biesheuvel 2014-12-22 19:08 ` Ard Biesheuvel [not found] ` <1419275322-29811-2-git-send-email-ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2015-01-06 9:04 ` Matt Fleming 2015-01-06 9:04 ` Matt Fleming [not found] ` <20150106090407.GF3163-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org> 2015-01-07 11:48 ` Ard Biesheuvel 2015-01-07 11:48 ` Ard Biesheuvel [not found] ` <CAKv+Gu_q5wFhjb8M7VptVtHfm5vfp6_YiqN_XoTs9qV5=8OOdg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2015-01-12 10:46 ` Matt Fleming 2015-01-12 10:46 ` Matt Fleming 2015-01-09 15:41 ` Will Deacon 2015-01-09 15:41 ` Will Deacon 2014-12-22 19:08 ` [PATCH 2/8] arm64/efi: register UEFI reserved regions as iomem resources Ard Biesheuvel 2014-12-22 19:08 ` Ard Biesheuvel [not found] ` <1419275322-29811-3-git-send-email-ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2015-01-06 9:13 ` Matt Fleming 2015-01-06 9:13 ` Matt Fleming [not found] ` <20150106091322.GG3163-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org> 2015-01-07 11:53 ` Ard Biesheuvel 2015-01-07 11:53 ` Ard Biesheuvel 2014-12-22 19:08 ` [PATCH 3/8] memblock: add physmem to memblock_dump_all() output Ard Biesheuvel 2014-12-22 19:08 ` Ard Biesheuvel 2015-01-06 9:15 ` Matt Fleming 2015-01-06 9:15 ` Matt Fleming 2015-01-06 9:15 ` Matt Fleming 2014-12-22 19:08 ` Ard Biesheuvel [this message] 2014-12-22 19:08 ` [PATCH 4/8] memblock: introduce memblock_add_phys() and memblock_is_physmem() Ard Biesheuvel 2015-01-06 9:19 ` Matt Fleming 2015-01-06 9:19 ` Matt Fleming 2015-01-06 9:19 ` Matt Fleming 2014-12-22 19:08 ` [PATCH 5/8] of: fdt: register physmem in early_init_dt_scan_memory() Ard Biesheuvel 2014-12-22 19:08 ` Ard Biesheuvel 2014-12-22 19:08 ` [PATCH 6/8] arm64/efi: register physmem in reserve_regions() Ard Biesheuvel 2014-12-22 19:08 ` Ard Biesheuvel 2014-12-22 19:08 ` [PATCH 7/8] arm64: use 'physmem' memblock to improve CONFIG_STRICT_DEVMEM handling Ard Biesheuvel 2014-12-22 19:08 ` Ard Biesheuvel [not found] ` <1419275322-29811-8-git-send-email-ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2015-01-09 15:38 ` Will Deacon 2015-01-09 15:38 ` Will Deacon 2014-12-22 19:08 ` [PATCH 8/8] arm64/efi: memblock_remove rather than _reserve UEFI reserved RAM Ard Biesheuvel 2014-12-22 19:08 ` Ard Biesheuvel 2014-12-26 9:35 ` [PATCH 0/8] arm64: improved memory map handling for /dev/mem, ACPI etc Dave Young 2014-12-26 9:35 ` Dave Young [not found] ` <20141226093528.GA26133-4/PLUo9XfK/1wF9wiOj0lkEOCMrvLtNR@public.gmane.org> 2014-12-29 9:22 ` Ard Biesheuvel 2014-12-29 9:22 ` Ard Biesheuvel [not found] ` <CAKv+Gu_1VCJK7y5U9H-mhjjN6AFW8+SGvbKUZfuzx6qGEpVg0A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2014-12-30 9:25 ` Dave Young 2014-12-30 9:25 ` Dave Young [not found] ` <20141230092514.GF2457-4/PLUo9XfK/1wF9wiOj0lkEOCMrvLtNR@public.gmane.org> 2014-12-30 13:21 ` Ard Biesheuvel 2014-12-30 13:21 ` Ard Biesheuvel [not found] ` <CAKv+Gu_Ou6Fv7-AUcpbUJAijwEJ8=PCB1mQU3mCfctLFAMhu_w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2015-01-04 8:19 ` Dave Young 2015-01-04 8:19 ` Dave Young [not found] ` <20150104081905.GA6231-4/PLUo9XfK/1wF9wiOj0lkEOCMrvLtNR@public.gmane.org> 2015-01-05 9:18 ` Ard Biesheuvel 2015-01-05 9:18 ` Ard Biesheuvel [not found] ` <CAKv+Gu-P7AeMNveZMe814FgrEr_z26vaYKWa=borKoPSc76Y6g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2015-01-06 8:16 ` Dave Young 2015-01-06 8:16 ` Dave Young [not found] ` <20150106081635.GE2113-4/PLUo9XfK/1wF9wiOj0lkEOCMrvLtNR@public.gmane.org> 2015-01-07 11:41 ` Ard Biesheuvel 2015-01-07 11:41 ` Ard Biesheuvel [not found] ` <CAKv+Gu9DQLZnvNyF0qdk5jSH6=NvdsKYTX+E46U=kGRzCEfwHg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2015-01-08 1:29 ` Dave Young 2015-01-08 1:29 ` Dave Young
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1419275322-29811-5-git-send-email-ard.biesheuvel@linaro.org \ --to=ard.biesheuvel-qsej5fyqhm4dnm+yrofe0a@public.gmane.org \ --cc=bp-Gina5bIWoIWzQB+pC5nmwQ@public.gmane.org \ --cc=catalin.marinas-5wv7dgnIgG8@public.gmane.org \ --cc=dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \ --cc=grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \ --cc=leif.lindholm-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \ --cc=matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \ --cc=msalter-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \ --cc=roy.franz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \ --cc=will.deacon-5wv7dgnIgG8@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.