Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp236224ybg; Thu, 17 Oct 2019 22:07:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqwbnXwKbusy46ZNmH696FTHGmFACmAINPYSJMthfwocx5pGDaMYa8JJOKVbTsF62kOfquIQ X-Received: by 2002:a50:e40c:: with SMTP id d12mr7490601edm.256.1571375269430; Thu, 17 Oct 2019 22:07:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571375269; cv=none; d=google.com; s=arc-20160816; b=Bl33BmGAo28m9XM8sVtLaEuAEvmx1E6oonYpnnxTk7ClKsl1KhZlq4VctCED+Y1gef BB5QJkQbzK8RTV+/iporblhkJApzfOg+FHlGu2B0DSDR6IziNLO0Fl+hD+aOcJsio/Z5 CiM/ttekEjD6sMJWFAs/J46i35y+Lw06ndk7XYeH0sE2gJ4tc6cIdvk7kt7J57JKKqbl s1dBi/uR1dItiPF+EQg0sdDAsnyn0GFEczQsT7l207/WZ2aBpz3cSTaHUF+eR/vKG2xZ oVLI7yEPrloJ+frgbJ0QWBKfSxd7pnfa/ZGzDceT+1ZF0DOtuBYzbD+TuxIzGNQVeRUg 0rww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=h+db85ZKvv/00JgVGcAqO2QssCNoRDb7mSWZDwgy1o0=; b=o0vadkYhi33Bbl1FVdl5fqe+DOdMiTNCQClf17Y6AUGcCApY88g9gbMTJt4dEsDLZ4 Z9et99Fjy4scLpbXpHmd5uLae3BJK2YF5PF/unQV8pPJ3QQDfePfi5miZ9sMrBKrDf7b tBsbYgss/2O3ujD4p0ePu6Z6A5OGnajoczPBG+8VDj6rpC/WuMcnRS85CHnx900twahR +C7vt6e5veXDRZPjOQITL6VFZdn4dgVgxUNW+0e/q0mZ9K3gIAk5z/isZp9udeWaiSux 5MSeW1gXDm4ETAMapbF1ritk4MFckR8umjXfaVvq8YfzuIbseWJHZ//+n/V6IyyH8LDi NHlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=v50KGf+D; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u27si2786640ejb.172.2019.10.17.22.07.26; Thu, 17 Oct 2019 22:07:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=v50KGf+D; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394144AbfJPWX3 (ORCPT + 99 others); Wed, 16 Oct 2019 18:23:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:41348 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437032AbfJPVw4 (ORCPT ); Wed, 16 Oct 2019 17:52:56 -0400 Received: from localhost (unknown [192.55.54.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8279021D7C; Wed, 16 Oct 2019 21:52:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262774; bh=6EyxsEqBJ2oOZtJcJw9OqpnSifZ1fmKpzk8Q4zKakk4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v50KGf+DyiYFdwV1HL9vyoV+U29WMIFBgcXABKc8oYlCDVE97Ssjfj6jQkNcoChXU 9f1TBW9XaozCZ1HRlcLIqmHrNad5b9O0JdGS0mtBeu6RVA1SjUh6ajMAvrDsUsK1I4 4ARZ/qxIuqafHQdiwM4AM8wPU8qZlyeSHAHicjD8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Igor Druzhinin , Boris Ostrovsky , Sasha Levin Subject: [PATCH 4.4 15/79] xen/pci: reserve MCFG areas earlier Date: Wed, 16 Oct 2019 14:49:50 -0700 Message-Id: <20191016214743.785879274@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214729.758892904@linuxfoundation.org> References: <20191016214729.758892904@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Igor Druzhinin [ Upstream commit a4098bc6eed5e31e0391bcc068e61804c98138df ] If MCFG area is not reserved in E820, Xen by default will defer its usage until Dom0 registers it explicitly after ACPI parser recognizes it as a reserved resource in DSDT. Having it reserved in E820 is not mandatory according to "PCI Firmware Specification, rev 3.2" (par. 4.1.2) and firmware is free to keep a hole in E820 in that place. Xen doesn't know what exactly is inside this hole since it lacks full ACPI view of the platform therefore it's potentially harmful to access MCFG region without additional checks as some machines are known to provide inconsistent information on the size of the region. Now xen_mcfg_late() runs after acpi_init() which is too late as some basic PCI enumeration starts exactly there as well. Trying to register a device prior to MCFG reservation causes multiple problems with PCIe extended capability initializations in Xen (e.g. SR-IOV VF BAR sizing). There are no convenient hooks for us to subscribe to so register MCFG areas earlier upon the first invocation of xen_add_device(). It should be safe to do once since all the boot time buses must have their MCFG areas in MCFG table already and we don't support PCI bus hot-plug. Signed-off-by: Igor Druzhinin Reviewed-by: Boris Ostrovsky Signed-off-by: Boris Ostrovsky Signed-off-by: Sasha Levin --- drivers/xen/pci.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/drivers/xen/pci.c b/drivers/xen/pci.c index 7494dbeb4409c..db58aaa4dc598 100644 --- a/drivers/xen/pci.c +++ b/drivers/xen/pci.c @@ -29,6 +29,8 @@ #include "../pci/pci.h" #ifdef CONFIG_PCI_MMCONFIG #include + +static int xen_mcfg_late(void); #endif static bool __read_mostly pci_seg_supported = true; @@ -40,7 +42,18 @@ static int xen_add_device(struct device *dev) #ifdef CONFIG_PCI_IOV struct pci_dev *physfn = pci_dev->physfn; #endif - +#ifdef CONFIG_PCI_MMCONFIG + static bool pci_mcfg_reserved = false; + /* + * Reserve MCFG areas in Xen on first invocation due to this being + * potentially called from inside of acpi_init immediately after + * MCFG table has been finally parsed. + */ + if (!pci_mcfg_reserved) { + xen_mcfg_late(); + pci_mcfg_reserved = true; + } +#endif if (pci_seg_supported) { struct { struct physdev_pci_device_add add; @@ -213,7 +226,7 @@ static int __init register_xen_pci_notifier(void) arch_initcall(register_xen_pci_notifier); #ifdef CONFIG_PCI_MMCONFIG -static int __init xen_mcfg_late(void) +static int xen_mcfg_late(void) { struct pci_mmcfg_region *cfg; int rc; @@ -252,8 +265,4 @@ static int __init xen_mcfg_late(void) } return 0; } -/* - * Needs to be done after acpi_init which are subsys_initcall. - */ -subsys_initcall_sync(xen_mcfg_late); #endif -- 2.20.1