Skip to contentSkip to conversation

hw/block/nvme: Simplify timestamp sum

PATCH Applied Philippe Mathieu-Daudé 3 participants 3 messages Oct 2, 2020 – Oct 12, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/block/nvme: Simplify timestamp sum

As the 'timestamp' variable is declared as a 48-bit bitfield, we do not need to wrap the sum result.

---
 hw/block/nvme.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
hw/block/nvme.c +1 -6
index 63078f6009..44fa5b9076 100644
@@ -1280,12 +1280,7 @@ static inline uint64_t nvme_get_timestamp(const NvmeCtrl *n)
 
     union nvme_timestamp ts;
     ts.all = 0;
-
-    /*
-     * If the sum of the Timestamp value set by the host and the elapsed
-     * time exceeds 2^48, the value returned should be reduced modulo 2^48.
-     */
-    ts.timestamp = (n->host_timestamp + elapsed_time) & 0xffffffffffff;
+    ts.timestamp = n->host_timestamp + elapsed_time;
 
     /* If the host timestamp is non-zero, set the timestamp origin */
     ts.origin = n->host_timestamp ? 0x01 : 0x00;
Signature · 1 line
2.26.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Philippe Mathieu-Daudé

As the 'timestamp' variable is declared as a 48-bit bitfield, we do not need to wrap the sum result.

Quoted 26 lines
---
 hw/block/nvme.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
hw/block/nvme.c +1 -6
index 63078f6009..44fa5b9076 100644
@@ -1280,12 +1280,7 @@ static inline uint64_t nvme_get_timestamp(const NvmeCtrl *n)
 
     union nvme_timestamp ts;
     ts.all = 0;
-
-    /*
-     * If the sum of the Timestamp value set by the host and the elapsed
-     * time exceeds 2^48, the value returned should be reduced modulo 2^48.
-     */
-    ts.timestamp = (n->host_timestamp + elapsed_time) & 0xffffffffffff;
+    ts.timestamp = n->host_timestamp + elapsed_time;
 
     /* If the host timestamp is non-zero, set the timestamp origin */
     ts.origin = n->host_timestamp ? 0x01 : 0x00;
Signature · 1 line
2.26.2
Signature · 1 line
One of us - No more doubt, silence or taboo about mental illness.
#2 lore raw
In reply to Philippe Mathieu-Daudé

Le 02/10/2020 à 09:57, Philippe Mathieu-Daudé a écrit :

Quoted 17 lines

As the 'timestamp' variable is declared as a 48-bit bitfield, we do not need to wrap the sum result.

---
 hw/block/nvme.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
hw/block/nvme.c +0 -0
index 63078f6009..44fa5b9076 100644
@@ -1280,12 +1280,7 @@ static inline uint64_t nvme_get_timestamp(const NvmeCtrl *n)
 
     union nvme_timestamp ts;
     ts.all = 0;

hw/block/nvme.c static inline uint64_t nvme_get_timestamp(const NvmeCtrl *n) · line 1286

Quoted 10 lines
hw/block/nvme.c +1 -6
-
-    /*
-     * If the sum of the Timestamp value set by the host and the elapsed
-     * time exceeds 2^48, the value returned should be reduced modulo 2^48.
-     */
-    ts.timestamp = (n->host_timestamp + elapsed_time) & 0xffffffffffff;
+    ts.timestamp = n->host_timestamp + elapsed_time;
 
     /* If the host timestamp is non-zero, set the timestamp origin */
     ts.origin = n->host_timestamp ? 0x01 : 0x00;

Applied to my trivial-patches branch.

Thanks,
Laurent