Commit 2bfd2276 authored by Wojciech Ziemba's avatar Wojciech Ziemba Committed by Herbert Xu
Browse files

crypto: qat - replace user types with kernel u types 



Kernel source code should not include stdint.h types.
This patch replaces uintXX_t types with respective ones defined in kernel
headers.

Signed-off-by: default avatarWojciech Ziemba <wojciech.ziemba@intel.com>
Signed-off-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 060ce503

drivers/crypto/qat/qat_common/adf_accel_devices.h

+27 −27
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ struct adf_accel_pci { 
	struct pci_dev *pci_dev;

	struct adf_accel_msix msix_entries;

	struct adf_bar pci_bars[ADF_PCI_MAX_BARS];

	uint8_t revid;

	uint8_t sku;

	u8 revid;

	u8 sku;

} __packed;



enum dev_state {
@@ -100,7 +100,7 @@ static inline const char *get_sku_info(enum dev_sku_info info) 
struct adf_hw_device_class {

	const char *name;

	const enum adf_device_type type;

	uint32_t instances;

	u32 instances;

} __packed;



struct adf_cfg_device_data;
@@ -110,15 +110,15 @@ struct adf_etr_ring_data; 


struct adf_hw_device_data {

	struct adf_hw_device_class *dev_class;

	uint32_t (*get_accel_mask)(uint32_t fuse);

	uint32_t (*get_ae_mask)(uint32_t fuse);

	uint32_t (*get_sram_bar_id)(struct adf_hw_device_data *self);

	uint32_t (*get_misc_bar_id)(struct adf_hw_device_data *self);

	uint32_t (*get_etr_bar_id)(struct adf_hw_device_data *self);

	uint32_t (*get_num_aes)(struct adf_hw_device_data *self);

	uint32_t (*get_num_accels)(struct adf_hw_device_data *self);

	uint32_t (*get_pf2vf_offset)(uint32_t i);

	uint32_t (*get_vintmsk_offset)(uint32_t i);

	u32 (*get_accel_mask)(u32 fuse);

	u32 (*get_ae_mask)(u32 fuse);

	u32 (*get_sram_bar_id)(struct adf_hw_device_data *self);

	u32 (*get_misc_bar_id)(struct adf_hw_device_data *self);

	u32 (*get_etr_bar_id)(struct adf_hw_device_data *self);

	u32 (*get_num_aes)(struct adf_hw_device_data *self);

	u32 (*get_num_accels)(struct adf_hw_device_data *self);

	u32 (*get_pf2vf_offset)(u32 i);

	u32 (*get_vintmsk_offset)(u32 i);

	enum dev_sku_info (*get_sku)(struct adf_hw_device_data *self);

	int (*alloc_irq)(struct adf_accel_dev *accel_dev);

	void (*free_irq)(struct adf_accel_dev *accel_dev);
@@ -129,25 +129,25 @@ struct adf_hw_device_data { 
	int (*init_arb)(struct adf_accel_dev *accel_dev);

	void (*exit_arb)(struct adf_accel_dev *accel_dev);

	void (*get_arb_mapping)(struct adf_accel_dev *accel_dev,

				const uint32_t **cfg);

				const u32 **cfg);

	void (*disable_iov)(struct adf_accel_dev *accel_dev);

	void (*enable_ints)(struct adf_accel_dev *accel_dev);

	int (*enable_vf2pf_comms)(struct adf_accel_dev *accel_dev);

	void (*reset_device)(struct adf_accel_dev *accel_dev);

	const char *fw_name;

	const char *fw_mmp_name;

	uint32_t fuses;

	uint32_t accel_capabilities_mask;

	uint32_t instance_id;

	uint16_t accel_mask;

	uint16_t ae_mask;

	uint16_t tx_rings_mask;

	uint8_t tx_rx_gap;

	uint8_t num_banks;

	uint8_t num_accel;

	uint8_t num_logical_accel;

	uint8_t num_engines;

	uint8_t min_iov_compat_ver;

	u32 fuses;

	u32 accel_capabilities_mask;

	u32 instance_id;

	u16 accel_mask;

	u16 ae_mask;

	u16 tx_rings_mask;

	u8 tx_rx_gap;

	u8 num_banks;

	u8 num_accel;

	u8 num_logical_accel;

	u8 num_engines;

	u8 min_iov_compat_ver;

} __packed;



/* CSR write macro */
@@ -204,8 +204,8 @@ struct adf_accel_dev { 
			struct tasklet_struct pf2vf_bh_tasklet;

			struct mutex vf2pf_lock; /* protect CSR access */

			struct completion iov_msg_completion;

			uint8_t compatible;

			uint8_t pf_version;

			u8 compatible;

			u8 pf_version;

		} vf;

	};

	bool is_vf;

