From patchwork Sun Dec 17 17:25:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 10118441 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 8A05160390 for ; Mon, 18 Dec 2017 08:38:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7836C28915 for ; Mon, 18 Dec 2017 08:38:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D4162891C; Mon, 18 Dec 2017 08:38:12 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3915828915 for ; Mon, 18 Dec 2017 08:38:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E2C9C89C54; Mon, 18 Dec 2017 08:38:05 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf0-x244.google.com (mail-lf0-x244.google.com [IPv6:2a00:1450:4010:c07::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id B31C289C56 for ; Sun, 17 Dec 2017 17:28:00 +0000 (UTC) Received: by mail-lf0-x244.google.com with SMTP id y78so9693406lfd.1 for ; Sun, 17 Dec 2017 09:28:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fSNTRpWfN58BbJNJn/czpOujzIcbntWrFPp0KKarAOQ=; b=CL9ysxpRWLdm0cc3ctqEWHXTdkHizSrud/yGZYA0KbdDaLb9fh0lc2oBjDoKdUPU9F kGKU73/E71ui3NAUzUJDnoqttK4YE2+1qmli1LWJ7ZvTOOs7ZZ3OqSSx5tvCJclbCXRE dwCXnZDOxoHtERPFVUQ+JztYvutnTgyXG6YOXeaHmbDao+dK7eQ7/08dQP1Wh1yfvzCk ht924FFm4xajgatSURN44wPr0jSZjUujbZ/hs0g2FITt+pLCvaP3MfkvVM/hbaJTGZTb twcALUsFr9gbSYfbY3MwZf0pYZ89H4uyk0RN9aNdjKleGm6FG7IPDAatz0DfGHU3JAAN MU/Q== 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=fSNTRpWfN58BbJNJn/czpOujzIcbntWrFPp0KKarAOQ=; b=dU3WmuUPOGXTYEUYExlSUENlSBuR+bwNhyvySoVEBnbsMgV7tkcJL4QbpbL6YlXlnw bYKh08od1YFHMSOPg1bVNr3/XO3Ur53cc4DyXmhObqVn3pR3YJh6hR0CRvDOFexQ9t9L YnP7FLDDgUVPS80EAuEis6ONvr0/Fym80NRhuGeO9G5R1Lzw8RK1eg4hLa/1AznYQHxL fqDLMLSuINO5Qscd9k+wWd3qB73uAwdkovoM1Yr0A80eco4DGNz8HLtJst3gqsVU4FWq hrzLkwSVtuw/F6BKnHoL7sOnDAx3T+u22IjdO+l2bB4ElR0XeEhthb7ZyDg0qf/mXQjN gpiA== X-Gm-Message-State: AKGB3mKLKunjskZmluR75l+xWr0qx8Ohkad2Zt8EZ7f7vMj3dpO2UxU4 dtGTgU6MWhqXwMszfy6nU9w= X-Google-Smtp-Source: ACJfBotsXNYnkSB/HnQqlIpR3LhEO9h51KNdxyVmt/8kTg2Q7vM/7U2tZ/+tajQY6zU0J1WlMcUD1g== X-Received: by 10.46.71.143 with SMTP id u137mr9191938lja.79.1513531679240; Sun, 17 Dec 2017 09:27:59 -0800 (PST) Received: from localhost.localdomain (ppp109-252-55-194.pppoe.spdop.ru. [109.252.55.194]) by smtp.gmail.com with ESMTPSA id t85sm2244926ljb.91.2017.12.17.09.27.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Dec 2017 09:27:58 -0800 (PST) From: Dmitry Osipenko To: Thierry Reding Subject: [PATCH v1] drm/tegra: gem: Correct iommu_map_sg() error checking Date: Sun, 17 Dec 2017 20:25:43 +0300 Message-Id: X-Mailer: git-send-email 2.15.1 In-Reply-To: <8a87083279bb793dd21a0c621bcd002a851495e5.1513530934.git.digetx@gmail.com> References: <8a87083279bb793dd21a0c621bcd002a851495e5.1513530934.git.digetx@gmail.com> X-Mailman-Approved-At: Mon, 18 Dec 2017 08:38:01 +0000 Cc: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP iommu_map_sg() doesn't return a error value, but a size of the requested IOMMU mapping or zero in case of error. Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/tegra/gem.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index ab1e53d434e8..710d3c289b2e 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -114,7 +114,7 @@ static const struct host1x_bo_ops tegra_bo_ops = { static int tegra_bo_iommu_map(struct tegra_drm *tegra, struct tegra_bo *bo) { int prot = IOMMU_READ | IOMMU_WRITE; - ssize_t err; + int err; if (bo->mm) return -EBUSY; @@ -135,15 +135,14 @@ static int tegra_bo_iommu_map(struct tegra_drm *tegra, struct tegra_bo *bo) bo->paddr = bo->mm->start; - err = iommu_map_sg(tegra->domain, bo->paddr, bo->sgt->sgl, - bo->sgt->nents, prot); - if (err < 0) { - dev_err(tegra->drm->dev, "failed to map buffer: %zd\n", err); + bo->size = iommu_map_sg(tegra->domain, bo->paddr, bo->sgt->sgl, + bo->sgt->nents, prot); + if (!bo->size) { + dev_err(tegra->drm->dev, "failed to map buffer\n"); + err = -ENOMEM; goto remove; } - bo->size = err; - mutex_unlock(&tegra->mm_lock); return 0;