[Eric: proposed reproducing steps]4696b828ca37 only*moves* drivers/pci/pcie/aer/aerdrv.c to
Fixes: 4696b828ca37 ("PCI/AER: Hoist aerdrv.c, aer_inject.c up to drivers/pci/pcie/")
drivers/pci/pcie/aer.c, so I don't think it's related.
I think the actual change of interest is e167bfcaa4cd ("PCI: aerdrv:
remove magical ROOT_ERR_STATUS_MASKS") [1]. It looks like we did
exactly what you propose before that commit.
I can update this unless you disagree.
[1]https://git.kernel.org/linus/e167bfcaa4cd