]> git.baikalelectronics.ru Git - kernel.git/commit
nvme: retain split access workaround for capability reads
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Thu, 3 Oct 2019 11:57:29 +0000 (13:57 +0200)
committerSagi Grimberg <sagi@grimberg.me>
Sat, 5 Oct 2019 00:10:12 +0000 (17:10 -0700)
commitb3e060af293acc4152b2bd4c48c35fb8942aa93b
treeb693b82efcc842fc000db2068151af8475e53f95
parentf087d2552b73005dc79d8df72308b91414c40060
nvme: retain split access workaround for capability reads

Commit cb7c53e0f14a5

  "nvme: add a common helper to read Identify Controller data"

has re-introduced an issue that we have attempted to work around in the
past, in commit 7a24e239da77 ("NVMe: use split lo_hi_{read,write}q").

The problem is that some PCIe NVMe controllers do not implement 64-bit
outbound accesses correctly, which is why the commit above switched
to using lo_hi_[read|write]q for all 64-bit BAR accesses occuring in
the code.

In the mean time, the NVMe subsystem has been refactored, and now calls
into the PCIe support layer for NVMe via a .reg_read64() method, which
fails to use lo_hi_readq(), and thus reintroduces the problem that the
workaround above aimed to address.

Given that, at the moment, .reg_read64() is only used to read the
capability register [which is known to tolerate split reads], let's
switch .reg_read64() to lo_hi_readq() as well.

This fixes a boot issue on some ARM boxes with NVMe behind a Synopsys
DesignWare PCIe host controller.

Fixes: cb7c53e0f14a5 ("nvme: add a common helper to read Identify Controller data")
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
drivers/nvme/host/pci.c