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: Antoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/inside-secure/safexcel.c b/drivers/crypto/inside-secure/safexcel.c
index c39d2d7c9917c27ba0bb6eb7ee4d87b3df7d08be..a04d39231aaf08bad7100f72f9913f29f1980aa2 100644 (file)
--- a/drivers/crypto/inside-secure/safexcel.c
+++ b/drivers/crypto/inside-secure/safexcel.c
@@ -132,18 +132,24 @@ 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++) {
-               ret = request_firmware(&fw[i], fw_name[i], priv->dev);
+               snprintf(fw_path, 31, "inside-secure/eip197b/%s", fw_name[i]);
+               ret = request_firmware(&fw[i], fw_path, priv->dev);
                if (ret) {
-                       dev_err(priv->dev,
-                               "Failed to request firmware %s (%d)\n",
-                               fw_name[i], ret);
-                       goto release_fw;
+                       /* Fallback to the old firmware location. */
+                       ret = request_firmware(&fw[i], fw_name[i], priv->dev);
+                       if (ret) {
+                               dev_err(priv->dev,
+                                       "Failed to request firmware %s (%d)\n",
+                                       fw_name[i], ret);
+                               goto release_fw;
+                       }
                }
-        }
+       }
 
        /* Clear the scratchpad memory */
        val = readl(EIP197_PE(priv) + EIP197_PE_ICE_SCRATCH_CTRL);