From patchwork Thu Feb 15 21:03:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10223727 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 28FEB601D7 for ; Thu, 15 Feb 2018 21:33:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1885D2952C for ; Thu, 15 Feb 2018 21:33:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0CFD02953E; Thu, 15 Feb 2018 21:33:15 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 772102952C for ; Thu, 15 Feb 2018 21:33:14 +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=6PC9EsgvTJZx6aPQaC9ITVElDwgtlj6hGgGMYXg7KMc=; b=FIi7hk5sMwwj99lEW3dZq5d6Qn cIDxiA0JKFZLLrph6/Z+630un7y2NxYg+9xHBUYHqYpm6Tfs3CQnC3/BVun4MWQRLGBvT48QHSQbP ZCwkZ95z8lmXacI2Y0kxFamgFdOeLzeeDNPBQTZKYV7E86PkOPDwsdqWJuKWhWFn/gFEXtlAI2/xT Da3MsVIkOgFq7MZOR+XuwANT/Atj2NTOhk5/ElVwbqC0RNYm7jrDoQjYp9ReQngqjEFJW+dRcURBw z3A2yIruC307QCgfHsOzwZT7kGaYalIBqZGwIE9YRJjlO3pA5Q8V3i1jDa9ePMht40cmM/ags/l4I P4ESUGxg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1emR9K-0008Gt-RC; Thu, 15 Feb 2018 21:33:02 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1emQwd-0005PW-V1 for linux-arm-kernel@bombadil.infradead.org; Thu, 15 Feb 2018 21:19:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=dFIhmOfB5nH3d0495Vbj3kgCP1yu/VAe08v7P8KJO/M=; b=GtKSwlOKwJtYf7yxOaDcwUYzD +xCx9s5+cJBlLVhAgqko4CrnWbGihkuul5CEodfHrmNB0ILcxbamsP/gMUkqsuWYjr8+d/IPLUmw5 3zDf5xJcRNoCKBLL+VxmlfudWqPAlkFMSXJh4rsBSKFR3RBGjlwDVjhE1mkJCRYqMACKH1ufxzgB0 Pao0837sljgxsenCJur6tEVet/ogjtlOkbQrAPDI5EJptah8YNH+Em+YFk//BYI4TdnpGoZZ1UBqe 5FGfIZb+PbZJFGwlEo4R1uXZUFLzTGQdIxeqKftDQ8GD3FOI53MQcGHq8bWqhqyLeqkoSIgdkQVFo EFxP73BuA==; Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1emQi9-0004ha-4u for linux-arm-kernel@lists.infradead.org; Thu, 15 Feb 2018 21:04:58 +0000 Received: by mail-wm0-x244.google.com with SMTP id z81so3263935wmb.4 for ; Thu, 15 Feb 2018 13:04:47 -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=dFIhmOfB5nH3d0495Vbj3kgCP1yu/VAe08v7P8KJO/M=; b=LCQiGmg1iTGEqqYNRB9O+E504zEIzJyGUx+t95mvw2vB/gR6EzaH7VSu4Dsb0JWO8f 9Cw2/eUI5AzT4N1SzVJfklDiKgOGh+mjI2QodPlylPqNj3TSDlZJHejOLS7bcfT+LDHO B6UuzhJf9dq1j/T2jJmFEjC66rCgybPdLOsZ4= 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=dFIhmOfB5nH3d0495Vbj3kgCP1yu/VAe08v7P8KJO/M=; b=d/koKaw4hgVzW09RV139a8f84BY0f/dW0OiauFKcoiSlfsZgBMpDsF/cJ+6eAzkM4p nGGE9y/t2ci2lOHP1LEA/5y6S/hJU1QuCzm+x4B8yHG0tBVpUi1rzJNFbXhb8dE7NRNh GmErS4J8QnRr9hDESkRK2UDskaaWVnHcMFPRw+bgjixIVB2A7LzkNZl8Yi5JyifkLWZv +168IdLb2djplQ1pQw+XgeQGvnVsJXWHVR1hkxzooxjqlNVnwOJCjRpeok7Vj9M34GRz x7FymgUZFCJx4+jNAQljCpUAoi3VhRTcv4rBlQGuaqnLqenBDY2dIS+bdDgXQHCZFwua THNw== X-Gm-Message-State: APf1xPArHIm6/W0upIMPF9H3Q9Oaa/7+qhQq/XYH//9S1jhia10dZ+dh cZ/ItejB2WN7By3J8dFsM/qEuQ== X-Google-Smtp-Source: AH8x224zmb5Pp42JZ2z0OixvB7nBOEbMEV05B2G5zNn4+K+6TrLR/IQCwXR14YYf4ovAvvkIdxgOXQ== X-Received: by 10.80.135.205 with SMTP id 13mr5167656edz.253.1518728686006; Thu, 15 Feb 2018 13:04:46 -0800 (PST) Received: from localhost.localdomain (x50d2404e.cust.hiper.dk. [80.210.64.78]) by smtp.gmail.com with ESMTPSA id p55sm8220030edc.15.2018.02.15.13.04.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Feb 2018 13:04:45 -0800 (PST) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 37/40] KVM: arm/arm64: Move arm64-only vgic-v2-sr.c file to arm64 Date: Thu, 15 Feb 2018 22:03:29 +0100 Message-Id: <20180215210332.8648-38-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180215210332.8648-1-christoffer.dall@linaro.org> References: <20180215210332.8648-1-christoffer.dall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180215_210457_177027_5425B20C X-CRM114-Status: GOOD ( 14.05 ) 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: Andrew Jones , kvm@vger.kernel.org, Marc Zyngier , Tomasz Nowicki , Julien Grall , Yury Norov , Christoffer Dall , Dave Martin , Shih-Wei Li 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. 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 0bbafdfd4adb..97f357ea9c72 100644 --- a/virt/kvm/arm/hyp/vgic-v2-sr.c +++ b/arch/arm64/kvm/hyp/vgic-v2-sr.c @@ -23,7 +23,6 @@ #include #include -#ifdef CONFIG_ARM64 /* * __vgic_v2_perform_cpuif_access -- perform a GICV access on behalf of the * guest. @@ -77,4 +76,3 @@ int __hyp_text __vgic_v2_perform_cpuif_access(struct kvm_vcpu *vcpu) return 1; } -#endif