From patchwork Fri Apr 25 17:16:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 4064841 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 551509F1F4 for ; Fri, 25 Apr 2014 17:18:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7A3FD20263 for ; Fri, 25 Apr 2014 17:18:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A4398200CC for ; Fri, 25 Apr 2014 17:18:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752641AbaDYRQz (ORCPT ); Fri, 25 Apr 2014 13:16:55 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:47294 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752141AbaDYRQf (ORCPT ); Fri, 25 Apr 2014 13:16:35 -0400 Received: by mail-pa0-f50.google.com with SMTP id rd3so3407661pab.9 for ; Fri, 25 Apr 2014 10:16:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=1KP70j4Ur7tAmps7u6dg1LpJr68ytTTQS1lvMxwVuWM=; b=JMJogHL8I79ZtfOviSAKciuCmhY611foAeLCghssNkyn5blpWp/yLv3YJI3BzDVrk+ k0c4p7g6fZyz8TaEiMSE8e5QiRcIbDeD8N/ONoxx2fEeDMdigii0sciloayBUbMp66Hw 7P2E4i1j5/mFNyrT7APXk1M8ZdgiK5aWPjqmG+FxX0Tv5I2qFCjs+zMhsEuAbeBzV4y1 9WePAT+YXFz8ZCxk+0MWcL5rTHzeJO1W2w6IwZZ83SHFXjZYhq4wigoy5qv6tsQUNXAT 5O4rWuWE2vO5fxT+r5XCrQryyXsCoN6uP0n96J+Vf02u/f4RKN5OKBKYHD9Vv4ZSTnhs K66A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=1KP70j4Ur7tAmps7u6dg1LpJr68ytTTQS1lvMxwVuWM=; b=EMx1l81xQNxxnOvqWoU+jGHNC+urG1ru3DpWSm3ZcTvKPWUBsfJ82DXVzMS5fFxvhr tX/LhwNAbWnAGDt6DSnTkvxSvTN+46vkNcGfswiMuooqixqlTXFh60HvUgTf4LXJexcW MI0dNxCW0qwmuOSwfdlHFKStF1589mCY8ZtHM25qAsfw5JpDXpFyTqBS+XAqaBMglWzh SMp3Slil5Qbb4dzzF+WRQgshow8dM9G8OnbR98D7ptQIeHjEjjkeYKaYCzAxZ+PNIiWO eSSNK+P4DMWPn48sVXiBnRDPwwZqpKrAw599nTEPc69+iaTOHonjVrhKfdx9kavDPzle DU8Q== X-Gm-Message-State: ALoCoQl5txlVDZxunPeSTolPwSGktXei2OhfaZYUWuDm4cOYX/i2p3IT/uIu8g5egt81DuB6PT/g1+qq/PSvOt7ektDk/7PuVEXVy2DC+bOr/5IebCRxFxrQOTwt+gG7gsE7gbp4XkcYxSdkvPUfWbXudKUNz1+W9AyIBhHc0fU7WF+K6peeiNRdQmyD5pjLmzNcb8wLqg3L566uuUXTOY6ZPHoJJajsy05F+kIEZ+dEzR7Ut1pFQSo= X-Received: by 10.68.201.10 with SMTP id jw10mr12691867pbc.25.1398446195066; Fri, 25 Apr 2014 10:16:35 -0700 (PDT) Received: from localhost ([172.19.243.187]) by mx.google.com with ESMTPSA id ck10sm10734323pac.0.2014.04.25.10.16.33 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 25 Apr 2014 10:16:34 -0700 (PDT) Subject: [PATCH 1/4] x86/PCI: Don't try to move IORESOURCE_PCI_FIXED resources To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: David Airlie , Bodo Eggert <7eggert@gmx.de>, x86@kernel.org, linux-kernel@vger.kernel.org Date: Fri, 25 Apr 2014 11:16:31 -0600 Message-ID: <20140425171631.312.6079.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20140425171144.312.9601.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20140425171144.312.9601.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Don't attempt to move resource marked IORESOURCE_PCI_FIXED, even if pci_claim_resource() fails. In some cases, these are legacy resources that cannot be moved. Signed-off-by: Bjorn Helgaas --- arch/x86/pci/i386.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index db6b1ab43255..6db58d68feb5 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c @@ -271,11 +271,16 @@ static void pcibios_allocate_dev_resources(struct pci_dev *dev, int pass) "BAR %d: reserving %pr (d=%d, p=%d)\n", idx, r, disabled, pass); if (pci_claim_resource(dev, idx) < 0) { - /* We'll assign a new address later */ - pcibios_save_fw_addr(dev, - idx, r->start); - r->end -= r->start; - r->start = 0; + if (r->flags & IORESOURCE_PCI_FIXED) { + dev_info(&dev->dev, "BAR %d %pR is immovable\n", + idx, r); + } else { + /* We'll assign a new address later */ + pcibios_save_fw_addr(dev, + idx, r->start); + r->end -= r->start; + r->start = 0; + } } } }