[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/8] hw/block/nvme: disable PMR at boot up
From: |
Klaus Jensen |
Subject: |
[PATCH 7/8] hw/block/nvme: disable PMR at boot up |
Date: |
Fri, 18 Dec 2020 14:29:04 +0100 |
From: Klaus Jensen <k.jensen@samsung.com>
The PMR should not be enabled at boot up. Disable the PMR MemoryRegion
initially and implement MMIO for PMRCTL, allowing the host to enable the
PMR explicitly.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
hw/block/nvme.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 58e86bba0316..c04d6e69e4df 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -2549,8 +2549,16 @@ static void nvme_write_bar(NvmeCtrl *n, hwaddr offset,
uint64_t data,
NVME_GUEST_ERR(pci_nvme_ub_mmiowr_pmrcap_readonly,
"invalid write to PMRCAP register, ignored");
return;
- case 0xE04: /* TODO PMRCTL */
- break;
+ case 0xE04: /* PMRCTL */
+ n->bar.pmrctl = data;
+ if (NVME_PMRCTL_EN(data)) {
+ memory_region_set_enabled(&n->pmrdev->mr, true);
+ n->bar.pmrsts = 0;
+ } else {
+ memory_region_set_enabled(&n->pmrdev->mr, false);
+ NVME_PMRSTS_SET_NRDY(n->bar.pmrsts, 1);
+ }
+ return;
case 0xE08: /* PMRSTS */
NVME_GUEST_ERR(pci_nvme_ub_mmiowr_pmrsts_readonly,
"invalid write to PMRSTS register, ignored");
@@ -2918,6 +2926,8 @@ static void nvme_init_pmr(NvmeCtrl *n, PCIDevice *pci_dev)
PCI_BASE_ADDRESS_SPACE_MEMORY |
PCI_BASE_ADDRESS_MEM_TYPE_64 |
PCI_BASE_ADDRESS_MEM_PREFETCH, &n->pmrdev->mr);
+
+ memory_region_set_enabled(&n->pmrdev->mr, false);
}
static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp)
--
2.29.2
- [PATCH 0/8] hw/block/nvme: misc cmb/pmr patches, Klaus Jensen, 2020/12/18
- [PATCH 1/8] hw/block/nvme: indicate CMB support through controller capabilities register, Klaus Jensen, 2020/12/18
- [PATCH 4/8] hw/block/nvme: fix controller reset/shutdown logic, Klaus Jensen, 2020/12/18
- [PATCH 2/8] hw/block/nvme: move msix table and pba to BAR 0, Klaus Jensen, 2020/12/18
- [PATCH 8/8] hw/block/nvme: add PMR RDS/WDS support, Klaus Jensen, 2020/12/18
- [PATCH 6/8] hw/block/nvme: remove redundant zeroing of PMR registers, Klaus Jensen, 2020/12/18
- [PATCH 3/8] hw/block/nvme: allow cmb and pmr to coexist, Klaus Jensen, 2020/12/18
- [PATCH 7/8] hw/block/nvme: disable PMR at boot up,
Klaus Jensen <=
- [PATCH 5/8] hw/block/nvme: rename CAP_PMR_{SHIFT, MASK} to CAP_PMRS_{SHIFT, MASK}, Klaus Jensen, 2020/12/18