Skip to content

Commit

Permalink
drivers/perf: hisi: Add support for HiSilicon H60PA and PAv3 PMU driver
Browse files Browse the repository at this point in the history 
Compared to the original PA device, H60PA offers higher bandwidth.
The H60PA is a new device and we use HID to differentiate them.

The events supported by PAv3 and PAv2 are different. The PAv3 PMU
removed some events which are supported by PAv2 PMU. The older PA
PMU driver will probe v3 as v2. Therefore PA events displayed by
"perf list" cannot work properly. We add the HISI0275 HID for PAv3
PMU to distinguish different.

For each H60PA PMU, except for the overflow interrupt register, other
functions of the H60PA PMU are the same as the original PA PMU module.
It has 8-programable counters and each counter is free-running.
Interrupt is supported to handle counter (64-bits) overflow.

Signed-off-by: Junhao He <hejunhao3@huawei.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Yicong Yang <yangyicong@hisilicon.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20230615125926.29832-2-hejunhao3@huawei.com
Signed-off-by: Will Deacon <will@kernel.org>
  • Loading branch information
Junhao He authored and Will Deacon committed Jun 16, 2023
1 parent 7e51d05 commit 1a51688
Show file tree
Hide file tree
Showing 2 changed files with 120 additions and 15 deletions.
127 changes: 112 additions & 15 deletions drivers/perf/hisilicon/hisi_uncore_pa_pmu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,15 @@
#define PA_TT_CTRL 0x1c08
#define PA_TGTID_CTRL 0x1c14
#define PA_SRCID_CTRL 0x1c18

/* H32 PA interrupt registers */
#define PA_INT_MASK 0x1c70
#define PA_INT_STATUS 0x1c78
#define PA_INT_CLEAR 0x1c7c

#define H60PA_INT_STATUS 0x1c70
#define H60PA_INT_MASK 0x1c74

#define PA_EVENT_TYPE0 0x1c80
#define PA_PMU_VERSION 0x1cf0
#define PA_EVENT_CNT0_L 0x1d00
Expand All @@ -46,6 +52,12 @@ HISI_PMU_EVENT_ATTR_EXTRACTOR(srcid_cmd, config1, 32, 22);
HISI_PMU_EVENT_ATTR_EXTRACTOR(srcid_msk, config1, 43, 33);
HISI_PMU_EVENT_ATTR_EXTRACTOR(tracetag_en, config1, 44, 44);

struct hisi_pa_pmu_int_regs {
u32 mask_offset;
u32 clear_offset;
u32 status_offset;
};

