From bd98e6ae7160d5a4fc013266183506068227dd79 Mon Sep 17 00:00:00 2001 From: "Park, Aiden" Date: Tue, 20 Aug 2019 16:47:42 +0000 Subject: dm: scsi: Scan the actual number of ports The scsi_scan_dev() is looping over the number of uc_plat->max_id. The number of actual ports a AHCI controller has can be greater than max_id. Update uc_plat->max_id to make SCSI scan all detected ports. Signed-off-by: Aiden Park Reviewed-by: Bin Meng --- drivers/ata/ahci.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'drivers') diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index e3135bb75f..9a08575053 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1167,6 +1167,14 @@ int ahci_probe_scsi(struct udevice *ahci_dev, ulong base) if (ret) return ret; + /* + * scsi_scan_dev() scans devices up-to the number of max_id. + * Update max_id if the number of detected ports exceeds max_id. + * This allows SCSI to scan all detected ports. + */ + uc_plat->max_id = max_t(unsigned long, uc_priv->n_ports, + uc_plat->max_id); + return 0; } -- cgit From b21dcebfa6b372cd91bf42a30f1d8a1a525f329b Mon Sep 17 00:00:00 2001 From: Aaron Williams Date: Thu, 22 Aug 2019 20:37:26 -0700 Subject: nvme: Fix PRP Offset Invalid When large writes take place I saw a Samsung EVO 970+ return a status value of 0x13, PRP Offset Invalid. I tracked this down to the improper handling of PRP entries. The blocks the PRP entries are placed in cannot cross a page boundary and thus should be allocated on page boundaries. This is how the Linux kernel driver works. With this patch, the PRP pool is allocated on a page boundary and other than the very first allocation, the pool size is a multiple of the page size. Each page can hold (4096 / 8) - 1 entries since the last entry must point to the next page in the pool. Signed-off-by: Aaron Williams Reviewed-by: Bin Meng --- drivers/nvme/nvme.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'drivers') diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c index d4965e2ef6..47f101e280 100644 --- 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; @@ -788,14 +796,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 +805,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; -- cgit From a074667d52031b1074bc23ca59bf0b73c13ccf7c Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Sat, 24 Aug 2019 13:50:34 -0500 Subject: Kconfig: Varios: Fix more SPL, TPL dependencies Several options are presenting themselves on a various boards where the options are clearly not used. (ie, SPL/TPL options when SPL or TPL are not defined) This patch is not attempting to be a complete list of items, but more like low hanging fruit. In some instances, I wasn't sure of DM was required, so I simply made them SPL or TPL. This patch attempts to reduce some of the menuconfig noise by defining dependencies so they don't appear when not used. Signed-off-by: Adam Ford --- drivers/clk/Kconfig | 1 + drivers/core/Kconfig | 2 +- drivers/misc/Kconfig | 2 ++ drivers/phy/Kconfig | 2 +- drivers/serial/Kconfig | 4 ++-- 5 files changed, 7 insertions(+), 4 deletions(-) (limited to 'drivers') diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 82cd8f623c..95fe0aea2c 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -48,6 +48,7 @@ config CLK_BOSTON config SPL_CLK_CCF bool "SPL Common Clock Framework [CCF] support " + depends on SPL help Enable this option if you want to (re-)use the Linux kernel's Common Clock Framework [CCF] code in U-Boot's SPL. diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig index 2d195ae35e..3b95b5387b 100644 --- a/drivers/core/Kconfig +++ b/drivers/core/Kconfig @@ -92,7 +92,7 @@ config DM_SEQ_ALIAS config SPL_DM_SEQ_ALIAS bool "Support numbered aliases in device tree in SPL" - depends on DM + depends on SPL_DM default n help Most boards will have a '/aliases' node containing the path to diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index cb8b5c04db..8037b6ee2d 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -88,6 +88,7 @@ config CROS_EC config SPL_CROS_EC bool "Enable Chrome OS EC in SPL" + depends on SPL help Enable access to the Chrome OS EC in SPL. This is a separate microcontroller typically available on a SPI bus on Chromebooks. It @@ -97,6 +98,7 @@ config SPL_CROS_EC config TPL_CROS_EC bool "Enable Chrome OS EC in TPL" + depends on TPL help Enable access to the Chrome OS EC in TPL. This is a separate microcontroller typically available on a SPI bus on Chromebooks. It diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index 3942f035eb..02312273e2 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -19,7 +19,7 @@ config PHY config SPL_PHY bool "PHY Core in SPL" - depends on DM + depends on DM && SPL help PHY support in SPL. diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 8a447fd6e3..ae2d819ba9 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -45,7 +45,7 @@ config SERIAL_PRESENT config SPL_SERIAL_PRESENT bool "Provide a serial driver in SPL" - depends on DM_SERIAL + depends on DM_SERIAL && SPL default y help In very space-constrained devices even the full UART driver is too @@ -55,7 +55,7 @@ config SPL_SERIAL_PRESENT config TPL_SERIAL_PRESENT bool "Provide a serial driver in TPL" - depends on DM_SERIAL + depends on DM_SERIAL && TPL default y help In very space-constrained devices even the full UART driver is too -- cgit