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: 10001713 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 760476028A for ; Thu, 12 Oct 2017 11:52:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 665E828D99 for ; Thu, 12 Oct 2017 11:52:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B26228D9B; Thu, 12 Oct 2017 11:52:57 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E1D3928D99 for ; Thu, 12 Oct 2017 11:52:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=mcM9woKFpY3cxAnc1ekFUAZayx7vE7PRU+9z+ynU2D4=; b=txCZcHGyYaLKUrDNDqjhFV1dlk FZjWe4zztm7M63pFVNZfkBX8lfPlrJb4RZ+jYMTE/tQ7u4owmBe3SH4v8UcquSjb4xWnxsIqAHrAV qki/gicmKuJv+grJ+AloJfcNklgkvTkhTGDAKocnIR44d4gqLcuytb5zd/VH0sNTahk6KQlsbI5WS SsBk3JlyGHGrIJJ0m/I4hW8damW/ThCVsHgV8HPvy+T6se4kS4vmttpMoUt5BgU71/FRWthneMGwj juTXEnbPDhWxz7Kp0kwJS7HUXDxSh36ElOiZGiUvQCt4deVcmdBIYH9t9NGsXwY5AzMhWccBFsa5a IQbb+bbw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e2c2p-0001lP-4K; Thu, 12 Oct 2017 11:52:55 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e2bzP-00063q-DR for linux-arm-kernel@bombadil.infradead.org; Thu, 12 Oct 2017 11:49:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=QTQuVgh2/5FSX6YxaDL+zNXbefFx05jHOGoDGo7zZ+w=; b=xBKTrEKMr8OzTjK+Vxum0UcPZ 1JLzunGMBAbxPsqOJs0QYEV9cmJafWdouxKhzxwy0eaJPKP3wLxMz4u6ECIQWo6X7Zy0EEjZIQeET SD3Vyd33sJ534bUWODVOUnL1fD7yePTpBaplAMph9uLp0OFP5aFYTAU6As1K+oOlYQTPHcuM+zhRm cDQwQcXRFSfI9WpwbxYQAm55YQHqIgJOxxuTMAs0f4vaJmM31rLosf/MFp8ROgl0alhnvIBf+7Ykg hH8oQvWo0V8hGh6Q9ZzIsXR7c6sOZr+EZTHDzUdhkD5wIC5uGPTAE/AR6rSFEd0pBO+yltGZcwVSo Pk+zSv1eA==; Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e2awz-0004Nm-Dm for linux-arm-kernel@lists.infradead.org; Thu, 12 Oct 2017 10:42:50 +0000 Received: by mail-wm0-x22d.google.com with SMTP id t69so11963965wmt.2 for ; Thu, 12 Oct 2017 03:42:29 -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=NV53CoM+FhfSFCrP7055za2CazEHNaYl0PuEgQmBMp7zBJe3Bnd1VWpdviaE1fpPjh wRK7n8tIvtOZcuqf4HAYrzcDEZQ8+2Z5++H8/2Fyt7Ticelq9A1SnJpC3SHJlhW9BHfQ n3prkhmR3uAI7VA26zuC28W6nGoSajavqA3/Lb9ijj438FsdDpxjE0VjfXC6cL226Njt vnVNQ7S9g2TD03wzasR/fcbVdk5SQQtFX2KH0a5+CSXEXDf/IowWt4LARre+7CGQgA6b BCZgKk3a/9QZbp7qRlRxfKs2uCGUxxM0oWbSfe7BetVChyCh/j05XzncJF3R3gHcjWz8 lBUg== X-Gm-Message-State: AMCzsaUvXRJEmjnjLforSEcT+bMl27zSDCy/PNaGoZU6kQ6jmaooq5MG mMuRYuprTAmc//JKpCAkKI3kdg== 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 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> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marc Zyngier , Christoffer Dall , Shih-Wei Li , kvm@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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