From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 22 Mar 2022 22:16:26 +0000 (-0500)
Subject: Merge branch 'remotes/lorenzo/pci/rcar'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4b0f6ecaba3b90daa08b10d2936a82e901c3de16;p=linux.git

Merge branch 'remotes/lorenzo/pci/rcar'

- Finish transition to L1 state in rcar_pcie_config_access() because R-Car
  can't do it on its own (Marek Vasut)

- Return PCI_ERROR_RESPONSE for reads that trigger PCIe errors (Marek
  Vasut)

* remotes/lorenzo/pci/rcar:
  PCI: rcar: Use PCI_SET_ERROR_RESPONSE after read which triggered an exception
  PCI: rcar: Finish transition to L1 state in rcar_pcie_config_access()
---

4b0f6ecaba3b90daa08b10d2936a82e901c3de16