From patchwork Wed Apr 30 00:59:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 344039 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 B61071400B7 for ; Wed, 30 Apr 2014 11:01:29 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755210AbaD3BAF (ORCPT ); Tue, 29 Apr 2014 21:00:05 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:54278 "EHLO mail-ie0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754500AbaD3BAB (ORCPT ); Tue, 29 Apr 2014 21:00:01 -0400 Received: by mail-ie0-f173.google.com with SMTP id rp18so1147389iec.18 for ; Tue, 29 Apr 2014 18:00:00 -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=671Mkao2DY5d+WDi5OPvKD7OIk7zo3PHUAX0BA+cOjg=; b=f9pQL8XocMbWzVMgPJgWh2tgwZoSVs74CWbNJ5uzijRXIIAqr1mRbE5O0o6IyDvaWo n0XKRIF8yOCkevcC6PSm3Cz/vn9elzhe9erGtvyzJQZpNSSIt2fqVjs/cO9jrGySIh+C uhg5lIKG7kG5WaLC+/crbQrzdloBwWpYVeg9Xq/0j0NlWy6jnmqcBNhkjTxpwN/TYpB1 n6LqZbF6zq5NcAE3GYwYqhY7l/fb5df6xjYA+6rmKBjY/CiTxGri5N3OPVgrTA8AJR0d cTv/9dGjS2+UbR5bW9AUcmFTywI2gBP/qklT686xjLI4qBTWHm3SN+KZ0T7F6nK03GkH 9U4Q== 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=671Mkao2DY5d+WDi5OPvKD7OIk7zo3PHUAX0BA+cOjg=; b=iPT0Q/L3sImJ8bq8LjwgAwf6/F+KSN78R0SNB1URMslONGwaXN9O6aKs0nlcn4prJE +h4R7WecOU7xLbhB7PqQCEIkVk1Ffr5NAcScniDD6VwYw7W2eAFd+c6ogsorPJ5qlDxo rXdrA15iaqfUNDRw3GweCxBMH3tCgxRQKAlOwS0feev8FNyg55GfzA7CRhbgx+H6YmY2 dZRK9hrcklYywpwuqfOOAgT4Z7UMuBm1nMzAnEu+/QT99fvZNQa14EH2m0rlRQ/YEqHJ fDLJ77XGFS0rEEmeq8o75Ml90+sis4RB8/t30dzPGqkFjG+O0X8TX/YyNiNhimKiPW4U vrNQ== X-Gm-Message-State: ALoCoQnJt8lPxW7+cdwW3g520uyD7w0sXF+O6APeD9z5IecGNeFX8k+kkuSA0P16nbbkAhljcOSyMqmRoFFjpQiaU8tiRpyIG7t/C5bWLvkVgT4CGoPVqxzsMoJqGr96ABYv2UddP7q/vaMaEuXIM6VgI3LxhT1KuaCRsQTQR98/XJBbWcXVsaIlo/avggrx+k7WFgWhwYjU7cPgr8VNXDRrXK0638k0EAgaiQ8s7O4JOPBoCR9xoOk= X-Received: by 10.50.30.6 with SMTP id o6mr34593275igh.43.1398819600609; Tue, 29 Apr 2014 18:00:00 -0700 (PDT) Received: from localhost ([172.16.51.53]) by mx.google.com with ESMTPSA id ie20sm67828igb.10.2014.04.29.18.00.00 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 29 Apr 2014 18:00:00 -0700 (PDT) Subject: [PATCH 3/7] PCI: Don't convert BAR address to resource if dma_addr_t is too small To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: linux-kernel@vger.kernel.org Date: Tue, 29 Apr 2014 18:59:59 -0600 Message-ID: <20140430005958.13138.17945.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20140430005642.13138.99577.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20140430005642.13138.99577.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 If dma_addr_t is too small to represent the BAR value, pcibios_bus_to_resource() will fail, so just remember the BAR size directly in the resource. The resource is already marked UNSET, so we know the address isn't valid anyway. Signed-off-by: Bjorn Helgaas --- drivers/pci/probe.c | 5 +++-- 1 file changed, 3 insertions(+), 2 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/drivers/pci/probe.c b/drivers/pci/probe.c index afae3bf405fa..82cd75f6118a 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -258,9 +258,10 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, pci_write_config_dword(dev, pos, 0); pci_write_config_dword(dev, pos + 4, 0); res->flags |= IORESOURCE_UNSET; - region.start = 0; - region.end = sz64; + res->start = 0; + res->end = sz64; bar_disabled = true; + goto out; } else { region.start = l64; region.end = l64 + sz64;