From patchwork Mon Sep 20 10:05:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12505049 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F770C433EF for ; Mon, 20 Sep 2021 10:07:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 513C4600D4 for ; Mon, 20 Sep 2021 10:07:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 513C4600D4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=CRupwVg5+2oRMXB4dcPN6+ZHIOqD3tQB6JDiVGH8buA=; b=KhKkWaMxL4c1Pb Z0qXS+91BUqxNtuZXzcOAnbAmNDIE7LmLMfPSD50SfcJOTGcG5jzJLGKkfl2Ct+LWZ3oA1TfQwYvb ZZt529zkR/WJPM0CIgL697byDeuSNyhusmfkbV+5/EXSg9yi/9uwuMaxAD7e0Zjd9ZpdC57v/jsvu 3hBHEmS9XIwlY6yOA9ME7uZzUYiPWzj6PRxpcr3JVD9lVF+ZbITFI61MeHIrWnRRs0dLbPesBA39a RL1ibd68u7EqaM/nrXqKovqmnMFvamGkJQG9TRSAK+4qlYcUjUwApZfNVd1JDHXTNyGmHDyb+N6Yq veIsDNGT6UX7OOIZq30Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mSGAw-001DoD-3Q; Mon, 20 Sep 2021 10:05:26 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mSGAr-001Dmi-0L for linux-arm-kernel@lists.infradead.org; Mon, 20 Sep 2021 10:05:23 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2DCB760F21; Mon, 20 Sep 2021 10:05:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632132320; bh=BQ/pJEAhwojVoXtwSmRnTJ5Rlh46slyFWdQtV+Ah9rk=; h=From:To:Cc:Subject:Date:From; b=QsMHE9cHRVHvL8TUDwOHjUyfsYxJwqNDZmA2zBcwiVPnbOZ25NxJ4zdovMO4c1oRk R0hnaa7WcCV7cJ8mVF5oZoNinUu4YmkzZyiASj/ni+NkMWrleyFV7+No5ltYAyW5gp rEcwqCdSa+5Ao6D2nyS/YuxlvrGSZSjBewJ9tLB8pDAeIsVN/+lg5O4vBrCT6tw25t BTW/yDARFOjM7AAF1RpeKx/tOIB9azMOXWktc5+WSAa7eBy4fCr64Vs9htrdPUwDs3 zRSSGQNHt1og8bbBuW8ySHKOsejbT8uOgyXKXm+D+ObD65slQOFAFbKd46WrGH0Zvz C5m5PWMxh0Ilw== From: Arnd Bergmann To: Marc Zyngier , Catalin Marinas , Will Deacon , David Brazdil Cc: Arnd Bergmann , James Morse , Alexandru Elisei , Suzuki K Poulose , Quentin Perret , Kees Cook , Sami Tolvanen , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org Subject: [PATCH] KVM: arm: add Kbuild FORCE prerequisite for hyp-reloc Date: Mon, 20 Sep 2021 12:05:10 +0200 Message-Id: <20210920100515.1554788-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210920_030521_110311_A9360F3B X-CRM114-Status: GOOD ( 11.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann Commit e1f86d7b4b2a ("kbuild: warn if FORCE is missing for if_changed(_dep,_rule) and filechk") added a helpful check for Kbuild, which now notices that a problem with the hyp-reloc rule: arch/arm64/kvm/hyp/nvhe/Makefile:58: FORCE prerequisite is missing Do as suggested and add FORCE here. Fixes: 8c49b5d43d4c ("KVM: arm64: Generate hyp relocation data") Signed-off-by: Arnd Bergmann --- arch/arm64/kvm/hyp/nvhe/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile index 5df6193fc430..8d741f71377f 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -54,7 +54,7 @@ $(obj)/kvm_nvhe.tmp.o: $(obj)/hyp.lds $(addprefix $(obj)/,$(hyp-obj)) FORCE # runtime. Because the hypervisor is part of the kernel binary, relocations # produce a kernel VA. We enumerate relocations targeting hyp at build time # and convert the kernel VAs at those positions to hyp VAs. -$(obj)/hyp-reloc.S: $(obj)/kvm_nvhe.tmp.o $(obj)/gen-hyprel +$(obj)/hyp-reloc.S: $(obj)/kvm_nvhe.tmp.o $(obj)/gen-hyprel FORCE $(call if_changed,hyprel) # 5) Compile hyp-reloc.S and link it into the existing partially linked object.