From patchwork Tue Apr 18 18:27:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 9686055 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 C24EF601C2 for ; Tue, 18 Apr 2017 18:35:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B70F92838E for ; Tue, 18 Apr 2017 18:35:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ABE6F283E1; Tue, 18 Apr 2017 18:35:22 +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 464732838E for ; Tue, 18 Apr 2017 18:35:22 +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=JC6zkGe+0hJ9REBeqbs5DH0wo3 lJysP6oYVj+7RjrQ+Ao5ncfR9795JHeYnWRfyjacQGjpXBihE76esvlsJ55kV73m+hVpKJ73H76o0 zwRKlW5j6zIoF5xhMk4QewEVUOs+pPSCscKk4D2UFE5avYIiFi40wyD73pL4+sbWlBTeHHofdUC5Q pkxszpSRjPxCSaiYD2hdlx+S3fd5wb09soiumQVCLib/yJ+pJVvNv82hvMKIQ0Wmdjg2IkJtPDHeg uJFjTIBt+OfsMmBpKglSmmPePjQ2zwgxcj8PPhopXFkOO6ENLNk+zslScivlGqzZMod4OoQBj6K23 ROWJumPQ==; 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 1d0XyD-0004fP-0i; Tue, 18 Apr 2017 18:35:21 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d0Xxu-0003PM-97 for linux-arm-kernel@bombadil.infradead.org; Tue, 18 Apr 2017 18:35:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.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=xqGOsYKxSnmBlbWAejLRNADWD W7+gSioBY/DrrjwwcFgS1lw8UwNY8KiIenhIVTgBdBCZhQ9ox3VsKXt/3VGR2kaBWL0kib3aVx5Uq l5riz+I9iiIoLgUJ0TGjb7i1xxdeW6xf1WcVxeLRTQsLJk50GMHmZKMHsmy5hvtULRHCprQVVi0Em pmCfKYmo6grJCEOTExzvP6XaoCdARffiNK7loLwcw14T+uSSHP5eBti3TQLndOyyNGnSQtaEbwCUv QeRvQJC0kaw7CRcmy3WT22L5g0WMt/bNjLQJBJPbTMYklCT1koKqPNGsu66rlnoPhuvAm7tEeuB/9 3qP7xeiYA==; Received: from mail-qk0-f173.google.com ([209.85.220.173]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d0Xxs-0006G4-ES for linux-arm-kernel@lists.infradead.org; Tue, 18 Apr 2017 18:35:01 +0000 Received: by mail-qk0-f173.google.com with SMTP id h67so1415389qke.0 for ; Tue, 18 Apr 2017 11:34:39 -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=CBM+LRKcIdjz2gcRfOg4uxxHC8xrOoHJNSHYt/a7OZqloZubYin5XBRlmWNP4lvnen lNkhG/h8X3HgMZHOccXx5gEv7OEmI5gQBERrUtxr8hYSeAGQPL4MMBaSkZTdbQ6ET9L7 5GZMdsEMuYhjQRQUKBykJZXOKrfwRcpHV90SNVaS3oAVF1zvTyQPhwvchGvmQZq3OxOb rZ3mCKRWWGNAKYBzfHy3cWPkjR9h1HFmYEQfkR6tApFhgMyhKXen5/uRFYp3Rgj3T90o lwQN8c4yR1omA8dWQiPDeIVU3RnnURssFcSvN2ypndRDsd/a+Gy3fBLy2RWSTay5NZss d5KA== X-Gm-Message-State: AN3rC/7zwFLTRmoCGmxFJVaL/TDgEATU03KuKwQ+D/c1X1/axX7XNqMq FS9dComIWVsD1Zz3 X-Received: by 10.55.220.3 with SMTP id v3mr11515491qki.284.1492540054006; Tue, 18 Apr 2017 11:27:34 -0700 (PDT) Received: from labbott-redhat-machine.redhat.com ([2601:602:9802:a8dc::159c]) by smtp.gmail.com with ESMTPSA id q66sm10142381qkd.69.2017.04.18.11.27.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Apr 2017 11:27:32 -0700 (PDT) From: Laura Abbott To: Sumit Semwal , Riley Andrews , arve@android.com, Greg Kroah-Hartman Subject: [PATCHv4 04/12] staging: android: ion: Stop butchering the DMA address Date: Tue, 18 Apr 2017 11:27:06 -0700 Message-Id: <1492540034-5466-5-git-send-email-labbott@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492540034-5466-1-git-send-email-labbott@redhat.com> References: <1492540034-5466-1-git-send-email-labbott@redhat.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170418_143500_517172_5F2C89C6 X-CRM114-Status: GOOD ( 12.09 ) 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, 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);