Skip to contentSkip to conversation

drm/msm/a6xx: add missing MODULE_FIRMWARE()

PATCH In review Rob Clark 3 participants 4 messages Jul 3, 2019 – Jul 10, 2019

Subsystems (4)
lore
Share & tools
lore

Rob Clark

author
#0 lore raw

PATCH 1/1 drm/msm/a6xx: add missing MODULE_FIRMWARE()

From: Rob Clark <[email protected]>

For platforms that require the "zap shader" to take the GPU out of secure mode at boot, we also need the zap fw to end up in the initrd.

---
 drivers/gpu/drm/msm/adreno/adreno_device.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/gpu/drm/msm/adreno/adreno_device.c +4 -0
index d9ac8c4cd866..aa64514afd5c 100644
@@ -174,6 +174,10 @@ MODULE_FIRMWARE("qcom/a530_zap.b01");
 MODULE_FIRMWARE("qcom/a530_zap.b02");
 MODULE_FIRMWARE("qcom/a630_sqe.fw");
 MODULE_FIRMWARE("qcom/a630_gmu.bin");
+MODULE_FIRMWARE("qcom/a630_zap.mdt");
+MODULE_FIRMWARE("qcom/a630_zap.b00");
+MODULE_FIRMWARE("qcom/a630_zap.b01");
+MODULE_FIRMWARE("qcom/a630_zap.b02");
 
 static inline bool _rev_match(uint8_t entry, uint8_t id)
 {
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 15 lines · Rob Clark

From: Rob Clark <[email protected]>

For platforms that require the "zap shader" to take the GPU out of secure mode at boot, we also need the zap fw to end up in the initrd.

---
 drivers/gpu/drm/msm/adreno/adreno_device.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/gpu/drm/msm/adreno/adreno_device.c +0 -0
index d9ac8c4cd866..aa64514afd5c 100644

drivers/gpu/drm/msm/adreno/adreno_device.c MODULE_FIRMWARE("qcom/a530_zap.b01"); · line 180

Quoted 7 lines
drivers/gpu/drm/msm/adreno/adreno_device.c +4 -0
@@ -174,6 +174,10 @@ MODULE_FIRMWARE("qcom/a530_zap.b01");
 MODULE_FIRMWARE("qcom/a530_zap.b02");
 MODULE_FIRMWARE("qcom/a630_sqe.fw");
 MODULE_FIRMWARE("qcom/a630_gmu.bin");
+MODULE_FIRMWARE("qcom/a630_zap.mdt");
+MODULE_FIRMWARE("qcom/a630_zap.b00");
+MODULE_FIRMWARE("qcom/a630_zap.b01");
+MODULE_FIRMWARE("qcom/a630_zap.b02");

Hopefully we are in the very last days of the split PIL so we can leave this ugliness behind us once and for all.

Quoted 5 lines
drivers/gpu/drm/msm/adreno/adreno_device.c +0 -0
 static inline bool _rev_match(uint8_t entry, uint8_t id)
 {
Signature · 1 line
2.20.1
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 1/1
#2 lore raw
In reply to Rob Clark
Quoted 6 lines · Rob Clark

From: Rob Clark <[email protected]>

For platforms that require the "zap shader" to take the GPU out of secure mode at boot, we also need the zap fw to end up in the initrd.

My upcoming pull request for this merge window includes the support for the mdt_loader to read unsplit firmware files. So how about running the firmware through [1] (pil-squasher a630_zap.mbn a630_zap.mdt) and pointing the driver to use the single .mbn file instead?

If not, you have my:

[1] https://github.com/andersson/pil-squasher

Regards,
Bjorn

Quoted 22 lines
---
 drivers/gpu/drm/msm/adreno/adreno_device.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/gpu/drm/msm/adreno/adreno_device.c +4 -0
index d9ac8c4cd866..aa64514afd5c 100644
@@ -174,6 +174,10 @@ MODULE_FIRMWARE("qcom/a530_zap.b01");
 MODULE_FIRMWARE("qcom/a530_zap.b02");
 MODULE_FIRMWARE("qcom/a630_sqe.fw");
 MODULE_FIRMWARE("qcom/a630_gmu.bin");
+MODULE_FIRMWARE("qcom/a630_zap.mdt");
+MODULE_FIRMWARE("qcom/a630_zap.b00");
+MODULE_FIRMWARE("qcom/a630_zap.b01");
+MODULE_FIRMWARE("qcom/a630_zap.b02");
 
 static inline bool _rev_match(uint8_t entry, uint8_t id)
 {
Signature · 1 line
2.20.1
author
#3 lore raw
Quoted 8 lines · Bjorn Andersson
Quoted 5 lines · Rob Clark

From: Rob Clark <[email protected]>

For platforms that require the "zap shader" to take the GPU out of secure mode at boot, we also need the zap fw to end up in the initrd.

Quoted 7 lines
Quoted 1 line

My upcoming pull request for this merge window includes the support for the mdt_loader to read unsplit firmware files. So how about running the firmware through [1] (pil-squasher a630_zap.mbn a630_zap.mdt) and pointing the driver to use the single .mbn file instead?

I wonder if it would just make sense to list both, at least until we change the a6xx code to *require* zap fw if the zap node in dt isn't removed (since the outcome of gpu driver assuming missing zap fw means zap is not required is slightly brutal)

BR,
-R

Quoted 6 lines

If not, you have my:

[1] https://github.com/andersson/pil-squasher