From patchwork Tue Sep 11 16:30:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 10595869 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 98907921 for ; Tue, 11 Sep 2018 16:31:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 86A4D29AA1 for ; Tue, 11 Sep 2018 16:31:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7AEDC29A60; Tue, 11 Sep 2018 16:31:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D9D129A98 for ; Tue, 11 Sep 2018 16:31:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728027AbeIKVbS (ORCPT ); Tue, 11 Sep 2018 17:31:18 -0400 Received: from sauhun.de ([88.99.104.3]:53648 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726928AbeIKVbS (ORCPT ); Tue, 11 Sep 2018 17:31:18 -0400 Received: from localhost (i577B9DAC.versanet.de [87.123.157.172]) by pokefinder.org (Postfix) with ESMTPSA id 610EA2CF60B; Tue, 11 Sep 2018 18:31:10 +0200 (CEST) From: Wolfram Sang To: iommu@lists.linux-foundation.org, Robin Murphy Cc: linux-renesas-soc@vger.kernel.org, Christoph Hellwig , Marek Szyprowski , linux-kernel@vger.kernel.org, Wolfram Sang Subject: [RFC PATCH 1/2] dma-mapping: introduce helper for setting dma_parms Date: Tue, 11 Sep 2018 18:30:49 +0200 Message-Id: <20180911163050.28072-2-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180911163050.28072-1-wsa+renesas@sang-engineering.com> References: <20180911163050.28072-1-wsa+renesas@sang-engineering.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Setting up dma_parms seems not so trivial because it is easy to miss that its pointer has the life cycle of its containing 'struct device' while the allocation of dma_parms usually happens during the bind/unbind life cycle. Which can lead to dangling pointers. If coding this correctly in drivers, this results in boilerplate code. So, this patch adds a devm_* style helper which is easy to use and make sure the allocation and the pointer are always handled at the same time. Signed-off-by: Wolfram Sang --- include/linux/dma-mapping.h | 5 ++++ kernel/dma/mapping.c | 50 +++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 1db6a6b46d0d..05a525b4639b 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -700,6 +700,11 @@ static inline int dma_set_seg_boundary(struct device *dev, unsigned long mask) return -EIO; } +extern int dmam_set_dma_parms(struct device *dev, unsigned int max_seg_size, + unsigned long seg_bound_mask); + +extern void dmam_free_dma_parms(struct device *dev); + #ifndef dma_max_pfn static inline unsigned long dma_max_pfn(struct device *dev) { diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c index d2a92ddaac4d..082cc651513b 100644 --- a/kernel/dma/mapping.c +++ b/kernel/dma/mapping.c @@ -198,6 +198,56 @@ EXPORT_SYMBOL(dmam_release_declared_memory); #endif +static void dmam_release_dma_parms(struct device *dev, void *res) +{ + dev->dma_parms = NULL; +} + +static int dmam_match_dma_parms(struct device *dev, void *res, void *data) +{ + return res == data; +} + +/** + * dmam_set_dma_parms - Managed setting of dma_parms + * @dev: device to set dma_parms for + * @max_seg_size: the maximum segment size for this device + * @seg_bound_mask: the segment boundary mask for this device + * + * RETURNS: + * 0 on success, errno on failure. + */ +int dmam_set_dma_parms(struct device *dev, unsigned int max_seg_size, + unsigned long seg_bound_mask) +{ + struct device_dma_parameters *parms; + + parms = devres_alloc(dmam_release_dma_parms, + sizeof(struct device_dma_parameters), GFP_KERNEL); + if (!parms) + return -ENOMEM; + + dev->dma_parms = parms; + dma_set_max_seg_size(dev, max_seg_size); + dma_set_seg_boundary(dev, seg_bound_mask); + + devres_add(dev, parms); + return 0; +} +EXPORT_SYMBOL_GPL(dmam_set_dma_parms); + +/** + * dmam_free_dma_parms - free dma_parms allocated with dmam_set_dma_parms + * @dev: device with dma_parms allocated by dmam_set_dma_parms() + */ +void dmam_free_dma_parms(struct device *dev) +{ + int rc = devres_destroy(dev, dmam_release_dma_parms, dmam_match_dma_parms, + dev->dma_parms); + WARN_ON(rc); +} +EXPORT_SYMBOL_GPL(dmam_free_dma_parms); + /* * Create scatter-list for the already allocated DMA buffer. */ From patchwork Tue Sep 11 16:30:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 10595867 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8907A921 for ; Tue, 11 Sep 2018 16:31:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79CAE29AA0 for ; Tue, 11 Sep 2018 16:31:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B7D229A96; Tue, 11 Sep 2018 16:31:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA6DA29A96 for ; Tue, 11 Sep 2018 16:31:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726983AbeIKVbR (ORCPT ); Tue, 11 Sep 2018 17:31:17 -0400 Received: from sauhun.de ([88.99.104.3]:53660 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726863AbeIKVbR (ORCPT ); Tue, 11 Sep 2018 17:31:17 -0400 Received: from localhost (i577B9DAC.versanet.de [87.123.157.172]) by pokefinder.org (Postfix) with ESMTPSA id CBC912CF688; Tue, 11 Sep 2018 18:31:10 +0200 (CEST) From: Wolfram Sang To: iommu@lists.linux-foundation.org, Robin Murphy Cc: linux-renesas-soc@vger.kernel.org, Christoph Hellwig , Marek Szyprowski , linux-kernel@vger.kernel.org, Wolfram Sang Subject: [RFC PATCH 2/2] mmc: sdhi: internal_dmac: set dma_parms Date: Tue, 11 Sep 2018 18:30:50 +0200 Message-Id: <20180911163050.28072-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180911163050.28072-1-wsa+renesas@sang-engineering.com> References: <20180911163050.28072-1-wsa+renesas@sang-engineering.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We have our own DMA provider, so we should set the dma_parms properly. Signed-off-by: Wolfram Sang --- drivers/mmc/host/renesas_sdhi_internal_dmac.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c index ca0b43973769..00116e4ec6c4 100644 --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c @@ -315,6 +315,8 @@ static int renesas_sdhi_internal_dmac_probe(struct platform_device *pdev) global_flags |= (unsigned long)soc->data; + dmam_set_dma_parms(&pdev->dev, 0xffffffff, 0); + return renesas_sdhi_probe(pdev, &renesas_sdhi_internal_dmac_dma_ops); }