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

Commit 043ecc63 authored by Antoine Tenart's avatar Antoine Tenart Committed by Herbert Xu
Browse files

crypto: inside-secure - move the firmware to a better location 



This patch moves the firmware loaded by the Inside Secure SafeXcel
driver from /lib/firmware/ to /lib/firmware/inside-secure/eip197b/. This
prepares the driver for future patches which will support other
revisions of the EIP197 crypto engine as they'll have their own
firmwares.

To keep the compatibility of what was done, the old path is still
supported as a fallback for the EIP197b (currently the only one
supported by the driver that loads a firmware).

Signed-off-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e3fe0ae1

drivers/crypto/inside-secure/safexcel.c

+12 −6
Original line number Diff line number Diff line
@@ -132,10 +132,15 @@ static int eip197_load_firmwares(struct safexcel_crypto_priv *priv) 
{

	const char *fw_name[] = {"ifpp.bin", "ipue.bin"};

	const struct firmware *fw[FW_NB];

	char fw_path[31];

	int i, j, ret = 0;

	u32 val;



	for (i = 0; i < FW_NB; i++) {

		snprintf(fw_path, 31, "inside-secure/eip197b/%s", fw_name[i]);

		ret = request_firmware(&fw[i], fw_path, priv->dev);

		if (ret) {

			/* Fallback to the old firmware location. */

			ret = request_firmware(&fw[i], fw_name[i], priv->dev);

			if (ret) {

				dev_err(priv->dev,
@@ -144,6 +149,7 @@ static int eip197_load_firmwares(struct safexcel_crypto_priv *priv) 
				goto release_fw;

			}

		}

	}



	/* Clear the scratchpad memory */

	val = readl(EIP197_PE(priv) + EIP197_PE_ICE_SCRATCH_CTRL);