summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiang Liu <xiang.liu@amd.com>2026-07-08 22:13:18 +0800
committerAlex Deucher <alexander.deucher@amd.com>2026-08-25 18:26:12 -0400
commit9ba874eba904337403f8f985c67b1b7eeff33232 (patch)
tree11a2d22d8bca1e132ffd09b530bbcf16eac10b49
parentb6531cd34c2600e00032fbee2c5e53c6b4ff7837 (diff)
drm/amd/ras: process cached BERT boot errors
Read and cache the ACPI BERT payload during MCE hardware init, then ask rascore to process the cached records once for each GPU socket. Reset the cached state when the MCE notifier chain is torn down so a new initialization sequence can poll and process boot errors again. Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Xiang Liu <xiang.liu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/ras/ras_mgr/Makefile1
-rw-r--r--drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_bert.c152
-rw-r--r--drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_bert.h32
-rw-r--r--drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mce.c7
4 files changed, 192 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/ras/ras_mgr/Makefile b/drivers/gpu/drm/amd/ras/ras_mgr/Makefile
index 3df2a290f67b..4f94c97c15ca 100644
--- a/drivers/gpu/drm/amd/ras/ras_mgr/Makefile
+++ b/drivers/gpu/drm/amd/ras/ras_mgr/Makefile
@@ -27,6 +27,7 @@ RAS_MGR_FILES = amdgpu_ras_sys.o \
amdgpu_virt_ras_cmd.o \
amdgpu_ras_process.o \
amdgpu_ras_nbio_v7_9.o \
+ amdgpu_ras_bert.o \
amdgpu_ras_mce.o
diff --git a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_bert.c b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_bert.c
new file mode 100644
index 000000000000..29111b10b00a
--- /dev/null
+++ b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_bert.c
@@ -0,0 +1,152 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright 2026 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include "amdgpu.h"
+#include "amdgpu_ras_bert.h"
+
+#if defined(CONFIG_X86_MCE_AMD) && defined(CONFIG_ACPI_APEI)
+#include <linux/acpi.h>
+#include <linux/mutex.h>
+
+#include "amdgpu_ras_mgr.h"
+
+static DEFINE_MUTEX(boot_err_lock);
+static bool boot_err_polled, boot_err_written[MAX_GPU_INSTANCE];
+static int boot_err_poll_result;
+static u8 *boot_err_raw_data;
+static u32 boot_err_raw_data_len;
+
+int amdgpu_ras_bert_process_boot_errors(struct amdgpu_device *adev)
+{
+ struct amdgpu_ras_mgr *ras_mgr = amdgpu_ras_mgr_get_context(adev);
+ struct acpi_bert_region *boot_error_region;
+ struct acpi_table_header *table;
+ struct acpi_table_bert *bert_tab;
+ unsigned int region_len;
+ acpi_status status;
+ u32 socket_id;
+ int ret;
+
+ if (!ras_mgr || !ras_mgr->ras_core)
+ return -EPERM;
+
+ mutex_lock(&boot_err_lock);
+
+ if (!boot_err_polled) {
+ boot_err_polled = true;
+ boot_err_poll_result = 0;
+ ret = 0;
+
+ if (acpi_disabled)
+ goto out_unlock;
+
+ status = acpi_get_table(ACPI_SIG_BERT, 0, &table);
+ if (status == AE_NOT_FOUND)
+ goto out_unlock;
+
+ if (ACPI_FAILURE(status)) {
+ RAS_DEV_ERR(adev, "get table failed, %s.\n", acpi_format_exception(status));
+ boot_err_poll_result = -EINVAL;
+ goto out_unlock;
+ }
+ bert_tab = (struct acpi_table_bert *)table;
+
+ if (bert_tab->header.length < sizeof(struct acpi_table_bert) ||
+ bert_tab->region_length < sizeof(struct acpi_bert_region)) {
+ RAS_DEV_ERR(adev, "table invalid.\n");
+ boot_err_poll_result = -EINVAL;
+ goto out_put_bert_tab;
+ }
+
+ region_len = bert_tab->region_length;
+ boot_error_region = acpi_os_map_memory(bert_tab->address, region_len);
+ if (boot_error_region) {
+ boot_err_raw_data = kmemdup(boot_error_region, region_len, GFP_KERNEL);
+ acpi_os_unmap_memory(boot_error_region, region_len);
+ if (!boot_err_raw_data) {
+ RAS_DEV_ERR(adev, "failed to cache BERT raw data.\n");
+ boot_err_poll_result = -ENOMEM;
+ } else {
+ boot_err_raw_data_len = region_len;
+ }
+ } else {
+ RAS_DEV_ERR(adev, "failed to map BERT region.\n");
+ boot_err_poll_result = -ENOMEM;
+ }
+
+out_put_bert_tab:
+ acpi_put_table(table);
+ }
+
+ if (boot_err_poll_result) {
+ ret = boot_err_poll_result;
+ goto out_unlock;
+ }
+
+ if (!boot_err_raw_data || !boot_err_raw_data_len ||
+ !(adev && (adev->gmc.xgmi.connected_to_cpu || adev->gmc.is_app_apu))) {
+ ret = 0;
+ goto out_unlock;
+ }
+
+ if (!adev->smuio.funcs || !adev->smuio.funcs->get_socket_id) {
+ RAS_DEV_WARN(adev, "No interface to obtain current device socket ID!\n");
+ ret = 0;
+ goto out_unlock;
+ }
+
+ socket_id = adev->smuio.funcs->get_socket_id(adev);
+ if (socket_id >= MAX_GPU_INSTANCE) {
+ ret = -EINVAL;
+ goto out_unlock;
+ }
+
+ if (boot_err_written[socket_id]) {
+ ret = 0;
+ goto out_unlock;
+ }
+
+ ret = ras_bert_process_records(ras_mgr->ras_core,
+ boot_err_raw_data, boot_err_raw_data_len);
+ if (!ret)
+ boot_err_written[socket_id] = true;
+
+out_unlock:
+ mutex_unlock(&boot_err_lock);
+
+ return ret;
+}
+
+void amdgpu_ras_bert_reset_boot_errors(void)
+{
+ mutex_lock(&boot_err_lock);
+ memset(boot_err_written, 0, sizeof(boot_err_written));
+ kfree(boot_err_raw_data);
+ boot_err_raw_data = NULL;
+ boot_err_raw_data_len = 0;
+ boot_err_poll_result = 0;
+ boot_err_polled = false;
+ mutex_unlock(&boot_err_lock);
+}
+#endif
diff --git a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_bert.h b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_bert.h
new file mode 100644
index 000000000000..27e2378ea5f3
--- /dev/null
+++ b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_bert.h
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright 2026 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __AMDGPU_RAS_BERT_H__
+#define __AMDGPU_RAS_BERT_H__
+
+#if defined(CONFIG_X86_MCE_AMD) && defined(CONFIG_ACPI_APEI)
+int amdgpu_ras_bert_process_boot_errors(struct amdgpu_device *adev);
+void amdgpu_ras_bert_reset_boot_errors(void);
+#endif
+
+#endif
diff --git a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mce.c b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mce.c
index b6e11d7cff08..20934a962b05 100644
--- a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mce.c
+++ b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mce.c
@@ -23,6 +23,7 @@
*/
#include "amdgpu.h"
+#include "amdgpu_ras_bert.h"
#include "amdgpu_ras_mgr.h"
#include "amdgpu_ras_mce.h"
@@ -121,6 +122,9 @@ static int amdgpu_ras_unregister_mce_notifier(struct amdgpu_device *adev)
if (atomic_read(&mce_mgr->ref_count) <= 0) {
atomic_set(&mce_mgr->dev_count, 0);
mce_unregister_decode_chain(&mce_mgr->nb);
+#ifdef CONFIG_ACPI_APEI
+ amdgpu_ras_bert_reset_boot_errors();
+#endif
}
return 0;
@@ -238,6 +242,9 @@ static int amdgpu_ras_mce_notifier(struct amdgpu_device *adev,
int amdgpu_ras_mce_hw_init(struct amdgpu_device *adev)
{
+#if defined(CONFIG_X86_MCE_AMD) && defined(CONFIG_ACPI_APEI)
+ amdgpu_ras_bert_process_boot_errors(adev);
+#endif
return 0;
}