[v2,38/39] xen/riscv: enable full Xen build

Message ID	c56be97d180b996d431eb97e7b0a23ac28798996.1700761381.git.oleksii.kurochko@gmail.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <xen-devel-bounces@lists.xenproject.org> Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org> From: Oleksii Kurochko <oleksii.kurochko@gmail.com> To: xen-devel@lists.xenproject.org Cc: Oleksii Kurochko <oleksii.kurochko@gmail.com>, Alistair Francis <alistair.francis@wdc.com>, Bob Eshleman <bobbyeshleman@gmail.com>, Connor Davis <connojdavis@gmail.com>, Andrew Cooper <andrew.cooper3@citrix.com>, George Dunlap <george.dunlap@citrix.com>, Jan Beulich <jbeulich@suse.com>, Julien Grall <julien@xen.org>, Stefano Stabellini <sstabellini@kernel.org>, Wei Liu <wl@xen.org> Subject: [PATCH v2 38/39] xen/riscv: enable full Xen build Date: Fri, 24 Nov 2023 12:30:58 +0200 Message-ID: <c56be97d180b996d431eb97e7b0a23ac28798996.1700761381.git.oleksii.kurochko@gmail.com> In-Reply-To: <cover.1700761381.git.oleksii.kurochko@gmail.com> References: <cover.1700761381.git.oleksii.kurochko@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	Enable build of full Xen for RISC-V \| expand [v2,00/39] Enable build of full Xen for RISC-V [v2,01/39] xen/riscv: disable unnecessary configs [v2,02/39] xen/riscv: use some asm-generic headers [v2,03/39] xen/riscv:introduce asm/byteorder.h [v2,04/39] xen/riscv: add public arch-riscv.h [v2,05/39] xen/riscv: introduce spinlock.h [v2,06/39] xen/riscv: introduce fence.h [v2,07/39] xen/riscv: introduce arch-riscv/hvm/save.h [v2,08/39] xen/riscv: introduce asm/cpufeature.h [v2,09/39] xen/riscv: introduce asm/guest_atomics.h [v2,10/39] xen/riscv: introduce asm/iommu.h [v2,11/39] xen/riscv: introduce asm/nospec.h [v2,12/39] xen/riscv: introduce asm/setup.h [v2,13/39] xen/riscv: introduce asm/system.h [v2,14/39] xen/riscv: introduce bitops.h [v2,15/39] xen/riscv: introduce flushtlb.h [v2,16/39] xen/riscv: introduce asm/smp.h [v2,17/39] xen/riscv: introduce asm/atomic.h [v2,18/39] xen/riscv: introduce cmpxchg.h [v2,19/39] xen/riscv: introduce asm/io.h [v2,20/39] xen/riscv: define bug frame tables in xen.lds.S [v2,21/39] xen/riscv: introduce bit operations [v2,22/39] xen/riscv: introduce asm/domain.h [v2,23/39] xen/riscv: introduce asm/guest_access.h [v2,24/39] xen/riscv: introduce asm/irq.h [v2,25/39] xen/riscv: introduce asm/p2m.h [v2,26/39] xen/riscv: introduce asm/regs.h [v2,27/39] xen/riscv: introduce asm/time.h [v2,28/39] xen/riscv: introduce asm/event.h [v2,29/39] xen/riscv: add definition of __read_mostly [v2,30/39] xen/riscv: define an address of frame table [v2,31/39] xen/riscv: add required things to asm/current.h [v2,32/39] xen/riscv: add minimal stuff to asm/page.h to build full Xen [v2,33/39] xen/riscv: add minimal stuff to asm/processor.h to build full Xen [v2,34/39] xen: add RISCV support for pmu.h [v2,35/39] xen: add necessary headers to common to build full Xen for RISC-V [v2,36/39] xen/riscv: add minimal stuff to asm/mm.h to build full Xen [v2,37/39] xen/rirscv: add minimal amount of stubs to build full Xen [v2,38/39] xen/riscv: enable full Xen build [v2,39/39] xen: fix compilation issue of serial.c

Message ID

c56be97d180b996d431eb97e7b0a23ac28798996.1700761381.git.oleksii.kurochko@gmail.com (mailing list archive)

State

Superseded

Headers

Errors-To: xen-devel-bounces@lists.xenproject.org
Precedence: list
Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org>
From: Oleksii Kurochko <oleksii.kurochko@gmail.com>
To: xen-devel@lists.xenproject.org
Cc: Oleksii Kurochko <oleksii.kurochko@gmail.com>,
	Alistair Francis <alistair.francis@wdc.com>,
	Bob Eshleman <bobbyeshleman@gmail.com>,
	Connor Davis <connojdavis@gmail.com>,
	Andrew Cooper <andrew.cooper3@citrix.com>,
	George Dunlap <george.dunlap@citrix.com>,
	Jan Beulich <jbeulich@suse.com>,
	Julien Grall <julien@xen.org>,
	Stefano Stabellini <sstabellini@kernel.org>,
	Wei Liu <wl@xen.org>
