From patchwork Fri Jan 12 12:07:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10160651 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 138A960327 for ; Fri, 12 Jan 2018 12:27:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EDB2F289D3 for ; Fri, 12 Jan 2018 12:27:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DFD13289D7; Fri, 12 Jan 2018 12:27:10 +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 72FA4289D3 for ; Fri, 12 Jan 2018 12:27:09 +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=Rw2BXSVE1LdFMGwCGhB1yuQEfv JvtDzr5XITCUCO4was51V6QQn8kWC8Gbn7wgWezuRnl33SFLCcvOxJO1TcfejBP6HHqemR3Ru6/2I 5tvQQOKp4SYbD/iKvw65tJzea9CGSUGWMdB+Y4TQq4CWfRR/XmZi9+DaR7KAlMNow4mPBLTID0jyi hno7ZmsvJzI+tEalpDHiN7Z0BfjtlxQ9GjmNvhdXsM9AfWU9ZfD2jRini1QjqAT/manUo4w9tz6Ga UXbSR9X+OsWhrjwO8znGRQbs33Q5PglCM8Oe22k7/W5Qnqf/qN20+eqsf+Lrnw095cMdS/1qSzzcr 8q32tFbA==; 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 1eZyQN-0004NX-DY; Fri, 12 Jan 2018 12:27:07 +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 1eZyNr-0007CK-K1 for linux-arm-kernel@bombadil.infradead.org; Fri, 12 Jan 2018 12:24:31 +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=ni8Wuaa+14sbf2aHcUmP0Yvms qOiw3+8LwG03udwxgfXIdP9xSlFnifo5nYOKy46zYVbnJlJZGmeJTxSG/VPCiiPJwxEOl3XuKAR/f 9cuVWNg7tdMtv4nSk4ZSaPJ0Q08A59ZgWGLoYvYHBdrADyTiUsjiJpunevjt9ALCZi2+xX+emnpmY dQaMOTHKRUdDeReWTOjHyUxpJvXz5iUp76R1PLkqDPTkmICJ9x2OimxLFOh0oZsLIToKbCgYnkpk7 aq4EFparcsBG8CTJkWVFChoBkx5FA8jLqdfzY/f/uSo+p5o/uPAfkRPrvQO7HstocgW8SaLwT/Z2+ tvBtiwwqQ==; 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 1eZy8p-0003Af-Rj for linux-arm-kernel@lists.infradead.org; Fri, 12 Jan 2018 12:09:08 +0000 Received: by mail-wm0-x244.google.com with SMTP id b141so11742651wme.1 for ; Fri, 12 Jan 2018 04:08:49 -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=TehN7da+xikkksNlOt6gP5HVMVgxefu9Lv9Y7n6i+ikJ8eWTf0Ra6g7zS6iv73+PDV u61MKtYSC69jo5vnwhmplro7SLLjBylIramgyALGuLcdrbRuzXw4a3eze9jDhG7GYKUT 32SjY8f7P4cWNT8t1NBllFtxjfi0yVuRDHTUk= 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=PlLq26/zMbzaExvN/CJsE3uSQMFBvDyNgk5imd7FBU5EFbDGowaYomvcA2Cjr2YyC2 szxfbDLYYEf9dRbImv3D2N4FFOST9BXF/ckiJOwLxPiiEcHJpTcMU/fQq+GKBOkh+94W ATGlw2oI3qo9Kdk96lVm7Q8ux4yGz599D6dbTHZPmXWT5cpwFSVBQfe2Q7OkF+mtu6un QndnplzYG+VenDwzPg0Qw0juC8/GhPb3N3W+nnloNe2K4IbpoDq2bjYhZkgvyAoA+4zh 9PMHbSXGSaA1l10qHC3mheKRer5iN1TVJFnN4GlT23e01dPrv6ClHei1Ws4A9jE4FQOa 1gxQ== X-Gm-Message-State: AKwxyteyGuv+aT8kgSYHOYv/AQ+UX58TdB7w7ab6yRN+kaahZ6VXmrot 0QJryXh9Jrsv9ghbnsqV6TUTvw== X-Google-Smtp-Source: ACJfBoujbY8MkXnQGX7KlHOE81WXvj0s9xgN+c3ROlFOqSjnt96aKgD+2vuxod63cRlRosi0Bm6DeQ== X-Received: by 10.80.213.74 with SMTP id f10mr7626637edj.255.1515758928687; Fri, 12 Jan 2018 04:08:48 -0800 (PST) Received: from localhost.localdomain (x50d2404e.cust.hiper.dk. [80.210.64.78]) by smtp.gmail.com with ESMTPSA id f16sm13489705edj.65.2018.01.12.04.08.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Jan 2018 04:08:47 -0800 (PST) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 38/41] KVM: arm/arm64: Move arm64-only vgic-v2-sr.c file to arm64 Date: Fri, 12 Jan 2018 13:07:44 +0100 Message-Id: <20180112120747.27999-39-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180112120747.27999-1-christoffer.dall@linaro.org> References: <20180112120747.27999-1-christoffer.dall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180112_120900_031985_A6676B11 X-CRM114-Status: GOOD ( 13.20 ) 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