drm/msm/a6xx: Update HFI definitions

Update the HFI definitions to support additional GMU based power
features.

Signed-off-by: Akhil P Oommen <akhilpo@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/714671/
Message-ID: <20260327-a8xx-gpu-batch2-v2-10-2b53c38d2101@oss.qualcomm.com>
Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_hfi.c b/drivers/gpu/drm/msm/adreno/a6xx_hfi.c
index 09b6bc464b47b8d7446e6fb42cd94f8ccbed8799..487c2736f2b3772d0878d8447e181cfe02959788 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_hfi.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_hfi.c
@@ -851,7 +851,6 @@ static int a6xx_hfi_feature_ctrl_msg(struct a6xx_gmu *gmu, u32 feature, u32 enab
        return a6xx_hfi_send_msg(gmu, HFI_H2F_FEATURE_CTRL, &msg, sizeof(msg), NULL, 0);
 }
 
-#define HFI_FEATURE_IFPC 9
 #define IFPC_LONG_HYST 0x1680
 
 static int a6xx_hfi_enable_ifpc(struct a6xx_gmu *gmu)
@@ -862,8 +861,6 @@ static int a6xx_hfi_enable_ifpc(struct a6xx_gmu *gmu)
        return a6xx_hfi_feature_ctrl_msg(gmu, HFI_FEATURE_IFPC, 1, IFPC_LONG_HYST);
 }
 
