From patchwork Thu Mar 30 09:59:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oza Pawandeep X-Patchwork-Id: 745160 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 3vv0bB6GPrz9s4s for ; Thu, 30 Mar 2017 21:04:06 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=broadcom.com header.i=@broadcom.com header.b="W/uwfJji"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933230AbdC3KAN (ORCPT ); Thu, 30 Mar 2017 06:00:13 -0400 Received: from mail-wr0-f181.google.com ([209.85.128.181]:34849 "EHLO mail-wr0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932760AbdC3KAJ (ORCPT ); Thu, 30 Mar 2017 06:00:09 -0400 Received: by mail-wr0-f181.google.com with SMTP id k6so47127753wre.2 for ; Thu, 30 Mar 2017 03:00:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id; bh=HZ0dVHp4vxxdnQL+DlNgSmNw6TgNYZqLBZq+fiFU4P0=; b=W/uwfJjiEEa3XtDGvL33ovXwc/A8MBIwi63lZF6YRALp7czNaDikTOb0+D+wLf0Fz4 /OY8JISbxsSecHbdub3tuL0/1eqLI+25yGYlx55QP9eIwls+BkMuKlNAitzH+c/Qqrnp gB5rysq3l/xxC6S7UQsMA/HvzuHz2sMPwVl4o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=HZ0dVHp4vxxdnQL+DlNgSmNw6TgNYZqLBZq+fiFU4P0=; b=LRaClvfhoYseDBsy90pJqVCm8NsYBESwoHMxBCMBOpBrhmz8Tm47dT2AQCnCeyTBuv Z14JzzxSUqFaynXWAuU7Wl1jFvEAlLUA6ZV8oriBZzF/0rLZj2oNZqwV6wjI2qSCXst4 By7yRng3Df8N13lRPsDnDllNnAEOD8MBznVT1e7WeIXFvb8W232cgJ2T3Mgs27APXRQI NmSS/I5J09BOyY2K3PhW5RZ5wtXTnY8oYpWzE6rbN5B005OSW9vn3kudqEMR5aD1N9L6 XT6FcuSEopuX8VGObABV23XVBV5jG4Hj1MfZLqK76RbFFk7Em781rmTjKdQYm0L7gzwI +vNw== X-Gm-Message-State: AFeK/H0DJDSq7zHNitz/qDNaYauEQiVLKuDM/1g4D0Bt1yVB/lMz8ssxchS9e0pPlSeQ+MbO X-Received: by 10.28.113.73 with SMTP id m70mr2667930wmc.12.1490868002431; Thu, 30 Mar 2017 03:00:02 -0700 (PDT) Received: from anjanavk-OptiPlex-7010.dhcp.avagotech.net ([192.19.237.250]) by smtp.gmail.com with ESMTPSA id k43sm2123802wrk.42.2017.03.30.02.59.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Mar 2017 03:00:01 -0700 (PDT) From: Oza Pawandeep To: Joerg Roedel , Robin Murphy Cc: iommu@lists.linux-foundation.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, Oza Pawandeep , Oza Pawandeep Subject: [RFC PATCH 1/2] of/pci: implement inbound dma-ranges for PCI Date: Thu, 30 Mar 2017 15:29:45 +0530 Message-Id: <1490867986-5675-1-git-send-email-oza.oza@broadcom.com> X-Mailer: git-send-email 1.9.1 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org current device frmework and of framework integration assumes dma-ranges in a way where memory-mapped devices define their dma-ranges. dma-ranges: (child-bus-address, parent-bus-address, length). but iproc based SOCs and other SOCs(rcar) have PCI world dma-ranges. dma-ranges = <0x43000000 0x00 0x00 0x00 0x00 0x80 0x00>; of_dma_configure is specifically witten to take care of memory mapped devices. but no implementation exists for pci to take care of pcie based memory ranges. in fact pci world doesnt seem to define standard dma-ranges this exposes intrface not only to the pci host driver, but also it aims to provide an interface to callers such as of_dma_configure. so then the returned size get best possible (largest) dma_mask. for e.g. dma-ranges = <0x43000000 0x00 0x00 0x00 0x00 0x80 0x00>; we should get dev->coherent_dma_mask=0x7fffffffff. also this patch intends to handle multiple inbound windows and dma-ranges. it is left to the caller, how it wants to use them. Signed-off-by: Oza Pawandeep diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c index 0ee42c3..5299438 100644 --- a/drivers/of/of_pci.c +++ b/drivers/of/of_pci.c @@ -283,6 +283,80 @@ int of_pci_get_host_bridge_resources(struct device_node *dev, return err; } EXPORT_SYMBOL_GPL(of_pci_get_host_bridge_resources); + +/** + * of_pci_get_dma_ranges - Parse PCI host bridge inbound resources from DT + * @np: device node of the host bridge having the dma-ranges property + * @resources: list where the range of resources will be added after DT parsing + * + * It is the caller's job to free the @resources list. + * + * This function will parse the "dma-ranges" property of a PCI host bridge device + * node and setup the resource mapping based on its content. + * + * It returns zero if the range parsing has been successful or a standard error + * value if it failed. + */ + +int of_pci_get_dma_ranges(struct device_node *np, struct list_head *resources) +{ + struct device_node *node = of_node_get(np); + int rlen; + int ret = 0; + const int na = 3, ns = 2; + struct resource *res; + struct of_pci_range_parser parser; + struct of_pci_range range; + + if (!node) + return -EINVAL; + + parser.node = node; + parser.pna = of_n_addr_cells(node); + parser.np = parser.pna + na + ns; + + parser.range = of_get_property(node, "dma-ranges", &rlen); + + if (!parser.range) { + pr_debug("pcie device has no dma-ranges defined for node(%s)\n", np->full_name); + ret = -ENODEV; + goto out; + } + + parser.end = parser.range + rlen / sizeof(__be32); + + for_each_of_pci_range(&parser, &range) { + /* + * If we failed translation or got a zero-sized region + * then skip this range + */ + if (range.cpu_addr == OF_BAD_ADDR || range.size == 0) + continue; + + res = kzalloc(sizeof(struct resource), GFP_KERNEL); + if (!res) { + ret = -ENOMEM; + goto parse_failed; + } + + ret = of_pci_range_to_resource(&range, np, res); + if (ret) { + kfree(res); + continue; + } + + pci_add_resource_offset(resources, res, res->start - range.pci_addr); + } + + return ret; + +parse_failed: + pci_free_resource_list(resources); +out: + of_node_put(node); + return ret; +} +EXPORT_SYMBOL_GPL(of_pci_get_dma_ranges); #endif /* CONFIG_OF_ADDRESS */ #ifdef CONFIG_PCI_MSI diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h index 0e0974e..8509e3d 100644 --- a/include/linux/of_pci.h +++ b/include/linux/of_pci.h @@ -76,6 +76,7 @@ static inline void of_pci_check_probe_only(void) { } int of_pci_get_host_bridge_resources(struct device_node *dev, unsigned char busno, unsigned char bus_max, struct list_head *resources, resource_size_t *io_base); +int of_pci_get_dma_ranges(struct device_node *np, struct list_head *resources); #else static inline int of_pci_get_host_bridge_resources(struct device_node *dev, unsigned char busno, unsigned char bus_max, @@ -83,6 +84,11 @@ static inline int of_pci_get_host_bridge_resources(struct device_node *dev, { return -EINVAL; } + +static inline int of_pci_get_dma_ranges(struct device_node *np, struct list_head *resources) +{ + return -EINVAL; +} #endif #if defined(CONFIG_OF) && defined(CONFIG_PCI_MSI)