All of lore.kernel.org
 help / color / mirror / Atom feed
From: Klaus Jensen <its@irrelevant.dk>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Klaus Jensen <k.jensen@samsung.com>,
	qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
	Klaus Jensen <its@irrelevant.dk>, Keith Busch <kbusch@kernel.org>,
	Maxim Levitsky <mlevitsk@redhat.com>
Subject: [PATCH 04/17] hw/block/nvme: add temperature threshold feature
Date: Mon, 29 Jun 2020 20:26:29 +0200	[thread overview]
Message-ID: <20200629182642.1170387-5-its@irrelevant.dk> (raw)
In-Reply-To: <20200629182642.1170387-1-its@irrelevant.dk>

From: Klaus Jensen <k.jensen@samsung.com>

It might seem weird to implement this feature for an emulated device,
but it is mandatory to support and the feature is useful for testing
asynchronous event request support, which will be added in a later
patch.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Acked-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
---
 hw/block/nvme.c      | 48 ++++++++++++++++++++++++++++++++++++++++++++
 hw/block/nvme.h      |  1 +
 include/block/nvme.h |  8 +++++++-
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index b7037a7d3504..5ca50646369e 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -59,6 +59,9 @@
 #define NVME_DB_SIZE  4
 #define NVME_CMB_BIR 2
 #define NVME_PMR_BIR 2
+#define NVME_TEMPERATURE 0x143
+#define NVME_TEMPERATURE_WARNING 0x157
+#define NVME_TEMPERATURE_CRITICAL 0x175
 
 #define NVME_GUEST_ERR(trace, fmt, ...) \
     do { \
@@ -827,9 +830,31 @@ static uint16_t nvme_get_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd)
 static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)
 {
     uint32_t dw10 = le32_to_cpu(cmd->cdw10);
+    uint32_t dw11 = le32_to_cpu(cmd->cdw11);
     uint32_t result;
 
     switch (dw10) {
+    case NVME_TEMPERATURE_THRESHOLD:
+        result = 0;
+
+        /*
+         * The controller only implements the Composite Temperature sensor, so
+         * return 0 for all other sensors.
+         */
+        if (NVME_TEMP_TMPSEL(dw11) != NVME_TEMP_TMPSEL_COMPOSITE) {
+            break;
+        }
+
+        switch (NVME_TEMP_THSEL(dw11)) {
+        case NVME_TEMP_THSEL_OVER:
+            result = cpu_to_le16(n->features.temp_thresh_hi);
+            break;
+        case NVME_TEMP_THSEL_UNDER:
+            result = cpu_to_le16(n->features.temp_thresh_low);
+            break;
+        }
+
+        break;
     case NVME_VOLATILE_WRITE_CACHE:
         result = blk_enable_write_cache(n->conf.blk);
         trace_pci_nvme_getfeat_vwcache(result ? "enabled" : "disabled");
@@ -874,6 +899,23 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)
     uint32_t dw11 = le32_to_cpu(cmd->cdw11);
 
     switch (dw10) {
+    case NVME_TEMPERATURE_THRESHOLD:
+        if (NVME_TEMP_TMPSEL(dw11) != NVME_TEMP_TMPSEL_COMPOSITE) {
+            break;
+        }
+
+        switch (NVME_TEMP_THSEL(dw11)) {
+        case NVME_TEMP_THSEL_OVER:
+            n->features.temp_thresh_hi = NVME_TEMP_TMPTH(dw11);
+            break;
+        case NVME_TEMP_THSEL_UNDER:
+            n->features.temp_thresh_low = NVME_TEMP_TMPTH(dw11);
+            break;
+        default:
+            return NVME_INVALID_FIELD | NVME_DNR;
+        }
+
+        break;
     case NVME_VOLATILE_WRITE_CACHE:
         blk_set_enable_write_cache(n->conf.blk, dw11 & 1);
         break;
@@ -1454,6 +1496,7 @@ static void nvme_init_state(NvmeCtrl *n)
     n->namespaces = g_new0(NvmeNamespace, n->num_namespaces);
     n->sq = g_new0(NvmeSQueue *, n->params.max_ioqpairs + 1);
     n->cq = g_new0(NvmeCQueue *, n->params.max_ioqpairs + 1);
+    n->features.temp_thresh_hi = NVME_TEMPERATURE_WARNING;
 }
 
 static void nvme_init_blk(NvmeCtrl *n, Error **errp)
@@ -1611,6 +1654,11 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev)
     id->acl = 3;
     id->frmw = 7 << 1;
     id->lpa = 1 << 0;
+
+    /* recommended default value (~70 C) */
+    id->wctemp = cpu_to_le16(NVME_TEMPERATURE_WARNING);
+    id->cctemp = cpu_to_le16(NVME_TEMPERATURE_CRITICAL);
+
     id->sqes = (0x6 << 4) | 0x6;
     id->cqes = (0x4 << 4) | 0x4;
     id->nn = cpu_to_le32(n->num_namespaces);
