* [RFC PATCH v1 0/3] SPL NVMe support
@ 2022-09-29 9:56 Mayuresh Chitale
2022-09-29 9:56 ` [RFC PATCH v1 1/3] spl: Add Kconfig options for NVME Mayuresh Chitale
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Mayuresh Chitale @ 2022-09-29 9:56 UTC (permalink / raw)
To: Bin Meng, Simon Glass
Cc: Mayuresh Chitale, u-boot, Heinrich Schuchardt, Rick Chen, Leo
This patchset adds support to load images of the SPL's next booting stage from a NVMe device.
Mayuresh Chitale (3):
spl: Add Kconfig options for NVME
nvme: pci: Enable for SPL
common: spl: Add spl NVMe boot support
arch/riscv/include/asm/spl.h | 1 +
common/spl/Kconfig | 25 ++++++++++++++++++++
common/spl/Makefile | 1 +
common/spl/spl_nvme.c | 44 ++++++++++++++++++++++++++++++++++++
drivers/Makefile | 2 +-
drivers/nvme/Makefile | 2 +-
drivers/nvme/nvme_pci.c | 1 +
drivers/pci/Kconfig | 7 ++++++
drivers/pci/pci-uclass.c | 3 ++-
9 files changed, 83 insertions(+), 3 deletions(-)
create mode 100644 common/spl/spl_nvme.c
--
2.25.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [RFC PATCH v1 1/3] spl: Add Kconfig options for NVME
2022-09-29 9:56 [RFC PATCH v1 0/3] SPL NVMe support Mayuresh Chitale
@ 2022-09-29 9:56 ` Mayuresh Chitale
2022-09-29 23:55 ` Simon Glass
2022-09-29 9:56 ` [RFC PATCH v1 2/3] nvme: pci: Enable for SPL Mayuresh Chitale
2022-09-29 9:56 ` [RFC PATCH v1 3/3] common: spl: Add spl NVMe boot support Mayuresh Chitale
2 siblings, 1 reply; 9+ messages in thread
From: Mayuresh Chitale @ 2022-09-29 9:56 UTC (permalink / raw)
To: Bin Meng, Simon Glass
Cc: Mayuresh Chitale, u-boot, Heinrich Schuchardt, Rick Chen, Leo
This patch adds options to enable PCI NVMe support in SPL
Signed-off-by: Mayuresh Chitale <mchitale@ventanamicro.com>
---
common/spl/Kconfig | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 70d97815f0..2bc97421f9 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1218,6 +1218,31 @@ config SPL_SATA
expense and power consumption. This enables loading from SATA
using a configured device.
+config SPL_NVME
+ bool "NVM Express device support"
+ depends on BLK
+ select HAVE_BLOCK_DEVICE
+ help
+ This option enables support for NVM Express devices.
+ It supports basic functions of NVMe (read/write).
+
+config SPL_NVME_PCI
+ bool "NVM Express PCI device support for SPL"
+ depends on SPL_PCI && SPL_NVME
+ help
+ This option enables support for NVM Express PCI devices.
+ This allows use of NVMe devices for loading u-boot.
+
+config SPL_NVME_BOOT_DEVICE
+ hex "NVMe boot device number"
+ depends on SPL_NVME
+ default 0x0
+
+config SYS_NVME_FAT_BOOT_PARTITION
+ hex "NVMe boot partition number"
+ depends on SPL_NVME
+ default 0x1
+
config SPL_SATA_RAW_U_BOOT_USE_SECTOR
bool "SATA raw mode: by sector"
depends on SPL_SATA
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [RFC PATCH v1 2/3] nvme: pci: Enable for SPL
2022-09-29 9:56 [RFC PATCH v1 0/3] SPL NVMe support Mayuresh Chitale
2022-09-29 9:56 ` [RFC PATCH v1 1/3] spl: Add Kconfig options for NVME Mayuresh Chitale
@ 2022-09-29 9:56 ` Mayuresh Chitale
2022-09-29 23:55 ` Simon Glass
2022-09-29 9:56 ` [RFC PATCH v1 3/3] common: spl: Add spl NVMe boot support Mayuresh Chitale
2 siblings, 1 reply; 9+ messages in thread
From: Mayuresh Chitale @ 2022-09-29 9:56 UTC (permalink / raw)
To: Bin Meng, Simon Glass
Cc: Mayuresh Chitale, u-boot, Heinrich Schuchardt, Rick Chen, Leo
Build PCI NVMe driver when enabled for SPI and enable dm-pre-reloc for
the driver. Also enable PCI_PNP for SPL which is required to auto
configure the PCIe devices.
Signed-off-by: Mayuresh Chitale <mchitale@ventanamicro.com>
---
drivers/Makefile | 2 +-
drivers/nvme/Makefile | 2 +-
drivers/nvme/nvme_pci.c | 1 +
drivers/pci/Kconfig | 7 +++++++
drivers/pci/pci-uclass.c | 3 ++-
5 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/Makefile b/drivers/Makefile
index eba9940231..581ae9f819 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -34,6 +34,7 @@ obj-$(CONFIG_$(SPL_)DM_MAILBOX) += mailbox/
obj-$(CONFIG_$(SPL_)REMOTEPROC) += remoteproc/
obj-$(CONFIG_$(SPL_)SYSINFO) += sysinfo/
obj-$(CONFIG_$(SPL_TPL_)TPM) += tpm/
+obj-$(CONFIG_$(SPL_)NVME) += nvme/
obj-$(CONFIG_XEN) += xen/
obj-$(CONFIG_$(SPL_)FPGA) += fpga/
@@ -86,7 +87,6 @@ obj-y += crypto/
obj-$(CONFIG_FASTBOOT) += fastboot/
obj-y += misc/
obj-$(CONFIG_MMC) += mmc/
-obj-$(CONFIG_NVME) += nvme/
obj-$(CONFIG_PCI_ENDPOINT) += pci_endpoint/
obj-y += dfu/
obj-$(CONFIG_PCH) += pch/
diff --git a/drivers/nvme/Makefile b/drivers/nvme/Makefile
index fa7b619446..fd3e68a91d 100644
--- a/drivers/nvme/Makefile
+++ b/drivers/nvme/Makefile
@@ -4,4 +4,4 @@
obj-y += nvme-uclass.o nvme.o nvme_show.o
obj-$(CONFIG_NVME_APPLE) += nvme_apple.o
-obj-$(CONFIG_NVME_PCI) += nvme_pci.o
+obj-$(CONFIG_$(SPL_)NVME_PCI) += nvme_pci.o
diff --git a/drivers/nvme/nvme_pci.c b/drivers/nvme/nvme_pci.c
index 36bf9c5ffb..16d8b9fff7 100644
--- a/drivers/nvme/nvme_pci.c
+++ b/drivers/nvme/nvme_pci.c
@@ -39,6 +39,7 @@ U_BOOT_DRIVER(nvme) = {
.bind = nvme_bind,
.probe = nvme_probe,
.priv_auto = sizeof(struct nvme_dev),
+ .flags = DM_FLAG_PRE_RELOC,
};
struct pci_device_id nvme_supported[] = {
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 22f4995453..2d4c9f0781 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -40,6 +40,13 @@ config PCI_PNP
help
Enable PCI memory and I/O space resource allocation and assignment.
+config SPL_PCI_PNP
+ bool "Enable Plug & Play support for PCI"
+ default n
+ help
+ Enable PCI memory and I/O space resource allocation and assignment.
+ This is required to auto configure the enumerated devices.
+
config PCI_REGION_MULTI_ENTRY
bool "Enable Multiple entries of region type MEMORY in ranges for PCI"
help
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 16a6a699f9..62d2409a6d 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -1140,7 +1140,8 @@ static int pci_uclass_post_probe(struct udevice *bus)
if (ret)
return log_msg_ret("bind", ret);
- if (CONFIG_IS_ENABLED(PCI_PNP) && ll_boot_init() &&
+ if ((CONFIG_IS_ENABLED(PCI_PNP) || CONFIG_IS_ENABLED(SPL_PCI_PNP)) &&
+ ll_boot_init() &&
(!hose->skip_auto_config_until_reloc ||
(gd->flags & GD_FLG_RELOC))) {
ret = pci_auto_config_devices(bus);
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [RFC PATCH v1 3/3] common: spl: Add spl NVMe boot support
2022-09-29 9:56 [RFC PATCH v1 0/3] SPL NVMe support Mayuresh Chitale
2022-09-29 9:56 ` [RFC PATCH v1 1/3] spl: Add Kconfig options for NVME Mayuresh Chitale
2022-09-29 9:56 ` [RFC PATCH v1 2/3] nvme: pci: Enable for SPL Mayuresh Chitale
@ 2022-09-29 9:56 ` Mayuresh Chitale
2022-09-29 23:55 ` Simon Glass
2 siblings, 1 reply; 9+ messages in thread
From: Mayuresh Chitale @ 2022-09-29 9:56 UTC (permalink / raw)
To: Bin Meng, Simon Glass
Cc: Mayuresh Chitale, u-boot, Heinrich Schuchardt, Rick Chen, Leo
Add spl_nvme to read a fat partition from a bootable NVMe device.
Signed-off-by: Mayuresh Chitale <mchitale@ventanamicro.com>
---
arch/riscv/include/asm/spl.h | 1 +
common/spl/Makefile | 1 +
common/spl/spl_nvme.c | 44 ++++++++++++++++++++++++++++++++++++
3 files changed, 46 insertions(+)
create mode 100644 common/spl/spl_nvme.c
diff --git a/arch/riscv/include/asm/spl.h b/arch/riscv/include/asm/spl.h
index e8a94fcb1f..5d0ba4b034 100644
--- a/arch/riscv/include/asm/spl.h
+++ b/arch/riscv/include/asm/spl.h
@@ -20,6 +20,7 @@ enum {
BOOT_DEVICE_SPI,
BOOT_DEVICE_USB,
BOOT_DEVICE_SATA,
+ BOOT_DEVICE_NVME,
BOOT_DEVICE_I2C,
BOOT_DEVICE_BOARD,
BOOT_DEVICE_DFU,
diff --git a/common/spl/Makefile b/common/spl/Makefile
index 13db3df993..4bcc3d7e68 100644
--- a/common/spl/Makefile
+++ b/common/spl/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_$(SPL_TPL_)USB_STORAGE) += spl_usb.o
obj-$(CONFIG_$(SPL_TPL_)FS_FAT) += spl_fat.o
obj-$(CONFIG_$(SPL_TPL_)FS_EXT4) += spl_ext.o
obj-$(CONFIG_$(SPL_TPL_)SATA) += spl_sata.o
+obj-$(CONFIG_$(SPL_TPL_)NVME) += spl_nvme.o
obj-$(CONFIG_$(SPL_TPL_)SEMIHOSTING) += spl_semihosting.o
obj-$(CONFIG_$(SPL_TPL_)DFU) += spl_dfu.o
obj-$(CONFIG_$(SPL_TPL_)SPI_LOAD) += spl_spi.o
diff --git a/common/spl/spl_nvme.c b/common/spl/spl_nvme.c
new file mode 100644
index 0000000000..d8a9dba845
--- /dev/null
+++ b/common/spl/spl_nvme.c
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2022
+ * Ventana Micro Systems Inc.
+ *
+ * Derived work from spl_sata.c
+ */
+
+#include <common.h>
+#include <spl.h>
+#include <errno.h>
+#include <fat.h>
+#include <nvme.h>
+#include <init.h>
+
+static int spl_nvme_load_image(struct spl_image_info *spl_image,
+ struct spl_boot_device *bootdev)
+{
+ int ret;
+ struct blk_desc *blk_desc;
+
+ ret = pci_init();
+ if (ret < 0)
+ goto out;
+
+ ret = nvme_scan_namespace();
+ if (ret < 0)
+ goto out;
+
+ blk_show_device(IF_TYPE_NVME, CONFIG_SPL_NVME_BOOT_DEVICE);
+ blk_desc = blk_get_devnum_by_type(IF_TYPE_NVME,
+ CONFIG_SPL_NVME_BOOT_DEVICE);
+ if (IS_ENABLED(CONFIG_SPL_FS_FAT))
+ ret = spl_load_image_fat(spl_image, bootdev, blk_desc,
+ CONFIG_SYS_NVME_FAT_BOOT_PARTITION,
+ CONFIG_SPL_PAYLOAD);
+ else
+ ret = -ENOSYS;
+
+out:
+ return ret;
+}
+
+SPL_LOAD_IMAGE_METHOD("NVME", 0, BOOT_DEVICE_NVME, spl_nvme_load_image);
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [RFC PATCH v1 1/3] spl: Add Kconfig options for NVME
2022-09-29 9:56 ` [RFC PATCH v1 1/3] spl: Add Kconfig options for NVME Mayuresh Chitale
@ 2022-09-29 23:55 ` Simon Glass
0 siblings, 0 replies; 9+ messages in thread
From: Simon Glass @ 2022-09-29 23:55 UTC (permalink / raw)
To: Mayuresh Chitale
Cc: Bin Meng, U-Boot Mailing List, Heinrich Schuchardt, Rick Chen, Leo
On Thu, 29 Sept 2022 at 03:57, Mayuresh Chitale
<mchitale@ventanamicro.com> wrote:
>
> This patch adds options to enable PCI NVMe support in SPL
>
> Signed-off-by: Mayuresh Chitale <mchitale@ventanamicro.com>
> ---
> common/spl/Kconfig | 25 +++++++++++++++++++++++++
> 1 file changed, 25 insertions(+)
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC PATCH v1 2/3] nvme: pci: Enable for SPL
2022-09-29 9:56 ` [RFC PATCH v1 2/3] nvme: pci: Enable for SPL Mayuresh Chitale
@ 2022-09-29 23:55 ` Simon Glass
2022-09-30 16:58 ` Mayuresh Chitale
0 siblings, 1 reply; 9+ messages in thread
From: Simon Glass @ 2022-09-29 23:55 UTC (permalink / raw)
To: Mayuresh Chitale
Cc: Bin Meng, U-Boot Mailing List, Heinrich Schuchardt, Rick Chen, Leo
Hi Mayuresh,
On Thu, 29 Sept 2022 at 03:57, Mayuresh Chitale
<mchitale@ventanamicro.com> wrote:
>
> Build PCI NVMe driver when enabled for SPI and enable dm-pre-reloc for
> the driver. Also enable PCI_PNP for SPL which is required to auto
> configure the PCIe devices.
>
> Signed-off-by: Mayuresh Chitale <mchitale@ventanamicro.com>
> ---
> drivers/Makefile | 2 +-
> drivers/nvme/Makefile | 2 +-
> drivers/nvme/nvme_pci.c | 1 +
> drivers/pci/Kconfig | 7 +++++++
> drivers/pci/pci-uclass.c | 3 ++-
> 5 files changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/Makefile b/drivers/Makefile
> index eba9940231..581ae9f819 100644
> --- a/drivers/Makefile
> +++ b/drivers/Makefile
> @@ -34,6 +34,7 @@ obj-$(CONFIG_$(SPL_)DM_MAILBOX) += mailbox/
> obj-$(CONFIG_$(SPL_)REMOTEPROC) += remoteproc/
> obj-$(CONFIG_$(SPL_)SYSINFO) += sysinfo/
> obj-$(CONFIG_$(SPL_TPL_)TPM) += tpm/
> +obj-$(CONFIG_$(SPL_)NVME) += nvme/
> obj-$(CONFIG_XEN) += xen/
> obj-$(CONFIG_$(SPL_)FPGA) += fpga/
>
> @@ -86,7 +87,6 @@ obj-y += crypto/
> obj-$(CONFIG_FASTBOOT) += fastboot/
> obj-y += misc/
> obj-$(CONFIG_MMC) += mmc/
> -obj-$(CONFIG_NVME) += nvme/
> obj-$(CONFIG_PCI_ENDPOINT) += pci_endpoint/
> obj-y += dfu/
> obj-$(CONFIG_PCH) += pch/
> diff --git a/drivers/nvme/Makefile b/drivers/nvme/Makefile
> index fa7b619446..fd3e68a91d 100644
> --- a/drivers/nvme/Makefile
> +++ b/drivers/nvme/Makefile
> @@ -4,4 +4,4 @@
>
> obj-y += nvme-uclass.o nvme.o nvme_show.o
> obj-$(CONFIG_NVME_APPLE) += nvme_apple.o
> -obj-$(CONFIG_NVME_PCI) += nvme_pci.o
> +obj-$(CONFIG_$(SPL_)NVME_PCI) += nvme_pci.o
> diff --git a/drivers/nvme/nvme_pci.c b/drivers/nvme/nvme_pci.c
> index 36bf9c5ffb..16d8b9fff7 100644
> --- a/drivers/nvme/nvme_pci.c
> +++ b/drivers/nvme/nvme_pci.c
> @@ -39,6 +39,7 @@ U_BOOT_DRIVER(nvme) = {
> .bind = nvme_bind,
> .probe = nvme_probe,
> .priv_auto = sizeof(struct nvme_dev),
> + .flags = DM_FLAG_PRE_RELOC,
Why is this here? It is only applicable on some boards.
Instead, add the appropriate tag (e.g. u-boot,dm-spl) to the device node.
> };
>
> struct pci_device_id nvme_supported[] = {
> diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
> index 22f4995453..2d4c9f0781 100644
> --- a/drivers/pci/Kconfig
> +++ b/drivers/pci/Kconfig
> @@ -40,6 +40,13 @@ config PCI_PNP
> help
> Enable PCI memory and I/O space resource allocation and assignment.
>
> +config SPL_PCI_PNP
> + bool "Enable Plug & Play support for PCI"
> + default n
> + help
> + Enable PCI memory and I/O space resource allocation and assignment.
> + This is required to auto configure the enumerated devices.
> +
> config PCI_REGION_MULTI_ENTRY
> bool "Enable Multiple entries of region type MEMORY in ranges for PCI"
> help
> diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
> index 16a6a699f9..62d2409a6d 100644
> --- a/drivers/pci/pci-uclass.c
> +++ b/drivers/pci/pci-uclass.c
> @@ -1140,7 +1140,8 @@ static int pci_uclass_post_probe(struct udevice *bus)
> if (ret)
> return log_msg_ret("bind", ret);
>
> - if (CONFIG_IS_ENABLED(PCI_PNP) && ll_boot_init() &&
> + if ((CONFIG_IS_ENABLED(PCI_PNP) || CONFIG_IS_ENABLED(SPL_PCI_PNP)) &&
> + ll_boot_init() &&
> (!hose->skip_auto_config_until_reloc ||
> (gd->flags & GD_FLG_RELOC))) {
> ret = pci_auto_config_devices(bus);
> --
> 2.25.1
>
Regards,
Simon
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC PATCH v1 3/3] common: spl: Add spl NVMe boot support
2022-09-29 9:56 ` [RFC PATCH v1 3/3] common: spl: Add spl NVMe boot support Mayuresh Chitale
@ 2022-09-29 23:55 ` Simon Glass
0 siblings, 0 replies; 9+ messages in thread
From: Simon Glass @ 2022-09-29 23:55 UTC (permalink / raw)
To: Mayuresh Chitale
Cc: Bin Meng, U-Boot Mailing List, Heinrich Schuchardt, Rick Chen, Leo
Hi Mayuresh,
On Thu, 29 Sept 2022 at 03:57, Mayuresh Chitale
<mchitale@ventanamicro.com> wrote:
>
> Add spl_nvme to read a fat partition from a bootable NVMe device.
>
> Signed-off-by: Mayuresh Chitale <mchitale@ventanamicro.com>
> ---
> arch/riscv/include/asm/spl.h | 1 +
> common/spl/Makefile | 1 +
> common/spl/spl_nvme.c | 44 ++++++++++++++++++++++++++++++++++++
> 3 files changed, 46 insertions(+)
> create mode 100644 common/spl/spl_nvme.c
Reviewed-by: Simon Glass <sjg@chromium.org>
(but see below)
>
> diff --git a/arch/riscv/include/asm/spl.h b/arch/riscv/include/asm/spl.h
> index e8a94fcb1f..5d0ba4b034 100644
> --- a/arch/riscv/include/asm/spl.h
> +++ b/arch/riscv/include/asm/spl.h
> @@ -20,6 +20,7 @@ enum {
> BOOT_DEVICE_SPI,
> BOOT_DEVICE_USB,
> BOOT_DEVICE_SATA,
> + BOOT_DEVICE_NVME,
> BOOT_DEVICE_I2C,
> BOOT_DEVICE_BOARD,
> BOOT_DEVICE_DFU,
> diff --git a/common/spl/Makefile b/common/spl/Makefile
> index 13db3df993..4bcc3d7e68 100644
> --- a/common/spl/Makefile
> +++ b/common/spl/Makefile
> @@ -28,6 +28,7 @@ obj-$(CONFIG_$(SPL_TPL_)USB_STORAGE) += spl_usb.o
> obj-$(CONFIG_$(SPL_TPL_)FS_FAT) += spl_fat.o
> obj-$(CONFIG_$(SPL_TPL_)FS_EXT4) += spl_ext.o
> obj-$(CONFIG_$(SPL_TPL_)SATA) += spl_sata.o
> +obj-$(CONFIG_$(SPL_TPL_)NVME) += spl_nvme.o
> obj-$(CONFIG_$(SPL_TPL_)SEMIHOSTING) += spl_semihosting.o
> obj-$(CONFIG_$(SPL_TPL_)DFU) += spl_dfu.o
> obj-$(CONFIG_$(SPL_TPL_)SPI_LOAD) += spl_spi.o
> diff --git a/common/spl/spl_nvme.c b/common/spl/spl_nvme.c
> new file mode 100644
> index 0000000000..d8a9dba845
> --- /dev/null
> +++ b/common/spl/spl_nvme.c
> @@ -0,0 +1,44 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2022
> + * Ventana Micro Systems Inc.
> + *
> + * Derived work from spl_sata.c
> + */
> +
> +#include <common.h>
> +#include <spl.h>
> +#include <errno.h>
> +#include <fat.h>
> +#include <nvme.h>
> +#include <init.h>
Should go above nvme.h
> +
> +static int spl_nvme_load_image(struct spl_image_info *spl_image,
> + struct spl_boot_device *bootdev)
> +{
> + int ret;
> + struct blk_desc *blk_desc;
> +
> + ret = pci_init();
> + if (ret < 0)
> + goto out;
> +
> + ret = nvme_scan_namespace();
> + if (ret < 0)
> + goto out;
> +
> + blk_show_device(IF_TYPE_NVME, CONFIG_SPL_NVME_BOOT_DEVICE);
> + blk_desc = blk_get_devnum_by_type(IF_TYPE_NVME,
> + CONFIG_SPL_NVME_BOOT_DEVICE);
I think we need to move this to device tree, but it is OK for now.
> + if (IS_ENABLED(CONFIG_SPL_FS_FAT))
> + ret = spl_load_image_fat(spl_image, bootdev, blk_desc,
> + CONFIG_SYS_NVME_FAT_BOOT_PARTITION,
> + CONFIG_SPL_PAYLOAD);
> + else
> + ret = -ENOSYS;
> +
> +out:
> + return ret;
> +}
> +
> +SPL_LOAD_IMAGE_METHOD("NVME", 0, BOOT_DEVICE_NVME, spl_nvme_load_image);
> --
> 2.25.1
>
Regards,
Simon
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC PATCH v1 2/3] nvme: pci: Enable for SPL
2022-09-29 23:55 ` Simon Glass
@ 2022-09-30 16:58 ` Mayuresh Chitale
2022-09-30 23:49 ` Simon Glass
0 siblings, 1 reply; 9+ messages in thread
From: Mayuresh Chitale @ 2022-09-30 16:58 UTC (permalink / raw)
To: Simon Glass
Cc: Bin Meng, U-Boot Mailing List, Heinrich Schuchardt, Rick Chen, Leo
Hi Simon,
On Fri, Sep 30, 2022 at 5:26 AM Simon Glass <sjg@chromium.org> wrote:
> Hi Mayuresh,
>
> On Thu, 29 Sept 2022 at 03:57, Mayuresh Chitale
> <mchitale@ventanamicro.com> wrote:
> >
> > Build PCI NVMe driver when enabled for SPI and enable dm-pre-reloc for
> > the driver. Also enable PCI_PNP for SPL which is required to auto
> > configure the PCIe devices.
> >
> > Signed-off-by: Mayuresh Chitale <mchitale@ventanamicro.com>
> > ---
> > drivers/Makefile | 2 +-
> > drivers/nvme/Makefile | 2 +-
> > drivers/nvme/nvme_pci.c | 1 +
> > drivers/pci/Kconfig | 7 +++++++
> > drivers/pci/pci-uclass.c | 3 ++-
> > 5 files changed, 12 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/Makefile b/drivers/Makefile
> > index eba9940231..581ae9f819 100644
> > --- a/drivers/Makefile
> > +++ b/drivers/Makefile
> > @@ -34,6 +34,7 @@ obj-$(CONFIG_$(SPL_)DM_MAILBOX) += mailbox/
> > obj-$(CONFIG_$(SPL_)REMOTEPROC) += remoteproc/
> > obj-$(CONFIG_$(SPL_)SYSINFO) += sysinfo/
> > obj-$(CONFIG_$(SPL_TPL_)TPM) += tpm/
> > +obj-$(CONFIG_$(SPL_)NVME) += nvme/
> > obj-$(CONFIG_XEN) += xen/
> > obj-$(CONFIG_$(SPL_)FPGA) += fpga/
> >
> > @@ -86,7 +87,6 @@ obj-y += crypto/
> > obj-$(CONFIG_FASTBOOT) += fastboot/
> > obj-y += misc/
> > obj-$(CONFIG_MMC) += mmc/
> > -obj-$(CONFIG_NVME) += nvme/
> > obj-$(CONFIG_PCI_ENDPOINT) += pci_endpoint/
> > obj-y += dfu/
> > obj-$(CONFIG_PCH) += pch/
> > diff --git a/drivers/nvme/Makefile b/drivers/nvme/Makefile
> > index fa7b619446..fd3e68a91d 100644
> > --- a/drivers/nvme/Makefile
> > +++ b/drivers/nvme/Makefile
> > @@ -4,4 +4,4 @@
> >
> > obj-y += nvme-uclass.o nvme.o nvme_show.o
> > obj-$(CONFIG_NVME_APPLE) += nvme_apple.o
> > -obj-$(CONFIG_NVME_PCI) += nvme_pci.o
> > +obj-$(CONFIG_$(SPL_)NVME_PCI) += nvme_pci.o
> > diff --git a/drivers/nvme/nvme_pci.c b/drivers/nvme/nvme_pci.c
> > index 36bf9c5ffb..16d8b9fff7 100644
> > --- a/drivers/nvme/nvme_pci.c
> > +++ b/drivers/nvme/nvme_pci.c
> > @@ -39,6 +39,7 @@ U_BOOT_DRIVER(nvme) = {
> > .bind = nvme_bind,
> > .probe = nvme_probe,
> > .priv_auto = sizeof(struct nvme_dev),
> > + .flags = DM_FLAG_PRE_RELOC,
>
> Why is this here? It is only applicable on some boards.
>
> Instead, add the appropriate tag (e.g. u-boot,dm-spl) to the device node.
>
I am not sure how that can be done for PCI devices as those would be probed
at run time. Could you please point to any examples? Also,
the pci_find_and_bind_driver function only checks for this flag in the
drivers when binding the devices
>
> > };
> >
> > struct pci_device_id nvme_supported[] = {
> > diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
> > index 22f4995453..2d4c9f0781 100644
> > --- a/drivers/pci/Kconfig
> > +++ b/drivers/pci/Kconfig
> > @@ -40,6 +40,13 @@ config PCI_PNP
> > help
> > Enable PCI memory and I/O space resource allocation and
> assignment.
> >
> > +config SPL_PCI_PNP
> > + bool "Enable Plug & Play support for PCI"
> > + default n
> > + help
> > + Enable PCI memory and I/O space resource allocation and
> assignment.
> > + This is required to auto configure the enumerated devices.
> > +
> > config PCI_REGION_MULTI_ENTRY
> > bool "Enable Multiple entries of region type MEMORY in ranges
> for PCI"
> > help
> > diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
> > index 16a6a699f9..62d2409a6d 100644
> > --- a/drivers/pci/pci-uclass.c
> > +++ b/drivers/pci/pci-uclass.c
> > @@ -1140,7 +1140,8 @@ static int pci_uclass_post_probe(struct udevice
> *bus)
> > if (ret)
> > return log_msg_ret("bind", ret);
> >
> > - if (CONFIG_IS_ENABLED(PCI_PNP) && ll_boot_init() &&
> > + if ((CONFIG_IS_ENABLED(PCI_PNP) ||
> CONFIG_IS_ENABLED(SPL_PCI_PNP)) &&
> > + ll_boot_init() &&
> > (!hose->skip_auto_config_until_reloc ||
> > (gd->flags & GD_FLG_RELOC))) {
> > ret = pci_auto_config_devices(bus);
> > --
> > 2.25.1
> >
>
> Regards,
> Simon
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC PATCH v1 2/3] nvme: pci: Enable for SPL
2022-09-30 16:58 ` Mayuresh Chitale
@ 2022-09-30 23:49 ` Simon Glass
0 siblings, 0 replies; 9+ messages in thread
From: Simon Glass @ 2022-09-30 23:49 UTC (permalink / raw)
To: Mayuresh Chitale
Cc: Bin Meng, U-Boot Mailing List, Heinrich Schuchardt, Rick Chen, Leo
Hi Mayuresh,
On Fri, 30 Sept 2022 at 10:58, Mayuresh Chitale
<mchitale@ventanamicro.com> wrote:
>
> Hi Simon,
>
> On Fri, Sep 30, 2022 at 5:26 AM Simon Glass <sjg@chromium.org> wrote:
>>
>> Hi Mayuresh,
>>
>> On Thu, 29 Sept 2022 at 03:57, Mayuresh Chitale
>> <mchitale@ventanamicro.com> wrote:
>> >
>> > Build PCI NVMe driver when enabled for SPI and enable dm-pre-reloc for
>> > the driver. Also enable PCI_PNP for SPL which is required to auto
>> > configure the PCIe devices.
>> >
>> > Signed-off-by: Mayuresh Chitale <mchitale@ventanamicro.com>
>> > ---
>> > drivers/Makefile | 2 +-
>> > drivers/nvme/Makefile | 2 +-
>> > drivers/nvme/nvme_pci.c | 1 +
>> > drivers/pci/Kconfig | 7 +++++++
>> > drivers/pci/pci-uclass.c | 3 ++-
>> > 5 files changed, 12 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/drivers/Makefile b/drivers/Makefile
>> > index eba9940231..581ae9f819 100644
>> > --- a/drivers/Makefile
>> > +++ b/drivers/Makefile
>> > @@ -34,6 +34,7 @@ obj-$(CONFIG_$(SPL_)DM_MAILBOX) += mailbox/
>> > obj-$(CONFIG_$(SPL_)REMOTEPROC) += remoteproc/
>> > obj-$(CONFIG_$(SPL_)SYSINFO) += sysinfo/
>> > obj-$(CONFIG_$(SPL_TPL_)TPM) += tpm/
>> > +obj-$(CONFIG_$(SPL_)NVME) += nvme/
>> > obj-$(CONFIG_XEN) += xen/
>> > obj-$(CONFIG_$(SPL_)FPGA) += fpga/
>> >
>> > @@ -86,7 +87,6 @@ obj-y += crypto/
>> > obj-$(CONFIG_FASTBOOT) += fastboot/
>> > obj-y += misc/
>> > obj-$(CONFIG_MMC) += mmc/
>> > -obj-$(CONFIG_NVME) += nvme/
>> > obj-$(CONFIG_PCI_ENDPOINT) += pci_endpoint/
>> > obj-y += dfu/
>> > obj-$(CONFIG_PCH) += pch/
>> > diff --git a/drivers/nvme/Makefile b/drivers/nvme/Makefile
>> > index fa7b619446..fd3e68a91d 100644
>> > --- a/drivers/nvme/Makefile
>> > +++ b/drivers/nvme/Makefile
>> > @@ -4,4 +4,4 @@
>> >
>> > obj-y += nvme-uclass.o nvme.o nvme_show.o
>> > obj-$(CONFIG_NVME_APPLE) += nvme_apple.o
>> > -obj-$(CONFIG_NVME_PCI) += nvme_pci.o
>> > +obj-$(CONFIG_$(SPL_)NVME_PCI) += nvme_pci.o
>> > diff --git a/drivers/nvme/nvme_pci.c b/drivers/nvme/nvme_pci.c
>> > index 36bf9c5ffb..16d8b9fff7 100644
>> > --- a/drivers/nvme/nvme_pci.c
>> > +++ b/drivers/nvme/nvme_pci.c
>> > @@ -39,6 +39,7 @@ U_BOOT_DRIVER(nvme) = {
>> > .bind = nvme_bind,
>> > .probe = nvme_probe,
>> > .priv_auto = sizeof(struct nvme_dev),
>> > + .flags = DM_FLAG_PRE_RELOC,
>>
>> Why is this here? It is only applicable on some boards.
>>
>> Instead, add the appropriate tag (e.g. u-boot,dm-spl) to the device node.
>
>
> I am not sure how that can be done for PCI devices as those would be probed at run time. Could you please point to any examples? Also, the pci_find_and_bind_driver function only checks for this flag in the drivers when binding the devices
See host-bridge@0,0 in chromebook_coral.dts for an example of using
the u-boot,dm-pre-reloc flag. Note that pci_find_and_bind_driver() is
only called if the device tree lacks anything.
Which board is this for?
Regards,
Simon
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-09-30 23:49 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-29 9:56 [RFC PATCH v1 0/3] SPL NVMe support Mayuresh Chitale
2022-09-29 9:56 ` [RFC PATCH v1 1/3] spl: Add Kconfig options for NVME Mayuresh Chitale
2022-09-29 23:55 ` Simon Glass
2022-09-29 9:56 ` [RFC PATCH v1 2/3] nvme: pci: Enable for SPL Mayuresh Chitale
2022-09-29 23:55 ` Simon Glass
2022-09-30 16:58 ` Mayuresh Chitale
2022-09-30 23:49 ` Simon Glass
2022-09-29 9:56 ` [RFC PATCH v1 3/3] common: spl: Add spl NVMe boot support Mayuresh Chitale
2022-09-29 23:55 ` Simon Glass
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.