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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9CBD3C6FA89 for ; Wed, 14 Sep 2022 09:02:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2B04810E8BD; Wed, 14 Sep 2022 09:02:25 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id F162710E8BD; Wed, 14 Sep 2022 09:02:18 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6B59D61999; Wed, 14 Sep 2022 09:02:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF070C433D7; Wed, 14 Sep 2022 09:02:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1663146137; bh=D6yNkS8/rv3f4Kgw0Cl2PR7CDS5sCEdTlxNUZbRpUZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FUxrWmKVswx5iLQJlNy9mkMpP7c/VG/VATG9p33vmnIAXosH1yEyaReTi0qDV2aa/ snFxzPn+gdpxcUpVh/QymoZccAoSLXnNW+JyYuDwp9vXFjYM+7dKJxUm2a6qTZzZ/I jhY7mEb2reB6cIjU5siELL2mgBYGWZg/osnQidhpRkI81/D/11HWdhoHWLcOmXqNK2 qAkd0bDiMMSZWovT387H4W+LCfQMbQrF/ZqrQmo12dnSP8dYObIysGQWKRUbfHZgAa N3o/vZ1liELjy7VimuMaDBV9C16xbnOtblhiWFm78X/8EkOVzHvcCSwn8wcvezPs1x shQTI1EUAME+A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.19 20/22] drm/amdgpu: prevent toc firmware memory leak Date: Wed, 14 Sep 2022 05:01:01 -0400 Message-Id: <20220914090103.470630-20-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220914090103.470630-1-sashal@kernel.org> References: <20220914090103.470630-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , tao.zhou1@amd.com, Guchun Chen , airlied@linux.ie, Bokun.Zhang@amd.com, Xinhui.Pan@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, daniel@ffwll.ch, Alex Deucher , Likun.Gao@amd.com, candice.li@amd.com, john.clements@amd.com, christian.koenig@amd.com, Hawking.Zhang@amd.com Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Guchun Chen [ Upstream commit aac4cec1ec45d72bd03eaf3fd772c5a609f5ed26 ] It's missed in psp fini. Signed-off-by: Guchun Chen Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index e9411c28d88ba..9cb7d208a09ad 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -481,11 +481,14 @@ static int psp_sw_fini(void *handle) release_firmware(psp->ta_fw); psp->ta_fw = NULL; } - if (adev->psp.cap_fw) { + if (psp->cap_fw) { release_firmware(psp->cap_fw); psp->cap_fw = NULL; } - + if (psp->toc_fw) { + release_firmware(psp->toc_fw); + psp->toc_fw = NULL; + } if (adev->ip_versions[MP0_HWIP][0] == IP_VERSION(11, 0, 0) || adev->ip_versions[MP0_HWIP][0] == IP_VERSION(11, 0, 7)) psp_sysfs_fini(adev); -- 2.35.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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35BE6ECAAD3 for ; Wed, 14 Sep 2022 09:04:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230305AbiINJEt (ORCPT ); Wed, 14 Sep 2022 05:04:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231190AbiINJD7 (ORCPT ); Wed, 14 Sep 2022 05:03:59 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 678BB77EA9; Wed, 14 Sep 2022 02:02:31 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id E67C6CE1695; Wed, 14 Sep 2022 09:02:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF070C433D7; Wed, 14 Sep 2022 09:02:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1663146137; bh=D6yNkS8/rv3f4Kgw0Cl2PR7CDS5sCEdTlxNUZbRpUZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FUxrWmKVswx5iLQJlNy9mkMpP7c/VG/VATG9p33vmnIAXosH1yEyaReTi0qDV2aa/ snFxzPn+gdpxcUpVh/QymoZccAoSLXnNW+JyYuDwp9vXFjYM+7dKJxUm2a6qTZzZ/I jhY7mEb2reB6cIjU5siELL2mgBYGWZg/osnQidhpRkI81/D/11HWdhoHWLcOmXqNK2 qAkd0bDiMMSZWovT387H4W+LCfQMbQrF/ZqrQmo12dnSP8dYObIysGQWKRUbfHZgAa N3o/vZ1liELjy7VimuMaDBV9C16xbnOtblhiWFm78X/8EkOVzHvcCSwn8wcvezPs1x shQTI1EUAME+A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Guchun Chen , Alex Deucher , Sasha Levin , christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@linux.ie, daniel@ffwll.ch, Hawking.Zhang@amd.com, Likun.Gao@amd.com, john.clements@amd.com, candice.li@amd.com, tao.zhou1@amd.com, Bokun.Zhang@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.19 20/22] drm/amdgpu: prevent toc firmware memory leak Date: Wed, 14 Sep 2022 05:01:01 -0400 Message-Id: <20220914090103.470630-20-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220914090103.470630-1-sashal@kernel.org> References: <20220914090103.470630-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Guchun Chen [ Upstream commit aac4cec1ec45d72bd03eaf3fd772c5a609f5ed26 ] It's missed in psp fini. Signed-off-by: Guchun Chen Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index e9411c28d88ba..9cb7d208a09ad 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -481,11 +481,14 @@ static int psp_sw_fini(void *handle) release_firmware(psp->ta_fw); psp->ta_fw = NULL; } - if (adev->psp.cap_fw) { + if (psp->cap_fw) { release_firmware(psp->cap_fw); psp->cap_fw = NULL; } - + if (psp->toc_fw) { + release_firmware(psp->toc_fw); + psp->toc_fw = NULL; + } if (adev->ip_versions[MP0_HWIP][0] == IP_VERSION(11, 0, 0) || adev->ip_versions[MP0_HWIP][0] == IP_VERSION(11, 0, 7)) psp_sysfs_fini(adev); -- 2.35.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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 59E48ECAAD3 for ; Wed, 14 Sep 2022 09:02:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 78A5910E8BE; Wed, 14 Sep 2022 09:02:22 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id F162710E8BD; Wed, 14 Sep 2022 09:02:18 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6B59D61999; Wed, 14 Sep 2022 09:02:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF070C433D7; Wed, 14 Sep 2022 09:02:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1663146137; bh=D6yNkS8/rv3f4Kgw0Cl2PR7CDS5sCEdTlxNUZbRpUZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FUxrWmKVswx5iLQJlNy9mkMpP7c/VG/VATG9p33vmnIAXosH1yEyaReTi0qDV2aa/ snFxzPn+gdpxcUpVh/QymoZccAoSLXnNW+JyYuDwp9vXFjYM+7dKJxUm2a6qTZzZ/I jhY7mEb2reB6cIjU5siELL2mgBYGWZg/osnQidhpRkI81/D/11HWdhoHWLcOmXqNK2 qAkd0bDiMMSZWovT387H4W+LCfQMbQrF/ZqrQmo12dnSP8dYObIysGQWKRUbfHZgAa N3o/vZ1liELjy7VimuMaDBV9C16xbnOtblhiWFm78X/8EkOVzHvcCSwn8wcvezPs1x shQTI1EUAME+A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.19 20/22] drm/amdgpu: prevent toc firmware memory leak Date: Wed, 14 Sep 2022 05:01:01 -0400 Message-Id: <20220914090103.470630-20-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220914090103.470630-1-sashal@kernel.org> References: <20220914090103.470630-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , tao.zhou1@amd.com, Guchun Chen , airlied@linux.ie, Bokun.Zhang@amd.com, Xinhui.Pan@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , Likun.Gao@amd.com, candice.li@amd.com, john.clements@amd.com, christian.koenig@amd.com, Hawking.Zhang@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Guchun Chen [ Upstream commit aac4cec1ec45d72bd03eaf3fd772c5a609f5ed26 ] It's missed in psp fini. Signed-off-by: Guchun Chen Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index e9411c28d88ba..9cb7d208a09ad 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -481,11 +481,14 @@ static int psp_sw_fini(void *handle) release_firmware(psp->ta_fw); psp->ta_fw = NULL; } - if (adev->psp.cap_fw) { + if (psp->cap_fw) { release_firmware(psp->cap_fw); psp->cap_fw = NULL; } - + if (psp->toc_fw) { + release_firmware(psp->toc_fw); + psp->toc_fw = NULL; + } if (adev->ip_versions[MP0_HWIP][0] == IP_VERSION(11, 0, 0) || adev->ip_versions[MP0_HWIP][0] == IP_VERSION(11, 0, 7)) psp_sysfs_fini(adev); -- 2.35.1