Commit 66341331 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Sagi Grimberg
Browse files

nvme-pci: Add support for Apple 2018+ models 



Based on reverse engineering and original patch by

Paul Pawlowski <paul@mrarm.io>

This adds support for Apple weird implementation of NVME in their
2018 or later machines. It accounts for the twice-as-big SQ entries
for the IO queues, and the fact that only interrupt vector 0 appears
to function properly.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: default avatarMinwoo Im <minwoo.im.dev@gmail.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
parent c1e0cc7e

drivers/nvme/host/nvme.h

+10 −0
Original line number Diff line number Diff line
@@ -94,6 +94,16 @@ enum nvme_quirks { 
	 * Broken Write Zeroes.

	 */

	NVME_QUIRK_DISABLE_WRITE_ZEROES		= (1 << 9),



	/*

	 * Use only one interrupt vector for all queues

	 */

	NVME_QUIRK_SINGLE_VECTOR		= (1 << 10),



	/*

	 * Use non-standard 128 bytes SQEs.

	 */

	NVME_QUIRK_128_BYTES_SQES		= (1 << 11),

};



/*

drivers/nvme/host/pci.c

+20 −1
Original line number Diff line number Diff line
@@ -2081,6 +2081,13 @@ static int nvme_setup_irqs(struct nvme_dev *dev, unsigned int nr_io_queues) 
	dev->io_queues[HCTX_TYPE_DEFAULT] = 1;

	dev->io_queues[HCTX_TYPE_READ] = 0;



	/*

	 * Some Apple controllers require all queues to use the

	 * first vector.

	 */

	if (dev->ctrl.quirks & NVME_QUIRK_SINGLE_VECTOR)

		irq_queues = 1;



	return pci_alloc_irq_vectors_affinity(pdev, 1, irq_queues,

			      PCI_IRQ_ALL_TYPES | PCI_IRQ_AFFINITY, &affd);

}
@@ -2321,6 +2328,15 @@ static int nvme_pci_enable(struct nvme_dev *dev) 
	dev->ctrl.sqsize = dev->q_depth - 1; /* 0's based queue depth */

	dev->db_stride = 1 << NVME_CAP_STRIDE(dev->ctrl.cap);

	dev->dbs = dev->bar + 4096;



	/*

	 * Some Apple controllers require a non-standard SQE size.

	 * Interestingly they also seem to ignore the CC:IOSQES register

	 * so we don't bother updating it here.

	 */

	if (dev->ctrl.quirks & NVME_QUIRK_128_BYTES_SQES)

		dev->io_sqes = 7;

	else

		dev->io_sqes = NVME_NVM_IOSQES;



	/*
@@ -3040,6 +3056,9 @@ static const struct pci_device_id nvme_id_table[] = { 
	{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },

	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) },

	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) },

	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2005),

		.driver_data = NVME_QUIRK_SINGLE_VECTOR |

				NVME_QUIRK_128_BYTES_SQES },

	{ 0, }

};

MODULE_DEVICE_TABLE(pci, nvme_id_table);

CRA Git | Maintained and supported by SUSTech CRA and CCSE