Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09f2e716 authored by Matias Bjørling's avatar Matias Bjørling Committed by Jens Axboe
Browse files

lightnvm: refactor and change vendor id for qemu 



The QEMU NVMe implementation uses Intel vendor, Intel device id, and the
first vendor specific byte to identify a LightNVM compatible nvme
instance.

Instead of using the Intel specific, use a preallocated from CNEX Labs
instead. This lets us uniquely identify a QEMU lightnvm device without
breaking other vendor specific work in the qemu device driver.

Reported-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent d160147b

drivers/nvme/host/lightnvm.c

+9 −2
Original line number Diff line number Diff line
@@ -569,18 +569,25 @@ void nvme_nvm_unregister(struct request_queue *q, char *disk_name) 
	nvm_unregister(disk_name);

}



/* move to shared place when used in multiple places. */

#define PCI_VENDOR_ID_CNEX 0x1d1d

#define PCI_DEVICE_ID_CNEX_WL 0x2807

#define PCI_DEVICE_ID_CNEX_QEMU 0x1f1f



int nvme_nvm_ns_supported(struct nvme_ns *ns, struct nvme_id_ns *id)

{

	struct nvme_dev *dev = ns->dev;

	struct pci_dev *pdev = to_pci_dev(dev->dev);



	/* QEMU NVMe simulator - PCI ID + Vendor specific bit */

	if (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == 0x5845 &&

	if (pdev->vendor == PCI_VENDOR_ID_CNEX &&

				pdev->device == PCI_DEVICE_ID_CNEX_QEMU &&

							id->vs[0] == 0x1)

		return 1;



	/* CNEX Labs - PCI ID + Vendor specific bit */

	if (pdev->vendor == 0x1d1d && pdev->device == 0x2807 &&

	if (pdev->vendor == PCI_VENDOR_ID_CNEX &&

				pdev->device == PCI_DEVICE_ID_CNEX_WL &&

							id->vs[0] == 0x1)

		return 1;