From patchwork Thu Nov 4 12:54:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1550913 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=f96mPk2z; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HlNtt6Bgpz9sPf for ; Thu, 4 Nov 2021 23:56:38 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1micIB-0006IB-Eb; Thu, 04 Nov 2021 12:56:31 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1micHE-0004eI-KT for kernel-team@lists.ubuntu.com; Thu, 04 Nov 2021 12:55:32 +0000 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id AA3173F1D0 for ; Thu, 4 Nov 2021 12:55:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1636030529; bh=yzDS46gOJ/SG43WRVs9oOgz8h7VjnjyVU/l3c1yLygU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=f96mPk2zz2ijxoZJJLeJsMLyAVt/cPej+SvOfB3H9Say3nFPz0fgyorBjDC53eiLl 1MZ0JfOKGoGRg+qYEGifDxx/RDp6CBuBrid7AslDRJn8dETqfNaZKJ0eudQBBr88Ph wNrkNiyqSG9fJx22alHn35igyfpA7V6aJKreLNXtrLHkYDtK8hAT95kxw3IyV+cZqO sTw+H9mLjH4jYGJPOEjV9qh7uxNsEL9V0loZQSFv8Cp6u/TfUOCPbaWN2A7qCJRyBe WBx41aO6KC3qSF+M1uEGpGd4talfYloBDpgWTXWhdOGTjig0NwbayzP877Vs8Lr5ZM vN/ouA+9DI4XA== Received: by mail-pl1-f197.google.com with SMTP id h2-20020a170902f54200b001422a32c821so1999713plf.13 for ; Thu, 04 Nov 2021 05:55:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yzDS46gOJ/SG43WRVs9oOgz8h7VjnjyVU/l3c1yLygU=; b=tNMA1laVatkj1hufC4b3vdHaShXGE/kMACBWPSomqkjf/zJVZNl3xe5UiAWgUQgIeh 9qCH51ZnqQiCFieJP02blNSQ6bQKIwhYCn7bqtc/7hH/AVd0p7Zp0rzIUIVf8QYHSCTO RzDrOGbtInGvxK9CIAmq9iUmlzo8ZpzBejOfjDA0zXeoekajmHmH0lQhUHX+sSsz3HyC /hfilIHDNnuyR9O4DWXBQ7Sq8TDazHsahZptyr3Z+BnqOe50jzU5PC6VuJS1WmlI2JtA DNpG9wv8bQpzejmI0ZlavNGp26noTWosHWITLj1JhU8MkCqsZyMYsTSCS58kh2NWuTyw XlXQ== X-Gm-Message-State: AOAM532Q142Ze4mJhGpc1rpCeR83GvWxTc1fZouUxhymZpdvCZlb7+Yd /jhTUz+mxhAJF4ENUtY4H2+lH0OwweA9EZ8NLnSJ8w4YMKO7xJPTjWxZTSVHeRpBvwkZdPT+zMW d+kt63JmuMI/ebP6xsIIT4hGsnvqj4C4TTLjcEPjLTQ== X-Received: by 2002:a17:902:ce8c:b0:141:d411:7e25 with SMTP id f12-20020a170902ce8c00b00141d4117e25mr30346905plg.85.1636030528004; Thu, 04 Nov 2021 05:55:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxybVCWsl8Sv31fR9e6dRzIL0zCtYmnk93R4eGRcxo8NkkJvVLgYTbht73AewarONgmr+XjwQ== X-Received: by 2002:a17:902:ce8c:b0:141:d411:7e25 with SMTP id f12-20020a170902ce8c00b00141d4117e25mr30346891plg.85.1636030527777; Thu, 04 Nov 2021 05:55:27 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id y4sm5283859pfi.178.2021.11.04.05.55.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Nov 2021 05:55:27 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 20/41] UBUNTU: SAUCE: asm-generic: hyperv: Fix incorrect architecture dependencies Date: Thu, 4 Nov 2021 06:54:28 -0600 Message-Id: <20211104125449.16540-21-tim.gardner@canonical.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211104125449.16540-1-tim.gardner@canonical.com> References: <20211104125449.16540-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Michael Kelley BugLink: https://bugs.launchpad.net/bugs/1949770 Move the declaration of hv_root_partition and hyperv_pcpu_input_arg from the x86-specific mshyperv.h to the arch independent mshyperv.h since they are used by arch independent code. While here, add a missing #include needed to compile correctly on ARM64. Signed-off-by: Michael Kelley [marcelo.cerri@canonical.com: back ported from https://lore.kernel.org/linux-hyperv/1620841067-46606-2-git-send-email-mikelley@microsoft.com/] Signed-off-by: Marcelo Henrique Cerri --- arch/x86/include/asm/mshyperv.h | 3 --- include/asm-generic/mshyperv.h | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h index 10cf34d33ddd..c16cd567798d 100644 --- a/arch/x86/include/asm/mshyperv.h +++ b/arch/x86/include/asm/mshyperv.h @@ -36,7 +36,6 @@ void hyperv_vector_handler(struct pt_regs *regs); extern int hyperv_init_cpuhp; extern void *hv_hypercall_pg; -extern void __percpu **hyperv_pcpu_input_arg; static inline u64 hv_do_hypercall(u64 control, void *input, void *output) { @@ -163,8 +162,6 @@ int hyperv_fill_flush_guest_mapping_list( struct hv_guest_mapping_flush_list *flush, u64 start_gfn, u64 end_gfn); -extern bool hv_root_partition; - #ifdef CONFIG_X86_64 void hv_apic_init(void); void __init hv_init_spinlocks(void); diff --git a/include/asm-generic/mshyperv.h b/include/asm-generic/mshyperv.h index f100baa6a33d..bd79b48cfe07 100644 --- a/include/asm-generic/mshyperv.h +++ b/include/asm-generic/mshyperv.h @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -147,6 +148,8 @@ void hv_remove_crash_handler(void); extern int vmbus_interrupt; extern int vmbus_irq; +extern bool hv_root_partition; + #if IS_ENABLED(CONFIG_HYPERV) /* * Hypervisor's notion of virtual processor ID is different from @@ -157,6 +160,8 @@ extern int vmbus_irq; extern u32 *hv_vp_index; extern u32 hv_max_vp_index; +extern void __percpu **hyperv_pcpu_input_arg; + /* Sentinel value for an uninitialized entry in hv_vp_index array */ #define VP_INVAL U32_MAX