* [PATCH v2] KVM: arm64: selftests: Clean up the GIC[D,R]_BASE_GPA
@ 2023-11-15 15:34 Shaoqin Huang
2023-11-15 15:41 ` Oliver Upton
0 siblings, 1 reply; 3+ messages in thread
From: Shaoqin Huang @ 2023-11-15 15:34 UTC (permalink / raw)
To: kvm, kvmarm
Cc: Shaoqin Huang, Marc Zyngier, Oliver Upton, James Morse,
Suzuki K Poulose, Zenghui Yu, Paolo Bonzini, Shuah Khan,
linux-arm-kernel, linux-kselftest, linux-kernel
The GIC[D,R]_BASE_GPA has been defined in multiple files with the same
value, define it in one place to make the code clean.
Signed-off-by: Shaoqin Huang <shahuang@redhat.com>
---
v1->v2:
- Clean up the vpmu_counter_access.c.
---
tools/testing/selftests/kvm/aarch64/arch_timer.c | 3 ---
tools/testing/selftests/kvm/aarch64/vgic_irq.c | 3 ---
tools/testing/selftests/kvm/aarch64/vpmu_counter_access.c | 3 ---
tools/testing/selftests/kvm/dirty_log_perf_test.c | 3 ---
tools/testing/selftests/kvm/include/aarch64/vgic.h | 3 +++
5 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/tools/testing/selftests/kvm/aarch64/arch_timer.c b/tools/testing/selftests/kvm/aarch64/arch_timer.c
index 274b8465b42a..818854007bfd 100644
--- a/tools/testing/selftests/kvm/aarch64/arch_timer.c
+++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c
@@ -59,9 +59,6 @@ static struct test_args test_args = {
#define msecs_to_usecs(msec) ((msec) * 1000LL)
-#define GICD_BASE_GPA 0x8000000ULL
-#define GICR_BASE_GPA 0x80A0000ULL
-
enum guest_stage {
GUEST_STAGE_VTIMER_CVAL = 1,
GUEST_STAGE_VTIMER_TVAL,
diff --git a/tools/testing/selftests/kvm/aarch64/vgic_irq.c b/tools/testing/selftests/kvm/aarch64/vgic_irq.c
index 2e64b4856e38..a48aff110fb6 100644
--- a/tools/testing/selftests/kvm/aarch64/vgic_irq.c
+++ b/tools/testing/selftests/kvm/aarch64/vgic_irq.c
@@ -19,9 +19,6 @@
#include "gic_v3.h"
#include "vgic.h"
-#define GICD_BASE_GPA 0x08000000ULL
-#define GICR_BASE_GPA 0x080A0000ULL
-
/*
* Stores the user specified args; it's passed to the guest and to every test
* function.
diff --git a/tools/testing/selftests/kvm/aarch64/vpmu_counter_access.c b/tools/testing/selftests/kvm/aarch64/vpmu_counter_access.c
index 5ea78986e665..325a8ead0660 100644
--- a/tools/testing/selftests/kvm/aarch64/vpmu_counter_access.c
+++ b/tools/testing/selftests/kvm/aarch64/vpmu_counter_access.c
@@ -421,9 +421,6 @@ static void guest_code(uint64_t expected_pmcr_n)
GUEST_DONE();
}
-#define GICD_BASE_GPA 0x8000000ULL
-#define GICR_BASE_GPA 0x80A0000ULL
-
/* Create a VM that has one vCPU with PMUv3 configured. */
static void create_vpmu_vm(void *guest_code)
{
diff --git a/tools/testing/selftests/kvm/dirty_log_perf_test.c b/tools/testing/selftests/kvm/dirty_log_perf_test.c
index d374dbcf9a53..4971e8f77a0a 100644
--- a/tools/testing/selftests/kvm/dirty_log_perf_test.c
+++ b/tools/testing/selftests/kvm/dirty_log_perf_test.c
@@ -22,9 +22,6 @@
#ifdef __aarch64__
#include "aarch64/vgic.h"
-#define GICD_BASE_GPA 0x8000000ULL
-#define GICR_BASE_GPA 0x80A0000ULL
-
static int gic_fd;
static void arch_setup_vm(struct kvm_vm *vm, unsigned int nr_vcpus)
diff --git a/tools/testing/selftests/kvm/include/aarch64/vgic.h b/tools/testing/selftests/kvm/include/aarch64/vgic.h
index 0ac6f05c63f9..9dbb342fd808 100644
--- a/tools/testing/selftests/kvm/include/aarch64/vgic.h
+++ b/tools/testing/selftests/kvm/include/aarch64/vgic.h
@@ -33,4 +33,7 @@ void kvm_irq_write_isactiver(int gic_fd, uint32_t intid, struct kvm_vcpu *vcpu);
#define KVM_IRQCHIP_NUM_PINS (1020 - 32)
+#define GICD_BASE_GPA 0x08000000ULL
+#define GICR_BASE_GPA 0x080A0000ULL
+
#endif // SELFTEST_KVM_VGIC_H
--
2.40.1
_______________________________________________
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] 3+ messages in thread
* Re: [PATCH v2] KVM: arm64: selftests: Clean up the GIC[D,R]_BASE_GPA
2023-11-15 15:34 [PATCH v2] KVM: arm64: selftests: Clean up the GIC[D,R]_BASE_GPA Shaoqin Huang
@ 2023-11-15 15:41 ` Oliver Upton
2023-11-16 9:05 ` Shaoqin Huang
0 siblings, 1 reply; 3+ messages in thread
From: Oliver Upton @ 2023-11-15 15:41 UTC (permalink / raw)
To: Shaoqin Huang
Cc: kvm, kvmarm, Marc Zyngier, James Morse, Suzuki K Poulose,
Zenghui Yu, Paolo Bonzini, Shuah Khan, linux-arm-kernel,
linux-kselftest, linux-kernel
On Wed, Nov 15, 2023 at 10:34:48AM -0500, Shaoqin Huang wrote:
> The GIC[D,R]_BASE_GPA has been defined in multiple files with the same
> value, define it in one place to make the code clean.
>
> Signed-off-by: Shaoqin Huang <shahuang@redhat.com>
Colton already posted a fix for this as part of his selftests series
https://lore.kernel.org/kvmarm/20231103192915.2209393-2-coltonlewis@google.com/
--
Thanks,
Oliver
_______________________________________________
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] 3+ messages in thread
* Re: [PATCH v2] KVM: arm64: selftests: Clean up the GIC[D,R]_BASE_GPA
2023-11-15 15:41 ` Oliver Upton
@ 2023-11-16 9:05 ` Shaoqin Huang
0 siblings, 0 replies; 3+ messages in thread
From: Shaoqin Huang @ 2023-11-16 9:05 UTC (permalink / raw)
To: Oliver Upton
Cc: kvm, kvmarm, Marc Zyngier, James Morse, Suzuki K Poulose,
Zenghui Yu, Paolo Bonzini, Shuah Khan, linux-arm-kernel,
linux-kselftest, linux-kernel
On 11/15/23 23:41, Oliver Upton wrote:
> On Wed, Nov 15, 2023 at 10:34:48AM -0500, Shaoqin Huang wrote:
>> The GIC[D,R]_BASE_GPA has been defined in multiple files with the same
>> value, define it in one place to make the code clean.
>>
>> Signed-off-by: Shaoqin Huang <shahuang@redhat.com>
>
> Colton already posted a fix for this as part of his selftests series
>
> https://lore.kernel.org/kvmarm/20231103192915.2209393-2-coltonlewis@google.com/
>
I see. Thanks for notification.
--
Shaoqin
_______________________________________________
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] 3+ messages in thread
end of thread, other threads:[~2023-11-16 9:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-15 15:34 [PATCH v2] KVM: arm64: selftests: Clean up the GIC[D,R]_BASE_GPA Shaoqin Huang
2023-11-15 15:41 ` Oliver Upton
2023-11-16 9:05 ` Shaoqin Huang
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).