Merge branch 'devel'

Author: kelvin-cao

nvme-topology.c

@@ -148,7 +148,7 @@ static int scan_namespace(struct nvme_namespace *n)
 	if (ret < 0)
 		return ret;
 
-	fd = open(path, O_RDONLY);
+	fd = open_global_device(path);
 	if (fd < 0)
 		goto free;
 
@@ -160,7 +160,7 @@ static int scan_namespace(struct nvme_namespace *n)
 	if (ret < 0)
 		goto close_fd;
 close_fd:
-	close(fd);
+	close_global_device();
 free:
 	free(path);
 	return 0;
@@ -357,21 +357,21 @@ static int verify_legacy_ns(struct nvme_namespace *n)
 		char tmp_address[64] = "";
 		legacy_get_pci_bdf(path, tmp_address);
 		if (tmp_address[0]) {
-			if (asprintf(&n->ctrl->transport, "pcie") != 1)
+			if (asprintf(&n->ctrl->transport, "pcie") < 0)
 				return -1;
-			if (asprintf(&n->ctrl->address, "%s", tmp_address) != 1)
+			if (asprintf(&n->ctrl->address, "%s", tmp_address) < 0)
 				return -1;
 		}
 	}
 
-	fd = open(path, O_RDONLY);
+	fd = open_global_device(path);
 	free (path);
 
 	if (fd < 0)
 		return fd;
 
 	ret = nvme_identify_ctrl(fd, &id);
-	close(fd);
+	close_global_device();
 
 	if (ret)
 		return ret;
@@ -426,10 +426,10 @@ static int legacy_list(struct nvme_topology *t)
 			continue;
 		ret = 0;
 
-		fd = open(path, O_RDONLY);
-		if (fd > 0) {
+		fd = open_global_device(path);
+		if (fd >= 0) {
 			nvme_identify_ctrl(fd, &c->id);
-			close(fd);
+			close_global_device();
 		}
 		free(path);
 

nvme.c

@@ -148,7 +148,7 @@ static void *nvme_alloc(size_t len, bool *huge)
 
 extern struct nvme_device *global_device;
 
-static int open_dev(char *dev)
+int open_global_device(char *dev)
 {
 	int err, fd;
 	char device_str[64];
@@ -178,7 +178,6 @@ static int open_dev(char *dev)
 		if (!pax->dev) {
 			switchtec_perror(device_str);
 			free(pax);
-			printf("return here\n");
 			global_device  = NULL;
 			return -ENODEV;
 		}
@@ -214,6 +213,7 @@ static int open_dev(char *dev)
 		}
 
 		rc = malloc(sizeof(struct rc_nvme_device));
+		rc->fd = fd;
 		rc->device.ops = &rc_ops;
 		global_device = &rc->device;
 		global_device->type = NVME_DEVICE_TYPE_RC;
@@ -227,27 +227,31 @@ static int open_dev(char *dev)
 	return err;
 }
 