Subject: [PATCH v2 38/39] xen/riscv: enable full Xen build
Date: Fri, 24 Nov 2023 12:30:58 +0200
Message-ID: 
 <c56be97d180b996d431eb97e7b0a23ac28798996.1700761381.git.oleksii.kurochko@gmail.com>
In-Reply-To: <cover.1700761381.git.oleksii.kurochko@gmail.com>
References: <cover.1700761381.git.oleksii.kurochko@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

Enable build of full Xen for RISC-V | expand

Commit Message

Oleksii Kurochko Nov. 24, 2023, 10:30 a.m. UTC

Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
---
Changes in V2:
 - Nothing changed. Only rebase.
---
 xen/arch/riscv/Makefile                 | 16 +++++++++++++++-
 xen/arch/riscv/arch.mk                  |  4 ----
 xen/arch/riscv/configs/tiny64_defconfig |  1 -
 3 files changed, 15 insertions(+), 6 deletions(-)

Comments

Jan Beulich Dec. 18, 2023, 3:28 p.m. UTC | #1

On 24.11.2023 11:30, Oleksii Kurochko wrote:
> Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>

Reviewed-by: Jan Beulich <jbeulich@suse.com>
with ...

> --- a/xen/arch/riscv/configs/tiny64_defconfig
> +++ b/xen/arch/riscv/configs/tiny64_defconfig
> @@ -24,7 +24,6 @@
>  # CONFIG_COVERAGE is not set
>  # CONFIG_UBSAN is not set
>  # CONFIG_NEEDS_LIBELF is not set
> -
>  CONFIG_RISCV_64=y
>  CONFIG_DEBUG=y
>  CONFIG_DEBUG_INFO=y

... this unrelated (and perhaps even unhelpful) change dropped.

Jan

diff --git a/xen/arch/riscv/Makefile b/xen/arch/riscv/Makefile
index 50c09469a0..9c02cb0ccf 100644
--- a/xen/arch/riscv/Makefile
+++ b/xen/arch/riscv/Makefile
@@ -12,10 +12,24 @@  $(TARGET): $(TARGET)-syms
 	$(OBJCOPY) -O binary -S $< $@
 
 $(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds
-	$(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) -o $@
+	$(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< \
+	    $(objtree)/common/symbols-dummy.o -o $(dot-target).0
+	$(NM) -pa --format=sysv $(dot-target).0 \
+		| $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
+		> $(dot-target).0.S
+	$(MAKE) $(build)=$(@D) $(dot-target).0.o
+	$(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< \
+	    $(dot-target).0.o -o $(dot-target).1
+	$(NM) -pa --format=sysv $(dot-target).1 \
+		| $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
+		> $(dot-target).1.S
+	$(MAKE) $(build)=$(@D) $(dot-target).1.o
+	$(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \
+	    $(dot-target).1.o -o $@
 	$(NM) -pa --format=sysv $@ \
 		| $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \
 		> $@.map
+	rm -f $(@D)/.$(@F).[0-9]*
 
 $(obj)/xen.lds: $(src)/xen.lds.S FORCE
 	$(call if_changed_dep,cpp_lds_S)
diff --git a/xen/arch/riscv/arch.mk b/xen/arch/riscv/arch.mk
index 8403f96b6f..12b1673fae 100644
--- a/xen/arch/riscv/arch.mk
+++ b/xen/arch/riscv/arch.mk
@@ -13,7 +13,3 @@  riscv-march-$(CONFIG_RISCV_ISA_C)       := $(riscv-march-y)c
 # -mcmodel=medlow would force Xen into the lower half.
 
 CFLAGS += -march=$(riscv-march-y) -mstrict-align -mcmodel=medany
-
-# TODO: Drop override when more of the build is working
-override ALL_OBJS-y = arch/$(SRCARCH)/built_in.o
-override ALL_LIBS-y =
diff --git a/xen/arch/riscv/configs/tiny64_defconfig b/xen/arch/riscv/configs/tiny64_defconfig
index ce37c5ae00..4b488180ae 100644
--- a/xen/arch/riscv/configs/tiny64_defconfig
+++ b/xen/arch/riscv/configs/tiny64_defconfig
@@ -24,7 +24,6 @@ 
 # CONFIG_COVERAGE is not set
 # CONFIG_UBSAN is not set
 # CONFIG_NEEDS_LIBELF is not set
-
 CONFIG_RISCV_64=y
 CONFIG_DEBUG=y
 CONFIG_DEBUG_INFO=y

[v2,38/39] xen/riscv: enable full Xen build

Commit Message

Comments

Patch