From owner-svn-src-all@freebsd.org Tue Nov 14 05:05:29 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5FE15D1F43B; Tue, 14 Nov 2017 05:05:29 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4C0D66F023; Tue, 14 Nov 2017 05:05:27 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAE55Qxs042729; Tue, 14 Nov 2017 05:05:26 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAE55Qaw042726; Tue, 14 Nov 2017 05:05:26 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201711140505.vAE55Qaw042726@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 14 Nov 2017 05:05:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325796 - head/sys/cam/nvme X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/cam/nvme X-SVN-Commit-Revision: 325796 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Nov 2017 05:05:30 -0000 Author: imp Date: Tue Nov 14 05:05:26 2017 New Revision: 325796 URL: https://svnweb.freebsd.org/changeset/base/325796 Log: Properly decode NVMe state of the drive and print out the information in the attach to more closely match what SCSI and ATA attached storage provides. Sponsored by: Netflix Modified: head/sys/cam/nvme/nvme_all.c head/sys/cam/nvme/nvme_all.h head/sys/cam/nvme/nvme_xpt.c Modified: head/sys/cam/nvme/nvme_all.c ============================================================================== --- head/sys/cam/nvme/nvme_all.c Tue Nov 14 05:05:21 2017 (r325795) +++ head/sys/cam/nvme/nvme_all.c Tue Nov 14 05:05:26 2017 (r325796) @@ -87,9 +87,16 @@ nvme_identify_match(caddr_t identbuffer, caddr_t table void nvme_print_ident(const struct nvme_controller_data *cdata, - const struct nvme_namespace_data *data) + const struct nvme_namespace_data *data, struct sbuf *sb) { - printf("I'm a pretty NVME drive\n"); + + sbuf_printf(sb, "<"); + cam_strvis_sbuf(sb, cdata->mn, sizeof(cdata->mn), 0); + sbuf_printf(sb, " "); + cam_strvis_sbuf(sb, cdata->fr, sizeof(cdata->fr), 0); + sbuf_printf(sb, " "); + cam_strvis_sbuf(sb, cdata->sn, sizeof(cdata->sn), 0); + sbuf_printf(sb, ">\n"); } /* XXX need to do nvme admin opcodes too, but those aren't used yet by nda */ Modified: head/sys/cam/nvme/nvme_all.h ============================================================================== --- head/sys/cam/nvme/nvme_all.h Tue Nov 14 05:05:21 2017 (r325795) +++ head/sys/cam/nvme/nvme_all.h Tue Nov 14 05:05:26 2017 (r325796) @@ -39,7 +39,8 @@ void nvme_ns_cmd(struct ccb_nvmeio *nvmeio, uint8_t cm int nvme_identify_match(caddr_t identbuffer, caddr_t table_entry); -void nvme_print_ident(const struct nvme_controller_data *, const struct nvme_namespace_data *); +struct sbuf; +void nvme_print_ident(const struct nvme_controller_data *, const struct nvme_namespace_data *, struct sbuf *); const char *nvme_op_string(const struct nvme_command *); const char *nvme_cmd_string(const struct nvme_command *, char *, size_t); const void *nvme_get_identify_cntrl(struct cam_periph *); Modified: head/sys/cam/nvme/nvme_xpt.c ============================================================================== --- head/sys/cam/nvme/nvme_xpt.c Tue Nov 14 05:05:21 2017 (r325795) +++ head/sys/cam/nvme/nvme_xpt.c Tue Nov 14 05:05:26 2017 (r325796) @@ -619,35 +619,49 @@ nvme_announce_periph(struct cam_periph *periph) struct ccb_pathinq cpi; struct ccb_trans_settings cts; struct cam_path *path = periph->path; + struct ccb_trans_settings_nvme *nvmex; cam_periph_assert(periph, MA_OWNED); + /* Ask the SIM for connection details */ xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; cts.type = CTS_TYPE_CURRENT_SETTINGS; xpt_action((union ccb*)&cts); if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) return; + nvmex = &cts.xport_specific.nvme; + /* Ask the SIM for its base transfer speed */ xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NORMAL); cpi.ccb_h.func_code = XPT_PATH_INQ; xpt_action((union ccb *)&cpi); - /* XXX NVME STUFF HERE */ + printf("%s%d: nvme version %d.%d x%d (max x%d) lanes PCIe Gen%d (max Gen%d) link", + periph->periph_name, periph->unit_number, + NVME_MAJOR(nvmex->spec), + NVME_MINOR(nvmex->spec), + nvmex->lanes, nvmex->max_lanes, + nvmex->speed, nvmex->max_speed); printf("\n"); } static void nvme_proto_announce(struct cam_ed *device) { + struct sbuf sb; + char buffer[120]; - nvme_print_ident(device->nvme_cdata, device->nvme_data); + sbuf_new(&sb, buffer, sizeof(buffer), SBUF_FIXEDLEN); + nvme_print_ident(device->nvme_cdata, device->nvme_data, &sb); + sbuf_finish(&sb); + sbuf_putbuf(&sb); } static void nvme_proto_denounce(struct cam_ed *device) { - nvme_print_ident(device->nvme_cdata, device->nvme_data); + nvme_proto_announce(device); } static void