* [PATCH] drivers/perf: hisi: Fix data source control
@ 2021-06-03 8:34 Shaokun Zhang
2021-06-04 19:48 ` Will Deacon
0 siblings, 1 reply; 2+ messages in thread
From: Shaokun Zhang @ 2021-06-03 8:34 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: Shaokun Zhang, Will Deacon, Mark Rutland
'Data source' is a new function for HHA PMU and config / clear
interface was wrong by mistake. 'HHA_DATSRC_CTRL' register is
mainly used for data source configuration, if we enable bit0
as driver, it will go on count the event and we didn't check
it carefully. So fix the issue and do as the initial purpose.
Fixes: 932f6a99f9b0 ("drivers/perf: hisi: Add new functions for HHA PMU")
Reported-by: kernel test robot <lkp@intel.com>
Cc: Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
---
drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c b/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c
index 12b2c5e6d488..393513150106 100644
--- a/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c
+++ b/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c
@@ -90,7 +90,7 @@ static void hisi_hha_pmu_config_ds(struct perf_event *event)
val = readl(hha_pmu->base + HHA_DATSRC_CTRL);
val |= HHA_DATSRC_SKT_EN;
- writel(ds_skt, hha_pmu->base + HHA_DATSRC_CTRL);
+ writel(val, hha_pmu->base + HHA_DATSRC_CTRL);
}
}
@@ -104,7 +104,7 @@ static void hisi_hha_pmu_clear_ds(struct perf_event *event)
val = readl(hha_pmu->base + HHA_DATSRC_CTRL);
val &= ~HHA_DATSRC_SKT_EN;
- writel(ds_skt, hha_pmu->base + HHA_DATSRC_CTRL);
+ writel(val, hha_pmu->base + HHA_DATSRC_CTRL);
}
}
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drivers/perf: hisi: Fix data source control
2021-06-03 8:34 [PATCH] drivers/perf: hisi: Fix data source control Shaokun Zhang
@ 2021-06-04 19:48 ` Will Deacon
0 siblings, 0 replies; 2+ messages in thread
From: Will Deacon @ 2021-06-04 19:48 UTC (permalink / raw)
To: Shaokun Zhang, linux-arm-kernel
Cc: catalin.marinas, kernel-team, Will Deacon, Mark Rutland
On Thu, 3 Jun 2021 16:34:51 +0800, Shaokun Zhang wrote:
> 'Data source' is a new function for HHA PMU and config / clear
> interface was wrong by mistake. 'HHA_DATSRC_CTRL' register is
> mainly used for data source configuration, if we enable bit0
> as driver, it will go on count the event and we didn't check
> it carefully. So fix the issue and do as the initial purpose.
Applied to will (for-next/perf), thanks!
[1/1] drivers/perf: hisi: Fix data source control
https://git.kernel.org/will/c/814be609baae
Cheers,
--
Will
https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-04 19:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-03 8:34 [PATCH] drivers/perf: hisi: Fix data source control Shaokun Zhang
2021-06-04 19:48 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).