From patchwork Fri Jun 14 03:08:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 166768 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1506132ilk; Thu, 13 Jun 2019 20:13:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqw2FQn8ARvIEy2KHRyOAKVwIzs3c062vpo+/4UxKBptFP5Klyop5D4vgNavPRGjZ9nvzQV6 X-Received: by 2002:a17:902:e312:: with SMTP id cg18mr24146683plb.212.1560481995831; Thu, 13 Jun 2019 20:13:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560481995; cv=none; d=google.com; s=arc-20160816; b=wPMNuyNKJHE/vfL/ZrZJPh2wLaTkMDzm3INjFH+yebRV3zElDd1PS6m6ajUmqsf2o8 Y/B4SDP26qUz6cR24a/Hyh5Rfnn084u8FzdZ+uTYwdYfTw9sfmdf7fFgVNvYQxmjSw1P RrKIWSv2mz50VILpltnnPoYgZiDH98NmbkOBnpfmgZzhCE6GEcqeYWiO4bSsZq2gSNOB 3Fv5CKsm8VcJbFse3KlbgrTYDCNN/G09w+7NV9INRwyS4U8kSrt1BU0cfF8N4S0Jd9ck fUNM7Y4eLqZQlWKODBMWMuHyJ5sj2HiQ9XFD7Gc+nli5OxIGiq+qkXyadmWcR1LG5SZj /5wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=RBs1rUgoU6ONwGkddceY1nFBB7cQx3Xs99bBwFEL95E=; b=BkVLMfUj4FLolS3igp+SdYf3t4Iqg7DA6ETtzpTyKBafGn8OKyQQFrdk4XKSNloo6h nr7O1pP8as2pa3pRncTDglaBeZzTqnFN6YlYA+NnPP/Jdvgx61CV/YyR+r5u+N8IqVlb ylj1lHNktggED9PT8aGidqnSTy2z1ooF4YW0H6oVzOZyZMQyDe4vWCjkkuFiIw5x+opp L7YY8yGA7ToGFub7VFzXB3I+S3GfXaOfM55pvlYNpG4XzgzrTk3/F/7ZzyKirG6WG2kp EEfrHzb1oOLuQMb0eqc+ISJ9BGkER/NKT1cbVhTMZ8CGJoMD8HlSXov38YFMJhtX0qrk R9Bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Y+C3vCm4; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e8si1073936plb.420.2019.06.13.20.13.15; Thu, 13 Jun 2019 20:13:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Y+C3vCm4; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726028AbfFNDNP (ORCPT + 14 others); Thu, 13 Jun 2019 23:13:15 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:40845 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725819AbfFNDNO (ORCPT ); Thu, 13 Jun 2019 23:13:14 -0400 Received: by mail-pg1-f194.google.com with SMTP id d30so672774pgm.7 for ; Thu, 13 Jun 2019 20:13:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RBs1rUgoU6ONwGkddceY1nFBB7cQx3Xs99bBwFEL95E=; b=Y+C3vCm4FkAIC9ch5xg5mi8S62oaHgpJnjqQq+9lw8g9Xph7XUJlAmNDCc33ug39w6 e/FxICYL1v+gXJSPGpk4abMVGyBOrKwE/0zjP4smzzCzNga3q90iJtaLrxAMC1tz/wO4 fYKov71NsbdHsYB+kGPyzeMqqqn3qVMEdnwq5VGs/UawuNFTPwh0GTBWmOr8exKBwGM0 HCnGqmdUj/OrLoPiL3ABfRNC5FWKxQfoupQcwJe7fzwger9I++tW2np6m5KhLbY6oHqR D5K3XavaqFUz33yhK5eXM/BXTUiaxAip93SGy2tDEVN/C0lP2cPT0x1nl5fZuDHreUDV JC3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RBs1rUgoU6ONwGkddceY1nFBB7cQx3Xs99bBwFEL95E=; b=jGgIc8p+OiQ2zi+1ka4nvzB+KAuhao1VYxzsC8BWP7NajSWA7bG5pFPdTOzDujHxRR 92zkpdYAn7Drs3Dvps7HyB4zHjmx0SeWm4WYhf3dTyrjr+ybCooueooIIEZ6EpM0sJA3 cd89EwqDKKTX/YJ1HujeDUPk9hplrl8YK+gcga6eKkglyCaUU1+fQrKJxRcLM6AaEzBH qA+cPBcN7tMO0zXgp7C4/Ctdl8QFoY8l/0d3RaM571WDdTpGpg/OpOcUHQfH04KZpbxl /LdsiTOgKhR3RFCdGziJcX15VRGyuCQ0i9UlnjPNlyvReYJdL1Vv8fo1A1Wnf9U0QQEh fwNQ== X-Gm-Message-State: APjAAAVaBWlLqJxq73Xo4ACAVv7Rw5GvHmtXs/wnUlcNjpbup+sG7lV2 +QTIa8XmxT6l9ohZU5T/aqVtXg== X-Received: by 2002:a63:1617:: with SMTP id w23mr25538091pgl.183.1560481993805; Thu, 13 Jun 2019 20:13:13 -0700 (PDT) Received: from localhost ([122.172.66.84]) by smtp.gmail.com with ESMTPSA id f17sm1131479pgv.16.2019.06.13.20.13.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jun 2019 20:13:13 -0700 (PDT) From: Viresh Kumar To: linux-arm-kernel@lists.infradead.org, Julien Thierry Cc: Viresh Kumar , stable@vger.kernel.org, Catalin Marinas , Marc Zyngier , Mark Rutland , Will Deacon , Russell King , Vincent Guittot , mark.brown@arm.com Subject: [PATCH v4.4 30/45] arm/arm64: KVM: Consolidate the PSCI include files Date: Fri, 14 Jun 2019 08:38:13 +0530 Message-Id: <165e8628ae4e24397d1dcee69d10487d53a7df98.1560480942.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.21.0.rc0.269.g1a574e7a288b In-Reply-To: References: MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Rutland commit 1a2fb94e6a771ff94f4afa22497a4695187b820c upstream. As we're about to update the PSCI support, and because I'm lazy, let's move the PSCI include file to include/kvm so that both ARM architectures can find it. Acked-by: Christoffer Dall Tested-by: Ard Biesheuvel Signed-off-by: Marc Zyngier Signed-off-by: Catalin Marinas [ v4.4: account for files moved to virt/ upstream ] Signed-off-by: Viresh Kumar --- arch/arm/include/asm/kvm_psci.h | 27 ------------------- arch/arm/kvm/arm.c | 2 +- arch/arm/kvm/handle_exit.c | 2 +- arch/arm/kvm/psci.c | 3 ++- arch/arm64/kvm/handle_exit.c | 5 +++- .../asm/kvm_psci.h => include/kvm/arm_psci.h | 6 ++--- 6 files changed, 11 insertions(+), 34 deletions(-) delete mode 100644 arch/arm/include/asm/kvm_psci.h rename arch/arm64/include/asm/kvm_psci.h => include/kvm/arm_psci.h (89%) -- 2.21.0.rc0.269.g1a574e7a288b diff --git a/arch/arm/include/asm/kvm_psci.h b/arch/arm/include/asm/kvm_psci.h deleted file mode 100644 index 6bda945d31fa..000000000000 --- a/arch/arm/include/asm/kvm_psci.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2012 - ARM Ltd - * Author: Marc Zyngier - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __ARM_KVM_PSCI_H__ -#define __ARM_KVM_PSCI_H__ - -#define KVM_ARM_PSCI_0_1 1 -#define KVM_ARM_PSCI_0_2 2 - -int kvm_psci_version(struct kvm_vcpu *vcpu); -int kvm_psci_call(struct kvm_vcpu *vcpu); - -#endif /* __ARM_KVM_PSCI_H__ */ diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index d7bef2144760..96fa300cf581 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -28,6 +28,7 @@ #include #include #include +#include #define CREATE_TRACE_POINTS #include "trace.h" @@ -43,7 +44,6 @@ #include #include #include -#include #ifdef REQUIRES_VIRT __asm__(".arch_extension virt"); diff --git a/arch/arm/kvm/handle_exit.c b/arch/arm/kvm/handle_exit.c index 05b2f8294968..ed879e3238d3 100644 --- a/arch/arm/kvm/handle_exit.c +++ b/arch/arm/kvm/handle_exit.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include "trace.h" diff --git a/arch/arm/kvm/psci.c b/arch/arm/kvm/psci.c index 443db0c43d7c..b4acfec9b459 100644 --- a/arch/arm/kvm/psci.c +++ b/arch/arm/kvm/psci.c @@ -21,9 +21,10 @@ #include #include -#include #include +#include + #include /* diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index c43e0e100c11..5b7fb5ab9136 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -22,11 +22,14 @@ #include #include +#include + #include #include #include #include -#include +#include +#include #define CREATE_TRACE_POINTS #include "trace.h" diff --git a/arch/arm64/include/asm/kvm_psci.h b/include/kvm/arm_psci.h similarity index 89% rename from arch/arm64/include/asm/kvm_psci.h rename to include/kvm/arm_psci.h index bc39e557c56c..2042bb909474 100644 --- a/arch/arm64/include/asm/kvm_psci.h +++ b/include/kvm/arm_psci.h @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -#ifndef __ARM64_KVM_PSCI_H__ -#define __ARM64_KVM_PSCI_H__ +#ifndef __KVM_ARM_PSCI_H__ +#define __KVM_ARM_PSCI_H__ #define KVM_ARM_PSCI_0_1 1 #define KVM_ARM_PSCI_0_2 2 @@ -24,4 +24,4 @@ int kvm_psci_version(struct kvm_vcpu *vcpu); int kvm_psci_call(struct kvm_vcpu *vcpu); -#endif /* __ARM64_KVM_PSCI_H__ */ +#endif /* __KVM_ARM_PSCI_H__ */