Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2607472lqp; Mon, 25 Mar 2024 04:22:37 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXYn6IfveJH6Z3vV1J4jDAzLK2dB1iPup2BOamQ80tJVovl3Jy19x6Zndp9/1jfcrbUQb3zCkgfsOkuWHy8cgArAan0Fuclh7v/CWZdIQ== X-Google-Smtp-Source: AGHT+IHCOz5MUs8MiyDH4g7I+XxJ+UBAoG7XJoToOf1brj6pRus4s1GGXD79AykNlZz5FoteJuKr X-Received: by 2002:a25:800a:0:b0:dc6:b9d6:1542 with SMTP id m10-20020a25800a000000b00dc6b9d61542mr4429733ybk.48.1711365756946; Mon, 25 Mar 2024 04:22:36 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711365756; cv=pass; d=google.com; s=arc-20160816; b=PV76mxbFmblX5d0LWhs+9ttcPglLpLk3MTDjpr66mRE6IkmqeoSBsA/NUFguk+lwGn nELKj8Zc0vqrQmjySxCOdAGoHXvpz2j1YggOwGAN2yPuM+bnfNbTgw0iYRV1H+mB4+nK 7h31qIvCcJehh8MfSv17pfV0bZATumze4Mv6126DZmFzv1zy1FUO1gXVZ7NXOEspijtl oFwoDsNdmaeDkO7WXURtIi9LVeOGP2zr/MiTh+DRJ5fR23wsdxP1XECvbDVpgTR6DMoO xdoNKdC3wDcyY6NR7zUcy8viZL8lkFDhW4+A5bYUVWiWtX4odMXHHdf2hxVukomDzHDj DNHQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=tJ64ETd2tgBusXMj7J3sebBMZzMoMA9NPoLz6myNi9Q=; fh=KaWuy+J/rRi1rQFIYzrEytFj80jZ3i/KN22dP5dDnlM=; b=XXPiqfFuc702jGqXptg+HTjAGwnsb21QgD92w5zKwjEDTYrzoII7Ss4DRJlA4s5j1F yiWf/53E4ChXUfUfREHMZoNMRTGSsDnNf1f/CIibQcXuZ19IxvodEJO/YMBH3X6gafoR fXr84n53NcEzMtwOiRv9jXESUjht9ml4tkZc8X+Tc+2gIAeTNHvGqKfU88EYSZR4GzVg MmfUJucdBJ7jyfW4cJ3QMfHGbc/WrhipMOU/sD28W37B4hnS3l5wnQyWLKMEZyPUTbjA qfIIc8RVdwhKT0Afru7PgkCAhCrMIRBSYkvg+u8wUdPRVRYmlsGMZKzE2C4HBkFFhOAu X/jA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mJTOIbln; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115580-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115580-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id gc11-20020a056214230b00b0069620a81656si7501775qvb.47.2024.03.25.04.22.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 04:22:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-115580-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mJTOIbln; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115580-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115580-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 8E9031C33E0C for ; Mon, 25 Mar 2024 11:22:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 256A0341100; Mon, 25 Mar 2024 02:44:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mJTOIbln" 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 4838112D76E; Sun, 24 Mar 2024 22:58: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=1711321134; cv=none; b=oaEOItlF4GgZDZDjqKuiI803XQ8RHY/eeMqhS++OFLbabzUELa7hGYXP1hcpPI4v+mFa3jTWSSViPMqX01OavUWYMz9XgfkIGgtlov2rtQfPwItXmayKlDbUvh2yGBLb16cLeTjAuFjuwfZlX1uP5NVqsMB8iYBFCthgGQ2t6eI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321134; c=relaxed/simple; bh=VbR4fQBjLC7Rzjg/ep21s0JziHQ4SL9IpGKzUXBLVfA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sgFjEyTO4E+ewiEZhkV+m9T/h8dFH4I8jlZklUXsdK7MgDEYHIiZ04NaDxaw2cdqUJ2WcEXz0jpBNz530tHRAzj51L7WLNsMSkIHd5s/9NuADaPZL54oEtke53Aby825L42VSODJKqPL/v4QNmgtxOr2WbZQCdxcxdirg3HInd0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mJTOIbln; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38D10C43390; Sun, 24 Mar 2024 22:58:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321133; bh=VbR4fQBjLC7Rzjg/ep21s0JziHQ4SL9IpGKzUXBLVfA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mJTOIblnc6pdXsSHv1M5ZfpiShIErUvjqBsux/v1yiZFKJsm7MZxe8n0THXDc9SVM 85KwVn/g90HxowQy12VcFgHjBU1DmEAA2ENWGSIXp7jBKBOuv/zc1MIMPtjU8GOoUU Zgd5S13bo9QtkcHk9EcXUfX9suWOQIaUiYYbBolW9ZsNSQyxxv/Pxx9oJfviaQAOgZ yiNB9M4Eskbek11gXnKTzM4H4CEzpt0h9ee0EwNNj8IqIeJvtQl+YQxaaJyYDg7Z/G wFg8T1Za5/2NtrxLfc+AktzWh3EUiSiiHXtos7KpZn9dS9cKx/+0dvVb+R19XlSKzn IfUhFGBXLL4RA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yifan Zhang , Alex Deucher , Sasha Levin Subject: [PATCH 6.7 695/713] drm/amdgpu: add MMHUB 3.3.1 support Date: Sun, 24 Mar 2024 18:47:01 -0400 Message-ID: <20240324224720.1345309-696-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Yifan Zhang [ Upstream commit 31e0a586f3385134bcad00d8194eb0728cb1a17d ] This patch to add MMHUB 3.3.1 support. v2: squash in fault info fix (Alex) Signed-off-by: Yifan Zhang Signed-off-by: Alex Deucher Stable-dep-of: 6540ff6482c1 ("drm/amdgpu: fix mmhub client id out-of-bounds access") Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 1 + drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c index c9c653cfc765b..3f1692194b7ad 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c @@ -570,6 +570,7 @@ static void gmc_v11_0_set_mmhub_funcs(struct amdgpu_device *adev) adev->mmhub.funcs = &mmhub_v3_0_2_funcs; break; case IP_VERSION(3, 3, 0): + case IP_VERSION(3, 3, 1): adev->mmhub.funcs = &mmhub_v3_3_funcs; break; default: diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c index dc4812ecc98d6..b3961968c10c4 100644 --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c @@ -98,6 +98,7 @@ mmhub_v3_3_print_l2_protection_fault_status(struct amdgpu_device *adev, switch (amdgpu_ip_version(adev, MMHUB_HWIP, 0)) { case IP_VERSION(3, 3, 0): + case IP_VERSION(3, 3, 1): mmhub_cid = mmhub_client_ids_v3_3[cid][rw]; break; default: -- 2.43.0