spl: support boot from rknand device

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I168ec42ec1ac4bc1e8b640fba22357cde4a26aac

arch/arm/include/asm/spl.h

@@ -34,6 +34,7 @@ enum {
 	BOOT_DEVICE_MTD_BLK_NAND,
 	BOOT_DEVICE_MTD_BLK_SPI_NAND,
 	BOOT_DEVICE_MTD_BLK_SPI_NOR,
+	BOOT_DEVICE_RKNAND,
 	BOOT_DEVICE_NONE
 };
 #endif

common/spl/Kconfig

@@ -658,6 +658,23 @@ config SPL_SPI_FLASH_SUPPORT
 	  lines). This enables the drivers in drivers/mtd/spi as part of an
 	  SPL build. This normally requires SPL_SPI_SUPPORT.
 
+config SPL_RKNAND_SUPPORT
+	bool "Rockchip NAND FLASH device support"
+	depends on BLK
+	select RKNAND
+	select ZFTL if (ROCKCHIP_PX30 || ROCKCHIP_RK3568)
+	help
+	  This option enables support for Rockchip NAND FLASH devices.
+	  It supports block interface(with rk ftl) to read and write NAND FLASH.
+
+config RKNAND_BLK_U_BOOT_OFFS
+	hex "Location in RKNAND block to read U-Boot from"
+	default 0x4000
+	depends on SPL_RKNAND_SUPPORT
+	help
+	  Set the offset from the start of the rknand device where
+	  u-boot should be loaded from.
+
 if SPL_SPI_FLASH_SUPPORT
 
 config SPL_SPI_FLASH_TINY

common/spl/Makefile

@@ -40,6 +40,7 @@ obj-$(CONFIG_$(SPL_TPL_)UBI) += spl_ubi.o
 obj-$(CONFIG_$(SPL_TPL_)NET_SUPPORT) += spl_net.o
 obj-$(CONFIG_$(SPL_TPL_)MMC_SUPPORT) += spl_mmc.o
 obj-$(CONFIG_$(SPL_TPL_)MTD_SUPPORT) += spl_mtd_blk.o
+obj-$(CONFIG_$(SPL_TPL_)RKNAND_SUPPORT) += spl_rknand.o
 obj-$(CONFIG_$(SPL_TPL_)ATF) += spl_atf.o
 obj-$(CONFIG_$(SPL_TPL_)OPTEE) += spl_optee.o
 obj-$(CONFIG_$(SPL_TPL_)LOAD_RKFW) += spl_rkfw.o

common/spl/spl_rknand.c

@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2020 Rockchip Electronics Co., Ltd
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#include <common.h>
+#include <blk.h>
+#include <boot_rkimg.h>
+#include <dm.h>
+#include <errno.h>
+#include <image.h>
+#include <malloc.h>
+#include <mtd_blk.h>
+#include <part.h>
+#include <spl.h>
+#include <spl_ab.h>
+#include <spl_rkfw.h>
+#include <asm/u-boot.h>
+#include <dm/device-internal.h>
+#include <linux/compiler.h>
+
+static struct blk_desc *find_rknand_device(int dev_num)
+{
+	struct udevice *dev;
+	struct blk_desc *desc;
+	int ret;
+
+	ret = blk_find_device(IF_TYPE_RKNAND, dev_num, &dev);
+	if (ret)
+		return NULL;
+
+	ret = device_probe(dev);
+	if (ret) {
+		debug("RKNAND Device %d not found\n", dev_num);
+		return NULL;
+	}
+
+	desc = dev_get_uclass_platdata(dev);
+	if (!desc)
+		return NULL;
+
+	return desc;
+}
+
+static ulong h_spl_load_read(struct spl_load_info *load, ulong sector,
+			     ulong count, void *buf)
+{
+	return blk_dread(load->dev, sector, count, buf);
+}
+
+static int spl_rknand_load_image(struct spl_image_info *spl_image,
+				 struct spl_boot_device *bootdev)
+{
+	lbaint_t image_sector = CONFIG_RKNAND_BLK_U_BOOT_OFFS;
+	struct image_header *header;
+	struct spl_load_info load;
+	struct blk_desc *desc;
+	int ret = -1;
+
+	desc = find_rknand_device(0);
+	if (!desc)
+		return -ENODEV;
+
+	load.dev = desc;
+	load.priv = NULL;
+	load.filename = NULL;
+	load.bl_len = desc->blksz;
+	load.read = h_spl_load_read;
+
+#ifdef CONFIG_SPL_LIBDISK_SUPPORT
+	disk_partition_t info;
+
+	ret = part_get_info_by_name(desc, PART_UBOOT, &info);
+	if (ret > 0)
+		image_sector = info.start;
+#endif
+
+	if (IS_ENABLED(CONFIG_SPL_LOAD_FIT)) {
+		header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
+					 sizeof(struct image_header));
+		ret = blk_dread(desc, image_sector, 1, header);
+		if (ret != 1)
+			return -ENODEV;
+
+#ifdef CONFIG_SPL_FIT_IMAGE_MULTIPLE
+		if (image_get_magic(header) == FDT_MAGIC ||
+		    CONFIG_SPL_FIT_IMAGE_MULTIPLE > 1) {
+#else
+		if (image_get_magic(header) == FDT_MAGIC) {
+#endif
+			ret = spl_load_simple_fit(spl_image, &load,
+						  image_sector,
+						  header);
+		}
+	}
+
+	if (!ret)
+		return 0;
+
+#ifdef CONFIG_SPL_LOAD_RKFW
+	ret = spl_load_rkfw_image(spl_image, &load);
+#endif
+
+	return ret;
+}
+
+SPL_LOAD_IMAGE_METHOD("RKNAND", 0, BOOT_DEVICE_RKNAND, spl_rknand_load_image);