From patchwork Thu Feb 25 02:12:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 587877 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 79EEB1400CB for ; Thu, 25 Feb 2016 13:27:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759508AbcBYC1Z (ORCPT ); Wed, 24 Feb 2016 21:27:25 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:39749 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759363AbcBYCSo (ORCPT ); Wed, 24 Feb 2016 21:18:44 -0500 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u1P2DRFN019139 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 25 Feb 2016 02:13:27 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0022.oracle.com (8.14.4/8.13.8) with ESMTP id u1P2DQRj014433 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Thu, 25 Feb 2016 02:13:26 GMT Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by aserv0122.oracle.com (8.13.8/8.13.8) with ESMTP id u1P2DQSu005117; Thu, 25 Feb 2016 02:13:26 GMT Received: from userv0022.oracle.com (/10.132.126.176) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 24 Feb 2016 18:13:26 -0800 From: Yinghai Lu To: Bjorn Helgaas , David Miller , Benjamin Herrenschmidt , Wei Yang , TJ , Yijing Wang , Khalid Aziz Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH v10 38/59] PCI: Separate out save_resources()/restore_resources() Date: Wed, 24 Feb 2016 18:12:29 -0800 Message-Id: <1456366370-28995-39-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1456366370-28995-1-git-send-email-yinghai@kernel.org> References: <1456366370-28995-1-git-send-email-yinghai@kernel.org> X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org We need to save/restore resources several times for alt_size support, separate the save_resources()/resources() to save some lines later. Signed-off-by: Yinghai Lu --- drivers/pci/setup-bus.c | 49 ++++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 4d9cf1b..a84e0c3 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -436,6 +436,29 @@ static bool pci_need_to_release(unsigned long mask, struct resource *res) return false; /* should not get here */ } +static bool save_resources(struct list_head *head, + struct list_head *save_head) +{ + struct pci_dev_resource *dev_res; + + /* Save original start, end, flags etc at first */ + list_for_each_entry(dev_res, head, list) + if (add_to_list(save_head, dev_res->dev, dev_res->res)) { + free_list(save_head); + return false; + } + + return true; +} + +static void restore_resource(struct pci_dev_resource *save_res, + struct resource *res) +{ + res->start = save_res->start; + res->end = save_res->end; + res->flags = save_res->flags; +} + static void __assign_resources_sorted(struct list_head *head, struct list_head *realloc_head, struct list_head *fail_head) @@ -473,13 +496,8 @@ static void __assign_resources_sorted(struct list_head *head, if (!realloc_head || list_empty(realloc_head)) goto requested_and_reassign; - /* Save original start, end, flags etc at first */ - list_for_each_entry(dev_res, head, list) { - if (add_to_list(&save_head, dev_res->dev, dev_res->res)) { - free_list(&save_head); - goto requested_and_reassign; - } - } + if (!save_resources(head, &save_head)) + goto requested_and_reassign; /* Update res in head list with add_size in realloc_head list */ list_for_each_entry(dev_res, head, list) { @@ -548,12 +566,9 @@ static void __assign_resources_sorted(struct list_head *head, } } /* Restore start/end/flags from saved list */ - list_for_each_entry(save_res, &save_head, list) { - res = save_res->res; - res->start = save_res->start; - res->end = save_res->end; - res->flags = save_res->flags; - } + list_for_each_entry(save_res, &save_head, list) + restore_resource(save_res, save_res->res); + free_list(&save_head); requested_and_reassign: @@ -2025,9 +2040,7 @@ again: list_for_each_entry(fail_res, &fail_head, list) { struct resource *res = fail_res->res; - res->start = fail_res->start; - res->end = fail_res->end; - res->flags = fail_res->flags; + restore_resource(fail_res, res); if (fail_res->dev->subordinate) { res->flags = 0; /* last or third times and later */ @@ -2111,9 +2124,7 @@ again: list_for_each_entry(fail_res, &fail_head, list) { struct resource *res = fail_res->res; - res->start = fail_res->start; - res->end = fail_res->end; - res->flags = fail_res->flags; + restore_resource(fail_res, res); if (fail_res->dev->subordinate) { res->flags = 0; /* last time */