Skip to contentSkip to conversation

gpu: nova-core: fix missing colon in SEC2 boot debug message

PATCH In review David Carlier 4 participants 5 messages Mar 31 – Apr 6

Subsystems (3)
DRM drivers DRM Rust nova-core (Rust)
lore
Share & tools
lore

David Carlier

author
#0 lore raw

PATCH 1/1 gpu: nova-core: fix missing colon in SEC2 boot debug message

The SEC2 mailbox debug output formats MBOX1 without a colon separator, producing "MBOX10xdead" instead of "MBOX1: 0xdead". The GSP debug message a few lines above uses the correct format.

Fixes 5949d419c193 ("gpu: nova-core: gsp: Boot GSP")
Signed-off-by David Carlier <[email protected]>
---
 drivers/gpu/nova-core/gsp/boot.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/nova-core/gsp/boot.rs +1 -1
index 6f707b3d1a54..18f356c9178e 100644
@@ -195,7 +195,7 @@ pub(crate) fn boot(
             Some(wpr_handle as u32),
             Some((wpr_handle >> 32) as u32),
         )?;
-        dev_dbg!(pdev, "SEC2 MBOX0: {:#x}, MBOX1{:#x}\n", mbox0, mbox1);
+        dev_dbg!(pdev, "SEC2 MBOX0: {:#x}, MBOX1: {:#x}\n", mbox0, mbox1);
 
         if mbox0 != 0 {
             dev_err!(pdev, "Booter-load failed with error {:#x}\n", mbox0);
Signature · 1 line
2.53.0
#1 lore raw
Quoted 15 lines · David Carlier

The SEC2 mailbox debug output formats MBOX1 without a colon separator, producing "MBOX10xdead" instead of "MBOX1: 0xdead". The GSP debug message a few lines above uses the correct format.

Fixes 5949d419c193 ("gpu: nova-core: gsp: Boot GSP")
Signed-off-by David Carlier <[email protected]>
---
 drivers/gpu/nova-core/gsp/boot.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/nova-core/gsp/boot.rs +0 -0
index 6f707b3d1a54..18f356c9178e 100644

drivers/gpu/nova-core/gsp/boot.rs pub(crate) fn boot( · line 198

Quoted 5 lines
drivers/gpu/nova-core/gsp/boot.rs +1 -1
@@ -195,7 +195,7 @@ pub(crate) fn boot(
             Some(wpr_handle as u32),
             Some((wpr_handle >> 32) as u32),
         )?;
-        dev_dbg!(pdev, "SEC2 MBOX0: {:#x}, MBOX1{:#x}\n", mbox0, mbox1);
+        dev_dbg!(pdev, "SEC2 MBOX0: {:#x}, MBOX1: {:#x}\n", mbox0, mbox1);

This is also fixed in my Blackwell series, see patch 28/31 [1].

[1] https://lore.kernel.org/[email protected]

thanks,

Signature · 1 line
John Hubbard
maintainer
#2 lore raw
In reply to David Carlier
Quoted 25 lines · David Carlier

The SEC2 mailbox debug output formats MBOX1 without a colon separator, producing "MBOX10xdead" instead of "MBOX1: 0xdead". The GSP debug message a few lines above uses the correct format.

Fixes 5949d419c193 ("gpu: nova-core: gsp: Boot GSP")
Signed-off-by David Carlier <[email protected]>
---
 drivers/gpu/nova-core/gsp/boot.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/nova-core/gsp/boot.rs +1 -1
index 6f707b3d1a54..18f356c9178e 100644
@@ -195,7 +195,7 @@ pub(crate) fn boot(
             Some(wpr_handle as u32),
             Some((wpr_handle >> 32) as u32),
         )?;
-        dev_dbg!(pdev, "SEC2 MBOX0: {:#x}, MBOX1{:#x}\n", mbox0, mbox1);
+        dev_dbg!(pdev, "SEC2 MBOX0: {:#x}, MBOX1: {:#x}\n", mbox0, mbox1);
 
         if mbox0 != 0 {
             dev_err!(pdev, "Booter-load failed with error {:#x}\n", mbox0);
Signature · 1 line
2.53.0

Thanks for the patch! The issue is also technically fixed by [1] but I prefer having one fix per patch, so thinking about taking it anyway.

Danilo, do you mind if I fast-track this one into drm-rust-next since it introduces no possibility of breakage and is technically a fix? This would allow the Blackwell series to rebase nicely.

[1] https://lore.kernel.org/all/[email protected]/

maintainer
#3 lore raw
Quoted 30 lines · Alexandre Courbot
Quoted 25 lines · David Carlier

The SEC2 mailbox debug output formats MBOX1 without a colon separator, producing "MBOX10xdead" instead of "MBOX1: 0xdead". The GSP debug message a few lines above uses the correct format.

Fixes 5949d419c193 ("gpu: nova-core: gsp: Boot GSP")
Signed-off-by David Carlier <[email protected]>
---
 drivers/gpu/nova-core/gsp/boot.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/nova-core/gsp/boot.rs +1 -1
index 6f707b3d1a54..18f356c9178e 100644
@@ -195,7 +195,7 @@ pub(crate) fn boot(
             Some(wpr_handle as u32),
             Some((wpr_handle >> 32) as u32),
         )?;
-        dev_dbg!(pdev, "SEC2 MBOX0: {:#x}, MBOX1{:#x}\n", mbox0, mbox1);
+        dev_dbg!(pdev, "SEC2 MBOX0: {:#x}, MBOX1: {:#x}\n", mbox0, mbox1);
 
         if mbox0 != 0 {
             dev_err!(pdev, "Booter-load failed with error {:#x}\n", mbox0);
Signature · 1 line
2.53.0

Thanks for the patch! The issue is also technically fixed by [1] but I prefer having one fix per patch, so thinking about taking it anyway.

Quoted 3 lines

Danilo, do you mind if I fast-track this one into drm-rust-next since it introduces no possibility of breakage and is technically a fix? This would allow the Blackwell series to rebase nicely.

I don't mind if we end up picking your v5 of the UB fix in the next days, so it is still in time for another drm-rust-next PR before the merge window opens.

Otherwise, I wouldn't send a PR just for this.

Quoted 1 line

[1] https://lore.kernel.org/all/[email protected]/

maintainer
#4 lore raw
In reply to David Carlier
Quoted 25 lines · David Carlier

The SEC2 mailbox debug output formats MBOX1 without a colon separator, producing "MBOX10xdead" instead of "MBOX1: 0xdead". The GSP debug message a few lines above uses the correct format.

Fixes 5949d419c193 ("gpu: nova-core: gsp: Boot GSP")
Signed-off-by David Carlier <[email protected]>
---
 drivers/gpu/nova-core/gsp/boot.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/nova-core/gsp/boot.rs +1 -1
index 6f707b3d1a54..18f356c9178e 100644
@@ -195,7 +195,7 @@ pub(crate) fn boot(
             Some(wpr_handle as u32),
             Some((wpr_handle >> 32) as u32),
         )?;
-        dev_dbg!(pdev, "SEC2 MBOX0: {:#x}, MBOX1{:#x}\n", mbox0, mbox1);
+        dev_dbg!(pdev, "SEC2 MBOX0: {:#x}, MBOX1: {:#x}\n", mbox0, mbox1);
 
         if mbox0 != 0 {
             dev_err!(pdev, "Booter-load failed with error {:#x}\n", mbox0);
Signature · 1 line
2.53.0

As agreed upon with Danilo, pushed into drm-rust-next! Thanks for the fix.