From patchwork Fri Feb 3 15:48:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sricharan Ramabadhran X-Patchwork-Id: 9554543 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ED35E604A7 for ; Fri, 3 Feb 2017 15:51:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C57D91FE95 for ; Fri, 3 Feb 2017 15:51:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8F1B26242; Fri, 3 Feb 2017 15:51:49 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 378241FE95 for ; Fri, 3 Feb 2017 15:51:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751407AbdBCPtt (ORCPT ); Fri, 3 Feb 2017 10:49:49 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:57268 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751388AbdBCPtq (ORCPT ); Fri, 3 Feb 2017 10:49:46 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 18C286084B; Fri, 3 Feb 2017 15:49:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1486136985; bh=RqbEwwXUzo/VpgXZFXH9MXGVbJFgH9mnnHiGD6oYQCQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GX0j0FyP5sggbOBMNrPzpuPvb6fr4CBR2acZEp+lNxMv0DMCoY+AX+OIbh7HiEHjw JyRs3gNmbuwUu9blQF3VV0QdHzM3NNdv2S8nLD29FUuv/Nb8ajrjoldkwpBofHUEU+ +oNJI5FzZ8Cf/Rubl/actdAUs3ZChYm/qC4GRo4g= Received: from blr-ubuntu-32.ap.qualcomm.com (unknown [202.46.23.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: sricharan@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id D8F80607F4; Fri, 3 Feb 2017 15:49:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1486136981; bh=RqbEwwXUzo/VpgXZFXH9MXGVbJFgH9mnnHiGD6oYQCQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L0YWlL+426kquF8KjuvNRswM1X9kkSsSSsQ/02G4KE0vMn2RhERbNzgMRoEjiNksv JOysMZW+AW3GUCTudllj4+8JOKAExEtSQHRSSijKKXFkq0L/0Ortb2BJDpSFsVRBou 1GOcRcGqtiWWSzQPQ7trXy1Ms3iPe6y8qzBfqFqI= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org D8F80607F4 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sricharan@codeaurora.org From: Sricharan R To: robin.murphy@arm.com, will.deacon@arm.com, joro@8bytes.org, lorenzo.pieralisi@arm.com, iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, m.szyprowski@samsung.com, bhelgaas@google.com, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, tn@semihalf.com, hanjun.guo@linaro.org, okaya@codeaurora.org Cc: sricharan@codeaurora.org Subject: [PATCH V8 03/11] of: dma: Move range size workaround to of_dma_get_range() Date: Fri, 3 Feb 2017 21:18:45 +0530 Message-Id: <1486136933-20328-4-git-send-email-sricharan@codeaurora.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1486136933-20328-1-git-send-email-sricharan@codeaurora.org> References: <1486136933-20328-1-git-send-email-sricharan@codeaurora.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Laurent Pinchart Invalid dma-ranges values should be worked around when retrieving the DMA range in of_dma_get_range(), not by all callers of the function. This isn't much of a problem now that we have a single caller, but that situation will change when moving DMA configuration to device probe time. Tested-by: Marek Szyprowski Signed-off-by: Laurent Pinchart --- drivers/of/address.c | 20 ++++++++++++++++++-- drivers/of/device.c | 15 --------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/drivers/of/address.c b/drivers/of/address.c index 02b2903..6aeb816 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -819,8 +819,8 @@ void __iomem *of_io_request_and_map(struct device_node *np, int index, * CPU addr (phys_addr_t) : pna cells * size : nsize cells * - * It returns -ENODEV if "dma-ranges" property was not found - * for this device in DT. + * Return 0 on success, -ENODEV if the "dma-ranges" property was not found for + * this device in DT, or -EINVAL if the CPU address or size is invalid. */ int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *size) { @@ -880,6 +880,22 @@ int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *siz *dma_addr = dmaaddr; *size = of_read_number(ranges + naddr + pna, nsize); + /* + * DT nodes sometimes incorrectly set the size as a mask. Work around + * those incorrect DT by computing the size as mask + 1. + */ + if (*size & 1) { + pr_warn("%s: size 0x%llx for dma-range in node(%s) set as mask\n", + __func__, *size, np->full_name); + *size = *size + 1; + } + + if (!*size) { + pr_err("%s: invalid size zero for dma-range in node(%s)\n", + __func__, np->full_name); + ret = -EINVAL; + goto out; + } pr_debug("dma_addr(%llx) cpu_addr(%llx) size(%llx)\n", *dma_addr, *paddr, *size); diff --git a/drivers/of/device.c b/drivers/of/device.c index b1e6beb..09dedd0 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -110,21 +110,6 @@ void of_dma_configure(struct device *dev, struct device_node *np) size = dev->coherent_dma_mask + 1; } else { offset = PFN_DOWN(paddr - dma_addr); - - /* - * Add a work around to treat the size as mask + 1 in case - * it is defined in DT as a mask. - */ - if (size & 1) { - dev_warn(dev, "Invalid size 0x%llx for dma-range\n", - size); - size = size + 1; - } - - if (!size) { - dev_err(dev, "Adjusted size 0x%llx invalid\n", size); - return; - } dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", offset); }