Commit c5af0cd0 authored by Jie Wang's avatar Jie Wang Committed by Aichun Shi
Browse files

crypto: qat - move fw config related structures 

mainline inclusion
from mainline-v6.8-rc1
commit 98a4f29fba0ffc1f1b026d9cb717fbe7edd66ffe
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I9A5BW
CVE: N/A
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=98a4f29fba0ffc1f1b026d9cb717fbe7edd66ffe



-------------------------------------

Relocate the structures adf_fw_objs and adf_fw_config from the file
adf_4xxx_hw_data.c to the newly created adf_fw_config.h.

These structures will be used by new device drivers.

This does not introduce any functional change.

Intel-SIG: commit 98a4f29fba0f crypto: qat - move fw config related structures
Backport to support QAT in-tree driver

Signed-off-by: default avatarJie Wang <jie.wang@intel.com>
Reviewed-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
[ Aichun Shi: amend commit log ]
Signed-off-by: default avatarAichun Shi <aichun.shi@intel.com>
parent ae3b23ab

drivers/crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c

+1 −12
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <adf_cfg_services.h>

#include <adf_clock.h>

#include <adf_common_drv.h>

#include <adf_fw_config.h>

#include <adf_gen4_config.h>

#include <adf_gen4_dc.h>

#include <adf_gen4_hw_data.h>
@@ -21,13 +22,6 @@ 
#define ADF_AE_GROUP_1		GENMASK(7, 4)

#define ADF_AE_GROUP_2		BIT(8)



enum adf_fw_objs {

	ADF_FW_SYM_OBJ,

	ADF_FW_ASYM_OBJ,

	ADF_FW_DC_OBJ,

	ADF_FW_ADMIN_OBJ,

};



static const char * const adf_4xxx_fw_objs[] = {

	[ADF_FW_SYM_OBJ] =  ADF_4XXX_SYM_OBJ,

	[ADF_FW_ASYM_OBJ] =  ADF_4XXX_ASYM_OBJ,
@@ -42,11 +36,6 @@ static const char * const adf_402xx_fw_objs[] = { 
	[ADF_FW_ADMIN_OBJ] = ADF_402XX_ADMIN_OBJ,

};



struct adf_fw_config {

	u32 ae_mask;

	enum adf_fw_objs obj;

};



static const struct adf_fw_config adf_fw_cy_config[] = {

	{ADF_AE_GROUP_1, ADF_FW_SYM_OBJ},

	{ADF_AE_GROUP_0, ADF_FW_ASYM_OBJ},

drivers/crypto/intel/qat/qat_common/adf_fw_config.h

0 → 100644
+18 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/* Copyright(c) 2023 Intel Corporation */

#ifndef ADF_FW_CONFIG_H_

#define ADF_FW_CONFIG_H_



enum adf_fw_objs {

	ADF_FW_SYM_OBJ,

	ADF_FW_ASYM_OBJ,

	ADF_FW_DC_OBJ,

	ADF_FW_ADMIN_OBJ,

};



struct adf_fw_config {

	u32 ae_mask;

	enum adf_fw_objs obj;

};



#endif