On 01/11/2019 15:47, Andre Przywara wrote: > On 11/1/19 11:30 AM, Clément Péron wrote: Hi, for the sake of finishing this thread, in case search engines point to it: >> On Thu, 31 Oct 2019 at 21:35, Vasily Khoruzhick <anarsoul@xxxxxxxxx> >> wrote: >>> >>> On Thu, Oct 31, 2019 at 12:10 PM Clément Péron <peron.clem@xxxxxxxxx> >>> wrote: >>>> >>>> Hi, >>>> >>>> Just a remark here but the interrupt are from 152 to 155 SPI. >>>> But there is an offset of 32 no (remove SGI/PPI)? >>>> This should be from 120 to 123 >>> >>> I already tried it (and I believe someone already suggested it above), >>> it doesn't fix PMU interrupts though. >> >> Ok thanks for the confirmation. >> >> Made a research about the PMU for A64 and found that Andre Przywara >> made a patch to enable it: >> https://gist.github.com/apritzel/d025abaa1425fcaf5991b5ffcf18a0a3 >> >> Maybe he can confirm or not the issue on A64 ? > > Well, I tried it back then, but couldn't make the interrupts work (and > yes, I tried +/- 32). That's the reason I didn't send it back then. I did the experiment drafted below, and found that the interrupts are not 152-155, as the manual describes, but 148-151 instead. And yes, those are the GIC interrupt IDs used, but the GIC binding requires us to give the SPI numbers, so we need to subtract 32, which was not the case for the original patch. Thanks to Maxime for merging the fix patch: https://archive.armlinux.org.uk/lurker/message/20191105.110651.914455de.en.html In case someone wants to confirm this or in general needs to find/confirm IRQ numbers for some peripherals: > I can't say whether the IRQ lines are not wired or the manual just gives > the wrong numbers. I don't have access to a board before Sunday, but if > someone wants to beat me to it: > - Hack U-Boot to add a command to program one PMU counter to expire > quickly, and enable overflow interrupts. Attaching a U-Boot patch to trigger a PMU cycle counter overflow IRQ. > - Enable *all* SPIs on the GIC distributor level, and enable the > distributor. Keep the GIC CPU interface disabled. The GIC distributor on most Allwinner SoCs is located at 0x01c81000. This is the first address shown in the GIC's DT node. To enable all IRQs in U-Boot, on the U-Boot command prompt: => mw.l 0x01c81100 0xffffffff 0x20 This will set all possible 1024 bits in the GICD_ISENABLERn registers (offset 0x100) to 1. Reading this back will reveal which IRQs the GIC actually is configured for, typically we have much fewer SPIs supported. To enable the distributor (really: group 1 interrupts): => mw.l 0x01c81000 1 As suggested, we don't touch the GIC CPU interface, so no interrupts will actually reach the core. > - Trigger the U-Boot command, and inspect the GICD_ISPENDR registers to > see if any SPI fired. Trigger the IRQ, for instance using the command provided by the patch above. Keep the PMU enabled, because it will deassert the IRQ lines otherwise: => pmuc start => pmuc (check that the counter overflows) => md.l 0x01c81200 0x20 This will print the pending bits (GICD_ISPENDRn at offset 0x200) for each IRQ. In U-Boot we expect no other IRQs to ever fire, so any bit set in here would be due to our experiment. In this case the output looked like: 01c81200: 00000000 00000000 00000000 00000000 01c81210: 00100000 00000000 00000000 00000000 If you do the counting, this is bit 20 in word 4, so 4 * 32 + 20 = 148. Subtract 32 to get the number that goes into the DT node. U-Boot is UP, so this is probably the IRQ on core 0. A reasonable assumption is that the other cores just follow behind this, which you can confirm in Linux, by running some perf command on only a single core and watching the interrupt count increasing: $ grep pmu /proc/interrupts $ taskset -cp 1 $$ $ perf record sleep 3 $ grep pmu /proc/interrupts > - Also double check the PMU overflow status register to verify that the > event triggered. Just calling "pmuc" will print the PMOVSCLR register. Hope that helps! Cheers, Andre >>>> On Wed, 25 Sep 2019 at 13:09, Maxime Ripard <mripard@xxxxxxxxxx> wrote: >>>>> >>>>> On Mon, Sep 23, 2019 at 04:55:59PM -0700, Vasily Khoruzhick wrote: >>>>>> On Mon, Sep 23, 2019 at 4:51 PM Vasily Khoruzhick >>>>>> <anarsoul@xxxxxxxxx> wrote: >>>>>>> >>>>>>> On Mon, Aug 12, 2019 at 10:39 PM Maxime Ripard >>>>>>> <maxime.ripard@xxxxxxxxxxx> wrote: >>>>>>>> >>>>>>>> On Mon, Aug 12, 2019 at 11:01:51AM -0700, Vasily Khoruzhick wrote: >>>>>>>>> On Mon, Aug 12, 2019 at 1:04 AM Maxime Ripard >>>>>>>>> <maxime.ripard@xxxxxxxxxxx> wrote: >>>>>>>>>> >>>>>>>>>> On Thu, Aug 08, 2019 at 12:59:07PM -0700, Vasily Khoruzhick >>>>>>>>>> wrote: >>>>>>>>>>> On Thu, Aug 8, 2019 at 9:26 AM Maxime Ripard >>>>>>>>>>> <maxime.ripard@xxxxxxxxxxx> wrote: >>>>>>>>>>>> >>>>>>>>>>>> On Wed, Aug 07, 2019 at 10:36:08AM -0700, Vasily Khoruzhick >>>>>>>>>>>> wrote: >>>>>>>>>>>>> On Wed, Aug 7, 2019 at 4:56 AM Maxime Ripard >>>>>>>>>>>>> <maxime.ripard@xxxxxxxxxxx> wrote: >>>>>>>>>>>>>> >>>>>>>>>>>>>> On Tue, Aug 06, 2019 at 07:39:26PM -0700, Vasily >>>>>>>>>>>>>> Khoruzhick wrote: >>>>>>>>>>>>>>> On Tue, Aug 6, 2019 at 2:14 PM Robin Murphy >>>>>>>>>>>>>>> <robin.murphy@xxxxxxx> wrote: >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> On 2019-08-06 9:52 pm, Vasily Khoruzhick wrote: >>>>>>>>>>>>>>>>> On Tue, Aug 6, 2019 at 1:19 PM Harald Geyer >>>>>>>>>>>>>>>>> <harald@xxxxxxxxx> wrote: >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> Vasily Khoruzhick writes: >>>>>>>>>>>>>>>>>>> On Tue, Aug 6, 2019 at 7:35 AM Robin Murphy >>>>>>>>>>>>>>>>>>> <robin.murphy@xxxxxxx> wrote: >>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>> On 06/08/2019 15:01, Vasily Khoruzhick wrote: >>>>>>>>>>>>>>>>>>>>> Looks like PMU in A64 is broken, it generates no >>>>>>>>>>>>>>>>>>>>> interrupts at all and >>>>>>>>>>>>>>>>>>>>> as result 'perf top' shows no events. >>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>> Does something like 'perf stat sleep 1' at least >>>>>>>>>>>>>>>>>>>> count cycles correctly? >>>>>>>>>>>>>>>>>>>> It could well just be that the interrupt numbers are >>>>>>>>>>>>>>>>>>>> wrong... >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> Looks like it does, at least result looks plausible: >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> I'm using perf stat regularly (cache benchmarks) and >>>>>>>>>>>>>>>>>> it works fine. >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> Unfortunately I wasn't aware that perf stat is a poor >>>>>>>>>>>>>>>>>> test for >>>>>>>>>>>>>>>>>> the interrupts part of the node, when I added it. So >>>>>>>>>>>>>>>>>> I'm not too >>>>>>>>>>>>>>>>>> surprised I got it wrong. >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> However, it would be unfortunate if the node got >>>>>>>>>>>>>>>>>> removed completely, >>>>>>>>>>>>>>>>>> because perf stat would not work anymore. Maybe we can >>>>>>>>>>>>>>>>>> only remove >>>>>>>>>>>>>>>>>> the interrupts or just fix them even if the HW doesn't >>>>>>>>>>>>>>>>>> work? >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> I'm not familiar with PMU driver. Is it possible to get >>>>>>>>>>>>>>>>> it working >>>>>>>>>>>>>>>>> without interrupts? >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Yup - you get a grumpy message from the driver, it will >>>>>>>>>>>>>>>> refuse sampling >>>>>>>>>>>>>>>> events (the ones which weren't working anyway), and if >>>>>>>>>>>>>>>> you measure >>>>>>>>>>>>>>>> anything for long enough that a counter overflows you'll >>>>>>>>>>>>>>>> get wonky >>>>>>>>>>>>>>>> results. But for counting hardware events over >>>>>>>>>>>>>>>> relatively short periods >>>>>>>>>>>>>>>> it'll still do the job. >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> I tried to drop interrupts completely from the node but >>>>>>>>>>>>>>> 'perf top' is >>>>>>>>>>>>>>> still broken. Though now in different way: it complains >>>>>>>>>>>>>>> "cycles: PMU >>>>>>>>>>>>>>> Hardware doesn't support sampling/overflow-interrupts. >>>>>>>>>>>>>>> Try 'perf >>>>>>>>>>>>>>> stat'" >>>>>>>>>>>>>> >>>>>>>>>>>>>> I have no idea if that's the culprit, but what is the >>>>>>>>>>>>>> state of the >>>>>>>>>>>>>> 0x09010000 register? >>>>>>>>>>>>> >>>>>>>>>>>>> What register is that and how do I check it? >>>>>>>>>>>> >>>>>>>>>>>> It's in the CPUX Configuration block, and the bits are >>>>>>>>>>>> labelled as CPU >>>>>>>>>>>> Debug Reset. >>>>>>>>>>>> >>>>>>>>>>>> And if you have busybox, you can use devmem. >>>>>>>>>>> >>>>>>>>>>> CPUX configuration block is at 0x01700000 according to A64 user >>>>>>>>>>> manual, and particular register you're interested in is at >>>>>>>>>>> 0x01700080, >>>>>>>>>>> its value is 0x1110110F. >>>>>>>>>>> >>>>>>>>>>> Bits 16-19 are not defined in user manual and are not set. >>>>>>>>>> >>>>>>>>>> Sorry, I somehow thought this was for the H6... >>>>>>>>>> >>>>>>>>>> I don't have any idea then :/ >>>>>>>>> >>>>>>>>> OK, so what should we do? 'perf top'/'perf record' work fine if >>>>>>>>> PMU >>>>>>>>> node is dropped, but they don't work if PMU node is present >>>>>>>>> (even with >>>>>>>>> interrupts dropped). I'd prefer to have 'perf top' and 'perf >>>>>>>>> record' >>>>>>>>> working instead of 'perf stat' >>>>>>>> >>>>>>>> Well, it doesn't work so we should just remove the node, and if >>>>>>>> someone wants it back, they should figure it out. >>>>>>> >>>>>>> Hey Maxime, >>>>>>> >>>>>>> So can you merge this patch? >>>>>> >>>>>> Added new Maxime's email to CC >>>>> >>>>> Queued as a fix for 5.4, thanks! >>>>> Maxime >>>>> _______________________________________________ >>>>> linux-arm-kernel mailing list >>>>> linux-arm-kernel@xxxxxxxxxxxxxxxxxxx >>>>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >
>From 169f01c8545a68b5f36515c49d171b9e0555ec1b Mon Sep 17 00:00:00 2001 From: Andre Przywara <andre.przywara@xxxxxxx> Date: Mon, 4 Nov 2019 21:54:51 +0000 Subject: [PATCH] arm64: Add performance monitoring unit test command Mostly useful for identifying the interrupts used. Signed-off-by: Andre Przywara <andre.przywara@xxxxxxx> --- cmd/Makefile | 1 + cmd/arm_pmu.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 cmd/arm_pmu.c diff --git a/cmd/Makefile b/cmd/Makefile index ac843b4b16..bced333222 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -182,6 +182,7 @@ endif # !CONFIG_SPL_BUILD # core command obj-y += nvedit.o +obj-$(CONFIG_ARM64) += arm_pmu.o obj-$(CONFIG_TI_COMMON_CMD_OPTIONS) += ti/ diff --git a/cmd/arm_pmu.c b/cmd/arm_pmu.c new file mode 100644 index 0000000000..0bc072b2f5 --- /dev/null +++ b/cmd/arm_pmu.c @@ -0,0 +1,78 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2019 Arm Ltd. + */ + +#include <common.h> +#include <command.h> +#include <linux/bitops.h> + + +int do_pmuc(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + u64 reg; + + if (argc < 2) { + /* PMU control register */ + __asm__ volatile("mrs %0, PMCR_EL0\n" : "=r"(reg)); + printf("PMCR: 0x%llx\n", reg); + /* overflow status register */ + __asm__ volatile("mrs %0, PMOVSCLR_EL0\n" : "=r"(reg)); + printf("PMOVSCLR: 0x%llx\n", reg); + /* counter register */ + __asm__ volatile("mrs %0, PMCCNTR_EL0\n" : "=r"(reg)); + printf("counter: 0x%llx\n", reg); + return CMD_RET_SUCCESS; + } + + if (!strcmp(argv[1], "start")) { + /* enable cycle counting */ + __asm__ volatile("msr PMCNTENSET_EL0, %0\n" :: "r"(BIT(31))); + /* enable overflow interrupt */ + __asm__ volatile("msr PMINTENSET_EL1, %0\n" :: "r"(BIT(31))); + /* allow counting in EL2 */ + __asm__ volatile("msr PMCCFILTR_EL0, %0\n" :: "r"(BIT(27))); + __asm__ volatile("mrs %0, PMCR_EL0\n" : "=r"(reg)); + /* enable PMU */ + reg |= 0x1; + __asm__ volatile("msr PMCR_EL0, %0\n" :: "r"(reg)); + return CMD_RET_SUCCESS; + } + if (!strcmp(argv[1], "reset")) { + /* disable all event and cycle counting */ + __asm__ volatile("msr PMCNTENCLR_EL0, %0\n" :: "r"(0xffffffff)); + /* disable all overflow interrupts */ + __asm__ volatile("msr PMINTENCLR_EL1, %0\n" :: "r"(0xffffffff)); + /* clear all overflow interrupts */ + __asm__ volatile("msr PMOVSCLR_EL0, %0\n" :: "r"(0xffffffff)); + /* clear filter (blocks EL2 counting) */ + __asm__ volatile("msr PMCCFILTR_EL0, %0\n" :: "r"(0)); + __asm__ volatile("mrs %0, PMCR_EL0\n" : "=r"(reg)); + /* disable PMU */ + reg &= ~0x1; + __asm__ volatile("msr PMCR_EL0, %0\n" :: "r"(reg)); + return CMD_RET_SUCCESS; + } + if (!strcmp(argv[1], "stop")) { + __asm__ volatile("mrs %0, PMCR_EL0\n" : "=r"(reg)); + /* disable PMU */ + reg &= ~0x1; + __asm__ volatile("msr PMCR_EL0, %0\n" :: "r"(reg)); + return CMD_RET_SUCCESS; + } + + reg = simple_strtoul(argv[1], NULL, 16); + __asm__ volatile("msr PMCCNTR_EL0, %0\n" :: "r" (reg)); + + return CMD_RET_SUCCESS; +} + +U_BOOT_CMD( + pmuc, 2, 1, do_pmuc, + "test the ARM performance monitoring unit", + "(no argument): print the cycle counter, PMCR and overflow status\n" + " start: enable the cycle counter and interrupts\n" + " stop: disable the cycle counter and interrupts\n" + " reset: reset the PMU\n" + " <value>: set the cycle counter\n" +); -- 2.14.5