From patchwork Wed Jun 8 12:54:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9164527 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 742E260467 for ; Wed, 8 Jun 2016 12:56:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64C7C28179 for ; Wed, 8 Jun 2016 12:56:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 597772823D; Wed, 8 Jun 2016 12:56: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 2574128179 for ; Wed, 8 Jun 2016 12:56: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 1bAczu-0007cn-1b; Wed, 08 Jun 2016 12:54:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bAczs-0007cV-OG for xen-devel@lists.xenproject.org; Wed, 08 Jun 2016 12:54:12 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 6E/B2-17405-37518575; Wed, 08 Jun 2016 12:54:11 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrFIsWRWlGSWpSXmKPExsXS6fjDS7dYNCL cYP4ULovvWyYzOTB6HP5whSWAMYo1My8pvyKBNePJt0fMBQcVKuZP9GtgvCTdxcjJISSQJ3Fp 2htmEJtXwE5izcSt7CC2hIChxL75q9hAbBYBVYm/c6eAxdkE1CXanm1n7WLk4BARMJA4dzQJx GQW0JfYto4FpEIYaMraN8eYIKbbSXSe6gebzilgL/GzdTUjSDmvgKDE3x3CIGFmoJJDK/awTm DkmYWQmYUkA2FrSTz8dYsFwtaWWLbwNfMssL3SEsv/cUCY1hLfX5SgqgCx3SR69q1lW8DIsYp Rozi1qCy1SNfQWC+pKDM9oyQ3MTNH19DAWC83tbg4MT01JzGpWC85P3cTIzBMGYBgB+O27Z6H GCU5mJREeRXdw8OF+JLyUyozEosz4otKc1KLDzHKcHAoSfCWi0SECwkWpaanVqRl5gAjBiYtw cGjJMI7EyTNW1yQmFucmQ6ROsWoKCXO2wiSEABJZJTmwbXBovQSo6yUMC8j0CFCPAWpRbmZJa jyrxjFORiVhHlNQKbwZOaVwE1/BbSYCWjx8iPhIItLEhFSUg2MM17PXb5CcW2rtdeejLubX/2 csdqtjD9z2ZzZW5rXbuNZavB9xYljfsePfIouO310R1p9zxOm/nc8F0PMXBv2St8oVbz5/ePp K253GnMKz7X4HuFyd/7ZImTbpCWmcvtfhey8fr+Z7n/3/zCdfPDfowfbel4laF0QOXWq6/efb Tn6piKTN0ZwuSmxFGckGmoxFxUnAgD0ple4zQIAAA== X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1465390449!44461019!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29733 invoked from network); 8 Jun 2016 12:54:10 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-8.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Jun 2016 12:54:10 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Wed, 08 Jun 2016 06:54:08 -0600 Message-Id: <5758318D02000078000F30AA@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.0 Date: Wed, 08 Jun 2016 06:54:05 -0600 From: "Jan Beulich" To: "xen-devel" References: <5758302D02000078000F3087@prv-mh.provo.novell.com> In-Reply-To: <5758302D02000078000F3087@prv-mh.provo.novell.com> Mime-Version: 1.0 Cc: Andrew Cooper Subject: [Xen-devel] [PATCH 3/4] x86/vMSI-X: drop pci_msix_get_table_len() 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 We can calculate the needed value at the single use site more easily. Signed-off-by: Jan Beulich x86/vMSI-X: drop pci_msix_get_table_len() We can calculate the needed value at the single use site more easily. Signed-off-by: Jan Beulich --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -411,7 +411,7 @@ static void add_msixtbl_entry(struct dom INIT_RCU_HEAD(&entry->rcu); atomic_set(&entry->refcnt, 0); - entry->table_len = pci_msix_get_table_len(pdev); + entry->table_len = pdev->msix->nr_entries * PCI_MSIX_ENTRY_SIZE; entry->pdev = pdev; entry->gtable = (unsigned long) gtable; --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -1463,27 +1463,6 @@ int pci_restore_msi_state(struct pci_dev return 0; } -unsigned int pci_msix_get_table_len(struct pci_dev *pdev) -{ - int pos; - u16 control, seg = pdev->seg; - u8 bus, slot, func; - unsigned int len; - - bus = pdev->bus; - slot = PCI_SLOT(pdev->devfn); - func = PCI_FUNC(pdev->devfn); - - pos = pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSIX); - if ( !pos || !use_msi ) - return 0; - - control = pci_conf_read16(seg, bus, slot, func, msix_control_reg(pos)); - len = msix_table_size(control) * PCI_MSIX_ENTRY_SIZE; - - return len; -} - static int msi_cpu_callback( struct notifier_block *nfb, unsigned long action, void *hcpu) { --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -91,8 +91,6 @@ extern void teardown_msi_irq(int irq); extern int msi_free_vector(struct msi_desc *entry); extern int pci_restore_msi_state(struct pci_dev *pdev); -extern unsigned int pci_msix_get_table_len(struct pci_dev *pdev); - struct msi_desc { struct msi_attrib { __u8 type; /* {0: unused, 5h:MSI, 11h:MSI-X} */ Reviewed-by: Andrew Cooper --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -411,7 +411,7 @@ static void add_msixtbl_entry(struct dom INIT_RCU_HEAD(&entry->rcu); atomic_set(&entry->refcnt, 0); - entry->table_len = pci_msix_get_table_len(pdev); + entry->table_len = pdev->msix->nr_entries * PCI_MSIX_ENTRY_SIZE; entry->pdev = pdev; entry->gtable = (unsigned long) gtable; --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -1463,27 +1463,6 @@ int pci_restore_msi_state(struct pci_dev return 0; } -unsigned int pci_msix_get_table_len(struct pci_dev *pdev) -{ - int pos; - u16 control, seg = pdev->seg; - u8 bus, slot, func; - unsigned int len; - - bus = pdev->bus; - slot = PCI_SLOT(pdev->devfn); - func = PCI_FUNC(pdev->devfn); - - pos = pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSIX); - if ( !pos || !use_msi ) - return 0; - - control = pci_conf_read16(seg, bus, slot, func, msix_control_reg(pos)); - len = msix_table_size(control) * PCI_MSIX_ENTRY_SIZE; - - return len; -} - static int msi_cpu_callback( struct notifier_block *nfb, unsigned long action, void *hcpu) { --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -91,8 +91,6 @@ extern void teardown_msi_irq(int irq); extern int msi_free_vector(struct msi_desc *entry); extern int pci_restore_msi_state(struct pci_dev *pdev); -extern unsigned int pci_msix_get_table_len(struct pci_dev *pdev); - struct msi_desc { struct msi_attrib { __u8 type; /* {0: unused, 5h:MSI, 11h:MSI-X} */