From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A1AAC433F5 for ; Thu, 9 Sep 2021 13:45:09 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3ABC36120E for ; Thu, 9 Sep 2021 13:45:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3ABC36120E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=uMuNcG4Nz/NCm1ERyUDkY4fDKYl+/zY3l7jOKToRBiY=; b=gLic7600XjnvDP yPtvKgdqEjFEz/AOnL7uHo+VqcMBcICKGZNbD/+nWvvywdfH8Qc/QS77/ielrjn4UBxjMu+XfiO99 mRFnFJit6iTiUf7XK57KQro5FnyDO1zOipPQ8vnJJXxFKxuk0Mp+vzdcBh85AxMBgPxy3ns+bryx3 gDEuJtIkuPD0Up7GPWlDgwJuSaVHd1KqriDBmc5LTx6NO9ikgRtrsRmbAsBbCpb74AExlDx9RTbu3 cYOnoz4OA6vw00XIBLUI/rQ15SPyKXM+xRvjWcMokPhocdSvz7XyEurtoPLMx9xadoFAiwkzbO12Z 2CIAoPJ1lNTjvN17/MPg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mOKKT-009yYe-Nm; Thu, 09 Sep 2021 13:43:02 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mOKFw-009wez-OX for linux-arm-kernel@lists.infradead.org; Thu, 09 Sep 2021 13:38:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631194699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=mIEy4vU6He4mxZAyPtvCnUdjgbnJN+ExybQr7N/yeGA=; b=Y2d5hyFuuhjEU10iD+mnqVSvYfD9p76ViWMSMaSzxvfoRIoXk53NgobJNOWp5O9OdK4Frn 5c8Rrl2LpeerUCV9DvmKZTcR88ZhiJ/Aet7U8niwMQxbb4D3pFwXv52++PJJS8Tq4sCqzA zF6pQmnq+u8Usxlxx6xYAmejbN5hk6o= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-29-RtmMyUvVP2KJmP62w5ecJg-1; Thu, 09 Sep 2021 09:38:18 -0400 X-MC-Unique: RtmMyUvVP2KJmP62w5ecJg-1 Received: by mail-wr1-f70.google.com with SMTP id u2-20020adfdd42000000b001579f5d6779so517399wrm.8 for ; Thu, 09 Sep 2021 06:38:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=mIEy4vU6He4mxZAyPtvCnUdjgbnJN+ExybQr7N/yeGA=; b=ZccJ/s3TbYN8Ps/NBfDtl60IweUjZjaLKlpmOOhgvWRbDlAxzr363dMJArvTdhzcCn x0KU2OEct04OeAkB7dthSeTMgFQvDfM5ggm0jNX4XEiaUVTC6rQG9a50tNfjHyDxVAl3 3XBG5HSwlhqd3E980Qb23oSMH6UlWCl6fa+S3IGJraomEpcGg1+vv7caD2WFPboKWyNo nbHP1tU2uUykGa4uhCe5udj1klVG09HN+SbjM8h320CWOXivfHKHNnC5G9j2kZoJsA7O jpZEbLPOKK/rX2ZSq/fZUqNNEy6mkX+KW+alC+V6ZUODnEI7DPBNiekLnnuaC234kXKP CxWw== X-Gm-Message-State: AOAM532BsqfdVO5DeSMfuKXCzZAo9xVryrlQkoaL7r2Fsb+x2Ty0pCmv Jav4bvDZfxEvWtEIDuRgYxd7JXrXVJWQcf9n6+ncqg6CMWq3App99Jy3wFxxZ3p4HZgGmHRqCMD hgqKGu/76f884XygmcCi0lNZmmM6L+Nn8NGg= X-Received: by 2002:a05:6000:104e:: with SMTP id c14mr3672044wrx.130.1631194696913; Thu, 09 Sep 2021 06:38:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwYhoRxlLOsZDoSKadFGu59kuAkRGfRF4uFoBJKfJmIsL3BnpQOfPdzBLXTxUvq41MnfbZmzg== X-Received: by 2002:a05:6000:104e:: with SMTP id c14mr3672010wrx.130.1631194696645; Thu, 09 Sep 2021 06:38:16 -0700 (PDT) Received: from gator (cst2-174-132.cust.vodafone.cz. [31.30.174.132]) by smtp.gmail.com with ESMTPSA id t11sm1667345wmi.23.2021.09.09.06.38.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Sep 2021 06:38:16 -0700 (PDT) Date: Thu, 9 Sep 2021 15:38:14 +0200 From: Andrew Jones To: Raghavendra Rao Ananta Cc: Paolo Bonzini , Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , Catalin Marinas , Will Deacon , Peter Shier , Ricardo Koller , Oliver Upton , Reiji Watanabe , Jing Zhang , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: Re: [PATCH v4 17/18] KVM: arm64: selftests: Replace ARM64_SYS_REG with ARM64_SYS_KVM_REG Message-ID: <20210909133814.wsua43ya2erfw6gm@gator> References: <20210909013818.1191270-1-rananta@google.com> <20210909013818.1191270-18-rananta@google.com> MIME-Version: 1.0 In-Reply-To: <20210909013818.1191270-18-rananta@google.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=drjones@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210909_063820_926275_014FD8B8 X-CRM114-Status: GOOD ( 20.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Sep 09, 2021 at 01:38:17AM +0000, Raghavendra Rao Ananta wrote: > With the introduction of ARM64_SYS_KVM_REG, that takes the > system register encodings from sysreg.h directly, replace > all the users of ARM64_SYS_REG, relyiing on the encodings > created in processor.h, with ARM64_SYS_KVM_REG. > > Signed-off-by: Raghavendra Rao Ananta > --- > .../selftests/kvm/aarch64/debug-exceptions.c | 2 +- > .../selftests/kvm/aarch64/psci_cpu_on_test.c | 3 ++- > .../selftests/kvm/include/aarch64/processor.h | 10 ---------- > .../selftests/kvm/lib/aarch64/processor.c | 16 ++++++++-------- > 4 files changed, 11 insertions(+), 20 deletions(-) > > diff --git a/tools/testing/selftests/kvm/aarch64/debug-exceptions.c b/tools/testing/selftests/kvm/aarch64/debug-exceptions.c > index 11fd23e21cb4..b28b311f4dd7 100644 > --- a/tools/testing/selftests/kvm/aarch64/debug-exceptions.c > +++ b/tools/testing/selftests/kvm/aarch64/debug-exceptions.c > @@ -190,7 +190,7 @@ static int debug_version(struct kvm_vm *vm) > { > uint64_t id_aa64dfr0; > > - get_reg(vm, VCPU_ID, ARM64_SYS_REG(ID_AA64DFR0_EL1), &id_aa64dfr0); > + get_reg(vm, VCPU_ID, ARM64_SYS_KVM_REG(SYS_ID_AA64DFR0_EL1), &id_aa64dfr0); > return id_aa64dfr0 & 0xf; > } > > diff --git a/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c b/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c > index 018c269990e1..4c8aa7b8a65d 100644 > --- a/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c > +++ b/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c > @@ -91,7 +91,8 @@ int main(void) > init.features[0] |= (1 << KVM_ARM_VCPU_POWER_OFF); > aarch64_vcpu_add_default(vm, VCPU_ID_TARGET, &init, guest_main); > > - get_reg(vm, VCPU_ID_TARGET, ARM64_SYS_REG(MPIDR_EL1), &target_mpidr); > + get_reg(vm, VCPU_ID_TARGET, > + ARM64_SYS_KVM_REG(SYS_MPIDR_EL1), &target_mpidr); nit: I'd just leave this on one line. We don't mind long lines in this part of town. > vcpu_args_set(vm, VCPU_ID_SOURCE, 1, target_mpidr & MPIDR_HWID_BITMASK); > vcpu_run(vm, VCPU_ID_SOURCE); > > diff --git a/tools/testing/selftests/kvm/include/aarch64/processor.h b/tools/testing/selftests/kvm/include/aarch64/processor.h > index 150f63101f4c..ee81dd3db516 100644 > --- a/tools/testing/selftests/kvm/include/aarch64/processor.h > +++ b/tools/testing/selftests/kvm/include/aarch64/processor.h > @@ -16,16 +16,6 @@ > #define ARM64_CORE_REG(x) (KVM_REG_ARM64 | KVM_REG_SIZE_U64 | \ > KVM_REG_ARM_CORE | KVM_REG_ARM_CORE_REG(x)) > > -#define CPACR_EL1 3, 0, 1, 0, 2 > -#define TCR_EL1 3, 0, 2, 0, 2 > -#define MAIR_EL1 3, 0, 10, 2, 0 > -#define MPIDR_EL1 3, 0, 0, 0, 5 > -#define TTBR0_EL1 3, 0, 2, 0, 0 > -#define SCTLR_EL1 3, 0, 1, 0, 0 > -#define VBAR_EL1 3, 0, 12, 0, 0 > - > -#define ID_AA64DFR0_EL1 3, 0, 0, 5, 0 > - > /* > * ARM64_SYS_KVM_REG(sys_reg_id): Helper macro to convert > * SYS_* register definitions in sysreg.h to use in KVM > diff --git a/tools/testing/selftests/kvm/lib/aarch64/processor.c b/tools/testing/selftests/kvm/lib/aarch64/processor.c > index 9844b62227b1..d7b89aa092f5 100644 > --- a/tools/testing/selftests/kvm/lib/aarch64/processor.c > +++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c > @@ -240,10 +240,10 @@ void aarch64_vcpu_setup(struct kvm_vm *vm, int vcpuid, struct kvm_vcpu_init *ini > * Enable FP/ASIMD to avoid trapping when accessing Q0-Q15 > * registers, which the variable argument list macros do. > */ > - set_reg(vm, vcpuid, ARM64_SYS_REG(CPACR_EL1), 3 << 20); > + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_CPACR_EL1), 3 << 20); > > - get_reg(vm, vcpuid, ARM64_SYS_REG(SCTLR_EL1), &sctlr_el1); > - get_reg(vm, vcpuid, ARM64_SYS_REG(TCR_EL1), &tcr_el1); > + get_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_SCTLR_EL1), &sctlr_el1); > + get_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_TCR_EL1), &tcr_el1); > > switch (vm->mode) { > case VM_MODE_P52V48_4K: > @@ -281,10 +281,10 @@ void aarch64_vcpu_setup(struct kvm_vm *vm, int vcpuid, struct kvm_vcpu_init *ini > tcr_el1 |= (1 << 8) | (1 << 10) | (3 << 12); > tcr_el1 |= (64 - vm->va_bits) /* T0SZ */; > > - set_reg(vm, vcpuid, ARM64_SYS_REG(SCTLR_EL1), sctlr_el1); > - set_reg(vm, vcpuid, ARM64_SYS_REG(TCR_EL1), tcr_el1); > - set_reg(vm, vcpuid, ARM64_SYS_REG(MAIR_EL1), DEFAULT_MAIR_EL1); > - set_reg(vm, vcpuid, ARM64_SYS_REG(TTBR0_EL1), vm->pgd); > + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_SCTLR_EL1), sctlr_el1); > + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_TCR_EL1), tcr_el1); > + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_MAIR_EL1), DEFAULT_MAIR_EL1); > + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_TTBR0_EL1), vm->pgd); > } > > void vcpu_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid, uint8_t indent) > @@ -370,7 +370,7 @@ void vcpu_init_descriptor_tables(struct kvm_vm *vm, uint32_t vcpuid) > { > extern char vectors; > > - set_reg(vm, vcpuid, ARM64_SYS_REG(VBAR_EL1), (uint64_t)&vectors); > + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_VBAR_EL1), (uint64_t)&vectors); > } > > void route_exception(struct ex_regs *regs, int vector) > -- > 2.33.0.153.gba50c8fa24-goog > I also agree with Oliver that this patch may be squashed into the one that introduces ARM64_SYS_KVM_REG. Thanks, drew _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel