package/kernel/mac80211/patches/ath11k/0016-wifi-ath11k-Make-QMI-message-rules-const.patch

   1 From 93c1592889fca46d09d833455628bab05516cdbf Mon Sep 17 00:00:00 2001
   2 From: Jeff Johnson <quic_jjohnson@quicinc.com>
   3 Date: Wed, 14 Sep 2022 17:23:03 -0700
   4 Subject: [PATCH] wifi: ath11k: Make QMI message rules const
   5
   6 Commit ff6d365898d4 ("soc: qcom: qmi: use const for struct
   7 qmi_elem_info") allows QMI message encoding/decoding rules to be
   8 const, so do that for ath11k.
   9
  10 Compile tested only.
  11
  12 Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
  13 Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
  14 Link: https://lore.kernel.org/r/20220915002303.12206-1-quic_jjohnson@quicinc.com
  15 ---
  16  drivers/net/wireless/ath/ath11k/qmi.c | 72 +++++++++++++--------------
  17  1 file changed, 36 insertions(+), 36 deletions(-)
  18
  19 --- a/drivers/net/wireless/ath/ath11k/qmi.c
  20 +++ b/drivers/net/wireless/ath/ath11k/qmi.c
  21 @@ -29,7 +29,7 @@ module_param_named(cold_boot_cal, ath11k
  22  MODULE_PARM_DESC(cold_boot_cal,
  23                  "Decrease the channel switch time but increase the driver load time (Default: true)");
  24
  25 -static struct qmi_elem_info qmi_wlanfw_host_cap_req_msg_v01_ei[] = {
  26 +static const struct qmi_elem_info qmi_wlanfw_host_cap_req_msg_v01_ei[] = {
  27         {
  28                 .data_type      = QMI_OPT_FLAG,
  29                 .elem_len       = 1,
  30 @@ -280,7 +280,7 @@ static struct qmi_elem_info qmi_wlanfw_h
  31         },
  32  };
  33
  34 -static struct qmi_elem_info qmi_wlanfw_host_cap_resp_msg_v01_ei[] = {
  35 +static const struct qmi_elem_info qmi_wlanfw_host_cap_resp_msg_v01_ei[] = {
  36         {
  37                 .data_type      = QMI_STRUCT,
  38                 .elem_len       = 1,
  39 @@ -297,7 +297,7 @@ static struct qmi_elem_info qmi_wlanfw_h
  40         },
  41  };
  42
  43 -static struct qmi_elem_info qmi_wlanfw_ind_register_req_msg_v01_ei[] = {
  44 +static const struct qmi_elem_info qmi_wlanfw_ind_register_req_msg_v01_ei[] = {
  45         {
  46                 .data_type      = QMI_OPT_FLAG,
  47                 .elem_len       = 1,
  48 @@ -522,7 +522,7 @@ static struct qmi_elem_info qmi_wlanfw_i
  49         },
  50  };
  51
  52 -static struct qmi_elem_info qmi_wlanfw_ind_register_resp_msg_v01_ei[] = {
  53 +static const struct qmi_elem_info qmi_wlanfw_ind_register_resp_msg_v01_ei[] = {
  54         {
  55                 .data_type      = QMI_STRUCT,
  56                 .elem_len       = 1,
  57 @@ -558,7 +558,7 @@ static struct qmi_elem_info qmi_wlanfw_i
  58         },
  59  };
  60
  61 -static struct qmi_elem_info qmi_wlanfw_mem_cfg_s_v01_ei[] = {
  62 +static const struct qmi_elem_info qmi_wlanfw_mem_cfg_s_v01_ei[] = {
  63         {
  64                 .data_type      = QMI_UNSIGNED_8_BYTE,
  65                 .elem_len       = 1,
  66 @@ -590,7 +590,7 @@ static struct qmi_elem_info qmi_wlanfw_m
  67         },
  68  };
  69
  70 -static struct qmi_elem_info qmi_wlanfw_mem_seg_s_v01_ei[] = {
  71 +static const struct qmi_elem_info qmi_wlanfw_mem_seg_s_v01_ei[] = {
  72         {
  73                 .data_type      = QMI_UNSIGNED_4_BYTE,
  74                 .elem_len       = 1,
  75 @@ -632,7 +632,7 @@ static struct qmi_elem_info qmi_wlanfw_m
  76         },
  77  };
  78
  79 -static struct qmi_elem_info qmi_wlanfw_request_mem_ind_msg_v01_ei[] = {
  80 +static const struct qmi_elem_info qmi_wlanfw_request_mem_ind_msg_v01_ei[] = {
  81         {
  82                 .data_type      = QMI_DATA_LEN,
  83                 .elem_len       = 1,
  84 @@ -659,7 +659,7 @@ static struct qmi_elem_info qmi_wlanfw_r
  85         },
  86  };
  87
  88 -static struct qmi_elem_info qmi_wlanfw_mem_seg_resp_s_v01_ei[] = {
  89 +static const struct qmi_elem_info qmi_wlanfw_mem_seg_resp_s_v01_ei[] = {
  90         {
  91                 .data_type      = QMI_UNSIGNED_8_BYTE,
  92                 .elem_len       = 1,
  93 @@ -699,7 +699,7 @@ static struct qmi_elem_info qmi_wlanfw_m
  94         },
  95  };
  96
  97 -static struct qmi_elem_info qmi_wlanfw_respond_mem_req_msg_v01_ei[] = {
  98 +static const struct qmi_elem_info qmi_wlanfw_respond_mem_req_msg_v01_ei[] = {
  99         {
 100                 .data_type      = QMI_DATA_LEN,
 101                 .elem_len       = 1,
 102 @@ -726,7 +726,7 @@ static struct qmi_elem_info qmi_wlanfw_r
 103         },
 104  };
 105
 106 -static struct qmi_elem_info qmi_wlanfw_respond_mem_resp_msg_v01_ei[] = {
 107 +static const struct qmi_elem_info qmi_wlanfw_respond_mem_resp_msg_v01_ei[] = {
 108         {
 109                 .data_type      = QMI_STRUCT,
 110                 .elem_len       = 1,
 111 @@ -744,7 +744,7 @@ static struct qmi_elem_info qmi_wlanfw_r
 112         },
 113  };
 114
 115 -static struct qmi_elem_info qmi_wlanfw_cap_req_msg_v01_ei[] = {
 116 +static const struct qmi_elem_info qmi_wlanfw_cap_req_msg_v01_ei[] = {
 117         {
 118                 .data_type      = QMI_EOTI,
 119                 .array_type     = NO_ARRAY,
 120 @@ -752,7 +752,7 @@ static struct qmi_elem_info qmi_wlanfw_c
 121         },
 122  };
 123
 124 -static struct qmi_elem_info qmi_wlanfw_device_info_req_msg_v01_ei[] = {
 125 +static const struct qmi_elem_info qmi_wlanfw_device_info_req_msg_v01_ei[] = {
 126         {
 127                 .data_type      = QMI_EOTI,
 128                 .array_type     = NO_ARRAY,
 129 @@ -760,7 +760,7 @@ static struct qmi_elem_info qmi_wlanfw_d
 130         },
 131  };
 132
 133 -static struct qmi_elem_info qmi_wlfw_device_info_resp_msg_v01_ei[] = {
 134 +static const struct qmi_elem_info qmi_wlfw_device_info_resp_msg_v01_ei[] = {
 135         {
 136                 .data_type      = QMI_STRUCT,
 137                 .elem_len       = 1,
 138 @@ -814,7 +814,7 @@ static struct qmi_elem_info qmi_wlfw_dev
 139         },
 140  };
 141
 142 -static struct qmi_elem_info qmi_wlanfw_rf_chip_info_s_v01_ei[] = {
 143 +static const struct qmi_elem_info qmi_wlanfw_rf_chip_info_s_v01_ei[] = {
 144         {
 145                 .data_type      = QMI_UNSIGNED_4_BYTE,
 146                 .elem_len       = 1,
 147 @@ -840,7 +840,7 @@ static struct qmi_elem_info qmi_wlanfw_r
 148         },
 149  };
 150
 151 -static struct qmi_elem_info qmi_wlanfw_rf_board_info_s_v01_ei[] = {
 152 +static const struct qmi_elem_info qmi_wlanfw_rf_board_info_s_v01_ei[] = {
 153         {
 154                 .data_type      = QMI_UNSIGNED_4_BYTE,
 155                 .elem_len       = 1,
 156 @@ -857,7 +857,7 @@ static struct qmi_elem_info qmi_wlanfw_r
 157         },
 158  };
 159
 160 -static struct qmi_elem_info qmi_wlanfw_soc_info_s_v01_ei[] = {
 161 +static const struct qmi_elem_info qmi_wlanfw_soc_info_s_v01_ei[] = {
 162         {
 163                 .data_type      = QMI_UNSIGNED_4_BYTE,
 164                 .elem_len       = 1,
 165 @@ -873,7 +873,7 @@ static struct qmi_elem_info qmi_wlanfw_s
 166         },
 167  };
 168
 169 -static struct qmi_elem_info qmi_wlanfw_fw_version_info_s_v01_ei[] = {
 170 +static const struct qmi_elem_info qmi_wlanfw_fw_version_info_s_v01_ei[] = {
 171         {
 172                 .data_type      = QMI_UNSIGNED_4_BYTE,
 173                 .elem_len       = 1,
 174 @@ -899,7 +899,7 @@ static struct qmi_elem_info qmi_wlanfw_f
 175         },
 176  };
 177
 178 -static struct qmi_elem_info qmi_wlanfw_cap_resp_msg_v01_ei[] = {
 179 +static const struct qmi_elem_info qmi_wlanfw_cap_resp_msg_v01_ei[] = {
 180         {
 181                 .data_type      = QMI_STRUCT,
 182                 .elem_len       = 1,
 183 @@ -1100,7 +1100,7 @@ static struct qmi_elem_info qmi_wlanfw_c
 184         },
 185  };
 186
 187 -static struct qmi_elem_info qmi_wlanfw_bdf_download_req_msg_v01_ei[] = {
 188 +static const struct qmi_elem_info qmi_wlanfw_bdf_download_req_msg_v01_ei[] = {
 189         {
 190                 .data_type      = QMI_UNSIGNED_1_BYTE,
 191                 .elem_len       = 1,
 192 @@ -1235,7 +1235,7 @@ static struct qmi_elem_info qmi_wlanfw_b
 193         },
 194  };
 195
 196 -static struct qmi_elem_info qmi_wlanfw_bdf_download_resp_msg_v01_ei[] = {
 197 +static const struct qmi_elem_info qmi_wlanfw_bdf_download_resp_msg_v01_ei[] = {
 198         {
 199                 .data_type      = QMI_STRUCT,
 200                 .elem_len       = 1,
 201 @@ -1253,7 +1253,7 @@ static struct qmi_elem_info qmi_wlanfw_b
 202         },
 203  };
 204
 205 -static struct qmi_elem_info qmi_wlanfw_m3_info_req_msg_v01_ei[] = {
 206 +static const struct qmi_elem_info qmi_wlanfw_m3_info_req_msg_v01_ei[] = {
 207         {
 208                 .data_type      = QMI_UNSIGNED_8_BYTE,
 209                 .elem_len       = 1,
 210 @@ -1277,7 +1277,7 @@ static struct qmi_elem_info qmi_wlanfw_m
 211         },
 212  };
 213
 214 -static struct qmi_elem_info qmi_wlanfw_m3_info_resp_msg_v01_ei[] = {
 215 +static const struct qmi_elem_info qmi_wlanfw_m3_info_resp_msg_v01_ei[] = {
 216         {
 217                 .data_type      = QMI_STRUCT,
 218                 .elem_len       = 1,
 219 @@ -1294,7 +1294,7 @@ static struct qmi_elem_info qmi_wlanfw_m
 220         },
 221  };
 222
 223 -static struct qmi_elem_info qmi_wlanfw_ce_tgt_pipe_cfg_s_v01_ei[] = {
 224 +static const struct qmi_elem_info qmi_wlanfw_ce_tgt_pipe_cfg_s_v01_ei[] = {
 225         {
 226                 .data_type      = QMI_UNSIGNED_4_BYTE,
 227                 .elem_len       = 1,
 228 @@ -1347,7 +1347,7 @@ static struct qmi_elem_info qmi_wlanfw_c
 229         },
 230  };
 231
 232 -static struct qmi_elem_info qmi_wlanfw_ce_svc_pipe_cfg_s_v01_ei[] = {
 233 +static const struct qmi_elem_info qmi_wlanfw_ce_svc_pipe_cfg_s_v01_ei[] = {
 234         {
 235                 .data_type      = QMI_UNSIGNED_4_BYTE,
 236                 .elem_len       = 1,
 237 @@ -1382,7 +1382,7 @@ static struct qmi_elem_info qmi_wlanfw_c
 238         },
 239  };
 240
 241 -static struct qmi_elem_info qmi_wlanfw_shadow_reg_cfg_s_v01_ei[] = {
 242 +static const struct qmi_elem_info qmi_wlanfw_shadow_reg_cfg_s_v01_ei[] = {
 243         {
 244                 .data_type      = QMI_UNSIGNED_2_BYTE,
 245                 .elem_len       = 1,
 246 @@ -1406,7 +1406,7 @@ static struct qmi_elem_info qmi_wlanfw_s
 247         },
 248  };
 249
 250 -static struct qmi_elem_info qmi_wlanfw_shadow_reg_v2_cfg_s_v01_ei[] = {
 251 +static const struct qmi_elem_info qmi_wlanfw_shadow_reg_v2_cfg_s_v01_ei[] = {
 252         {
 253                 .data_type      = QMI_UNSIGNED_4_BYTE,
 254                 .elem_len       = 1,
 255 @@ -1423,7 +1423,7 @@ static struct qmi_elem_info qmi_wlanfw_s
 256         },
 257  };
 258
 259 -static struct qmi_elem_info qmi_wlanfw_wlan_mode_req_msg_v01_ei[] = {
 260 +static const struct qmi_elem_info qmi_wlanfw_wlan_mode_req_msg_v01_ei[] = {
 261         {
 262                 .data_type      = QMI_UNSIGNED_4_BYTE,
 263                 .elem_len       = 1,
 264 @@ -1458,7 +1458,7 @@ static struct qmi_elem_info qmi_wlanfw_w
 265         },
 266  };
 267
 268 -static struct qmi_elem_info qmi_wlanfw_wlan_mode_resp_msg_v01_ei[] = {
 269 +static const struct qmi_elem_info qmi_wlanfw_wlan_mode_resp_msg_v01_ei[] = {
 270         {
 271                 .data_type      = QMI_STRUCT,
 272                 .elem_len       = 1,
 273 @@ -1476,7 +1476,7 @@ static struct qmi_elem_info qmi_wlanfw_w
 274         },
 275  };
 276
 277 -static struct qmi_elem_info qmi_wlanfw_wlan_cfg_req_msg_v01_ei[] = {
 278 +static const struct qmi_elem_info qmi_wlanfw_wlan_cfg_req_msg_v01_ei[] = {
 279         {
 280                 .data_type      = QMI_OPT_FLAG,
 281                 .elem_len       = 1,
 282 @@ -1615,7 +1615,7 @@ static struct qmi_elem_info qmi_wlanfw_w
 283         },
 284  };
 285
 286 -static struct qmi_elem_info qmi_wlanfw_wlan_cfg_resp_msg_v01_ei[] = {
 287 +static const struct qmi_elem_info qmi_wlanfw_wlan_cfg_resp_msg_v01_ei[] = {
 288         {
 289                 .data_type      = QMI_STRUCT,
 290                 .elem_len       = 1,
 291 @@ -1632,28 +1632,28 @@ static struct qmi_elem_info qmi_wlanfw_w
 292         },
 293  };
 294
 295 -static struct qmi_elem_info qmi_wlanfw_mem_ready_ind_msg_v01_ei[] = {
 296 +static const struct qmi_elem_info qmi_wlanfw_mem_ready_ind_msg_v01_ei[] = {
 297         {
 298                 .data_type = QMI_EOTI,
 299                 .array_type = NO_ARRAY,
 300         },
 301  };
 302
 303 -static struct qmi_elem_info qmi_wlanfw_fw_ready_ind_msg_v01_ei[] = {
 304 +static const struct qmi_elem_info qmi_wlanfw_fw_ready_ind_msg_v01_ei[] = {
 305         {
 306                 .data_type = QMI_EOTI,
 307                 .array_type = NO_ARRAY,
 308         },
 309  };
 310
 311 -static struct qmi_elem_info qmi_wlanfw_cold_boot_cal_done_ind_msg_v01_ei[] = {
 312 +static const struct qmi_elem_info qmi_wlanfw_cold_boot_cal_done_ind_msg_v01_ei[] = {
 313         {
 314                 .data_type = QMI_EOTI,
 315                 .array_type = NO_ARRAY,
 316         },
 317  };
 318
 319 -static struct qmi_elem_info qmi_wlanfw_wlan_ini_req_msg_v01_ei[] = {
 320 +static const struct qmi_elem_info qmi_wlanfw_wlan_ini_req_msg_v01_ei[] = {
 321         {
 322                 .data_type      = QMI_OPT_FLAG,
 323                 .elem_len       = 1,
 324 @@ -1679,7 +1679,7 @@ static struct qmi_elem_info qmi_wlanfw_w
 325         },
 326  };
 327
 328 -static struct qmi_elem_info qmi_wlanfw_wlan_ini_resp_msg_v01_ei[] = {
 329 +static const struct qmi_elem_info qmi_wlanfw_wlan_ini_resp_msg_v01_ei[] = {
 330         {
 331                 .data_type      = QMI_STRUCT,
 332                 .elem_len       = 1,
 333 @@ -1697,7 +1697,7 @@ static struct qmi_elem_info qmi_wlanfw_w
 334         },
 335  };
 336
 337 -static struct qmi_elem_info qmi_wlfw_fw_init_done_ind_msg_v01_ei[] = {
 338 +static const struct qmi_elem_info qmi_wlfw_fw_init_done_ind_msg_v01_ei[] = {
 339         {
 340                 .data_type = QMI_EOTI,
 341                 .array_type = NO_ARRAY,