From patchwork Mon Apr 3 18:57:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 9660429 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 8C11660353 for ; Mon, 3 Apr 2017 19:14:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BFD828403 for ; Mon, 3 Apr 2017 19:14:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7047C284D1; Mon, 3 Apr 2017 19:14:35 +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.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 E14AC28403 for ; Mon, 3 Apr 2017 19:14:34 +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=b7DhiJCH8YFiHVdaFh6sgPFn+YzquEQJTgSV8Rk57zs=; b=VmcHCCVnskKzsn56waTfui5lIK 4cNbs/1XP3AfoX/mcSMrLDOyXcrRCXGYt2zbTyQqAtpCdPCgVY3V4qyC51ZV5UEvBbkv5PA9VcRFL X3o8r7AWBeCa+mYOkNw2HlpzLhk9b/ejvr1657VMzYPO97i7acjz8jDXb09AFQ6TicVqfaPYIH6yL qQ3E5BMOQc1YOtcyyFOueG3xOUVwnwTWAAUZ1t33NGhx0f4NjZl2vxZNwWNxRN7dMYc+gcTc5vNyi 49d7GnIn4YytpQbqNHqMiclAjUKV6B2KF68c1cZ4ACCIKy0nWhZBNXRzH7BH4T54AuvfcgqZ3eH+X 6+LpgDpA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cv7Qw-0000bd-Bu; Mon, 03 Apr 2017 19:14:34 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cv7QW-0008Nn-V9 for linux-arm-kernel@bombadil.infradead.org; Mon, 03 Apr 2017 19:14:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=qa5J8Onn46QYz4K+JMqARf0jTKn36PZpsQ2st8ADBPs=; b=GFW4R/KMYztfU+Dr3uVuxrMbu BlewECqVKpydEs4/THenfDzLKwswJ6eZSiPhzfV8q7upoJeZH5N74QFgx/I+5fv8P+mCmS8ED3zUE Le27QtqhlheBmwCZHxF+7Fi4PkdbQ4aGx3cRI3+G5EkuIoIJMRE7LmUeV3lejTIjrn1VFyflJNdf1 zLxBmgYKwJZIp5iOnLoQuchDSO9fyELFrTNMu3gglWneIf4Z4cW0RdIcxHCT4AepGIgwu/GZYFm+f +x0f6VKRgtTL6TrsbjjH4Gb1kCukxVgG4aIxRQ5WErsMkiDhnb6c0oqvivDhV/SkiFK2Cr+ORTU1N qzb8EsVvw==; Received: from mail-qt0-f175.google.com ([209.85.216.175]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cv7Jk-0004X3-8i for linux-arm-kernel@lists.infradead.org; Mon, 03 Apr 2017 19:07:10 +0000 Received: by mail-qt0-f175.google.com with SMTP id n21so121012194qta.1 for ; Mon, 03 Apr 2017 12:06:48 -0700 (PDT) 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:in-reply-to :references; bh=qa5J8Onn46QYz4K+JMqARf0jTKn36PZpsQ2st8ADBPs=; b=to+V/IVbEl5Dw0RdO2qj9C7fgbqhK8qnfZMMYymjB5CgrxmratKOQU9gm22ksIIS+B 0Jr0ZajMY0zjYcm37ntU1Syz4HHE/ZhDdFyzvR/CQVfRBcAQptpnanLqkVAwp9gZ/897 f5YfC7bDUeEobxGpDaXtC8v2cGehhV/J0eH1zWh8T2qezJQZ+/4034oSrr7V+EBLzw29 GACMC2sNswYRl5BK8W/EmvGOFQ37ahhIVwO4MoMx5/0gRXOg6x9jX9TfNSLXvMVAh+TQ 1CB24SbOnQ7zw3gKf9apu1LjxeNJ8FY9q6H+BBNu1oyH7XxX0vaX+Nyjs4Pe0RTK8iNH cPew== X-Gm-Message-State: AFeK/H0kUppJv6VZwP68vTVEb+mtt2UbWQtSdNkgoMbJ3rq2G0xZcONkSad0KxZ99WPDsFwI X-Received: by 10.237.34.125 with SMTP id o58mr18016123qtc.108.1491245936940; Mon, 03 Apr 2017 11:58:56 -0700 (PDT) Received: from labbott-redhat-machine.redhat.com ([2601:602:9802:a8dc:1722:8a6b:a66c:79eb]) by smtp.gmail.com with ESMTPSA id e5sm10173689qtc.6.2017.04.03.11.58.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Apr 2017 11:58:55 -0700 (PDT) From: Laura Abbott To: Sumit Semwal , Riley Andrews , arve@android.com Subject: [PATCHv3 14/22] staging: android: ion: Stop butchering the DMA address Date: Mon, 3 Apr 2017 11:57:56 -0700 Message-Id: <1491245884-15852-15-git-send-email-labbott@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491245884-15852-1-git-send-email-labbott@redhat.com> References: <1491245884-15852-1-git-send-email-labbott@redhat.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170403_200708_409757_CCF07C35 X-CRM114-Status: GOOD ( 13.93 ) 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: devel@driverdev.osuosl.org, romlem@google.com, Greg Kroah-Hartman , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org, Mark Brown , Laurent Pinchart , Benjamin Gaignard , Daniel Vetter , Laura Abbott , Brian Starkey , 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 Now that we have proper caching, stop setting the DMA address manually. It should be set after properly calling dma_map. Signed-off-by: Laura Abbott --- drivers/staging/android/ion/ion.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 3d979ef5..65638f5 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -81,8 +81,7 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap, { struct ion_buffer *buffer; struct sg_table *table; - struct scatterlist *sg; - int i, ret; + int ret; buffer = kzalloc(sizeof(*buffer), GFP_KERNEL); if (!buffer) @@ -119,20 +118,6 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap, INIT_LIST_HEAD(&buffer->vmas); INIT_LIST_HEAD(&buffer->attachments); mutex_init(&buffer->lock); - /* - * this will set up dma addresses for the sglist -- it is not - * technically correct as per the dma api -- a specific - * device isn't really taking ownership here. However, in practice on - * our systems the only dma_address space is physical addresses. - * Additionally, we can't afford the overhead of invalidating every - * allocation via dma_map_sg. The implicit contract here is that - * memory coming from the heaps is ready for dma, ie if it has a - * cached mapping that mapping has been invalidated - */ - for_each_sg(buffer->sg_table->sgl, sg, buffer->sg_table->nents, i) { - sg_dma_address(sg) = sg_phys(sg); - sg_dma_len(sg) = sg->length; - } mutex_lock(&dev->buffer_lock); ion_buffer_add(dev, buffer); mutex_unlock(&dev->buffer_lock);