From patchwork Tue Feb 13 09:42:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 200306 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp429104dyb; Tue, 13 Feb 2024 01:49:43 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWXYIwOr03mwagyl4NxlbtXag+RavQsdO7WnPPLeVG/q1G127/G1G+3N3e+HI4k/BXYaGVFmJzldfFBi1GBA5UWEo6qog== X-Google-Smtp-Source: AGHT+IG/jmHn9vdDylvBgNmTbA5ZU4VH4yihZVBbTXPHd2t8gGqwv8Pk2xw+e+Rg2IY5ZjXSNZIi X-Received: by 2002:a05:620a:5659:b0:785:c9fc:29b5 with SMTP id vw25-20020a05620a565900b00785c9fc29b5mr3227530qkn.5.1707817783362; Tue, 13 Feb 2024 01:49:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707817783; cv=pass; d=google.com; s=arc-20160816; b=IU4JCNqY+/ItvnwXXqel05vS8uSxhdo0nfN6nNGYK7tivPYPcM0mMEIgLYtA8qZ8l+ y3L2LCkG1L5yy3w0X/C5zEun69GECpDWfOsaoUhiFkNTEo38eiRzN3jDa7Ksyf82qrbo NV9r9ccSAYg4HcCng58mTkKTzQlvHPB2l0zPfI7RoGvpzoFKhWL+n47p2Gzgvj6mPv4z yZ/Xp9aSN4neoZEQ7kQY1nCBdokg4DEPrF4zJP7CC3rZvqESmG/Zxlc4jT9hUaaum5rJ AH4auJkgxwfaWTHWdQPUZlfe7w8TuzRmrYEyq9yqFjygfpxrYYGyKpi/hb2FDV4xfy9R eVug== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=i+nhnpV9cTa5T5zRVWJVPTwjU5zRG8qikjP97n6jlxI=; fh=fg8BUbepVm6phOz8WMuChFWwXJSQOTCPHnFOc0brygo=; b=IVopwTPWy25b6Ir0k397A35w1SVZvkdgULTEnddTwlpnWcWyOEffZI12yxDRM5BXQg Sitn0fe2dJWsVEG4yp3LYfj3hvkEiMSf8hGO+WFX/1HBdZVq4H0M96R5vaPzgdoPfe5O p4RvD4/g0CEbOQEmo+e4f+O/SGxusakttJu9Zy30xbiYihixodYg8SlXioohb7FuYsbC z9zII5rluD9s9jvAfj0GRSswdv8bFzFWWoVestcRH0bDHpdu+Fdo00Umu2EHctUUc7Bk f1zdyrsF/7XIueD9F9BOsFNd1H4LvNshpF1M1rrR/tobcnJQZKGHZfYn3dH3Y4GNXQ12 zPlQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=ue3reT56; arc=pass (i=1 spf=pass spfdomain=linux.dev dkim=pass dkdomain=linux.dev dmarc=pass fromdomain=linux.dev); spf=pass (google.com: domain of linux-kernel+bounces-63254-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63254-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev X-Forwarded-Encrypted: i=2; AJvYcCU8Tn0IP19ZcTkFoLK0yHYz4gCpvu06JJZmvUcGF0m3IvIeUQGiHbnMj0/iaZqm6SB7AW7/LjfDu4CBbRp0HL0Erl7IjQ== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id 2-20020a05620a04c200b00785af741c35si7944162qks.618.2024.02.13.01.49.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 01:49:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63254-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=ue3reT56; arc=pass (i=1 spf=pass spfdomain=linux.dev dkim=pass dkdomain=linux.dev dmarc=pass fromdomain=linux.dev); spf=pass (google.com: domain of linux-kernel+bounces-63254-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63254-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 17C041C2113D for ; Tue, 13 Feb 2024 09:49:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5938C4DA0A; Tue, 13 Feb 2024 09:42:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="ue3reT56" Received: from out-175.mta0.migadu.com (out-175.mta0.migadu.com [91.218.175.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1661D224D6 for ; Tue, 13 Feb 2024 09:42:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707817347; cv=none; b=RsnhS5SFbeLmofj71WDyN67R3bCeN2Fq8yltcGDG1GgKerc+KnLzUopXPFmux0dfmz8L5Txv3psX97oLHs6MWwup/mUObglXVYvnBwhUV2jJbV1wC34TKl2v9Yw1EJhMaPJCzGFQn2s+hVkEpOXlzhGCp9s8y1VSEut0n1rAJGY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707817347; c=relaxed/simple; bh=BBRquBRon3PszAnzHobEjBuxkFIZiY9f9MB60l15p2A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ui4jVmAQEkOUrh0khVFMBvNc8mVEByoRjPKDlW0Hf/YTLjkgZaw1AIOvRSofBEKUVxDfkIMSpqXScqCRIRXoiWQ66sby/FkjcFIFmD0M0iLR/YFFGeOeNksbT4Baqqfssz5xDzBO6CLup9tSO/qDHlZVpuOtwZH2H4QCUb00pxk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=ue3reT56; arc=none smtp.client-ip=91.218.175.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1707817344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i+nhnpV9cTa5T5zRVWJVPTwjU5zRG8qikjP97n6jlxI=; b=ue3reT56fVXCKJyglvSSqFfaWxf6VnGHRUKrI4CNwKYTCq1mx3ZedLMj7I6j/No9Pmtoct y0ceCEmMeibOZUMIqToQlUb7zPn2sD5RK/QSx6aHLGR6hA7LeX8Ui5+aZUt6X1AUtdctXB 7F83XFPIhmAamNtx76XTi0OBsk3QeSg= From: Oliver Upton To: kvmarm@lists.linux.dev Cc: kvm@vger.kernel.org, Marc Zyngier , James Morse , Suzuki K Poulose , Zenghui Yu , linux-kernel@vger.kernel.org, Oliver Upton Subject: [PATCH v2 21/23] KVM: selftests: Use MPIDR_HWID_BITMASK from cputype.h Date: Tue, 13 Feb 2024 09:42:02 +0000 Message-ID: <20240213094202.3962084-1-oliver.upton@linux.dev> In-Reply-To: <20240213093250.3960069-1-oliver.upton@linux.dev> References: <20240213093250.3960069-1-oliver.upton@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790776740281525230 X-GMAIL-MSGID: 1790776740281525230 No need for a home-rolled definition, just rely on the common header. Signed-off-by: Oliver Upton --- tools/testing/selftests/kvm/aarch64/psci_test.c | 2 ++ tools/testing/selftests/kvm/include/aarch64/processor.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/aarch64/psci_test.c b/tools/testing/selftests/kvm/aarch64/psci_test.c index 9b004905d1d3..9fa3578d47d5 100644 --- a/tools/testing/selftests/kvm/aarch64/psci_test.c +++ b/tools/testing/selftests/kvm/aarch64/psci_test.c @@ -13,7 +13,9 @@ #define _GNU_SOURCE +#include #include +#include #include "kvm_util.h" #include "processor.h" diff --git a/tools/testing/selftests/kvm/include/aarch64/processor.h b/tools/testing/selftests/kvm/include/aarch64/processor.h index cf20e44e86f2..94e8f1892754 100644 --- a/tools/testing/selftests/kvm/include/aarch64/processor.h +++ b/tools/testing/selftests/kvm/include/aarch64/processor.h @@ -58,8 +58,6 @@ MAIR_ATTRIDX(MAIR_ATTR_NORMAL, MT_NORMAL) | \ MAIR_ATTRIDX(MAIR_ATTR_NORMAL_WT, MT_NORMAL_WT)) -#define MPIDR_HWID_BITMASK (0xff00fffffful) - void aarch64_vcpu_setup(struct kvm_vcpu *vcpu, struct kvm_vcpu_init *init); struct kvm_vcpu *aarch64_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id, struct kvm_vcpu_init *init, void *guest_code);