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: 10100307 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 D42FD60360 for ; Thu, 7 Dec 2017 17:14:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B99152844C for ; Thu, 7 Dec 2017 17:14:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD848284DE; Thu, 7 Dec 2017 17:14:41 +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 397402844C for ; Thu, 7 Dec 2017 17:14:40 +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=EAwKAuYbzNXztoVHupddnVElURSuPRjQ3q7ubROWCVw=; b=EwNtfodrzFMltq7P+PN6k96F7j hJDiUrU75pjnvohpSCY3zQfz3+wTPrrK6TSlRScfGOyb8OopaVMXTqmlUR0blq7y1r7sZ5PVkKzlN 5mfpEGCT8j9jXPoMSDgRX7ycR8pY9bBP0Q/MfVR9IB9H9XnwgnNBZIx7DRaXynO3+nx4luYrlwJdh eMb8KENIDTg16uXU6no3tXY3a5llJ3sBeAGVvP/PWSpkZCAR6SQRyf04CBPXabYAhJBbWh59AAoGF PKw15+4pXZYtbWgttv+Omi7IUUPFi9wYBZjmbr4Xp5LsaD5pxyHduNQUhSGFPoiTYPz6AtTmSmpwj RJkK8xVg==; 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 1eMzks-0002Q4-RS; Thu, 07 Dec 2017 17:14:39 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eMzfB-0004Pb-6k for linux-arm-kernel@bombadil.infradead.org; Thu, 07 Dec 2017 17:08:45 +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=BSK7mAIz7KnNilqoZgVB7KW5CzHk3OIehikGC2EttjM=; b=ealdFfLNXRika+g76wb7F+Vzt Y+PPHIibK40Mnf5SWtdo8yX7q6/KD4UQIerCqDGSRfqjXKBgcs6CDmfJcJw7YlCz9+iO2yF+LOPe4 Oh4UgfQM9DkhyF3Oz7T7d7HO8de2G4ACgBSwii56tIYf4xFtq94El0o2DnvfE7KxMH7qSaVIk6IQK EduhdceeYcJFET1KbotBVvZTwmQUyueuC9Pb+6Jf0T+AP4F6vKc3DqrWVvCWbDq2/Be8NAR3EU9oK JbdPpEZbOBfog8MPCslZlFOP+dGEHMdQBJd5+kpi8gbDEEe7Yve9UBzeZT+BeVoMU0aMxQLboamBA 1AlLaw1Ww==; Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eMzeJ-0001yl-27 for linux-arm-kernel@lists.infradead.org; Thu, 07 Dec 2017 17:07:54 +0000 Received: by mail-wm0-x243.google.com with SMTP id y82so1449958wmg.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=D4cumCzOCmP76gMYnAJmrYdiXazXYkR+IiuxjBuNHXxUzvxSee9U1vS7fNXqfwARIk u+wdsC5rL/zIrRF+gq+AXKu7NChWKeON0gbAGUBsIMMPu9qo6+d57XETJ1U+0MUAUtRR 0CVyGGRApxaPSSjMrUiDAkrtfZ4VtXgg9Ru0rI9JHYwLY0G2FXbldVRG06xjLZzenx3j OWFiGgU3L5hAk2dwnlOy/xL2l6WLa+/MtmutmGRhZ0+sg162cYWqAkybDEyADvzUCcES gzmI665L0b+8xS/vQcGb2iA7hCyU5kbh5REtlAzoWps9TwQyIH+2CDplnbNqPijXjA9F 0AEA== X-Gm-Message-State: AKGB3mIt+R8dVUQv4Ww3Hq4J/ac+w85ltATte/qIkd/f7DKxy4wBZ8KP uhfCDqDF8PB4rPAcRtEFg87pPA== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171207_170751_158747_D15CB80F X-CRM114-Status: GOOD ( 12.66 ) 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 , Andrew Jones , 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. 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