Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

crypto: qat - relocate and rename get_service_enabled()

Move the function get_service_enabled() from adf_4xxx_hw_data.c to
adf_cfg_services.c and rename it as adf_get_service_enabled().
This function is not specific to the 4xxx and will be used by
other QAT drivers.

This does not introduce any functional change.

Signed-off-by: Jie Wang <jie.wang@intel.com>
Reviewed-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Jie Wang and committed by
Herbert Xu
4db87a5f dd61d373

+34 -26
+3 -26
drivers/crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c
··· 120 120 .instances = 0, 121 121 }; 122 122 123 - static int get_service_enabled(struct adf_accel_dev *accel_dev) 124 - { 125 - char services[ADF_CFG_MAX_VAL_LEN_IN_BYTES] = {0}; 126 - int ret; 127 - 128 - ret = adf_cfg_get_param_value(accel_dev, ADF_GENERAL_SEC, 129 - ADF_SERVICES_ENABLED, services); 130 - if (ret) { 131 - dev_err(&GET_DEV(accel_dev), 132 - ADF_SERVICES_ENABLED " param not found\n"); 133 - return ret; 134 - } 135 - 136 - ret = match_string(adf_cfg_services, ARRAY_SIZE(adf_cfg_services), 137 - services); 138 - if (ret < 0) 139 - dev_err(&GET_DEV(accel_dev), 140 - "Invalid value of " ADF_SERVICES_ENABLED " param: %s\n", 141 - services); 142 - 143 - return ret; 144 - } 145 - 146 123 static u32 get_accel_mask(struct adf_hw_device_data *self) 147 124 { 148 125 return ADF_4XXX_ACCELERATORS_MASK; ··· 252 275 capabilities_dc &= ~ICP_ACCEL_CAPABILITIES_CNV_INTEGRITY64; 253 276 } 254 277 255 - switch (get_service_enabled(accel_dev)) { 278 + switch (adf_get_service_enabled(accel_dev)) { 256 279 case SVC_CY: 257 280 case SVC_CY2: 258 281 return capabilities_sym | capabilities_asym; ··· 288 311 289 312 static const u32 *adf_get_arbiter_mapping(struct adf_accel_dev *accel_dev) 290 313 { 291 - switch (get_service_enabled(accel_dev)) { 314 + switch (adf_get_service_enabled(accel_dev)) { 292 315 case SVC_DC: 293 316 return thrd_to_arb_map_dc; 294 317 case SVC_DCC: ··· 397 420 398 421 static const struct adf_fw_config *get_fw_config(struct adf_accel_dev *accel_dev) 399 422 { 400 - switch (get_service_enabled(accel_dev)) { 423 + switch (adf_get_service_enabled(accel_dev)) { 401 424 case SVC_CY: 402 425 case SVC_CY2: 403 426 return adf_fw_cy_config;
+27
drivers/crypto/intel/qat/qat_common/adf_cfg_services.c
··· 2 2 /* Copyright(c) 2023 Intel Corporation */ 3 3 4 4 #include <linux/export.h> 5 + #include <linux/pci.h> 6 + #include <linux/string.h> 7 + #include "adf_cfg.h" 5 8 #include "adf_cfg_services.h" 6 9 #include "adf_cfg_strings.h" 7 10 ··· 21 18 [SVC_SYM_DC] = ADF_CFG_SYM_DC, 22 19 }; 23 20 EXPORT_SYMBOL_GPL(adf_cfg_services); 21 + 22 + int adf_get_service_enabled(struct adf_accel_dev *accel_dev) 23 + { 24 + char services[ADF_CFG_MAX_VAL_LEN_IN_BYTES] = {0}; 25 + int ret; 26 + 27 + ret = adf_cfg_get_param_value(accel_dev, ADF_GENERAL_SEC, 28 + ADF_SERVICES_ENABLED, services); 29 + if (ret) { 30 + dev_err(&GET_DEV(accel_dev), 31 + ADF_SERVICES_ENABLED " param not found\n"); 32 + return ret; 33 + } 34 + 35 + ret = match_string(adf_cfg_services, ARRAY_SIZE(adf_cfg_services), 36 + services); 37 + if (ret < 0) 38 + dev_err(&GET_DEV(accel_dev), 39 + "Invalid value of " ADF_SERVICES_ENABLED " param: %s\n", 40 + services); 41 + 42 + return ret; 43 + } 44 + EXPORT_SYMBOL_GPL(adf_get_service_enabled);
+4
drivers/crypto/intel/qat/qat_common/adf_cfg_services.h
··· 5 5 6 6 #include "adf_cfg_strings.h" 7 7 8 + struct adf_accel_dev; 9 + 8 10 enum adf_services { 9 11 SVC_CY = 0, 10 12 SVC_CY2, ··· 22 20 }; 23 21 24 22 extern const char *const adf_cfg_services[SVC_COUNT]; 23 + 24 + int adf_get_service_enabled(struct adf_accel_dev *accel_dev); 25 25 26 26 #endif