When sram ecc is disabled by vbios, ras initialization
process in the corrresponding IPs that suppport sram ecc
needs to be skipped. So update ras support capability
accordingly on top of this configuration. This capability
will block further ras operations to the unsupported IPs.
v2: check HBM ECC enablement and set ras mask accordingly.
Signed-off-by: Guchun Chen <guchun.chen@xxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 37 +++++++++++++++++++++++--
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 69b02b9d4131..b08226c10d95 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -1748,8 +1748,41 @@ static void amdgpu_ras_check_supported(struct amdgpu_device *adev,
amdgpu_atomfirmware_sram_ecc_supported(adev)))
*hw_supported = AMDGPU_RAS_BLOCK_MASK;
- *supported = amdgpu_ras_enable == 0 ?
- 0 : *hw_supported & amdgpu_ras_mask;
+ /* Both HBM and SRAM ECC are disabled in vbios. */
+ if (*hw_supported == 0) {
+ DRM_INFO("RAS HW support is disabled as HBM"
+ " and SRAM ECC are not presented.\n");
+ return;
+ }
+
+ if (amdgpu_ras_enable) {
+ *supported = *hw_supported;
+
+ /*
+ * When HBM ECC is disabled in vbios, remove
+ * UMC's and DF's ras support.
+ */
+ if (!amdgpu_atomfirmware_mem_ecc_supported(adev)) {
+ DRM_INFO("HBM ECC is disabled and "
+ "remove UMC and DF ras support.\n");
+ *supported &= ~(1 << AMDGPU_RAS_BLOCK__UMC |
+ 1 << AMDGPU_RAS_BLOCK__DF);
+ }
+
+ /*
+ * When sram ecc is disabled in vbios, bypass those IP
+ * blocks that support sram ecc, and only hold UMC and DF.
+ */
+ if (!amdgpu_atomfirmware_sram_ecc_supported(adev)) {
+ DRM_INFO("SRAM ECC is disabled and remove ras support "
+ "from IPs that support sram ecc.\n");
+ *supported &= (1 << AMDGPU_RAS_BLOCK__UMC |
+ 1 << AMDGPU_RAS_BLOCK__DF);
+ }
+
+ /* ras support needs to align with module parmeter */
+ *supported &= amdgpu_ras_mask;
+ }
}
int amdgpu_ras_init(struct amdgpu_device *adev)
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
