* [PATCH 1/2] KVM: arm64: nvhe: rename confusing obj-y
@ 2022-06-13 9:20 ` Masahiro Yamada
0 siblings, 0 replies; 9+ messages in thread
From: Masahiro Yamada @ 2022-06-13 9:20 UTC (permalink / raw)
To: Marc Zyngier, James Morse, Alexandru Elisei, Suzuki K Poulose,
linux-arm-kernel, kvmarm
Cc: Catalin Marinas, Masahiro Yamada, Kefeng Wang, linux-kernel, Will Deacon
This Makefile appends several objects to obj-y from line 15, but none
of them is linked to vmlinux in an ordinary way.
obj-y is overwritten at line 30:
obj-y := kvm_nvhe.o
So, kvm_nvhe.o is the only object directly linked to vmlinux.
Replace the abused obj-y with hyp-obj-y.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
arch/arm64/kvm/hyp/nvhe/Makefile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile
index f9fe4dc21b1f..3c6d3a18171c 100644
--- a/arch/arm64/kvm/hyp/nvhe/Makefile
+++ b/arch/arm64/kvm/hyp/nvhe/Makefile
@@ -12,13 +12,13 @@ HOST_EXTRACFLAGS += -I$(objtree)/include
lib-objs := clear_page.o copy_page.o memcpy.o memset.o
lib-objs := $(addprefix ../../../lib/, $(lib-objs))
-obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o host.o \
+hyp-obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o host.o \
hyp-main.o hyp-smp.o psci-relay.o early_alloc.o page_alloc.o \
cache.o setup.o mm.o mem_protect.o sys_regs.o pkvm.o
-obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \
+hyp-obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \
../fpsimd.o ../hyp-entry.o ../exception.o ../pgtable.o
-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
-obj-y += $(lib-objs)
+hyp-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
+hyp-obj-y += $(lib-objs)
##
## Build rules for compiling nVHE hyp code
@@ -26,7 +26,7 @@ obj-y += $(lib-objs)
## file containing all nVHE hyp code and data.
##
-hyp-obj := $(patsubst %.o,%.nvhe.o,$(obj-y))
+hyp-obj := $(patsubst %.o,%.nvhe.o,$(hyp-obj-y))
obj-y := kvm_nvhe.o
extra-y := $(hyp-obj) kvm_nvhe.tmp.o kvm_nvhe.rel.o hyp.lds hyp-reloc.S hyp-reloc.o
--
2.32.0
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 1/2] KVM: arm64: nvhe: rename confusing obj-y
@ 2022-06-13 9:20 ` Masahiro Yamada
0 siblings, 0 replies; 9+ messages in thread
From: Masahiro Yamada @ 2022-06-13 9:20 UTC (permalink / raw)
To: Marc Zyngier, James Morse, Alexandru Elisei, Suzuki K Poulose,
linux-arm-kernel, kvmarm
Cc: Masahiro Yamada, Andrew Jones, Catalin Marinas, Fuad Tabba,
Kefeng Wang, Keir Fraser, Will Deacon, Zenghui Yu, linux-kernel
This Makefile appends several objects to obj-y from line 15, but none
of them is linked to vmlinux in an ordinary way.
obj-y is overwritten at line 30:
obj-y := kvm_nvhe.o
So, kvm_nvhe.o is the only object directly linked to vmlinux.
Replace the abused obj-y with hyp-obj-y.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
arch/arm64/kvm/hyp/nvhe/Makefile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile
index f9fe4dc21b1f..3c6d3a18171c 100644
--- a/arch/arm64/kvm/hyp/nvhe/Makefile
+++ b/arch/arm64/kvm/hyp/nvhe/Makefile
@@ -12,13 +12,13 @@ HOST_EXTRACFLAGS += -I$(objtree)/include
lib-objs := clear_page.o copy_page.o memcpy.o memset.o
lib-objs := $(addprefix ../../../lib/, $(lib-objs))
-obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o host.o \
+hyp-obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o host.o \
hyp-main.o hyp-smp.o psci-relay.o early_alloc.o page_alloc.o \
cache.o setup.o mm.o mem_protect.o sys_regs.o pkvm.o
-obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \
+hyp-obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \
../fpsimd.o ../hyp-entry.o ../exception.o ../pgtable.o
-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
-obj-y += $(lib-objs)
+hyp-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
+hyp-obj-y += $(lib-objs)
##
## Build rules for compiling nVHE hyp code
@@ -26,7 +26,7 @@ obj-y += $(lib-objs)
## file containing all nVHE hyp code and data.
##
-hyp-obj := $(patsubst %.o,%.nvhe.o,$(obj-y))
+hyp-obj := $(patsubst %.o,%.nvhe.o,$(hyp-obj-y))
obj-y := kvm_nvhe.o
extra-y := $(hyp-obj) kvm_nvhe.tmp.o kvm_nvhe.rel.o hyp.lds hyp-reloc.S hyp-reloc.o
--
2.32.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] KVM: arm64: nvhe: add intermediates to 'targets' instead of extra-y
2022-06-13 9:20 ` Masahiro Yamada
(?)
@ 2022-06-13 9:20 ` Masahiro Yamada
-1 siblings, 0 replies; 9+ messages in thread
From: Masahiro Yamada @ 2022-06-13 9:20 UTC (permalink / raw)
To: Marc Zyngier, James Morse, Alexandru Elisei, Suzuki K Poulose,
linux-arm-kernel, kvmarm
Cc: Masahiro Yamada, Andrew Jones, Catalin Marinas, Fuad Tabba,
Kefeng Wang, Keir Fraser, Will Deacon, Zenghui Yu, linux-kernel
These are generated on demand. Adding them to 'targets' is enough.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
arch/arm64/kvm/hyp/nvhe/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile
index 3c6d3a18171c..a2b0d043dddf 100644
--- a/arch/arm64/kvm/hyp/nvhe/Makefile
+++ b/arch/arm64/kvm/hyp/nvhe/Makefile
@@ -28,7 +28,7 @@ hyp-obj-y += $(lib-objs)
hyp-obj := $(patsubst %.o,%.nvhe.o,$(hyp-obj-y))
obj-y := kvm_nvhe.o
-extra-y := $(hyp-obj) kvm_nvhe.tmp.o kvm_nvhe.rel.o hyp.lds hyp-reloc.S hyp-reloc.o
+targets += $(hyp-obj) kvm_nvhe.tmp.o kvm_nvhe.rel.o hyp.lds hyp-reloc.S hyp-reloc.o
# 1) Compile all source files to `.nvhe.o` object files. The file extension
# avoids file name clashes for files shared with VHE.
--
2.32.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] KVM: arm64: nvhe: add intermediates to 'targets' instead of extra-y
@ 2022-06-13 9:20 ` Masahiro Yamada
0 siblings, 0 replies; 9+ messages in thread
From: Masahiro Yamada @ 2022-06-13 9:20 UTC (permalink / raw)
To: Marc Zyngier, James Morse, Alexandru Elisei, Suzuki K Poulose,
linux-arm-kernel, kvmarm
Cc: Catalin Marinas, Masahiro Yamada, Kefeng Wang, linux-kernel, Will Deacon
These are generated on demand. Adding them to 'targets' is enough.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
arch/arm64/kvm/hyp/nvhe/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile
index 3c6d3a18171c..a2b0d043dddf 100644
--- a/arch/arm64/kvm/hyp/nvhe/Makefile
+++ b/arch/arm64/kvm/hyp/nvhe/Makefile
@@ -28,7 +28,7 @@ hyp-obj-y += $(lib-objs)
hyp-obj := $(patsubst %.o,%.nvhe.o,$(hyp-obj-y))
obj-y := kvm_nvhe.o
-extra-y := $(hyp-obj) kvm_nvhe.tmp.o kvm_nvhe.rel.o hyp.lds hyp-reloc.S hyp-reloc.o
+targets += $(hyp-obj) kvm_nvhe.tmp.o kvm_nvhe.rel.o hyp.lds hyp-reloc.S hyp-reloc.o
# 1) Compile all source files to `.nvhe.o` object files. The file extension
# avoids file name clashes for files shared with VHE.
--
2.32.0
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] KVM: arm64: nvhe: add intermediates to 'targets' instead of extra-y
@ 2022-06-13 9:20 ` Masahiro Yamada
0 siblings, 0 replies; 9+ messages in thread
From: Masahiro Yamada @ 2022-06-13 9:20 UTC (permalink / raw)
To: Marc Zyngier, James Morse, Alexandru Elisei, Suzuki K Poulose,
linux-arm-kernel, kvmarm
Cc: Masahiro Yamada, Andrew Jones, Catalin Marinas, Fuad Tabba,
Kefeng Wang, Keir Fraser, Will Deacon, Zenghui Yu, linux-kernel
These are generated on demand. Adding them to 'targets' is enough.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
arch/arm64/kvm/hyp/nvhe/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile
index 3c6d3a18171c..a2b0d043dddf 100644
--- a/arch/arm64/kvm/hyp/nvhe/Makefile
+++ b/arch/arm64/kvm/hyp/nvhe/Makefile
@@ -28,7 +28,7 @@ hyp-obj-y += $(lib-objs)
hyp-obj := $(patsubst %.o,%.nvhe.o,$(hyp-obj-y))
obj-y := kvm_nvhe.o
-extra-y := $(hyp-obj) kvm_nvhe.tmp.o kvm_nvhe.rel.o hyp.lds hyp-reloc.S hyp-reloc.o
+targets += $(hyp-obj) kvm_nvhe.tmp.o kvm_nvhe.rel.o hyp.lds hyp-reloc.S hyp-reloc.o
# 1) Compile all source files to `.nvhe.o` object files. The file extension
# avoids file name clashes for files shared with VHE.
--
2.32.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] KVM: arm64: nvhe: rename confusing obj-y
2022-06-13 9:20 ` Masahiro Yamada
(?)
@ 2022-06-29 9:55 ` Marc Zyngier
-1 siblings, 0 replies; 9+ messages in thread
From: Marc Zyngier @ 2022-06-29 9:55 UTC (permalink / raw)
To: James Morse, linux-arm-kernel, Alexandru Elisei, Masahiro Yamada,
kvmarm, Suzuki K Poulose
Cc: Kefeng Wang, Will Deacon, Catalin Marinas, Zenghui Yu,
linux-kernel, Keir Fraser, Andrew Jones, Fuad Tabba
On Mon, 13 Jun 2022 18:20:25 +0900, Masahiro Yamada wrote:
> This Makefile appends several objects to obj-y from line 15, but none
> of them is linked to vmlinux in an ordinary way.
>
> obj-y is overwritten at line 30:
>
> obj-y := kvm_nvhe.o
>
> [...]
Applied to next, thanks!
[1/2] KVM: arm64: nvhe: rename confusing obj-y
commit: 3d5697f95e492899d0bf813cbab2af03dde77fa2
[2/2] KVM: arm64: nvhe: add intermediates to 'targets' instead of extra-y
commit: 40c56bd8e1aea7929a09f1d4d68ac3221bb142c4
Cheers,
M.
--
Marc Zyngier <maz@kernel.org>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/2] KVM: arm64: nvhe: rename confusing obj-y
@ 2022-06-29 9:55 ` Marc Zyngier
0 siblings, 0 replies; 9+ messages in thread
From: Marc Zyngier @ 2022-06-29 9:55 UTC (permalink / raw)
To: James Morse, linux-arm-kernel, Alexandru Elisei, Masahiro Yamada,
kvmarm, Suzuki K Poulose
Cc: Kefeng Wang, Will Deacon, Catalin Marinas, Zenghui Yu,
linux-kernel, Keir Fraser, Andrew Jones, Fuad Tabba
On Mon, 13 Jun 2022 18:20:25 +0900, Masahiro Yamada wrote:
> This Makefile appends several objects to obj-y from line 15, but none
> of them is linked to vmlinux in an ordinary way.
>
> obj-y is overwritten at line 30:
>
> obj-y := kvm_nvhe.o
>
> [...]
Applied to next, thanks!
[1/2] KVM: arm64: nvhe: rename confusing obj-y
commit: 3d5697f95e492899d0bf813cbab2af03dde77fa2
[2/2] KVM: arm64: nvhe: add intermediates to 'targets' instead of extra-y
commit: 40c56bd8e1aea7929a09f1d4d68ac3221bb142c4
Cheers,
M.
--
Marc Zyngier <maz@kernel.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/2] KVM: arm64: nvhe: rename confusing obj-y
@ 2022-06-29 9:55 ` Marc Zyngier
0 siblings, 0 replies; 9+ messages in thread
From: Marc Zyngier @ 2022-06-29 9:55 UTC (permalink / raw)
To: James Morse, linux-arm-kernel, Alexandru Elisei, Masahiro Yamada,
kvmarm, Suzuki K Poulose
Cc: Kefeng Wang, Andrew Jones, Catalin Marinas, linux-kernel, Will Deacon
On Mon, 13 Jun 2022 18:20:25 +0900, Masahiro Yamada wrote:
> This Makefile appends several objects to obj-y from line 15, but none
> of them is linked to vmlinux in an ordinary way.
>
> obj-y is overwritten at line 30:
>
> obj-y := kvm_nvhe.o
>
> [...]
Applied to next, thanks!
[1/2] KVM: arm64: nvhe: rename confusing obj-y
commit: 3d5697f95e492899d0bf813cbab2af03dde77fa2
[2/2] KVM: arm64: nvhe: add intermediates to 'targets' instead of extra-y
commit: 40c56bd8e1aea7929a09f1d4d68ac3221bb142c4
Cheers,
M.
--
Marc Zyngier <maz@kernel.org>
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 9+ messages in thread