Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4577868pxv; Tue, 6 Jul 2021 04:30:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxl/ze3xJz731H0jn6RKPIgGM/tadHTuORbieZ9CSZi0qALUeJJ/bV65Ps78dD8Q5qRYCSb X-Received: by 2002:a05:6602:160c:: with SMTP id x12mr15838713iow.16.1625571008440; Tue, 06 Jul 2021 04:30:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625571008; cv=none; d=google.com; s=arc-20160816; b=M9bFq3Oua/E8XQSrXJf6TIdPTsU8JWR84EOIOVBMVuhUVeo+hjZFhlD0wynYHYPlHm Dqu3Wunfh+eL/9Ap0xHpx/ipWCbEgarRDvFvoCdraAjh2jBTGaiPJPy/p9YgMGbjpPid aoCMkIB3PslkXA94h3BS1+AjSkxYxhPAiBhRXh/aGfnh6OjJg7WJ1ICTFAZpMpOH96hc e12qPgCT47QzL0nKDSFMJG6ytxlKqRmKBmLgoWNC23c2fovn+TQvSpetk+145H2WBFVy VMj2NuAZXKflmBJAo8W160yZvzOqSwPftTFYPohsIucPEjF6OrMHSDegKzHSbcWuNuUd PPtA== 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=Ne1gyzv/oxQvilJNcYUCwmKG+veHh+lcAcfCHycOoGQ=; b=IOStwtsk0cPRA/NAWQVK1PpEkM+aEbXdYj8x0aK0fArM/9b7uQOUoqLsgqjuuSK36G rXVvtRO0xmSyYPUNq7UXlMuicSO9cEvpgGm/REjnMJrYjsWMsZLTNT/rEdzQ5NSP0V/Z 7ZSrr42s6QmX0uI6xlpG6KjG5PJvNj2MD/Hj+194NLlmX4g8FtLQOllPDh56+xZ1P49z qfELcdT88EzUAozCy4fZnc+AJKBn2DViOh0Ou4uE+JuXfbwapjHrdhQeBz7cFrcFK/zq b5Q2OSV9xiLQDNidVDpDrnSuaprdIKlZ+joTJ9gtzPrivZ6rkqQwe4P36oWzqYsRI8LE 9o8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="i/PathUg"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j5si15887698iom.105.2021.07.06.04.29.56; Tue, 06 Jul 2021 04:30:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="i/PathUg"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235142AbhGFL3j (ORCPT + 99 others); Tue, 6 Jul 2021 07:29:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:55940 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232549AbhGFLTy (ORCPT ); Tue, 6 Jul 2021 07:19:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3ADE661C54; Tue, 6 Jul 2021 11:17:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570221; bh=EPOCnEXw8/VmsiNiam4/FX7tIxHAadbJoZ0kZXZvbMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i/PathUgbcCHYu0G8qDiOVX4KDtvoTI0UtNUgZVzI5GNChRA4j2A7edQDnyzNcd9N Ix5IrCo3/bf+FErARCeErlbibRl+IK9JMX5ODl72Fq7KOcrzxhIUE1qsMaT34ZCbt0 3JqbmIjtujCsIUslqirycPQY6KX+zo1/Nvx8Q7QV1O60cS9DRT5f3ilO7uOD6GWhaH A0qlcqUvuMBlt63OaX266863cYsue5jxXDTyKHhPRzkoL6aN4eUNzKXJtpb91ssdYe ErJ9OOePb+te9/rg6f2ATIzYHXjTOZ1CUuoT5CfBUPz3s8nOdXIP/hRRYgXDkDewPF cXmrD9S7UAGzg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Stanley.Yang" , Hawking Zhang , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.13 128/189] drm/amdgpu: fix bad address translation for sienna_cichlid Date: Tue, 6 Jul 2021 07:13:08 -0400 Message-Id: <20210706111409.2058071-128-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111409.2058071-1-sashal@kernel.org> References: <20210706111409.2058071-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: linux-kernel@vger.kernel.org From: "Stanley.Yang" [ Upstream commit 6ec598cc9dfbf40433e94a2ed1a622e3ef80268b ] Signed-off-by: Stanley.Yang Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 5 +++++ drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h index bbcccf53080d..e5a75fb788dd 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h @@ -21,6 +21,11 @@ #ifndef __AMDGPU_UMC_H__ #define __AMDGPU_UMC_H__ +/* + * (addr / 256) * 4096, the higher 26 bits in ErrorAddr + * is the index of 4KB block + */ +#define ADDR_OF_4KB_BLOCK(addr) (((addr) & ~0xffULL) << 4) /* * (addr / 256) * 8192, the higher 26 bits in ErrorAddr * is the index of 8KB block diff --git a/drivers/gpu/drm/amd/amdgpu/umc_v8_7.c b/drivers/gpu/drm/amd/amdgpu/umc_v8_7.c index 89d20adfa001..af59a35788e3 100644 --- a/drivers/gpu/drm/amd/amdgpu/umc_v8_7.c +++ b/drivers/gpu/drm/amd/amdgpu/umc_v8_7.c @@ -234,7 +234,7 @@ static void umc_v8_7_query_error_address(struct amdgpu_device *adev, err_addr &= ~((0x1ULL << lsb) - 1); /* translate umc channel address to soc pa, 3 parts are included */ - retired_page = ADDR_OF_8KB_BLOCK(err_addr) | + retired_page = ADDR_OF_4KB_BLOCK(err_addr) | ADDR_OF_256B_BLOCK(channel_index) | OFFSET_IN_256B_BLOCK(err_addr); -- 2.30.2