static void hisi_pa_pmu_enable_tracetag(struct perf_event *event)
{
struct hisi_pmu *pa_pmu = to_hisi_pmu(event->pmu);
Expand Down Expand Up @@ -219,40 +231,40 @@ static void hisi_pa_pmu_disable_counter(struct hisi_pmu *pa_pmu,
static void hisi_pa_pmu_enable_counter_int(struct hisi_pmu *pa_pmu,
struct hw_perf_event *hwc)
{
struct hisi_pa_pmu_int_regs *regs = pa_pmu->dev_info->private;
u32 val;

/* Write 0 to enable interrupt */
val = readl(pa_pmu->base + PA_INT_MASK);
val = readl(pa_pmu->base + regs->mask_offset);
val &= ~(1 << hwc->idx);
writel(val, pa_pmu->base + PA_INT_MASK);
writel(val, pa_pmu->base + regs->mask_offset);
}

static void hisi_pa_pmu_disable_counter_int(struct hisi_pmu *pa_pmu,
struct hw_perf_event *hwc)
{
struct hisi_pa_pmu_int_regs *regs = pa_pmu->dev_info->private;
u32 val;

/* Write 1 to mask interrupt */
val = readl(pa_pmu->base + PA_INT_MASK);
val = readl(pa_pmu->base + regs->mask_offset);
val |= 1 << hwc->idx;
writel(val, pa_pmu->base + PA_INT_MASK);
writel(val, pa_pmu->base + regs->mask_offset);
}

static u32 hisi_pa_pmu_get_int_status(struct hisi_pmu *pa_pmu)
{
return readl(pa_pmu->base + PA_INT_STATUS);
struct hisi_pa_pmu_int_regs *regs = pa_pmu->dev_info->private;

return readl(pa_pmu->base + regs->status_offset);
}

static void hisi_pa_pmu_clear_int_status(struct hisi_pmu *pa_pmu, int idx)
{
writel(1 << idx, pa_pmu->base + PA_INT_CLEAR);
}
struct hisi_pa_pmu_int_regs *regs = pa_pmu->dev_info->private;

static const struct acpi_device_id hisi_pa_pmu_acpi_match[] = {
{ "HISI0273", },
{}
};
MODULE_DEVICE_TABLE(acpi, hisi_pa_pmu_acpi_match);
writel(1 << idx, pa_pmu->base + regs->clear_offset);
}

static int hisi_pa_pmu_init_data(struct platform_device *pdev,
struct hisi_pmu *pa_pmu)
Expand All @@ -276,6 +288,10 @@ static int hisi_pa_pmu_init_data(struct platform_device *pdev,
pa_pmu->ccl_id = -1;
pa_pmu->sccl_id = -1;

pa_pmu->dev_info = device_get_match_data(&pdev->dev);
if (!pa_pmu->dev_info)
return -ENODEV;

pa_pmu->base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(pa_pmu->base)) {
dev_err(&pdev->dev, "ioremap failed for pa_pmu resource.\n");
Expand Down Expand Up @@ -314,6 +330,32 @@ static const struct attribute_group hisi_pa_pmu_v2_events_group = {
.attrs = hisi_pa_pmu_v2_events_attr,
};

static struct attribute *hisi_pa_pmu_v3_events_attr[] = {
HISI_PMU_EVENT_ATTR(tx_req, 0x0),
HISI_PMU_EVENT_ATTR(tx_dat, 0x1),
HISI_PMU_EVENT_ATTR(tx_snp, 0x2),
HISI_PMU_EVENT_ATTR(rx_req, 0x7),
HISI_PMU_EVENT_ATTR(rx_dat, 0x8),
HISI_PMU_EVENT_ATTR(rx_snp, 0x9),
NULL
};

static const struct attribute_group hisi_pa_pmu_v3_events_group = {
.name = "events",
.attrs = hisi_pa_pmu_v3_events_attr,
};

static struct attribute *hisi_h60pa_pmu_events_attr[] = {
HISI_PMU_EVENT_ATTR(rx_flit, 0x50),
HISI_PMU_EVENT_ATTR(tx_flit, 0x65),
NULL
};

static const struct attribute_group hisi_h60pa_pmu_events_group = {
.name = "events",
.attrs = hisi_h60pa_pmu_events_attr,
};

static DEVICE_ATTR(cpumask, 0444, hisi_cpumask_sysfs_show, NULL);

static struct attribute *hisi_pa_pmu_cpumask_attrs[] = {
Expand All @@ -337,6 +379,12 @@ static const struct attribute_group hisi_pa_pmu_identifier_group = {
.attrs = hisi_pa_pmu_identifier_attrs,
};

static struct hisi_pa_pmu_int_regs hisi_pa_pmu_regs = {
.mask_offset = PA_INT_MASK,
.clear_offset = PA_INT_CLEAR,
.status_offset = PA_INT_STATUS,
};

static const struct attribute_group *hisi_pa_pmu_v2_attr_groups[] = {
&hisi_pa_pmu_v2_format_group,
&hisi_pa_pmu_v2_events_group,
Expand All @@ -345,6 +393,46 @@ static const struct attribute_group *hisi_pa_pmu_v2_attr_groups[] = {
NULL
};

static const struct hisi_pmu_dev_info hisi_h32pa_v2 = {
.name = "pa",
.attr_groups = hisi_pa_pmu_v2_attr_groups,
.private = &hisi_pa_pmu_regs,
};

static const struct attribute_group *hisi_pa_pmu_v3_attr_groups[] = {
&hisi_pa_pmu_v2_format_group,
&hisi_pa_pmu_v3_events_group,
&hisi_pa_pmu_cpumask_attr_group,
&hisi_pa_pmu_identifier_group,
NULL
};

static const struct hisi_pmu_dev_info hisi_h32pa_v3 = {
.name = "pa",
.attr_groups = hisi_pa_pmu_v3_attr_groups,
.private = &hisi_pa_pmu_regs,
};

static struct hisi_pa_pmu_int_regs hisi_h60pa_pmu_regs = {
.mask_offset = H60PA_INT_MASK,
.clear_offset = H60PA_INT_STATUS, /* Clear on write */
.status_offset = H60PA_INT_STATUS,
};

static const struct attribute_group *hisi_h60pa_pmu_attr_groups[] = {
&hisi_pa_pmu_v2_format_group,
&hisi_h60pa_pmu_events_group,
&hisi_pa_pmu_cpumask_attr_group,
&hisi_pa_pmu_identifier_group,
NULL
};

static const struct hisi_pmu_dev_info hisi_h60pa = {
.name = "h60pa",
.attr_groups = hisi_h60pa_pmu_attr_groups,
.private = &hisi_h60pa_pmu_regs,
};

static const struct hisi_uncore_ops hisi_uncore_pa_ops = {
.write_evtype = hisi_pa_pmu_write_evtype,
.get_event_idx = hisi_uncore_pmu_get_event_idx,
Expand Down Expand Up @@ -375,7 +463,7 @@ static int hisi_pa_pmu_dev_probe(struct platform_device *pdev,
if (ret)
return ret;

pa_pmu->pmu_events.attr_groups = hisi_pa_pmu_v2_attr_groups;
pa_pmu->pmu_events.attr_groups = pa_pmu->dev_info->attr_groups;
pa_pmu->num_counters = PA_NR_COUNTERS;
pa_pmu->ops = &hisi_uncore_pa_ops;
pa_pmu->check_event = 0xB0;
Expand All @@ -400,8 +488,9 @@ static int hisi_pa_pmu_probe(struct platform_device *pdev)
if (ret)
return ret;

name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "hisi_sicl%u_pa%u",
pa_pmu->sicl_id, pa_pmu->index_id);
name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "hisi_sicl%d_%s%u",
pa_pmu->sicl_id, pa_pmu->dev_info->name,
pa_pmu->index_id);
if (!name)
return -ENOMEM;

Expand Down Expand Up @@ -435,6 +524,14 @@ static int hisi_pa_pmu_remove(struct platform_device *pdev)
return 0;
}

static const struct acpi_device_id hisi_pa_pmu_acpi_match[] = {
{ "HISI0273", (kernel_ulong_t)&hisi_h32pa_v2 },
{ "HISI0275", (kernel_ulong_t)&hisi_h32pa_v3 },
{ "HISI0274", (kernel_ulong_t)&hisi_h60pa },
{}
};
MODULE_DEVICE_TABLE(acpi, hisi_pa_pmu_acpi_match);

static struct platform_driver hisi_pa_pmu_driver = {
.driver = {
.name = "hisi_pa_pmu",
Expand Down
8 changes: 8 additions & 0 deletions drivers/perf/hisilicon/hisi_uncore_pmu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@ struct hisi_uncore_ops {
void (*disable_filter)(struct perf_event *event);
};

/* Describes the HISI PMU chip features information */
struct hisi_pmu_dev_info {
const char *name;
const struct attribute_group **attr_groups;
void *private;
};

struct hisi_pmu_hwevents {
struct perf_event *hw_events[HISI_MAX_COUNTERS];
DECLARE_BITMAP(used_mask, HISI_MAX_COUNTERS);
Expand All @@ -72,6 +79,7 @@ struct hisi_pmu_hwevents {
struct hisi_pmu {
struct pmu pmu;
const struct hisi_uncore_ops *ops;
const struct hisi_pmu_dev_info *dev_info;
struct hisi_pmu_hwevents pmu_events;
/* associated_cpus: All CPUs associated with the PMU */
cpumask_t associated_cpus;
Expand Down

0 comments on commit 1a51688

Please sign in to comment.