drm/amd/pm: Add STB accessors interface

Add interface to collect STB logs.

Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Luben Tuikov <luben.tuikov@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h
index 7a06021a58f06d4325ad30864fb88cab83b7d8db..4301403af76198e26ed032cc999b795c16fcaa09 100644 (file)
--- a/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h
@@ -474,6 +474,12 @@ struct cmn2asic_mapping {
        int     map_to;
 };
 
+struct stb_context {
+       uint32_t stb_buf_size;
+       bool enabled;
+       spinlock_t lock;
+};
+
 #define WORKLOAD_POLICY_MAX 7
 struct smu_context
 {
@@ -561,6 +567,8 @@ struct smu_context
        uint16_t cpu_core_num;
 
        struct smu_user_dpm_profile user_dpm_profile;
+
+       struct stb_context stb_context;
 };
 
 struct i2c_adapter;
@@ -1268,6 +1276,12 @@ struct pptable_funcs {
         * @get_ecc_table:  message SMU to get ECC INFO table.
         */
        ssize_t (*get_ecc_info)(struct smu_context *smu, void *table);
+       
+       
+       /**
+        * @stb_collect_info: Collects Smart Trace Buffers data.
+        */
+       int (*stb_collect_info)(struct smu_context *smu, void *buf, uint32_t size);
 };
 
 typedef enum {
@@ -1405,6 +1419,7 @@ int smu_set_light_sbr(struct smu_context *smu, bool enable);
 int smu_wait_for_event(struct amdgpu_device *adev, enum smu_event_type event,
                       uint64_t event_arg);
 int smu_get_ecc_info(struct smu_context *smu, void *umc_ecc);
+int smu_stb_collect_info(struct smu_context *smu, void *buff, uint32_t size);
 
 #endif
 #endif

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index fd3b6b460b12be3044859a723ff3259f5fcba984..97bafba4c5c9f4f4fb749aa5afb7f55e590c8a0c 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -3175,3 +3175,21 @@ int smu_wait_for_event(struct amdgpu_device *adev, enum smu_event_type event,
 
        return ret;
 }
+
+int smu_stb_collect_info(struct smu_context *smu, void *buf, uint32_t size)
+{
+
+       if (!smu->ppt_funcs->stb_collect_info || !smu->stb_context.enabled)
+               return -EOPNOTSUPP;
+
+       /* Confirm the buffer allocated is of correct size */
+       if (size != smu->stb_context.stb_buf_size)
+               return -EINVAL;
+
+       /*
+        * No need to lock smu mutex as we access STB directly through MMIO
+        * and not going through SMU messaging route (for now at least).
+        * For registers access rely on implementation internal locking.
+        */
+       return smu->ppt_funcs->stb_collect_info(smu, buf, size);
+}