diff options
| author | mav <mav@FreeBSD.org> | 2018-02-01 21:25:56 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2018-02-01 21:25:56 +0000 |
| commit | f35215facdf49f064beb27c7dc42e3916228a5d7 (patch) | |
| tree | 96437c66b8c81da43b70f9e8b583c2787f79aa3c | |
| parent | d647dac2515610aa47152371fc7043b4f062b736 (diff) | |
| download | FreeBSD-src-f35215facdf49f064beb27c7dc42e3916228a5d7.zip FreeBSD-src-f35215facdf49f064beb27c7dc42e3916228a5d7.tar.gz | |
MFC r327034 (by imp):
Return domain, bus, slot, and function for the transport settings in
PATH_INQ requests for nvme.
| -rw-r--r-- | sys/cam/cam_ccb.h | 5 | ||||
| -rw-r--r-- | sys/dev/nvme/nvme_sim.c | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h index bcfc2bc..d278f4d 100644 --- a/sys/cam/cam_ccb.h +++ b/sys/cam/cam_ccb.h @@ -626,6 +626,11 @@ struct ccb_pathinq_settings_sas { struct ccb_pathinq_settings_nvme { uint32_t nsid; /* Namespace ID for this path */ + uint32_t domain; + uint8_t bus; + uint8_t slot; + uint8_t function; + uint8_t extra; }; #define PATHINQ_SETTINGS_SIZE 128 diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c index 6d99cde..866c496 100644 --- a/sys/dev/nvme/nvme_sim.c +++ b/sys/dev/nvme/nvme_sim.c @@ -169,7 +169,8 @@ nvme_sim_action(struct cam_sim *sim, union ccb *ccb) break; case XPT_PATH_INQ: /* Path routing inquiry */ { - struct ccb_pathinq *cpi = &ccb->cpi; + struct ccb_pathinq *cpi = &ccb->cpi; + device_t dev = ctrlr->dev; /* * NVMe may have multiple LUNs on the same path. Current generation @@ -197,6 +198,11 @@ nvme_sim_action(struct cam_sim *sim, union ccb *ccb) cpi->protocol = PROTO_NVME; cpi->protocol_version = NVME_REV_1; /* Groks all 1.x NVMe cards */ cpi->xport_specific.nvme.nsid = ns->id; + cpi->xport_specific.nvme.domain = pci_get_domain(dev); + cpi->xport_specific.nvme.bus = pci_get_bus(dev); + cpi->xport_specific.nvme.slot = pci_get_slot(dev); + cpi->xport_specific.nvme.function = pci_get_function(dev); + cpi->xport_specific.nvme.extra = 0; cpi->ccb_h.status = CAM_REQ_CMP; break; } |
