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

Commit 5bc35703 authored by Dan Carpenter's avatar Dan Carpenter Committed by Herbert Xu
Browse files

crypto: tegra-aes - bitwise vs logical and 



The bug here is that:

	while (eng_busy & (!icq_empty) & dma_busy)

is never true because it's using bitwise instead of logical ANDs.  The
other bitwise AND conditions work as intended but I changed them as well
for consistency.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 393e661d

drivers/crypto/tegra-aes.c

+3 −3
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static int aes_start_crypt(struct tegra_aes_dev *dd, u32 in_addr, u32 out_addr, 
			value = aes_readl(dd, TEGRA_AES_INTR_STATUS);

			eng_busy = value & TEGRA_AES_ENGINE_BUSY_FIELD;

			icq_empty = value & TEGRA_AES_ICQ_EMPTY_FIELD;

		} while (eng_busy & (!icq_empty));

		} while (eng_busy && !icq_empty);

		aes_writel(dd, cmdq[i], TEGRA_AES_ICMDQUE_WR);

	}
@@ -365,7 +365,7 @@ static int aes_set_key(struct tegra_aes_dev *dd) 
		eng_busy = value & TEGRA_AES_ENGINE_BUSY_FIELD;

		icq_empty = value & TEGRA_AES_ICQ_EMPTY_FIELD;

		dma_busy = value & TEGRA_AES_DMA_BUSY_FIELD;

	} while (eng_busy & (!icq_empty) & dma_busy);

	} while (eng_busy && !icq_empty && dma_busy);



	/* settable command to get key into internal registers */

	value = CMD_SETTABLE << CMDQ_OPCODE_SHIFT |
@@ -379,7 +379,7 @@ static int aes_set_key(struct tegra_aes_dev *dd) 
		value = aes_readl(dd, TEGRA_AES_INTR_STATUS);

		eng_busy = value & TEGRA_AES_ENGINE_BUSY_FIELD;

		icq_empty = value & TEGRA_AES_ICQ_EMPTY_FIELD;

	} while (eng_busy & (!icq_empty));

	} while (eng_busy && !icq_empty);



	return 0;

}