From patchwork Sat Jun 3 14:02:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mayuresh Chitale X-Patchwork-Id: 1789963 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=LXaLLocm; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QYM7F4BJpz20Tk for ; Sun, 4 Jun 2023 00:04:25 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 093F38575B; Sat, 3 Jun 2023 16:04:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="LXaLLocm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8AB44847D5; Sat, 3 Jun 2023 16:03:59 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oi1-x22e.google.com (mail-oi1-x22e.google.com [IPv6:2607:f8b0:4864:20::22e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DC04E85746 for ; Sat, 3 Jun 2023 16:03:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mchitale@ventanamicro.com Received: by mail-oi1-x22e.google.com with SMTP id 5614622812f47-39855d57240so2064413b6e.2 for ; Sat, 03 Jun 2023 07:03:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1685801035; x=1688393035; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5sCvvfn/PczvA1D6g51HEkiphpVj0cRvnfZ1hw2+7rc=; b=LXaLLocmbokfXRX1yDrOuVpWs0ar6BQY/UOjkxugUVl9W/wfGLCGdae/l7FTt2TxkN KbqSLkzrdytdIVWOWRIWkzD+9qcDf21FJ3Afysf/xnURZVunhAn2bSFhzuhlnEfVUqwj PYGgG02VFWj0JnjFx5SkvQx0Py/KxjEHxUWOeZGV/ozxnhA99zrt0xqPtrZAKgjxze8/ RUAG0HGSWo3BMD8mYpwSCU01lKIb2AurqkASIddbSAKsG00zM91D0cNrevsxdgsq6VRO /BUHe0tLNJz6RqLtVyD8Qt8CnfE6iV71ND+Hgo/8dyTg9pEXNIY9YwcdvUJARKLNSMW7 qerQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685801035; x=1688393035; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5sCvvfn/PczvA1D6g51HEkiphpVj0cRvnfZ1hw2+7rc=; b=URxlKDJhe/8sMaFJ2FkVoBxd1rr+353s5os2Qco4yDgDX+/fJyOCizMwwHZgYNmxnV NrDm459gR3mzQ/4ZhOaK4wNhMDSeKxR81w5UOwIdZ7xepf1jEorIoAbcURNfpLHaOgGC JMYFoLyKY4xWXOw+j+p7dLvK3R79nyQHIECRm4OMOE3m0tvg9NWbFQM94Hluw1m6MAVo kxl+UN1PSAd00hxROnwAVNyFuLIjKtDMN5J9mS/zoiMAithwfQAgHp3jTNCCA8NOxcmo a/w9u4EB1/xyQ9PRQYp1ECqqfGlvCG9sKhZJLy6B6BlfvrtPBeIoFn3g3tzAMbEYAiSB S7ZQ== X-Gm-Message-State: AC+VfDznAFiwQ0H2DhOmnWulergMr/ldpLHEwOQpCD+Q3bQsXkGm32Fo 2oRa0bLjBgdI1jRsB+ezqj5LNQ== X-Google-Smtp-Source: ACHHUZ5dRH/8+seI1io4wrG12icK76f/01cGcRty21rAtFAhzuN8xuJnJvXrBWXvFj61X65ZEXa0NA== X-Received: by 2002:a05:6808:428e:b0:398:574e:8352 with SMTP id dq14-20020a056808428e00b00398574e8352mr2085246oib.21.1685801035505; Sat, 03 Jun 2023 07:03:55 -0700 (PDT) Received: from mchitale-vm.. ([103.97.165.210]) by smtp.googlemail.com with ESMTPSA id cz8-20020a056808404800b0039819ef73e7sm113150oib.2.2023.06.03.07.03.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jun 2023 07:03:47 -0700 (PDT) From: Mayuresh Chitale To: Bin Meng , Simon Glass Cc: Mayuresh Chitale , u-boot@lists.denx.de, Heinrich Schuchardt , Rick Chen , Leo Subject: [PATCH v4 1/4] spl: Add Kconfig options for NVME Date: Sat, 3 Jun 2023 19:32:53 +0530 Message-Id: <20230603140256.2443518-2-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230603140256.2443518-1-mchitale@ventanamicro.com> References: <20230603140256.2443518-1-mchitale@ventanamicro.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Add kconfig options to enable NVME and PCI NVMe support in SPL Signed-off-by: Mayuresh Chitale Reviewed-by: Simon Glass --- common/spl/Kconfig | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 2c042ad306..94b13f7a7f 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1263,6 +1263,32 @@ config SPL_SATA_RAW_U_BOOT_SECTOR Sector on the SATA disk to load U-Boot from, when the SATA disk is being used in raw mode. Units: SATA disk sectors (1 sector = 512 bytes). +config SPL_NVME + bool "NVM Express device support" + depends on BLK + select HAVE_BLOCK_DEVICE + select FS_LOADER + 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_BOOT_PARTITION + hex "NVMe boot partition number" + depends on SPL_NVME + default 0x1 + config SPL_SERIAL bool "Support serial" select SPL_PRINTF From patchwork Sat Jun 3 14:02:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mayuresh Chitale X-Patchwork-Id: 1789964 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=fygiLosB; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QYM7S441lz20Tk for ; Sun, 4 Jun 2023 00:04:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 93787857D1; Sat, 3 Jun 2023 16:04:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="fygiLosB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 667A785813; Sat, 3 Jun 2023 16:04:27 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 51EEA857D1 for ; Sat, 3 Jun 2023 16:04:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mchitale@ventanamicro.com Received: by mail-oi1-x22c.google.com with SMTP id 5614622812f47-39a3f165ac5so2773269b6e.3 for ; Sat, 03 Jun 2023 07:04:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1685801062; x=1688393062; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=neHIoS7zmzzjOmPHWW+8bTwQAoqK/q0StiwrWrsFOLY=; b=fygiLosBffN5zIpGnvCEfkEHa1C5KvPkWEx+YMh2kZy89BXA5yvZrlfbmCdsUdkjKg TdUahnUBFziJCR7zkt0poT+oZ4sgeNcF6YZ2qo4v+DfUKxvam38Qp3hJv3NYs8r+BpPU tgaP4xQQfx7QKJiqsDJD/NQ/Y6qtklI3M/H9S8V+/TXVazFRMpOhfxAC6cHQMMrK9qvz 8xlzm0m+f+yror5q5YuzhPkoX0IIqqEDwfP+qE9ji2s5I1wLdgn02CuBvDI4LHuCHck0 gMYrTLivTF6DBx5qFzItHdwDfhqtdHCOjxDK4A6886ZlxNpgzHShHF3uOvOzHaxa/+xx g9Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685801062; x=1688393062; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=neHIoS7zmzzjOmPHWW+8bTwQAoqK/q0StiwrWrsFOLY=; b=K+C4+iPMcZ3f97PaxXFrqEDfKYvWDBc5SXGEiFfqGTXCjSTVS029FL7/SP6jPCCgUm kbyXGe/OrimsBteZtzBr5LqlIac8oDPU1mdtUuPr46fQRFgzo4CyeSQtb3qbAyYhBPtQ h29Ew4c/nWWjPZluElwZ0YdIlEzTwV7j2AK/BCq3Fk352Ds0lE6YgQ9xXKSFa9qyhMcy heWISTEAHw6hDeusTS5Hky64fE+Tk31qXVsYUHJ2ut3BAosOeEHYidFkMSA0QYobnSdU 1o1gpzKL43vj6t7xU3bBSt8KfbsUY318UOEW/hut1Dfy0BE7somA2hUiGoQDRcUt7wQ3 O0CQ== X-Gm-Message-State: AC+VfDy83ndsMBJV2z99QeCTO/skGWn3pjmZbCvGxmnEJr4rli0AwpkH 5gdHKblfHEnXCRnXXUl2Ya4ewg== X-Google-Smtp-Source: ACHHUZ4wZW7EP0AuLaYy43rQQHNBk8JfVlqHDv2S4h/KBTHGewRLSv+kh+694KMoR2Ppuf95w2lXaQ== X-Received: by 2002:a05:6808:624a:b0:39a:a4ab:22f2 with SMTP id dt10-20020a056808624a00b0039aa4ab22f2mr283436oib.56.1685801061884; Sat, 03 Jun 2023 07:04:21 -0700 (PDT) Received: from mchitale-vm.. ([103.97.165.210]) by smtp.googlemail.com with ESMTPSA id cz8-20020a056808404800b0039819ef73e7sm113150oib.2.2023.06.03.07.03.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jun 2023 07:04:06 -0700 (PDT) From: Mayuresh Chitale To: Bin Meng , Simon Glass Cc: Mayuresh Chitale , u-boot@lists.denx.de, Heinrich Schuchardt , Rick Chen , Leo Subject: [PATCH v4 2/4] spl: blk: Support loading images from fs Date: Sat, 3 Jun 2023 19:32:54 +0530 Message-Id: <20230603140256.2443518-3-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230603140256.2443518-1-mchitale@ventanamicro.com> References: <20230603140256.2443518-1-mchitale@ventanamicro.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Add a generic API to support loading of SPL payload from any supported filesystem on a given partition of a block device. Signed-off-by: Mayuresh Chitale --- common/spl/Kconfig | 1 + common/spl/Makefile | 1 + common/spl/spl_blk_fs.c | 134 ++++++++++++++++++++++++++++++++++++++++ drivers/block/Kconfig | 7 +++ include/spl.h | 3 + 5 files changed, 146 insertions(+) create mode 100644 common/spl/spl_blk_fs.c diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 94b13f7a7f..3f705f4fb8 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1268,6 +1268,7 @@ config SPL_NVME depends on BLK select HAVE_BLOCK_DEVICE select FS_LOADER + select SPL_BLK_FS help This option enables support for NVM Express devices. It supports basic functions of NVMe (read/write). diff --git a/common/spl/Makefile b/common/spl/Makefile index 13db3df993..5210ad0248 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -10,6 +10,7 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_$(SPL_TPL_)FRAMEWORK) += spl.o obj-$(CONFIG_$(SPL_TPL_)BOOTROM_SUPPORT) += spl_bootrom.o obj-$(CONFIG_$(SPL_TPL_)LOAD_FIT) += spl_fit.o +obj-$(CONFIG_$(SPL_TPL_)BLK_FS) += spl_blk_fs.o obj-$(CONFIG_$(SPL_TPL_)LEGACY_IMAGE_FORMAT) += spl_legacy.o obj-$(CONFIG_$(SPL_TPL_)NOR_SUPPORT) += spl_nor.o obj-$(CONFIG_$(SPL_TPL_)XIP_SUPPORT) += spl_xip.o diff --git a/common/spl/spl_blk_fs.c b/common/spl/spl_blk_fs.c new file mode 100644 index 0000000000..d97adc4d39 --- /dev/null +++ b/common/spl/spl_blk_fs.c @@ -0,0 +1,134 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2023 + * Ventana Micro Systems Inc. + * + */ + +#include +#include +#include +#include + +struct blk_dev { + const char *ifname; + char dev_part_str[8]; +}; + +static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset, + ulong size, void *buf) +{ + loff_t actlen; + int ret; + struct blk_dev *dev = (struct blk_dev *)load->priv; + + ret = fs_set_blk_dev(dev->ifname, dev->dev_part_str, FS_TYPE_ANY); + if (ret) { + printf("spl: unable to set blk_dev %s %s. Err - %d\n", + dev->ifname, dev->dev_part_str, ret); + return ret; + } + + ret = fs_read(load->filename, (ulong)buf, file_offset, size, &actlen); + if (ret < 0) { + printf("spl: error reading image %s. Err - %d\n", + load->filename, ret); + return ret; + } + + return actlen; +} + +int spl_blk_load_image(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev, + enum uclass_id uclass_id, int devnum, int partnum) +{ + const char *filename = CONFIG_SPL_PAYLOAD; + struct disk_partition part_info = {}; + struct legacy_img_hdr *header; + struct blk_desc *blk_desc; + loff_t actlen, filesize; + struct blk_dev dev; + int ret; + + blk_desc = blk_get_devnum_by_uclass_id(uclass_id, devnum); + if (!blk_desc) { + printf("blk desc for %d %d not found\n", uclass_id, devnum); + goto out; + } + + blk_show_device(uclass_id, devnum); + header = spl_get_load_buffer(-sizeof(*header), sizeof(*header)); + ret = part_get_info(blk_desc, 1, &part_info); + if (ret) { + printf("spl: no partition table found. Err - %d\n", ret); + goto out; + } + + dev.ifname = blk_get_uclass_name(uclass_id); + snprintf(dev.dev_part_str, sizeof(dev.dev_part_str) - 1, "%d:%d", + devnum, partnum); + ret = fs_set_blk_dev(dev.ifname, dev.dev_part_str, FS_TYPE_ANY); + if (ret) { + printf("spl: unable to set blk_dev %s %s. Err - %d\n", + dev.ifname, dev.dev_part_str, ret); + goto out; + } + + ret = fs_read(filename, (ulong)header, 0, + sizeof(struct legacy_img_hdr), &actlen); + if (ret) { + printf("spl: unable to read file %s. Err - %d\n", filename, + ret); + goto out; + } + + if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && + image_get_magic(header) == FDT_MAGIC) { + struct spl_load_info load; + + debug("Found FIT\n"); + load.read = spl_fit_read; + load.bl_len = 1; + load.filename = (void *)filename; + load.priv = &dev; + + return spl_load_simple_fit(spl_image, &load, 0, header); + } + + ret = spl_parse_image_header(spl_image, bootdev, header); + if (ret) { + printf("spl: unable to parse image header. Err - %d\n", + ret); + goto out; + } + + ret = fs_set_blk_dev(dev.ifname, dev.dev_part_str, FS_TYPE_ANY); + if (ret) { + printf("spl: unable to set blk_dev %s %s. Err - %d\n", + dev.ifname, dev.dev_part_str, ret); + goto out; + } + + ret = fs_size(filename, &filesize); + if (ret) { + printf("spl: unable to get file size: %s. Err - %d\n", + filename, ret); + goto out; + } + + ret = fs_set_blk_dev(dev.ifname, dev.dev_part_str, FS_TYPE_ANY); + if (ret) { + printf("spl: unable to set blk_dev %s %s. Err - %d\n", + dev.ifname, dev.dev_part_str, ret); + goto out; + } + + ret = fs_read(filename, (ulong)spl_image->load_addr, 0, filesize, + &actlen); + if (ret) + printf("spl: unable to read file %s. Err - %d\n", + filename, ret); +out: + return ret; +} diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 5a1aeb3d2b..6baaa6f071 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -107,6 +107,13 @@ config EFI_MEDIA For sandbox there is a test driver. +config SPL_BLK_FS + bool "Load images from filesystems on block devices" + depends on SPL_BLK + help + Use generic support to load images from fat/ext filesystems on + different types of block devices such as NVMe. + if EFI_MEDIA config EFI_MEDIA_SANDBOX diff --git a/include/spl.h b/include/spl.h index 7e0f5ac63b..20e1eb32a4 100644 --- a/include/spl.h +++ b/include/spl.h @@ -672,6 +672,9 @@ int spl_load_image_ext(struct spl_image_info *spl_image, int spl_load_image_ext_os(struct spl_image_info *spl_image, struct spl_boot_device *bootdev, struct blk_desc *block_dev, int partition); +int spl_blk_load_image(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev, + enum uclass_id uclass_id, int devnum, int partnum); /** * spl_early_init() - Set up device tree and driver model in SPL if enabled From patchwork Sat Jun 3 14:02:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mayuresh Chitale X-Patchwork-Id: 1789965 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=A4+Jy1Jg; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QYM861xKHz20Tj for ; Sun, 4 Jun 2023 00:05:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0D8528575B; Sat, 3 Jun 2023 16:05:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="A4+Jy1Jg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C725A85746; Sat, 3 Jun 2023 16:05:04 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oo1-xc2a.google.com (mail-oo1-xc2a.google.com [IPv6:2607:f8b0:4864:20::c2a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7D161847D5 for ; Sat, 3 Jun 2023 16:05:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mchitale@ventanamicro.com Received: by mail-oo1-xc2a.google.com with SMTP id 006d021491bc7-558b04141e2so54414eaf.0 for ; Sat, 03 Jun 2023 07:05:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1685801099; x=1688393099; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zyEKFnJgELuTCED6HlhJ8Qtvv6SQJGvqKsjz3n40QsA=; b=A4+Jy1JgYYm9SlvBqeGgAtoQBw8fDrY+Zh3Rho5bgS3F33Aqv03dCTUSKT5P5t2ySo t3OjJfXmNXeIOjTBakSVVtPfFWhqiSzr+l0USGdOVZADzeJwk2qFiRCvthYboGoG9Zq4 9Lpnyg1F2Ju6IuC/QcJd4rJyI2T/zA03hLoxlq2eOBqqt2mfLiXWu5SL5+orXTRbkOFe eyp8vWg+13QyMJglp9zKGJ2Y0vWkFRxNwvJaVRbVakUgiJLtE+kOmy9eT5SQQUbdlBGS kNlNupgeORAUatiMKPTFUEQ2DjGooMDE4yTSVw4Owa55eQ1TbWAt1PbU5PGMPIbOZJUF W8QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685801099; x=1688393099; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zyEKFnJgELuTCED6HlhJ8Qtvv6SQJGvqKsjz3n40QsA=; b=QYqcwEtmKO7XUgjcHlfkiW8x/mFx9orzZevJ27NRBDCQSPKJRerrKrTMvIPfu5OlPa 1x2p/C3Uc3L/4mgWoL6KcVRz6Jg1tQTCcvOw5b/dzZ3IwD8Ut1oyUWU2YK1Ue60kRxsZ FLbA0beRBkYA5pzNDc15Odx6thNYxV/xyF4iT2lhnu/6u4F4RY/wsF+gr9KPV7u/WI5Q HynsJOsOV0BAiHWo0uU6nxZYPJC1We7rXZKdIQsrvf6s4WXXUSlLkSIZx6MoDJ+xYwLx Qnd9cfPIIEBL1UljpWPLeX0APSfy6Pm48jVb0xt930nwzMVQO9e/OrO3sU/zkCcKM54Y /voA== X-Gm-Message-State: AC+VfDz2vrgG4/hpkLtgbeVeWCBqHp4090YciNA7bNIFrscYJGth1Tfa 63PdZny26dmliFx4s+XzmyArJg== X-Google-Smtp-Source: ACHHUZ5fx1EdQGiSsEfSuN5LAGf0Lrrv6oS30mtp1HCGJGQkYitf5NojiEAYXMoMZA2JyjUqZnKH6g== X-Received: by 2002:a05:6808:a10:b0:398:10ef:c9d2 with SMTP id n16-20020a0568080a1000b0039810efc9d2mr3460967oij.36.1685801099165; Sat, 03 Jun 2023 07:04:59 -0700 (PDT) Received: from mchitale-vm.. ([103.97.165.210]) by smtp.googlemail.com with ESMTPSA id cz8-20020a056808404800b0039819ef73e7sm113150oib.2.2023.06.03.07.04.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jun 2023 07:04:33 -0700 (PDT) From: Mayuresh Chitale To: Bin Meng , Simon Glass Cc: Mayuresh Chitale , u-boot@lists.denx.de, Heinrich Schuchardt , Rick Chen , Leo Subject: [PATCH v4 3/4] nvme: pci: Enable for SPL Date: Sat, 3 Jun 2023 19:32:55 +0530 Message-Id: <20230603140256.2443518-4-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230603140256.2443518-1-mchitale@ventanamicro.com> References: <20230603140256.2443518-1-mchitale@ventanamicro.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Enable NVME and PCI NVMe drivers for SPL builds. Also enable PCI_PNP for SPL which is required to auto configure the PCIe devices. Signed-off-by: Mayuresh Chitale --- drivers/Makefile | 1 + drivers/nvme/Makefile | 2 +- drivers/pci/Kconfig | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/Makefile b/drivers/Makefile index 58be410135..dc559ea7f7 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/ obj-y += bus/ 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/pci/Kconfig b/drivers/pci/Kconfig index ef328d2652..dca71ef504 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -40,6 +40,12 @@ 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" + 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 From patchwork Sat Jun 3 14:02:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mayuresh Chitale X-Patchwork-Id: 1789966 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=BAWpXZPe; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QYM8K3KQnz20Tj for ; Sun, 4 Jun 2023 00:05:21 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 600B48561F; Sat, 3 Jun 2023 16:05:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="BAWpXZPe"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 61463857D5; Sat, 3 Jun 2023 16:05:10 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3C420847D5 for ; Sat, 3 Jun 2023 16:05:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mchitale@ventanamicro.com Received: by mail-oi1-x231.google.com with SMTP id 5614622812f47-39aa825c299so25475b6e.0 for ; Sat, 03 Jun 2023 07:05:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1685801105; x=1688393105; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ALTsjnS0mp13gyTLnoMsyJYnQI13FNiRxUBipjZDc6s=; b=BAWpXZPe1h6YpJzXnWeIJxo7R2CDB8/EhQ5Gu9m07dbeZZpq6gfyBD1N1yJAh2mu5j h5wmMX5EOAuTYaG/6rj2W/Hofgdol5sod6WczRNNABrJ1XqQMWNywTFDSl9g2EIgZDDj Ztm19kszVDiaEkDM0vzOMqQ+D+6jgr3dWc4IjwCrkrB/uueu8liE477eI61KjxNNbgJC xgmCvD2vz6ln8Tl4G+ze+zEeQ+x6sPWSvV0wSnFLEqAoRE3gfGjiEhewpNYVHnPILw7h pXMIb1Lvy4f35XVDeL6xwvxhWhx5354exXkMzUf2LriaDyXkG8U1gxWyio/2NdnAHabd uDmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685801105; x=1688393105; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ALTsjnS0mp13gyTLnoMsyJYnQI13FNiRxUBipjZDc6s=; b=UGIBVbu7TNhn94xBhWbZuN3KnccgiPtQjFO5yWCBKKIbbxsdKF8no5TNV70dgYHFsa HPCgMTeaE5D5ChWMvrMVVk8o5BsiPKioftSFrcu5pnCNse7b+qw2BdffgLD1wrlOkW98 786co9q1OAgp1eTa2F8qv/VQrFMV62/3xYcGhtQJZtZo22qt1+l+eZzqKavhezAtGKBd Lw2kwLVwgg4kgtx1U3bL2/0d6D4MZZNsaGzWLZQYMy1yFaceKnKDFkCMZ/DdTXcEdYgC skfuL7FcTGOXO9/jUo0XDXlg8LvR32gfugWOVJNyfzYjhF4sFRMBz0792DR7jCEOKUju YcQA== X-Gm-Message-State: AC+VfDzcekidN/HdgdpqZcb9xCg1TRTWy6tLFV8D16OEIub4gBN18C7R y0IwlvyeimQNP7F91v5tkiawUQ== X-Google-Smtp-Source: ACHHUZ4dJrt6hzsCzJlghgRIXCYPWYLKOqrFHCboUGdTiqc3buLZ6LzcBhe9XSik5tdF/YfRgC5bcA== X-Received: by 2002:aca:a957:0:b0:39a:a78f:2b79 with SMTP id s84-20020acaa957000000b0039aa78f2b79mr114675oie.16.1685801104518; Sat, 03 Jun 2023 07:05:04 -0700 (PDT) Received: from mchitale-vm.. ([103.97.165.210]) by smtp.googlemail.com with ESMTPSA id cz8-20020a056808404800b0039819ef73e7sm113150oib.2.2023.06.03.07.04.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jun 2023 07:05:03 -0700 (PDT) From: Mayuresh Chitale To: Bin Meng , Simon Glass Cc: Mayuresh Chitale , u-boot@lists.denx.de, Heinrich Schuchardt , Rick Chen , Leo Subject: [PATCH v4 4/4] common: spl: Add spl NVMe boot support Date: Sat, 3 Jun 2023 19:32:56 +0530 Message-Id: <20230603140256.2443518-5-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230603140256.2443518-1-mchitale@ventanamicro.com> References: <20230603140256.2443518-1-mchitale@ventanamicro.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Add support to load the next stage image from an NVMe disk which may be formatted as an EXT or FAT filesystem. Also protect the call to env_get in blk_get_device_part_str with CONFIG_SPL_ENV_SUPPORT macro to avoid link error when SPL_ENV_SUPPORT is not enabled. Signed-off-by: Mayuresh Chitale --- arch/riscv/include/asm/spl.h | 1 + common/spl/Makefile | 1 + common/spl/spl_nvme.c | 32 ++++++++++++++++++++++++++++++++ disk/part.c | 10 ++++++---- 4 files changed, 40 insertions(+), 4 deletions(-) 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 2898a770ee..9c0bf9755c 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 5210ad0248..bad2bbf6cf 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -29,6 +29,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..2af63f1dc8 --- /dev/null +++ b/common/spl/spl_nvme.c @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2023 + * Ventana Micro Systems Inc. + * + */ + +#include +#include +#include +#include + +static int spl_nvme_load_image(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev) +{ + int ret; + + ret = pci_init(); + if (ret < 0) + return ret; + + ret = nvme_scan_namespace(); + if (ret < 0) + return ret; + + ret = spl_blk_load_image(spl_image, bootdev, UCLASS_NVME, + CONFIG_SPL_NVME_BOOT_DEVICE, + CONFIG_SYS_NVME_BOOT_PARTITION); + return ret; +} + +SPL_LOAD_IMAGE_METHOD("NVME", 0, BOOT_DEVICE_NVME, spl_nvme_load_image); diff --git a/disk/part.c b/disk/part.c index 35300df590..d330c57ab4 100644 --- a/disk/part.c +++ b/disk/part.c @@ -467,10 +467,12 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, } #endif - /* If no dev_part_str, use bootdevice environment variable */ - if (!dev_part_str || !strlen(dev_part_str) || - !strcmp(dev_part_str, "-")) - dev_part_str = env_get("bootdevice"); + if (IS_ENABLED(CONFIG_SPL_ENV_SUPPORT)) { + /* If no dev_part_str, use bootdevice environment variable */ + if (!dev_part_str || !strlen(dev_part_str) || + !strcmp(dev_part_str, "-")) + dev_part_str = env_get("bootdevice"); + } /* If still no dev_part_str, it's an error */ if (!dev_part_str) {