Merge branch '2021-08-05-drop-almost-all-pre-dm_pci-code'

- Remove the majority of our pre-DM_PCI PCI code as DM_PCI is true in
  almost all cases now.