Commit f3bda3b9 authored by Suman Kumar Chakraborty's avatar Suman Kumar Chakraborty Committed by Herbert Xu
Browse files

crypto: qat - introduce fuse array 



Change the representation of fuses in the accelerator device
structure from a single value to an array.

This allows the structure to accommodate additional fuses that
are required for future generations of QAT hardware.

This does not introduce any functional changes.

Signed-off-by: default avatarSuman Kumar Chakraborty <suman.kumar.chakraborty@intel.com>
Reviewed-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 7450ebd2

drivers/crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static struct adf_hw_device_class adf_420xx_class = { 


static u32 get_ae_mask(struct adf_hw_device_data *self)

{

	u32 me_disable = self->fuses;

	u32 me_disable = self->fuses[ADF_FUSECTL4];



	return ~me_disable & ADF_420XX_ACCELENGINES_MASK;

}

drivers/crypto/intel/qat/qat_420xx/adf_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	adf_init_hw_data_420xx(accel_dev->hw_device, ent->device);



	pci_read_config_byte(pdev, PCI_REVISION_ID, &accel_pci_dev->revid);

	pci_read_config_dword(pdev, ADF_GEN4_FUSECTL4_OFFSET, &hw_data->fuses);

	pci_read_config_dword(pdev, ADF_GEN4_FUSECTL4_OFFSET, &hw_data->fuses[ADF_FUSECTL4]);



	/* Get Accelerators and Accelerators Engines masks */

	hw_data->accel_mask = hw_data->get_accel_mask(hw_data);

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

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static struct adf_hw_device_class adf_4xxx_class = { 


static u32 get_ae_mask(struct adf_hw_device_data *self)

{

	u32 me_disable = self->fuses;

	u32 me_disable = self->fuses[ADF_FUSECTL4];



	return ~me_disable & ADF_4XXX_ACCELENGINES_MASK;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	adf_init_hw_data_4xxx(accel_dev->hw_device, ent->device);



	pci_read_config_byte(pdev, PCI_REVISION_ID, &accel_pci_dev->revid);

	pci_read_config_dword(pdev, ADF_GEN4_FUSECTL4_OFFSET, &hw_data->fuses);

	pci_read_config_dword(pdev, ADF_GEN4_FUSECTL4_OFFSET, &hw_data->fuses[ADF_FUSECTL4]);



	/* Get Accelerators and Accelerators Engines masks */

	hw_data->accel_mask = hw_data->get_accel_mask(hw_data);

drivers/crypto/intel/qat/qat_c3xxx/adf_c3xxx_hw_data.c

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ static struct adf_hw_device_class c3xxx_class = { 


static u32 get_accel_mask(struct adf_hw_device_data *self)

{

	u32 fuses = self->fuses[ADF_FUSECTL0];

	u32 straps = self->straps;

	u32 fuses = self->fuses;

	u32 accel;



	accel = ~(fuses | straps) >> ADF_C3XXX_ACCELERATORS_REG_OFFSET;
@@ -39,8 +39,8 @@ static u32 get_accel_mask(struct adf_hw_device_data *self) 


static u32 get_ae_mask(struct adf_hw_device_data *self)

{

	u32 fuses = self->fuses[ADF_FUSECTL0];

	u32 straps = self->straps;

	u32 fuses = self->fuses;

	unsigned long disabled;

	u32 ae_disable;

	int accel;