From patchwork Thu Dec 7 17:06:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10100193 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 28D9260360 for ; Thu, 7 Dec 2017 17:07:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 139C2284DE for ; Thu, 7 Dec 2017 17:07:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 08820284F5; Thu, 7 Dec 2017 17:07:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0C13284CE for ; Thu, 7 Dec 2017 17:07:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756625AbdLGRHg (ORCPT ); Thu, 7 Dec 2017 12:07:36 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34008 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756336AbdLGRHe (ORCPT ); Thu, 7 Dec 2017 12:07:34 -0500 Received: by mail-wm0-f67.google.com with SMTP id y82so1449956wmg.1 for ; Thu, 07 Dec 2017 09:07:34 -0800 (PST) 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; bh=BSK7mAIz7KnNilqoZgVB7KW5CzHk3OIehikGC2EttjM=; b=f86jzO2Sk5+ZzwABWXRozEvNBY0n48H9jTijdpHfmVfkfyNW/XVxy4UkvUSfkT34u8 3BTdNjPvrVSsDzu7gg559B5cZAL8JWBbQYAeHA8JC46bBZdCJ3xkCESfKoYK4EyZRAXn iKr4gB96Gt35lTLAJxOEuuc92rWkft+X3q2fA= 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; bh=BSK7mAIz7KnNilqoZgVB7KW5CzHk3OIehikGC2EttjM=; b=makVGvRntMGg4wTIWFLd+H9peQBel1XZ2AJurwn3JVrS6FqJ2uDmKmiWeMTk6LYkW3 b2/sUb8jRRO8O06ThJlb0qSjaP0t1z6FQpfHOY5t07Pj1oG3ynRgFUPvtivwhshM6ohx 3LT4i2pGvBnRDAu8t6GfmhEY4Q54Zut8j91QjUxI9FOqtuy+nTZaMo/cARVjzk6kvp2b gvBL22oFis6uKTn2tci877Z8q30/4JU0WWjge86NTbFU60bXv3aFMW/flsbMhuiYS2nr 2MPItEZKGI9qXrZZ/DeZPph2J4Kk1pDwCp52VgPKu7qylsq+wpmjMdZ7iAUqvN3wGzov 3TlA== X-Gm-Message-State: AKGB3mI7LimSwb3Kj/iKCsIEtZF1HM2h5drscQl7i8HaPaqYvuVBJJs2 tYlOYGyUwzbb9cA5bqmt5S00bw== X-Google-Smtp-Source: AGs4zMbw0sA/0RbYt4Fa07l+cLWWXNibC14Kj9Zr3/lDm7+42oXMoEPTeN9/lH07y57AJC4jKu9/Cg== X-Received: by 10.80.131.133 with SMTP id 5mr2515453edi.197.1512666453729; Thu, 07 Dec 2017 09:07:33 -0800 (PST) Received: from localhost.localdomain (x50d2404e.cust.hiper.dk. [80.210.64.78]) by smtp.gmail.com with ESMTPSA id a16sm2868270edd.19.2017.12.07.09.07.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Dec 2017 09:07:32 -0800 (PST) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Cc: kvm@vger.kernel.org, Marc Zyngier , Shih-Wei Li , Andrew Jones , Christoffer Dall Subject: [PATCH v2 33/36] KVM: arm/arm64: Move arm64-only vgic-v2-sr.c file to arm64 Date: Thu, 7 Dec 2017 18:06:27 +0100 Message-Id: <20171207170630.592-34-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171207170630.592-1-christoffer.dall@linaro.org> References: <20171207170630.592-1-christoffer.dall@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The vgic-v2-sr.c file now only contains the logic to replay unaligned accesses to the virtual CPU interface on 16K and 64K page systems, which is only relevant on 64-bit platforms. Therefore move this file to the arm64 KVM tree, remove the compile directive from the 32-bit side makefile, and remove the ifdef in the C file. Reviewed-by: Andre Przywara Signed-off-by: Christoffer Dall --- arch/arm/kvm/hyp/Makefile | 1 - arch/arm64/kvm/hyp/Makefile | 2 +- {virt/kvm/arm => arch/arm64/kvm}/hyp/vgic-v2-sr.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) rename {virt/kvm/arm => arch/arm64/kvm}/hyp/vgic-v2-sr.c (98%) diff --git a/arch/arm/kvm/hyp/Makefile b/arch/arm/kvm/hyp/Makefile index 5638ce0c9524..1964111c984a 100644 --- a/arch/arm/kvm/hyp/Makefile +++ b/arch/arm/kvm/hyp/Makefile @@ -7,7 +7,6 @@ ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING KVM=../../../../virt/kvm -obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v2-sr.o obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v3-sr.o obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile index f04400d494b7..7e8d41210288 100644 --- a/arch/arm64/kvm/hyp/Makefile +++ b/arch/arm64/kvm/hyp/Makefile @@ -7,10 +7,10 @@ ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING KVM=../../../../virt/kvm -obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v2-sr.o obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v3-sr.o obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o +obj-$(CONFIG_KVM_ARM_HOST) += vgic-v2-sr.o obj-$(CONFIG_KVM_ARM_HOST) += sysreg-sr.o obj-$(CONFIG_KVM_ARM_HOST) += debug-sr.o obj-$(CONFIG_KVM_ARM_HOST) += entry.o diff --git a/virt/kvm/arm/hyp/vgic-v2-sr.c b/arch/arm64/kvm/hyp/vgic-v2-sr.c similarity index 98% rename from virt/kvm/arm/hyp/vgic-v2-sr.c rename to arch/arm64/kvm/hyp/vgic-v2-sr.c index b433257f4348..fcd7b4eff927 100644 --- a/virt/kvm/arm/hyp/vgic-v2-sr.c +++ b/arch/arm64/kvm/hyp/vgic-v2-sr.c @@ -22,7 +22,6 @@ #include #include -#ifdef CONFIG_ARM64 /* * __vgic_v2_perform_cpuif_access -- perform a GICV access on behalf of the * guest. @@ -76,4 +75,3 @@ int __hyp_text __vgic_v2_perform_cpuif_access(struct kvm_vcpu *vcpu) return 1; } -#endif