From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [1/3] dma: imx-sdma: fix NULL pointer de-reference From: Angus Ainslie Message-Id: <20190120015851.11797-2-angus@akkea.ca> Date: Sat, 19 Jan 2019 18:58:49 -0700 To: angus@akkea.ca Cc: Vinod Koul , dmaengine@vger.kernel.org, NXP Linux Team , Pengutronix Kernel Team , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org List-ID: T24gdGhlIGlteDhtcSBJIGdldCBOVUxMIHBvaW50ZXIgZGUtZGVmZXJlbmNlIGVycm9ycyBpZiB0 aGUgZGV2aWNlCmlzbid0IHBhc3NlZCBpbiBkdXJpbmcgYWxsb2NhdGlvbi4KClNpZ25lZC1vZmYt Ynk6IEFuZ3VzIEFpbnNsaWUgKFB1cmlzbSkgPGFuZ3VzQGFra2VhLmNhPgotLS0KIGRyaXZlcnMv ZG1hL2lteC1zZG1hLmMgfCAxNyArKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDkg aW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2RtYS9p bXgtc2RtYS5jIGIvZHJpdmVycy9kbWEvaW14LXNkbWEuYwppbmRleCA4NjcwOGZiOWJkYTEuLjA2 NGJjNTBkMWU5OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9kbWEvaW14LXNkbWEuYworKysgYi9kcml2 ZXJzL2RtYS9pbXgtc2RtYS5jCkBAIC02NzcsNyArNjc3LDcgQEAgc3RhdGljIGludCBzZG1hX2xv YWRfc2NyaXB0KHN0cnVjdCBzZG1hX2VuZ2luZSAqc2RtYSwgdm9pZCAqYnVmLCBpbnQgc2l6ZSwK IAlpbnQgcmV0OwogCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CiAKLQlidWZfdmlydCA9IGRtYV9hbGxv Y19jb2hlcmVudChOVUxMLCBzaXplLCAmYnVmX3BoeXMsIEdGUF9LRVJORUwpOworCWJ1Zl92aXJ0 ID0gZG1hX2FsbG9jX2NvaGVyZW50KHNkbWEtPmRldiwgc2l6ZSwgJmJ1Zl9waHlzLCBHRlBfS0VS TkVMKTsKIAlpZiAoIWJ1Zl92aXJ0KSB7CiAJCXJldHVybiAtRU5PTUVNOwogCX0KQEAgLTY5Niw3 ICs2OTYsNyBAQCBzdGF0aWMgaW50IHNkbWFfbG9hZF9zY3JpcHQoc3RydWN0IHNkbWFfZW5naW5l ICpzZG1hLCB2b2lkICpidWYsIGludCBzaXplLAogCiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgm c2RtYS0+Y2hhbm5lbF8wX2xvY2ssIGZsYWdzKTsKIAotCWRtYV9mcmVlX2NvaGVyZW50KE5VTEws IHNpemUsIGJ1Zl92aXJ0LCBidWZfcGh5cyk7CisJZG1hX2ZyZWVfY29oZXJlbnQoc2RtYS0+ZGV2 LCBzaXplLCBidWZfdmlydCwgYnVmX3BoeXMpOwogCiAJcmV0dXJuIHJldDsKIH0KQEAgLTExODIs OCArMTE4Miw4IEBAIHN0YXRpYyBpbnQgc2RtYV9yZXF1ZXN0X2NoYW5uZWwwKHN0cnVjdCBzZG1h X2VuZ2luZSAqc2RtYSkKIHsKIAlpbnQgcmV0ID0gLUVCVVNZOwogCi0Jc2RtYS0+YmQwID0gZG1h X2FsbG9jX2NvaGVyZW50KE5VTEwsIFBBR0VfU0laRSwgJnNkbWEtPmJkMF9waHlzLAotCQkJCSAg ICAgICBHRlBfTk9XQUlUKTsKKwlzZG1hLT5iZDAgPSBkbWFfemFsbG9jX2NvaGVyZW50KHNkbWEt PmRldiwgUEFHRV9TSVpFLCAmc2RtYS0+YmQwX3BoeXMsCisJCQkJCUdGUF9OT1dBSVQpOwogCWlm ICghc2RtYS0+YmQwKSB7CiAJCXJldCA9IC1FTk9NRU07CiAJCWdvdG8gb3V0OwpAQCAtMTIwNSw4 ICsxMjA1LDggQEAgc3RhdGljIGludCBzZG1hX2FsbG9jX2JkKHN0cnVjdCBzZG1hX2Rlc2MgKmRl c2MpCiAJdTMyIGJkX3NpemUgPSBkZXNjLT5udW1fYmQgKiBzaXplb2Yoc3RydWN0IHNkbWFfYnVm ZmVyX2Rlc2NyaXB0b3IpOwogCWludCByZXQgPSAwOwogCi0JZGVzYy0+YmQgPSBkbWFfYWxsb2Nf Y29oZXJlbnQoTlVMTCwgYmRfc2l6ZSwgJmRlc2MtPmJkX3BoeXMsCi0JCQkJICAgICAgR0ZQX05P V0FJVCk7CisJZGVzYy0+YmQgPSBkbWFfemFsbG9jX2NvaGVyZW50KGRlc2MtPnNkbWFjLT5zZG1h LT5kZXYsIGJkX3NpemUsCisJCQkmZGVzYy0+YmRfcGh5cywJR0ZQX05PV0FJVCk7CiAJaWYgKCFk ZXNjLT5iZCkgewogCQlyZXQgPSAtRU5PTUVNOwogCQlnb3RvIG91dDsKQEAgLTEyMTksNyArMTIx OSw4IEBAIHN0YXRpYyB2b2lkIHNkbWFfZnJlZV9iZChzdHJ1Y3Qgc2RtYV9kZXNjICpkZXNjKQog ewogCXUzMiBiZF9zaXplID0gZGVzYy0+bnVtX2JkICogc2l6ZW9mKHN0cnVjdCBzZG1hX2J1ZmZl cl9kZXNjcmlwdG9yKTsKIAotCWRtYV9mcmVlX2NvaGVyZW50KE5VTEwsIGJkX3NpemUsIGRlc2Mt PmJkLCBkZXNjLT5iZF9waHlzKTsKKwlkbWFfZnJlZV9jb2hlcmVudChkZXNjLT5zZG1hYy0+c2Rt YS0+ZGV2LCBiZF9zaXplLCBkZXNjLT5iZCwKKwkJCWRlc2MtPmJkX3BoeXMpOwogfQogCiBzdGF0 aWMgdm9pZCBzZG1hX2Rlc2NfZnJlZShzdHJ1Y3QgdmlydF9kbWFfZGVzYyAqdmQpCkBAIC0xODQy LDcgKzE4NDMsNyBAQCBzdGF0aWMgaW50IHNkbWFfaW5pdChzdHJ1Y3Qgc2RtYV9lbmdpbmUgKnNk bWEpCiAJLyogQmUgc3VyZSBTRE1BIGhhcyBub3Qgc3RhcnRlZCB5ZXQgKi8KIAl3cml0ZWxfcmVs YXhlZCgwLCBzZG1hLT5yZWdzICsgU0RNQV9IX0MwUFRSKTsKIAotCXNkbWEtPmNoYW5uZWxfY29u dHJvbCA9IGRtYV9hbGxvY19jb2hlcmVudChOVUxMLAorCXNkbWEtPmNoYW5uZWxfY29udHJvbCA9 IGRtYV9hbGxvY19jb2hlcmVudChzZG1hLT5kZXYsCiAJCQlNQVhfRE1BX0NIQU5ORUxTICogc2l6 ZW9mIChzdHJ1Y3Qgc2RtYV9jaGFubmVsX2NvbnRyb2wpICsKIAkJCXNpemVvZihzdHJ1Y3Qgc2Rt YV9jb250ZXh0X2RhdGEpLAogCQkJJmNjYl9waHlzLCBHRlBfS0VSTkVMKTsK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0ED0C6369F for ; Sun, 20 Jan 2019 02:05:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 80E0B20896 for ; Sun, 20 Jan 2019 02:05:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="ojK+jmY8"; dkim=pass (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="ojK+jmY8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730215AbfATCFc (ORCPT ); Sat, 19 Jan 2019 21:05:32 -0500 Received: from node.akkea.ca ([192.155.83.177]:35716 "EHLO node.akkea.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729945AbfATCFR (ORCPT ); Sat, 19 Jan 2019 21:05:17 -0500 X-Greylist: delayed 374 seconds by postgrey-1.27 at vger.kernel.org; Sat, 19 Jan 2019 21:05:16 EST Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id 6AB5A4E2051; Sun, 20 Jan 2019 01:59:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1547949542; bh=wxj4KQZd68U4CteRg0LBuiQpkZAAQQhF+vq81skObRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ojK+jmY84YyQYcxCHDRCg5LVJr2eIuuenKTQC8ndf4Am9brlHWNjclzDyrjPrlwPQ 5qj+WLPgY0Skzu0OY9qtMB8oMV7hc9cdN0KTsGMbU6LliwYwrHRkHo6aIG9Q7aMFb5 nGUVHFZogUlMXfAesHgWSdj5lT/o/hmSt1ea+6JE= X-Virus-Scanned: Debian amavisd-new at mail.akkea.ca Received: from node.akkea.ca ([127.0.0.1]) by localhost (mail.akkea.ca [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7q5NT6QLraNd; Sun, 20 Jan 2019 01:59:02 +0000 (UTC) Received: from localhost.localdomain (198-48-167-13.cpe.pppoe.ca [198.48.167.13]) by node.akkea.ca (Postfix) with ESMTPSA id 91C8D4E204D; Sun, 20 Jan 2019 01:59:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1547949542; bh=wxj4KQZd68U4CteRg0LBuiQpkZAAQQhF+vq81skObRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ojK+jmY84YyQYcxCHDRCg5LVJr2eIuuenKTQC8ndf4Am9brlHWNjclzDyrjPrlwPQ 5qj+WLPgY0Skzu0OY9qtMB8oMV7hc9cdN0KTsGMbU6LliwYwrHRkHo6aIG9Q7aMFb5 nGUVHFZogUlMXfAesHgWSdj5lT/o/hmSt1ea+6JE= From: "Angus Ainslie (Purism)" To: angus@akkea.ca Cc: Vinod Koul , dmaengine@vger.kernel.org, NXP Linux Team , Pengutronix Kernel Team , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] dma: imx-sdma: fix NULL pointer de-reference Date: Sat, 19 Jan 2019 18:58:49 -0700 Message-Id: <20190120015851.11797-2-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190120015851.11797-1-angus@akkea.ca> References: <20190120015851.11797-1-angus@akkea.ca> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On the imx8mq I get NULL pointer de-deference errors if the device isn't passed in during allocation. Signed-off-by: Angus Ainslie (Purism) --- drivers/dma/imx-sdma.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 86708fb9bda1..064bc50d1e99 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -677,7 +677,7 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size, int ret; unsigned long flags; - buf_virt = dma_alloc_coherent(NULL, size, &buf_phys, GFP_KERNEL); + buf_virt = dma_alloc_coherent(sdma->dev, size, &buf_phys, GFP_KERNEL); if (!buf_virt) { return -ENOMEM; } @@ -696,7 +696,7 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size, spin_unlock_irqrestore(&sdma->channel_0_lock, flags); - dma_free_coherent(NULL, size, buf_virt, buf_phys); + dma_free_coherent(sdma->dev, size, buf_virt, buf_phys); return ret; } @@ -1182,8 +1182,8 @@ static int sdma_request_channel0(struct sdma_engine *sdma) { int ret = -EBUSY; - sdma->bd0 = dma_alloc_coherent(NULL, PAGE_SIZE, &sdma->bd0_phys, - GFP_NOWAIT); + sdma->bd0 = dma_zalloc_coherent(sdma->dev, PAGE_SIZE, &sdma->bd0_phys, + GFP_NOWAIT); if (!sdma->bd0) { ret = -ENOMEM; goto out; @@ -1205,8 +1205,8 @@ static int sdma_alloc_bd(struct sdma_desc *desc) u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor); int ret = 0; - desc->bd = dma_alloc_coherent(NULL, bd_size, &desc->bd_phys, - GFP_NOWAIT); + desc->bd = dma_zalloc_coherent(desc->sdmac->sdma->dev, bd_size, + &desc->bd_phys, GFP_NOWAIT); if (!desc->bd) { ret = -ENOMEM; goto out; @@ -1219,7 +1219,8 @@ static void sdma_free_bd(struct sdma_desc *desc) { u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor); - dma_free_coherent(NULL, bd_size, desc->bd, desc->bd_phys); + dma_free_coherent(desc->sdmac->sdma->dev, bd_size, desc->bd, + desc->bd_phys); } static void sdma_desc_free(struct virt_dma_desc *vd) @@ -1842,7 +1843,7 @@ static int sdma_init(struct sdma_engine *sdma) /* Be sure SDMA has not started yet */ writel_relaxed(0, sdma->regs + SDMA_H_C0PTR); - sdma->channel_control = dma_alloc_coherent(NULL, + sdma->channel_control = dma_alloc_coherent(sdma->dev, MAX_DMA_CHANNELS * sizeof (struct sdma_channel_control) + sizeof(struct sdma_context_data), &ccb_phys, GFP_KERNEL); -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA627C61CE8 for ; Sun, 20 Jan 2019 01:59:46 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AAD972084F for ; Sun, 20 Jan 2019 01:59:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Yb91lIXB"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="ojK+jmY8"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="ojK+jmY8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AAD972084F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=akkea.ca Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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=rfl3zNON+onmSKlnKfMBDeAJtGJw+9Yb0T+qW7I/qeQ=; b=Yb91lIXBIrfwOxlCetZJCK4NXk C2uG5uDephY0OlAM9miMxF7AzXRiuSFLouXzstssP9YV0fGPHcrsdwlwktvOuR9Z6TBBbiehV/rg4 pMCyesEhHAmx+y9j+WwhRt0WZ1x+nGiBGN1fJsveLoMQU457OwvsjBu+v12a/hQ5J8Vcnt2dYfZKu 7nLnrS8A4XQ1GC7qKXMBRejHstJumFNpC6EGtwFSkyK0pPQDLMiEmYI8NGGeHHIKLpd81VppCitQM s70eVyCnENONgcFfM0vi15e3JlSPWL0CD681GOdtVr6cq12xTlBJcl7OOgGMj+ArvCjwkPnm8Kpb0 Cg6YV/sQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gl2Ok-00082J-TF; Sun, 20 Jan 2019 01:59:42 +0000 Received: from node.akkea.ca ([192.155.83.177]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gl2OB-0007XU-Ks for linux-arm-kernel@lists.infradead.org; Sun, 20 Jan 2019 01:59:09 +0000 Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id 6AB5A4E2051; Sun, 20 Jan 2019 01:59:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1547949542; bh=wxj4KQZd68U4CteRg0LBuiQpkZAAQQhF+vq81skObRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ojK+jmY84YyQYcxCHDRCg5LVJr2eIuuenKTQC8ndf4Am9brlHWNjclzDyrjPrlwPQ 5qj+WLPgY0Skzu0OY9qtMB8oMV7hc9cdN0KTsGMbU6LliwYwrHRkHo6aIG9Q7aMFb5 nGUVHFZogUlMXfAesHgWSdj5lT/o/hmSt1ea+6JE= X-Virus-Scanned: Debian amavisd-new at mail.akkea.ca Received: from node.akkea.ca ([127.0.0.1]) by localhost (mail.akkea.ca [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7q5NT6QLraNd; Sun, 20 Jan 2019 01:59:02 +0000 (UTC) Received: from localhost.localdomain (198-48-167-13.cpe.pppoe.ca [198.48.167.13]) by node.akkea.ca (Postfix) with ESMTPSA id 91C8D4E204D; Sun, 20 Jan 2019 01:59:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1547949542; bh=wxj4KQZd68U4CteRg0LBuiQpkZAAQQhF+vq81skObRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ojK+jmY84YyQYcxCHDRCg5LVJr2eIuuenKTQC8ndf4Am9brlHWNjclzDyrjPrlwPQ 5qj+WLPgY0Skzu0OY9qtMB8oMV7hc9cdN0KTsGMbU6LliwYwrHRkHo6aIG9Q7aMFb5 nGUVHFZogUlMXfAesHgWSdj5lT/o/hmSt1ea+6JE= From: "Angus Ainslie (Purism)" To: angus@akkea.ca Subject: [PATCH 1/3] dma: imx-sdma: fix NULL pointer de-reference Date: Sat, 19 Jan 2019 18:58:49 -0700 Message-Id: <20190120015851.11797-2-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190120015851.11797-1-angus@akkea.ca> References: <20190120015851.11797-1-angus@akkea.ca> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190119_175907_688723_1822CE5C X-CRM114-Status: GOOD ( 10.78 ) 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: linux-kernel@vger.kernel.org, Vinod Koul , NXP Linux Team , Pengutronix Kernel Team , dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On the imx8mq I get NULL pointer de-deference errors if the device isn't passed in during allocation. Signed-off-by: Angus Ainslie (Purism) --- drivers/dma/imx-sdma.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 86708fb9bda1..064bc50d1e99 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -677,7 +677,7 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size, int ret; unsigned long flags; - buf_virt = dma_alloc_coherent(NULL, size, &buf_phys, GFP_KERNEL); + buf_virt = dma_alloc_coherent(sdma->dev, size, &buf_phys, GFP_KERNEL); if (!buf_virt) { return -ENOMEM; } @@ -696,7 +696,7 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size, spin_unlock_irqrestore(&sdma->channel_0_lock, flags); - dma_free_coherent(NULL, size, buf_virt, buf_phys); + dma_free_coherent(sdma->dev, size, buf_virt, buf_phys); return ret; } @@ -1182,8 +1182,8 @@ static int sdma_request_channel0(struct sdma_engine *sdma) { int ret = -EBUSY; - sdma->bd0 = dma_alloc_coherent(NULL, PAGE_SIZE, &sdma->bd0_phys, - GFP_NOWAIT); + sdma->bd0 = dma_zalloc_coherent(sdma->dev, PAGE_SIZE, &sdma->bd0_phys, + GFP_NOWAIT); if (!sdma->bd0) { ret = -ENOMEM; goto out; @@ -1205,8 +1205,8 @@ static int sdma_alloc_bd(struct sdma_desc *desc) u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor); int ret = 0; - desc->bd = dma_alloc_coherent(NULL, bd_size, &desc->bd_phys, - GFP_NOWAIT); + desc->bd = dma_zalloc_coherent(desc->sdmac->sdma->dev, bd_size, + &desc->bd_phys, GFP_NOWAIT); if (!desc->bd) { ret = -ENOMEM; goto out; @@ -1219,7 +1219,8 @@ static void sdma_free_bd(struct sdma_desc *desc) { u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor); - dma_free_coherent(NULL, bd_size, desc->bd, desc->bd_phys); + dma_free_coherent(desc->sdmac->sdma->dev, bd_size, desc->bd, + desc->bd_phys); } static void sdma_desc_free(struct virt_dma_desc *vd) @@ -1842,7 +1843,7 @@ static int sdma_init(struct sdma_engine *sdma) /* Be sure SDMA has not started yet */ writel_relaxed(0, sdma->regs + SDMA_H_C0PTR); - sdma->channel_control = dma_alloc_coherent(NULL, + sdma->channel_control = dma_alloc_coherent(sdma->dev, MAX_DMA_CHANNELS * sizeof (struct sdma_channel_control) + sizeof(struct sdma_context_data), &ccb_phys, GFP_KERNEL); -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel