Received: by 2002:ab2:6d45:0:b0:1fb:d597:ff75 with SMTP id d5csp264453lqr; Wed, 5 Jun 2024 05:38:21 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWK+USx2qGkrP4G8b9hiRvGHToRqZSWYEAMnseG9Go5tNVyi+OgVYOqC9R6Wo78eMYX7/5grmroAtnUeZb5/2adYVSwSnj92agUr+DMfA== X-Google-Smtp-Source: AGHT+IHm2G5FKe1bwj+ztgc4Xwhm4lIVpralAtxZ5gL5pbSubl610kMAuaakP1tJ6+S1Fv4LdUaz X-Received: by 2002:a05:6a20:a126:b0:1af:59b9:74e9 with SMTP id adf61e73a8af0-1b2b6e8f299mr3032180637.2.1717591101127; Wed, 05 Jun 2024 05:38:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717591101; cv=pass; d=google.com; s=arc-20160816; b=mlwDG05i+/ZcaEDesiFum2/ZsSxJTNPbz7t18aJrGpEWnHjCPbGryNr1cFU+OdV1Mx syJMJvvrZuk/3bdd/YJpf9HGdsqC0ei8VZa8CepQ9rbO9+DeJ+XPHr5LwhFgecRsdGin KZKqwCFwvSl+21HC6p0oPNiVF8bmU13izWCHAnPYd6PIZDXoLzNpLRN88zk7wEGejVE/ 9pcF4Yqgw1mXzubbOIl2H1h8emUW5dXNhpQrRGvDymj2P/L4ZPd7hzfLt6sDn3O0aR+i 0sXXS8IA3VHlq4VxThldi4IhKWx+JgCdahR+Ho1WwMYSbNVLbvDtFuHLXt6OY3pqa+UD h90Q== 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=A4GTGgWBCA06eQW/MoeBQWk1e5O6SWY3h4KuJp2ie6U=; fh=ysMY3fuOnL27AOdP1quRHFRdf9mDLvrwL16abqwY+Bc=; b=D9ir6l8NcOQ6fJvs7SrUe5lVYM1d31mB69YqgLzDgc2WWuwDVOmo5CgfItBww8/vs1 4PyigQkWxosAAR1uRe+96YghNfjzAq5Jr6rDF7zHvpWK5soIrA/o4PA+ruUXi+k2TayW KXASwNyEbDvz96y6er9p2ESgdrNdvIs0dp72INmE1iNEXPQbIhBkDIqSVZtMm5oreuU2 85tlBMAzAZyYcbD8I0ZZIpFRuFUWZ6Je2ibcHkg4c5fat0Ngi3+xQD6CZDrGQ8vTfeHV k2PU5Tp3dJVHx18zWxgylYHQQ/SPJxUfnGm0CUin4zbe0fXszrqqAcCuA989qQt8/S1k /ypg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lpoiUwcE; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-202454-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-202454-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id 98e67ed59e1d1-2c2806322a3si1149638a91.24.2024.06.05.05.38.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 05:38:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-202454-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lpoiUwcE; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-202454-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-202454-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id D3EF128CADE for ; Wed, 5 Jun 2024 12:28:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8710F19644A; Wed, 5 Jun 2024 12:02:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="lpoiUwcE" 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 AA325195FF3; Wed, 5 Jun 2024 12:02:28 +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=1717588948; cv=none; b=K/XOxNCjrhgDD+PeI0Vir74nckBhn+0sDC9hHmwaG7SDKwlFHBqswuUAnyQ8ZsaUZhlBvbvbmVYR9nbSU8/Dqt+DPRGbb1bm81HH0jyEIacrj1X+gb61FN8IO3+9wC5zJVWVSsZhB+QMnqa4nwrN1MFYhWyHlvq0UrpAIn8eSpE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717588948; c=relaxed/simple; bh=FgrilCR7PCWlydzFzxiRwvpWlP3ziGuP2hn1K1zPjP4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hn40l3qVsug1VbnjIPsXouN9jhtfroQyGdKy+gRcmRgrIjPX+V7p2qtJTRBmvvG8i+Hj3vwJHE68KzhHWOEPKTKYt+2HWp7np/71p0jBzul1nawcZyjWjqriyBkD7A2gdPW0l4n6vam0D6yjOk64PgtJ3Xt882Qa31mFA7ZanyI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lpoiUwcE; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2A11C4AF0C; Wed, 5 Jun 2024 12:02:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717588948; bh=FgrilCR7PCWlydzFzxiRwvpWlP3ziGuP2hn1K1zPjP4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lpoiUwcEd3QeCvbo8sxWtAv5NfjYRdhX9HvmGnZFBcOETw0+xrXYG378UOpv342/g z4KsaYyQknH5rt4W4Q1H8ze8jfFcQV5nl/jP4UORQWKD6VQMEbrqGnm8P9FDoZGOSn 2pF05AolCec/aqAuAvSUHnBSkoNb9DcJRbYUH4myZBbkx/dvEOHy1Ge8f7N9owrse2 mHGGs0CulGFg0+hO1KLU3+GmMMKEupZKw1QUybQkoQ683fYNuhFEHc5qyqr/FzroNW zvwq+3elyqSUGfpeEa9WWgo8lvn1bTVjs12llcycK6bwr4GM3hzkGDScP+mW45/R+I a444d9XOfAzSQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hawking Zhang , Tao Zhou , Alex Deucher , Sasha Levin , christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, YiPeng.Chai@amd.com, kevinyang.wang@amd.com, lijo.lazar@amd.com, lee@kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.9 03/23] drm/amdgpu: correct hbm field in boot status Date: Wed, 5 Jun 2024 08:01:46 -0400 Message-ID: <20240605120220.2966127-3-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240605120220.2966127-1-sashal@kernel.org> References: <20240605120220.2966127-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 X-stable-base: Linux 6.9.3 Content-Transfer-Encoding: 8bit From: Hawking Zhang [ Upstream commit ec58991054e899c9d86f7e3c8a96cb602d4b5938 ] hbm filed takes bit 13 and bit 14 in boot status. Signed-off-by: Hawking Zhang Reviewed-by: Tao Zhou Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h index e0f8ce9d84406..db9cb2b4e9823 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h @@ -43,7 +43,7 @@ struct amdgpu_iv_entry; #define AMDGPU_RAS_GPU_ERR_HBM_BIST_TEST(x) AMDGPU_GET_REG_FIELD(x, 7, 7) #define AMDGPU_RAS_GPU_ERR_SOCKET_ID(x) AMDGPU_GET_REG_FIELD(x, 10, 8) #define AMDGPU_RAS_GPU_ERR_AID_ID(x) AMDGPU_GET_REG_FIELD(x, 12, 11) -#define AMDGPU_RAS_GPU_ERR_HBM_ID(x) AMDGPU_GET_REG_FIELD(x, 13, 13) +#define AMDGPU_RAS_GPU_ERR_HBM_ID(x) AMDGPU_GET_REG_FIELD(x, 14, 13) #define AMDGPU_RAS_GPU_ERR_BOOT_STATUS(x) AMDGPU_GET_REG_FIELD(x, 31, 31) #define AMDGPU_RAS_BOOT_STATUS_POLLING_LIMIT 1000 -- 2.43.0