1. Patchew
  2. Xen
  3. View series

[PATCH] xen/arm: Remove unused BOOT_RELOC_VIRT_START

Julien Grall posted 1 patch 2 years, 2 months ago
Test gitlab-ci passed
Patches applied successfully (tree, apply log)
git fetch https://gitlab.com/xen-project/patchew/xen tags/patchew/20220228100633.57593-1-julien@xen.org
xen/arch/arm/include/asm/config.h | 4 +---
xen/arch/arm/mm.c                 | 1 -
2 files changed, 1 insertion(+), 4 deletions(-)
[PATCH] xen/arm: Remove unused BOOT_RELOC_VIRT_START
Posted by Julien Grall 2 years, 2 months ago 
From: Julien Grall <julien.grall@arm.com>

We stopped relocating Xen since commit f60658c6ae "xen/arm: Stop
relocating Xen".

At the same time, update the memory layout description.

Signed-off-by: Julien Grall <julien.grall@arm.com>
Signed-off-by: Julien Grall <jgrall@amazon.com>
---
 xen/arch/arm/include/asm/config.h | 4 +---
 xen/arch/arm/mm.c                 | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/xen/arch/arm/include/asm/config.h b/xen/arch/arm/include/asm/config.h
index 2aced0bc3b8b..b25c9d39bb32 100644
--- a/xen/arch/arm/include/asm/config.h
+++ b/xen/arch/arm/include/asm/config.h
@@ -77,8 +77,7 @@
  *   2M -   4M   Xen text, data, bss
  *   4M -   6M   Fixmap: special-purpose 4K mapping slots
  *   6M -  10M   Early boot mapping of FDT
- *   10M - 12M   Early relocation address (used when relocating Xen)
- *               and later for livepatch vmap (if compiled in)
+ *   10M - 12M   Livepatch vmap (if compiled in)
  *
  * ARM32 layout:
  *   0  -  12M   <COMMON>
@@ -115,7 +114,6 @@
 #define BOOT_FDT_SLOT_SIZE     MB(4)
 #define BOOT_FDT_VIRT_END      (BOOT_FDT_VIRT_START + BOOT_FDT_SLOT_SIZE)
 
-#define BOOT_RELOC_VIRT_START  _AT(vaddr_t,0x00a00000)
 #ifdef CONFIG_LIVEPATCH
 #define LIVEPATCH_VMAP_START   _AT(vaddr_t,0x00a00000)
 #define LIVEPATCH_VMAP_END     (LIVEPATCH_VMAP_START + MB(2))
diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
index 515d0906f85b..8a17222109c6 100644
--- a/xen/arch/arm/mm.c
+++ b/xen/arch/arm/mm.c
@@ -196,7 +196,6 @@ static void __init __maybe_unused build_assertions(void)
     /* 2MB aligned regions */
     BUILD_BUG_ON(XEN_VIRT_START & ~SECOND_MASK);
     BUILD_BUG_ON(FIXMAP_ADDR(0) & ~SECOND_MASK);
-    BUILD_BUG_ON(BOOT_RELOC_VIRT_START & ~SECOND_MASK);
     /* 1GB aligned regions */
 #ifdef CONFIG_ARM_32
     BUILD_BUG_ON(XENHEAP_VIRT_START & ~FIRST_MASK);
-- 
2.32.0
Re: [PATCH] xen/arm: Remove unused BOOT_RELOC_VIRT_START
Posted by Bertrand Marquis 2 years, 2 months ago 
Hi Julien,

> On 28 Feb 2022, at 10:06, Julien Grall <julien@xen.org> wrote:
> 
> From: Julien Grall <julien.grall@arm.com>
> 
> We stopped relocating Xen since commit f60658c6ae "xen/arm: Stop
> relocating Xen".
> 
> At the same time, update the memory layout description.
> 
> Signed-off-by: Julien Grall <julien.grall@arm.com>
> Signed-off-by: Julien Grall <jgrall@amazon.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

Cheers
Bertrand

