drm/amdgpu: add message fifo to handle RAS poison events

Add message fifo to handle RAS poison events.

Signed-off-by: YiPeng Chai <YiPeng.Chai@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index fe4fdb079bd1e9d896ba550aad0ea8374600b338..6641f27cb35c61a9209abfeefe0c75ac5e91f397 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -2703,6 +2703,40 @@ static void amdgpu_ras_validate_threshold(struct amdgpu_device *adev,
        }
 }
 
+int amdgpu_ras_put_poison_req(struct amdgpu_device *adev,
+               enum amdgpu_ras_block block, uint16_t pasid,
+               pasid_notify pasid_fn, void *data, uint32_t reset)
+{
+       int ret = 0;
+       struct ras_poison_msg poison_msg;
+       struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
+
+       memset(&poison_msg, 0, sizeof(poison_msg));
+       poison_msg.block = block;
+       poison_msg.pasid = pasid;
+       poison_msg.reset = reset;
+       poison_msg.pasid_fn = pasid_fn;
+       poison_msg.data = data;
+
+       ret = kfifo_put(&con->poison_fifo, poison_msg);
+       if (!ret) {
+               dev_err(adev->dev, "Poison message fifo is full!\n");
+               return -ENOSPC;
+       }
+
+       return 0;
+}
+
+#ifdef PRE_DEFINED_FUNCTION
+static int amdgpu_ras_get_poison_req(struct amdgpu_device *adev,
+               struct ras_poison_msg *poison_msg)
+{
+       struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
+
+       return kfifo_get(&con->poison_fifo, poison_msg);
+}
+#endif
+
 static int amdgpu_ras_page_retirement_thread(void *param)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)param;
@@ -2793,6 +2827,7 @@ int amdgpu_ras_recovery_init(struct amdgpu_device *adev)
        }
 
        mutex_init(&con->page_rsv_lock);
+       INIT_KFIFO(con->poison_fifo);
        mutex_init(&con->page_retirement_lock);
        init_waitqueue_head(&con->page_retirement_wq);
        atomic_set(&con->page_retirement_req_cnt, 0);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
index ab5bf573378eb8b0bf0c80e26e59d223a347b273..2b15996f1edeafe4570eb08a428e4e07269e90ee 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
@@ -26,6 +26,7 @@
 
 #include <linux/debugfs.h>
 #include <linux/list.h>
+#include <linux/kfifo.h>
 #include "ta_ras_if.h"
 #include "amdgpu_ras_eeprom.h"
 #include "amdgpu_smuio.h"
@@ -442,6 +443,17 @@ struct ras_query_context {
        u64 event_id;
 };
 
+typedef int (*pasid_notify)(struct amdgpu_device *adev,
+               uint16_t pasid, void *data);
+
+struct ras_poison_msg {
+       enum amdgpu_ras_block block;
+       uint16_t pasid;
+       uint32_t reset;
+       pasid_notify pasid_fn;
+       void *data;
+};
+
 struct amdgpu_ras {
        /* ras infrastructure */
        /* for ras itself. */
@@ -501,6 +513,8 @@ struct amdgpu_ras {
        struct mutex page_retirement_lock;
        atomic_t page_retirement_req_cnt;
        struct mutex page_rsv_lock;
+       DECLARE_KFIFO(poison_fifo, struct ras_poison_msg, 128);
+
        /* Fatal error detected flag */
        atomic_t fed;
 
@@ -913,4 +927,8 @@ u64 amdgpu_ras_acquire_event_id(struct amdgpu_device *adev, enum ras_event_type
 
 int amdgpu_ras_reserve_page(struct amdgpu_device *adev, uint64_t pfn);
 
+int amdgpu_ras_put_poison_req(struct amdgpu_device *adev,
+               enum amdgpu_ras_block block, uint16_t pasid,
+               pasid_notify pasid_fn, void *data, uint32_t reset);
+
 #endif