Page MenuHomeFreeBSD
Files F98591607

D33287.id99517.diff
No OneTemporary
Actions

D33287.id99517.diff
View Options

Index: sys/dev/nvme/nvme_sim.c
===================================================================
--- sys/dev/nvme/nvme_sim.c
+++ sys/dev/nvme/nvme_sim.c
@@ -172,6 +172,13 @@
struct ccb_pathinq *cpi = &ccb->cpi;
device_t dev = ctrlr->dev;
+ /*
+ * For devices that are reported as children of the AHCI
+ * controller, which has no access to the config space for this
+ * controller, report the AHCI controller's data.
+ */
+ if (ctrlr->quirks & QUIRK_AHCI)
+ dev = device_get_parent(dev);
cpi->version_num = 1;
cpi->hba_inquiry = 0;
cpi->target_sprt = 0;
@@ -219,17 +226,20 @@
nvmex = &cts->xport_specific.nvme;
nvmep = &cts->proto_specific.nvme;
- status = pcie_read_config(dev, PCIER_LINK_STA, 2);
- caps = pcie_read_config(dev, PCIER_LINK_CAP, 2);
- flags = pcie_read_config(dev, PCIER_FLAGS, 2);
nvmex->spec = nvme_mmio_read_4(ctrlr, vs);
nvmex->valid = CTS_NVME_VALID_SPEC;
- if ((flags & PCIEM_FLAGS_TYPE) == PCIEM_TYPE_ENDPOINT) {
- nvmex->valid |= CTS_NVME_VALID_LINK;
- nvmex->speed = status & PCIEM_LINK_STA_SPEED;
- nvmex->lanes = (status & PCIEM_LINK_STA_WIDTH) >> 4;
- nvmex->max_speed = caps & PCIEM_LINK_CAP_MAX_SPEED;
- nvmex->max_lanes = (caps & PCIEM_LINK_CAP_MAX_WIDTH) >> 4;
+ if ((ctrlr->quirks & QUIRK_AHCI) == 0) {
+ /* AHCI redirect makes it impossible to query */
+ status = pcie_read_config(dev, PCIER_LINK_STA, 2);
+ caps = pcie_read_config(dev, PCIER_LINK_CAP, 2);
+ flags = pcie_read_config(dev, PCIER_FLAGS, 2);
+ if ((flags & PCIEM_FLAGS_TYPE) == PCIEM_TYPE_ENDPOINT) {
+ nvmex->valid |= CTS_NVME_VALID_LINK;
+ nvmex->speed = status & PCIEM_LINK_STA_SPEED;
+ nvmex->lanes = (status & PCIEM_LINK_STA_WIDTH) >> 4;
+ nvmex->max_speed = caps & PCIEM_LINK_CAP_MAX_SPEED;
+ nvmex->max_lanes = (caps & PCIEM_LINK_CAP_MAX_WIDTH) >> 4;
+ }
}
/* XXX these should be something else maybe ? */

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 4, 11:33 PM (10 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13591621
Default Alt Text
D33287.id99517.diff (1 KB)

Event Timeline