[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/38] hw/block/nvme: use locally assigned QEMU IEEE OUI
From: |
Klaus Jensen |
Subject: |
[PULL 15/38] hw/block/nvme: use locally assigned QEMU IEEE OUI |
Date: |
Mon, 8 Mar 2021 13:22:50 +0100 |
From: Gollu Appalanaidu <anaidu.gollu@samsung.com>
Commit 6eb7a071292a ("hw/block/nvme: change controller pci id") changed
the controller to use a Red Hat assigned PCI Device and Vendor ID, but
did not change the IEEE OUI away from the Intel IEEE OUI.
Fix that and use the locally assigned QEMU IEEE OUI instead if the
`use-intel-id` parameter is not explicitly set. Also reverse the Intel
IEEE OUI bytes.
Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/block/nvme.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index ae7ccf643673..68d80a0b4c37 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -4698,9 +4698,17 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice
*pci_dev)
id->cntlid = cpu_to_le16(n->cntlid);
id->rab = 6;
- id->ieee[0] = 0x00;
- id->ieee[1] = 0x02;
- id->ieee[2] = 0xb3;
+
+ if (n->params.use_intel_id) {
+ id->ieee[0] = 0xb3;
+ id->ieee[1] = 0x02;
+ id->ieee[2] = 0x00;
+ } else {
+ id->ieee[0] = 0x00;
+ id->ieee[1] = 0x54;
+ id->ieee[2] = 0x52;
+ }
+
id->mdts = n->params.mdts;
id->ver = cpu_to_le32(NVME_SPEC_VER);
id->oacs = cpu_to_le16(0);
--
2.30.1
- [PULL 04/38] hw/block/nvme: support for multi-controller in subsystem, (continued)
- [PULL 04/38] hw/block/nvme: support for multi-controller in subsystem, Klaus Jensen, 2021/03/08
- [PULL 10/38] nvme: updated shared header for copy command, Klaus Jensen, 2021/03/08
- [PULL 06/38] hw/block/nvme: support for shared namespace in subsystem, Klaus Jensen, 2021/03/08
- [PULL 08/38] hw/block/nvme: refactor zone resource management, Klaus Jensen, 2021/03/08
- [PULL 07/38] hw/block/nvme: remove unused parameter in check zone write, Klaus Jensen, 2021/03/08
- [PULL 13/38] hw/block/nvme: add missing mor/mar constraint checks, Klaus Jensen, 2021/03/08
- [PULL 09/38] hw/block/nvme: pull write pointer advancement to separate function, Klaus Jensen, 2021/03/08
- [PULL 11/38] hw/block/nvme: add simple copy command, Klaus Jensen, 2021/03/08
- [PULL 12/38] hw/block/nvme: fix Close Zone, Klaus Jensen, 2021/03/08
- [PULL 14/38] hw/block/nvme: improve invalid zasl value reporting, Klaus Jensen, 2021/03/08
- [PULL 15/38] hw/block/nvme: use locally assigned QEMU IEEE OUI,
Klaus Jensen <=
- [PULL 16/38] hw/block/nvme: add broadcast nsid support flush command, Klaus Jensen, 2021/03/08
- [PULL 17/38] hw/block/nvme: document 'mdts' nvme device parameter, Klaus Jensen, 2021/03/08
- [PULL 18/38] hw/block/nvme: deduplicate bad mdts trace event, Klaus Jensen, 2021/03/08
- [PULL 20/38] hw/block/nvme: remove unnecessary endian conversion, Klaus Jensen, 2021/03/08
- [PULL 19/38] hw/block/nvme: align zoned.zasl with mdts, Klaus Jensen, 2021/03/08
- [PULL 28/38] hw/block/nvme: try to deal with the iov/qsg duality, Klaus Jensen, 2021/03/08
- [PULL 29/38] hw/block/nvme: remove the req dependency in map functions, Klaus Jensen, 2021/03/08
- [PULL 30/38] hw/block/nvme: refactor nvme_dma, Klaus Jensen, 2021/03/08
- [PULL 21/38] hw/block/nvme: add identify trace event, Klaus Jensen, 2021/03/08
- [PULL 24/38] hw/block/nvme: report non-mdts command size limit for dsm, Klaus Jensen, 2021/03/08