-#define HFI_FEATURE_ACD 12
-
 static int a6xx_hfi_enable_acd(struct a6xx_gmu *gmu)
 {
        struct a6xx_hfi_acd_table *acd_table = &gmu->acd_table;

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_hfi.h b/drivers/gpu/drm/msm/adreno/a6xx_hfi.h
index 217708b03f6f0816faa87d2f08e882e170dd1438..e10d32ce93e0c6730241ae5b3acade3011fb9c34 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_hfi.h
+++ b/drivers/gpu/drm/msm/adreno/a6xx_hfi.h
@@ -165,6 +165,42 @@ struct a6xx_hfi_acd_table {
        u32 data[16 * MAX_ACD_STRIDE];
 } __packed;
 
+#define CLX_DATA(irated, num_phases, clx_path, extd_intf) \
+       ((extd_intf << 29) |                              \
+        (clx_path << 28) |                               \
+        (num_phases << 22) |                             \
+        (irated << 16))
+
+struct a6xx_hfi_clx_domain_v2 {
+       /**
+        * @data: BITS[0:15]  Migration time
+        *        BITS[16:21] Current rating
+        *        BITS[22:27] Phases for domain
+        *        BITS[28:28] Path notification
+        *        BITS[29:31] Extra features
+        */
+       u32 data;
+       /** @clxt: CLX time in microseconds */
+       u32 clxt;
+       /** @clxh: CLH time in microseconds */
+       u32 clxh;
+       /** @urg_mode: Urgent HW throttle mode of operation */
+       u32 urg_mode;
+       /** @lkg_en: Enable leakage current estimate */
+       u32 lkg_en;
+       /** curr_budget: Current Budget */
+       u32 curr_budget;
+} __packed;
+
+#define HFI_H2F_MSG_CLX_TBL 8
+
+#define MAX_CLX_DOMAINS 2
+struct a6xx_hfi_clx_table_v2_cmd {
+       u32 hdr;
+       u32 version;
+       struct a6xx_hfi_clx_domain_v2 domain[MAX_CLX_DOMAINS];
+} __packed;
+
 #define HFI_H2F_MSG_START 10
 
 struct a6xx_hfi_msg_start {
@@ -176,6 +212,41 @@ struct a6xx_hfi_msg_start {
 struct a6xx_hfi_msg_feature_ctrl {
        u32 header;
        u32 feature;
+#define HFI_FEATURE_DCVS               0
+#define HFI_FEATURE_HWSCHED            1
+#define HFI_FEATURE_PREEMPTION         2
+#define HFI_FEATURE_CLOCKS_ON          3
+#define HFI_FEATURE_BUS_ON             4
+#define HFI_FEATURE_RAIL_ON            5
+#define HFI_FEATURE_HWCG               6
+#define HFI_FEATURE_LM                 7
+#define HFI_FEATURE_THROTTLE           8
+#define HFI_FEATURE_IFPC               9
+#define HFI_FEATURE_NAP                        10
+#define HFI_FEATURE_BCL                        11
+#define HFI_FEATURE_ACD                        12
+#define HFI_FEATURE_DIDT               13
+#define HFI_FEATURE_DEPRECATED         14
+#define HFI_FEATURE_CB                 15
+#define HFI_FEATURE_KPROF              16
+#define HFI_FEATURE_BAIL_OUT_TIMER     17
+#define HFI_FEATURE_GMU_STATS          18
+#define HFI_FEATURE_DBQ                        19
+#define HFI_FEATURE_MINBW              20
+#define HFI_FEATURE_CLX                        21
+#define HFI_FEATURE_LSR                        23
+#define HFI_FEATURE_LPAC               24
+#define HFI_FEATURE_HW_FENCE           25
+#define HFI_FEATURE_PERF_NORETAIN      26
+#define HFI_FEATURE_DMS                        27
+#define HFI_FEATURE_THERMAL            28
+#define HFI_FEATURE_AQE                        29
+#define HFI_FEATURE_TDCVS              30
+#define HFI_FEATURE_DCE                        31
+#define HFI_FEATURE_IFF_PCLX           32
+#define HFI_FEATURE_SOFT_RESET         0x10000001
+#define HFI_FEATURE_DCVS_PROFILE       0x10000002
+#define HFI_FEATURE_FAST_CTX_DESTROY   0x10000003
        u32 enable;
        u32 data;
 } __packed;
@@ -199,8 +270,17 @@ struct a6xx_hfi_table {
        u32 header;
        u32 version;
        u32 type;
-#define HFI_TABLE_BW_VOTE 0
-#define HFI_TABLE_GPU_PERF 1
+#define HFI_TABLE_BW_VOTE      0
+#define HFI_TABLE_GPU_PERF     1
+#define HFI_TABLE_DIDT         2
+#define HFI_TABLE_ACD          3
+#define HFI_TABLE_CLX_V1       4 /* Unused */
+#define HFI_TABLE_CLX_V2       5
+#define HFI_TABLE_THERM                6
+#define HFI_TABLE_DCVS         7
+#define HFI_TABLE_SYS_TIME     8
+#define HFI_TABLE_GMU_DCVS     9
+#define HFI_TABLE_LIMITS_MIT   10
        struct a6xx_hfi_table_entry entry[];
 } __packed;
 
@@ -226,4 +306,33 @@ struct a6xx_hfi_prep_slumber_cmd {
        u32 freq;
 } __packed;
 
+struct a6xx_hfi_limits_cfg {
+       u32 enable;
+       u32 msg_path;
+       u32 lkg_en;
+       /*
+        * BIT[0]: 0 = (static) throttle to fixed sid level
+        *         1 = (dynamic) throttle to sid level calculated by HW
+        * BIT[1]: 0 = Mx
+        *         1 = Bx
+        */
+       u32 mode;
+       u32 sid;
+       /* Mitigation time in microseconds */
+       u32 mit_time;
+       /* Max current in mA during mitigation */
+       u32 curr_limit;
+} __packed;
+
+struct a6xx_hfi_limits_tbl {
+       u8 feature_id;
+#define GMU_MIT_IFF  0
+#define GMU_MIT_PCLX 1
+       u8 domain;
+#define GMU_GX_DOMAIN 0
+#define GMU_MX_DOMAIN 1
+       u16 feature_rev;
+       struct a6xx_hfi_limits_cfg cfg;
+} __packed;
+
 #endif