From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 22750C77B7E for ; Tue, 2 May 2023 16:20:13 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E7AA18470D; Tue, 2 May 2023 18:19:37 +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="DMTo3wa5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4136D846F7; Tue, 2 May 2023 18:19:36 +0200 (CEST) Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) (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 7A88E8473C for ; Tue, 2 May 2023 18:19:32 +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-pl1-x630.google.com with SMTP id d9443c01a7336-1ab032d9266so17418285ad.0 for ; Tue, 02 May 2023 09:19:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1683044371; x=1685636371; 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=xvF3Ut6Mwm8aQ+CSLRYWNJpb3coPn84bekCJ9G9kS+E=; b=DMTo3wa5rZGRyefWHSW1a1Y+8/DPKJfpDxPYOIf8mnGcmc1h3AjPcoOmI9LLs3dcAJ 1Phdwbnk4PfYla9dREaCl9rO+y0aFzAmW533G5hsgrzkcItNtV90jwgKCxDPluL+YpkP x1jue6LjZ00f+3Rya10C4EhsqZIdedUIa+ngUl0zelUTbb/OgA7UrzjyJvYsPsb0P0S7 o7KQ15Cd7+RGhHQa9duDoqj1k860jvF/excv2Gg7uJcT9rpmXPiT40suwcAiQvrUQPL7 SAmmDGtosPyKH+7kxvFZK6lNjkWceA8zp9mupQmPguCKUAjfkaS95z6USQeR2Yh+gHxe 5BNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683044371; x=1685636371; 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=xvF3Ut6Mwm8aQ+CSLRYWNJpb3coPn84bekCJ9G9kS+E=; b=i/75P0chAXz6uHYG1/AdmgOD9SwNyJzNsL12Qw3yMxxYGf+7Xc1u6/45PfCZAKBUGZ 5tMPuJoYr8zCnSI17ioGYs+dW59F1kD5GvE2Oa+NoiUnG+3+SU7cy5QEmgVPacq9EtdF W9F65UGGyI6eRR9VF9Uf9H1qS8/Qu8XnPcG6BJwJZvd4mIbWwxC88Na9hCd8lL6iJx9P i9s1psYDIefVKtybk5VfhRI+GtsYPbYw4LvI6jrgEUzxxPlhL2AWQBBRpVxroWH3zcHD eyZW5M5TQV+VwbSx2bKAP/+4qGgj52k8S66W+mp7ZWFaXh1JeuqOyOO32d2riDAa5Ltg EO3g== X-Gm-Message-State: AC+VfDxuFzmmCDllf7owzkJj/lzMJt51Pxs3SVVWzrE/7vRBYsWTdYTX C9N79aml7lhZJEpmA+DQkN6kPA== X-Google-Smtp-Source: ACHHUZ4LMRLCkVsspN1mSFfM3DP8fawSZDX13GPGvQgeNot2VzoBl80DdTDxglaAwrLE03fZsLEK5A== X-Received: by 2002:a17:902:c950:b0:1a1:9020:f9c7 with SMTP id i16-20020a170902c95000b001a19020f9c7mr20657478pla.44.1683044370894; Tue, 02 May 2023 09:19:30 -0700 (PDT) Received: from mchitale-vm.. ([106.195.4.219]) by smtp.googlemail.com with ESMTPSA id c11-20020a170902724b00b001a527761c31sm20052465pll.79.2023.05.02.09.19.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 09:19:30 -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 v2 4/4] common: spl: Add spl NVMe boot support Date: Tue, 2 May 2023 21:49:02 +0530 Message-Id: <20230502161902.1339861-5-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502161902.1339861-1-mchitale@ventanamicro.com> References: <20230502161902.1339861-1-mchitale@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. Signed-off-by: Mayuresh Chitale --- arch/riscv/include/asm/spl.h | 1 + common/spl/Kconfig | 10 +++++++ common/spl/Makefile | 1 + common/spl/spl_nvme.c | 52 ++++++++++++++++++++++++++++++++++++ 4 files changed, 64 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 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/Kconfig b/common/spl/Kconfig index a42774c76d..021c4997a7 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1283,6 +1283,16 @@ config SPL_NVME_BOOT_DEVICE depends on SPL_NVME default 0x0 +config SYS_NVME_EXT_BOOT_PARTITION + hex "NVMe ext boot partition number" + depends on SPL_NVME + default 0x2 + +config SYS_NVME_FAT_BOOT_PARTITION + hex "NVMe boot partition number" + depends on SPL_NVME + default 0x1 + config SPL_SERIAL bool "Support serial" select SPL_PRINTF 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..c99e0aefc7 --- /dev/null +++ b/common/spl/spl_nvme.c @@ -0,0 +1,52 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2023 + * Ventana Micro Systems Inc. + * + * Derived work from spl_sata.c + */ + +#include +#include +#include +#include +#include +#include + +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(UCLASS_NVME, CONFIG_SPL_NVME_BOOT_DEVICE); + blk_desc = blk_get_devnum_by_uclass_id(UCLASS_NVME, + CONFIG_SPL_NVME_BOOT_DEVICE); + if (IS_ENABLED(CONFIG_SPL_FS_EXT4)) { + ret = spl_load_image_ext(spl_image, bootdev, blk_desc, + CONFIG_SYS_NVME_EXT_BOOT_PARTITION, + CONFIG_SPL_PAYLOAD); + if (!ret) + return ret; + } + + 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.34.1