Switch from marcros to helper that builds events per chip.
Also abstract IP events from version since they can bind to chip instead.
Signed-off-by: Jonathan Kim <Jonathan.Kim@xxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 13 ---
drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 108 +++++++++++++++++++++---
drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 63 --------------
3 files changed, 95 insertions(+), 89 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 49ea9fa780c4..0cb2f12a1fbd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1265,19 +1265,6 @@ void amdgpu_unregister_gpu_instance(struct amdgpu_device *adev);
#include "amdgpu_object.h"
-/* used by df_v3_6.c and amdgpu_pmu.c */
-#define AMDGPU_PMU_ATTR(_name, _object) \
-static ssize_t \
-_name##_show(struct device *dev, \
- struct device_attribute *attr, \
- char *page) \
-{ \
- BUILD_BUG_ON(sizeof(_object) >= PAGE_SIZE - 1); \
- return sprintf(page, _object "\n"); \
-} \
- \
-static struct device_attribute pmu_attr_##_name = __ATTR_RO(_name)
-
static inline bool amdgpu_is_tmz(struct amdgpu_device *adev)
{
return adev->gmc.tmz_enabled;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
index 0aef565acabf..517448aa2d50 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
@@ -27,9 +27,9 @@
#include <linux/init.h>
#include "amdgpu.h"
#include "amdgpu_pmu.h"
-#include "df_v3_6.h"
#define PMU_NAME_SIZE 32
+#define NUM_FORMATS_DF_VEGA20 3
#define NUM_EVENTS_DF_VEGA20 8
/* record to keep track of pmu entry per pmu type per device */
@@ -42,6 +42,39 @@ struct amdgpu_pmu_entry {
static LIST_HEAD(amdgpu_pmu_list);
+static struct attribute_group df_vega20_format_attr_group = {
+ .name = "format",
+ .attrs = NULL,
+};
+
+static struct attribute_group df_vega20_event_attr_group = {
+ .name = "events",
+ .attrs = NULL
+};
+
+const struct attribute_group *df_vega20_attr_groups[] = {
+ &df_vega20_format_attr_group,
+ &df_vega20_event_attr_group,
+ NULL
+};
+
+static const char *df_vega20_formats[NUM_FORMATS_DF_VEGA20][2] = {
+ { "event", "config:0-7" },
+ { "instance", "config:8-15" },
+ { "umask", "config:16-23"}
+};
+
+static const char *df_vega20_events[NUM_EVENTS_DF_VEGA20][2] = {
+ { "cake0_pcsout_txdata", "event=0x7,instance=0x46,umask=0x2" },
+ { "cake1_pcsout_txdata", "event=0x7,instance=0x47,umask=0x2" },
+ { "cake0_pcsout_txmeta", "event=0x7,instance=0x46,umask=0x4" },
+ { "cake1_pcsout_txmeta", "event=0x7,instance=0x47,umask=0x4" },
+ { "cake0_ftiinstat_reqalloc", "event=0xb,instance=0x46,umask=0x4" },
+ { "cake1_ftiinstat_reqalloc", "event=0xb,instance=0x47,umask=0x4" },
+ { "cake0_ftiinstat_rspalloc", "event=0xb,instance=0x46,umask=0x8" },
+ { "cake1_ftiinstat_rspalloc", "event=0xb,instance=0x47,umask=0x8" },
+};
+
/* initialize perf counter */
static int amdgpu_perf_event_init(struct perf_event *event)
{
@@ -203,13 +236,48 @@ static void amdgpu_perf_del(struct perf_event *event, int flags)
perf_event_update_userpage(event);
}
-/* vega20 pmus */
+static int amdgpu_pmu_create_attributes(struct attribute_group *attr_group,
+ const char *events[][2],
+ int max_attrs)
+{
+
+ struct perf_pmu_events_attr *pmu_attr = NULL;
+ int i;
+
+ pmu_attr = kcalloc(max_attrs, sizeof(*pmu_attr), GFP_KERNEL);
+ if (!pmu_attr)
+ return -ENOMEM;
+
+ attr_group->attrs = kcalloc(max_attrs + 1, sizeof(*attr_group->attrs),
+ GFP_KERNEL);
+ if (!attr_group->attrs) {
+ kfree(pmu_attr);
+ return -ENOMEM;
+ }
+
+ for (i = 0; i < max_attrs; i++) {
+ attr_group->attrs[i] = &pmu_attr->attr.attr;
+ sysfs_attr_init(&pmu_attr->attr.attr);
+ pmu_attr->attr.attr.name = events[i][0];
+ pmu_attr->attr.attr.mode = 0444;
+ pmu_attr->attr.show = perf_event_sysfs_show;
+ pmu_attr->event_str = events[i][1];
+ pmu_attr++;
+ }
+
+ return 0;
+}
/* init pmu tracking per pmu type */
static int init_pmu_by_type(struct amdgpu_device *adev,
const struct attribute_group *attr_groups[],
char *pmu_type_name, char *pmu_file_prefix,
unsigned int pmu_perf_type,
+ const char *formats[][2],
+ struct attribute_group *format_group,
+ unsigned int num_formats,
+ const char *events[][2],
+ struct attribute_group *event_group,
unsigned int num_events)
{
char pmu_name[PMU_NAME_SIZE];
@@ -232,18 +300,23 @@ static int init_pmu_by_type(struct amdgpu_device *adev,
.task_ctx_nr = perf_invalid_context,
};
+ ret = amdgpu_pmu_create_attributes(format_group, formats, num_formats);
+ if (ret)
+ goto err;
+
+ ret = amdgpu_pmu_create_attributes(event_group, events, num_events);
+ if (ret)
+ goto err;
+
pmu_entry->pmu.attr_groups = attr_groups;
pmu_entry->pmu_perf_type = pmu_perf_type;
- snprintf(pmu_name, PMU_NAME_SIZE, "%s_%d",
- pmu_file_prefix, adev_to_drm(adev)->primary->index);
+ snprintf(pmu_name, PMU_NAME_SIZE, "%s_%d", pmu_file_prefix,
+ adev_to_drm(adev)->primary->index);
ret = perf_pmu_register(&pmu_entry->pmu, pmu_name, -1);
- if (ret) {
- kfree(pmu_entry);
- pr_warn("Error initializing AMDGPU %s PMUs.\n", pmu_type_name);
- return ret;
- }
+ if (ret)
+ goto err;
pr_info("Detected AMDGPU %s Counters. # of Counters = %d.\n",
pmu_type_name, num_events);
@@ -251,6 +324,10 @@ static int init_pmu_by_type(struct amdgpu_device *adev,
list_add_tail(&pmu_entry->entry, &amdgpu_pmu_list);
return 0;
+err:
+ kfree(pmu_entry);
+ pr_warn("Error initializing AMDGPU %s PMUs.\n", pmu_type_name);
+ return ret;
}
/* init amdgpu_pmu */
@@ -261,9 +338,14 @@ int amdgpu_pmu_init(struct amdgpu_device *adev)
switch (adev->asic_type) {
case CHIP_VEGA20:
/* init df */
- ret = init_pmu_by_type(adev, df_v3_6_attr_groups,
- "DF", "amdgpu_df", PERF_TYPE_AMDGPU_DF,
- NUM_EVENTS_DF_VEGA20);
+ ret = init_pmu_by_type(adev, df_vega20_attr_groups,
+ "DF", "amdgpu_df", PERF_TYPE_AMDGPU_DF,
+ df_vega20_formats,
+ &df_vega20_format_attr_group,
+ NUM_FORMATS_DF_VEGA20,
+ df_vega20_events,
+ &df_vega20_event_attr_group,
+ NUM_EVENTS_DF_VEGA20);
/* other pmu types go here*/
break;
@@ -271,7 +353,7 @@ int amdgpu_pmu_init(struct amdgpu_device *adev)
return 0;
}
- return 0;
+ return ret;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/df_v3_6.c b/drivers/gpu/drm/amd/amdgpu/df_v3_6.c
index 42937c474e46..569c40be6e75 100644
--- a/drivers/gpu/drm/amd/amdgpu/df_v3_6.c
+++ b/drivers/gpu/drm/amd/amdgpu/df_v3_6.c
@@ -42,69 +42,6 @@
static u32 df_v3_6_channel_number[] = {1, 2, 0, 4, 0, 8, 0,
16, 32, 0, 0, 0, 2, 4, 8};
-/* init df format attrs */
-AMDGPU_PMU_ATTR(event, "config:0-7");
-AMDGPU_PMU_ATTR(instance, "config:8-15");
-AMDGPU_PMU_ATTR(umask, "config:16-23");
-
-/* df format attributes */
-static struct attribute *df_v3_6_format_attrs[] = {
- &pmu_attr_event.attr,
- &pmu_attr_instance.attr,
- &pmu_attr_umask.attr,
- NULL
-};
-
-/* df format attribute group */
-static struct attribute_group df_v3_6_format_attr_group = {
- .name = "format",
- .attrs = df_v3_6_format_attrs,
-};
-
-/* df event attrs */
-AMDGPU_PMU_ATTR(cake0_pcsout_txdata,
- "event=0x7,instance=0x46,umask=0x2");
-AMDGPU_PMU_ATTR(cake1_pcsout_txdata,
- "event=0x7,instance=0x47,umask=0x2");
-AMDGPU_PMU_ATTR(cake0_pcsout_txmeta,
- "event=0x7,instance=0x46,umask=0x4");
-AMDGPU_PMU_ATTR(cake1_pcsout_txmeta,
- "event=0x7,instance=0x47,umask=0x4");
-AMDGPU_PMU_ATTR(cake0_ftiinstat_reqalloc,
- "event=0xb,instance=0x46,umask=0x4");
-AMDGPU_PMU_ATTR(cake1_ftiinstat_reqalloc,
- "event=0xb,instance=0x47,umask=0x4");
-AMDGPU_PMU_ATTR(cake0_ftiinstat_rspalloc,
- "event=0xb,instance=0x46,umask=0x8");
-AMDGPU_PMU_ATTR(cake1_ftiinstat_rspalloc,
- "event=0xb,instance=0x47,umask=0x8");
-
-/* df event attributes */
-static struct attribute *df_v3_6_event_attrs[] = {
- &pmu_attr_cake0_pcsout_txdata.attr,
- &pmu_attr_cake1_pcsout_txdata.attr,
- &pmu_attr_cake0_pcsout_txmeta.attr,
- &pmu_attr_cake1_pcsout_txmeta.attr,
- &pmu_attr_cake0_ftiinstat_reqalloc.attr,
- &pmu_attr_cake1_ftiinstat_reqalloc.attr,
- &pmu_attr_cake0_ftiinstat_rspalloc.attr,
- &pmu_attr_cake1_ftiinstat_rspalloc.attr,
- NULL
-};
-
-/* df event attribute group */
-static struct attribute_group df_v3_6_event_attr_group = {
- .name = "events",
- .attrs = df_v3_6_event_attrs
-};
-
-/* df event attr groups */
-const struct attribute_group *df_v3_6_attr_groups[] = {
- &df_v3_6_format_attr_group,
- &df_v3_6_event_attr_group,
- NULL
-};
-
static uint64_t df_v3_6_get_fica(struct amdgpu_device *adev,
uint32_t ficaa_val)
{
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
