It seems weird that a subsystem has a serial.But that's actually how NVMe defines them.
Where is that wording?
Which mean we first need to fix our code to generate a serial number per subsystem, and on top of that the patch from Johannes seems perfectly reasonable.
If that is indeed the case then sure.