drivers/crypto/qat/qat_common/adf_accel_engine.c

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ int adf_ae_start(struct adf_accel_dev *accel_dev) 
{

	struct adf_fw_loader_data *loader_data = accel_dev->fw_loader;

	struct adf_hw_device_data *hw_data = accel_dev->hw_device;

	uint32_t ae_ctr, ae, max_aes = GET_MAX_ACCELENGINES(accel_dev);

	u32 ae_ctr, ae, max_aes = GET_MAX_ACCELENGINES(accel_dev);



	if (!hw_data->fw_name)

		return 0;
@@ -95,7 +95,7 @@ int adf_ae_stop(struct adf_accel_dev *accel_dev) 
{

	struct adf_fw_loader_data *loader_data = accel_dev->fw_loader;

	struct adf_hw_device_data *hw_data = accel_dev->hw_device;

	uint32_t ae_ctr, ae, max_aes = GET_MAX_ACCELENGINES(accel_dev);

	u32 ae_ctr, ae, max_aes = GET_MAX_ACCELENGINES(accel_dev);



	if (!hw_data->fw_name)

		return 0;

drivers/crypto/qat/qat_common/adf_aer.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ void adf_reset_sbr(struct adf_accel_dev *accel_dev) 
{

	struct pci_dev *pdev = accel_to_pci_dev(accel_dev);

	struct pci_dev *parent = pdev->bus->self;

	uint16_t bridge_ctl = 0;

	u16 bridge_ctl = 0;



	if (!parent)

		parent = pdev;

drivers/crypto/qat/qat_common/adf_common_drv.h

+6 −6
Original line number Diff line number Diff line
@@ -79,11 +79,11 @@ int adf_devmgr_add_dev(struct adf_accel_dev *accel_dev, 
void adf_devmgr_rm_dev(struct adf_accel_dev *accel_dev,

		       struct adf_accel_dev *pf);

struct list_head *adf_devmgr_get_head(void);

struct adf_accel_dev *adf_devmgr_get_dev_by_id(uint32_t id);

struct adf_accel_dev *adf_devmgr_get_dev_by_id(u32 id);

struct adf_accel_dev *adf_devmgr_get_first(void);

struct adf_accel_dev *adf_devmgr_pci_to_accel_dev(struct pci_dev *pci_dev);

int adf_devmgr_verify_id(uint32_t id);

void adf_devmgr_get_num_dev(uint32_t *num);

int adf_devmgr_verify_id(u32 id);

void adf_devmgr_get_num_dev(u32 *num);

int adf_devmgr_in_reset(struct adf_accel_dev *accel_dev);

int adf_dev_started(struct adf_accel_dev *accel_dev);

int adf_dev_restarting_notify(struct adf_accel_dev *accel_dev);
@@ -154,7 +154,7 @@ void qat_hal_set_pc(struct icp_qat_fw_loader_handle *handle, 
		    unsigned char ae, unsigned int ctx_mask, unsigned int upc);

void qat_hal_wr_uwords(struct icp_qat_fw_loader_handle *handle,

		       unsigned char ae, unsigned int uaddr,

		       unsigned int words_num, uint64_t *uword);

		       unsigned int words_num, u64 *uword);

void qat_hal_wr_umem(struct icp_qat_fw_loader_handle *handle, unsigned char ae,

		     unsigned int uword_addr, unsigned int words_num,

		     unsigned int *data);
@@ -189,9 +189,9 @@ int qat_uclo_map_obj(struct icp_qat_fw_loader_handle *handle, 
int adf_sriov_configure(struct pci_dev *pdev, int numvfs);

void adf_disable_sriov(struct adf_accel_dev *accel_dev);

void adf_disable_vf2pf_interrupts(struct adf_accel_dev *accel_dev,

				  uint32_t vf_mask);

				  u32 vf_mask);

void adf_enable_vf2pf_interrupts(struct adf_accel_dev *accel_dev,

				 uint32_t vf_mask);

				 u32 vf_mask);

void adf_enable_pf2vf_interrupts(struct adf_accel_dev *accel_dev);

void adf_disable_pf2vf_interrupts(struct adf_accel_dev *accel_dev);

drivers/crypto/qat/qat_common/adf_ctl_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static int adf_ctl_is_device_in_use(int id) 
	return 0;

}



static void adf_ctl_stop_devices(uint32_t id)

static void adf_ctl_stop_devices(u32 id)

{

	struct adf_accel_dev *accel_dev;
@@ -330,7 +330,7 @@ out: 
static int adf_ctl_ioctl_get_num_devices(struct file *fp, unsigned int cmd,

					 unsigned long arg)

{

	uint32_t num_devices = 0;

	u32 num_devices = 0;



	adf_devmgr_get_num_dev(&num_devices);

	if (copy_to_user((void __user *)arg, &num_devices, sizeof(num_devices)))

CRA Git | Maintained and supported by SUSTech CRA and CCSE