From patchwork Mon Mar 5 09:35:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 10258485 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 C053260365 for ; Mon, 5 Mar 2018 09:36:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE327289AF for ; Mon, 5 Mar 2018 09:36:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A26B8289B2; Mon, 5 Mar 2018 09:36: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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A19DD289AF for ; Mon, 5 Mar 2018 09:36:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=RKARWBiHTS8amiapUlEMUKKec57c7xLWmhZK+1S5RkM=; b=JudHZxw1TO2sQ95Q9vbohhhzXc AJ01dqbYJVW1OVvevhBjioplw2EJVPdpyKjrggs35a9ezRgz1dcmH3VDAhHmvlTgMOEjnJ7K+j9wp 6Q7YBXCC7ubxcsq7E7SnaNynkCToPueHowX5Xw/6T6NmHINeE5t2XrDSlVHIp5exF1k1sjtQPGok3 OlwT4stkMn0gBVbyIxAS7BwllrIx65c8afmPXuz0RaE+QS73rvO3Z0stl4h3iZQV1GgC9djS+LXwc xupW1Jht8NoWicZcGIU0HMUuNp/4yxR/VF9hl1fn4SgikOB7IR1GS1P6wtGb1vWvQf+MavJLff3ub RW3mhjRA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1esmXr-0004ps-4R; Mon, 05 Mar 2018 09:36:35 +0000 Received: from mail.bootlin.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1esmXH-0004U4-9R for linux-arm-kernel@lists.infradead.org; Mon, 05 Mar 2018 09:36:01 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 010EB2092C; Mon, 5 Mar 2018 10:35:46 +0100 (CET) Received: from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.bootlin.com (Postfix) with ESMTPSA id 9D72F20784; Mon, 5 Mar 2018 10:35:36 +0100 (CET) From: Maxime Ripard To: Yong Deng Subject: [PATCH 1/7] media: sun6i: Fill dma_pfn_offset to accomodate for the RAM offset Date: Mon, 5 Mar 2018 10:35:28 +0100 Message-Id: <20180305093535.11801-2-maxime.ripard@bootlin.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180305093535.11801-1-maxime.ripard@bootlin.com> References: <1519697113-32202-1-git-send-email-yong.deng@magewell.com> <20180305093535.11801-1-maxime.ripard@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180305_013559_637567_A60B15FF X-CRM114-Status: GOOD ( 13.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mylene Josserand , Thomas Petazzoni , Maxime Ripard , Chen-Yu Tsai , Hans Verkuil , Sakari Ailus , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The CSI controller does its DMA accesses through a DMA bus that has the RAM mapped at the address 0. The current code removes from the dma_addr_t PHYS_OFFSET, and while it works, this is an abuse of the DMA API. Instead, fill the dma_pfn_offset field in the struct device that should be used to express such an offset, and the use the dma_addr_t directly as we should. Signed-off-by: Maxime Ripard --- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c index 1aaaae238d57..2ec33fb04632 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c @@ -563,20 +563,15 @@ int sun6i_csi_update_config(struct sun6i_csi *csi, void sun6i_csi_update_buf_addr(struct sun6i_csi *csi, dma_addr_t addr) { struct sun6i_csi_dev *sdev = sun6i_csi_to_dev(csi); - /* transform physical address to bus address */ -#if defined(CONFIG_COMPILE_TEST) && !defined(PHYS_OFFSET) -#define PHYS_OFFSET 0 -#endif - dma_addr_t bus_addr = addr - PHYS_OFFSET; regmap_write(sdev->regmap, CSI_CH_F0_BUFA_REG, - (bus_addr + sdev->planar_offset[0]) >> 2); + (addr + sdev->planar_offset[0]) >> 2); if (sdev->planar_offset[1] != -1) regmap_write(sdev->regmap, CSI_CH_F1_BUFA_REG, - (bus_addr + sdev->planar_offset[1]) >> 2); + (addr + sdev->planar_offset[1]) >> 2); if (sdev->planar_offset[2] != -1) regmap_write(sdev->regmap, CSI_CH_F2_BUFA_REG, - (bus_addr + sdev->planar_offset[2]) >> 2); + (addr + sdev->planar_offset[2]) >> 2); } void sun6i_csi_set_stream(struct sun6i_csi *csi, bool enable) @@ -856,6 +851,14 @@ static int sun6i_csi_resource_request(struct sun6i_csi_dev *sdev, return 0; } +/* + * PHYS_OFFSET isn't available on all architectures. In order to + * accomodate for COMPILE_TEST, let's define it to something dumb. + */ +#ifndef PHYS_OFFSET +#define PHYS_OFFSET 0 +#endif + static int sun6i_csi_probe(struct platform_device *pdev) { struct sun6i_csi_dev *sdev; @@ -866,6 +869,8 @@ static int sun6i_csi_probe(struct platform_device *pdev) return -ENOMEM; sdev->dev = &pdev->dev; + /* The DMA bus has the memory mapped at 0 */ + sdev->dev->dma_pfn_offset = PHYS_OFFSET >> PAGE_SHIFT; ret = sun6i_csi_resource_request(sdev, pdev); if (ret)