dmaengine: imx-sdma: Add MODULE_FIRMWARE

dmaengine: imx-sdma: Add MODULE_FIRMWARE

[Nicolas Chauvet]

This avoid the following error when using an initramfs on wandboard quad
Direct firmware load for imx/sdma/sdma-imx6q.bin failed with error -2

Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
---
 drivers/dma/imx-sdma.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 2184881afe76..e7db24c67030 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1939,4 +1939,10 @@ module_platform_driver(sdma_driver);
 
 MODULE_AUTHOR("Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>");
 MODULE_DESCRIPTION("i.MX SDMA driver");
+#if IS_ENABLED(CONFIG_SOC_IMX6Q)
+MODULE_FIRMWARE("imx/sdma/sdma-imx6q.bin");
+#endif
+#if IS_ENABLED(CONFIG_SOC_IMX7D)
+MODULE_FIRMWARE("imx/sdma/sdma-imx7d.bin");
+#endif
 MODULE_LICENSE("GPL");

dmaengine: imx-sdma: Add MODULE_FIRMWARE

[Nicolas Chauvet]

This avoid the following error when using an initramfs on wandboard quad
Direct firmware load for imx/sdma/sdma-imx6q.bin failed with error -2

Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
---
 drivers/dma/imx-sdma.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 2184881afe76..e7db24c67030 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1939,4 +1939,10 @@ module_platform_driver(sdma_driver);
 
 MODULE_AUTHOR("Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>");
 MODULE_DESCRIPTION("i.MX SDMA driver");
+#if IS_ENABLED(CONFIG_SOC_IMX6Q)
+MODULE_FIRMWARE("imx/sdma/sdma-imx6q.bin");
+#endif
+#if IS_ENABLED(CONFIG_SOC_IMX7D)
+MODULE_FIRMWARE("imx/sdma/sdma-imx7d.bin");
+#endif
 MODULE_LICENSE("GPL");

dmaengine: imx-sdma: Add MODULE_FIRMWARE

[Vinod Koul]

On Wed, Dec 13, 2017 at 04:50:33PM +0100, Nicolas Chauvet wrote:
> This avoid the following error when using an initramfs on wandboard quad
> Direct firmware load for imx/sdma/sdma-imx6q.bin failed with error -2

Are you sure this fixes with latest kernel as the firmware in kernel has
been removed with commit 5620a0d1aacd: ("firmware: delete in-kernel
firmware")

> Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
> ---
>  drivers/dma/imx-sdma.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> index 2184881afe76..e7db24c67030 100644
> --- a/drivers/dma/imx-sdma.c
> +++ b/drivers/dma/imx-sdma.c
> @@ -1939,4 +1939,10 @@ module_platform_driver(sdma_driver);
>  
>  MODULE_AUTHOR("Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>");
>  MODULE_DESCRIPTION("i.MX SDMA driver");
> +#if IS_ENABLED(CONFIG_SOC_IMX6Q)
> +MODULE_FIRMWARE("imx/sdma/sdma-imx6q.bin");
> +#endif
> +#if IS_ENABLED(CONFIG_SOC_IMX7D)
> +MODULE_FIRMWARE("imx/sdma/sdma-imx7d.bin");
> +#endif
>  MODULE_LICENSE("GPL");
> -- 
> 2.13.6
>

dmaengine: imx-sdma: Add MODULE_FIRMWARE

[Nicolas Chauvet]

2017-12-18 4:23 GMT+01:00 Vinod Koul <vinod.koul@intel.com>:
> On Wed, Dec 13, 2017 at 04:50:33PM +0100, Nicolas Chauvet wrote:
>> This avoid the following error when using an initramfs on wandboard quad
>> Direct firmware load for imx/sdma/sdma-imx6q.bin failed with error -2
>
> Are you sure this fixes with latest kernel as the firmware in kernel has
> been removed with commit 5620a0d1aacd: ("firmware: delete in-kernel
> firmware")
Hi ,

Thx for your review.

I've only tested on Fedora kernel 4.14+. This kernel compiles mostly
everything as a module (specially imx-sdma) and (as I understand), it
relies on the separate linux-firmware repository for any (imx-sdma)
firmware.
This patch is only relevant when imx-sdma is compiled as a module (and
harmless if not) and the rootfs isn't available when sdma-imx is
loaded. This typically happens when the imx-sdma is bundled within an
initramfs, but the related firmware is missing from there.
Using the MODULE_FIRMWARE tag will instruct the initramfs builder
(here dracut in my case) to fetch the related firmware once imx-sdma
is selected. (if ever the firmware is missing, it shoudn't produce any
error).

I hope this description is clear enough. Please let me know if anything missing.

Thx

dmaengine: imx-sdma: Add MODULE_FIRMWARE

[Vinod Koul]

On Wed, Dec 13, 2017 at 04:50:33PM +0100, Nicolas Chauvet wrote:
> This avoid the following error when using an initramfs on wandboard quad
> Direct firmware load for imx/sdma/sdma-imx6q.bin failed with error -2

Applied, thanks