mirror of
https://github.com/Freescale/meta-freescale-3rdparty.git
synced 2025-07-19 12:09:01 +02:00
0997a74f95
Add support for Solid-Runs LX2160A based COM Express Type 7 Module (see https://www.solid-run.com/nxp-lx2160a-family/cex7-lx2160/). Signed-off-by: Jens Rehsack <sno@netbsd.org>
95 lines
3.0 KiB
Diff
95 lines
3.0 KiB
Diff
From f6b1bf35c4423eb1f038eca80df4f7d6862f338a Mon Sep 17 00:00:00 2001
|
|
From: Patrick Wildt <patrick@blueri.se>
|
|
Date: Wed, 16 Oct 2019 08:42:04 +0200
|
|
Subject: [PATCH 12/17] nvme: use page-aligned buffer for identify command
|
|
|
|
Change the stack-allocated buffer for the identification command
|
|
to explicitly allocate page-aligned buffers. Even though the spec
|
|
seems to allow having admin queue commands on non page-aligned
|
|
buffers, it seems to not be possible on my i.MX8MQ board with a
|
|
a Silicon Power P34A80. Since all of the NVMe drivers I have seen
|
|
always do admin commands on a page-aligned buffer, which does work
|
|
on my system, it makes sense for us to do that as well.
|
|
|
|
Upstream-Status: Backport [Solid-Run BSP]
|
|
|
|
Signed-off-by: Patrick Wildt <patrick@blueri.se>
|
|
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
|
|
(cherry picked from commit 2f83481dff9c4f253a6ac341911d78d4984ca07b)
|
|
Signed-off-by: Olof Johansson <olof@lixom.net>
|
|
---
|
|
drivers/nvme/nvme.c | 24 ++++++++++++++++++------
|
|
1 file changed, 18 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
|
|
index 53ff6e89aa..f915817aaa 100644
|
|
--- a/drivers/nvme/nvme.c
|
|
+++ b/drivers/nvme/nvme.c
|
|
@@ -583,14 +583,19 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
|
|
|
|
static int nvme_get_info_from_identify(struct nvme_dev *dev)
|
|
{
|
|
- ALLOC_CACHE_ALIGN_BUFFER(char, buf, sizeof(struct nvme_id_ctrl));
|
|
- struct nvme_id_ctrl *ctrl = (struct nvme_id_ctrl *)buf;
|
|
+ struct nvme_id_ctrl *ctrl;
|
|
int ret;
|
|
int shift = NVME_CAP_MPSMIN(dev->cap) + 12;
|
|
|
|
+ ctrl = memalign(dev->page_size, sizeof(struct nvme_id_ctrl));
|
|
+ if (!ctrl)
|
|
+ return -ENOMEM;
|
|
+
|
|
ret = nvme_identify(dev, 0, 1, (dma_addr_t)(long)ctrl);
|
|
- if (ret)
|
|
+ if (ret) {
|
|
+ free(ctrl);
|
|
return -EIO;
|
|
+ }
|
|
|
|
dev->nn = le32_to_cpu(ctrl->nn);
|
|
dev->vwc = ctrl->vwc;
|
|
@@ -621,6 +626,7 @@ static int nvme_get_info_from_identify(struct nvme_dev *dev)
|
|
dev->max_transfer_shift = 20;
|
|
}
|
|
|
|
+ free(ctrl);
|
|
return 0;
|
|
}
|
|
|
|
@@ -661,16 +667,21 @@ static int nvme_blk_probe(struct udevice *udev)
|
|
struct blk_desc *desc = dev_get_uclass_platdata(udev);
|
|
struct nvme_ns *ns = dev_get_priv(udev);
|
|
u8 flbas;
|
|
- ALLOC_CACHE_ALIGN_BUFFER(char, buf, sizeof(struct nvme_id_ns));
|
|
- struct nvme_id_ns *id = (struct nvme_id_ns *)buf;
|
|
struct pci_child_platdata *pplat;
|
|
+ struct nvme_id_ns *id;
|
|
+
|
|
+ id = memalign(ndev->page_size, sizeof(struct nvme_id_ns));
|
|
+ if (!id)
|
|
+ return -ENOMEM;
|
|
|
|
memset(ns, 0, sizeof(*ns));
|
|
ns->dev = ndev;
|
|
/* extract the namespace id from the block device name */
|
|
ns->ns_id = trailing_strtol(udev->name) + 1;
|
|
- if (nvme_identify(ndev, ns->ns_id, 0, (dma_addr_t)(long)id))
|
|
+ if (nvme_identify(ndev, ns->ns_id, 0, (dma_addr_t)(long)id)) {
|
|
+ free(id);
|
|
return -EIO;
|
|
+ }
|
|
|
|
memcpy(&ns->eui64, &id->eui64, sizeof(id->eui64));
|
|
flbas = id->flbas & NVME_NS_FLBAS_LBA_MASK;
|
|
@@ -689,6 +700,7 @@ static int nvme_blk_probe(struct udevice *udev)
|
|
memcpy(desc->product, ndev->serial, sizeof(ndev->serial));
|
|
memcpy(desc->revision, ndev->firmware_rev, sizeof(ndev->firmware_rev));
|
|
|
|
+ free(id);
|
|
return 0;
|
|
}
|
|
|
|
--
|
|
2.17.1
|
|
|