diff --git a/hw/block/nvme.h b/hw/block/nvme.h
index 1bf5c80ed843..3acde10e1d2a 100644
--- a/hw/block/nvme.h
+++ b/hw/block/nvme.h
@@ -107,6 +107,7 @@ typedef struct NvmeCtrl {
     NvmeSQueue      admin_sq;
     NvmeCQueue      admin_cq;
     NvmeIdCtrl      id_ctrl;
+    NvmeFeatureVal  features;
 } NvmeCtrl;
 
 /* calculate the number of LBAs that the namespace can accomodate */
diff --git a/include/block/nvme.h b/include/block/nvme.h
index 6d1fa6ff2228..bb651d0cbf5a 100644
--- a/include/block/nvme.h
+++ b/include/block/nvme.h
@@ -860,7 +860,13 @@ enum NvmeIdCtrlOncs {
 typedef struct NvmeFeatureVal {
     uint32_t    arbitration;
     uint32_t    power_mgmt;
-    uint32_t    temp_thresh;
+    union {
+        struct {
+            uint16_t temp_thresh_hi;
+            uint16_t temp_thresh_low;
+        };
+        uint32_t temp_thresh;
+    };
     uint32_t    err_rec;
     uint32_t    volatile_wc;
     uint32_t    num_queues;
-- 
2.27.0



  parent reply	other threads:[~2020-06-29 18:32 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-29 18:26 [PATCH 00/17] hw/block/nvme: bump to v1.3 Klaus Jensen
2020-06-29 18:26 ` [PATCH 01/17] hw/block/nvme: bump spec data structures " Klaus Jensen
2020-07-03  0:44   ` Dmitry Fomichev
2020-07-03  5:42     ` Klaus Jensen
2020-06-29 18:26 ` [PATCH 02/17] hw/block/nvme: additional tracing Klaus Jensen
2020-07-03  0:44   ` Dmitry Fomichev
2020-06-29 18:26 ` [PATCH 03/17] hw/block/nvme: add support for the abort command Klaus Jensen
2020-07-03  0:44   ` Dmitry Fomichev
2020-06-29 18:26 ` Klaus Jensen [this message]
2020-07-03  0:44   ` [PATCH 04/17] hw/block/nvme: add temperature threshold feature Dmitry Fomichev
2020-07-03  5:45     ` Klaus Jensen
2020-06-29 18:26 ` [PATCH 05/17] hw/block/nvme: mark fw slot 1 as read-only Klaus Jensen
2020-07-03  0:44   ` Dmitry Fomichev
2020-06-29 18:26 ` [PATCH 06/17] hw/block/nvme: add support for the get log page command Klaus Jensen
2020-07-03  0:45   ` Dmitry Fomichev
2020-07-03  5:51     ` Klaus Jensen
2020-06-29 18:26 ` [PATCH 07/17] hw/block/nvme: add support for the asynchronous event request command Klaus Jensen
2020-07-03  0:45   ` Dmitry Fomichev
2020-06-29 18:26 ` [PATCH 08/17] hw/block/nvme: move NvmeFeatureVal into hw/block/nvme.h Klaus Jensen
2020-07-03  0:45   ` Dmitry Fomichev
2020-06-29 18:26 ` [PATCH 09/17] hw/block/nvme: flush write cache when disabled Klaus Jensen
2020-07-03  0:45   ` Dmitry Fomichev
2020-06-29 18:26 ` [PATCH 10/17] hw/block/nvme: fix missing endian conversion Klaus Jensen
2020-07-03  0:45   ` Dmitry Fomichev
2020-06-29 18:26 ` [PATCH 11/17] hw/block/nvme: add remaining mandatory controller parameters Klaus Jensen
2020-07-03  0:46   ` Dmitry Fomichev
2020-07-03  5:52     ` Klaus Jensen
2020-06-29 18:26 ` [PATCH 12/17] hw/block/nvme: support the get/set features select and save fields Klaus Jensen
2020-07-03  0:46   ` Dmitry Fomichev
2020-07-03  6:03     ` Klaus Jensen
2020-06-29 18:26 ` [PATCH 13/17] hw/block/nvme: make sure ncqr and nsqr is valid Klaus Jensen
2020-07-03  0:46   ` Dmitry Fomichev
2020-06-29 18:26 ` [PATCH 14/17] hw/block/nvme: support identify namespace descriptor list Klaus Jensen
2020-07-03  0:46   ` Dmitry Fomichev
2020-06-29 18:26 ` [PATCH 15/17] hw/block/nvme: enforce valid queue creation sequence Klaus Jensen
2020-07-03  0:47   ` Dmitry Fomichev
2020-06-29 18:26 ` [PATCH 16/17] hw/block/nvme: provide the mandatory subnqn field Klaus Jensen
2020-07-03  0:47   ` Dmitry Fomichev
2020-06-29 18:26 ` [PATCH 17/17] hw/block/nvme: bump supported version to v1.3 Klaus Jensen
2020-07-03  0:47   ` Dmitry Fomichev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200629182642.1170387-5-its@irrelevant.dk \
    --to=its@irrelevant.dk \
    --cc=k.jensen@samsung.com \
    --cc=kbusch@kernel.org \
    --cc=kwolf@redhat.com \
    --cc=mlevitsk@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.