From patchwork Tue Aug 12 16:25:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Dudau X-Patchwork-Id: 35288 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 77A9D203C5 for ; Tue, 12 Aug 2014 16:27:02 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id lf10sf72541898pab.5 for ; Tue, 12 Aug 2014 09:27:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=VwhTZD7qAKKS84mnoJhciSZGqyoNkZ717OrMllo9lBI=; b=GQK1BvaE1/bdbEvuWh2MGJHoQ39Wcz+jRQduDHX1EvaSPa4xTh0JuCYX4T+OBRM1E3 sWASO3Ng7+MmgFZGc6cp8e/FRFcOqptTWFkAaV0PWmgeYiq3BjGtEASB2ICn0PDKQWFR aIwI6aEUS3L5r3j9x2ne7nrx3Pxz/g0pzovKkMNiewyl8Jiv+/UNCt5wFZKwIX3WEoi5 9oFZLzn/HlYIqxCfsbopBTZBrKfG6iNACru6Meq+EOU5bND/gWUOx+VyHchkvcb4DDMi lLzmkgpKsgZLolcyFvuJ6yAkZZ+B7DcuUJm8j4CKm2r6y3T9bFvJFPakclf4NJJdhjTd E/0w== X-Gm-Message-State: ALoCoQmEIHl6ulK8Ei10HoFS0XForcrMNnK4A2DUehni8mv7qG2hgDI4UzGj0IxgePCw34n7lyAp X-Received: by 10.66.158.193 with SMTP id ww1mr2854419pab.12.1407860821763; Tue, 12 Aug 2014 09:27:01 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.30.197 with SMTP id d63ls173700qgd.82.gmail; Tue, 12 Aug 2014 09:27:01 -0700 (PDT) X-Received: by 10.220.110.77 with SMTP id m13mr5092667vcp.35.1407860821574; Tue, 12 Aug 2014 09:27:01 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id 20si2213730vdb.67.2014.08.12.09.27.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Aug 2014 09:27:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id hq11so13647501vcb.10 for ; Tue, 12 Aug 2014 09:27:01 -0700 (PDT) X-Received: by 10.52.120.51 with SMTP id kz19mr1512621vdb.95.1407860821478; Tue, 12 Aug 2014 09:27:01 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp262549vcb; Tue, 12 Aug 2014 09:27:00 -0700 (PDT) X-Received: by 10.70.40.131 with SMTP id x3mr5411258pdk.22.1407860820487; Tue, 12 Aug 2014 09:27:00 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pj8si12835044pdb.54.2014.08.12.09.26.59 for ; Tue, 12 Aug 2014 09:27:00 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753982AbaHLQ06 (ORCPT + 26 others); Tue, 12 Aug 2014 12:26:58 -0400 Received: from fw-tnat.cambridge.arm.com ([217.140.96.21]:54725 "EHLO cam-smtp0.cambridge.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753258AbaHLQ0v (ORCPT ); Tue, 12 Aug 2014 12:26:51 -0400 Received: from e106497-lin.cambridge.arm.com (e106497-lin.cambridge.arm.com [10.1.195.53]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id s7CGPPgY026280; Tue, 12 Aug 2014 17:25:27 +0100 From: Liviu Dudau To: Bjorn Helgaas , Catalin Marinas , Will Deacon , Benjamin Herrenschmidt , Arnd Bergmann , Russell King , Tanmay Inamdar , Grant Likely , Sinan Kaya , Jingoo Han , Kukjin Kim , Suravee Suthikulanit , linux-pci Cc: linux-arch , LKML , Device Tree ML , LAKML Subject: [PATCH v9 04/12] PCI: OF: Fix the conversion of IO ranges into IO resources. Date: Tue, 12 Aug 2014 17:25:17 +0100 Message-Id: <1407860725-25202-5-git-send-email-Liviu.Dudau@arm.com> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1407860725-25202-1-git-send-email-Liviu.Dudau@arm.com> References: <1407860725-25202-1-git-send-email-Liviu.Dudau@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: liviu.dudau@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The ranges property for a host bridge controller in DT describes the mapping between the PCI bus address and the CPU physical address. The resources framework however expects that the IO resources start at a pseudo "port" address 0 (zero) and have a maximum size of IO_SPACE_LIMIT. The conversion from pci ranges to resources failed to take that into account. In the process move the function into drivers/of/address.c as it now depends on pci_address_to_pio() code and make it return an error code. Cc: Grant Likely Cc: Rob Herring Cc: Arnd Bergmann Signed-off-by: Liviu Dudau --- drivers/of/address.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ include/linux/of_address.h | 13 ++----------- 2 files changed, 48 insertions(+), 11 deletions(-) diff --git a/drivers/of/address.c b/drivers/of/address.c index 4dab700..3735ac7 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -906,3 +906,49 @@ bool of_dma_is_coherent(struct device_node *np) return false; } EXPORT_SYMBOL_GPL(of_dma_is_coherent); + +/* + * of_pci_range_to_resource - Create a resource from an of_pci_range + * @range: the PCI range that describes the resource + * @np: device node where the range belongs to + * @res: pointer to a valid resource that will be updated to + * reflect the values contained in the range. + * + * Returns EINVAL if the range cannot be converted to resource. + * + * Note that if the range is an IO range, the resource will be converted + * using pci_address_to_pio() which can fail if it is called too early or + * if the range cannot be matched to any host bridge IO space (our case here). + * To guard against that we try to register the IO range first. + * If that fails we know that pci_address_to_pio() will do too. + */ +int of_pci_range_to_resource(struct of_pci_range *range, + struct device_node *np, struct resource *res) +{ + int err; + res->flags = range->flags; + res->parent = res->child = res->sibling = NULL; + res->name = np->full_name; + + if (res->flags & IORESOURCE_IO) { + unsigned long port = -1; + err = pci_register_io_range(range->cpu_addr, range->size); + if (err) + goto invalid_range; + port = pci_address_to_pio(range->cpu_addr); + if (port == (unsigned long)-1) { + err = -EINVAL; + goto invalid_range; + } + res->start = port; + } else { + res->start = range->cpu_addr; + } + res->end = res->start + range->size - 1; + return 0; + +invalid_range: + res->start = (resource_size_t)OF_BAD_ADDR; + res->end = (resource_size_t)OF_BAD_ADDR; + return err; +} diff --git a/include/linux/of_address.h b/include/linux/of_address.h index 28e6836..6015f21 100644 --- a/include/linux/of_address.h +++ b/include/linux/of_address.h @@ -23,17 +23,8 @@ struct of_pci_range { #define for_each_of_pci_range(parser, range) \ for (; of_pci_range_parser_one(parser, range);) -static inline void of_pci_range_to_resource(struct of_pci_range *range, - struct device_node *np, - struct resource *res) -{ - res->flags = range->flags; - res->start = range->cpu_addr; - res->end = range->cpu_addr + range->size - 1; - res->parent = res->child = res->sibling = NULL; - res->name = np->full_name; -} - +extern int of_pci_range_to_resource(struct of_pci_range *range, + struct device_node *np, struct resource *res); /* Translate a DMA address from device space to CPU space */ extern u64 of_translate_dma_address(struct device_node *dev, const __be32 *in_addr);