-int close_dev(struct nvme_device *device)
+int close_global_device()
 {
-	if (!device)
+	struct rc_nvme_device *rc;
+
+	if (!global_device)
 		return 0;
 
-	if (device->type == NVME_DEVICE_TYPE_PAX) {
+	if (global_device->type == NVME_DEVICE_TYPE_PAX) {
 		struct pax_nvme_device *pax;
-		pax = to_pax_nvme_device(device);
+		pax = to_pax_nvme_device(global_device);
 
 		if (pax->channel_status == SWITCHTEC_EP_TUNNEL_DISABLED)
 			switchtec_ep_tunnel_disable(pax->dev, pax->pdfid);
 
 		switchtec_close(pax->dev);
 		free(pax);
 
+		global_device = NULL;
 		return 0;
-	} else if (device->type == NVME_DEVICE_TYPE_RC) {
-		struct rc_nvme_device *rc;
-		rc = to_rc_nvme_device(device);
+	} else if (global_device->type == NVME_DEVICE_TYPE_RC) {
+		rc = to_rc_nvme_device(global_device);
+		close(rc->fd);
 		free(rc);
 
+		global_device = NULL;
 		return 0;
 	}
 
@@ -272,7 +276,7 @@ static int get_dev(int argc, char **argv)
 	if (ret)
 		return ret;
 
-	return open_dev(argv[optind]);
+	return open_global_device(argv[optind]);
 }
 
 int parse_and_open(int argc, char **argv, const char *desc,
@@ -2313,8 +2317,8 @@ static int fw_download(int argc, char **argv, struct command *cmd, struct plugin
 	}
 
 	buf = fw_buf;
-	if (cfg.xfer == 0 || cfg.xfer % 4096)
-		cfg.xfer = 4096;
+
+	cfg.xfer = 512;
 	if (read(fw_fd, fw_buf, fw_size) != ((ssize_t)(fw_size))) {
 		err = -errno;
 		fprintf(stderr, "read :%s :%s\n", cfg.fw, strerror(errno));
@@ -4930,7 +4934,7 @@ int main(int argc, char **argv)
 		general_help(&builtin);
 
 
-	close_dev(global_device);
+	close_global_device();
 
 	return err;
 }

nvme.h

@@ -107,4 +107,7 @@ void free_topology(struct nvme_topology *t);
 char *get_nvme_subsnqn(char *path);
 char *nvme_get_ctrl_attr(char *path, const char *attr);
 
+int open_global_device(char *dev);
+int close_global_device();
+
 #endif /* _NVME_H */

plugins/microchip/rc-nvme-device.h

@@ -28,6 +28,7 @@
 #include "nvme-device.h"
 
 struct rc_nvme_device {
+	int fd;
 	struct nvme_device device;
 };
 

plugins/microchip/switchtec-nvme-device.c

@@ -25,12 +25,16 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <inttypes.h>
+#include <errno.h>
 #include "nvme-device.h"
 #include "switchtec-nvme-device.h"
 
 #include <switchtec/switchtec.h>
 #include <switchtec/fabric.h>
 #include <switchtec/mrpc.h>
+#include <switchtec/errors.h>
+
+#define INVALID_MRPC_CMD (SWITCHTEC_ERRNO_MRPC_FLAG_BIT | ERR_CMD_INVALID)
 
 struct switchtec_device_manage_nvme_req
 {
@@ -48,15 +52,26 @@ struct switchtec_device_manage_nvme_rsp
 	uint8_t nvme_data[SWITCHTEC_DEVICE_MANAGE_MAX_RESP - (4 * 4)];
 };
 
+struct switchtec_admin_passthru_nvme_req {
+	uint32_t nvme_sqe[16];
+	uint8_t nvme_data[SWITCHTEC_NVME_ADMIN_PASSTHRU_MAX_DATA_LEN -
+				(16 * 4)];
+};
 
-int pax_nvme_submit_admin_passthru(int fd, struct nvme_passthru_cmd *cmd)
+struct switchtec_admin_passthru_nvme_rsp {
+	uint32_t nvme_cqe[4];
+	uint8_t nvme_data[4096];
+};
+
+int pax_nvme_submit_admin_passthru_1k_rsp(int fd,
+					  struct nvme_passthru_cmd *cmd)
 {
 	int ret;
 
 	struct pax_nvme_device *pax;
 	struct switchtec_device_manage_nvme_req req;
 	struct switchtec_device_manage_nvme_rsp rsp;
-	int data_len;
+	size_t data_len = 0;
 	int status;
 
 	memset(&req, 0, sizeof(req));
@@ -69,23 +84,22 @@ int pax_nvme_submit_admin_passthru(int fd, struct nvme_passthru_cmd *cmd)
 	/* sqe[9] should be 0 per spec */
 	req.nvme_sqe[9] = 0;
 
-	if (cmd->data_len > sizeof(req.nvme_data))
-		data_len = sizeof(req.nvme_data);
-	else
-		data_len = cmd->data_len;
+	if (cmd->opcode & 0x1) {
+		if (cmd->data_len > sizeof(req.nvme_data))
+			data_len = sizeof(req.nvme_data);
+		else
+			data_len = cmd->data_len;
 
-	memcpy(req.nvme_data, (void *)cmd->addr, data_len);
+		memcpy(req.nvme_data, (void *)cmd->addr, data_len);
+	}
 
 	req.hdr.expected_rsp_len = (sizeof(rsp.nvme_cqe) + sizeof(rsp.nvme_data));
 
 	ret = switchtec_device_manage(pax->dev,
 				     (struct switchtec_device_manage_req *)&req,
 				     (struct switchtec_device_manage_rsp *)&rsp);
-
-	if (ret) {
-		switchtec_perror("device_manage_cmd");
+	if (ret)
 		return ret;
-	}
 
 	status = (rsp.nvme_cqe[3] & 0xfffe0000) >> 17;
 	if (!status) {
@@ -100,6 +114,70 @@ int pax_nvme_submit_admin_passthru(int fd, struct nvme_passthru_cmd *cmd)
 	return status;
 }
 
+int pax_nvme_submit_admin_passthru_4k_rsp(int fd,
+					  struct nvme_passthru_cmd *cmd)
+{
+	int ret;
+
+	struct pax_nvme_device *pax;
+	struct switchtec_admin_passthru_nvme_req req;
+	struct switchtec_admin_passthru_nvme_rsp rsp;
+	size_t data_len = 0;
+	size_t rsp_len;
+	int status;
+
+	memset(&req, 0, sizeof(req));
+	memset(&rsp, 0, sizeof(rsp));
+	pax = to_pax_nvme_device(global_device);
+
+	memcpy(&req.nvme_sqe, cmd, 16 * 4);
+
+	/* sqe[9] should be 0 per spec */
+	req.nvme_sqe[9] = 0;
+
+	if (cmd->opcode & 0x1) {
+		if (cmd->data_len > sizeof(req.nvme_data))
+			data_len = sizeof(req.nvme_data);
+		else
+			data_len = cmd->data_len;
+
+		memcpy(req.nvme_data, (void *)cmd->addr, data_len);
+	}
+
+	data_len = data_len + 16 * 4;
+
+	rsp_len = (sizeof(rsp.nvme_cqe) + cmd->data_len);
+
+	ret = switchtec_nvme_admin_passthru(pax->dev, pax->pdfid,
+					    data_len, &req,
+					    &rsp_len, &rsp);
+	if (ret)
+		return ret;
+
+	status = (rsp.nvme_cqe[3] & 0xfffe0000) >> 17;
+	if (!status) {
+		cmd->result = rsp.nvme_cqe[0];
+		if (cmd->addr) {
+			memcpy((uint64_t *)cmd->addr,
+				rsp.nvme_data,
+				rsp_len - 4 * 4);
+		}
+	}
+
+	return status;
+}
+
+int pax_nvme_submit_admin_passthru(int fd, struct nvme_passthru_cmd *cmd)
+{
+	int ret;
+
+	ret = pax_nvme_submit_admin_passthru_4k_rsp(fd, cmd);
+	if (ret && errno == INVALID_MRPC_CMD)
+		ret = pax_nvme_submit_admin_passthru_1k_rsp(fd, cmd);
+
+	return ret;
+}
+
 int pax_nvme_io(int fd, struct nvme_user_io *io)
 {
 	fprintf(stderr, "%s not implemented.\n", __FUNCTION__);
@@ -126,8 +204,13 @@ int pax_nvme_ns_rescan(int fd)
 
 int pax_nvme_submit_passthru(int fd, int ioctl_cmd, struct nvme_passthru_cmd *cmd)
 {
-	fprintf(stderr, "%s not implemented.\n", __FUNCTION__);
-	return -1;
+	if (ioctl_cmd != (int)NVME_IOCTL_ADMIN_CMD) {
+		fprintf(stderr, "%s only supports NVME_IOCTL_ADMIN_CMD.\n",
+			__FUNCTION__);
+		return -1;
+	}
+
+	return pax_nvme_submit_admin_passthru(fd, cmd);
 }
 
 int pax_nvme_submit_io_passthru(int fd, struct nvme_passthru_cmd *cmd)

plugins/microchip/switchtec-nvme.c

@@ -79,7 +79,7 @@ int get_nvme_info(int fd, struct list_item *item, const char *node)
 	if (item->nsid <= 0)
 		return item->nsid;
 	err = nvme_identify_ns(fd, item->nsid,
-			       0, &item->ns);
+			       1, &item->ns);
 	if (err)
 		return err;
 	strcpy(item->node, node);