Skip to contentSkip to conversation

media: venus: Fix firmware path for sm8250

PATCH Superseded Patrick Whewell 5 participants 7 messages Jul 11, 2023 – Sep 12, 2023

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 media: venus: Fix firmware path for sm8250

The firmware path for the sm8250 resources is incorrect. This fixes the path to address the firmware correctly.

---
 drivers/media/platform/qcom/venus/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/qcom/venus/core.c +1 -1
index 2ae867cb4c48..348085f8fc9c 100644
@@ -814,7 +814,7 @@ static const struct venus_resources sm8250_res = {
 	.vmem_size = 0,
 	.vmem_addr = 0,
 	.dma_mask = 0xe0000000 - 1,
-	.fwname = "qcom/vpu-1.0/venus.mdt",
+	.fwname = "qcom/vpu-1.0/venus.mbn",
 };
 
 static const struct freq_tbl sc7280_freq_table[] = {
Signature · 1 line
2.25.1
#1 lore raw
Quoted 13 lines · Patrick Whewell

The firmware path for the sm8250 resources is incorrect. This fixes the path to address the firmware correctly.

---
  drivers/media/platform/qcom/venus/core.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/qcom/venus/core.c +0 -0
index 2ae867cb4c48..348085f8fc9c 100644

drivers/media/platform/qcom/venus/core.c static const struct venus_resources sm8250_res = { · line 820

Quoted 8 lines
drivers/media/platform/qcom/venus/core.c +1 -1
@@ -814,7 +814,7 @@ static const struct venus_resources sm8250_res = {
  	.vmem_size = 0,
  	.vmem_addr = 0,
  	.dma_mask = 0xe0000000 - 1,
-	.fwname = "qcom/vpu-1.0/venus.mdt",
+	.fwname = "qcom/vpu-1.0/venus.mbn",
  };
 
  static const struct freq_tbl sc7280_freq_table[] = {

Is the policy not to stick with .mdt for existing platforms but use .mbn for new platforms.

https://lore.kernel.org/all/CALAqxLU1gjTY95+phBt=WksyguZuKpNKa6aYaJTe0GeCAg6WrA@mail.gmail.com/T/

Its a symlink for me but, is it a symlink for everybody ?

root@linaro-gnome:~# ls /lib/firmware/qcom/vpu-1.0/ -l
lrwxrwxrwx 1 root root       9 Dec  2  2022 venus.mdt -> venus.mbn

---
bod

#2 lore raw
Quoted 9 lines · Bryan O'Donoghue
Quoted 8 lines · Patrick Whewell

The firmware path for the sm8250 resources is incorrect. This fixes the path to address the firmware correctly.

---
  drivers/media/platform/qcom/venus/core.c | 2 +-

  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 14 lines

drivers/media/platform/qcom/venus/core.c static const struct venus_resources sm8250_res = { · line 819

Quoted 12 lines
drivers/media/platform/qcom/venus/core.c +1 -1
index 2ae867cb4c48..348085f8fc9c 100644
@@ -814,7 +814,7 @@ static const struct venus_resources sm8250_res = {
       .vmem_size = 0,
       .vmem_addr = 0,
       .dma_mask = 0xe0000000 - 1,
-    .fwname = "qcom/vpu-1.0/venus.mdt",
+    .fwname = "qcom/vpu-1.0/venus.mbn",
   };
   static const struct freq_tbl sc7280_freq_table[] = {

Is the policy not to stick with .mdt for existing platforms but use .mbn for new platforms.

This was slightly different for venus, where it was suggested to use .mdt for all the platforms. However last year when Chrome team was updating sc7280/sc7180 Venus firmware, Rob Clark and yours truly have persuaded them to (finally) switch to .mbn and provide compatibility .mdt symlinks.

Then we have similarly converted all the rest of the venus firmware files.

See:

https://lore.kernel.org/linux-arm-msm/CANHAJhG-aoOBgTzirGu-1uqCFUJd+AnenMSkoUqnG3mhraCRfw@mail.gmail.com/t/#u

https://lore.kernel.org/linux-arm-msm/CANHAJhEWXf8U-FJJbOUpRV1gCXsd++H8kzbiBP1Z7iryaOCoYQ@mail.gmail.com/t/#u

Quoted 7 lines

https://lore.kernel.org/all/CALAqxLU1gjTY95+phBt=WksyguZuKpNKa6aYaJTe0GeCAg6WrA@mail.gmail.com/T/

Its a symlink for me but, is it a symlink for everybody ?

root@linaro-gnome:~# ls /lib/firmware/qcom/vpu-1.0/ -l
lrwxrwxrwx 1 root root       9 Dec  2  2022 venus.mdt -> venus.mbn

Yes, it is a symlink for everybody:

$ grep Link.*qcom.v linux-firmware/WHENCE
Link: qcom/venus-1.8/venus.mdt -> venus.mbn
Link: qcom/venus-4.2/venus.mdt -> venus.mbn
Link: qcom/venus-5.2/venus.mdt -> venus.mbn
Link: qcom/venus-5.4/venus.mdt -> venus.mbn
Link: qcom/vpu-1.0/venus.mdt -> venus.mbn

So, long story short, I think this patch makes sense (and we should update other entries in this file too).

Patrick, maybe you can do it as well?

Signature · 2 lines
With best wishes
Dmitry
Reviewed-by
#3 lore raw
Quoted 52 lines · Dmitry Baryshkov
Quoted 9 lines · Bryan O'Donoghue
Quoted 8 lines · Patrick Whewell

The firmware path for the sm8250 resources is incorrect. This fixes the path to address the firmware correctly.

---
  drivers/media/platform/qcom/venus/core.c | 2 +-

  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 14 lines

drivers/media/platform/qcom/venus/core.c static const struct venus_resources sm8250_res = { · line 819

Quoted 12 lines
drivers/media/platform/qcom/venus/core.c +1 -1
index 2ae867cb4c48..348085f8fc9c 100644
@@ -814,7 +814,7 @@ static const struct venus_resources sm8250_res = {
       .vmem_size = 0,
       .vmem_addr = 0,
       .dma_mask = 0xe0000000 - 1,
-    .fwname = "qcom/vpu-1.0/venus.mdt",
+    .fwname = "qcom/vpu-1.0/venus.mbn",
   };
   static const struct freq_tbl sc7280_freq_table[] = {

Is the policy not to stick with .mdt for existing platforms but use .mbn for new platforms.

This was slightly different for venus, where it was suggested to use .mdt for all the platforms. However last year when Chrome team was updating sc7280/sc7180 Venus firmware, Rob Clark and yours truly have persuaded them to (finally) switch to .mbn and provide compatibility .mdt symlinks.

Then we have similarly converted all the rest of the venus firmware files.

See:

https://lore.kernel.org/linux-arm-msm/CANHAJhG-aoOBgTzirGu-1uqCFUJd+AnenMSkoUqnG3mhraCRfw@mail.gmail.com/t/#u

https://lore.kernel.org/linux-arm-msm/CANHAJhEWXf8U-FJJbOUpRV1gCXsd++H8kzbiBP1Z7iryaOCoYQ@mail.gmail.com/t/#u

Quoted 7 lines

https://lore.kernel.org/all/CALAqxLU1gjTY95+phBt=WksyguZuKpNKa6aYaJTe0GeCAg6WrA@mail.gmail.com/T/

Its a symlink for me but, is it a symlink for everybody ?

root@linaro-gnome:~# ls /lib/firmware/qcom/vpu-1.0/ -l
lrwxrwxrwx 1 root root       9 Dec  2  2022 venus.mdt -> venus.mbn

Yes, it is a symlink for everybody:

$ grep Link.*qcom.v linux-firmware/WHENCE
Link: qcom/venus-1.8/venus.mdt -> venus.mbn
Link: qcom/venus-4.2/venus.mdt -> venus.mbn
Link: qcom/venus-5.2/venus.mdt -> venus.mbn
Link: qcom/venus-5.4/venus.mdt -> venus.mbn
Link: qcom/vpu-1.0/venus.mdt -> venus.mbn
Quoted 4 lines

So, long story short, I think this patch makes sense (and we should update other entries in this file too).

Patrick, maybe you can do it as well?

Fine so.

#4 lore raw

PATCH v2 1/1 media: venus: Fix firmware path for resources

The firmware path for some of the resources is still the old format. This fixes the path to address the firmware correctly using the new .mbn format.

---
I've updated all .fwname to match the .mbn format. There is a qcom/venus-4.4/venus.mdt for the sdm660 that still remains but the linux-firmware package does not contain that firmware file anymore, so i left as is.

 drivers/media/platform/qcom/venus/core.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/media/platform/qcom/venus/core.c +6 -6
index 2ae867cb4c48..2d62669d99e1 100644
@@ -548,7 +548,7 @@ static const struct venus_resources msm8916_res = {
 	.vmem_size = 0,
 	.vmem_addr = 0,
 	.dma_mask = 0xddc00000 - 1,
-	.fwname = "qcom/venus-1.8/venus.mdt",
+	.fwname = "qcom/venus-1.8/venus.mbn",
 };
 
 static const struct freq_tbl msm8996_freq_table[] = {
@@ -581,7 +581,7 @@ static const struct venus_resources msm8996_res = {
 	.vmem_size = 0,
 	.vmem_addr = 0,
 	.dma_mask = 0xddc00000 - 1,
-	.fwname = "qcom/venus-4.2/venus.mdt",
+	.fwname = "qcom/venus-4.2/venus.mbn",
 };
 
 static const struct freq_tbl sdm660_freq_table[] = {
@@ -688,7 +688,7 @@ static const struct venus_resources sdm845_res = {
 	.vmem_size = 0,
 	.vmem_addr = 0,
 	.dma_mask = 0xe0000000 - 1,
-	.fwname = "qcom/venus-5.2/venus.mdt",
+	.fwname = "qcom/venus-5.2/venus.mbn",
 };
 
 static const struct venus_resources sdm845_res_v2 = {
@@ -717,7 +717,7 @@ static const struct venus_resources sdm845_res_v2 = {
 	.cp_size = 0x70800000,
 	.cp_nonpixel_start = 0x1000000,
 	.cp_nonpixel_size = 0x24800000,
-	.fwname = "qcom/venus-5.2/venus.mdt",
+	.fwname = "qcom/venus-5.2/venus.mbn",
 };
 
 static const struct freq_tbl sc7180_freq_table[] = {
@@ -760,7 +760,7 @@ static const struct venus_resources sc7180_res = {
 	.vmem_size = 0,
 	.vmem_addr = 0,
 	.dma_mask = 0xe0000000 - 1,
-	.fwname = "qcom/venus-5.4/venus.mdt",
+	.fwname = "qcom/venus-5.4/venus.mbn",
 };
 
 static const struct freq_tbl sm8250_freq_table[] = {
@@ -814,7 +814,7 @@ static const struct venus_resources sm8250_res = {
 	.vmem_size = 0,
 	.vmem_addr = 0,
 	.dma_mask = 0xe0000000 - 1,
-	.fwname = "qcom/vpu-1.0/venus.mdt",
+	.fwname = "qcom/vpu-1.0/venus.mbn",
 };
 
 static const struct freq_tbl sc7280_freq_table[] = {
Signature · 1 line
2.25.1
Reviewed-by on v2 1/1
#5 lore raw

Re: [PATCH v2] media: venus: Fix firmware path for resources

Quoted 6 lines · Patrick Whewell

The firmware path for some of the resources is still the old format. This fixes the path to address the firmware correctly using the new .mbn format.

---

the changes look good to me.

Quoted 65 lines

I've updated all .fwname to match the .mbn format. There is a qcom/venus-4.4/venus.mdt for the sdm660 that still remains but the linux-firmware package does not contain that firmware file anymore, so i left as is.

 drivers/media/platform/qcom/venus/core.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/media/platform/qcom/venus/core.c +6 -6
index 2ae867cb4c48..2d62669d99e1 100644
@@ -548,7 +548,7 @@ static const struct venus_resources msm8916_res = {
 	.vmem_size = 0,
 	.vmem_addr = 0,
 	.dma_mask = 0xddc00000 - 1,
-	.fwname = "qcom/venus-1.8/venus.mdt",
+	.fwname = "qcom/venus-1.8/venus.mbn",
 };
 
 static const struct freq_tbl msm8996_freq_table[] = {
@@ -581,7 +581,7 @@ static const struct venus_resources msm8996_res = {
 	.vmem_size = 0,
 	.vmem_addr = 0,
 	.dma_mask = 0xddc00000 - 1,
-	.fwname = "qcom/venus-4.2/venus.mdt",
+	.fwname = "qcom/venus-4.2/venus.mbn",
 };
 
 static const struct freq_tbl sdm660_freq_table[] = {
@@ -688,7 +688,7 @@ static const struct venus_resources sdm845_res = {
 	.vmem_size = 0,
 	.vmem_addr = 0,
 	.dma_mask = 0xe0000000 - 1,
-	.fwname = "qcom/venus-5.2/venus.mdt",
+	.fwname = "qcom/venus-5.2/venus.mbn",
 };
 
 static const struct venus_resources sdm845_res_v2 = {
@@ -717,7 +717,7 @@ static const struct venus_resources sdm845_res_v2 = {
 	.cp_size = 0x70800000,
 	.cp_nonpixel_start = 0x1000000,
 	.cp_nonpixel_size = 0x24800000,
-	.fwname = "qcom/venus-5.2/venus.mdt",
+	.fwname = "qcom/venus-5.2/venus.mbn",
 };
 
 static const struct freq_tbl sc7180_freq_table[] = {
@@ -760,7 +760,7 @@ static const struct venus_resources sc7180_res = {
 	.vmem_size = 0,
 	.vmem_addr = 0,
 	.dma_mask = 0xe0000000 - 1,
-	.fwname = "qcom/venus-5.4/venus.mdt",
+	.fwname = "qcom/venus-5.4/venus.mbn",
 };
 
 static const struct freq_tbl sm8250_freq_table[] = {
@@ -814,7 +814,7 @@ static const struct venus_resources sm8250_res = {
 	.vmem_size = 0,
 	.vmem_addr = 0,
 	.dma_mask = 0xe0000000 - 1,
-	.fwname = "qcom/vpu-1.0/venus.mdt",
+	.fwname = "qcom/vpu-1.0/venus.mbn",
 };
 
 static const struct freq_tbl sc7280_freq_table[] = {
#6 lore raw

Re: [PATCH v2] media: venus: Fix firmware path for resources

In reply to Patrick Whewell
Quoted 9 lines · Patrick Whewell

The firmware path for some of the resources is still the old format. This fixes the path to address the firmware correctly using the new .mbn format.

---
I've updated all .fwname to match the .mbn format. There is a qcom/venus-4.4/venus.mdt for the sdm660 that still remains but the linux-firmware package does not contain that firmware file anymore, so i left as is.

I noticed this patch hasn't been picked up yet. Is there anything pending left for approval, or can it be merged now?

William Breathitt Gray