From patchwork Tue Jun 26 18:53:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 167451 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 B6545B6FA5 for ; Wed, 27 Jun 2012 04:58:28 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932162Ab2FZSyr (ORCPT ); Tue, 26 Jun 2012 14:54:47 -0400 Received: from acsinet15.oracle.com ([141.146.126.227]:29852 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932161Ab2FZSyp (ORCPT ); Tue, 26 Jun 2012 14:54:45 -0400 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q5QIsZwr003341 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 26 Jun 2012 18:54:35 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q5QIsYUH012552 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 26 Jun 2012 18:54:34 GMT Received: from abhmt110.oracle.com (abhmt110.oracle.com [141.146.116.62]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q5QIsYmK023092; Tue, 26 Jun 2012 13:54:34 -0500 Received: from linux-siqj.site (/10.132.126.50) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 26 Jun 2012 11:54:34 -0700 From: Yinghai Lu To: Bjorn Helgaas , Benjamin Herrenschmidt , Tony Luck , David Miller , x86 Cc: Dominik Brodowski , Andrew Morton , Linus Torvalds , Greg Kroah-Hartman , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu Subject: [PATCH -v12 03/15] resources: Replace registered resource in tree. Date: Tue, 26 Jun 2012 11:53:57 -0700 Message-Id: <1340736849-14875-4-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1340736849-14875-1-git-send-email-yinghai@kernel.org> References: <1340736849-14875-1-git-send-email-yinghai@kernel.org> X-Source-IP: acsinet21.oracle.com [141.146.126.237] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org We could have one resource inserted in tree at first during probing. Later we need to put real resource into the tree. So try to hold the lock to swap them. -v2: make it more generic to handle old one with children or no parent. Signed-off-by: Yinghai Lu Cc: Andrew Morton --- include/linux/ioport.h | 1 + kernel/resource.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 8292e8b..cbf3480 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -163,6 +163,7 @@ int probe_resource(struct resource *b_res, struct resource *busn_res, resource_size_t needed_size, struct resource **p, int skip_nr, int limit, int flags); +void replace_resource(struct resource *old_res, struct resource *new_res); struct resource *lookup_resource(struct resource *root, resource_size_t start); int adjust_resource(struct resource *res, resource_size_t start, resource_size_t size); diff --git a/kernel/resource.c b/kernel/resource.c index d5d9aef..8da0e76 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -1129,6 +1129,31 @@ reduce_needed_size: return ret; } +/* replace old with new in the resource tree */ +void replace_resource(struct resource *old, struct resource *new) +{ + struct resource *parent, *tmp, *p; + + write_lock(&resource_lock); + new->start = old->start; + new->end = old->end; + new->flags = old->flags; + + p = old->child; + while (p) { + tmp = p; + p = p->sibling; + __release_resource(tmp); + __request_resource(new, tmp); + } + parent = old->parent; + if (parent) { + __release_resource(old); + __request_resource(parent, new); + } + write_unlock(&resource_lock); +} + /* * Managed region resource */