From patchwork Wed Jun 3 19:20:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 199594 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 372A3C433E0 for ; Wed, 3 Jun 2020 19:21:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 17DC4207D3 for ; Wed, 3 Jun 2020 19:21:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="RPD7B4cG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726383AbgFCTVc (ORCPT ); Wed, 3 Jun 2020 15:21:32 -0400 Received: from rnd-relay.smtp.broadcom.com ([192.19.229.170]:43188 "EHLO rnd-relay.smtp.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726365AbgFCTVa (ORCPT ); Wed, 3 Jun 2020 15:21:30 -0400 Received: from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net [10.75.242.48]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 6EFEB30DED1; Wed, 3 Jun 2020 12:21:28 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 6EFEB30DED1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1591212088; bh=SQNKzCK4mr62bKG2SrKfDfRn2h9ZIykztTMQ5vnyIw8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RPD7B4cGXC+aKMwmZCs4ZGQx0EzCjQr5l9Kx3NHB2hGVvQcOvqND0S+35gnyHMLTR Yix4RPo5PH7r/XG9Sb35nyRNRB4ZOZJc5nE+UqwjkxOidESznufxsgfh/YNARBGpSt ubJNEQjC2Kw2Lix2moqZK5b/+1rc5vbwEDJZI7Ao= Received: from stbsrv-and-01.and.broadcom.net (stbsrv-and-01.and.broadcom.net [10.28.16.211]) by mail-irv-17.broadcom.com (Postfix) with ESMTP id 2BEFA140069; Wed, 3 Jun 2020 12:21:27 -0700 (PDT) From: Jim Quinlan To: linux-pci@vger.kernel.org, Christoph Hellwig , Nicolas Saenz Julienne , bcm-kernel-feedback-list@broadcom.com, james.quinlan@broadcom.com Cc: Rob Herring , Frank Rowand , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 08/13] of: Include a dev param in of_dma_get_range() Date: Wed, 3 Jun 2020 15:20:40 -0400 Message-Id: <20200603192058.35296-9-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200603192058.35296-1-james.quinlan@broadcom.com> References: <20200603192058.35296-1-james.quinlan@broadcom.com> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Currently there is only one caller of of_dma_get_range(). A struct device *dev param is needed For implementing multiple dma offsets. This function will still work if dev == NULL. Signed-off-by: Jim Quinlan --- drivers/of/address.c | 4 +++- drivers/of/device.c | 2 +- drivers/of/of_private.h | 8 ++++---- drivers/of/unittest.c | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/of/address.c b/drivers/of/address.c index 8eea3f6e29a4..96d8cfb14a60 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -920,6 +920,7 @@ EXPORT_SYMBOL(of_io_request_and_map); /** * of_dma_get_range - Get DMA range info + * @dev: device pointer; only needed for a corner case. * @np: device node to get DMA range info * @dma_addr: pointer to store initial DMA address of DMA range * @paddr: pointer to store initial CPU address of DMA range @@ -935,7 +936,8 @@ EXPORT_SYMBOL(of_io_request_and_map); * It returns -ENODEV if "dma-ranges" property was not found * for this device in DT. */ -int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *size) +int of_dma_get_range(struct device *dev, struct device_node *np, u64 *dma_addr, + u64 *paddr, u64 *size) { struct device_node *node = of_node_get(np); const __be32 *ranges = NULL; diff --git a/drivers/of/device.c b/drivers/of/device.c index 27203bfd0b22..ef6a741f9f0b 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -95,7 +95,7 @@ int of_dma_configure(struct device *dev, struct device_node *np, bool force_dma) const struct iommu_ops *iommu; u64 mask, end; - ret = of_dma_get_range(np, &dma_addr, &paddr, &size); + ret = of_dma_get_range(dev, np, &dma_addr, &paddr, &size); if (ret < 0) { /* * For legacy reasons, we have to assume some devices need diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h index edc682249c00..7a83d3a81ab6 100644 --- a/drivers/of/of_private.h +++ b/drivers/of/of_private.h @@ -158,11 +158,11 @@ extern int of_bus_n_addr_cells(struct device_node *np); extern int of_bus_n_size_cells(struct device_node *np); #ifdef CONFIG_OF_ADDRESS -extern int of_dma_get_range(struct device_node *np, u64 *dma_addr, - u64 *paddr, u64 *size); +extern int of_dma_get_range(struct device *dev, struct device_node *np, + u64 *dma_addr, u64 *paddr, u64 *size); #else -static inline int of_dma_get_range(struct device_node *np, u64 *dma_addr, - u64 *paddr, u64 *size) +static inline int of_dma_get_range(struct device *dev, struct device_node *np, + u64 *dma_addr, u64 *paddr, u64 *size) { return -ENODEV; } diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 398de04fd19c..57a22517c428 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -881,7 +881,7 @@ static void __init of_unittest_dma_ranges_one(const char *path, return; } - rc = of_dma_get_range(np, &dma_addr, &paddr, &size); + rc = of_dma_get_range(NULL, np, &dma_addr, &paddr, &size); unittest(!rc, "of_dma_get_range failed on node %pOF rc=%i\n", np, rc); if (!rc) {