From patchwork Tue Jun 7 06:31:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9159901 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 4734C60572 for ; Tue, 7 Jun 2016 06:33:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3802427248 for ; Tue, 7 Jun 2016 06:33:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C95F2823D; Tue, 7 Jun 2016 06:33:47 +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 9FE7E27248 for ; Tue, 7 Jun 2016 06:33:46 +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 1bAAYJ-0002s1-0D; Tue, 07 Jun 2016 06:31:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bAAYH-0002ru-RJ for xen-devel@lists.xenproject.org; Tue, 07 Jun 2016 06:31:49 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id FE/12-09542-55A66575; Tue, 07 Jun 2016 06:31:49 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrEIsWRWlGSWpSXmKPExsXS6fjDSzckKyz c4OcOfovvWyYzOTB6HP5whSWAMYo1My8pvyKBNePBzzbmgn6JiqfrDBoYbwp3MXJyCAnkSbS3 b2ftYuTg4BWwk7h00QskLCFgKLFv/io2EJtFQFXix+PVzCA2m4C6RNszkHIuDhGBLYwSHSv7w YqYBQIl5s7eyQIyRxhozoofQhDj7SQ+zNzACmJzCthLPN+7kg1ilaDE3x3CEJ1aEg9/3WKBsL Ulli18zQxSwiwgLbH8H8cERr5ZCA2zkDTMQtIwC6FhASPLKkb14tSistQiXUu9pKLM9IyS3MT MHF1DQxO93NTi4sT01JzEpGK95PzcTYzAsGMAgh2M/VOcDzFKcjApifI+9A4LF+JLyk+pzEgs zogvKs1JLT7EKMPBoSTBG5MJlBMsSk1PrUjLzAFGAExagoNHSYT3TQZQmre4IDG3ODMdInWKU VFKnJcDpE8AJJFRmgfXBou6S4yyUsK8jECHCPEUpBblZpagyr9iFOdgVBLmdQSZwpOZVwI3/R XQYiagxcuuBYMsLklESEk1MGpO4t0icGfztlLhL0s3/LL9Vc0lccg3v/Xo/lTpf/NlIyfHNN1 mCkp42rP8vFGaVLyu8YOQc3ozJGXe1y0oX230/U75H6dfN57d1a87aLzz/iuDrolt0+I46i1/ fj8VnRaenqm2yeSk9xvulxd9mr7cUAvyeXZp9Un7d+9+/X9lbdZ2TYO7c6USS3FGoqEWc1FxI gA/MB9ptQIAAA== X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1465281106!46239063!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26114 invoked from network); 7 Jun 2016 06:31:47 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-6.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 7 Jun 2016 06:31:47 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Tue, 07 Jun 2016 00:31:45 -0600 Message-Id: <5756866F02000078000F269D@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.0 Date: Tue, 07 Jun 2016 00:31:43 -0600 From: "Jan Beulich" To: "David Vrabel" , "Boris Ostrovsky" , "Konrad Rzeszutek Wilk" , "Juergen Gross" References: <5756857802000078000F268D@prv-mh.provo.novell.com> In-Reply-To: <5756857802000078000F268D@prv-mh.provo.novell.com> Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel , linux-kernel@vger.kernel.org Subject: [Xen-devel] [PATCH v2 2/2] xen-pciback: clean up {bar,rom}_init() 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 - drop unused function parameter of read_dev_bar() - drop rom_init() (now identical to bar_init()) - fold read_dev_bar() into its now single caller - simplify determination of 64-bit memory resource - use const and unsigned Signed-off-by: Jan Beulich Reviewed-by: Boris Ostrovsky --- v2: fold in 3rd patch and drop read_dev_bar() (as requested by Boris) --- drivers/xen/xen-pciback/conf_space_header.c | 57 ++++++++-------------------- 1 file changed, 17 insertions(+), 40 deletions(-) --- 4.7-rc2-xen-pciback-BAR.orig/drivers/xen/xen-pciback/conf_space_header.c +++ 4.7-rc2-xen-pciback-BAR/drivers/xen/xen-pciback/conf_space_header.c @@ -209,58 +209,35 @@ static int bar_read(struct pci_dev *dev, return 0; } -static inline void read_dev_bar(struct pci_dev *dev, - struct pci_bar_info *bar_info, int offset, - u32 len_mask) +static void *bar_init(struct pci_dev *dev, int offset) { - int pos; - struct resource *res = dev->resource; + unsigned int pos; + const struct resource *res = dev->resource; + struct pci_bar_info *bar = kzalloc(sizeof(*bar), GFP_KERNEL); + + if (!bar) + return ERR_PTR(-ENOMEM); if (offset == PCI_ROM_ADDRESS || offset == PCI_ROM_ADDRESS1) pos = PCI_ROM_RESOURCE; else { pos = (offset - PCI_BASE_ADDRESS_0) / 4; - if (pos && ((res[pos - 1].flags & (PCI_BASE_ADDRESS_SPACE | - PCI_BASE_ADDRESS_MEM_TYPE_MASK)) == - (PCI_BASE_ADDRESS_SPACE_MEMORY | - PCI_BASE_ADDRESS_MEM_TYPE_64))) { - bar_info->val = res[pos - 1].start >> 32; - bar_info->len_val = -resource_size(&res[pos - 1]) >> 32; - return; + if (pos && (res[pos - 1].flags & IORESOURCE_MEM_64)) { + bar->val = res[pos - 1].start >> 32; + bar->len_val = -resource_size(&res[pos - 1]) >> 32; + return bar; } } if (!res[pos].flags || (res[pos].flags & (IORESOURCE_DISABLED | IORESOURCE_UNSET | IORESOURCE_BUSY))) - return; - - bar_info->val = res[pos].start | - (res[pos].flags & PCI_REGION_FLAG_MASK); - bar_info->len_val = -resource_size(&res[pos]) | - (res[pos].flags & PCI_REGION_FLAG_MASK); -} + return bar; -static void *bar_init(struct pci_dev *dev, int offset) -{ - struct pci_bar_info *bar = kzalloc(sizeof(*bar), GFP_KERNEL); - - if (!bar) - return ERR_PTR(-ENOMEM); - - read_dev_bar(dev, bar, offset, ~0); - - return bar; -} - -static void *rom_init(struct pci_dev *dev, int offset) -{ - struct pci_bar_info *bar = kzalloc(sizeof(*bar), GFP_KERNEL); - - if (!bar) - return ERR_PTR(-ENOMEM); - - read_dev_bar(dev, bar, offset, ~PCI_ROM_ADDRESS_ENABLE); + bar->val = res[pos].start | + (res[pos].flags & PCI_REGION_FLAG_MASK); + bar->len_val = -resource_size(&res[pos]) | + (res[pos].flags & PCI_REGION_FLAG_MASK); return bar; } @@ -383,7 +360,7 @@ static const struct config_field header_ { \ .offset = reg_offset, \ .size = 4, \ - .init = rom_init, \ + .init = bar_init, \ .reset = bar_reset, \ .release = bar_release, \ .u.dw.read = bar_read, \