[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 15/38] hw/block/nvme: use locally assigned QEMU IEEE OUI
From: |
Klaus Jensen |
Subject: |
[PULL v2 15/38] hw/block/nvme: use locally assigned QEMU IEEE OUI |
Date: |
Tue, 9 Mar 2021 12:44:49 +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 2addaf7c4f70..a54ef34ce5e7 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -4707,9 +4707,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 v2 01/38] hw/block/nvme: introduce nvme-subsys device, (continued)
- [PULL v2 01/38] hw/block/nvme: introduce nvme-subsys device, Klaus Jensen, 2021/03/09
- [PULL v2 07/38] hw/block/nvme: remove unused parameter in check zone write, Klaus Jensen, 2021/03/09
- [PULL v2 06/38] hw/block/nvme: support for shared namespace in subsystem, Klaus Jensen, 2021/03/09
- [PULL v2 04/38] hw/block/nvme: support for multi-controller in subsystem, Klaus Jensen, 2021/03/09
- [PULL v2 09/38] hw/block/nvme: pull write pointer advancement to separate function, Klaus Jensen, 2021/03/09
- [PULL v2 08/38] hw/block/nvme: refactor zone resource management, Klaus Jensen, 2021/03/09
- [PULL v2 10/38] nvme: updated shared header for copy command, Klaus Jensen, 2021/03/09
- [PULL v2 11/38] hw/block/nvme: add simple copy command, Klaus Jensen, 2021/03/09
- [PULL v2 12/38] hw/block/nvme: fix Close Zone, Klaus Jensen, 2021/03/09
- [PULL v2 13/38] hw/block/nvme: add missing mor/mar constraint checks, Klaus Jensen, 2021/03/09
- [PULL v2 15/38] hw/block/nvme: use locally assigned QEMU IEEE OUI,
Klaus Jensen <=
- [PULL v2 14/38] hw/block/nvme: improve invalid zasl value reporting, Klaus Jensen, 2021/03/09
- [PULL v2 16/38] hw/block/nvme: add broadcast nsid support flush command, Klaus Jensen, 2021/03/09
- [PULL v2 18/38] hw/block/nvme: deduplicate bad mdts trace event, Klaus Jensen, 2021/03/09
- [PULL v2 19/38] hw/block/nvme: align zoned.zasl with mdts, Klaus Jensen, 2021/03/09
- [PULL v2 20/38] hw/block/nvme: remove unnecessary endian conversion, Klaus Jensen, 2021/03/09
- [PULL v2 17/38] hw/block/nvme: document 'mdts' nvme device parameter, Klaus Jensen, 2021/03/09
- [PULL v2 29/38] hw/block/nvme: remove the req dependency in map functions, Klaus Jensen, 2021/03/09
- [PULL v2 28/38] hw/block/nvme: try to deal with the iov/qsg duality, Klaus Jensen, 2021/03/09