Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp5469775pxu; Tue, 22 Dec 2020 19:07:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJyM7joNYg9PVKin7g9RUs/Tv7PvKMdHj2pRc8vTNMaKpydUwWoxkueRdOQ/VoTMPSY5RaBu X-Received: by 2002:a17:906:5fc9:: with SMTP id k9mr21766144ejv.70.1608692853917; Tue, 22 Dec 2020 19:07:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608692853; cv=none; d=google.com; s=arc-20160816; b=mjOO60CRFIIRdkzEPGiVEAMOGMBsXNHRoPwjXRtvZYfLNmlSPyw/+amJ5x8tSZSxaK m4DPzm9KJkNENrWrKaFXgmNacQGMFK+AmdkH9ReVoE5LvXFmCIMqt95FF82A6GpFtTfO jM6WEp0uEyPKw8XzCf4kFJr/WF53uhd43vZtIAxvh/+QWcIxiNPIuEi2jwzak6waYIRf SNs97C0Gu8Y8h7Tq3a4Q96t5A7EwP9ntPqojRt182mjkfu5fQribq+9eTHci/NTkzB1T JXNL4G8z2+/9UZZ/voz0IcY8NxWRjy7cm68reCRG2TQsACpaq9dkLo3GNzFSXhHF8Ejn qrfA== 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=MPTbANs2wNmFBRuYQA8U2McBDzDHESLHZ6le2LYPObw=; b=eV48HwOdR8UQMTJDUbURV0lMJ6e/gkrY1NsNAAedtRiO5fYX/irPonU95P5VnjzgYH HGziXXpwSmMFjJcQdrF1txNzP+b0JYtrM7WgnQ8w4yDucbCYoTK5qSWcEFnSoFLGbYQ5 5n1Pkg7Te34UxBGpAuiaqQWOhEYEf2m185auXDjHbbwm5y/+SX/+nSysg0JdboCKtn6w VHC/EO3V5q8tD6YkLCkw6iLNpyYF7VLXeXDtsm4xK/sBHmcTpcT3naykHhJSBMlkocs4 iCD5TXGtUxedREsJP0ZH3M+LFmxI1bY1/NutwAGC2Mb7YP3mV898jBI6i6tnD7Eud8l1 iZdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PYafhoPP; 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 mf27si11216985ejb.129.2020.12.22.19.07.11; Tue, 22 Dec 2020 19:07:33 -0800 (PST) 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=PYafhoPP; 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 S1728907AbgLWDDe (ORCPT + 99 others); Tue, 22 Dec 2020 22:03:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:45492 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728643AbgLWCT3 (ORCPT ); Tue, 22 Dec 2020 21:19:29 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id CE86622525; Wed, 23 Dec 2020 02:18:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608689935; bh=zk6cO27GUJVeOS+ID0F0Ks1lYJ3QJxO4vuZrb3FjT/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PYafhoPP/ELwfg+H2JF1jdofTTmjDcCZzPELv+w9iCzlk8IGE/RfMK0TpHPPKmFM7 RNelKBOn44aSMEvPqTMRtNGNWKEVNJ8PbsdC6liw9aCBCegmPinJZOuoCTPCeiGuF9 /7hdFxFLTS0SuniPC3DjhxzO2eWOA29AsMHCHeH5GUra59nm4T/LllGEhTJdgsIIYs hH8N9d8dxO8JcVoRvPFN6xaY74fpB3OrvFp1h975aciT3eVilia3/SKBu5pjZX56W0 VtC9SJ71f1T9BuTrw5vBfHizydULdgiJ1uVhL/UWn8nZ5qzOBtbaL8jm+OEr+azZbb CWfvKNW6rrnxw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bokun Zhang , Monk Liu , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.4 032/130] drm/amd/amdgpu: Add rev_id workaround logic for SRIOV setup Date: Tue, 22 Dec 2020 21:16:35 -0500 Message-Id: <20201223021813.2791612-32-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223021813.2791612-1-sashal@kernel.org> References: <20201223021813.2791612-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: Bokun Zhang [ Upstream commit de21e4aeb2b26128dcc5be1bcb2fafa73d041e51 ] - When we are under SRIOV setup, the rev_id cannot be read properly. Therefore, we will return default value for it Signed-off-by: Bokun Zhang Reviewed-by: Monk Liu Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c index c05d78d4efc66..56887affc13be 100644 --- a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c @@ -34,8 +34,17 @@ static u32 nbio_v2_3_get_rev_id(struct amdgpu_device *adev) { - u32 tmp = RREG32_SOC15(NBIO, 0, mmRCC_DEV0_EPF0_STRAP0); + u32 tmp; + /* + * guest vm gets 0xffffffff when reading RCC_DEV0_EPF0_STRAP0, + * therefore we force rev_id to 0 (which is the default value) + */ + if (amdgpu_sriov_vf(adev)) { + return 0; + } + + tmp = RREG32_SOC15(NBIO, 0, mmRCC_DEV0_EPF0_STRAP0); tmp &= RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0_MASK; tmp >>= RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0__SHIFT; -- 2.27.0