From patchwork Wed Sep 15 21:09:02 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Bjorn Helgaas <bjorn.helgaas@hp.com>
X-Patchwork-Id: 183542
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8FL9WM7003750
	for <patchwork-pci@patchwork.kernel.org>;
	Wed, 15 Sep 2010 21:09:32 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753015Ab0IOVJF (ORCPT
	<rfc822;patchwork-pci@patchwork.kernel.org>);
	Wed, 15 Sep 2010 17:09:05 -0400
Received: from g5t0006.atlanta.hp.com ([15.192.0.43]:1229 "EHLO
	g5t0006.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752789Ab0IOVJE (ORCPT
	<rfc822; linux-pci@vger.kernel.org>); Wed, 15 Sep 2010 17:09:04 -0400
Received: from g5t0030.atlanta.hp.com (g5t0030.atlanta.hp.com [16.228.8.142])
	by g5t0006.atlanta.hp.com (Postfix) with ESMTP id 60207C193;
	Wed, 15 Sep 2010 21:09:03 +0000 (UTC)
Received: from ldl (ldl.fc.hp.com [15.11.146.30])
	by g5t0030.atlanta.hp.com (Postfix) with ESMTP id 191EB140B4;
	Wed, 15 Sep 2010 21:09:03 +0000 (UTC)
Received: from localhost (ldl.fc.hp.com [127.0.0.1])
	by ldl (Postfix) with ESMTP id E1A73CF0043;
	Wed, 15 Sep 2010 15:09:02 -0600 (MDT)
Received: from ldl ([127.0.0.1])
	by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id Z3qE6+NECNn2; Wed, 15 Sep 2010 15:09:02 -0600 (MDT)
Received: from eh.fc.hp.com (eh.fc.hp.com [15.11.146.105])
	by ldl (Postfix) with ESMTP id C7577CF0010;
	Wed, 15 Sep 2010 15:09:02 -0600 (MDT)
Received: from bob.kio (localhost [127.0.0.1])
	by eh.fc.hp.com (Postfix) with ESMTP id AC1B226108;
	Wed, 15 Sep 2010 15:09:02 -0600 (MDT)
Subject: [PATCH 1/3] x86/PCI: allocate space from the end of a region,
	not the beginning
To: Jesse Barnes <jbarnes@virtuousgeek.org>
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Brian Bloniarz <phunge0@hotmail.com>,
	Charles Butterfield <charles.butterfield@nextcentury.com>,
	Denys Vlasenko <dvlasenk@redhat.com>, linux-pci@vger.kernel.org,
	linux-kernel@vger.kernel.org, Stefan Becker <chemobejk@gmail.com>,
	"H. Peter Anvin" <hpa@zytor.com>, Yinghai Lu <yinghai@kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Ingo Molnar <mingo@elte.hu>
Date: Wed, 15 Sep 2010 15:09:02 -0600
Message-ID: <20100915210902.12365.19911.stgit@bob.kio>
In-Reply-To: <20100915210818.12365.58732.stgit@bob.kio>
References: <20100915210818.12365.58732.stgit@bob.kio>
User-Agent: StGit/0.15
MIME-Version: 1.0
Sender: linux-pci-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-pci.vger.kernel.org>
X-Mailing-List: linux-pci@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Wed, 15 Sep 2010 21:09:32 +0000 (UTC)


diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 5525309..1ff3e9f 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -65,7 +65,10 @@ pcibios_align_resource(void *data, const struct resource *res,
 			resource_size_t size, resource_size_t align)
 {
 	struct pci_dev *dev = data;
-	resource_size_t start = res->start;
+	resource_size_t start = ALIGN(res->end - size + 1, align);
+
+	if (start < res->start)
+		start = res->start;
 
 	if (res->flags & IORESOURCE_IO) {
 		if (skip_isa_ioresource_align(dev))