Commit 63ba5b0f authored by Eric Lin's avatar Eric Lin Committed by Palmer Dabbelt

perf arch events: Fix duplicate RISC-V SBI firmware event name

Currently, the RISC-V firmware JSON file has duplicate event name
"FW_SFENCE_VMA_RECEIVED". According to the RISC-V SBI PMU extension[1],
the event name should be "FW_SFENCE_VMA_ASID_SENT".

Before this patch:
$ perf list

firmware:
  fw_access_load
       [Load access trap event. Unit: cpu]
  fw_access_store
       [Store access trap event. Unit: cpu]
....
 fw_set_timer
       [Set timer event. Unit: cpu]
  fw_sfence_vma_asid_received
       [Received SFENCE.VMA with ASID request from other HART event. Unit: cpu]
  fw_sfence_vma_received
       [Sent SFENCE.VMA with ASID request to other HART event. Unit: cpu]

After this patch:
$ perf list

firmware:
  fw_access_load
       [Load access trap event. Unit: cpu]
  fw_access_store
       [Store access trap event. Unit: cpu]
.....
  fw_set_timer
       [Set timer event. Unit: cpu]
  fw_sfence_vma_asid_received
       [Received SFENCE.VMA with ASID request from other HART event. Unit: cpu]
  fw_sfence_vma_asid_sent
       [Sent SFENCE.VMA with ASID request to other HART event. Unit: cpu]
  fw_sfence_vma_received
       [Received SFENCE.VMA request from other HART event. Unit: cpu]

Link: https://github.com/riscv-non-isa/riscv-sbi-doc/blob/master/src/ext-pmu.adoc#event-firmware-events-type-15 [1]
Fixes: 8f0dcb4e ("perf arch events: riscv sbi firmware std event files")
Fixes: c4f769d4 ("perf vendor events riscv: add Sifive U74 JSON file")
Fixes: acbf6de6 ("perf vendor events riscv: Add StarFive Dubhe-80 JSON file")
Fixes: 7340c6df ("perf vendor events riscv: add T-HEAD C9xx JSON file")
Fixes: f5102e31 ("riscv: andes: Support specifying symbolic firmware and hardware raw event")
Signed-off-by: default avatarEric Lin <eric.lin@sifive.com>
Reviewed-by: default avatarSamuel Holland <samuel.holland@sifive.com>
Reviewed-by: default avatarNikita Shubin <n.shubin@yadro.com>
Reviewed-by: default avatarInochi Amaoto <inochiama@outlook.com>
Reviewed-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Reviewed-by: default avatarAtish Patra <atishp@rivosinc.com>
Link: https://lore.kernel.org/r/20240719115018.27356-1-eric.lin@sifive.comSigned-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent fb197c5d
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
}, },
{ {
"ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
}, },
{ {
"ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED" "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
{ {
"PublicDescription": "Sent SFENCE.VMA with ASID request to other HART event", "PublicDescription": "Sent SFENCE.VMA with ASID request to other HART event",
"ConfigCode": "0x800000000000000c", "ConfigCode": "0x800000000000000c",
"EventName": "FW_SFENCE_VMA_RECEIVED", "EventName": "FW_SFENCE_VMA_ASID_SENT",
"BriefDescription": "Sent SFENCE.VMA with ASID request to other HART event" "BriefDescription": "Sent SFENCE.VMA with ASID request to other HART event"
}, },
{ {
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
}, },
{ {
"ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
}, },
{ {
"ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED" "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
}, },
{ {
"ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
}, },
{ {
"ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED" "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
}, },
{ {
"ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
}, },
{ {
"ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED" "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment