From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 91EFB58231; Sun, 28 Jan 2024 16:12:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706458373; cv=none; b=IAtDGNGT6L1ny+jTxGpTzEPxJTR1Xg8hOqRcSwov55VF4zMby3HaQaU03zZOtLrnANxXhV8YBn8LZ7b0saBBSRT7ywr8A754Qr1xeSyiqom043Opk51tPxYMDyqwGSnC2LaVBrKHkO1+A+4LPcYuIKe6mpUeMnIAgqytvpXuyac= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706458373; c=relaxed/simple; bh=RF11Nuaw/Quj3WjbZtfD35x2IlLylre1seT1n1UkZg0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kFkBO8XpyUbwaT29Pnmm0y8/ilCqKrFaAOR/JPBijWHJrdXOkYow9pYhp2cWeaB1L8SsXqDaC7L0sGSnBhySFWsFTu9qvJcchw+72Ckgr/FdJhV1csZlLeLuKi704uFSDMjRodcAX7U3jBIt0+M7XwuXAHtWdCf+f8mKGBFUdLs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kGtKVD9Y; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kGtKVD9Y" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2CDE2C433F1; Sun, 28 Jan 2024 16:12:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706458373; bh=RF11Nuaw/Quj3WjbZtfD35x2IlLylre1seT1n1UkZg0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kGtKVD9Y+IG/FH9/CP6Gp3sotIfUmYRxGxotMQnjvebbM8M76f8QTg4LH70DoEdzp Cp1hsfJYRf1Vsv8dGYKPHoJOQ+6m0xwRTyDpa5NhujmueIXrL6/hcnwQLyfbDN2KRN aAQF7hWpr6XsQYB13jCYf2rBl/W5/GbdKymWOaXvt31Fo3VhgMDm6dN4tb+ynxx5wi frqk/eTUtn/aJGxCwnl5Q/xDAyQRrQHBTk/7RXNuloBR+xH/Oh/Ivx08CE9AIMXDSP zY8UqYZqHAST05aFN8nIlXrK+fT/c/RAK2iHNLxXRSvROL5UWan9IDXeA9p/2FcZz4 XauiiN9WyNYVQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Srinivasan Shanmugam , Xiaojian Du , Lijo Lazar , =?UTF-8?q?Christian=20K=C3=B6nig?= , Alex Deucher , Sasha Levin , Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, Hawking.Zhang@amd.com, tao.zhou1@amd.com, Felix.Kuehling@amd.com, mukul.joshi@amd.com, shiwu.zhang@amd.com, mario.limonciello@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.7 36/39] drm/amdgpu: Fix with right return code '-EIO' in 'amdgpu_gmc_vram_checking()' Date: Sun, 28 Jan 2024 11:10:56 -0500 Message-ID: <20240128161130.200783-36-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240128161130.200783-1-sashal@kernel.org> References: <20240128161130.200783-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.7.2 Content-Transfer-Encoding: 8bit From: Srinivasan Shanmugam [ Upstream commit fac4ebd79fed60e79cccafdad45a2bb8d3795044 ] The amdgpu_gmc_vram_checking() function in emulation checks whether all of the memory range of shared system memory could be accessed by GPU, from this aspect, -EIO is returned for error scenarios. Fixes the below: drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c:919 gmc_v6_0_hw_init() warn: missing error code? 'r' drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c:1103 gmc_v7_0_hw_init() warn: missing error code? 'r' drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c:1223 gmc_v8_0_hw_init() warn: missing error code? 'r' drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c:2344 gmc_v9_0_hw_init() warn: missing error code? 'r' Cc: Xiaojian Du Cc: Lijo Lazar Cc: Christian König Cc: Alex Deucher Signed-off-by: Srinivasan Shanmugam Suggested-by: Christian König Reviewed-by: Christian König Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c index d2f273d77e59..55784a9f26c4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c @@ -1045,21 +1045,28 @@ int amdgpu_gmc_vram_checking(struct amdgpu_device *adev) * seconds, so here, we just pick up three parts for emulation. */ ret = memcmp(vram_ptr, cptr, 10); - if (ret) - return ret; + if (ret) { + ret = -EIO; + goto release_buffer; + } ret = memcmp(vram_ptr + (size / 2), cptr, 10); - if (ret) - return ret; + if (ret) { + ret = -EIO; + goto release_buffer; + } ret = memcmp(vram_ptr + size - 10, cptr, 10); - if (ret) - return ret; + if (ret) { + ret = -EIO; + goto release_buffer; + } +release_buffer: amdgpu_bo_free_kernel(&vram_bo, &vram_gpu, &vram_ptr); - return 0; + return ret; } static ssize_t current_memory_partition_show( -- 2.43.0