> ---
> xen/arch/arm/include/asm/config.h | 4 +---
> xen/arch/arm/mm.c                 | 1 -
> 2 files changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/xen/arch/arm/include/asm/config.h b/xen/arch/arm/include/asm/config.h
> index 2aced0bc3b8b..b25c9d39bb32 100644
> --- a/xen/arch/arm/include/asm/config.h
> +++ b/xen/arch/arm/include/asm/config.h
> @@ -77,8 +77,7 @@
>  *   2M -   4M   Xen text, data, bss
>  *   4M -   6M   Fixmap: special-purpose 4K mapping slots
>  *   6M -  10M   Early boot mapping of FDT
> - *   10M - 12M   Early relocation address (used when relocating Xen)
> - *               and later for livepatch vmap (if compiled in)
> + *   10M - 12M   Livepatch vmap (if compiled in)
>  *
>  * ARM32 layout:
>  *   0  -  12M   <COMMON>
> @@ -115,7 +114,6 @@
> #define BOOT_FDT_SLOT_SIZE     MB(4)
> #define BOOT_FDT_VIRT_END      (BOOT_FDT_VIRT_START + BOOT_FDT_SLOT_SIZE)
> 
> -#define BOOT_RELOC_VIRT_START  _AT(vaddr_t,0x00a00000)
> #ifdef CONFIG_LIVEPATCH
> #define LIVEPATCH_VMAP_START   _AT(vaddr_t,0x00a00000)
> #define LIVEPATCH_VMAP_END     (LIVEPATCH_VMAP_START + MB(2))
> diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
> index 515d0906f85b..8a17222109c6 100644
> --- a/xen/arch/arm/mm.c
> +++ b/xen/arch/arm/mm.c
> @@ -196,7 +196,6 @@ static void __init __maybe_unused build_assertions(void)
>     /* 2MB aligned regions */
>     BUILD_BUG_ON(XEN_VIRT_START & ~SECOND_MASK);
>     BUILD_BUG_ON(FIXMAP_ADDR(0) & ~SECOND_MASK);
> -    BUILD_BUG_ON(BOOT_RELOC_VIRT_START & ~SECOND_MASK);
>     /* 1GB aligned regions */
> #ifdef CONFIG_ARM_32
>     BUILD_BUG_ON(XENHEAP_VIRT_START & ~FIRST_MASK);
> -- 
> 2.32.0
>
Re: [PATCH] xen/arm: Remove unused BOOT_RELOC_VIRT_START
Posted by Michal Orzel 2 years, 2 months ago 
Hi Julien,

On 28.02.2022 11:06, Julien Grall wrote:
> From: Julien Grall <julien.grall@arm.com>
> 
> We stopped relocating Xen since commit f60658c6ae "xen/arm: Stop
> relocating Xen".
> 
> At the same time, update the memory layout description.
> 
> Signed-off-by: Julien Grall <julien.grall@arm.com>
> Signed-off-by: Julien Grall <jgrall@amazon.com>
Are these two entries needed? I'd say one is enough.
> ---

Apart from that:
Reviewed-by: Michal Orzel <michal.orzel@arm.com>

Cheers,
Michal
Re: [PATCH] xen/arm: Remove unused BOOT_RELOC_VIRT_START
Posted by Julien Grall 2 years, 2 months ago 
On 01/03/2022 08:28, Michal Orzel wrote:
> Hi Julien,

Hi Michal,

> On 28.02.2022 11:06, Julien Grall wrote:
>> From: Julien Grall <julien.grall@arm.com>
>>
>> We stopped relocating Xen since commit f60658c6ae "xen/arm: Stop
>> relocating Xen".
>>
>> At the same time, update the memory layout description.
>>
>> Signed-off-by: Julien Grall <julien.grall@arm.com>
>> Signed-off-by: Julien Grall <jgrall@amazon.com>
> Are these two entries needed? I'd say one is enough.
 From my understanding, it is necessary. The person is the same here but 
the companies are different.

So I should properly account that the work was originaly done while 
working for Arm (see [1]) and was updated while I was working for Amazon.

Even I didn't touch the patch, I still need to add a signed-off-by 
because of the DCO [2].

>> ---
> 
> Apart from that:
> Reviewed-by: Michal Orzel <michal.orzel@arm.com>

Cheers,

[1] 
https://xenbits.xen.org/gitweb/?p=people/julieng/xen-unstable.git;a=commit;h=dfa041f32ae2fef6132d40df7cbce93b6e385937
[2] https://developercertificate.org/

-- 
Julien Grall
Re: [PATCH] xen/arm: Remove unused BOOT_RELOC_VIRT_START
Posted by Michal Orzel 2 years, 2 months ago 
Hi Julien,

On 01.03.2022 10:57, Julien Grall wrote:
> On 01/03/2022 08:28, Michal Orzel wrote:
>> Hi Julien,
> 
> Hi Michal,
> 
>> On 28.02.2022 11:06, Julien Grall wrote:
>>> From: Julien Grall <julien.grall@arm.com>
>>>
>>> We stopped relocating Xen since commit f60658c6ae "xen/arm: Stop
>>> relocating Xen".
>>>
>>> At the same time, update the memory layout description.
>>>
>>> Signed-off-by: Julien Grall <julien.grall@arm.com>
>>> Signed-off-by: Julien Grall <jgrall@amazon.com>
>> Are these two entries needed? I'd say one is enough.
> From my understanding, it is necessary. The person is the same here but the companies are different.
> 
> So I should properly account that the work was originaly done while working for Arm (see [1]) and was updated while I was working for Amazon.
> 
> Even I didn't touch the patch, I still need to add a signed-off-by because of the DCO [2].
> 
Interesting. Thank you very much for the explanation.

>>> ---
>>
>> Apart from that:
>> Reviewed-by: Michal Orzel <michal.orzel@arm.com>
> 
> Cheers,
> 
> [1] https://xenbits.xen.org/gitweb/?p=people/julieng/xen-unstable.git;a=commit;h=dfa041f32ae2fef6132d40df7cbce93b6e385937
> [2] https://developercertificate.org/
> 

Cheers,
Michal

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.