Merge tag 'u-boot-imx-20191009' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / drivers / nvme / nvme.c

diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index d4965e2ef635984da967f06967ab30846ec00e17..ee6b581d9e17f9240165a892ca128f764ab7617f 100644 (file)
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -73,6 +73,9 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2,
        u64 *prp_pool;
        int length = total_len;
        int i, nprps;
+       u32 prps_per_page = (page_size >> 3) - 1;
+       u32 num_pages;
+
        length -= (page_size - offset);
 
        if (length <= 0) {
@@ -89,15 +92,20 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2,
        }
 
        nprps = DIV_ROUND_UP(length, page_size);
+       num_pages = DIV_ROUND_UP(nprps, prps_per_page);
 
        if (nprps > dev->prp_entry_num) {
                free(dev->prp_pool);
-               dev->prp_pool = malloc(nprps << 3);
+               /*
+                * Always increase in increments of pages.  It doesn't waste
+                * much memory and reduces the number of allocations.
+                */
+               dev->prp_pool = memalign(page_size, num_pages * page_size);
                if (!dev->prp_pool) {
                        printf("Error: malloc prp_pool fail\n");
                        return -ENOMEM;
                }
-               dev->prp_entry_num = nprps;
+               dev->prp_entry_num = prps_per_page * num_pages;
        }
 
        prp_pool = dev->prp_pool;
@@ -613,6 +621,18 @@ static int nvme_get_info_from_identify(struct nvme_dev *dev)
        return 0;
 }
 
+int nvme_get_namespace_id(struct udevice *udev, u32 *ns_id, u8 *eui64)
+{
+       struct nvme_ns *ns = dev_get_priv(udev);
+
+       if (ns_id)
+               *ns_id = ns->ns_id;
+       if (eui64)
+               memcpy(eui64, ns->eui64, sizeof(ns->eui64));
+
+       return 0;
+}
+
 int nvme_scan_namespace(void)
 {
        struct uclass *uc;
@@ -649,6 +669,7 @@ static int nvme_blk_probe(struct udevice *udev)
        if (nvme_identify(ndev, ns->ns_id, 0, (dma_addr_t)(long)id))
                return -EIO;
 
+       memcpy(&ns->eui64, &id->eui64, sizeof(id->eui64));
        flbas = id->flbas & NVME_NS_FLBAS_LBA_MASK;
        ns->flbas = flbas;
        ns->lba_shift = id->lbaf[flbas].ds;
@@ -788,14 +809,6 @@ static int nvme_probe(struct udevice *udev)
        }
        memset(ndev->queues, 0, NVME_Q_NUM * sizeof(struct nvme_queue *));
 
-       ndev->prp_pool = malloc(MAX_PRP_POOL);
-       if (!ndev->prp_pool) {
-               ret = -ENOMEM;
-               printf("Error: %s: Out of memory!\n", udev->name);
-               goto free_nvme;
-       }
-       ndev->prp_entry_num = MAX_PRP_POOL >> 3;
-
        ndev->cap = nvme_readq(&ndev->bar->cap);
        ndev->q_depth = min_t(int, NVME_CAP_MQES(ndev->cap) + 1, NVME_Q_DEPTH);
        ndev->db_stride = 1 << NVME_CAP_STRIDE(ndev->cap);
@@ -805,6 +818,15 @@ static int nvme_probe(struct udevice *udev)
        if (ret)
                goto free_queue;
 
+       /* Allocate after the page size is known */
+       ndev->prp_pool = memalign(ndev->page_size, MAX_PRP_POOL);
+       if (!ndev->prp_pool) {
+               ret = -ENOMEM;
+               printf("Error: %s: Out of memory!\n", udev->name);
+               goto free_nvme;
+       }
+       ndev->prp_entry_num = MAX_PRP_POOL >> 3;
+
        ret = nvme_setup_io_queues(ndev);
        if (ret)
                goto free_queue;