From patchwork Thu Apr 13 08:22:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Perttunen X-Patchwork-Id: 82858 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp878530vqo; Thu, 13 Apr 2023 01:36:35 -0700 (PDT) X-Google-Smtp-Source: AKy350a9cwGyGFuLhG5pAzTQU3ZLSeWDwELEmhgDnW1OtR6X6Anhg5/igsHk74KqT5DHLcN8fuCA X-Received: by 2002:a05:6a00:1a93:b0:638:d5a7:acc6 with SMTP id e19-20020a056a001a9300b00638d5a7acc6mr2460688pfv.9.1681374995262; Thu, 13 Apr 2023 01:36:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681374995; cv=none; d=google.com; s=arc-20160816; b=mP0Vy2gya0d4NEuEJYY0GS6n6t0eStDrELP41L9ofaUThrsCRHlnOK6LDBO0zxJXaf saTKmCkOVHdK0APmJ/zbC0iLjTx+qPpTKCXH1DYEMoUk83q71NflcrBatCJY25FSiwE5 GkhmESgjQukZdfQxIb7CHFTLIJGp17e5PqiVbTNIDnq7XUwvOnhl3IbYRZCRQRxaWJPW A4/jTD/K6HG0u3YERZtqpBkEJ/BKzU0t77+Jwnp+Lj+51oiEELzRGYHjU2cg51BBFtvu 62x7C1LTlfmALmWnTFtJ0730shDseL6rne+5vW2pxCY1hxQ3N75FUKeBi3Cbji6X0cL5 Pdog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=KKG30S28GcImO9fjjiMWJCrRczwA06I44fh0HArJMdw=; b=XGxJhs99HJGUJLyb6e8Zu0SUvL2C6CvGOpR4fFWCV8AFVNTJsk3s1O5zGjWcN6qS0R QHxOjHUR1aqRcY1tpS9mcvo9P5RVVMDbgVvRtKRKxmgu8jDmgH3nhxeb7DBdhefXBum5 zVke3nzLBHC0tr81qPEUWYpeU4PXQ7O8gaoKUxk94zoeGPbI4083H/dWfqDkVhkS1UrA 9CXP3dKOFXgtuND7PHov/s+GwtonH8dOEx6xrfwzLAEl7694R0LjJqApiZnIx9XbbXce 5yNuGxpUWKSTuCiJeode3FmY0+Ws7q21AcK6WP1MEsRo6O7FzQj35GxpsjVHY7nhm/Xk 3gPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kapsi.fi header.s=20161220 header.b=cFxLsR4N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kapsi.fi Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a4-20020aa795a4000000b006345170da98si1304841pfk.38.2023.04.13.01.36.23; Thu, 13 Apr 2023 01:36:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@kapsi.fi header.s=20161220 header.b=cFxLsR4N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kapsi.fi Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229678AbjDMIWU (ORCPT + 99 others); Thu, 13 Apr 2023 04:22:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230156AbjDMIWS (ORCPT ); Thu, 13 Apr 2023 04:22:18 -0400 Received: from mail.kapsi.fi (mail.kapsi.fi [IPv6:2001:67c:1be8::25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD2FD8695; Thu, 13 Apr 2023 01:22:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kapsi.fi; s=20161220; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=KKG30S28GcImO9fjjiMWJCrRczwA06I44fh0HArJMdw=; b=cFxLsR4NhRubxrLXp8YIRnE+ty EaYZ+AUsoa+HvlKjdoHKeOOoIWGllAe2t4mW7TN2rs0sCcY1z0E7GgARvD29MNZ0Phb/4L3oW0cD5 kCNvHprgvJthYCVCv7ejDkx7snyOuCp2F+PtZO7Vym6s9V3lFjGUZNkf/IFOrvE/6nqX715LSmUt/ +jKYmqmU7S/pSPBMoyijhVaBGeWKdfuWsckjjOfwK1ru9w+tCVP+hjYjoLNBIl5aDFiyd787WARJE FCxOEZnWn4bE5eHHky4DyxZq188/LHvEFbrJ6t7ACkFOAeWHuUB8p6MoQLg7mTqZB9+g0wT1aD5Zl JLzm3FNw==; Received: from 91-158-25-70.elisa-laajakaista.fi ([91.158.25.70] helo=toshino.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pmsDc-008oPu-3l; Thu, 13 Apr 2023 11:22:12 +0300 From: Mikko Perttunen To: Thierry Reding Cc: Mikko Perttunen , Dan Carpenter , dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] drm/tegra: Add error check for NVDEC firmware memory allocation Date: Thu, 13 Apr 2023 11:22:01 +0300 Message-Id: <20230413082202.114721-1-cyndis@kapsi.fi> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 91.158.25.70 X-SA-Exim-Mail-From: cyndis@kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763049467224173256?= X-GMAIL-MSGID: =?utf-8?q?1763049467224173256?= From: Mikko Perttunen The return value for tegra_drm_alloc was missing an error check. Add one. Reported-by: Dan Carpenter Signed-off-by: Mikko Perttunen --- drivers/gpu/drm/tegra/nvdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/tegra/nvdec.c b/drivers/gpu/drm/tegra/nvdec.c index ae78a81e5eef..15ce5e89fad4 100644 --- a/drivers/gpu/drm/tegra/nvdec.c +++ b/drivers/gpu/drm/tegra/nvdec.c @@ -276,6 +276,8 @@ static int nvdec_load_falcon_firmware(struct nvdec *nvdec) return err; } else { virt = tegra_drm_alloc(tegra, size, &iova); + if (IS_ERR(virt)) + return PTR_ERR(virt); } nvdec->falcon.firmware.virt = virt; From patchwork Thu Apr 13 08:22:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Perttunen X-Patchwork-Id: 82860 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp878733vqo; Thu, 13 Apr 2023 01:37:00 -0700 (PDT) X-Google-Smtp-Source: AKy350bU4CGFBUrE2Vi1Ays7593F4ANUdMcudgvmFmnmAm8hjJkxY5g3YxSJkt/eA6kNsYa8qyK6 X-Received: by 2002:a05:6402:1486:b0:504:8a10:ac34 with SMTP id e6-20020a056402148600b005048a10ac34mr1720856edv.24.1681375020243; Thu, 13 Apr 2023 01:37:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681375020; cv=none; d=google.com; s=arc-20160816; b=zCE9lGu5aO1dNLxV+gQroOaxNgyNhoQthhQqcUAjOTL79iZWudHVM+5//6Il893/H9 CVh01hL/h5MLdv3nR/JCwGzl9kC9ayCSxtDl6iABJnVL5HlSkFGXHcCOvvbjKg03ylGL tdlawbSKjeo7XswfLTN6NgN5gV/ptr+muYW2Ryn85AaQh8vpexh5vY0cFOl9rmCY5y8M eKg0ombsyQCTALxMgGdmI27SGc3rNYyitDCCjZSAVYt5bMCHyS1HItWO4YbuaV5ErsG9 HFAIWea3J0fu6mQ+eq4JMzgVxeeC5P7nnVnzYxJJ+yoaltp5bnPU2D0xSQ5CMdOn7/AN 9pTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DdPYvmnlhKSi2/t2MM9rvNpqpdHa3YjdMYZD1FWaIEs=; b=bXaBFuE9rYO5+I33vDkA+rjF4Aqbrl0lbdifHF6Gi5LfB5OTwZLKGSqp6o3GDKsWp+ 8gdWcvM4cs9eYyWbT4yzydEmDUMs5mtdm5mwWEiUQd3oPhtMoQlvZ0JsEfpaO5AjEf7N HOpdVO1wnL6jHu+MApaJ3fOYtYhoY0VvnkICTVNOenQt7xS/+yX47I4TNteMBugkBKIj w7rsMiIbAXdMkDHgkw+if2QUIoc1fNeL2FuMXRum05Rg5MojkTOLLTZXBhy30p+O7l35 KJmWG4y6ImpaKt9MAOh8DFmDLu4luoSEYkj1DZZd+wYbPrZmo/MY42LhjQmKauLUFzH4 4tHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kapsi.fi header.s=20161220 header.b=gqJizhtT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kapsi.fi Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c2-20020aa7d602000000b00504b97f26f0si1176848edr.616.2023.04.13.01.36.36; Thu, 13 Apr 2023 01:37:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@kapsi.fi header.s=20161220 header.b=gqJizhtT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kapsi.fi Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230413AbjDMIWY (ORCPT + 99 others); Thu, 13 Apr 2023 04:22:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230393AbjDMIWT (ORCPT ); Thu, 13 Apr 2023 04:22:19 -0400 Received: from mail.kapsi.fi (mail.kapsi.fi [IPv6:2001:67c:1be8::25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CDDE5FD4; Thu, 13 Apr 2023 01:22:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kapsi.fi; s=20161220; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: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=DdPYvmnlhKSi2/t2MM9rvNpqpdHa3YjdMYZD1FWaIEs=; b=gqJizhtTRdr8hkff58lekZDHZf 7w+fg8oyG3h96eTYQeDG4opBNJQ2hLaadNwAQv7PgeTg+xB2dnVoO+KBOKQ2gDguV2khSTVbX1Xx9 fGcQNIcgPeYxO1zMibGgSEFXs/ZTDdSEJJU0PGtAYZJXLIdu5JM62PRaYcy4vXiuzSW332e07moCZ FjMLgDPw2949+DMOSzL0dYDuYezRyfMP/NB6FBbhHPrpB09lqjy5D+MyIk2GNS7WpncNHQE+Vj8x/ FVObCbWTq9uu2E0de0vmsYatPIfMV2SZoYXFy05AHCRJUlU3m0xxo455eA3YTH8v7kPCIAiTloO1X xkalSz4A==; Received: from 91-158-25-70.elisa-laajakaista.fi ([91.158.25.70] helo=toshino.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pmsDc-008oPu-AT; Thu, 13 Apr 2023 11:22:12 +0300 From: Mikko Perttunen To: Thierry Reding Cc: Mikko Perttunen , Dan Carpenter , dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] gpu: host1x: Return error when context device not attached to IOMMU Date: Thu, 13 Apr 2023 11:22:02 +0300 Message-Id: <20230413082202.114721-2-cyndis@kapsi.fi> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230413082202.114721-1-cyndis@kapsi.fi> References: <20230413082202.114721-1-cyndis@kapsi.fi> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 91.158.25.70 X-SA-Exim-Mail-From: cyndis@kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763049493500261124?= X-GMAIL-MSGID: =?utf-8?q?1763049493500261124?= From: Mikko Perttunen If a context device was not attached to IOMMU, we kept the old success err value causing context devices to be unregistered but success to be returned. This would mean that things would go on but with context isolation disabled. To decide on an explicit behavior, let's return an error code here instead. If someone wants to go without IOMMU on a platform modern enough to support context isolation, they can remove the context devices from device tree. Reported-by: Dan Carpenter Signed-off-by: Mikko Perttunen --- drivers/gpu/host1x/context.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/host1x/context.c b/drivers/gpu/host1x/context.c index 9ad89d22c0ca..c45c4d4e6c1a 100644 --- a/drivers/gpu/host1x/context.c +++ b/drivers/gpu/host1x/context.c @@ -79,6 +79,14 @@ int host1x_memory_context_list_init(struct host1x *host1x) !device_iommu_mapped(&ctx->dev)) { dev_err(host1x->dev, "Context device %d has no IOMMU!\n", i); device_unregister(&ctx->dev); + + /* + * This means that if IOMMU is disabled but context devices + * are defined in the device tree, Host1x will fail to probe. + * That's probably OK in this time and age. + */ + err = -EINVAL; + goto unreg_devices; } }