Commit ad1332aa authored by Marco Chiappero's avatar Marco Chiappero Committed by Herbert Xu
Browse files

crypto: qat - add support for capability detection 



Add logic to detect device capabilities for c62x, c3xxx and dh895xcc.

Read fuses, straps and legfuses CSRs and build the device capabilities
mask. This will be used to understand if a certain service is supported
by a device.

This patch is based on earlier work done by Conor McLoughlin.

Signed-off-by: default avatarMarco Chiappero <marco.chiappero@intel.com>
Co-developed-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: default avatarWojciech Ziemba <wojciech.ziemba@intel.com>
Reviewed-by: default avatarFiona Trahe <fiona.trahe@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 369eb4aa

drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <adf_pf2vf_msg.h>

#include <adf_gen2_hw_data.h>

#include "adf_c3xxx_hw_data.h"

#include "icp_qat_hw.h"



/* Worker thread to service arbiter mappings based on dev SKUs */

static const u32 thrd_to_arb_map_6_me_sku[] = {
@@ -195,6 +196,7 @@ void adf_init_hw_data_c3xxx(struct adf_hw_device_data *hw_data) 
	hw_data->enable_error_correction = adf_enable_error_correction;

	hw_data->get_accel_mask = get_accel_mask;

	hw_data->get_ae_mask = get_ae_mask;

	hw_data->get_accel_cap = adf_gen2_get_accel_cap;

	hw_data->get_num_accels = get_num_accels;

	hw_data->get_num_aes = get_num_aes;

	hw_data->get_sram_bar_id = get_sram_bar_id;

drivers/crypto/qat/qat_c3xxx/adf_drv.c

+2 −3
Original line number Diff line number Diff line
@@ -177,9 +177,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto out_err_disable;

	}



	/* Read accelerator capabilities mask */

	pci_read_config_dword(pdev, ADF_DEVICE_LEGFUSE_OFFSET,

			      &hw_data->accel_capabilities_mask);

	/* Get accelerator capabilities mask */

	hw_data->accel_capabilities_mask = hw_data->get_accel_cap(accel_dev);



	/* Find and map all the device's BARS */

	i = 0;

drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <adf_pf2vf_msg.h>

#include <adf_gen2_hw_data.h>

#include "adf_c62x_hw_data.h"

#include "icp_qat_hw.h"



/* Worker thread to service arbiter mappings based on dev SKUs */

static const u32 thrd_to_arb_map_8_me_sku[] = {
@@ -205,6 +206,7 @@ void adf_init_hw_data_c62x(struct adf_hw_device_data *hw_data) 
	hw_data->enable_error_correction = adf_enable_error_correction;

	hw_data->get_accel_mask = get_accel_mask;

	hw_data->get_ae_mask = get_ae_mask;

	hw_data->get_accel_cap = adf_gen2_get_accel_cap;

	hw_data->get_num_accels = get_num_accels;

	hw_data->get_num_aes = get_num_aes;

	hw_data->get_sram_bar_id = get_sram_bar_id;

drivers/crypto/qat/qat_c62x/adf_drv.c

+2 −3
Original line number Diff line number Diff line
@@ -177,9 +177,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto out_err_disable;

	}



	/* Read accelerator capabilities mask */

	pci_read_config_dword(pdev, ADF_DEVICE_LEGFUSE_OFFSET,

			      &hw_data->accel_capabilities_mask);

	/* Get accelerator capabilities mask */

	hw_data->accel_capabilities_mask = hw_data->get_accel_cap(accel_dev);



	/* Find and map all the device's BARS */

	i = (hw_data->fuses & ADF_DEVICE_FUSECTL_MASK) ? 1 : 0;

drivers/crypto/qat/qat_common/adf_accel_devices.h

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ struct adf_hw_device_data { 
	struct adf_hw_device_class *dev_class;

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

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

	u32 (*get_accel_cap)(struct adf_accel_dev *accel_dev);

	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);