From patchwork Wed Oct 18 11:40:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 10014431 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 22EB060211 for ; Wed, 18 Oct 2017 11:43:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21C4E28B09 for ; Wed, 18 Oct 2017 11:43:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1699C28B27; Wed, 18 Oct 2017 11:43:09 +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, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7CD7528B09 for ; Wed, 18 Oct 2017 11:43:08 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e4mig-0004Fe-Vn; Wed, 18 Oct 2017 11:41:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e4mif-0004BE-Ky for xen-devel@lists.xenproject.org; Wed, 18 Oct 2017 11:41:05 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 81/BB-07262-1DD37E95; Wed, 18 Oct 2017 11:41:05 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrOIsWRWlGSWpSXmKPExsXitHSDve5Z2+e RBv0HZS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozu/nXMBf2yFTd+NLA3MN4Q72Lk5JAQ8JfY /fYNG4jNJqAjcXHuTiCbg0NEQEXi9l6DLkYuDmaBDYwS0x/fZgWpERZIkmie1sgCYrMIqEqs/ 9AA1ssrYCVx78UEdpBeCQE9iR/bDUHCnEDhyXMamEBsIQFLiasXGxghygUlTs58AjaGWUBTon X7b3YIW16ieetsZoh6RYn+eQ/YJjDyzULSMgtJyywkLQsYmVcxqhenFpWlFuka6yUVZaZnlOQ mZuboGhoY6+WmFhcnpqfmJCYV6yXn525iBAYaAxDsYGz+4nSIUZKDSUmUV/fAs0ghvqT8lMqM xOKM+KLSnNTiQ4wyHBxKErxWwMAVEixKTU+tSMvMAYY8TFqCg0dJhHe1NVCat7ggMbc4Mx0id YpRl6Pj5t0/TEIsefl5qVLivAIgMwRAijJK8+BGwOLvEqOslDAvI9BRQjwFqUW5mSWo8q8YxT kYlYR5ZUCm8GTmlcBtegV0BBPQEeucnoAcUZKIkJJqYGx9Zxa1YKWxx8zWiPYkg4Kec3feSTy tqYvtyTgkKFmlusFIM21O23F7GzdpE4Gcbg3rbWdPN9kkbTC7ut+W1ZErZ8eB83WGcafWax/d /9P4qQS/oMq/mUu/C3/U5HjgHXW2LOFW5c3ytiebvx7dePF/6LW9XC23nE9/aV76vffrTHUv+ TefFyixFGckGmoxFxUnAgCYTYSYugIAAA== X-Env-Sender: prvs=457281bb7=roger.pau@citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1508326859!103276370!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40644 invoked from network); 18 Oct 2017 11:41:01 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-7.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 18 Oct 2017 11:41:01 -0000 X-IronPort-AV: E=Sophos;i="5.43,396,1503360000"; d="scan'208";a="454771756" From: Roger Pau Monne To: Date: Wed, 18 Oct 2017 12:40:33 +0100 Message-ID: <20171018114034.36587-12-roger.pau@citrix.com> X-Mailer: git-send-email 2.13.5 (Apple Git-94) In-Reply-To: <20171018114034.36587-1-roger.pau@citrix.com> References: <20171018114034.36587-1-roger.pau@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , boris.ostrovsky@oracle.com, Roger Pau Monne , Jan Beulich , konrad.wilk@oracle.com Subject: [Xen-devel] [PATCH v7 for-next 11/12] vpci: add a priority parameter to the vPCI register initializer X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This is needed for MSI-X, since MSI-X will need to be initialized before parsing the BARs, so that the header BAR handlers are aware of the MSI-X related holes and make sure they are not mapped in order for the trap handlers to work properly. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- Cc: Jan Beulich Cc: Andrew Cooper --- Changes since v4: - Add a middle priority and add the PCI header to it. Changes since v3: - Add a numerial suffix to the section used to store the pointer to each initializer function, and sort them at link time. --- xen/arch/arm/xen.lds.S | 4 ++-- xen/arch/x86/xen.lds.S | 4 ++-- xen/drivers/vpci/header.c | 2 +- xen/drivers/vpci/msi.c | 2 +- xen/include/xen/vpci.h | 8 ++++++-- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index 98b82680c6..f2e213b3c2 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -69,7 +69,7 @@ SECTIONS #if defined(CONFIG_HAS_PCI) && defined(CONFIG_LATE_HWDOM) . = ALIGN(POINTER_ALIGN); __start_vpci_array = .; - *(.data.vpci) + *(SORT(.data.vpci.*)) __end_vpci_array = .; #endif } :text @@ -184,7 +184,7 @@ SECTIONS #if defined(CONFIG_HAS_PCI) && !defined(CONFIG_LATE_HWDOM) . = ALIGN(POINTER_ALIGN); __start_vpci_array = .; - *(.data.vpci) + *(SORT(.data.vpci.*)) __end_vpci_array = .; #endif } :text diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 6c50916ed2..ee1ab4929b 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -128,7 +128,7 @@ SECTIONS #if defined(CONFIG_HAS_PCI) && defined(CONFIG_LATE_HWDOM) . = ALIGN(POINTER_ALIGN); __start_vpci_array = .; - *(.data.vpci) + *(SORT(.data.vpci.*)) __end_vpci_array = .; #endif } :text @@ -224,7 +224,7 @@ SECTIONS #if defined(CONFIG_HAS_PCI) && !defined(CONFIG_LATE_HWDOM) . = ALIGN(POINTER_ALIGN); __start_vpci_array = .; - *(.data.vpci) + *(SORT(.data.vpci.*)) __end_vpci_array = .; #endif } :text diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index a03efffc71..170fa3bbbf 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -505,7 +505,7 @@ static int init_bars(struct pci_dev *pdev) return 0; } -REGISTER_VPCI_INIT(init_bars); +REGISTER_VPCI_INIT(init_bars, VPCI_PRIORITY_MIDDLE); /* * Local variables: diff --git a/xen/drivers/vpci/msi.c b/xen/drivers/vpci/msi.c index 81d856b5d0..37397c938a 100644 --- a/xen/drivers/vpci/msi.c +++ b/xen/drivers/vpci/msi.c @@ -283,7 +283,7 @@ static int init_msi(struct pci_dev *pdev) return 0; } -REGISTER_VPCI_INIT(init_msi); +REGISTER_VPCI_INIT(init_msi, VPCI_PRIORITY_LOW); void vpci_dump_msi(void) { diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index e825a705b6..219427940a 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -15,9 +15,13 @@ typedef void vpci_write_t(const struct pci_dev *pdev, unsigned int reg, typedef int vpci_register_init_t(struct pci_dev *dev); -#define REGISTER_VPCI_INIT(x) \ +#define VPCI_PRIORITY_HIGH "1" +#define VPCI_PRIORITY_MIDDLE "5" +#define VPCI_PRIORITY_LOW "9" + +#define REGISTER_VPCI_INIT(x, p) \ static vpci_register_init_t *const x##_entry \ - __used_section(".data.vpci") = x + __used_section(".data.vpci." p) = x /* Add vPCI handlers to device. */ int __must_check vpci_add_handlers(struct pci_dev *dev);