* [PATCH] ARM: Make pgtbl macro more robust
@ 2014-01-06 13:39 Christopher Covington
2014-01-17 18:50 ` Stephen Boyd
0 siblings, 1 reply; 3+ messages in thread
From: Christopher Covington @ 2014-01-06 13:39 UTC (permalink / raw)
To: Russell King
Cc: Stephen Boyd, linux-arm-kernel, linux-arm-msm, linux-kernel,
Christopher Covington
The pgtbl macro couldn't handle the specific
(TEXT_OFFSET - PG_DIR_SIZE) value that the combination of
MSM platforms and LPAE created:
head.S:163: Error: invalid constant (203000) after fixup
Regardless of whether this combination of configuration options
will work on currently support platforms at run time, make it
at least assemble properly.
Signed-off-by: Christopher Covington <cov@codeaurora.org>
---
arch/arm/kernel/head.S | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 9cf6063..af30cac 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -52,7 +52,8 @@
.equ swapper_pg_dir, KERNEL_RAM_VADDR - PG_DIR_SIZE
.macro pgtbl, rd, phys
- add \rd, \phys, #TEXT_OFFSET - PG_DIR_SIZE
+ add \rd, \phys, #TEXT_OFFSET
+ sub \rd, \rd, #PG_DIR_SIZE
.endm
/*
--
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by the Linux Foundation.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ARM: Make pgtbl macro more robust
2014-01-06 13:39 [PATCH] ARM: Make pgtbl macro more robust Christopher Covington
@ 2014-01-17 18:50 ` Stephen Boyd
2014-01-21 15:28 ` Christopher Covington
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Boyd @ 2014-01-17 18:50 UTC (permalink / raw)
To: Christopher Covington
Cc: Russell King, linux-arm-kernel, linux-arm-msm, linux-kernel
On 01/06, Christopher Covington wrote:
> The pgtbl macro couldn't handle the specific
> (TEXT_OFFSET - PG_DIR_SIZE) value that the combination of
> MSM platforms and LPAE created:
>
> head.S:163: Error: invalid constant (203000) after fixup
>
> Regardless of whether this combination of configuration options
> will work on currently support platforms at run time, make it
> at least assemble properly.
>
> Signed-off-by: Christopher Covington <cov@codeaurora.org>
Looks good to me.
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
I think you can put it in the patch tracker. Russell?
> ---
> arch/arm/kernel/head.S | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
> index 9cf6063..af30cac 100644
> --- a/arch/arm/kernel/head.S
> +++ b/arch/arm/kernel/head.S
> @@ -52,7 +52,8 @@
> .equ swapper_pg_dir, KERNEL_RAM_VADDR - PG_DIR_SIZE
>
> .macro pgtbl, rd, phys
> - add \rd, \phys, #TEXT_OFFSET - PG_DIR_SIZE
> + add \rd, \phys, #TEXT_OFFSET
> + sub \rd, \rd, #PG_DIR_SIZE
> .endm
>
> /*
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ARM: Make pgtbl macro more robust
2014-01-17 18:50 ` Stephen Boyd
@ 2014-01-21 15:28 ` Christopher Covington
0 siblings, 0 replies; 3+ messages in thread
From: Christopher Covington @ 2014-01-21 15:28 UTC (permalink / raw)
To: Stephen Boyd; +Cc: Russell King, linux-arm-kernel, linux-arm-msm, linux-kernel
On 01/17/2014 01:50 PM, Stephen Boyd wrote:
> On 01/06, Christopher Covington wrote:
>> The pgtbl macro couldn't handle the specific
>> (TEXT_OFFSET - PG_DIR_SIZE) value that the combination of
>> MSM platforms and LPAE created:
>>
>> head.S:163: Error: invalid constant (203000) after fixup
>>
>> Regardless of whether this combination of configuration options
>> will work on currently support platforms at run time, make it
>> at least assemble properly.
>>
>> Signed-off-by: Christopher Covington <cov@codeaurora.org>
>
> Looks good to me.
>
> Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
>
> I think you can put it in the patch tracker. Russell?
Added as
http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7947/1
Regards,
Christopher
--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by the Linux Foundation.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-01-21 15:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-06 13:39 [PATCH] ARM: Make pgtbl macro more robust Christopher Covington
2014-01-17 18:50 ` Stephen Boyd
2014-01-21 15:28 ` Christopher Covington
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).