perf: arm_cspmu: nvidia: remove unsupported SCF events

Remove unsupported events under SCF PMU.

Signed-off-by: Besar Wicaksono <bwicaksono@nvidia.com>
Link: https://lore.kernel.org/r/20241031142118.1865965-2-bwicaksono@nvidia.com
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/drivers/perf/arm_cspmu/nvidia_cspmu.c b/drivers/perf/arm_cspmu/nvidia_cspmu.c
index d0ef611240aa3658b5ecb97438b5330603fb5ae3..ea2d44adfa7c502dfa6331f8bfdc031197392a93 100644 (file)
--- a/drivers/perf/arm_cspmu/nvidia_cspmu.c
+++ b/drivers/perf/arm_cspmu/nvidia_cspmu.c
@@ -54,65 +54,24 @@ static struct attribute *scf_pmu_event_attrs[] = {
        ARM_CSPMU_EVENT_ATTR(scf_cache_wb,                      0xF3),
 
        NV_CSPMU_EVENT_ATTR_4(socket, rd_data,                  0x101),
-       NV_CSPMU_EVENT_ATTR_4(socket, dl_rsp,                   0x105),
        NV_CSPMU_EVENT_ATTR_4(socket, wb_data,                  0x109),
-       NV_CSPMU_EVENT_ATTR_4(socket, ev_rsp,                   0x10d),
-       NV_CSPMU_EVENT_ATTR_4(socket, prb_data,                 0x111),
 
        NV_CSPMU_EVENT_ATTR_4(socket, rd_outstanding,           0x115),
-       NV_CSPMU_EVENT_ATTR_4(socket, dl_outstanding,           0x119),
-       NV_CSPMU_EVENT_ATTR_4(socket, wb_outstanding,           0x11d),
-       NV_CSPMU_EVENT_ATTR_4(socket, wr_outstanding,           0x121),
-       NV_CSPMU_EVENT_ATTR_4(socket, ev_outstanding,           0x125),
-       NV_CSPMU_EVENT_ATTR_4(socket, prb_outstanding,          0x129),
 
        NV_CSPMU_EVENT_ATTR_4(socket, rd_access,                0x12d),
-       NV_CSPMU_EVENT_ATTR_4(socket, dl_access,                0x131),
        NV_CSPMU_EVENT_ATTR_4(socket, wb_access,                0x135),
        NV_CSPMU_EVENT_ATTR_4(socket, wr_access,                0x139),
-       NV_CSPMU_EVENT_ATTR_4(socket, ev_access,                0x13d),
-       NV_CSPMU_EVENT_ATTR_4(socket, prb_access,               0x141),
-
-       NV_CSPMU_EVENT_ATTR_4(ocu, gmem_rd_data,                0x145),
-       NV_CSPMU_EVENT_ATTR_4(ocu, gmem_rd_access,              0x149),
-       NV_CSPMU_EVENT_ATTR_4(ocu, gmem_wb_access,              0x14d),
-       NV_CSPMU_EVENT_ATTR_4(ocu, gmem_rd_outstanding,         0x151),
-       NV_CSPMU_EVENT_ATTR_4(ocu, gmem_wr_outstanding,         0x155),
-
-       NV_CSPMU_EVENT_ATTR_4(ocu, rem_rd_data,                 0x159),
-       NV_CSPMU_EVENT_ATTR_4(ocu, rem_rd_access,               0x15d),
-       NV_CSPMU_EVENT_ATTR_4(ocu, rem_wb_access,               0x161),
-       NV_CSPMU_EVENT_ATTR_4(ocu, rem_rd_outstanding,          0x165),
-       NV_CSPMU_EVENT_ATTR_4(ocu, rem_wr_outstanding,          0x169),
 
        ARM_CSPMU_EVENT_ATTR(gmem_rd_data,                      0x16d),
        ARM_CSPMU_EVENT_ATTR(gmem_rd_access,                    0x16e),
        ARM_CSPMU_EVENT_ATTR(gmem_rd_outstanding,               0x16f),
-       ARM_CSPMU_EVENT_ATTR(gmem_dl_rsp,                       0x170),
-       ARM_CSPMU_EVENT_ATTR(gmem_dl_access,                    0x171),
-       ARM_CSPMU_EVENT_ATTR(gmem_dl_outstanding,               0x172),
        ARM_CSPMU_EVENT_ATTR(gmem_wb_data,                      0x173),
        ARM_CSPMU_EVENT_ATTR(gmem_wb_access,                    0x174),
-       ARM_CSPMU_EVENT_ATTR(gmem_wb_outstanding,               0x175),
-       ARM_CSPMU_EVENT_ATTR(gmem_ev_rsp,                       0x176),
-       ARM_CSPMU_EVENT_ATTR(gmem_ev_access,                    0x177),
-       ARM_CSPMU_EVENT_ATTR(gmem_ev_outstanding,               0x178),
        ARM_CSPMU_EVENT_ATTR(gmem_wr_data,                      0x179),
-       ARM_CSPMU_EVENT_ATTR(gmem_wr_outstanding,               0x17a),
        ARM_CSPMU_EVENT_ATTR(gmem_wr_access,                    0x17b),
 
        NV_CSPMU_EVENT_ATTR_4(socket, wr_data,                  0x17c),
 
-       NV_CSPMU_EVENT_ATTR_4(ocu, gmem_wr_data,                0x180),
-       NV_CSPMU_EVENT_ATTR_4(ocu, gmem_wb_data,                0x184),
-       NV_CSPMU_EVENT_ATTR_4(ocu, gmem_wr_access,              0x188),
-       NV_CSPMU_EVENT_ATTR_4(ocu, gmem_wb_outstanding,         0x18c),
-
-       NV_CSPMU_EVENT_ATTR_4(ocu, rem_wr_data,                 0x190),
-       NV_CSPMU_EVENT_ATTR_4(ocu, rem_wb_data,                 0x194),
-       NV_CSPMU_EVENT_ATTR_4(ocu, rem_wr_access,               0x198),
-       NV_CSPMU_EVENT_ATTR_4(ocu, rem_wb_outstanding,          0x19c),
-
        ARM_CSPMU_EVENT_ATTR(gmem_wr_total_bytes,               0x1a0),
        ARM_CSPMU_EVENT_ATTR(remote_socket_wr_total_bytes,      0x1a1),
        ARM_CSPMU_EVENT_ATTR(remote_socket_rd_data,             0x1a2),
@@ -122,35 +81,12 @@ static struct attribute *scf_pmu_event_attrs[] = {
        ARM_CSPMU_EVENT_ATTR(cmem_rd_data,                      0x1a5),
        ARM_CSPMU_EVENT_ATTR(cmem_rd_access,                    0x1a6),
        ARM_CSPMU_EVENT_ATTR(cmem_rd_outstanding,               0x1a7),
-       ARM_CSPMU_EVENT_ATTR(cmem_dl_rsp,                       0x1a8),
-       ARM_CSPMU_EVENT_ATTR(cmem_dl_access,                    0x1a9),
-       ARM_CSPMU_EVENT_ATTR(cmem_dl_outstanding,               0x1aa),
        ARM_CSPMU_EVENT_ATTR(cmem_wb_data,                      0x1ab),
        ARM_CSPMU_EVENT_ATTR(cmem_wb_access,                    0x1ac),
-       ARM_CSPMU_EVENT_ATTR(cmem_wb_outstanding,               0x1ad),
-       ARM_CSPMU_EVENT_ATTR(cmem_ev_rsp,                       0x1ae),
-       ARM_CSPMU_EVENT_ATTR(cmem_ev_access,                    0x1af),
-       ARM_CSPMU_EVENT_ATTR(cmem_ev_outstanding,               0x1b0),
        ARM_CSPMU_EVENT_ATTR(cmem_wr_data,                      0x1b1),
-       ARM_CSPMU_EVENT_ATTR(cmem_wr_outstanding,               0x1b2),
-
-       NV_CSPMU_EVENT_ATTR_4(ocu, cmem_rd_data,                0x1b3),
-       NV_CSPMU_EVENT_ATTR_4(ocu, cmem_rd_access,              0x1b7),
-       NV_CSPMU_EVENT_ATTR_4(ocu, cmem_wb_access,              0x1bb),
-       NV_CSPMU_EVENT_ATTR_4(ocu, cmem_rd_outstanding,         0x1bf),
-       NV_CSPMU_EVENT_ATTR_4(ocu, cmem_wr_outstanding,         0x1c3),
-
-       ARM_CSPMU_EVENT_ATTR(ocu_prb_access,                    0x1c7),
-       ARM_CSPMU_EVENT_ATTR(ocu_prb_data,                      0x1c8),
-       ARM_CSPMU_EVENT_ATTR(ocu_prb_outstanding,               0x1c9),
 
        ARM_CSPMU_EVENT_ATTR(cmem_wr_access,                    0x1ca),
 
-       NV_CSPMU_EVENT_ATTR_4(ocu, cmem_wr_access,              0x1cb),
-       NV_CSPMU_EVENT_ATTR_4(ocu, cmem_wb_data,                0x1cf),
-       NV_CSPMU_EVENT_ATTR_4(ocu, cmem_wr_data,                0x1d3),
-       NV_CSPMU_EVENT_ATTR_4(ocu, cmem_wb_outstanding,         0x1d7),
-
        ARM_CSPMU_EVENT_ATTR(cmem_wr_total_bytes,               0x1db),
 
        ARM_CSPMU_EVENT_ATTR(cycles, ARM_CSPMU_EVT_CYCLES_DEFAULT),