From patchwork Fri Mar 14 15:34:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Dudau X-Patchwork-Id: 26266 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DD209202DD for ; Fri, 14 Mar 2014 15:38:27 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id b6sf6535712yha.8 for ; Fri, 14 Mar 2014 08:38:27 -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=wYpbxGFYoat7lA0yiQE+wuIKYz5Nyn2sZO3lA/PqgSQ=; b=JjkcbvOVS0HtgMpQ1Fe/Y2VrdZSDkZ1iYROcYOkeu2vaTE6opW/GqTF2036EfGEvl5 wPrz3ZAqirdgm+IejGS+8yfgt8a5E9uNm2nguNhfDjMFBC+c8R89pEG/v5FMrn9EnMMa wJdtdNPBQIvgiNN/tZZgC3pg5eMiingmeaZGoNt0ymSttHH6mDnORHrc455BjlhBfed/ Tf4MG9fubEde9pdDSGXaogn48K7bz4MJl0vV85BvbFRYIoBScKO0EM3TfQ8NDaJTeb62 wnYSXzdmFhKc8m5bDKhi1C0ge9EispOWaNh0dJ7Hggl/rROwbiUkJ2AKHMRbioMOBR1A fWuQ== X-Gm-Message-State: ALoCoQnxG65HlXf3HHz9y/+KM2vIOXWNgnggpMQEWDwGaEfqfnkxHvLffgUpE2V/R86R+Qc+OL0X X-Received: by 10.58.127.66 with SMTP id ne2mr3136491veb.27.1394811507668; Fri, 14 Mar 2014 08:38:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.23.175 with SMTP id 44ls765158qgp.12.gmail; Fri, 14 Mar 2014 08:38:27 -0700 (PDT) X-Received: by 10.220.95.139 with SMTP id d11mr6870961vcn.21.1394811507565; Fri, 14 Mar 2014 08:38:27 -0700 (PDT) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id sr19si2203007vcb.146.2014.03.14.08.38.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Mar 2014 08:38:27 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.180; Received: by mail-ve0-f180.google.com with SMTP id jz11so2807949veb.25 for ; Fri, 14 Mar 2014 08:38:27 -0700 (PDT) X-Received: by 10.58.248.228 with SMTP id yp4mr502309vec.35.1394811507477; Fri, 14 Mar 2014 08:38:27 -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.220.78.9 with SMTP id i9csp28028vck; Fri, 14 Mar 2014 08:38:26 -0700 (PDT) X-Received: by 10.68.244.229 with SMTP id xj5mr9952586pbc.108.1394811506472; Fri, 14 Mar 2014 08:38:26 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yp10si4075602pab.339.2014.03.14.08.38.00; Fri, 14 Mar 2014 08:38:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755899AbaCNPhc (ORCPT + 26 others); Fri, 14 Mar 2014 11:37:32 -0400 Received: from fw-tnat.cambridge.arm.com ([217.140.96.21]:50982 "EHLO cam-smtp0.cambridge.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755485AbaCNPfN (ORCPT ); Fri, 14 Mar 2014 11:35:13 -0400 Received: from e106497-lin.cambridge.arm.com (e106497-lin.cambridge.arm.com [10.1.195.170]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id s2EFYWIA004053; Fri, 14 Mar 2014 15:34:32 GMT From: Liviu Dudau To: linux-pci , Bjorn Helgaas , Catalin Marinas , Will Deacon , Benjamin Herrenschmidt , linaro-kernel , Arnd Bergmann Cc: LKML , "devicetree@vger.kernel.org" , LAKML , Tanmay Inamdar , Grant Likely Subject: [PATCH v7 2/6] pci: OF: Fix the conversion of IO ranges into IO resources. Date: Fri, 14 Mar 2014 15:34:28 +0000 Message-Id: <1394811272-1547-3-git-send-email-Liviu.Dudau@arm.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1394811272-1547-1-git-send-email-Liviu.Dudau@arm.com> References: <1394811272-1547-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=neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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 message. Signed-off-by: Liviu Dudau Tested-by: Tanmay Inamdar --- drivers/of/address.c | 40 ++++++++++++++++++++++++++++++++++++ include/linux/of_address.h | 13 ++---------- 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/drivers/of/address.c b/drivers/of/address.c index be958ed..4eabd30 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -728,3 +728,43 @@ void __iomem *of_iomap(struct device_node *np, int index) return ioremap(res.start, resource_size(&res)); } EXPORT_SYMBOL(of_iomap); + +/** + * 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) +{ + res->flags = range->flags; + if (res->flags & IORESOURCE_IO) { + unsigned long port = -1; + int err = pci_register_io_range(range->cpu_addr, range->size); + if (err) + return err; + port = pci_address_to_pio(range->cpu_addr); + if (port == (unsigned long)-1) { + res->start = (resource_size_t)OF_BAD_ADDR; + res->end = (resource_size_t)OF_BAD_ADDR; + return -EINVAL; + } + res->start = port; + } else { + res->start = range->cpu_addr; + } + res->end = res->start + range->size - 1; + res->parent = res->child = res->sibling = NULL; + res->name = np->full_name; + return 0; +} diff --git a/include/linux/of_address.h b/include/linux/of_address.h index 40c418d..a4b400d 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);