NVMe timeout / aborting outstanding i/o (again)

[Theron]

With latest 12.1-STABLE (r354687), I have file access 30 second hang 
problem again when resuming from suspend, with dmesg:

nvme0: Resetting controller due to a timeout.
nvme0: resetting controller
nvme0: aborting outstanding i/o
nvme0: aborting outstanding i/o
(...)
nvme0: aborting outstanding i/o
nvme0: aborting outstanding i/o
nvme0: nvme0: aborting outstanding i/o
async event occurred (type 0x0, info 0x00, page 0x01)
nvme0: aborting outstanding i/o
nvme0: aborting outstanding i/o
(...)

I thought this was fixed with r351914 "MFC r351747: Implement nvme 
suspend / resume for pci attachment."

Latest change, r354074 "MFC r352630: Make nvme(4) driver some more NUMA 
aware.", looks suspicious, I'll test before vs. after that change when I 
can.

Is anyone else seeing this?

Theron Tarigo