Commit 2b60f79c authored by Shashank Gupta's avatar Shashank Gupta Committed by Herbert Xu
Browse files

crypto: qat - replace state machine calls 



The device state machine functions are unsafe and interdependent on each
other. To perform a state transition, these shall be called in a
specific order:
  * device up:   adf_dev_init() -> adf_dev_start()
  * device down: adf_dev_stop() -> adf_dev_shutdown()

Replace all the state machine functions used in the QAT driver with the
safe wrappers adf_dev_up() and adf_dev_down().

Signed-off-by: default avatarShashank Gupta <shashank.gupta@intel.com>
Reviewed-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 1bdc8555

drivers/crypto/qat/qat_4xxx/adf_drv.c

+3 −14
Original line number Diff line number Diff line
@@ -411,15 +411,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto out_err_disable_aer;

	}



	ret = hw_data->dev_config(accel_dev);

	if (ret)

		goto out_err_disable_aer;



	ret = adf_dev_init(accel_dev);

	if (ret)

		goto out_err_dev_shutdown;



	ret = adf_dev_start(accel_dev);

	ret = adf_dev_up(accel_dev, true);

	if (ret)

		goto out_err_dev_stop;
@@ -430,9 +422,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	return ret;



out_err_dev_stop:

	adf_dev_stop(accel_dev);

out_err_dev_shutdown:

	adf_dev_shutdown(accel_dev);

	adf_dev_down(accel_dev, false);

out_err_disable_aer:

	adf_disable_aer(accel_dev);

out_err:
@@ -448,8 +438,7 @@ static void adf_remove(struct pci_dev *pdev) 
		pr_err("QAT: Driver removal failed\n");

		return;

	}

	adf_dev_stop(accel_dev);

	adf_dev_shutdown(accel_dev);

	adf_dev_down(accel_dev, false);

	adf_disable_aer(accel_dev);

	adf_cleanup_accel(accel_dev);

}

drivers/crypto/qat/qat_c3xxx/adf_drv.c

+3 −14
Original line number Diff line number Diff line
@@ -201,24 +201,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto out_err_disable_aer;

	}



	ret = hw_data->dev_config(accel_dev);

	if (ret)

		goto out_err_disable_aer;



	ret = adf_dev_init(accel_dev);

	if (ret)

		goto out_err_dev_shutdown;



	ret = adf_dev_start(accel_dev);

	ret = adf_dev_up(accel_dev, true);

	if (ret)

		goto out_err_dev_stop;



	return ret;



out_err_dev_stop:

	adf_dev_stop(accel_dev);

out_err_dev_shutdown:

	adf_dev_shutdown(accel_dev);

	adf_dev_down(accel_dev, false);

out_err_disable_aer:

	adf_disable_aer(accel_dev);

out_err_free_reg:
@@ -239,8 +229,7 @@ static void adf_remove(struct pci_dev *pdev) 
		pr_err("QAT: Driver removal failed\n");

		return;

	}

	adf_dev_stop(accel_dev);

	adf_dev_shutdown(accel_dev);

	adf_dev_down(accel_dev, false);

	adf_disable_aer(accel_dev);

	adf_cleanup_accel(accel_dev);

	adf_cleanup_pci_dev(accel_dev);

drivers/crypto/qat/qat_c3xxxvf/adf_drv.c

+3 −10
Original line number Diff line number Diff line
@@ -173,20 +173,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* Completion for VF2PF request/response message exchange */

	init_completion(&accel_dev->vf.msg_received);



	ret = adf_dev_init(accel_dev);

	if (ret)

		goto out_err_dev_shutdown;



	ret = adf_dev_start(accel_dev);

	ret = adf_dev_up(accel_dev, false);

	if (ret)

		goto out_err_dev_stop;



	return ret;



out_err_dev_stop:

	adf_dev_stop(accel_dev);

out_err_dev_shutdown:

	adf_dev_shutdown(accel_dev);

	adf_dev_down(accel_dev, false);

out_err_free_reg:

	pci_release_regions(accel_pci_dev->pci_dev);

out_err_disable:
@@ -206,8 +200,7 @@ static void adf_remove(struct pci_dev *pdev) 
		return;

	}

	adf_flush_vf_wq(accel_dev);

	adf_dev_stop(accel_dev);

	adf_dev_shutdown(accel_dev);

	adf_dev_down(accel_dev, false);

	adf_cleanup_accel(accel_dev);

	adf_cleanup_pci_dev(accel_dev);

	kfree(accel_dev);

drivers/crypto/qat/qat_c62x/adf_drv.c

+3 −14
Original line number Diff line number Diff line
@@ -201,24 +201,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto out_err_disable_aer;

	}



	ret = hw_data->dev_config(accel_dev);

	if (ret)

		goto out_err_disable_aer;



	ret = adf_dev_init(accel_dev);

	if (ret)

		goto out_err_dev_shutdown;



	ret = adf_dev_start(accel_dev);

	ret = adf_dev_up(accel_dev, true);

	if (ret)

		goto out_err_dev_stop;



	return ret;



out_err_dev_stop:

	adf_dev_stop(accel_dev);

out_err_dev_shutdown:

	adf_dev_shutdown(accel_dev);

	adf_dev_down(accel_dev, false);

out_err_disable_aer:

	adf_disable_aer(accel_dev);

out_err_free_reg:
@@ -239,8 +229,7 @@ static void adf_remove(struct pci_dev *pdev) 
		pr_err("QAT: Driver removal failed\n");

		return;

	}

	adf_dev_stop(accel_dev);

	adf_dev_shutdown(accel_dev);

	adf_dev_down(accel_dev, false);

	adf_disable_aer(accel_dev);

	adf_cleanup_accel(accel_dev);

	adf_cleanup_pci_dev(accel_dev);

drivers/crypto/qat/qat_c62xvf/adf_drv.c

+3 −10
Original line number Diff line number Diff line
@@ -173,20 +173,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* Completion for VF2PF request/response message exchange */

	init_completion(&accel_dev->vf.msg_received);



	ret = adf_dev_init(accel_dev);

	if (ret)

		goto out_err_dev_shutdown;



	ret = adf_dev_start(accel_dev);

	ret = adf_dev_up(accel_dev, false);

	if (ret)

		goto out_err_dev_stop;



	return ret;



out_err_dev_stop:

	adf_dev_stop(accel_dev);

out_err_dev_shutdown:

	adf_dev_shutdown(accel_dev);

	adf_dev_down(accel_dev, false);

out_err_free_reg:

	pci_release_regions(accel_pci_dev->pci_dev);

out_err_disable:
@@ -206,8 +200,7 @@ static void adf_remove(struct pci_dev *pdev) 
		return;

	}

	adf_flush_vf_wq(accel_dev);

	adf_dev_stop(accel_dev);

	adf_dev_shutdown(accel_dev);

	adf_dev_down(accel_dev, false);

	adf_cleanup_accel(accel_dev);

	adf_cleanup_pci_dev(accel_dev);

	kfree(accel_dev);