From patchwork Thu Oct 12 10:41:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10001553 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 C05C3602BF for ; Thu, 12 Oct 2017 10:42:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B308B28BEC for ; Thu, 12 Oct 2017 10:42:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A7DD928D6D; Thu, 12 Oct 2017 10:42:50 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 2245628BEC for ; Thu, 12 Oct 2017 10:42:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756851AbdJLKmm (ORCPT ); Thu, 12 Oct 2017 06:42:42 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:48025 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756834AbdJLKm2 (ORCPT ); Thu, 12 Oct 2017 06:42:28 -0400 Received: by mail-wm0-f46.google.com with SMTP id t69so11963971wmt.2 for ; Thu, 12 Oct 2017 03:42:28 -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; bh=QTQuVgh2/5FSX6YxaDL+zNXbefFx05jHOGoDGo7zZ+w=; b=W9/D9HRotV9iGAoVcYpHA3JiWd+MnZJmEBOq0vo46UVNZRYgmkj4j9qSJdbYpo7JUG y1rXcm6OyeiwRWb/7OgoYBFD2/p12spn3sJfhAr9pmccOvL/xBFcjcMQSQb61j9nATIr MWjx1OcvSG16te6cioySm2QKMY+vV0r8sS25c= 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=QTQuVgh2/5FSX6YxaDL+zNXbefFx05jHOGoDGo7zZ+w=; b=BpUhXAAZGX1PktMGELVDlBT8vXbuwhrRRHH/mZ4p27jXG9dCVRbTFYY/MyUqoX0yX+ EnmjULQeSCuC1AajkOsuog4iHnUWMI4MpYT8fY4mYGDw0GEduJLVzTXcC2VL4jGK4ISO UG6nQuHSbwzPnUwMpeiISvXyRG6FlqyObX9f8dZkoO45zj4i/BK2jvpkZ75NOzxTLlrJ WkWnuQuJdW0nWXTUNSh2tdagjx9gbv1X0mT9nc+bI6ZS1gsG+lW/2Qg0JIqfD6EWf9s5 lHGluqWNEUw/SpoXEZ4bIcn51o1CNW748fRZnUK8d/axN27tNWE9pmsGuvWLq4lAo/MJ cG+Q== X-Gm-Message-State: AMCzsaUXrWpNXrZN1n2z30VBe7+PIt7IZI2QR4R71BsovKk4RqVltPqx tFQuWdwRxwhmt5QS2B45yrRc7hnmY6Y= X-Google-Smtp-Source: AOwi7QC0Ll+j3YjWmuAJPTE09l489Cr2TOi/Y02tZLi3CH2KNevlhKUQXLGA+i/EpmG6VBEFojo/wA== X-Received: by 10.80.226.8 with SMTP id n8mr2430110edl.177.1507804947535; Thu, 12 Oct 2017 03:42:27 -0700 (PDT) Received: from localhost.localdomain (xd93dd96b.cust.hiper.dk. [217.61.217.107]) by smtp.gmail.com with ESMTPSA id g49sm4798603edc.31.2017.10.12.03.42.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Oct 2017 03:42:26 -0700 (PDT) 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 , Christoffer Dall Subject: [PATCH 33/37] KVM: arm/arm64: Move arm64-only vgic-v2-sr.c file to arm64 Date: Thu, 12 Oct 2017 12:41:37 +0200 Message-Id: <20171012104141.26902-34-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20171012104141.26902-1-christoffer.dall@linaro.org> References: <20171012104141.26902-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. Signed-off-by: Christoffer Dall Reviewed-by: Andre Przywara --- 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 8679405..4be5061 100644 --- a/arch/arm/kvm/hyp/Makefile +++ b/arch/arm/kvm/hyp/Makefile @@ -6,7 +6,6 @@ ccflags-y += -fno-stack-protector 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 14c4e3b..b746fa5 100644 --- a/arch/arm64/kvm/hyp/Makefile +++ b/arch/arm64/kvm/hyp/Makefile @@ -6,10 +6,10 @@ ccflags-y += -fno-stack-protector 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 b433257..fcd7b4e 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