[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 09/22] hw/block/nvme: remove redundant cmbloc/cmbsz members
From: |
Klaus Jensen |
Subject: |
[PATCH v7 09/22] hw/block/nvme: remove redundant cmbloc/cmbsz members |
Date: |
Tue, 9 Jun 2020 21:03:20 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200514044611.734782-11-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
hw/block/nvme.c | 7 ++-----
hw/block/nvme.h | 2 --
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 1c1d2f8b7768..61447220a873 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -76,7 +76,7 @@ static bool nvme_addr_is_cmb(NvmeCtrl *n, hwaddr addr)
static void nvme_addr_read(NvmeCtrl *n, hwaddr addr, void *buf, int size)
{
- if (n->cmbsz && nvme_addr_is_cmb(n, addr)) {
+ if (n->bar.cmbsz && nvme_addr_is_cmb(n, addr)) {
memcpy(buf, (void *)&n->cmbuf[addr - n->ctrl_mem.addr], size);
return;
}
@@ -170,7 +170,7 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector
*iov, uint64_t prp1,
if (unlikely(!prp1)) {
trace_pci_nvme_err_invalid_prp();
return NVME_INVALID_FIELD | NVME_DNR;
- } else if (n->cmbsz && prp1 >= n->ctrl_mem.addr &&
+ } else if (n->bar.cmbsz && prp1 >= n->ctrl_mem.addr &&
prp1 < n->ctrl_mem.addr + int128_get64(n->ctrl_mem.size)) {
qsg->nsg = 0;
qemu_iovec_init(iov, num_prps);
@@ -1485,9 +1485,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
NVME_CMBSZ_SET_SZU(n->bar.cmbsz, 2); /* MBs */
NVME_CMBSZ_SET_SZ(n->bar.cmbsz, n->params.cmb_size_mb);
- n->cmbloc = n->bar.cmbloc;
- n->cmbsz = n->bar.cmbsz;
-
n->cmbuf = g_malloc0(NVME_CMBSZ_GETSIZE(n->bar.cmbsz));
memory_region_init_io(&n->ctrl_mem, OBJECT(n), &nvme_cmb_ops, n,
"nvme-cmb", NVME_CMBSZ_GETSIZE(n->bar.cmbsz));
diff --git a/hw/block/nvme.h b/hw/block/nvme.h
index 26c38bd913be..cedc8022dbb3 100644
--- a/hw/block/nvme.h
+++ b/hw/block/nvme.h
@@ -82,8 +82,6 @@ typedef struct NvmeCtrl {
uint32_t num_namespaces;
uint32_t max_q_ents;
uint64_t ns_size;
- uint32_t cmbsz;
- uint32_t cmbloc;
uint8_t *cmbuf;
uint32_t irq_status;
uint64_t host_timestamp; /* Timestamp sent by the host
*/
--
2.27.0
- [PATCH v7 00/22] nvme: small fixes, refactoring and cleanups, Klaus Jensen, 2020/06/09
- [PATCH v7 01/22] hw/block/nvme: fix pci doorbell size calculation, Klaus Jensen, 2020/06/09
- [PATCH v7 04/22] hw/block/nvme: move device parameters to separate struct, Klaus Jensen, 2020/06/09
- [PATCH v7 05/22] hw/block/nvme: use constants in identify, Klaus Jensen, 2020/06/09
- [PATCH v7 06/22] hw/block/nvme: refactor nvme_addr_read, Klaus Jensen, 2020/06/09
- [PATCH v7 02/22] hw/block/nvme: rename trace events to pci_nvme, Klaus Jensen, 2020/06/09
- [PATCH v7 08/22] hw/block/nvme: add max_ioqpairs device parameter, Klaus Jensen, 2020/06/09
- [PATCH v7 09/22] hw/block/nvme: remove redundant cmbloc/cmbsz members,
Klaus Jensen <=
- [PATCH v7 07/22] hw/block/nvme: fix pin-based interrupt behavior, Klaus Jensen, 2020/06/09
- [PATCH v7 03/22] hw/block/nvme: remove superfluous breaks, Klaus Jensen, 2020/06/09
- [PATCH v7 10/22] hw/block/nvme: factor out property/constraint checks, Klaus Jensen, 2020/06/09
- [PATCH v7 11/22] hw/block/nvme: factor out device state setup, Klaus Jensen, 2020/06/09
- [PATCH v7 13/22] hw/block/nvme: add namespace helpers, Klaus Jensen, 2020/06/09
- [PATCH v7 14/22] hw/block/nvme: factor out namespace setup, Klaus Jensen, 2020/06/09
- [PATCH v7 19/22] hw/block/nvme: factor out controller identify setup, Klaus Jensen, 2020/06/09
- [PATCH v7 20/22] hw/block/nvme: Verify msix_vector_use() returned value, Klaus Jensen, 2020/06/09
- [PATCH v7 22/22] hw/block/nvme: verify msix_init_exclusive_bar() return value, Klaus Jensen, 2020/06/09
- [PATCH v7 18/22] hw/block/nvme: do cmb/pmr init as part of pci init, Klaus Jensen, 2020/06/09