From: Sascha Hauer <s.hauer@pengutronix.de>
To: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] ARM: Make use of ALIGN_DOWN macro in barebox-arm.h
Date: Wed, 11 Apr 2018 10:43:10 +0200 [thread overview]
Message-ID: <20180411084310.lox3beilymyxhvwb@pengutronix.de> (raw)
In-Reply-To: <20180410233805.4191-1-andrew.smirnov@gmail.com>
On Tue, Apr 10, 2018 at 04:38:05PM -0700, Andrey Smirnov wrote:
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> ---
> arch/arm/include/asm/barebox-arm.h | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h
> index 4b270e7de..67e4d964d 100644
> --- a/arch/arm/include/asm/barebox-arm.h
> +++ b/arch/arm/include/asm/barebox-arm.h
> @@ -114,8 +114,7 @@ static inline unsigned long arm_mem_ttb(unsigned long membase,
> unsigned long endmem)
> {
> endmem = arm_mem_stack(membase, endmem);
> - endmem &= ~(SZ_16K - 1);
> - endmem -= SZ_16K;
> + endmem = ALIGN_DOWN(endmem, SZ_16K) - SZ_16K;
>
> return endmem;
> }
> @@ -138,7 +137,7 @@ static inline unsigned long arm_mem_ramoops(unsigned long membase,
> endmem = arm_mem_ttb(membase, endmem);
> #ifdef CONFIG_FS_PSTORE_RAMOOPS
> endmem -= CONFIG_FS_PSTORE_RAMOOPS_SIZE;
> - endmem &= ~(SZ_4K - 1); /* Align to 4K */
> + endmem = ALIGN_DOWN(endmem, SZ_4K);
> #endif
>
> return endmem;
> @@ -151,9 +150,7 @@ static inline unsigned long arm_mem_barebox_image(unsigned long membase,
> endmem = arm_mem_ramoops(membase, endmem);
>
> if (IS_ENABLED(CONFIG_RELOCATABLE)) {
> - endmem -= size;
> - endmem &= ~(SZ_1M - 1);
> - return endmem;
> + return ALIGN_DOWN(endmem - size, SZ_1M);
> } else {
> if (TEXT_BASE >= membase && TEXT_BASE < endmem)
> return TEXT_BASE;
> --
> 2.14.3
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2018-04-11 8:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-10 23:38 Andrey Smirnov
2018-04-11 8:43 ` Sascha Hauer [this message]
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=20180411084310.lox3beilymyxhvwb@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=andrew.smirnov@gmail.com \
--cc=barebox@lists.infradead.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox