From mboxrd@z Thu Jan 1 00:00:00 1970 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=-20.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 ADE5CC07E9C for ; Mon, 5 Jul 2021 15:30:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9B0AF6199D for ; Mon, 5 Jul 2021 15:30:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231967AbhGEPcu (ORCPT ); Mon, 5 Jul 2021 11:32:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:58094 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232394AbhGEPcc (ORCPT ); Mon, 5 Jul 2021 11:32:32 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CFA4361997; Mon, 5 Jul 2021 15:29:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625498995; bh=cGwUjEPu6GVrJ4vuw2Vln/bkM7M4tBAEK+eA5D8vZi0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OjB1RJFypU3CF2yMV2kGcLr5b/iVpflBO1b9ewV3NXOz8QmGe0XEq7/9uiQRhov1U qvkdREfmQvF5MicMoF51J2QgfGlgySMRbl8PtWw/XNAw4W6X1iWyHVun6y7SKVGoZy 0aA1VdJpx7KwMlvR3ZjGd44sxYFh5SCoQ2iHlWhQvgYAgjiG1/TGdbrPUUu01OQVVo bJmiycC3TCsns8M1+tS/R2zD5yPe13/CpH4SL+WKFrnOx90ZKOt3la9uvNkQUYq3W3 xahzGuDS4yKLNZJ9jvk5A0Og1EU0E44i/XkCiLeyLVH6WfKMgbVU7LeG7iz8GNkqjU m4CWNNLqx3zew== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Haiyang Zhang , Mohammad Alqayeem , Wei Liu , Sasha Levin , linux-hyperv@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH AUTOSEL 5.12 34/52] PCI: hv: Add check for hyperv_initialized in init_hv_pci_drv() Date: Mon, 5 Jul 2021 11:28:55 -0400 Message-Id: <20210705152913.1521036-34-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210705152913.1521036-1-sashal@kernel.org> References: <20210705152913.1521036-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-hyperv@vger.kernel.org From: Haiyang Zhang [ Upstream commit 7d815f4afa87f2032b650ae1bba7534b550a6b8b ] Add check for hv_is_hyperv_initialized() at the top of init_hv_pci_drv(), so if the pci-hyperv driver is force-loaded on non Hyper-V platforms, the init_hv_pci_drv() will exit immediately, without any side effects, like assignments to hvpci_block_ops, etc. Signed-off-by: Haiyang Zhang Reported-and-tested-by: Mohammad Alqayeem Reviewed-by: Wei Liu Link: https://lore.kernel.org/r/1621984653-1210-1-git-send-email-haiyangz@microsoft.com Signed-off-by: Wei Liu Signed-off-by: Sasha Levin --- drivers/pci/controller/pci-hyperv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c index 27a17a1e4a7c..7479edf3676c 100644 --- a/drivers/pci/controller/pci-hyperv.c +++ b/drivers/pci/controller/pci-hyperv.c @@ -3480,6 +3480,9 @@ static void __exit exit_hv_pci_drv(void) static int __init init_hv_pci_drv(void) { + if (!hv_is_hyperv_initialized()) + return -ENODEV; + /* Set the invalid domain number's bit, so it will not be used */ set_bit(HVPCI_DOM_INVALID, hvpci_dom_map); -- 2.30.2