Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01dd9582 authored by Huang Ying's avatar Huang Ying Committed by Herbert Xu
Browse files

crypto: ghash-intel - Fix irq_fpu_usable usage 



When renaming kernel_fpu_using to irq_fpu_usable, the semantics of the
function is changed too, from mesuring whether kernel is using FPU,
that is, the FPU is NOT available, to measuring whether FPU is usable,
that is, the FPU is available.

But the usage of irq_fpu_usable in ghash-clmulni-intel_glue.c is not
changed accordingly. This patch fixes this.

Signed-off-by: default avatarHuang Ying <ying.huang@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 3b0d6596

arch/x86/crypto/ghash-clmulni-intel_glue.c

+4 −4
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static int ghash_async_init(struct ahash_request *req) 
	struct ahash_request *cryptd_req = ahash_request_ctx(req);

	struct cryptd_ahash *cryptd_tfm = ctx->cryptd_tfm;



	if (irq_fpu_usable()) {

	if (!irq_fpu_usable()) {

		memcpy(cryptd_req, req, sizeof(*req));

		ahash_request_set_tfm(cryptd_req, &cryptd_tfm->base);

		return crypto_ahash_init(cryptd_req);
@@ -177,7 +177,7 @@ static int ghash_async_update(struct ahash_request *req) 
{

	struct ahash_request *cryptd_req = ahash_request_ctx(req);



	if (irq_fpu_usable()) {

	if (!irq_fpu_usable()) {

		struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);

		struct ghash_async_ctx *ctx = crypto_ahash_ctx(tfm);

		struct cryptd_ahash *cryptd_tfm = ctx->cryptd_tfm;
@@ -195,7 +195,7 @@ static int ghash_async_final(struct ahash_request *req) 
{

	struct ahash_request *cryptd_req = ahash_request_ctx(req);



	if (irq_fpu_usable()) {

	if (!irq_fpu_usable()) {

		struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);

		struct ghash_async_ctx *ctx = crypto_ahash_ctx(tfm);

		struct cryptd_ahash *cryptd_tfm = ctx->cryptd_tfm;
@@ -216,7 +216,7 @@ static int ghash_async_digest(struct ahash_request *req) 
	struct ahash_request *cryptd_req = ahash_request_ctx(req);

	struct cryptd_ahash *cryptd_tfm = ctx->cryptd_tfm;



	if (irq_fpu_usable()) {

	if (!irq_fpu_usable()) {

		memcpy(cryptd_req, req, sizeof(*req));

		ahash_request_set_tfm(cryptd_req, &cryptd_tfm->base);

		return crypto_ahash_digest(cryptd_req);