Split-out SID-getting code to a separate functions. Also ensure we are dealing with PCI-class devices.
Sponsored by: UKRI