Skip to contentSkip to conversation

package/freescale-imx/firmware-imx: fix the VPU firmware location

PATCH New Fabio Estevam 4 participants 4 messages Jan 13, 2021 – Jan 18, 2021 Arm i.MX and Layerscape

lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH v2 1/1 package/freescale-imx/firmware-imx: fix the VPU firmware location

The mainline kernel searches the coda VPU firmware inside the following locations [1]:

/lib/firmware/
/lib/firmware/vpu/

Currently Buildroot installs the coda firmware into /lib/firmware/imx/vpu, which is not a valid location.

Fix it by installing the coda firmwares into /lib/firmware/vpu/ which is a valid path for both mainline and NXP vendor kernels. Also create a symlink to /lib/firmware/ so that mainline kernels do not need to wait more than 60 seconds to search again inside /lib/firmware/vpu/.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8af7779f3cbc1f6720d15f00abc797493710d1ab

---
Changes since v1:
- Create symlinks to /lib/firmware to speed up mainline kernels to found the VPU firmware.

 package/freescale-imx/firmware-imx/firmware-imx.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
package/freescale-imx/firmware-imx/firmware-imx.mk +5 -3
index 7d1f42f1d87b..6fba4e8a0cb3 100644
@@ -116,9 +116,11 @@ endif
 FIRMWARE_IMX_VPU_FW_NAME = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_IMX_VPU_FW_NAME))
 ifneq ($(FIRMWARE_IMX_VPU_FW_NAME),)
 define FIRMWARE_IMX_INSTALL_TARGET_VPU_FW
-	mkdir -p $(TARGET_DIR)/lib/firmware/imx/vpu
-	cp $(@D)/firmware/vpu/vpu_fw_$(FIRMWARE_IMX_VPU_FW_NAME)*.bin \
-		$(TARGET_DIR)/lib/firmware/imx/vpu/
+	mkdir -p $(TARGET_DIR)/lib/firmware/vpu
+	for i in $$(find $(@D)/firmware/vpu/vpu_fw_$(FIRMWARE_IMX_VPU_FW_NAME)*.bin); do \
+		cp $$i $(TARGET_DIR)/lib/firmware/vpu/ ; \
+		ln -sf vpu/$$(basename $$i) $(TARGET_DIR)/lib/firmware/$$(basename $$i) ; \
+	done
 endef
 endif
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/1 package/freescale-imx/firmware-imx: fix the VPU firmware location

Hi Fabio,

Le 13/01/2021 ? 23:30, Fabio Estevam a ?crit?:

Quoted 14 lines

The mainline kernel searches the coda VPU firmware inside the following locations [1]:

/lib/firmware/
/lib/firmware/vpu/

Currently Buildroot installs the coda firmware into /lib/firmware/imx/vpu, which is not a valid location.

Fix it by installing the coda firmwares into /lib/firmware/vpu/ which is a valid path for both mainline and NXP vendor kernels. Also create a symlink to /lib/firmware/ so that mainline kernels do not need to wait more than 60 seconds to search again inside /lib/firmware/vpu/.

Quoted 4 lines

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8af7779f3cbc1f6720d15f00abc797493710d1ab

Best regards,
Romain

Quoted 29 lines

---
Changes since v1:
- Create symlinks to /lib/firmware to speed up mainline kernels to found the VPU firmware.

 package/freescale-imx/firmware-imx/firmware-imx.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
package/freescale-imx/firmware-imx/firmware-imx.mk +5 -3
index 7d1f42f1d87b..6fba4e8a0cb3 100644
@@ -116,9 +116,11 @@ endif
 FIRMWARE_IMX_VPU_FW_NAME = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_IMX_VPU_FW_NAME))
 ifneq ($(FIRMWARE_IMX_VPU_FW_NAME),)
 define FIRMWARE_IMX_INSTALL_TARGET_VPU_FW
-	mkdir -p $(TARGET_DIR)/lib/firmware/imx/vpu
-	cp $(@D)/firmware/vpu/vpu_fw_$(FIRMWARE_IMX_VPU_FW_NAME)*.bin \
-		$(TARGET_DIR)/lib/firmware/imx/vpu/
+	mkdir -p $(TARGET_DIR)/lib/firmware/vpu
+	for i in $$(find $(@D)/firmware/vpu/vpu_fw_$(FIRMWARE_IMX_VPU_FW_NAME)*.bin); do \
+		cp $$i $(TARGET_DIR)/lib/firmware/vpu/ ; \
+		ln -sf vpu/$$(basename $$i) $(TARGET_DIR)/lib/firmware/$$(basename $$i) ; \
+	done
 endef
 endif
 
#2 lore raw

PATCH v2 1/1 package/freescale-imx/firmware-imx: fix the VPU firmware location

In reply to Fabio Estevam
Quoted 16 lines · On Wed, 13 Jan 2021 19:30:39 -0300 Fabio Estevam <[email protected]> wrote:

The mainline kernel searches the coda VPU firmware inside the following locations [1]:

/lib/firmware/
/lib/firmware/vpu/

Currently Buildroot installs the coda firmware into /lib/firmware/imx/vpu, which is not a valid location.

Fix it by installing the coda firmwares into /lib/firmware/vpu/ which is a valid path for both mainline and NXP vendor kernels. Also create a symlink to /lib/firmware/ so that mainline kernels do not need to wait more than 60 seconds to search again inside /lib/firmware/vpu/.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8af7779f3cbc1f6720d15f00abc797493710d1ab

Quoted 7 lines

---
Changes since v1:
- Create symlinks to /lib/firmware to speed up mainline kernels to found the VPU firmware.

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH v2 1/1 package/freescale-imx/firmware-imx: fix the VPU firmware location

In reply to Fabio Estevam
Quoted 18 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabio" == Fabio Estevam <[email protected]> writes:

The mainline kernel searches the coda VPU firmware inside the following locations [1]:

/lib/firmware/
/lib/firmware/vpu/

Currently Buildroot installs the coda firmware into /lib/firmware/imx/vpu, which is not a valid location.

Fix it by installing the coda firmwares into /lib/firmware/vpu/ which is a valid path for both mainline and NXP vendor kernels. Also create a symlink to /lib/firmware/ so that mainline kernels do not need to wait more than 60 seconds to search again inside /lib/firmware/vpu/.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8af7779f3cbc1f6720d15f00abc797493710d1ab

Quoted 7 lines

---
Changes since v1:
- Create symlinks to /lib/firmware to speed up mainline kernels to found the VPU firmware.

Committed to 2020.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard