Skip to contentSkip to conversation

drivers/perf: Risc-V: Update platform specific firmware event handling

PATCH In review Mayuresh Chitale 3 participants 4 messages Aug 14, 2023 – Aug 16, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/perf: Risc-V: Update platform specific firmware event handling

SBI specification [1] reserves an event code for platform specific firmware events. Update the driver to use the new reserved event code for platform specific firmware events. Also update the raw event parsing to use bits 63:62 instead of only bit 63 to distinguish between the raw event types. The platform specific firmware events must be specified in the perf command as in the below example:
perf stat -e rc000000000000001 <command>
where [63:62] = 0x3 indicates a platform specific firmware event

---
 arch/riscv/include/asm/sbi.h |  1 +
 drivers/perf/riscv_pmu_sbi.c | 29 +++++++++++++++++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)
arch/riscv/include/asm/sbi.h +1 -0
index 5b4a1bf5f439..001387354c2e 100644
@@ -138,6 +138,7 @@ union sbi_pmu_ctr_info {
 
 #define RISCV_PMU_RAW_EVENT_MASK GENMASK_ULL(47, 0)
 #define RISCV_PMU_RAW_EVENT_IDX 0x20000
+#define RISCV_PLAT_FW_EVENT	0xFFFF
 
 /** General pmu event codes specified in SBI PMU extension */
 enum sbi_pmu_hw_generic_events_t {
drivers/perf/riscv_pmu_sbi.c +21 -8
index 4163ff517471..f94a3f0a469b 100644
@@ -414,7 +414,6 @@ static int pmu_sbi_event_map(struct perf_event *event, u64 *econfig)
 {
 	u32 type = event->attr.type;
 	u64 config = event->attr.config;
-	int bSoftware;
 	u64 raw_config_val;
 	int ret;
 
@@ -429,18 +428,32 @@ static int pmu_sbi_event_map(struct perf_event *event, u64 *econfig)
 		break;
 	case PERF_TYPE_RAW:
 		/*
-		 * As per SBI specification, the upper 16 bits must be unused for
-		 * a raw event. Use the MSB (63b) to distinguish between hardware
-		 * raw event and firmware events.
+		 * As per SBI specification, the upper 16 bits must be unused
+		 * for a raw event. Hence bits 63:62 are used to distinguish
+		 * between raw events:
+		 * 00 - Hardware raw event
+		 * 10 - SBI firmware events
+		 * 11 - Risc-V platform specific firmware event
 		 */
-		bSoftware = config >> 63;
 		raw_config_val = config & RISCV_PMU_RAW_EVENT_MASK;
-		if (bSoftware) {
+		switch (config >> 62) {
+		case 0:
+			ret = RISCV_PMU_RAW_EVENT_IDX;
+			*econfig = raw_config_val;
+			break;
+		case 2:
 			ret = (raw_config_val & 0xFFFF) |
 				(SBI_PMU_EVENT_TYPE_FW << 16);
-		} else {
-			ret = RISCV_PMU_RAW_EVENT_IDX;
+			break;
+		case 3:
+			/*
+			 * For Risc-V platform specific firmware events
+			 * Event code - 0xFFFF
+			 * Event data - raw event encoding
+			 */
+			ret = SBI_PMU_EVENT_TYPE_FW << 16 | RISCV_PLAT_FW_EVENT;
 			*econfig = raw_config_val;
+			break;
 		}
 		break;
 	default:
Signature · 7 lines
2.34.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
#1 lore raw

drivers/perf/riscv_pmu_sbi.c static int pmu_sbi_event_map(struct perf_event *event, u64 *econfig) · line 450

Quoted 2 lines · Mayuresh Chitale
drivers/perf/riscv_pmu_sbi.c +2 -0
+			/*
+			 * For Risc-V platform specific firmware events

This is a nit, but it my OCD is triggered every time I read it - please don't invent another style of writing the name of the architecture, both here and in the commit message. If you respin for some other reason, could you please change these to one of the established styles?

Thanks,
Conor.

drivers/perf/riscv_pmu_sbi.c static int pmu_sbi_event_map(struct perf_event *event, u64 *econfig) · line 456

Quoted 6 lines
drivers/perf/riscv_pmu_sbi.c +5 -0
+			 * Event code - 0xFFFF
+			 * Event data - raw event encoding
+			 */
+			ret = SBI_PMU_EVENT_TYPE_FW << 16 | RISCV_PLAT_FW_EVENT;
 			*econfig = raw_config_val;
+			break;

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

#2 lore raw
In reply to Mayuresh Chitale
Quoted 11 lines · Mayuresh Chitale

SBI specification [1] reserves an event code for platform specific firmware events. Update the driver to use the new reserved event code for platform specific firmware events. Also update the raw event parsing to use bits 63:62 instead of only bit 63 to distinguish between the raw event types. The platform specific firmware events must be specified in the perf command as in the below example:
perf stat -e rc000000000000001 <command>
where [63:62] = 0x3 indicates a platform specific firmware event

Hmm, another question - is this actually in a frozen version of the SBI spec? I might've got distracted during the last PRS meeting and be unaware, but I had it in my head that it was not frozen.

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

#3 lore raw
Quoted 11 lines · Conor Dooley
Quoted 9 lines · Mayuresh Chitale

SBI specification [1] reserves an event code for platform specific firmware events. Update the driver to use the new reserved event code for platform specific firmware events. Also update the raw event parsing to use bits 63:62 instead of only bit 63 to distinguish between the raw event types. The platform specific firmware events must be specified in the perf command as in the below example:
perf stat -e rc000000000000001 <command>
where [63:62] = 0x3 indicates a platform specific firmware event

Quoted 6 lines
Quoted 2 lines

Hmm, another question - is this actually in a frozen version of the SBI spec? I might've got distracted during the last PRS meeting and be unaware, but I had it in my head that it was not frozen.

Yes. It is not frozen yet. We are in the process of getting all the RVI approvals to freeze the spec.

Signature · 7 lines
Regards,
Atish

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv