Attachment #183787 for bug #220267

View | Details | Raw Unified | Return to bug 220267
Collapse All | Expand All

Lines 627-633 struct ccb_pathinq_settings_sas { Link Here

(-)b/sys/cam/cam_ccb.h (-1 / +1 lines)
627	};	627	};
628		628
629	struct ccb_pathinq_settings_nvme {	629	struct ccb_pathinq_settings_nvme {
630	uint16_t nsid; /* Namespace ID for this path */	630	uint32_t nsid; /* Namespace ID for this path */
631	};	631	};
632		632
633	#define PATHINQ_SETTINGS_SIZE 128	633	#define PATHINQ_SETTINGS_SIZE 128

Lines 743-749 ndaregister(struct cam_periph periph, void arg) Link Here

(-)b/sys/cam/nvme/nvme_da.c (-1 / +1 lines)
743	/*	743	/*
744	* The name space ID is the lun, save it for later I/O	744	* The name space ID is the lun, save it for later I/O
745	*/	745	*/
746	softc->nsid = (uint16_t)xpt_path_lun_id(periph->path);	746	softc->nsid = (uint32_t)xpt_path_lun_id(periph->path);
747		747
748	/*	748	/*
749	* Register this media as a disk	749	* Register this media as a disk





/* Command building helper functions -- shared with CAM */
static inline
void	nvme_ns_flush_cmd(struct nvme_command *cmd, uint32_t nsid)
{

	cmd->opc = NVME_OPC_FLUSH;

}

static inline
void	nvme_ns_rw_cmd(struct nvme_command *cmd, uint32_t rwcmd, uint32_t nsid,
    uint64_t lba, uint32_t count)
{
	cmd->opc = rwcmd;

}

static inline
void	nvme_ns_write_cmd(struct nvme_command *cmd, uint32_t nsid,
    uint64_t lba, uint32_t count)
{
	nvme_ns_rw_cmd(cmd, NVME_OPC_WRITE, nsid, lba, count);
}

static inline
void	nvme_ns_read_cmd(struct nvme_command *cmd, uint32_t nsid,
    uint64_t lba, uint32_t count)
{
	nvme_ns_rw_cmd(cmd, NVME_OPC_READ, nsid, lba, count);
}

static inline
void	nvme_ns_trim_cmd(struct nvme_command *cmd, uint32_t nsid,
    uint32_t num_ranges)
{
	cmd->opc = NVME_OPC_DATASET_MANAGEMENT;

Lines 52-58 nvme_ctrlr_cmd_identify_controller(struct nvme_controller ctrlr, void payload, Link Here

(-)b/sys/dev/nvme/nvme_ctrlr_cmd.c (-1 / +1 lines)
52	}	52	}
53		53
54	void	54	void
55	nvme_ctrlr_cmd_identify_namespace(struct nvme_controller *ctrlr, uint16_t nsid,	55	nvme_ctrlr_cmd_identify_namespace(struct nvme_controller *ctrlr, uint32_t nsid,
56	void payload, nvme_cb_fn_t cb_fn, void cb_arg)	56	void payload, nvme_cb_fn_t cb_fn, void cb_arg)
57	{	57	{
58	struct nvme_request *req;	58	struct nvme_request *req;

Lines 357-363 void nvme_ctrlr_cmd_identify_controller(struct nvme_controller *ctrlr, Link Here

(-)b/sys/dev/nvme/nvme_private.h (-2 / +1 lines)
357	void *payload,	357	void *payload,
358	nvme_cb_fn_t cb_fn, void *cb_arg);	358	nvme_cb_fn_t cb_fn, void *cb_arg);
359	void nvme_ctrlr_cmd_identify_namespace(struct nvme_controller *ctrlr,	359	void nvme_ctrlr_cmd_identify_namespace(struct nvme_controller *ctrlr,
360	uint16_t nsid, void *payload,	360	uint32_t nsid, void *payload,
361	nvme_cb_fn_t cb_fn, void *cb_arg);	361	nvme_cb_fn_t cb_fn, void *cb_arg);
362	void nvme_ctrlr_cmd_set_interrupt_coalescing(struct nvme_controller *ctrlr,	362	void nvme_ctrlr_cmd_set_interrupt_coalescing(struct nvme_controller *ctrlr,
363	uint32_t microseconds,	363	uint32_t microseconds,
364	-

Return to bug 220267

Lines 942-948 int nvme_ns_bio_process(struct nvme_namespace ns, struct bio bp, Link Here

(-)b/sys/dev/nvme/nvme.h (-5 / +5 lines)
942		942
943	/* Command building helper functions -- shared with CAM */	943	/* Command building helper functions -- shared with CAM */
944	static inline	944	static inline
945	void nvme_ns_flush_cmd(struct nvme_command *cmd, uint16_t nsid)	945	void nvme_ns_flush_cmd(struct nvme_command *cmd, uint32_t nsid)
946	{	946	{
947		947
948	cmd->opc = NVME_OPC_FLUSH;	948	cmd->opc = NVME_OPC_FLUSH;
Lines 950-956 void nvme_ns_flush_cmd(struct nvme_command *cmd, uint16_t nsid) Link Here
950	}	950	}
951		951
952	static inline	952	static inline
953	void nvme_ns_rw_cmd(struct nvme_command *cmd, uint32_t rwcmd, uint16_t nsid,	953	void nvme_ns_rw_cmd(struct nvme_command *cmd, uint32_t rwcmd, uint32_t nsid,
954	uint64_t lba, uint32_t count)	954	uint64_t lba, uint32_t count)
955	{	955	{
956	cmd->opc = rwcmd;	956	cmd->opc = rwcmd;
Lines 964-984 void nvme_ns_rw_cmd(struct nvme_command *cmd, uint32_t rwcmd, uint16_t nsid, Link Here
964	}	964	}
965		965
966	static inline	966	static inline
967	void nvme_ns_write_cmd(struct nvme_command *cmd, uint16_t nsid,	967	void nvme_ns_write_cmd(struct nvme_command *cmd, uint32_t nsid,
968	uint64_t lba, uint32_t count)	968	uint64_t lba, uint32_t count)
969	{	969	{
970	nvme_ns_rw_cmd(cmd, NVME_OPC_WRITE, nsid, lba, count);	970	nvme_ns_rw_cmd(cmd, NVME_OPC_WRITE, nsid, lba, count);
971	}	971	}
972		972
973	static inline	973	static inline
974	void nvme_ns_read_cmd(struct nvme_command *cmd, uint16_t nsid,	974	void nvme_ns_read_cmd(struct nvme_command *cmd, uint32_t nsid,
975	uint64_t lba, uint32_t count)	975	uint64_t lba, uint32_t count)
976	{	976	{
977	nvme_ns_rw_cmd(cmd, NVME_OPC_READ, nsid, lba, count);	977	nvme_ns_rw_cmd(cmd, NVME_OPC_READ, nsid, lba, count);
978	}	978	}
979		979
980	static inline	980	static inline
981	void nvme_ns_trim_cmd(struct nvme_command *cmd, uint16_t nsid,	981	void nvme_ns_trim_cmd(struct nvme_command *cmd, uint32_t nsid,
982	uint32_t num_ranges)	982	uint32_t num_ranges)
983	{	983	{
984	cmd->opc = NVME_OPC_DATASET_MANAGEMENT;	984	cmd->opc = NVME_OPC_DATASET_MANAGEMENT;